diff --git a/reactos/Makefile b/reactos/Makefile index 84b25040413..9660147d2cf 100644 --- a/reactos/Makefile +++ b/reactos/Makefile @@ -214,6 +214,7 @@ ifeq ($(HALFVERBOSEECHO),yes) ECHO_BUILDNO =@echo $(QUOTE)[BUILDNO] $@$(QUOTE) ECHO_INVOKE =@echo $(QUOTE)[INVOKE] $<$(QUOTE) ECHO_PCH =@echo $(QUOTE)[PCH] $@$(QUOTE) + ECHO_CPP =@echo $(QUOTE)[CPP] $@$(QUOTE) ECHO_CC =@echo $(QUOTE)[CC] $<$(QUOTE) ECHO_CL =@echo $(QUOTE)[CL] $<$(QUOTE) ECHO_GAS =@echo $(QUOTE)[GAS] $<$(QUOTE) @@ -246,6 +247,7 @@ else ECHO_BUILDNO = ECHO_INVOKE = ECHO_PCH = + ECHO_CPP = ECHO_CC = ECHO_GAS = ECHO_NASM = diff --git a/reactos/ReactOS-amd64.rbuild b/reactos/ReactOS-amd64.rbuild index 46d9d728df4..bd763384bd3 100644 --- a/reactos/ReactOS-amd64.rbuild +++ b/reactos/ReactOS-amd64.rbuild @@ -19,7 +19,7 @@ - -enable-stdcall-fixup + -disable-stdcall-fixup -U_X86_ @@ -43,9 +43,9 @@ -mpreferred-stack-boundary=4 -fno-strict-aliasing -Wno-strict-aliasing + -fno-ira -Wpointer-arith - -Wno-uninitialized - -enable-stdcall-fixup + -disable-stdcall-fixup -static diff --git a/reactos/ReactOS-generic.rbuild b/reactos/ReactOS-generic.rbuild index e1cfc85985a..aac9b87f39b 100644 --- a/reactos/ReactOS-generic.rbuild +++ b/reactos/ReactOS-generic.rbuild @@ -110,7 +110,7 @@ - + diff --git a/reactos/base/applications/calc/lang/ru-RU.rc b/reactos/base/applications/calc/lang/ru-RU.rc index 3f608ff23f1..41f94b469a2 100644 --- a/reactos/base/applications/calc/lang/ru-RU.rc +++ b/reactos/base/applications/calc/lang/ru-RU.rc @@ -448,7 +448,7 @@ BEGIN IDS_CONV_CONSUMPTION "Расход топлива (двигатели)" IDS_CONV_CURRENCY "Валюта" IDS_CONV_ENERGY "Энергия" - IDS_CONV_LENGTH "Длинна" + IDS_CONV_LENGTH "Длина" IDS_CONV_POWER "Мощность" IDS_CONV_PRESSURE "Давление" IDS_CONV_TEMPERATURE "Температура" diff --git a/reactos/base/applications/calc/lang/uk-UA.rc b/reactos/base/applications/calc/lang/uk-UA.rc index cf2ac7b580d..fcc7e7f6344 100644 --- a/reactos/base/applications/calc/lang/uk-UA.rc +++ b/reactos/base/applications/calc/lang/uk-UA.rc @@ -239,20 +239,20 @@ END IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130 STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS Calculator" +CAPTION "Калькулятор ReactOS" MENU IDR_MENU_STANDARD FONT 8, "MS Shell Dlg" BEGIN - PUSHBUTTON "Convert",IDC_BUTTON_CONVERT,35,105,76,17 + PUSHBUTTON "Перевести",IDC_BUTTON_CONVERT,35,105,76,17 COMBOBOX IDC_COMBO_CATEGORY,4,31,140,168,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP | CBS_SORT - LTEXT "Category:",IDC_STATIC,4,20,56,8 + LTEXT "Категорія:",IDC_STATIC,4,20,56,8 COMBOBOX IDC_COMBO_FROM,4,60,140,168,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP | CBS_SORT - LTEXT "Convert from:",IDC_STATIC,4,49,56,8 + LTEXT "Вихідна величина (""з""):",IDC_STATIC,4,49,56,8 COMBOBOX IDC_COMBO_TO,4,87,140,168,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP | CBS_SORT - LTEXT "Convert to:",IDC_STATIC,4,76,56,8 + LTEXT "Кінцева величина (""в""):",IDC_STATIC,4,76,56,8 CONTROL "C",IDC_BUTTON_CANC,"Button",BS_OWNERDRAW | BS_CENTER | BS_VCENTER | BS_NOTIFY | WS_TABSTOP,276,24,40,17 CONTROL "CE",IDC_BUTTON_CE,"Button",BS_OWNERDRAW | BS_CENTER | @@ -452,17 +452,17 @@ END // types of conversion STRINGTABLE DISCARDABLE BEGIN - IDS_CONV_AREA "Area" - IDS_CONV_CONSUMPTION "Consumption (engines)" - IDS_CONV_CURRENCY "Currencies" - IDS_CONV_ENERGY "Energy" - IDS_CONV_LENGTH "Lenghts" - IDS_CONV_POWER "Power" - IDS_CONV_PRESSURE "Pressure" - IDS_CONV_TEMPERATURE "Temperature" - IDS_CONV_VELOCITY "Velocity" - IDS_CONV_VOLUME "Volume" - IDS_CONV_WEIGHT "Weights" + IDS_CONV_AREA "Площа" + IDS_CONV_CONSUMPTION "Витрата палива (двигуни)" + IDS_CONV_CURRENCY "Валюта" + IDS_CONV_ENERGY "Енергія" + IDS_CONV_LENGTH "Довжина" + IDS_CONV_POWER "Потужність" + IDS_CONV_PRESSURE "Тиск" + IDS_CONV_TEMPERATURE "Температура" + IDS_CONV_VELOCITY "Швидкість" + IDS_CONV_VOLUME "Об'єм" + IDS_CONV_WEIGHT "Вага" END // TYPES OF AREAS diff --git a/reactos/base/applications/kbswitch/kbswitch.c b/reactos/base/applications/kbswitch/kbswitch.c index b173e139bc3..5521b61a60a 100644 --- a/reactos/base/applications/kbswitch/kbswitch.c +++ b/reactos/base/applications/kbswitch/kbswitch.c @@ -24,6 +24,8 @@ HINSTANCE hInst; HANDLE hProcessHeap; HMODULE hDllLib; ULONG ulCurrentLayoutNum = 1; +UINT cxSmIcon, cySmIcon; + static HICON CreateTrayIcon(LPTSTR szLCID) @@ -49,18 +51,18 @@ CreateTrayIcon(LPTSTR szLCID) hdcsrc = GetDC(NULL); hdc = CreateCompatibleDC(hdcsrc); - hBitmap = CreateCompatibleBitmap(hdcsrc, 16, 16); + hBitmap = CreateCompatibleBitmap(hdcsrc, cxSmIcon, cySmIcon); ReleaseDC(NULL, hdcsrc); if (hdc && hBitmap) { - hBmpNew = CreateBitmap(16, 16, 1, 1, NULL); + hBmpNew = CreateBitmap(cxSmIcon, cySmIcon, 1, 1, NULL); if (hBmpNew) { hBmpOld = SelectObject(hdc, hBitmap); - rect.right = 16; + rect.right = cxSmIcon; rect.left = 0; - rect.bottom = 16; + rect.bottom = cySmIcon; rect.top = 0; bkColor = SetBkColor(hdc, GetSysColor(COLOR_HIGHLIGHT)); @@ -68,14 +70,14 @@ CreateTrayIcon(LPTSTR szLCID) ExtTextOut(hdc, rect.left, rect.top, ETO_OPAQUE, &rect, _T(""), 0, NULL); - hFont = CreateFont(-11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, - OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, - DEFAULT_QUALITY, FF_DONTCARE, _T("Tahoma")); + hFont = (HFONT) GetStockObject(DEFAULT_GUI_FONT); + if (!hFont) + goto End; hFontOld = SelectObject(hdc, hFont); DrawText(hdc, _tcsupr(szBuf), 2, &rect, DT_SINGLELINE|DT_CENTER|DT_VCENTER); SelectObject(hdc, hBmpNew); - PatBlt(hdc, 0, 0, 16, 16, BLACKNESS); + PatBlt(hdc, 0, 0, cxSmIcon, cySmIcon, BLACKNESS); SelectObject(hdc, hBmpOld); SelectObject(hdc, hFontOld); @@ -84,15 +86,15 @@ CreateTrayIcon(LPTSTR szLCID) IconInfo.fIcon = TRUE; hIcon = CreateIconIndirect(&IconInfo); - - DeleteObject(hBmpNew); - DeleteObject(hBmpOld); - DeleteObject(hFont); +End: + if (hBmpNew) DeleteObject(hBmpNew); + if (hBmpOld) DeleteObject(hBmpOld); + if (hFont) DeleteObject(hFont); } } - DeleteDC(hdc); - DeleteObject(hBitmap); + if (hdc) DeleteDC(hdc); + if (hBitmap) DeleteObject(hBitmap); return hIcon; } @@ -384,6 +386,23 @@ GetNextLayout() return -1; } +static VOID +SettingsChanging(HWND hwnd) +{ + UINT cxSmIconCur = 0, cySmIconCur = 0; + + cxSmIconCur = GetSystemMetrics(SM_CXSMICON); + cySmIconCur = GetSystemMetrics(SM_CYSMICON); + + if ((cxSmIcon != cxSmIconCur) || (cySmIcon != cySmIconCur)) + { + cxSmIcon = cxSmIconCur; + cySmIcon = cySmIconCur; + } + + ActivateLayout(hwnd, ulCurrentLayoutNum); +} + LRESULT CALLBACK WndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) { @@ -394,6 +413,9 @@ WndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) { case WM_CREATE: { + cxSmIcon = GetSystemMetrics(SM_CXSMICON); + cySmIcon = GetSystemMetrics(SM_CYSMICON); + SetHooks(); AddTrayIcon(hwnd); hRightPopupMenu = GetSubMenu(LoadMenu(hInst, MAKEINTRESOURCE(IDR_POPUP)), 0); @@ -489,6 +511,8 @@ WndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) case WM_SETTINGCHANGE: { + SettingsChanging(hwnd); + if (wParam == SPI_SETDEFAULTINPUTLANG) { //FIXME: Should detect default language changes by CPL applet or by other tools and update UI diff --git a/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc b/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc index 0285fb0a1c0..d38fc405e00 100644 --- a/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc +++ b/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc @@ -3,7 +3,7 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: base/applications/mscutils/eventvwr/lang/ru-RU.rc * PURPOSE: Russian Language File for ReactOS Event Viewer - * TRANSLATORS: Dmitry Chapyshev + * TRANSLATORS: Dmitry Chapyshev, Artem Reznikov */ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT @@ -93,12 +93,12 @@ END STRINGTABLE BEGIN IDS_APP_TITLE "Просмотр событий" - IDC_EVENTSTRINGIDNOTFOUND "The description for Event ID ( %lu ) in Source ( %s ) cannot be found. The local computer may not have the necessary registry information or message DLL files to display messages from a remote computer." - IDC_EVENTLOG_ERROR_TYPE "Error" - IDC_EVENTLOG_WARNING_TYPE "Warning" - IDC_EVENTLOG_INFORMATION_TYPE "Information" - IDC_EVENTLOG_AUDIT_SUCCESS "Audit Success" - IDC_EVENTLOG_AUDIT_FAILURE "Audit Failure" - IDC_EVENTLOG_SUCCESS "Success" - IDC_EVENTLOG_UNKNOWN_TYPE "Unknown Event" + IDC_EVENTSTRINGIDNOTFOUND "Не найдено описание для события с кодом ( %lu ) в источнике ( %s ). Возможно, на локальном компьютере нет нужных данных в реестре или файлов DLL сообщений для отображения сообщений удаленного компьютера." + IDC_EVENTLOG_ERROR_TYPE "Ошибка" + IDC_EVENTLOG_WARNING_TYPE "Предупреждение" + IDC_EVENTLOG_INFORMATION_TYPE "Уведомление" + IDC_EVENTLOG_AUDIT_SUCCESS "Аудит успехов" + IDC_EVENTLOG_AUDIT_FAILURE "Аудит отказов" + IDC_EVENTLOG_SUCCESS "Успех" + IDC_EVENTLOG_UNKNOWN_TYPE "Неизвестное событие" END diff --git a/reactos/base/applications/mscutils/eventvwr/lang/uk-UA.rc b/reactos/base/applications/mscutils/eventvwr/lang/uk-UA.rc index eb073e0d3ef..61cf3073a39 100644 --- a/reactos/base/applications/mscutils/eventvwr/lang/uk-UA.rc +++ b/reactos/base/applications/mscutils/eventvwr/lang/uk-UA.rc @@ -3,7 +3,7 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: base/applications/mscutils/eventvwr/lang/uk-UA.rc * PURPOSE: Ukraianian Language File for ReactOS Event Viewer - * TRANSLATORS: Rostislav Zabolotny + * TRANSLATORS: Rostislav Zabolotny, Artem Reznikov */ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT @@ -94,11 +94,11 @@ STRINGTABLE BEGIN IDS_APP_TITLE "Оглядач подій" IDC_EVENTSTRINGIDNOTFOUND "Опис для Ідентифікатора події( %lu ) за джерелом( %s ) не знайдено. Локальний комп'ютер може не мати необхідної інформації в реєстрі чи DLL файлів повідомлень для відображення повідомлень, що надходять від віддаленого комп'ютера." - IDC_EVENTLOG_ERROR_TYPE "Error" - IDC_EVENTLOG_WARNING_TYPE "Warning" - IDC_EVENTLOG_INFORMATION_TYPE "Information" - IDC_EVENTLOG_AUDIT_SUCCESS "Audit Success" - IDC_EVENTLOG_AUDIT_FAILURE "Audit Failure" - IDC_EVENTLOG_SUCCESS "Success" - IDC_EVENTLOG_UNKNOWN_TYPE "Unknown Event" + IDC_EVENTLOG_ERROR_TYPE "Помилка" + IDC_EVENTLOG_WARNING_TYPE "Попередження" + IDC_EVENTLOG_INFORMATION_TYPE "Повідомлення" + IDC_EVENTLOG_AUDIT_SUCCESS "Аудит успіхів" + IDC_EVENTLOG_AUDIT_FAILURE "Аудит відмов" + IDC_EVENTLOG_SUCCESS "Успіх" + IDC_EVENTLOG_UNKNOWN_TYPE "Невідома подія" END diff --git a/reactos/base/applications/mscutils/servman/listview.c b/reactos/base/applications/mscutils/servman/listview.c index b5a0f2ab574..ba1d68937be 100644 --- a/reactos/base/applications/mscutils/servman/listview.c +++ b/reactos/base/applications/mscutils/servman/listview.c @@ -174,11 +174,14 @@ ChangeListViewText(PMAIN_WND_INFO Info, lpServiceConfig = GetServiceConfig(pService->lpServiceName); - switch (lpServiceConfig->dwStartType) + if (lpServiceConfig) { - case 2: StringId = IDS_SERVICES_AUTO; break; - case 3: StringId = IDS_SERVICES_MAN; break; - case 4: StringId = IDS_SERVICES_DIS; break; + switch (lpServiceConfig->dwStartType) + { + case 2: StringId = IDS_SERVICES_AUTO; break; + case 3: StringId = IDS_SERVICES_MAN; break; + case 4: StringId = IDS_SERVICES_DIS; break; + } } if (StringId) diff --git a/reactos/base/applications/mstsc/lang/uk-UA.rc b/reactos/base/applications/mstsc/lang/uk-UA.rc index 6f4a6d05c6c..43212a0dfa2 100644 --- a/reactos/base/applications/mstsc/lang/uk-UA.rc +++ b/reactos/base/applications/mstsc/lang/uk-UA.rc @@ -66,6 +66,6 @@ BEGIN IDS_PIXEL "%lu на %lu крапок" IDS_FULLSCREEN "На весь екран" IDS_BROWSESERVER "<Пошук інших...>" - IDS_HEADERTEXT1 "Remote Desktop" - IDS_HEADERTEXT2 "Connection" + IDS_HEADERTEXT1 "Віддалене керування робочим столом" + IDS_HEADERTEXT2 "Підключення" END diff --git a/reactos/base/applications/network/net/help.c b/reactos/base/applications/network/net/help.c index 2ff632971c2..ae32525213b 100644 --- a/reactos/base/applications/network/net/help.c +++ b/reactos/base/applications/network/net/help.c @@ -19,148 +19,148 @@ INT cmdHelp(INT argc, CHAR **argv) if (strcmp(argv[0],"ACCOUNTS")==0) { - printf("ACCOUNTS\n"); - printf("help text\n"); + puts("ACCOUNTS"); + puts("help text"); return 0; } if (strcmp(argv[0],"COMPUTER")==0) { - printf("COMPUTER\n"); - printf("help text\n"); + puts("COMPUTER"); + puts("help text"); return 0; } if (strcmp(argv[0],"CONFIG")==0) { - printf("CONFIG\n"); - printf("help text\n"); + puts("CONFIG"); + puts("help text"); return 0; } if (strcmp(argv[0],"CONTINUE")==0) { - printf("CONTINUE\n"); - printf("help text\n"); + puts("CONTINUE"); + puts("help text"); return 0; } if (strcmp(argv[0],"FILE")==0) { - printf("FILE\n"); - printf("help text\n"); + puts("FILE"); + puts("help text"); return 0; } if (strcmp(argv[0],"GROUP")==0) { - printf("GROUP\n"); - printf("help text\n"); + puts("GROUP"); + puts("help text"); return 0; } if (strcmp(argv[0],"HELP")==0) { - printf("HELP\n"); - printf("help text\n"); + puts("HELP"); + puts("help text"); return 0; } if (strcmp(argv[0],"HELPMSG")==0) { - printf("HELPMSG\n"); - printf("help text\n"); + puts("HELPMSG"); + puts("help text"); return 0; } if (strcmp(argv[0],"LOCALGROUP")==0) { - printf("LOCALGROUP\n"); - printf("help text\n"); + puts("LOCALGROUP"); + puts("help text"); return 0; } if (strcmp(argv[0],"NAME")==0) { - printf("NAME\n"); - printf("help text\n"); + puts("NAME"); + puts("help text"); return 0; } if (strcmp(argv[0],"PRINT")==0) { - printf("PRINT\n"); - printf("help text\n"); + puts("PRINT"); + puts("help text"); return 0; } if (strcmp(argv[0],"SEND")==0) { - printf("SEND\n"); - printf("help text\n"); + puts("SEND"); + puts("help text"); return 0; } if (strcmp(argv[0],"SESSION")==0) { - printf("SESSION\n"); - printf("help text\n"); + puts("SESSION"); + puts("help text"); return 0; } if (strcmp(argv[0],"SHARE")==0) { - printf("SHARE\n"); - printf("help text\n"); + puts("SHARE"); + puts("help text"); return 0; } if (strcmp(argv[0],"START")==0) { - printf("START\n"); - printf("help text\n"); + puts("START"); + puts("help text"); return 0; } if (strcmp(argv[0],"STATISTICS")==0) { - printf("STATISTICS\n"); - printf("help text\n"); + puts("STATISTICS"); + puts("help text"); return 0; } if (strcmp(argv[0],"STOP")==0) { - printf("STOP\n"); - printf("help text\n"); + puts("STOP"); + puts("help text"); return 0; } if (strcmp(argv[0],"TIME")==0) { - printf("TIME\n"); - printf("help text\n"); + puts("TIME"); + puts("help text"); return 0; } if (strcmp(argv[0],"USE")==0) { - printf("USE\n"); - printf("help text\n"); + puts("USE"); + puts("help text"); return 0; } if (strcmp(argv[0],"USER")==0) { - printf("USER\n"); - printf("help text\n"); + puts("USER"); + puts("help text"); return 0; } if (strcmp(argv[0],"VIEW")==0) { - printf("VIEW\n"); - printf("help text\n"); + puts("VIEW"); + puts("help text"); return 0; } @@ -170,30 +170,30 @@ INT cmdHelp(INT argc, CHAR **argv) void help() { - printf("NET ACCOUNTS\n"); - printf("NET COMPUTER\n"); - printf("NET CONFIG\n"); - printf("NET CONFIG SERVER\n"); - printf("NET CONFIG WORKSTATION\n"); - printf("NET CONTINUE\n"); - printf("NET FILE\n"); - printf("NET GROUP\n"); + puts("NET ACCOUNTS"); + puts("NET COMPUTER"); + puts("NET CONFIG"); + puts("NET CONFIG SERVER"); + puts("NET CONFIG WORKSTATION"); + puts("NET CONTINUE"); + puts("NET FILE"); + puts("NET GROUP"); - printf("NET HELP\n"); - printf("NET HELPMSG\n"); - printf("NET LOCALGROUP\n"); - printf("NET NAME\n"); - printf("NET PAUSE\n"); - printf("NET PRINT\n"); - printf("NET SEND\n"); - printf("NET SESSION\n"); + puts("NET HELP"); + puts("NET HELPMSG"); + puts("NET LOCALGROUP"); + puts("NET NAME"); + puts("NET PAUSE"); + puts("NET PRINT"); + puts("NET SEND"); + puts("NET SESSION"); - printf("NET SHARE\n"); - printf("NET START\n"); - printf("NET STATISTICS\n"); - printf("NET STOP\n"); - printf("NET TIME\n"); - printf("NET USE\n"); - printf("NET USER\n"); - printf("NET VIEW\n"); + puts("NET SHARE"); + puts("NET START"); + puts("NET STATISTICS"); + puts("NET STOP"); + puts("NET TIME"); + puts("NET USE"); + puts("NET USER"); + puts("NET VIEW"); } diff --git a/reactos/base/applications/network/net/main.c b/reactos/base/applications/network/net/main.c index 51c2db647f7..425b0db393d 100644 --- a/reactos/base/applications/network/net/main.c +++ b/reactos/base/applications/network/net/main.c @@ -114,7 +114,7 @@ int main(int argc, char **argv) int unimplement() { - printf("This command is not implement yet\n"); + puts("This command is not implement yet"); return 1; } diff --git a/reactos/base/applications/network/ping/ping.c b/reactos/base/applications/network/ping/ping.c index 69fb94277f2..549c7d7036e 100644 --- a/reactos/base/applications/network/ping/ping.c +++ b/reactos/base/applications/network/ping/ping.c @@ -14,19 +14,6 @@ #define NDEBUG -#ifndef _MSC_VER - -/* Should be in the header files somewhere (exported by ntdll.dll) */ -long atol(const char *str); - -#ifndef __int64 -typedef long long __int64; -#endif - -char * _i64toa(__int64 value, char *string, int radix); - -#endif /* _MSC_VER */ - /* General ICMP constants */ #define ICMP_MINSIZE 8 /* Minimum ICMP packet size */ #define ICMP_MAXSIZE 65535 /* Maximum ICMP packet size */ diff --git a/reactos/base/applications/notepad/dialog.c b/reactos/base/applications/notepad/dialog.c index 38a8131c443..52951599663 100644 --- a/reactos/base/applications/notepad/dialog.c +++ b/reactos/base/applications/notepad/dialog.c @@ -871,19 +871,15 @@ VOID DIALOG_GoTo(VOID) VOID DIALOG_StatusBarUpdateCaretPos(VOID) { - int line; - int col; - int ccol; - POINT point; + int line, col; TCHAR buff[MAX_PATH]; + DWORD dwStart, dwSize; - GetCaretPos(&point); - line = (int) SendMessage(Globals.hEdit, EM_LINEFROMCHAR, (WPARAM)-1, (LPARAM)0); - ccol = (int) SendMessage(Globals.hEdit, EM_CHARFROMPOS, (WPARAM)0, (LPARAM)MAKELPARAM(point.x, point.y)); - ccol = LOWORD(ccol); - col = ccol - (int) SendMessage(Globals.hEdit, EM_LINEINDEX, (WPARAM)line, (LPARAM)0); + SendMessage(Globals.hEdit, EM_GETSEL, (WPARAM)&dwStart, (LPARAM)&dwSize); + line = SendMessage(Globals.hEdit, EM_LINEFROMCHAR, (WPARAM)dwStart, 0); + col = dwStart - SendMessage(Globals.hEdit, EM_LINEINDEX, (WPARAM)line, 0); - _stprintf(buff, TEXT("%S %d, %S %d"), Globals.szStatusBarLine, line+1, Globals.szStatusBarCol, col+1); + _stprintf(buff, Globals.szStatusBarLineCol, line+1, col+1); SendMessage(Globals.hStatusBar, SB_SETTEXT, (WPARAM) SB_SIMPLEID, (LPARAM)buff); } @@ -896,8 +892,7 @@ VOID DIALOG_ViewStatusBar(VOID) if ( !Globals.hStatusBar ) { Globals.hStatusBar = CreateStatusWindow(WS_CHILD | WS_VISIBLE | WS_EX_STATICEDGE, TEXT("test"), Globals.hMainWnd, CMD_STATUSBAR_WND_ID ); - LoadString(Globals.hInstance, STRING_LINE, Globals.szStatusBarLine, MAX_PATH-1); - LoadString(Globals.hInstance, STRING_COLUMN, Globals.szStatusBarCol, MAX_PATH-1); + LoadString(Globals.hInstance, STRING_LINE_COLUMN, Globals.szStatusBarLineCol, MAX_PATH-1); SendMessage(Globals.hStatusBar, SB_SIMPLE, (WPARAM)TRUE, (LPARAM)0); } CheckMenuItem(GetMenu(Globals.hMainWnd), CMD_STATUSBAR, diff --git a/reactos/base/applications/notepad/lang/bg-BG.rc b/reactos/base/applications/notepad/lang/bg-BG.rc index cd46b0999f1..20aa32c5103 100644 --- a/reactos/base/applications/notepad/lang/bg-BG.rc +++ b/reactos/base/applications/notepad/lang/bg-BG.rc @@ -201,4 +201,5 @@ STRING_UTF8, "UTF-8" STRING_CRLF, "Уьиндоуьс" STRING_LF, "Юникс" STRING_CR, "Мак" +STRING_LINE_COLUMN, "Line %d, column %d" END diff --git a/reactos/base/applications/notepad/lang/cs-CZ.rc b/reactos/base/applications/notepad/lang/cs-CZ.rc index e60e3e8b06b..065f051157b 100644 --- a/reactos/base/applications/notepad/lang/cs-CZ.rc +++ b/reactos/base/applications/notepad/lang/cs-CZ.rc @@ -203,4 +203,5 @@ STRING_UTF8, "UTF-8" STRING_CRLF, "Windows" STRING_LF, "Unix" STRING_CR, "Mac" +STRING_LINE_COLUMN, "Line %d, column %d" END diff --git a/reactos/base/applications/notepad/lang/da-DK.rc b/reactos/base/applications/notepad/lang/da-DK.rc index 606c75027cf..44ecfbc917a 100644 --- a/reactos/base/applications/notepad/lang/da-DK.rc +++ b/reactos/base/applications/notepad/lang/da-DK.rc @@ -200,4 +200,5 @@ STRING_UTF8, "UTF-8" STRING_CRLF, "Windows" STRING_LF, "Unix" STRING_CR, "Mac" +STRING_LINE_COLUMN, "Line %d, column %d" END diff --git a/reactos/base/applications/notepad/lang/de-DE.rc b/reactos/base/applications/notepad/lang/de-DE.rc index cd5a9e3d19d..e64bd1c85ab 100644 --- a/reactos/base/applications/notepad/lang/de-DE.rc +++ b/reactos/base/applications/notepad/lang/de-DE.rc @@ -202,4 +202,5 @@ STRING_UTF8, "UTF-8" STRING_CRLF, "Windows" STRING_LF, "Unix" STRING_CR, "Mac" +STRING_LINE_COLUMN, "Zeile %d, Spalte %d" END diff --git a/reactos/base/applications/notepad/lang/el-GR.rc b/reactos/base/applications/notepad/lang/el-GR.rc index 699a4d1112d..8be10f85472 100644 --- a/reactos/base/applications/notepad/lang/el-GR.rc +++ b/reactos/base/applications/notepad/lang/el-GR.rc @@ -199,4 +199,5 @@ STRING_UTF8, "UTF-8" STRING_CRLF, "Windows" STRING_LF, "Unix" STRING_CR, "Mac" +STRING_LINE_COLUMN, "Line %d, column %d" END diff --git a/reactos/base/applications/notepad/lang/en-US.rc b/reactos/base/applications/notepad/lang/en-US.rc index d5585433031..c4c56075497 100644 --- a/reactos/base/applications/notepad/lang/en-US.rc +++ b/reactos/base/applications/notepad/lang/en-US.rc @@ -201,4 +201,5 @@ STRING_UTF8, "UTF-8" STRING_CRLF, "Windows" STRING_LF, "Unix" STRING_CR, "Mac" +STRING_LINE_COLUMN, "Line %d, column %d" END diff --git a/reactos/base/applications/notepad/lang/es-ES.rc b/reactos/base/applications/notepad/lang/es-ES.rc index 5ce33aafd70..16e8f8bd406 100644 --- a/reactos/base/applications/notepad/lang/es-ES.rc +++ b/reactos/base/applications/notepad/lang/es-ES.rc @@ -195,7 +195,7 @@ STRING_NOTFOUND, "No se encontr STRING_OUT_OF_MEMORY, "No hay suficiente memoria para terminar esta \ tarea. \nCierre una o mбs aplicaciones para \ aumentar la cantidad \nde memoria libre." -STRING_CANNOTFIND "No pudo encontrar '%s'" +STRING_CANNOTFIND "No se encontrу '%s'" STRING_ANSI, "ANSI" STRING_UNICODE, "Unicode" STRING_UNICODE_BE, "Unicode (big endian)" @@ -203,5 +203,6 @@ STRING_UTF8, "UTF-8" STRING_CRLF, "Windows" STRING_LF, "Unix" STRING_CR, "Mac" +STRING_LINE_COLUMN, "Lнnea %d, columna %d" END diff --git a/reactos/base/applications/notepad/lang/eu-ES.rc b/reactos/base/applications/notepad/lang/eu-ES.rc index ac22afefc70..819c1db0d30 100644 --- a/reactos/base/applications/notepad/lang/eu-ES.rc +++ b/reactos/base/applications/notepad/lang/eu-ES.rc @@ -179,5 +179,5 @@ STRING_UTF8, "UTF-8" STRING_CRLF, "Windows" STRING_LF, "Unix" STRING_CR, "Mac" - +STRING_LINE_COLUMN, "Line %d, column %d" END diff --git a/reactos/base/applications/notepad/lang/fi-FI.rc b/reactos/base/applications/notepad/lang/fi-FI.rc index 2e9dba23283..13378c43e40 100644 --- a/reactos/base/applications/notepad/lang/fi-FI.rc +++ b/reactos/base/applications/notepad/lang/fi-FI.rc @@ -200,4 +200,5 @@ STRING_UTF8, "UTF-8" STRING_CRLF, "Windows" STRING_LF, "Unix" STRING_CR, "Mac" +STRING_LINE_COLUMN, "Line %d, column %d" END diff --git a/reactos/base/applications/notepad/lang/fr-FR.rc b/reactos/base/applications/notepad/lang/fr-FR.rc index 238190f83a0..0e8eaaac47a 100644 --- a/reactos/base/applications/notepad/lang/fr-FR.rc +++ b/reactos/base/applications/notepad/lang/fr-FR.rc @@ -201,4 +201,5 @@ STRING_UTF8, "UTF-8" STRING_CRLF, "Windows" STRING_LF, "Unix" STRING_CR, "Mac" +STRING_LINE_COLUMN, "Ligne %d, colonne %d" END diff --git a/reactos/base/applications/notepad/lang/hu-HU.rc b/reactos/base/applications/notepad/lang/hu-HU.rc index 0e32ed520ce..86ba21d0648 100644 --- a/reactos/base/applications/notepad/lang/hu-HU.rc +++ b/reactos/base/applications/notepad/lang/hu-HU.rc @@ -202,4 +202,5 @@ STRING_UTF8, "UTF-8" STRING_CRLF, "Windows" STRING_LF, "Unix" STRING_CR, "Mac" +STRING_LINE_COLUMN, "Line %d, column %d" END diff --git a/reactos/base/applications/notepad/lang/id-ID.rc b/reactos/base/applications/notepad/lang/id-ID.rc index ed089684878..59b5ef7f6a8 100644 --- a/reactos/base/applications/notepad/lang/id-ID.rc +++ b/reactos/base/applications/notepad/lang/id-ID.rc @@ -202,4 +202,5 @@ STRING_UTF8, "UTF-8" STRING_CRLF, "Windows" STRING_LF, "Unix" STRING_CR, "Mac" +STRING_LINE_COLUMN, "Line %d, column %d" END diff --git a/reactos/base/applications/notepad/lang/it-IT.rc b/reactos/base/applications/notepad/lang/it-IT.rc index 2da2f358a38..542f27de158 100644 --- a/reactos/base/applications/notepad/lang/it-IT.rc +++ b/reactos/base/applications/notepad/lang/it-IT.rc @@ -204,4 +204,5 @@ STRING_UTF8, "UTF-8" STRING_CRLF, "Windows" STRING_LF, "Unix" STRING_CR, "Mac" +STRING_LINE_COLUMN, "Linea %d, colonna %d" END diff --git a/reactos/base/applications/notepad/lang/ja-JP.rc b/reactos/base/applications/notepad/lang/ja-JP.rc index 49cc5fde18d..03536de14b4 100644 --- a/reactos/base/applications/notepad/lang/ja-JP.rc +++ b/reactos/base/applications/notepad/lang/ja-JP.rc @@ -201,4 +201,5 @@ STRING_UTF8, "UTF-8" STRING_CRLF, "Windows (CR+LF)" STRING_LF, "Unix (LF)" STRING_CR, "Mac (CR)" +STRING_LINE_COLUMN, "Line %d, column %d" END diff --git a/reactos/base/applications/notepad/lang/lt-LT.rc b/reactos/base/applications/notepad/lang/lt-LT.rc index 4779b0e56c0..07d0b8d9995 100644 --- a/reactos/base/applications/notepad/lang/lt-LT.rc +++ b/reactos/base/applications/notepad/lang/lt-LT.rc @@ -202,4 +202,5 @@ STRING_UTF8, "UTF-8" STRING_CRLF, "Windows" STRING_LF, "Unix" STRING_CR, "Mac" +STRING_LINE_COLUMN, "Line %d, column %d" END diff --git a/reactos/base/applications/notepad/lang/nl-NL.rc b/reactos/base/applications/notepad/lang/nl-NL.rc index d7cdf9cb164..da4c8ad8108 100644 --- a/reactos/base/applications/notepad/lang/nl-NL.rc +++ b/reactos/base/applications/notepad/lang/nl-NL.rc @@ -198,4 +198,5 @@ STRING_UTF8, "UTF-8" STRING_CRLF, "Windows" STRING_LF, "Unix" STRING_CR, "Mac" +STRING_LINE_COLUMN, "Line %d, column %d" END diff --git a/reactos/base/applications/notepad/lang/no-NO.rc b/reactos/base/applications/notepad/lang/no-NO.rc index 79aaab8cad5..53046579e80 100644 --- a/reactos/base/applications/notepad/lang/no-NO.rc +++ b/reactos/base/applications/notepad/lang/no-NO.rc @@ -201,4 +201,5 @@ STRING_UTF8, "UTF-8" STRING_CRLF, "Windows" STRING_LF, "Unix" STRING_CR, "Mac" +STRING_LINE_COLUMN, "Line %d, column %d" END diff --git a/reactos/base/applications/notepad/lang/pl-PL.rc b/reactos/base/applications/notepad/lang/pl-PL.rc index e267b043c37..a8355ffaed0 100644 --- a/reactos/base/applications/notepad/lang/pl-PL.rc +++ b/reactos/base/applications/notepad/lang/pl-PL.rc @@ -207,4 +207,5 @@ STRING_UTF8, "UTF-8" STRING_CRLF, "Windows" STRING_LF, "Unix" STRING_CR, "Mac" +STRING_LINE_COLUMN, "Line %d, column %d" END diff --git a/reactos/base/applications/notepad/lang/pt-PT.rc b/reactos/base/applications/notepad/lang/pt-PT.rc index 046e481f883..4a5cae4edeb 100644 --- a/reactos/base/applications/notepad/lang/pt-PT.rc +++ b/reactos/base/applications/notepad/lang/pt-PT.rc @@ -200,4 +200,5 @@ STRING_UTF8, "UTF-8" STRING_CRLF, "Windows" STRING_LF, "Unix" STRING_CR, "Mac" +STRING_LINE_COLUMN, "Line %d, column %d" END diff --git a/reactos/base/applications/notepad/lang/ru-RU.rc b/reactos/base/applications/notepad/lang/ru-RU.rc index a4d4d761f6a..186d37a69f7 100644 --- a/reactos/base/applications/notepad/lang/ru-RU.rc +++ b/reactos/base/applications/notepad/lang/ru-RU.rc @@ -200,4 +200,5 @@ STRING_UTF8, "UTF-8" STRING_CRLF, "Windows" STRING_LF, "Unix" STRING_CR, "Макинтош" +STRING_LINE_COLUMN, "Строка %d, столбец %d" END diff --git a/reactos/base/applications/notepad/lang/sk-SK.rc b/reactos/base/applications/notepad/lang/sk-SK.rc index cdedb92238c..fbf236f2747 100644 --- a/reactos/base/applications/notepad/lang/sk-SK.rc +++ b/reactos/base/applications/notepad/lang/sk-SK.rc @@ -189,4 +189,5 @@ STRING_UTF8, "UTF-8" STRING_CRLF, "Windows" STRING_LF, "Unix" STRING_CR, "Mac" +STRING_LINE_COLUMN, "Line %d, column %d" END diff --git a/reactos/base/applications/notepad/lang/sl-SI.rc b/reactos/base/applications/notepad/lang/sl-SI.rc index 98679e9d614..8c3c3a8cc4f 100644 --- a/reactos/base/applications/notepad/lang/sl-SI.rc +++ b/reactos/base/applications/notepad/lang/sl-SI.rc @@ -198,4 +198,5 @@ STRING_UTF8, "UTF-8" STRING_CRLF, "Windows" STRING_LF, "Unix" STRING_CR, "Mac" +STRING_LINE_COLUMN, "Line %d, column %d" END diff --git a/reactos/base/applications/notepad/lang/sv-SE.rc b/reactos/base/applications/notepad/lang/sv-SE.rc index 127dd6380cd..4b54bbc75ae 100644 --- a/reactos/base/applications/notepad/lang/sv-SE.rc +++ b/reactos/base/applications/notepad/lang/sv-SE.rc @@ -201,4 +201,5 @@ STRING_UTF8, "UTF-8" STRING_CRLF, "Windows" STRING_LF, "Unix" STRING_CR, "Mac" +STRING_LINE_COLUMN, "Line %d, column %d" END diff --git a/reactos/base/applications/notepad/lang/th-TH.rc b/reactos/base/applications/notepad/lang/th-TH.rc index 131075dcca4..bdb359e2ee8 100644 --- a/reactos/base/applications/notepad/lang/th-TH.rc +++ b/reactos/base/applications/notepad/lang/th-TH.rc @@ -193,4 +193,5 @@ STRING_UTF8, "UTF-8" STRING_CRLF, "Windows" STRING_LF, "Unix" STRING_CR, "Mac" +STRING_LINE_COLUMN, "Line %d, column %d" END diff --git a/reactos/base/applications/notepad/lang/uk-UA.rc b/reactos/base/applications/notepad/lang/uk-UA.rc index c24d8cc5bab..11cc7183771 100644 --- a/reactos/base/applications/notepad/lang/uk-UA.rc +++ b/reactos/base/applications/notepad/lang/uk-UA.rc @@ -198,4 +198,5 @@ STRING_UTF8, "UTF-8" STRING_CRLF, "Windows" STRING_LF, "Unix" STRING_CR, "Mac" +STRING_LINE_COLUMN, "Line %d, column %d" END diff --git a/reactos/base/applications/notepad/lang/zh-CN.rc b/reactos/base/applications/notepad/lang/zh-CN.rc index bb2fcf247ca..fe179b729a7 100644 --- a/reactos/base/applications/notepad/lang/zh-CN.rc +++ b/reactos/base/applications/notepad/lang/zh-CN.rc @@ -199,4 +199,5 @@ STRING_UTF8, "UTF-8" STRING_CRLF, "Windows" STRING_LF, "Unix" STRING_CR, "Mac" +STRING_LINE_COLUMN, "Line %d, column %d" END diff --git a/reactos/base/applications/notepad/main.c b/reactos/base/applications/notepad/main.c index 8b8b901641d..aa74631eb10 100644 --- a/reactos/base/applications/notepad/main.c +++ b/reactos/base/applications/notepad/main.c @@ -302,6 +302,7 @@ LRESULT CALLBACK EDIT_WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { switch (msg) { + case WM_KEYDOWN: case WM_KEYUP: { switch (wParam) diff --git a/reactos/base/applications/notepad/main.h b/reactos/base/applications/notepad/main.h index 37477bc6afe..180020fdb43 100644 --- a/reactos/base/applications/notepad/main.h +++ b/reactos/base/applications/notepad/main.h @@ -61,8 +61,7 @@ typedef struct TCHAR szMarginRight[MAX_PATH]; TCHAR szHeader[MAX_PATH]; TCHAR szFooter[MAX_PATH]; - TCHAR szStatusBarLine[MAX_PATH]; - TCHAR szStatusBarCol[MAX_PATH]; + TCHAR szStatusBarLineCol[MAX_PATH]; int iEncoding; int iEoln; diff --git a/reactos/base/applications/notepad/notepad_res.h b/reactos/base/applications/notepad/notepad_res.h index 9d6d5cbd1cf..75fe6a67dba 100644 --- a/reactos/base/applications/notepad/notepad_res.h +++ b/reactos/base/applications/notepad/notepad_res.h @@ -101,5 +101,4 @@ #define STRING_CR 0x184 #define STRING_LICENSE 0x185 -#define STRING_LINE 0x186 -#define STRING_COLUMN 0x187 +#define STRING_LINE_COLUMN 0x186 diff --git a/reactos/base/applications/notepad/settings.c b/reactos/base/applications/notepad/settings.c index 12e415939f3..d363c6e1da9 100644 --- a/reactos/base/applications/notepad/settings.c +++ b/reactos/base/applications/notepad/settings.c @@ -112,7 +112,7 @@ void LoadSettings(void) base_length = (GetSystemMetrics(SM_CXSCREEN) > GetSystemMetrics(SM_CYSCREEN))? GetSystemMetrics(SM_CYSCREEN) : GetSystemMetrics(SM_CXSCREEN); - dx = base_length * .95; + dx = (INT)(base_length * .95); dy = dx * 3 / 4; SetRect( &Globals.main_rect, 0, 0, dx, dy ); diff --git a/reactos/base/applications/taskmgr/taskmgr.rbuild b/reactos/base/applications/taskmgr/taskmgr.rbuild index 50518990a8e..a3bb904ea15 100644 --- a/reactos/base/applications/taskmgr/taskmgr.rbuild +++ b/reactos/base/applications/taskmgr/taskmgr.rbuild @@ -2,8 +2,7 @@ . - msvcrt - ntdll + ntsys kernel32 advapi32 user32 diff --git a/reactos/base/applications/winhlp32/lang/uk-UA.rc b/reactos/base/applications/winhlp32/lang/uk-UA.rc index 20f29088d58..a895a2fa14b 100644 --- a/reactos/base/applications/winhlp32/lang/uk-UA.rc +++ b/reactos/base/applications/winhlp32/lang/uk-UA.rc @@ -1,63 +1,112 @@ /* * PROJECT: ReactOS Help Viewer * LICENSE: GPL - See COPYING in the top level directory - * FILE: applications/winhelp/lang/uk-UA.rc + * FILE: applications/winhlp32/lang/uk-UA.rc * PURPOSE: Ukraianian Language File for ReactOS Help Viewer - * PROGRAMMERS: Rostislav Zabolotny + * PROGRAMMERS: Rostislav Zabolotny, Artem Reznikov */ -LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT - /* Menu */ -MAIN_MENU MENU -BEGIN - POPUP "&Файл" - BEGIN +MAIN_MENU MENU LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT +{ + POPUP "&Файл" { MENUITEM "&Відкрити", MNID_FILE_OPEN MENUITEM SEPARATOR MENUITEM "&Друк", MNID_FILE_PRINT - MENUITEM "Налаштування &прінтера...", MNID_FILE_SETUP + MENUITEM "Пара&метри друку...", MNID_FILE_SETUP MENUITEM SEPARATOR MENUITEM "В&ихід", MNID_FILE_EXIT - END - POPUP "&Правка" - BEGIN + } + POPUP "&Правка" { MENUITEM "&Копіювати...", MNID_EDIT_COPYDLG MENUITEM SEPARATOR MENUITEM "&Опис...", MNID_EDIT_ANNOTATE - END - POPUP "&Закладка" - BEGIN + } + POPUP "&Закладка" { MENUITEM "&Визначити...", MNID_BKMK_DEFINE - END - POPUP "&Допомога" - BEGIN - MENUITEM "Допомога &по допомозі", MNID_HELP_HELPON - MENUITEM "&Над усіма вікнами", MNID_HELP_HELPTOP + } + POPUP "П&араметри" { + POPUP "Довідку завжди видно" + BEGIN + MENUITEM "За промовчанням", MNID_OPTS_HELP_DEFAULT + MENUITEM "Видно", MNID_OPTS_HELP_VISIBLE + MENUITEM "Не видно", MNID_OPTS_HELP_NONVISIBLE + END + MENUITEM "Історія", MNID_OPTS_HISTORY + POPUP "Шрифт" + BEGIN + MENUITEM "Дрібний", MNID_OPTS_FONTS_SMALL + MENUITEM "Звичайний", MNID_OPTS_FONTS_NORMAL + MENUITEM "Великий", MNID_OPTS_FONTS_LARGE + END + MENUITEM "Використовувати системні кольори", MNID_OPTS_SYSTEM_COLORS + } + POPUP "&Довідка" { + MENUITEM "Довідка &по довідку", MNID_HELP_HELPON + MENUITEM "Над усіма вікнами", MNID_HELP_HELPTOP MENUITEM SEPARATOR MENUITEM "&Інформація...", MNID_HELP_ABOUT #ifdef WINELIB MENUITEM "&Про WINE", MNID_HELP_WINE #endif - END -END + } +} + +IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Предметний покажчик" +{ + LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER +} + +IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Search" +{ + LTEXT "Ще не реалізовано", -1, 10, 10, 180, 150 +} /* Strings */ - -STRINGTABLE DISCARDABLE -BEGIN -STID_WINE_HELP, "Допомога WINE" +STRINGTABLE DISCARDABLE LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT +{ +STID_WINE_HELP, "Довідка WINE" STID_WHERROR, "ПОМИЛКА" STID_WARNING, "ПОПЕРЕДЖЕННЯ" -STID_INFO, "Інформація" +STID_INFO, "Повідомлення" STID_NOT_IMPLEMENTED, "Не реалізовано" -STID_HLPFILE_ERROR_s, "Помилка під час читання файлу допомоги `%s'" -STID_CONTENTS, "&Зміст" -STID_SEARCH, "&Пошук" +STID_HLPFILE_ERROR_s, "Помилка під час читання файлу довідки `%s'" +STID_INDEX, "&Предметний покажчик" +STID_CONTENTS, "Зміст" STID_BACK, "&Назад" -STID_TOPICS, "&Розділи" -STID_ALL_FILES, "Всі файли (*.*)" -STID_HELP_FILES_HLP, "Файли допомоги (*.hlp)" +STID_ALL_FILES, "Усі файли (*.*)" +STID_HELP_FILES_HLP, "Файли довідки (*.hlp)" STID_FILE_NOT_FOUND_s "Не можу знайти '%s'. Чи не бажаєте вказати розташування самостійно?" +STID_NO_RICHEDIT "Не можу знайти richedit... Перериваю роботу" +STID_PSH_INDEX, "Теми довідки: " +} + +CONTEXT_MENU MENU LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT +BEGIN + POPUP "" + BEGIN + MENUITEM "Нотатки...", MNID_CTXT_ANNOTATE + MENUITEM "Копіювати", MNID_CTXT_COPY + MENUITEM "Друк...", MNID_CTXT_PRINT + POPUP "Шрифт" + BEGIN + MENUITEM "Дрібний", MNID_CTXT_FONTS_SMALL + MENUITEM "Звичайний", MNID_CTXT_FONTS_NORMAL + MENUITEM "Великий", MNID_CTXT_FONTS_LARGE + END + POPUP "Довідку завжди видно" + BEGIN + MENUITEM "За промовчанням", MNID_CTXT_HELP_DEFAULT + MENUITEM "Видно", MNID_CTXT_HELP_VISIBLE + MENUITEM "Не видно", MNID_CTXT_HELP_NONVISIBLE + END + MENUITEM "Використовувати системні кольори", MNID_CTXT_SYSTEM_COLORS + END END diff --git a/reactos/base/applications/winhlp32/rsrc.rc b/reactos/base/applications/winhlp32/rsrc.rc index f5bf5e20949..d6f0b692b0c 100644 --- a/reactos/base/applications/winhlp32/rsrc.rc +++ b/reactos/base/applications/winhlp32/rsrc.rc @@ -52,5 +52,5 @@ IDI_WINHELP ICON DISCARDABLE winhelp.ico #include "lang/sk-SK.rc" #include "lang/sv-SE.rc" #include "lang/tr-TR.rc" -// #include "lang/uk-UA.rc" +#include "lang/uk-UA.rc" #include "lang/zh-CN.rc" diff --git a/reactos/base/applications/wordpad/wordpad.rbuild b/reactos/base/applications/wordpad/wordpad.rbuild index c158254bca5..120f2355878 100644 --- a/reactos/base/applications/wordpad/wordpad.rbuild +++ b/reactos/base/applications/wordpad/wordpad.rbuild @@ -6,7 +6,6 @@ shell32 user32 gdi32 - msvcrt advapi32 kernel32 comctl32 diff --git a/reactos/base/services/dhcp/util.c b/reactos/base/services/dhcp/util.c index 3075fb8d0e5..2dd76235b79 100644 --- a/reactos/base/services/dhcp/util.c +++ b/reactos/base/services/dhcp/util.c @@ -97,7 +97,7 @@ int addr_eq( struct iaddr a, struct iaddr b ) { void *dmalloc( int size, char *name ) { return malloc( size ); } int read_client_conf(void) { - /* What a strage dance */ + /* What a strange dance */ struct client_config *config; char ComputerName [MAX_COMPUTERNAME_LENGTH + 1]; LPSTR lpCompName; @@ -113,14 +113,16 @@ int read_client_conf(void) { GetComputerName(ComputerName, & ComputerNameSize); + debug("Hostname: %s, length: %lu", + ComputerName, ComputerNameSize); /* This never gets freed since it's only called once */ lpCompName = - HeapAlloc(GetProcessHeap(), 0, strlen(ComputerName) + 1); + HeapAlloc(GetProcessHeap(), 0, ComputerNameSize + 1); if (lpCompName !=NULL) { - GetComputerName(lpCompName, & ComputerNameSize); + memcpy(lpCompName, ComputerName, ComputerNameSize + 1); /* Send our hostname, some dhcpds use this to update DNS */ config->send_options[DHO_HOST_NAME].data = (u_int8_t*)strlwr(lpCompName); - config->send_options[DHO_HOST_NAME].len = strlen(ComputerName); + config->send_options[DHO_HOST_NAME].len = ComputerNameSize; debug("Hostname: %s, length: %d", config->send_options[DHO_HOST_NAME].data, config->send_options[DHO_HOST_NAME].len); diff --git a/reactos/base/services/eventlog/rpc.c b/reactos/base/services/eventlog/rpc.c index 5a0e7b14c9a..83e06792722 100644 --- a/reactos/base/services/eventlog/rpc.c +++ b/reactos/base/services/eventlog/rpc.c @@ -44,7 +44,6 @@ DWORD STDCALL RpcThreadRoutine(LPVOID lpParameter) /* Function 0 */ NTSTATUS ElfrClearELFW( - handle_t BindingHandle, IELF_HANDLE LogHandle, PRPC_UNICODE_STRING BackupFileName) { @@ -55,7 +54,6 @@ NTSTATUS ElfrClearELFW( /* Function 1 */ NTSTATUS ElfrBackupELFW( - handle_t BindingHandle, IELF_HANDLE LogHandle, PRPC_UNICODE_STRING BackupFileName) { @@ -66,7 +64,6 @@ NTSTATUS ElfrBackupELFW( /* Function 2 */ NTSTATUS ElfrCloseEL( - handle_t BindingHandle, IELF_HANDLE *LogHandle) { UNIMPLEMENTED; @@ -76,7 +73,6 @@ NTSTATUS ElfrCloseEL( /* Function 3 */ NTSTATUS ElfrDeregisterEventSource( - handle_t BindingHandle, IELF_HANDLE *LogHandle) { UNIMPLEMENTED; @@ -86,7 +82,6 @@ NTSTATUS ElfrDeregisterEventSource( /* Function 4 */ NTSTATUS ElfrNumberOfRecords( - handle_t BindingHandle, IELF_HANDLE LogHandle, DWORD *NumberOfRecords) { @@ -97,7 +92,6 @@ NTSTATUS ElfrNumberOfRecords( /* Function 5 */ NTSTATUS ElfrOldestRecord( - handle_t BindingHandle, IELF_HANDLE LogHandle, DWORD *OldestRecordNumber) { @@ -108,7 +102,6 @@ NTSTATUS ElfrOldestRecord( /* Function 6 */ NTSTATUS ElfrChangeNotify( - handle_t BindingHandle, IELF_HANDLE *LogHandle, RPC_CLIENT_ID ClientId, DWORD Event) @@ -120,7 +113,6 @@ NTSTATUS ElfrChangeNotify( /* Function 7 */ NTSTATUS ElfrOpenELW( - handle_t BindingHandle, EVENTLOG_HANDLE_W UNCServerName, PRPC_UNICODE_STRING ModuleName, PRPC_UNICODE_STRING RegModuleName, @@ -136,7 +128,6 @@ NTSTATUS ElfrOpenELW( /* Function 8 */ NTSTATUS ElfrRegisterEventSourceW( - handle_t BindingHandle, EVENTLOG_HANDLE_W UNCServerName, PRPC_UNICODE_STRING ModuleName, PRPC_UNICODE_STRING RegModuleName, @@ -152,7 +143,6 @@ NTSTATUS ElfrRegisterEventSourceW( /* Function 9 */ NTSTATUS ElfrOpenBELW( - handle_t BindingHandle, EVENTLOG_HANDLE_W UNCServerName, PRPC_UNICODE_STRING BackupFileName, DWORD MajorVersion, @@ -166,7 +156,6 @@ NTSTATUS ElfrOpenBELW( /* Function 10 */ NTSTATUS ElfrReadELW( - handle_t BindingHandle, IELF_HANDLE LogHandle, DWORD ReadFlags, DWORD RecordOffset, @@ -182,7 +171,6 @@ NTSTATUS ElfrReadELW( /* Function 11 */ NTSTATUS ElfrReportEventW( - handle_t BindingHandle, IELF_HANDLE LogHandle, DWORD Time, USHORT EventType, @@ -233,7 +221,6 @@ NTSTATUS ElfrReportEventW( /* Function 12 */ NTSTATUS ElfrClearELFA( - handle_t BindingHandle, IELF_HANDLE LogHandle, PRPC_STRING BackupFileName) { @@ -244,7 +231,6 @@ NTSTATUS ElfrClearELFA( /* Function 13 */ NTSTATUS ElfrBackupELFA( - handle_t BindingHandle, IELF_HANDLE LogHandle, PRPC_STRING BackupFileName) { @@ -255,7 +241,6 @@ NTSTATUS ElfrBackupELFA( /* Function 14 */ NTSTATUS ElfrOpenELA( - handle_t BindingHandle, EVENTLOG_HANDLE_A UNCServerName, PRPC_STRING ModuleName, PRPC_STRING RegModuleName, @@ -290,7 +275,6 @@ NTSTATUS ElfrOpenELA( } Status = ElfrOpenELW( - BindingHandle, UNCServerName ? UNCServerNameW.Buffer : NULL, ModuleName ? (PRPC_UNICODE_STRING)&ModuleNameW : NULL, RegModuleName ? (PRPC_UNICODE_STRING)&RegModuleNameW : NULL, @@ -308,7 +292,6 @@ NTSTATUS ElfrOpenELA( /* Function 15 */ NTSTATUS ElfrRegisterEventSourceA( - handle_t BindingHandle, EVENTLOG_HANDLE_A UNCServerName, PRPC_STRING ModuleName, PRPC_STRING RegModuleName, @@ -323,7 +306,6 @@ NTSTATUS ElfrRegisterEventSourceA( /* Function 16 */ NTSTATUS ElfrOpenBELA( - handle_t BindingHandle, EVENTLOG_HANDLE_A UNCServerName, PRPC_STRING BackupFileName, DWORD MajorVersion, @@ -337,7 +319,6 @@ NTSTATUS ElfrOpenBELA( /* Function 17 */ NTSTATUS ElfrReadELA( - handle_t BindingHandle, IELF_HANDLE LogHandle, DWORD ReadFlags, DWORD RecordOffset, @@ -353,7 +334,6 @@ NTSTATUS ElfrReadELA( /* Function 18 */ NTSTATUS ElfrReportEventA( - handle_t BindingHandle, IELF_HANDLE LogHandle, DWORD Time, USHORT EventType, @@ -403,7 +383,6 @@ NTSTATUS ElfrWriteClusterEvents( /* Function 22 */ NTSTATUS ElfrGetLogInformation( - handle_t BindingHandle, IELF_HANDLE LogHandle, DWORD InfoLevel, BYTE *Buffer, @@ -417,7 +396,6 @@ NTSTATUS ElfrGetLogInformation( /* Function 23 */ NTSTATUS ElfrFlushEL( - handle_t BindingHandle, IELF_HANDLE LogHandle) { UNIMPLEMENTED; @@ -427,7 +405,6 @@ NTSTATUS ElfrFlushEL( /* Function 24 */ NTSTATUS ElfrReportEventAndSourceW( - handle_t BindingHandle, IELF_HANDLE LogHandle, DWORD Time, USHORT EventType, diff --git a/reactos/base/services/rpcss/endpoint.c b/reactos/base/services/rpcss/endpoint.c deleted file mode 100644 index f7e207eab5f..00000000000 --- a/reactos/base/services/rpcss/endpoint.c +++ /dev/null @@ -1,27 +0,0 @@ -/* - * PROJECT: ReactOS RpcSs service - * LICENSE: GPL - See COPYING in the top level directory - * FILE: services/rpcss/rpcss.c - * PURPOSE: Endpoint mapper - * COPYRIGHT: Copyright 2002 Eric Kohl - */ - -/* INCLUDES *****************************************************************/ - -#include "rpc.h" - -/* FUNCTIONS ****************************************************************/ - -VOID -StartEndpointMapper(VOID) -{ -#if 0 - RpcServerRegisterProtseqW("ncacn_np", 1, "\pipe\epmapper"); - - RpcServerRegisterProtseqW("ncalrpc", 1, "epmapper"); - - RpcServerRegisterIf(epmapper_InterfaceHandle, 0, 0); -#endif -} - -/* EOF */ diff --git a/reactos/dll/win32/rpcrt4/rpcss_np_client.h b/reactos/base/services/rpcss/epm.idl similarity index 73% rename from reactos/dll/win32/rpcrt4/rpcss_np_client.h rename to reactos/base/services/rpcss/epm.idl index db65d432bca..62f16f6774a 100644 --- a/reactos/dll/win32/rpcrt4/rpcss_np_client.h +++ b/reactos/base/services/rpcss/epm.idl @@ -1,26 +1,19 @@ -/* - * Copyright (C) 2002 Greg Turner - * - * 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 - */ - -#ifndef __WINE_RPCSS_NP_CLIENT_H -#define __WINE_RPCSS_NP_CLIENT_H - -/* rpcss_np_client.c */ -HANDLE RPC_RpcssNPConnect(void); -BOOL RPCRT4_SendReceiveNPMsg(HANDLE, PRPCSS_NP_MESSAGE, char *, PRPCSS_NP_REPLY); - -#endif /* __RPCSS_NP_CLINET_H */ +/* + * Copyright 2008 Robert Shearman + * + * 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 + */ + +#include "wine/epm.idl" diff --git a/reactos/base/services/rpcss/epmp.c b/reactos/base/services/rpcss/epmp.c new file mode 100644 index 00000000000..5cfef836cb8 --- /dev/null +++ b/reactos/base/services/rpcss/epmp.c @@ -0,0 +1,284 @@ +/* + * Endpoint Mapper + * + * Copyright (C) 2007 Robert Shearman for CodeWeavers + * + * 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 + */ + +#include "epm_s.h" + +#include "wine/debug.h" +#include "wine/list.h" + +WINE_DEFAULT_DEBUG_CHANNEL(ole); + +struct registered_ept_entry +{ + struct list entry; + GUID object; + RPC_SYNTAX_IDENTIFIER iface; + RPC_SYNTAX_IDENTIFIER syntax; + char *protseq; + char *endpoint; + char *address; + char annotation[ept_max_annotation_size]; +}; + +static struct list registered_ept_entry_list = LIST_INIT(registered_ept_entry_list); + +static CRITICAL_SECTION csEpm; +static CRITICAL_SECTION_DEBUG critsect_debug = +{ + 0, 0, &csEpm, + { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": csEpm") } +}; +static CRITICAL_SECTION csEpm = { &critsect_debug, -1, 0, 0, 0, 0 }; + +static const UUID nil_object; + +/* must be called inside csEpm */ +static void delete_registered_ept_entry(struct registered_ept_entry *entry) +{ + I_RpcFree(entry->protseq); + I_RpcFree(entry->endpoint); + I_RpcFree(entry->address); + list_remove(&entry->entry); + HeapFree(GetProcessHeap(), 0, entry); +} + +static struct registered_ept_entry *find_ept_entry( + const RPC_SYNTAX_IDENTIFIER *iface, const RPC_SYNTAX_IDENTIFIER *syntax, + const char *protseq, const char *endpoint, const char *address, + const UUID *object) +{ + struct registered_ept_entry *entry; + LIST_FOR_EACH_ENTRY(entry, ®istered_ept_entry_list, struct registered_ept_entry, entry) + { + if (memcmp(&entry->iface, iface, sizeof(RPC_SYNTAX_IDENTIFIER))) continue; + if (memcmp(&entry->syntax, syntax, sizeof(RPC_SYNTAX_IDENTIFIER))) continue; + if (strcmp(entry->protseq, protseq)) continue; + if (memcmp(&entry->object, object, sizeof(UUID))) continue; + WINE_TRACE("found entry with iface %d.%d %s, syntax %d.%d %s, protseq %s, object %s\n", + entry->iface.SyntaxVersion.MajorVersion, entry->iface.SyntaxVersion.MinorVersion, + wine_dbgstr_guid(&entry->iface.SyntaxGUID), + entry->syntax.SyntaxVersion.MajorVersion, entry->syntax.SyntaxVersion.MinorVersion, + wine_dbgstr_guid(&entry->syntax.SyntaxGUID), protseq, + wine_dbgstr_guid(&entry->object)); + return entry; + } + WINE_TRACE("not found\n"); + return NULL; +} + +void __RPC_USER ept_lookup_handle_t_rundown(ept_lookup_handle_t entry_handle) +{ + WINE_FIXME("%p\n", entry_handle); +} + +void ept_insert(handle_t h, + unsigned32 num_ents, + ept_entry_t entries[], + boolean32 replace, + error_status_t *status) +{ + unsigned32 i; + RPC_STATUS rpc_status; + + WINE_TRACE("(%p, %lu, %p, %lu, %p)\n", h, num_ents, entries, replace, status); + + *status = RPC_S_OK; + + EnterCriticalSection(&csEpm); + + for (i = 0; i < num_ents; i++) + { + struct registered_ept_entry *entry = HeapAlloc(GetProcessHeap(), 0, sizeof(*entry)); + if (!entry) + { + /* FIXME: cleanup code to delete added entries */ + *status = EPT_S_CANT_PERFORM_OP; + break; + } + list_init(&entry->entry); + memcpy(entry->annotation, entries[i].annotation, sizeof(entries[i].annotation)); + rpc_status = TowerExplode(entries[i].tower, &entry->iface, &entry->syntax, + &entry->protseq, &entry->endpoint, + &entry->address); + if (rpc_status != RPC_S_OK) + { + WINE_WARN("TowerExplode failed %lu\n", rpc_status); + *status = rpc_status; + break; /* FIXME: more cleanup? */ + } + + entry->object = entries[i].object; + + if (replace) + { + /* FIXME: correct find algorithm */ + struct registered_ept_entry *old_entry = find_ept_entry(&entry->iface, &entry->syntax, entry->protseq, entry->endpoint, entry->address, &entry->object); + if (old_entry) delete_registered_ept_entry(old_entry); + } + list_add_tail(®istered_ept_entry_list, &entry->entry); + } + + LeaveCriticalSection(&csEpm); +} + +void ept_delete(handle_t h, + unsigned32 num_ents, + ept_entry_t entries[], + error_status_t *status) +{ + unsigned32 i; + RPC_STATUS rpc_status; + + *status = RPC_S_OK; + + WINE_TRACE("(%p, %lu, %p, %p)\n", h, num_ents, entries, status); + + EnterCriticalSection(&csEpm); + + for (i = 0; i < num_ents; i++) + { + struct registered_ept_entry *entry; + RPC_SYNTAX_IDENTIFIER iface, syntax; + char *protseq; + char *endpoint; + char *address; + rpc_status = TowerExplode(entries[i].tower, &iface, &syntax, &protseq, + &endpoint, &address); + if (rpc_status != RPC_S_OK) + break; + entry = find_ept_entry(&iface, &syntax, protseq, endpoint, address, &entries[i].object); + if (entry) + delete_registered_ept_entry(entry); + else + { + *status = EPT_S_NOT_REGISTERED; + break; + } + I_RpcFree(protseq); + I_RpcFree(endpoint); + I_RpcFree(address); + } + + LeaveCriticalSection(&csEpm); +} + +void ept_lookup(handle_t h, + unsigned32 inquiry_type, + uuid_p_t object, + rpc_if_id_p_t interface_id, + unsigned32 vers_option, + ept_lookup_handle_t *entry_handle, + unsigned32 max_ents, + unsigned32 *num_ents, + ept_entry_t entries[], + error_status_t *status) +{ + WINE_FIXME("(%p, %p, %p): stub\n", h, entry_handle, status); + + *status = EPT_S_CANT_PERFORM_OP; +} + +void ept_map(handle_t h, + uuid_p_t object, + twr_p_t map_tower, + ept_lookup_handle_t *entry_handle, + unsigned32 max_towers, + unsigned32 *num_towers, + twr_p_t *towers, + error_status_t *status) +{ + RPC_STATUS rpc_status; + RPC_SYNTAX_IDENTIFIER iface, syntax; + char *protseq; + struct registered_ept_entry *entry; + + *status = RPC_S_OK; + *num_towers = 0; + + WINE_TRACE("(%p, %p, %p, %p, %lu, %p, %p, %p)\n", h, object, map_tower, + entry_handle, max_towers, num_towers, towers, status); + + rpc_status = TowerExplode(map_tower, &iface, &syntax, &protseq, + NULL, NULL); + if (rpc_status != RPC_S_OK) + { + *status = rpc_status; + return; + } + + EnterCriticalSection(&csEpm); + + LIST_FOR_EACH_ENTRY(entry, ®istered_ept_entry_list, struct registered_ept_entry, entry) + { + if (IsEqualGUID(&entry->iface.SyntaxGUID, &iface.SyntaxGUID) && + (entry->iface.SyntaxVersion.MajorVersion == iface.SyntaxVersion.MajorVersion) && + (entry->iface.SyntaxVersion.MinorVersion >= iface.SyntaxVersion.MinorVersion) && + !memcmp(&entry->syntax, &syntax, sizeof(syntax)) && + !strcmp(entry->protseq, protseq) && + ((!object && IsEqualGUID(&entry->object, &nil_object)) || IsEqualGUID(object, &entry->object))) + { + if (*num_towers < max_towers) + { + rpc_status = TowerConstruct(&entry->iface, &entry->syntax, + entry->protseq, entry->endpoint, + entry->address, + &towers[*num_towers]); + if (rpc_status != RPC_S_OK) + { + *status = rpc_status; + break; /* FIXME: more cleanup? */ + } + } + (*num_towers)++; + } + } + + LeaveCriticalSection(&csEpm); +} + +void ept_lookup_handle_free(handle_t h, + ept_lookup_handle_t *entry_handle, + error_status_t *status) +{ + WINE_FIXME("(%p, %p, %p): stub\n", h, entry_handle, status); + + *status = EPT_S_CANT_PERFORM_OP; +} + +void ept_inq_object(handle_t h, + GUID *ept_object, + error_status_t *status) +{ + WINE_FIXME("(%p, %p, %p): stub\n", h, ept_object, status); + + *status = EPT_S_CANT_PERFORM_OP; +} + +void ept_mgmt_delete(handle_t h, + boolean32 object_speced, + uuid_p_t object, + twr_p_t tower, + error_status_t *status) +{ + WINE_FIXME("(%p, %ld, %p, %p, %p): stub\n", h, object_speced, object, tower, status); + + *status = EPT_S_CANT_PERFORM_OP; +} diff --git a/reactos/base/services/rpcss/irot.idl b/reactos/base/services/rpcss/irot.idl new file mode 100644 index 00000000000..4324fa4e28b --- /dev/null +++ b/reactos/base/services/rpcss/irot.idl @@ -0,0 +1,19 @@ +/* + * Copyright 2007 Robert Shearman for CodeWeavers + * + * 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 + */ + +#include "wine/irot.idl" diff --git a/reactos/base/services/rpcss/irotp.c b/reactos/base/services/rpcss/irotp.c new file mode 100644 index 00000000000..00b282e8465 --- /dev/null +++ b/reactos/base/services/rpcss/irotp.c @@ -0,0 +1,379 @@ +/* + * Running Object Table + * + * Copyright 2007 Robert Shearman + * + * 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 + */ + +#include +#include + +#include "winerror.h" +#include "windef.h" +#include "winbase.h" + +#include "irot_s.h" + +#include "wine/list.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(rpcss); + +/* define the structure of the running object table elements */ +struct rot_entry +{ + struct list entry; + InterfaceData *object; /* marshaled running object*/ + InterfaceData *moniker; /* marshaled moniker that identifies this object */ + MonikerComparisonData *moniker_data; /* moniker comparison data that identifies this object */ + DWORD cookie; /* cookie identifying this object */ + FILETIME last_modified; + LONG refs; +}; + +static struct list RunningObjectTable = LIST_INIT(RunningObjectTable); + +static CRITICAL_SECTION csRunningObjectTable; +static CRITICAL_SECTION_DEBUG critsect_debug = +{ + 0, 0, &csRunningObjectTable, + { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": csRunningObjectTable") } +}; +static CRITICAL_SECTION csRunningObjectTable = { &critsect_debug, -1, 0, 0, 0, 0 }; + +static LONG last_cookie = 1; + +static inline void rot_entry_release(struct rot_entry *rot_entry) +{ + if (!InterlockedDecrement(&rot_entry->refs)) + { + HeapFree(GetProcessHeap(), 0, rot_entry->object); + HeapFree(GetProcessHeap(), 0, rot_entry->moniker); + HeapFree(GetProcessHeap(), 0, rot_entry->moniker_data); + HeapFree(GetProcessHeap(), 0, rot_entry); + } +} + +HRESULT IrotRegister( + IrotHandle h, + const MonikerComparisonData *data, + const InterfaceData *obj, + const InterfaceData *mk, + const FILETIME *time, + DWORD grfFlags, + IrotCookie *cookie, + IrotContextHandle *ctxt_handle) +{ + struct rot_entry *rot_entry; + struct rot_entry *existing_rot_entry; + HRESULT hr; + + if (grfFlags & ~(ROTFLAGS_REGISTRATIONKEEPSALIVE|ROTFLAGS_ALLOWANYCLIENT)) + { + WINE_ERR("Invalid grfFlags: 0x%08x\n", grfFlags & ~(ROTFLAGS_REGISTRATIONKEEPSALIVE|ROTFLAGS_ALLOWANYCLIENT)); + return E_INVALIDARG; + } + + rot_entry = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*rot_entry)); + if (!rot_entry) + return E_OUTOFMEMORY; + + rot_entry->refs = 1; + rot_entry->object = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(InterfaceData, abData[obj->ulCntData])); + if (!rot_entry->object) + { + rot_entry_release(rot_entry); + return E_OUTOFMEMORY; + } + rot_entry->object->ulCntData = obj->ulCntData; + memcpy(&rot_entry->object->abData, obj->abData, obj->ulCntData); + + rot_entry->last_modified = *time; + + rot_entry->moniker = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(InterfaceData, abData[mk->ulCntData])); + if (!rot_entry->moniker) + { + rot_entry_release(rot_entry); + return E_OUTOFMEMORY; + } + rot_entry->moniker->ulCntData = mk->ulCntData; + memcpy(&rot_entry->moniker->abData, mk->abData, mk->ulCntData); + + rot_entry->moniker_data = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(MonikerComparisonData, abData[data->ulCntData])); + if (!rot_entry->moniker_data) + { + rot_entry_release(rot_entry); + return E_OUTOFMEMORY; + } + rot_entry->moniker_data->ulCntData = data->ulCntData; + memcpy(&rot_entry->moniker_data->abData, data->abData, data->ulCntData); + + EnterCriticalSection(&csRunningObjectTable); + + hr = S_OK; + + LIST_FOR_EACH_ENTRY(existing_rot_entry, &RunningObjectTable, struct rot_entry, entry) + { + if ((existing_rot_entry->moniker_data->ulCntData == data->ulCntData) && + !memcmp(&data->abData, &existing_rot_entry->moniker_data->abData, data->ulCntData)) + { + hr = MK_S_MONIKERALREADYREGISTERED; + WINE_TRACE("moniker already registered with cookie %d\n", existing_rot_entry->cookie); + break; + } + } + + list_add_tail(&RunningObjectTable, &rot_entry->entry); + + LeaveCriticalSection(&csRunningObjectTable); + + /* gives a registration identifier to the registered object*/ + *cookie = rot_entry->cookie = InterlockedIncrement(&last_cookie); + *ctxt_handle = rot_entry; + + return hr; +} + +HRESULT IrotRevoke( + IrotHandle h, + IrotCookie cookie, + IrotContextHandle *ctxt_handle, + PInterfaceData *obj, + PInterfaceData *mk) +{ + struct rot_entry *rot_entry; + + WINE_TRACE("%d\n", cookie); + + EnterCriticalSection(&csRunningObjectTable); + LIST_FOR_EACH_ENTRY(rot_entry, &RunningObjectTable, struct rot_entry, entry) + { + if (rot_entry->cookie == cookie) + { + HRESULT hr = S_OK; + + list_remove(&rot_entry->entry); + LeaveCriticalSection(&csRunningObjectTable); + + *obj = MIDL_user_allocate(FIELD_OFFSET(InterfaceData, abData[rot_entry->object->ulCntData])); + *mk = MIDL_user_allocate(FIELD_OFFSET(InterfaceData, abData[rot_entry->moniker->ulCntData])); + if (*obj && *mk) + { + (*obj)->ulCntData = rot_entry->object->ulCntData; + memcpy((*obj)->abData, rot_entry->object->abData, (*obj)->ulCntData); + (*mk)->ulCntData = rot_entry->moniker->ulCntData; + memcpy((*mk)->abData, rot_entry->moniker->abData, (*mk)->ulCntData); + } + else + { + MIDL_user_free(*obj); + MIDL_user_free(*mk); + hr = E_OUTOFMEMORY; + } + + rot_entry_release(rot_entry); + *ctxt_handle = NULL; + return hr; + } + } + LeaveCriticalSection(&csRunningObjectTable); + + return E_INVALIDARG; +} + +HRESULT IrotIsRunning( + IrotHandle h, + const MonikerComparisonData *data) +{ + const struct rot_entry *rot_entry; + HRESULT hr = S_FALSE; + + WINE_TRACE("\n"); + + EnterCriticalSection(&csRunningObjectTable); + + LIST_FOR_EACH_ENTRY(rot_entry, &RunningObjectTable, const struct rot_entry, entry) + { + if ((rot_entry->moniker_data->ulCntData == data->ulCntData) && + !memcmp(&data->abData, &rot_entry->moniker_data->abData, data->ulCntData)) + { + hr = S_OK; + break; + } + } + LeaveCriticalSection(&csRunningObjectTable); + + return hr; +} + +HRESULT IrotGetObject( + IrotHandle h, + const MonikerComparisonData *moniker_data, + PInterfaceData *obj, + IrotCookie *cookie) +{ + const struct rot_entry *rot_entry; + + WINE_TRACE("%p\n", moniker_data); + + *cookie = 0; + + EnterCriticalSection(&csRunningObjectTable); + + LIST_FOR_EACH_ENTRY(rot_entry, &RunningObjectTable, const struct rot_entry, entry) + { + HRESULT hr = S_OK; + if ((rot_entry->moniker_data->ulCntData == moniker_data->ulCntData) && + !memcmp(&moniker_data->abData, &rot_entry->moniker_data->abData, moniker_data->ulCntData)) + { + *obj = MIDL_user_allocate(FIELD_OFFSET(InterfaceData, abData[rot_entry->object->ulCntData])); + if (*obj) + { + (*obj)->ulCntData = rot_entry->object->ulCntData; + memcpy((*obj)->abData, rot_entry->object->abData, (*obj)->ulCntData); + + *cookie = rot_entry->cookie; + } + else + hr = E_OUTOFMEMORY; + + LeaveCriticalSection(&csRunningObjectTable); + + return hr; + } + } + + LeaveCriticalSection(&csRunningObjectTable); + + return MK_E_UNAVAILABLE; +} + +HRESULT IrotNoteChangeTime( + IrotHandle h, + IrotCookie cookie, + const FILETIME *last_modified_time) +{ + struct rot_entry *rot_entry; + + WINE_TRACE("%d %p\n", cookie, last_modified_time); + + EnterCriticalSection(&csRunningObjectTable); + LIST_FOR_EACH_ENTRY(rot_entry, &RunningObjectTable, struct rot_entry, entry) + { + if (rot_entry->cookie == cookie) + { + rot_entry->last_modified = *last_modified_time; + LeaveCriticalSection(&csRunningObjectTable); + return S_OK; + } + } + LeaveCriticalSection(&csRunningObjectTable); + + return E_INVALIDARG; +} + +HRESULT IrotGetTimeOfLastChange( + IrotHandle h, + const MonikerComparisonData *moniker_data, + FILETIME *time) +{ + const struct rot_entry *rot_entry; + HRESULT hr = MK_E_UNAVAILABLE; + + WINE_TRACE("%p\n", moniker_data); + + memset(time, 0, sizeof(*time)); + + EnterCriticalSection(&csRunningObjectTable); + LIST_FOR_EACH_ENTRY(rot_entry, &RunningObjectTable, const struct rot_entry, entry) + { + if ((rot_entry->moniker_data->ulCntData == moniker_data->ulCntData) && + !memcmp(&moniker_data->abData, &rot_entry->moniker_data->abData, moniker_data->ulCntData)) + { + *time = rot_entry->last_modified; + hr = S_OK; + break; + } + } + LeaveCriticalSection(&csRunningObjectTable); + + return hr; +} + +HRESULT IrotEnumRunning( + IrotHandle h, + PInterfaceList *list) +{ + const struct rot_entry *rot_entry; + HRESULT hr = S_OK; + ULONG moniker_count = 0; + ULONG i = 0; + + WINE_TRACE("\n"); + + EnterCriticalSection(&csRunningObjectTable); + + LIST_FOR_EACH_ENTRY( rot_entry, &RunningObjectTable, const struct rot_entry, entry ) + moniker_count++; + + *list = MIDL_user_allocate(FIELD_OFFSET(InterfaceList, interfaces[moniker_count])); + if (*list) + { + (*list)->size = moniker_count; + LIST_FOR_EACH_ENTRY( rot_entry, &RunningObjectTable, const struct rot_entry, entry ) + { + (*list)->interfaces[i] = MIDL_user_allocate(FIELD_OFFSET(InterfaceData, abData[rot_entry->moniker->ulCntData])); + if (!(*list)->interfaces[i]) + { + ULONG end = i - 1; + for (i = 0; i < end; i++) + MIDL_user_free((*list)->interfaces[i]); + MIDL_user_free(*list); + hr = E_OUTOFMEMORY; + break; + } + (*list)->interfaces[i]->ulCntData = rot_entry->moniker->ulCntData; + memcpy((*list)->interfaces[i]->abData, rot_entry->moniker->abData, rot_entry->moniker->ulCntData); + i++; + } + } + else + hr = E_OUTOFMEMORY; + + LeaveCriticalSection(&csRunningObjectTable); + + return hr; +} + +void __RPC_USER IrotContextHandle_rundown(IrotContextHandle ctxt_handle) +{ + struct rot_entry *rot_entry = ctxt_handle; + EnterCriticalSection(&csRunningObjectTable); + list_remove(&rot_entry->entry); + LeaveCriticalSection(&csRunningObjectTable); + rot_entry_release(rot_entry); +} + +void * __RPC_USER MIDL_user_allocate(size_t size) +{ + return HeapAlloc(GetProcessHeap(), 0, size); +} + +void __RPC_USER MIDL_user_free(void * p) +{ + HeapFree(GetProcessHeap(), 0, p); +} diff --git a/reactos/base/services/rpcss/rpcss.c b/reactos/base/services/rpcss/rpcss.c deleted file mode 100644 index d1cd3c1960f..00000000000 --- a/reactos/base/services/rpcss/rpcss.c +++ /dev/null @@ -1,56 +0,0 @@ -/* - * PROJECT: ReactOS RpcSs service - * LICENSE: GPL - See COPYING in the top level directory - * FILE: services/rpcss/rpcss.c - * PURPOSE: Service initialization - * COPYRIGHT: Copyright 2002 Eric Kohl - */ - -/* INCLUDES *****************************************************************/ - -#include "rpcss.h" - -#define NDEBUG -#include - - - -/* GLOBALS ******************************************************************/ - - - -/* FUNCTIONS *****************************************************************/ - - -VOID CALLBACK -ServiceMain(DWORD argc, LPTSTR *argv) -{ - - DPRINT("ServiceMain() called\n"); - - StartEndpointMapper(); - - DPRINT("ServiceMain() done\n"); -} - - -int main(int argc, char *argv[]) -{ -#if 0 - SERVICE_TABLE_ENTRY ServiceTable[] = {{"RpcSs", ServiceMain},{NULL, NULL}}; -#endif - - DPRINT("RpcSs service\n"); - -#if 0 - StartServiceCtrlDispatcher(ServiceTable); -#endif - - ServiceMain(0, NULL); - - DPRINT("RpcSS: done\n"); - - return 0; -} - -/* EOF */ diff --git a/reactos/base/services/rpcss/rpcss.h b/reactos/base/services/rpcss/rpcss.h index bfa1afcc813..9c2f04f7b86 100644 --- a/reactos/base/services/rpcss/rpcss.h +++ b/reactos/base/services/rpcss/rpcss.h @@ -1,17 +1,26 @@ -#ifndef __RPCSS_H__ -#define __RPCSS_H__ +/* + * RPCSS definitions + * + * Copyright (C) 2002 Greg Turner + * + * 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 UNICODE +#ifndef __WINE_RPCSS_H +#define __WINE_RPCSS_H -#include -#define WIN32_NO_STATUS -#include - - -VOID -StartEndpointMapper(VOID); - -#endif /* __RPCSS_H__ */ - -/* EOF */ +#include "windows.h" +#endif /* __WINE_RPCSS_H */ diff --git a/reactos/base/services/rpcss/rpcss.rbuild b/reactos/base/services/rpcss/rpcss.rbuild index bf3f5219bb5..62b6668af74 100644 --- a/reactos/base/services/rpcss/rpcss.rbuild +++ b/reactos/base/services/rpcss/rpcss.rbuild @@ -1,10 +1,25 @@ - + . + . + wine + rpcss_epm_server + rpcss_irot_server + rpcrt4 kernel32 advapi32 - rpcss.c - endpoint.c + epmp.c + irotp.c + rpcss_main.c + service_main.c + epm.idl + irot.idl rpcss.rc + + epm.idl + + + irot.idl + diff --git a/reactos/base/services/rpcss/rpcss_main.c b/reactos/base/services/rpcss/rpcss_main.c new file mode 100644 index 00000000000..2df13c7cea1 --- /dev/null +++ b/reactos/base/services/rpcss/rpcss_main.c @@ -0,0 +1,146 @@ +/* + * Copyright 2001, Ove KГҐven, TransGaming Technologies Inc. + * Copyright 2002 Greg Turner + * + * 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 + * + * ---- rpcss_main.c: + * Initialize and start serving requests. Bail if rpcss already is + * running. + * + * ---- RPCSS.EXE: + * + * Wine needs a server whose role is somewhat like that + * of rpcss.exe in windows. This is not a clone of + * windows rpcss at all. It has been given the same name, however, + * to provide for the possibility that at some point in the future, + * it may become interface compatible with the "real" rpcss.exe on + * Windows. + * + * ---- KNOWN BUGS / TODO: + * + * o Service hooks are unimplemented (if you bother to implement + * these, also implement net.exe, at least for "net start" and + * "net stop" (should be pretty easy I guess, assuming the rest + * of the services API infrastructure works. + * + * o There is a looming problem regarding listening on privileged + * ports. We will need to be able to coexist with SAMBA, and be able + * to function without running winelib code as root. This may + * take some doing, including significant reconceptualization of the + * role of rpcss.exe in wine. + */ + +#include +#include +#include + +#define NONAMELESSUNION +#define NONAMELESSSTRUCT +#include "rpcss.h" +#include "winnt.h" +#include "irot.h" +#include "epm.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(ole); + +static HANDLE exit_event; + +//extern HANDLE __wine_make_process_system(void); + +BOOL RPCSS_Initialize(void) +{ + static unsigned short irot_protseq[] = IROT_PROTSEQ; + static unsigned short irot_endpoint[] = IROT_ENDPOINT; + static unsigned short epm_protseq[] = {'n','c','a','c','n','_','n','p',0}; + static unsigned short epm_endpoint[] = {'\\','p','i','p','e','\\','e','p','m','a','p','p','e','r',0}; + static unsigned short epm_protseq_lrpc[] = {'n','c','a','l','r','p','c',0}; + static unsigned short epm_endpoint_lrpc[] = {'e','p','m','a','p','p','e','r',0}; + RPC_STATUS status; + + WINE_TRACE("\n"); + + status = RpcServerRegisterIf(epm_v3_0_s_ifspec, NULL, NULL); + if (status != RPC_S_OK) + return status; + status = RpcServerRegisterIf(Irot_v0_2_s_ifspec, NULL, NULL); + if (status != RPC_S_OK) + { + RpcServerUnregisterIf(epm_v3_0_s_ifspec, NULL, FALSE); + return FALSE; + } + + status = RpcServerUseProtseqEpW(epm_protseq, RPC_C_PROTSEQ_MAX_REQS_DEFAULT, + epm_endpoint, NULL); + if (status != RPC_S_OK) + goto fail; + + status = RpcServerUseProtseqEpW(epm_protseq_lrpc, RPC_C_PROTSEQ_MAX_REQS_DEFAULT, + epm_endpoint_lrpc, NULL); + if (status != RPC_S_OK) + goto fail; + + status = RpcServerUseProtseqEpW(irot_protseq, RPC_C_PROTSEQ_MAX_REQS_DEFAULT, + irot_endpoint, NULL); + if (status != RPC_S_OK) + goto fail; + + status = RpcServerListen(1, RPC_C_LISTEN_MAX_CALLS_DEFAULT, TRUE); + if (status != RPC_S_OK) + goto fail; + + //exit_event = __wine_make_process_system(); + exit_event = CreateEventW(NULL, FALSE, FALSE, NULL); // never fires + + return TRUE; + +fail: + RpcServerUnregisterIf(epm_v3_0_s_ifspec, NULL, FALSE); + RpcServerUnregisterIf(Irot_v0_2_s_ifspec, NULL, FALSE); + return FALSE; +} + +/* returns false if we discover at the last moment that we + aren't ready to terminate */ +BOOL RPCSS_Shutdown(void) +{ + RpcMgmtStopServerListening(NULL); + RpcServerUnregisterIf(epm_v3_0_s_ifspec, NULL, TRUE); + RpcServerUnregisterIf(Irot_v0_2_s_ifspec, NULL, TRUE); + + CloseHandle(exit_event); + + return TRUE; +} + +#if 0 +int main( int argc, char **argv ) +{ + /* + * We are invoked as a standard executable; we act in a + * "lazy" manner. We register our interfaces and endpoints, and hang around + * until we all user processes exit, and then silently terminate. + */ + + if (RPCSS_Initialize()) { + WaitForSingleObject(exit_event, INFINITE); + RPCSS_Shutdown(); + } + + return 0; +} +#endif diff --git a/reactos/base/services/rpcss/rpcss_ros.diff b/reactos/base/services/rpcss/rpcss_ros.diff new file mode 100644 index 00000000000..7d7ad9a42c6 --- /dev/null +++ b/reactos/base/services/rpcss/rpcss_ros.diff @@ -0,0 +1,35 @@ +Index: rpcss_main.c +=================================================================== +--- rpcss_main.c (revision 37240) ++++ rpcss_main.c (working copy) +@@ -62,7 +62,7 @@ + + //extern HANDLE __wine_make_process_system(void); + +-static BOOL RPCSS_Initialize(void) ++BOOL RPCSS_Initialize(void) + { + static unsigned short irot_protseq[] = IROT_PROTSEQ; + static unsigned short irot_endpoint[] = IROT_ENDPOINT; +@@ -116,7 +116,7 @@ + + /* returns false if we discover at the last moment that we + aren't ready to terminate */ +-static BOOL RPCSS_Shutdown(void) ++BOOL RPCSS_Shutdown(void) + { + RpcMgmtStopServerListening(NULL); + RpcServerUnregisterIf(epm_v3_0_s_ifspec, NULL, TRUE); +@@ -127,6 +127,7 @@ + return TRUE; + } + ++#if 0 + int main( int argc, char **argv ) + { + /* +@@ -142,3 +143,4 @@ + + return 0; + } ++#endif diff --git a/reactos/base/services/rpcss/service_main.c b/reactos/base/services/rpcss/service_main.c new file mode 100644 index 00000000000..7fe84a57d26 --- /dev/null +++ b/reactos/base/services/rpcss/service_main.c @@ -0,0 +1,128 @@ +/* + * PROJECT: ReactOS Remote Procedure Call service + * LICENSE: GPL - See COPYING in the top level directory + * FILE: /base/services/rpcss/service_main.c + * PURPOSE: Service control code + * COPYRIGHT: Copyright 2008 Ged Murphy + * + */ + +#include "rpcss.h" + +BOOL RPCSS_Initialize(void); +BOOL RPCSS_Shutdown(void); + +static WCHAR ServiceName[] = L"RpcSs"; + +typedef struct _ServiceInfo +{ + SERVICE_STATUS servStatus; + SERVICE_STATUS_HANDLE hStatus; +} SERVICEINFO, *PSERVICEINFO; + + +static VOID +UpdateStatus(PSERVICEINFO pServInfo, + DWORD NewStatus, + DWORD Check) +{ + if (Check > 0) + { + pServInfo->servStatus.dwCheckPoint += Check; + } + else + { + pServInfo->servStatus.dwCheckPoint = Check; + } + + if (NewStatus > 0) + { + pServInfo->servStatus.dwCurrentState = NewStatus; + } + + SetServiceStatus(pServInfo->hStatus, &pServInfo->servStatus); +} + + +static BOOL +RunService(PSERVICEINFO pServInfo) +{ + return RPCSS_Initialize(); +} + +VOID WINAPI +ServerCtrlHandler(DWORD dwControl, + DWORD dwEventType, + LPVOID lpEventData, + LPVOID lpContext) +{ + PSERVICEINFO pServInfo = (PSERVICEINFO)lpContext; + + switch (dwControl) + { + case SERVICE_CONTROL_SHUTDOWN: + case SERVICE_CONTROL_STOP: + RPCSS_Shutdown(); + pServInfo->servStatus.dwWin32ExitCode = 0; + pServInfo->servStatus.dwWaitHint = 0; + UpdateStatus(pServInfo, SERVICE_STOP_PENDING, 1); + break; + + default: + break; + } +} + +VOID WINAPI +ServiceMain(DWORD argc, LPWSTR argv[]) +{ + SERVICEINFO servInfo; + HANDLE hThread; + DWORD dwThreadId; + + servInfo.servStatus.dwServiceType = SERVICE_WIN32_OWN_PROCESS; + servInfo.servStatus.dwCurrentState = SERVICE_STOPPED; + servInfo.servStatus.dwControlsAccepted = SERVICE_ACCEPT_SHUTDOWN; + servInfo.servStatus.dwWin32ExitCode = ERROR_SERVICE_SPECIFIC_ERROR; + servInfo.servStatus.dwServiceSpecificExitCode = 0; + servInfo.servStatus.dwCheckPoint = 0; + servInfo.servStatus.dwWaitHint = 1000; + + servInfo.hStatus = RegisterServiceCtrlHandlerExW(ServiceName, + (LPHANDLER_FUNCTION_EX)ServerCtrlHandler, + &servInfo); + if (!servInfo.hStatus) return; + + UpdateStatus(&servInfo, SERVICE_START_PENDING, 1); + + /* Create worker thread */ + hThread = CreateThread(NULL, + 0, + (LPTHREAD_START_ROUTINE)RunService, + &servInfo, + 0, + &dwThreadId); + if (!hThread) return; + + /* Set service status to running */ + UpdateStatus(&servInfo, SERVICE_RUNNING, 0); + + /* Wait until thread has terminated */ + WaitForSingleObject(hThread, INFINITE); + + CloseHandle(hThread); + + UpdateStatus(&servInfo, SERVICE_STOPPED, 0); +} + + +int wmain(int argc, LPWSTR argv []) +{ + SERVICE_TABLE_ENTRYW ServiceTable[] = + { + {ServiceName, ServiceMain}, + {NULL, NULL } + }; + + return (int)(StartServiceCtrlDispatcherW(ServiceTable) != TRUE); +} diff --git a/reactos/base/setup/usetup/lang/th-TH.h b/reactos/base/setup/usetup/lang/th-TH.h index cc602538311..e9c1496cc17 100644 --- a/reactos/base/setup/usetup/lang/th-TH.h +++ b/reactos/base/setup/usetup/lang/th-TH.h @@ -3,8 +3,11 @@ MUI_LAYOUTS thTHLayouts[] = { - { L"0409", L"00000409" }, { L"041E", L"0000041E" }, + { L"041E", L"0001041E" }, + { L"041E", L"0002041E" }, + { L"041E", L"0003041E" }, + { L"0409", L"00000409" }, { NULL, NULL } }; diff --git a/reactos/base/setup/usetup/mui.c b/reactos/base/setup/usetup/mui.c index aabe82ad34b..550a2e0b453 100644 --- a/reactos/base/setup/usetup/mui.c +++ b/reactos/base/setup/usetup/mui.c @@ -403,7 +403,7 @@ AddKbLayoutsToRegistry(IN const MUI_LAYOUTS * MuiLayouts) 0, REG_SZ, (PVOID)MuiLayouts[uIndex].LayoutID, - wcslen(MuiLayouts[uIndex].LayoutID) * sizeof(WCHAR)); + (wcslen(MuiLayouts[uIndex].LayoutID)+1) * sizeof(WCHAR)); if (!NT_SUCCESS(Status)) { DPRINT1("NtSetValueKey() failed (Status = %lx, uIndex = %d)\n", Status, uIndex); @@ -420,7 +420,7 @@ AddKbLayoutsToRegistry(IN const MUI_LAYOUTS * MuiLayouts) 0, REG_SZ, (PVOID)szLangID, - wcslen(szLangID) * sizeof(WCHAR)); + (wcslen(szLangID)+1) * sizeof(WCHAR)); if (!NT_SUCCESS(Status)) { DPRINT1("NtSetValueKey() failed (Status = %lx, uIndex = %d)\n", Status, uIndex); @@ -436,7 +436,7 @@ AddKbLayoutsToRegistry(IN const MUI_LAYOUTS * MuiLayouts) 0, REG_SZ, (PVOID)MuiLayouts[uIndex].LayoutID, - wcslen(MuiLayouts[uIndex].LayoutID) * sizeof(WCHAR)); + (wcslen(MuiLayouts[uIndex].LayoutID)+1) * sizeof(WCHAR)); if (!NT_SUCCESS(Status)) { DPRINT1("NtSetValueKey() failed (Status = %lx, uIndex = %d)\n", Status, uIndex); @@ -513,7 +513,7 @@ AddCodepageToRegistry(IN LPCWSTR ACPage, IN LPCWSTR OEMCPage, IN LPCWSTR MACCPag 0, REG_SZ, (PVOID)ACPage, - wcslen(ACPage) * sizeof(PWCHAR)); + (wcslen(ACPage)+1) * sizeof(PWCHAR)); if (!NT_SUCCESS(Status)) { DPRINT1("NtSetValueKey() failed (Status %lx)\n", Status); @@ -528,7 +528,7 @@ AddCodepageToRegistry(IN LPCWSTR ACPage, IN LPCWSTR OEMCPage, IN LPCWSTR MACCPag 0, REG_SZ, (PVOID)OEMCPage, - wcslen(OEMCPage) * sizeof(PWCHAR)); + (wcslen(OEMCPage)+1) * sizeof(PWCHAR)); if (!NT_SUCCESS(Status)) { DPRINT1("NtSetValueKey() failed (Status %lx)\n", Status); @@ -543,7 +543,7 @@ AddCodepageToRegistry(IN LPCWSTR ACPage, IN LPCWSTR OEMCPage, IN LPCWSTR MACCPag 0, REG_SZ, (PVOID)MACCPage, - wcslen(MACCPage) * sizeof(PWCHAR)); + (wcslen(MACCPage)+1) * sizeof(PWCHAR)); if (!NT_SUCCESS(Status)) { DPRINT1("NtSetValueKey() failed (Status %lx)\n", Status); diff --git a/reactos/base/setup/usetup/registry.c b/reactos/base/setup/usetup/registry.c index 1159c273cb0..3919f0440e5 100644 --- a/reactos/base/setup/usetup/registry.c +++ b/reactos/base/setup/usetup/registry.c @@ -679,7 +679,7 @@ SetInstallPathValue(PUNICODE_STRING InstallPath) 0, REG_SZ, (PVOID)InstallPath->Buffer, - InstallPath->Length); + InstallPath->Length + sizeof(WCHAR)); NtClose(KeyHandle); if (!NT_SUCCESS(Status)) { diff --git a/reactos/base/setup/usetup/usetup.rbuild b/reactos/base/setup/usetup/usetup.rbuild index 59fc77d9efe..de6806153e1 100644 --- a/reactos/base/setup/usetup/usetup.rbuild +++ b/reactos/base/setup/usetup/usetup.rbuild @@ -1,6 +1,6 @@ - + . . diff --git a/reactos/base/shell/cmd/batch.c b/reactos/base/shell/cmd/batch.c index 1c35123f295..ef282689b3e 100644 --- a/reactos/base/shell/cmd/batch.c +++ b/reactos/base/shell/cmd/batch.c @@ -427,7 +427,7 @@ LPTSTR ReadBatchLine () return textline; } - if (!FileGetString (bc->hBatchFile, textline, sizeof (textline) / sizeof (textline[0]))) + if (!FileGetString (bc->hBatchFile, textline, sizeof (textline) / sizeof (textline[0]) - 1)) { TRACE ("ReadBatchLine(): Reached EOF!\n"); /* End of file.... */ @@ -440,6 +440,9 @@ LPTSTR ReadBatchLine () } TRACE ("ReadBatchLine(): textline: \'%s\'\n", debugstr_aw(textline)); + if (textline[_tcslen(textline) - 1] != _T('\n')) + _tcscat(textline, _T("\n")); + first = textline; /* cmd block over multiple lines (..) */ diff --git a/reactos/base/shell/cmd/cmd.rbuild b/reactos/base/shell/cmd/cmd.rbuild index c0e301b1564..7ae5ff6b01b 100644 --- a/reactos/base/shell/cmd/cmd.rbuild +++ b/reactos/base/shell/cmd/cmd.rbuild @@ -1,11 +1,18 @@ - + include/reactos/wine - . + . + wine + kernel32 + advapi32 + shell32 + user32 + cmd.rc + main.c precomp.h alias.c @@ -67,17 +74,4 @@ window.c - - include/reactos/wine - . - - cmd_base - wine - kernel32 - advapi32 - shell32 - user32 - cmd.rc - main.c - diff --git a/reactos/base/shell/explorer/explorer-uk.rc b/reactos/base/shell/explorer/explorer-uk.rc index dd6f6a61c08..51bf0ddb6a3 100644 --- a/reactos/base/shell/explorer/explorer-uk.rc +++ b/reactos/base/shell/explorer/explorer-uk.rc @@ -381,9 +381,9 @@ BEGIN IDS_DESKTOPBAR_SETTINGS "Настройки робочого стола" IDS_DESKTOP "Робочий Стіл" IDS_TASKBAR "Панель завдань" - IDS_NAMECOLUMN "Name" - IDS_PATHCOLUMN "Path" - IDS_MENUCOLUMN "Menu path" + IDS_NAMECOLUMN "Ім'я" + IDS_PATHCOLUMN "Шлях" + IDS_MENUCOLUMN "Шлях в меню" END #endif // Ukrainian resources diff --git a/reactos/base/shell/explorer/explorer.rbuild b/reactos/base/shell/explorer/explorer.rbuild index 61ecefe26f5..92ee727d65b 100644 --- a/reactos/base/shell/explorer/explorer.rbuild +++ b/reactos/base/shell/explorer/explorer.rbuild @@ -18,7 +18,7 @@ shell32 uuid notifyhook - precomp.h + desktop.cpp diff --git a/reactos/base/shell/explorer/explorer.rc b/reactos/base/shell/explorer/explorer.rc index 10aa03a78ff..6fe6f32e8c9 100644 --- a/reactos/base/shell/explorer/explorer.rc +++ b/reactos/base/shell/explorer/explorer.rc @@ -14,8 +14,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL -STRINGTABLE DISCARDABLE -BEGIN - IDS_VERSION_STR REACTOS_STR_PRODUCT_VERSION - IDS_EXPLORER_VERSION_STR "ReactOS %s Explorer" -END +//STRINGTABLE DISCARDABLE +//BEGIN +// IDS_VERSION_STR REACTOS_STR_PRODUCT_VERSION +// IDS_EXPLORER_VERSION_STR "ReactOS %s Explorer" +//END diff --git a/reactos/base/shell/explorer/res/shutdown.ico b/reactos/base/shell/explorer/res/shutdown.ico index 3203a880c88..ee4fce42b0f 100644 Binary files a/reactos/base/shell/explorer/res/shutdown.ico and b/reactos/base/shell/explorer/res/shutdown.ico differ diff --git a/reactos/base/system/services/rpcserver.c b/reactos/base/system/services/rpcserver.c index 86302afa7c4..9b7012201c2 100644 --- a/reactos/base/system/services/rpcserver.c +++ b/reactos/base/system/services/rpcserver.c @@ -1018,7 +1018,7 @@ DWORD RSetServiceStatus( return ERROR_INVALID_HANDLE; } - lpService = ScmGetServiceEntryByClientHandle(hServiceStatus); + lpService = ScmGetServiceEntryByClientHandle(LongToPtr(hServiceStatus)); if (lpService == NULL) { DPRINT1("lpService == NULL!\n"); @@ -1041,8 +1041,7 @@ DWORD RSetServiceStatus( } /* Check accepted controls */ - if (lpServiceStatus->dwControlsAccepted == 0 || - lpServiceStatus->dwControlsAccepted & ~0xFF) + if (lpServiceStatus->dwControlsAccepted & ~0xFF) { DPRINT1("Invalid controls accepted!\n"); return ERROR_INVALID_DATA; diff --git a/reactos/boot/bootdata/hivesft_arm.inf b/reactos/boot/bootdata/hivesft_arm.inf index 94fc6e4cef1..9dd2a10ed73 100644 --- a/reactos/boot/bootdata/hivesft_arm.inf +++ b/reactos/boot/bootdata/hivesft_arm.inf @@ -997,6 +997,8 @@ HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\63","Coun HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\63","Name",0x00000000,"Philippines" HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\64","CountryCode",0x00010001,0x00000040 HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\64","Name",0x00000000,"New Zealand" +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\66","CountryCode",0x00010001,0x00000042 +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\66","Name",0x00000000,"Thailand" HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\7","CountryCode",0x00010001,0x00000007 HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\7","Name",0x00000000,"Russia" HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\705","CountryCode",0x00010001,0x000002C1 diff --git a/reactos/boot/bootdata/hivesft_i386.inf b/reactos/boot/bootdata/hivesft_i386.inf index 34fd6c9e53a..7b6f6ee4d4c 100644 --- a/reactos/boot/bootdata/hivesft_i386.inf +++ b/reactos/boot/bootdata/hivesft_i386.inf @@ -1003,6 +1003,8 @@ HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\63","Coun HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\63","Name",0x00000000,"Philippines" HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\64","CountryCode",0x00010001,0x00000040 HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\64","Name",0x00000000,"New Zealand" +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\66","CountryCode",0x00010001,0x00000042 +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\66","Name",0x00000000,"Thailand" HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\7","CountryCode",0x00010001,0x00000007 HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\7","Name",0x00000000,"Russia" HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\705","CountryCode",0x00010001,0x000002C1 diff --git a/reactos/boot/bootdata/hivesys_arm.inf b/reactos/boot/bootdata/hivesys_arm.inf index e183d6f04d6..582b25d4c6b 100644 --- a/reactos/boot/bootdata/hivesys_arm.inf +++ b/reactos/boot/bootdata/hivesys_arm.inf @@ -541,8 +541,8 @@ HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","InstallLanguage",0x0000000 HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale",,0x00000012 HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000402",0x00000000,"5" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000403",0x00000000,"1" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000404",0x00000000,"" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000804",0x00000000,"" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000404",0x00000000,"9" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000804",0x00000000,"a" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000405",0x00000000,"2" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000406",0x00000000,"1" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000407",0x00000000,"1" @@ -587,7 +587,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000c0c",0x00000000,"1" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000100c",0x00000000,"1" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000140c",0x00000000,"1" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000180c",0x00000000,"1" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000040d",0x00000000,"" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000040d",0x00000000,"c" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000040e",0x00000000,"2" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000040f",0x00000000,"1" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000410",0x00000000,"1" @@ -610,7 +610,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000041b",0x00000000,"2" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000041c",0x00000000,"2" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000041d",0x00000000,"1" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000081d",0x00000000,"1" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000041e",0x00000000,"" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000041e",0x00000000,"b" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000041f",0x00000000,"6" ;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000420",0x00000000,"" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000421",0x00000000,"1" @@ -622,15 +622,15 @@ HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000426",0x00000000,"3" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000427",0x00000000,"3" ;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000429",0x00000000,"" ;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000042a",0x00000000,"" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000042b",0x00000000,"" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000042b",0x00000000,"11" ;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000042c",0x00000000,"6" ;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000082c",0x00000000,"5" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000042d",0x00000000,"1" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000042f",0x00000000,"5" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000436",0x00000000,"1" -;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000437",0x00000000,"" +;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000437",0x00000000,"10" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000438",0x00000000,"1" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000439",0x00000000,"" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000439",0x00000000,"f" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000043e",0x00000000,"1" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000083e",0x00000000,"1" ;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000043f",0x00000000,"5" diff --git a/reactos/boot/bootdata/hivesys_i386.inf b/reactos/boot/bootdata/hivesys_i386.inf index dac699cb343..96956adbbc9 100644 --- a/reactos/boot/bootdata/hivesys_i386.inf +++ b/reactos/boot/bootdata/hivesys_i386.inf @@ -541,8 +541,8 @@ HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","InstallLanguage",0x0000000 HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale",,0x00000012 HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000402",0x00000000,"5" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000403",0x00000000,"1" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000404",0x00000000,"" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000804",0x00000000,"" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000404",0x00000000,"9" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000804",0x00000000,"a" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000405",0x00000000,"2" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000406",0x00000000,"1" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000407",0x00000000,"1" @@ -587,7 +587,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000c0c",0x00000000,"1" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000100c",0x00000000,"1" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000140c",0x00000000,"1" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000180c",0x00000000,"1" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000040d",0x00000000,"" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000040d",0x00000000,"c" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000040e",0x00000000,"2" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000040f",0x00000000,"1" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000410",0x00000000,"1" @@ -610,7 +610,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000041b",0x00000000,"2" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000041c",0x00000000,"2" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000041d",0x00000000,"1" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000081d",0x00000000,"1" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000041e",0x00000000,"" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000041e",0x00000000,"b" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000041f",0x00000000,"6" ;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000420",0x00000000,"" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000421",0x00000000,"1" @@ -622,15 +622,15 @@ HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000426",0x00000000,"3" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000427",0x00000000,"3" ;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000429",0x00000000,"" ;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000042a",0x00000000,"" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000042b",0x00000000,"" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000042b",0x00000000,"11" ;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000042c",0x00000000,"6" ;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000082c",0x00000000,"5" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000042d",0x00000000,"1" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000042f",0x00000000,"5" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000436",0x00000000,"1" -;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000437",0x00000000,"" +;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000437",0x00000000,"10" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000438",0x00000000,"1" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000439",0x00000000,"" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000439",0x00000000,"f" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000043e",0x00000000,"1" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000083e",0x00000000,"1" ;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000043f",0x00000000,"5" diff --git a/reactos/boot/bootdata/packages/reactos.dff b/reactos/boot/bootdata/packages/reactos.dff index 8ac0f01458c..05695bf8de6 100644 --- a/reactos/boot/bootdata/packages/reactos.dff +++ b/reactos/boot/bootdata/packages/reactos.dff @@ -30,636 +30,651 @@ Signature = "$ReactOS$" ; Base files -;base\applications\cacls\cacls.exe 1 -;base\applications\calc\calc.exe 1 -;base\applications\charmap\charmap.exe 1 -;base\applications\cmdutils\dbgprint\dbgprint.exe 1 -;base\applications\cmdutils\doskey\doskey.exe 1 -;base\applications\cmdutils\find\find.exe 1 -;base\applications\cmdutils\hostname\hostname.exe 1 -;base\applications\cmdutils\more\more.exe 1 -;base\applications\cmdutils\xcopy\xcopy.exe 1 -;base\applications\control\control.exe 1 -;base\applications\mscutils\devmgmt\devmgmt.exe 1 -;base\applications\mscutils\eventvwr\eventvwr.exe 1 -;base\applications\games\solitaire\sol.exe 1 -;base\applications\games\winemine\winemine.exe 1 -;base\applications\hh\hh.exe 1 -;base\applications\kbswitch\kbswitch.exe 1 -;base\applications\kbswitch\kbsdll\kbsdll.dll 1 -;base\applications\logoff\logoff.exe 1 -;base\applications\msconfig\msconfig.exe 1 -;base\applications\mstsc\mstsc.exe 1 -;base\applications\network\arp\arp.exe 1 -;base\applications\network\dwnl\dwnl.exe 1 -;base\applications\network\route\route.exe 1 -;base\applications\network\finger\finger.exe 1 -;base\applications\network\ftp\ftp.exe 1 -;base\applications\network\ipconfig\ipconfig.exe 1 -;base\applications\network\netstat\netstat.exe 1 -;base\applications\network\ping\ping.exe 1 +base\applications\cacls\cacls.exe 1 +base\applications\calc\calc.exe 1 +base\applications\charmap\charmap.exe 1 +base\applications\cmdutils\dbgprint\dbgprint.exe 1 +base\applications\cmdutils\doskey\doskey.exe 1 +base\applications\cmdutils\find\find.exe 1 +base\applications\cmdutils\hostname\hostname.exe 1 +base\applications\cmdutils\more\more.exe 1 +base\applications\cmdutils\xcopy\xcopy.exe 1 +base\applications\control\control.exe 1 +base\applications\mscutils\devmgmt\devmgmt.exe 1 +base\applications\mscutils\eventvwr\eventvwr.exe 1 +base\applications\games\solitaire\sol.exe 1 +base\applications\games\winemine\winemine.exe 1 +base\applications\hh\hh.exe 1 +base\applications\kbswitch\kbswitch.exe 1 +base\applications\kbswitch\kbsdll\kbsdll.dll 1 +base\applications\logoff\logoff.exe 1 +base\applications\msconfig\msconfig.exe 1 +base\applications\mstsc\mstsc.exe 1 +base\applications\network\arp\arp.exe 1 +base\applications\network\dwnl\dwnl.exe 1 +base\applications\network\route\route.exe 1 +base\applications\network\finger\finger.exe 1 +base\applications\network\ftp\ftp.exe 1 +base\applications\network\ipconfig\ipconfig.exe 1 +base\applications\network\netstat\netstat.exe 1 +base\applications\network\ping\ping.exe 1 ;base\applications\network\telnet\telnet.exe 1 -;base\applications\network\tracert\tracert.exe 1 -;base\applications\network\whois\whois.exe 1 -;base\applications\notepad\notepad.exe 1 -;base\applications\regedit\regedit.exe 4 -;base\applications\regedit\clb\clb.dll 1 -;base\applications\sc\sc.exe 1 -;base\applications\screensavers\3dtext\3dtext.scr 1 -;base\applications\screensavers\logon\logon.scr 1 -;base\applications\mscutils\servman\servman.exe 1 -;base\applications\shutdown\shutdown.exe 1 -;base\applications\sndvol32\sndvol32.exe 1 -;base\applications\taskmgr\taskmgr.exe 1 -;base\applications\winhlp32\winhlp32.exe 1 -;base\applications\wordpad\wordpad.exe 1 +base\applications\network\tracert\tracert.exe 1 +base\applications\network\whois\whois.exe 1 +base\applications\notepad\notepad.exe 1 +base\applications\regedit\regedit.exe 4 +base\applications\regedit\clb\clb.dll 1 +base\applications\sc\sc.exe 1 +base\applications\screensavers\3dtext\3dtext.scr 1 +base\applications\screensavers\logon\logon.scr 1 +base\applications\mscutils\servman\servman.exe 1 +base\applications\shutdown\shutdown.exe 1 +base\applications\sndvol32\sndvol32.exe 1 +base\applications\taskmgr\taskmgr.exe 1 +base\applications\winhlp32\winhlp32.exe 1 +base\applications\wordpad\wordpad.exe 1 -;base\services\audiosrv\audiosrv.exe 1 -;base\services\dhcp\dhcp.exe 1 -;base\services\eventlog\eventlog.exe 1 -;base\services\rpcss\rpcss.exe 1 -;base\services\spoolsv\spoolsv.exe 1 -;base\services\tcpsvcs\tcpsvcs.exe 1 -;base\services\tcpsvcs\quotes 5 -;base\services\umpnpmgr\umpnpmgr.exe 1 -;base\services\audiosrv\audiosrv.exe 1 +base\services\audiosrv\audiosrv.exe 1 +base\services\dhcp\dhcp.exe 1 +base\services\eventlog\eventlog.exe 1 +base\services\rpcss\rpcss.exe 1 +base\services\spoolsv\spoolsv.exe 1 +base\services\tcpsvcs\tcpsvcs.exe 1 +base\services\tcpsvcs\quotes 5 +base\services\umpnpmgr\umpnpmgr.exe 1 +base\services\audiosrv\audiosrv.exe 1 -;base\setup\setup\setup.exe 1 -;base\setup\vmwinst\vmwinst.exe 1 +base\setup\setup\setup.exe 1 +base\setup\vmwinst\vmwinst.exe 1 -;base\shell\cmd\cmd.exe 1 +base\shell\cmd\cmd.exe 1 ;base\shell\explorer\explorer.exe 4 -;base\shell\explorer\explorer-cfg-template.xml 4 +base\shell\explorer\explorer-cfg-template.xml 4 ;base\shell\explorer\notifyhook\notifyhook.dll 1 -;base\shell\explorer-new\explorer_new.exe 4 optional +base\shell\explorer-new\explorer_new.exe 4 optional -;base\system\autochk\autochk.exe 1 -;base\system\bootok\bootok.exe 1 -;base\system\format\format.exe 1 -;base\system\lsass\lsass.exe 1 -;base\system\msiexec\msiexec.exe 1 -;base\system\regsvr32\regsvr32.exe 1 -;base\system\rundll32\rundll32.exe 1 -;base\system\services\services.exe 1 -;base\system\userinit\userinit.exe 1 -;base\system\winlogon\winlogon.exe 1 -;base\system\expand\expand.exe 1 -;base\system\smss\smss.exe 1 +base\system\autochk\autochk.exe 1 +base\system\bootok\bootok.exe 1 +base\system\format\format.exe 1 +base\system\lsass\lsass.exe 1 +base\system\msiexec\msiexec.exe 1 +base\system\regsvr32\regsvr32.exe 1 +base\system\rundll32\rundll32.exe 1 +base\system\services\services.exe 1 +base\system\userinit\userinit.exe 1 +base\system\winlogon\winlogon.exe 1 +base\system\expand\expand.exe 1 +base\system\smss\smss.exe 1 ; Dynamic Link Libraries -;dll\3rdparty\freetype\freetype.dll 1 -;dll\3rdparty\mesa32\mesa32.dll 1 -;dll\3rdparty\dxtn\dxtn.dll 1 optional +dll\3rdparty\freetype\freetype.dll 1 +dll\3rdparty\mesa32\mesa32.dll 1 +dll\3rdparty\dxtn\dxtn.dll 1 optional -;dll\cpl\access\access.cpl 1 -;dll\cpl\appwiz\appwiz.cpl 1 -;dll\cpl\console\console.dll 1 -;dll\cpl\desk\desk.cpl 1 -;dll\cpl\intl\intl.cpl 1 -;dll\cpl\main\main.cpl 1 -;dll\cpl\mmsys\mmsys.cpl 1 -;dll\cpl\ncpa\ncpa.cpl 1 -;dll\cpl\powercfg\powercfg.cpl 1 -;dll\cpl\sysdm\sysdm.cpl 1 -;dll\cpl\timedate\timedate.cpl 1 -;dll\cpl\input\input.dll 1 -;dll\cpl\joy\joy.cpl 1 +dll\cpl\access\access.cpl 1 +dll\cpl\appwiz\appwiz.cpl 1 +dll\cpl\console\console.dll 1 +dll\cpl\desk\desk.cpl 1 +dll\cpl\intl\intl.cpl 1 +dll\cpl\main\main.cpl 1 +dll\cpl\mmsys\mmsys.cpl 1 +dll\cpl\ncpa\ncpa.cpl 1 +dll\cpl\powercfg\powercfg.cpl 1 +dll\cpl\sysdm\sysdm.cpl 1 +dll\cpl\timedate\timedate.cpl 1 +dll\cpl\input\input.dll 1 +dll\cpl\joy\joy.cpl 1 -;dll\directx\dinput\dinput.dll 1 -;dll\directx\dinput8\dinput8.dll 1 -;dll\directx\dplay\dplay.dll 1 -;dll\directx\dplayx\dplayx.dll 1 -;dll\directx\dsound\dsound.dll 1 -;dll\directx\dxdiagn\dxdiagn.dll 1 -;dll\directx\ddraw\ddraw.dll 1 -;dll\directx\d3d8thk\d3d8thk.dll 1 -;dll\directx\devenum\devenum.dll 1 -;dll\directx\ksproxy\ksproxy.ax 1 -;dll\directx\ksuser\ksuser.dll 1 -;dll\directx\msdmo\msdmo.dll 1 -;dll\directx\quartz\quartz.dll 1 -;dll\directx\qedit\qedit.dll 1 +dll\directx\dinput\dinput.dll 1 +dll\directx\dinput8\dinput8.dll 1 +dll\directx\dplay\dplay.dll 1 +dll\directx\dplayx\dplayx.dll 1 +dll\directx\dsound\dsound.dll 1 +dll\directx\dxdiagn\dxdiagn.dll 1 +dll\directx\ddraw\ddraw.dll 1 +dll\directx\d3d8thk\d3d8thk.dll 1 +dll\directx\devenum\devenum.dll 1 +dll\directx\ksproxy\ksproxy.ax 1 +dll\directx\ksuser\ksuser.dll 1 +dll\directx\msdmo\msdmo.dll 1 +dll\directx\quartz\quartz.dll 1 +dll\directx\qedit\qedit.dll 1 ;dll\directx\wine\d3d8\d3d8.dll 1 ;dll\directx\wine\wined3d\wined3d.dll 1 ;dll\directx\wine\d3d9\d3d9.dll 1 -;dll\keyboard\kbda1\kbda1.dll 1 -;dll\keyboard\kbda2\kbda2.dll 1 -;dll\keyboard\kbda3\kbda3.dll 1 -;dll\keyboard\kbdal\kbdal.dll 1 -;dll\keyboard\kbdarme\kbdarme.dll 1 -;dll\keyboard\kbdarmw\kbdarmw.dll 1 -;dll\keyboard\kbdaze\kbdaze.dll 1 -;dll\keyboard\kbdazel\kbdazel.dll 1 -;dll\keyboard\kbdbgm\kbdbgm.dll 1 -;dll\keyboard\kbdbgt\kbdbgt.dll 1 -;dll\keyboard\kbdblr\kbdblr.dll 1 -;dll\keyboard\kbdbr\kbdbr.dll 1 -;dll\keyboard\kbdbga\kbdbga.dll 1 -;dll\keyboard\kbdbe\kbdbe.dll 1 -;dll\keyboard\kbdbur\kbdbur.dll 1 -;dll\keyboard\kbdcan\kbdcan.dll 1 -;dll\keyboard\kbdcr\kbdcr.dll 1 -;dll\keyboard\kbdcz1\kbdcz1.dll 1 -;dll\keyboard\kbdda\kbdda.dll 1 -;dll\keyboard\kbddv\kbddv.dll 1 -;dll\keyboard\kbdes\kbdes.dll 1 -;dll\keyboard\kbdest\kbdest.dll 1 -;dll\keyboard\kbdfc\kbdfc.dll 1 -;dll\keyboard\kbdfi\kbdfi.dll 1 -;dll\keyboard\kbdfr\kbdfr.dll 1 -;dll\keyboard\kbdgeo\kbdgeo.dll 1 -;dll\keyboard\kbdgerg\kbdgerg.dll 1 -;dll\keyboard\kbdgneo\kbdgneo.dll 1 -;dll\keyboard\kbdgrist\kbdgrist.dll 1 -;dll\keyboard\kbdgr\kbdgr.dll 1 -;dll\keyboard\kbdhe\kbdhe.dll 1 -;dll\keyboard\kbdheb\kbdheb.dll 1 -;dll\keyboard\kbdhu\kbdhu.dll 1 -;dll\keyboard\kbdic\kbdic.dll 1 -;dll\keyboard\kbdinasa\kbdinasa.dll 1 -;dll\keyboard\kbdinben\kbdinben.dll 1 -;dll\keyboard\kbdindev\kbdindev.dll 1 -;dll\keyboard\kbdinguj\kbdinguj.dll 1 -;dll\keyboard\kbdinmal\kbdinmal.dll 1 -;dll\keyboard\kbdir\kbdir.dll 1 -;dll\keyboard\kbdit\kbdit.dll 1 -;dll\keyboard\kbdja\kbdja.dll 1 -;dll\keyboard\kbdkaz\kbdkaz.dll 1 -;dll\keyboard\kbdla\kbdla.dll 1 -;dll\keyboard\kbdlt\kbdlt.dll 1 -;dll\keyboard\kbdlv\kbdlv.dll 1 -;dll\keyboard\kbdmac\kbdmac.dll 1 -;dll\keyboard\kbdne\kbdne.dll 1 -;dll\keyboard\kbdno\kbdno.dll 1 -;dll\keyboard\kbdpl1\kbdpl1.dll 1 -;dll\keyboard\kbdpo\kbdpo.dll 1 -;dll\keyboard\kbdro\kbdro.dll 1 -;dll\keyboard\kbdru\kbdru.dll 1 -;dll\keyboard\kbdru1\kbdru1.dll 1 -;dll\keyboard\kbdsg\kbdsg.dll 1 -;dll\keyboard\kbdsk\kbdsk.dll 1 -;dll\keyboard\kbdsk1\kbdsk1.dll 1 -;dll\keyboard\kbdsw\kbdsw.dll 1 -;dll\keyboard\kbdtat\kbdtat.dll 1 -;dll\keyboard\kbdth0\kbdth0.dll 1 -;dll\keyboard\kbdth1\kbdth1.dll 1 -;dll\keyboard\kbdth2\kbdth2.dll 1 -;dll\keyboard\kbdth3\kbdth3.dll 1 -;dll\keyboard\kbdtuf\kbdtuf.dll 1 -;dll\keyboard\kbdtuq\kbdtuq.dll 1 -;dll\keyboard\kbduk\kbduk.dll 1 -;dll\keyboard\kbdur\kbdur.dll 1 -;dll\keyboard\kbdurs\kbdurs.dll 1 -;dll\keyboard\kbdus\kbdus.dll 1 -;dll\keyboard\kbdusa\kbdusa.dll 1 -;dll\keyboard\kbdusl\kbdusl.dll 1 -;dll\keyboard\kbdusr\kbdusr.dll 1 -;dll\keyboard\kbdusx\kbdusx.dll 1 -;dll\keyboard\kbduzb\kbduzb.dll 1 -;dll\keyboard\kbdvntc\kbdvntc.dll 1 -;dll\keyboard\kbdycc\kbdycc.dll 1 -;dll\keyboard\kbdycl\kbdycl.dll 1 -;dll\keyboard\kbdko\kbdko.dll 1 +dll\keyboard\kbda1\kbda1.dll 1 +dll\keyboard\kbda2\kbda2.dll 1 +dll\keyboard\kbda3\kbda3.dll 1 +dll\keyboard\kbdal\kbdal.dll 1 +dll\keyboard\kbdarme\kbdarme.dll 1 +dll\keyboard\kbdarmw\kbdarmw.dll 1 +dll\keyboard\kbdaze\kbdaze.dll 1 +dll\keyboard\kbdazel\kbdazel.dll 1 +dll\keyboard\kbdbgm\kbdbgm.dll 1 +dll\keyboard\kbdbgt\kbdbgt.dll 1 +dll\keyboard\kbdblr\kbdblr.dll 1 +dll\keyboard\kbdbr\kbdbr.dll 1 +dll\keyboard\kbdbga\kbdbga.dll 1 +dll\keyboard\kbdbe\kbdbe.dll 1 +dll\keyboard\kbdbur\kbdbur.dll 1 +dll\keyboard\kbdcan\kbdcan.dll 1 +dll\keyboard\kbdcr\kbdcr.dll 1 +dll\keyboard\kbdcz1\kbdcz1.dll 1 +dll\keyboard\kbdda\kbdda.dll 1 +dll\keyboard\kbddv\kbddv.dll 1 +dll\keyboard\kbdes\kbdes.dll 1 +dll\keyboard\kbdest\kbdest.dll 1 +dll\keyboard\kbdfc\kbdfc.dll 1 +dll\keyboard\kbdfi\kbdfi.dll 1 +dll\keyboard\kbdfr\kbdfr.dll 1 +dll\keyboard\kbdgeo\kbdgeo.dll 1 +dll\keyboard\kbdgerg\kbdgerg.dll 1 +dll\keyboard\kbdgneo\kbdgneo.dll 1 +dll\keyboard\kbdgrist\kbdgrist.dll 1 +dll\keyboard\kbdgr\kbdgr.dll 1 +dll\keyboard\kbdhe\kbdhe.dll 1 +dll\keyboard\kbdheb\kbdheb.dll 1 +dll\keyboard\kbdhu\kbdhu.dll 1 +dll\keyboard\kbdic\kbdic.dll 1 +dll\keyboard\kbdinasa\kbdinasa.dll 1 +dll\keyboard\kbdinben\kbdinben.dll 1 +dll\keyboard\kbdindev\kbdindev.dll 1 +dll\keyboard\kbdinguj\kbdinguj.dll 1 +dll\keyboard\kbdinmal\kbdinmal.dll 1 +dll\keyboard\kbdir\kbdir.dll 1 +dll\keyboard\kbdit\kbdit.dll 1 +dll\keyboard\kbdja\kbdja.dll 1 +dll\keyboard\kbdkaz\kbdkaz.dll 1 +dll\keyboard\kbdla\kbdla.dll 1 +dll\keyboard\kbdlt\kbdlt.dll 1 +dll\keyboard\kbdlv\kbdlv.dll 1 +dll\keyboard\kbdmac\kbdmac.dll 1 +dll\keyboard\kbdne\kbdne.dll 1 +dll\keyboard\kbdno\kbdno.dll 1 +dll\keyboard\kbdpl1\kbdpl1.dll 1 +dll\keyboard\kbdpo\kbdpo.dll 1 +dll\keyboard\kbdro\kbdro.dll 1 +dll\keyboard\kbdru\kbdru.dll 1 +dll\keyboard\kbdru1\kbdru1.dll 1 +dll\keyboard\kbdsg\kbdsg.dll 1 +dll\keyboard\kbdsk\kbdsk.dll 1 +dll\keyboard\kbdsk1\kbdsk1.dll 1 +dll\keyboard\kbdsw\kbdsw.dll 1 +dll\keyboard\kbdtat\kbdtat.dll 1 +dll\keyboard\kbdth0\kbdth0.dll 1 +dll\keyboard\kbdth1\kbdth1.dll 1 +dll\keyboard\kbdth2\kbdth2.dll 1 +dll\keyboard\kbdth3\kbdth3.dll 1 +dll\keyboard\kbdtuf\kbdtuf.dll 1 +dll\keyboard\kbdtuq\kbdtuq.dll 1 +dll\keyboard\kbduk\kbduk.dll 1 +dll\keyboard\kbdur\kbdur.dll 1 +dll\keyboard\kbdurs\kbdurs.dll 1 +dll\keyboard\kbdus\kbdus.dll 1 +dll\keyboard\kbdusa\kbdusa.dll 1 +dll\keyboard\kbdusl\kbdusl.dll 1 +dll\keyboard\kbdusr\kbdusr.dll 1 +dll\keyboard\kbdusx\kbdusx.dll 1 +dll\keyboard\kbduzb\kbduzb.dll 1 +dll\keyboard\kbdvntc\kbdvntc.dll 1 +dll\keyboard\kbdycc\kbdycc.dll 1 +dll\keyboard\kbdycl\kbdycl.dll 1 +dll\keyboard\kbdko\kbdko.dll 1 -;dll\nt;dll\ntdll.dll 1 +dll\ntdll\ntdll.dll 1 -;dll\win32\acledit\acledit.dll 1 -;dll\win32\aclui\aclui.dll 1 -;dll\win32\advapi32\advapi32.dll 1 -;dll\win32\advpack\advpack.dll 1 -;dll\win32\atl\atl.dll 1 -;dll\win32\authz\authz.dll 1 -;dll\win32\avifil32\avifil32.dll 1 -;dll\win32\beepmidi\beepmidi.dll 1 -;dll\win32\browseui\browseui.dll 1 -;dll\win32\cabinet\cabinet.dll 1 -;dll\win32\cards\cards.dll 1 -;dll\win32\cfgmgr32\cfgmgr32.dll 1 -;dll\win32\clusapi\clusapi.dll 1 -;dll\win32\comcat\comcat.dll 1 -;dll\win32\comctl32\comctl32.dll 1 -;dll\win32\comdlg32\comdlg32.dll 1 -;dll\win32\compstui\compstui.dll 1 -;dll\win32\credui\credui.dll 1 -;dll\win32\crtdll\crtdll.dll 1 -;dll\win32\crypt32\crypt32.dll 1 -;dll\win32\cryptdll\cryptdll.dll 1 -;dll\win32\cryptnet\cryptnet.dll 1 -;dll\win32\cryptui\cryptui.dll 1 -;dll\win32\dbghelp\dbghelp.dll 1 -;dll\win32\dciman32\dciman32.dll 1 -;dll\win32\devmgr\devmgr.dll 1 -;dll\win32\dhcpcsvc\dhcpcsvc.dll 1 -;dll\win32\dnsapi\dnsapi.dll 1 -;dll\win32\fmifs\fmifs.dll 1 -;dll\win32\fusion\fusion.dll 1 -;dll\win32\gdi32\gdi32.dll 1 -;dll\win32\gdiplus\gdiplus.dll 1 -;dll\win32\getuname\getuname.dll 1 -;dll\win32\glu32\glu32.dll 1 -;dll\win32\hhctrl.ocx\hhctrl.ocx 1 -;dll\win32\hid\hid.dll 1 -;dll\win32\hlink\hlink.dll 1 -;dll\win32\icmp\icmp.dll 1 -;dll\win32\imagehlp\imagehlp.dll 1 -;dll\win32\imm32\imm32.dll 1 -;dll\win32\inetcomm\inetcomm.dll 1 -;dll\win32\inetmib1\inetmib1.dll 1 -;dll\win32\iphlpapi\iphlpapi.dll 1 -;dll\win32\jscript\jscript.dll 1 -;dll\win32\kernel32\kernel32.dll 1 -;dll\win32\lsasrv\lsasrv.dll 1 -;dll\win32\lz32\lz32.dll 1 -;dll\win32\mapi32\mapi32.dll 1 -;dll\win32\mlang\mlang.dll 1 -;dll\win32\mmdrv\mmdrv.dll 1 -;dll\win32\modemui\modemui.dll 1 -;dll\win32\mpr\mpr.dll 1 -;dll\win32\mprapi\mprapi.dll 1 -;dll\win32\msacm32\msacm32.dll 1 -;dll\win32\msafd\msafd.dll 1 -;dll\win32\mscoree\mscoree.dll 1 -;dll\win32\msgina\msgina.dll 1 -;dll\win32\mshtml\mshtml.dll 1 -;dll\win32\mshtml.tlb\mshtml.tlb 1 -;dll\win32\msi\msi.dll 1 -;dll\win32\msimg32\msimg32.dll 1 -;dll\win32\mstask\mstask.dll 1 -;dll\win32\msvcrt\msvcrt.dll 1 -;dll\win32\msvcrt20\msvcrt20.dll 1 -;dll\win32\msvcrt40\msvcrt40.dll 1 -;dll\win32\msvfw32\msvfw32.dll 1 -;dll\win32\mswsock\mswsock.dll 1 -;dll\win32\msxml3\msxml3.dll 1 -;dll\win32\nddeapi\nddeapi.dll 1 -;dll\win32\netapi32\netapi32.dll 1 -;dll\win32\netcfgx\netcfgx.dll 1 -;dll\win32\netid\netid.dll 1 -;dll\win32\netshell\netshell.dll 1 -;dll\win32\newdev\newdev.dll 1 -;dll\win32\ntdsapi\ntdsapi.dll 1 -;dll\win32\ntmarta\ntmarta.dll 1 -;dll\win32\objsel\objsel.dll 1 -;dll\win32\odbc32\odbc32.dll 1 -;dll\win32\odbccp32\odbccp32.dll 1 -;dll\win32\ole32\ole32.dll 1 -;dll\win32\oleacc\oleacc.dll 1 -;dll\win32\oleaut32\oleaut32.dll 1 -;dll\win32\oledlg\oledlg.dll 1 -;dll\win32\olepro32\olepro32.dll 1 -;dll\win32\opengl32\opengl32.dll 1 -;dll\win32\pdh\pdh.dll 1 -;dll\win32\powrprof\powrprof.dll 1 -;dll\win32\printui\printui.dll 1 -;dll\win32\psapi\psapi.dll 1 -;dll\win32\pstorec\pstorec.dll 1 -;dll\win32\rasapi32\rasapi32.dll 1 -;dll\win32\rasdlg\rasdlg.dll 1 -;dll\win32\rasman\rasman.dll 1 -;dll\win32\riched20\riched20.dll 1 -;dll\win32\riched32\riched32.dll 1 -;dll\win32\rpcrt4\rpcrt4.dll 1 -;dll\win32\rsabase\rsabase.dll 1 -;dll\win32\rsaenh\rsaenh.dll 1 -;dll\win32\samlib\samlib.dll 1 -;dll\win32\samsrv\samsrv.dll 1 -;dll\win32\schannel\schannel.dll 1 -;dll\win32\secur32\secur32.dll 1 -;dll\win32\security\security.dll 1 -;dll\win32\sensapi\sensapi.dll 1 -;dll\win32\serialui\serialui.dll 1 -;dll\win32\setupapi\setupapi.dll 1 -;dll\win32\sfc\sfc.dll 1 -;dll\win32\sfc_os\sfc_os.dll 1 -;dll\win32\shdocvw\shdocvw.dll 1 -;dll\win32\shell32\shell32.dll 1 -;dll\win32\shfolder\shfolder.dll 1 -;dll\win32\shimgvw\shimgvw.dll 1 -;dll\win32\shlwapi\shlwapi.dll 1 -;dll\win32\smdll\smdll.dll 1 -;dll\win32\snmpapi\snmpapi.dll 1 -;dll\win32\stdole2.tlb\stdole2.tlb 1 -;dll\win32\stdole32.tlb\stdole32.tlb 1 -;dll\win32\sxs\sxs.dll 1 -;dll\win32\syssetup\syssetup.dll 1 -;dll\win32\tapi32\tapi32.dll 1 -;dll\win32\tapiui\tapiui.dll 1 -;dll\win32\twain_32\twain_32.dll 1 -;dll\win32\uext2\uext2.dll 1 -;dll\win32\ufat\ufat.dll 1 -;dll\win32\ufatx\ufatx.dll 1 optional -;dll\win32\untfs\untfs.dll 1 -;dll\win32\urlmon\urlmon.dll 1 -;dll\win32\user32\user32.dll 1 -;dll\win32\userenv\userenv.dll 1 -;dll\win32\usp10\usp10.dll 1 -;dll\win32\uxtheme\uxtheme.dll 1 -;dll\win32\vdmdbg\vdmdbg.dll 1 -;dll\win32\version\version.dll 1 -;dll\win32\winfax\winfax.dll 1 -;dll\win32\winhttp\winhttp.dll 1 -;dll\win32\wininet\wininet.dll 1 -;dll\win32\winmm\winmm.dll 1 -;dll\win32\winspool\winspool.drv 1 -;dll\win32\winsta\winsta.dll 1 -;dll\win32\wintrust\wintrust.dll 1 -;dll\win32\wldap32\wldap32.dll 1 -;dll\win32\ws2_32\ws2_32.dll 1 -;dll\win32\ws2help\ws2help.dll 1 -;dll\win32\wshirda\wshirda.dll 1 -;dll\win32\wshtcpip\wshtcpip.dll 1 -;dll\win32\wsock32\wsock32.dll 1 -;dll\win32\wtsapi32\wtsapi32.dll 1 -;dll\win32\winmm\midimap\midimap.dll 1 -;dll\win32\winmm\wavemap\msacm32.drv 1 optional +dll\win32\acledit\acledit.dll 1 +dll\win32\aclui\aclui.dll 1 +dll\win32\advapi32\advapi32.dll 1 +dll\win32\advpack\advpack.dll 1 +dll\win32\atl\atl.dll 1 +dll\win32\authz\authz.dll 1 +dll\win32\avifil32\avifil32.dll 1 +dll\win32\beepmidi\beepmidi.dll 1 +dll\win32\browseui\browseui.dll 1 +dll\win32\cabinet\cabinet.dll 1 +dll\win32\cards\cards.dll 1 +dll\win32\cfgmgr32\cfgmgr32.dll 1 +dll\win32\clusapi\clusapi.dll 1 +dll\win32\comcat\comcat.dll 1 +dll\win32\comctl32\comctl32.dll 1 +dll\win32\comdlg32\comdlg32.dll 1 +dll\win32\compstui\compstui.dll 1 +dll\win32\credui\credui.dll 1 +dll\win32\crtdll\crtdll.dll 1 +dll\win32\crypt32\crypt32.dll 1 +dll\win32\cryptdll\cryptdll.dll 1 +dll\win32\cryptnet\cryptnet.dll 1 +dll\win32\cryptui\cryptui.dll 1 +dll\win32\dbghelp\dbghelp.dll 1 +dll\win32\dciman32\dciman32.dll 1 +dll\win32\devmgr\devmgr.dll 1 +dll\win32\dhcpcsvc\dhcpcsvc.dll 1 +dll\win32\dnsapi\dnsapi.dll 1 +dll\win32\fmifs\fmifs.dll 1 +dll\win32\fusion\fusion.dll 1 +dll\win32\gdi32\gdi32.dll 1 +dll\win32\gdiplus\gdiplus.dll 1 +dll\win32\getuname\getuname.dll 1 +dll\win32\glu32\glu32.dll 1 +dll\win32\hhctrl.ocx\hhctrl.ocx 1 +dll\win32\hid\hid.dll 1 +dll\win32\hlink\hlink.dll 1 +dll\win32\icmp\icmp.dll 1 +dll\win32\imagehlp\imagehlp.dll 1 +dll\win32\imm32\imm32.dll 1 +dll\win32\inetcomm\inetcomm.dll 1 +dll\win32\inetmib1\inetmib1.dll 1 +dll\win32\iphlpapi\iphlpapi.dll 1 +dll\win32\jscript\jscript.dll 1 +dll\win32\kernel32\kernel32.dll 1 +dll\win32\lsasrv\lsasrv.dll 1 +dll\win32\lz32\lz32.dll 1 +dll\win32\mapi32\mapi32.dll 1 +dll\win32\mlang\mlang.dll 1 +dll\win32\mmdrv\mmdrv.dll 1 +dll\win32\modemui\modemui.dll 1 +dll\win32\mpr\mpr.dll 1 +dll\win32\mprapi\mprapi.dll 1 +dll\win32\msacm32\msacm32.dll 1 +dll\win32\msafd\msafd.dll 1 +dll\win32\mscoree\mscoree.dll 1 +dll\win32\msgina\msgina.dll 1 +dll\win32\mshtml\mshtml.dll 1 +dll\win32\mshtml.tlb\mshtml.tlb 1 +dll\win32\msi\msi.dll 1 +dll\win32\msimg32\msimg32.dll 1 +dll\win32\mstask\mstask.dll 1 +dll\win32\msvcrt\msvcrt.dll 1 +dll\win32\msvcrt20\msvcrt20.dll 1 +dll\win32\msvcrt40\msvcrt40.dll 1 +dll\win32\msvfw32\msvfw32.dll 1 +dll\win32\mswsock\mswsock.dll 1 +dll\win32\msxml3\msxml3.dll 1 +dll\win32\nddeapi\nddeapi.dll 1 +dll\win32\netapi32\netapi32.dll 1 +dll\win32\netcfgx\netcfgx.dll 1 +dll\win32\netid\netid.dll 1 +dll\win32\netshell\netshell.dll 1 +dll\win32\newdev\newdev.dll 1 +dll\win32\ntdsapi\ntdsapi.dll 1 +dll\win32\ntmarta\ntmarta.dll 1 +dll\win32\objsel\objsel.dll 1 +dll\win32\odbc32\odbc32.dll 1 +dll\win32\odbccp32\odbccp32.dll 1 +dll\win32\ole32\ole32.dll 1 +dll\win32\oleacc\oleacc.dll 1 +dll\win32\oleaut32\oleaut32.dll 1 +dll\win32\oledlg\oledlg.dll 1 +dll\win32\olepro32\olepro32.dll 1 +dll\win32\opengl32\opengl32.dll 1 +dll\win32\pdh\pdh.dll 1 +dll\win32\powrprof\powrprof.dll 1 +dll\win32\printui\printui.dll 1 +dll\win32\psapi\psapi.dll 1 +dll\win32\pstorec\pstorec.dll 1 +dll\win32\rasapi32\rasapi32.dll 1 +dll\win32\rasdlg\rasdlg.dll 1 +dll\win32\rasman\rasman.dll 1 +dll\win32\riched20\riched20.dll 1 +dll\win32\riched32\riched32.dll 1 +dll\win32\rpcrt4\rpcrt4.dll 1 +dll\win32\rsabase\rsabase.dll 1 +dll\win32\rsaenh\rsaenh.dll 1 +dll\win32\samlib\samlib.dll 1 +dll\win32\samsrv\samsrv.dll 1 +dll\win32\schannel\schannel.dll 1 +dll\win32\secur32\secur32.dll 1 +dll\win32\security\security.dll 1 +dll\win32\sensapi\sensapi.dll 1 +dll\win32\serialui\serialui.dll 1 +dll\win32\setupapi\setupapi.dll 1 +dll\win32\sfc\sfc.dll 1 +dll\win32\sfc_os\sfc_os.dll 1 +dll\win32\shdocvw\shdocvw.dll 1 +dll\win32\shell32\shell32.dll 1 +dll\win32\shfolder\shfolder.dll 1 +dll\win32\shimgvw\shimgvw.dll 1 +dll\win32\shlwapi\shlwapi.dll 1 +dll\win32\smdll\smdll.dll 1 +dll\win32\snmpapi\snmpapi.dll 1 +dll\win32\stdole2.tlb\stdole2.tlb 1 +dll\win32\stdole32.tlb\stdole32.tlb 1 +dll\win32\sxs\sxs.dll 1 +dll\win32\syssetup\syssetup.dll 1 +dll\win32\tapi32\tapi32.dll 1 +dll\win32\tapiui\tapiui.dll 1 +dll\win32\twain_32\twain_32.dll 1 +dll\win32\uext2\uext2.dll 1 +dll\win32\ufat\ufat.dll 1 +dll\win32\ufatx\ufatx.dll 1 optional +dll\win32\untfs\untfs.dll 1 +dll\win32\urlmon\urlmon.dll 1 +dll\win32\user32\user32.dll 1 +dll\win32\userenv\userenv.dll 1 +dll\win32\usp10\usp10.dll 1 +dll\win32\uxtheme\uxtheme.dll 1 +dll\win32\vdmdbg\vdmdbg.dll 1 +dll\win32\version\version.dll 1 +dll\win32\winfax\winfax.dll 1 +dll\win32\winhttp\winhttp.dll 1 +dll\win32\wininet\wininet.dll 1 +dll\win32\winmm\winmm.dll 1 +dll\win32\winspool\winspool.drv 1 +dll\win32\winsta\winsta.dll 1 +dll\win32\wintrust\wintrust.dll 1 +dll\win32\wldap32\wldap32.dll 1 +dll\win32\ws2_32\ws2_32.dll 1 +dll\win32\ws2help\ws2help.dll 1 +dll\win32\wshirda\wshirda.dll 1 +dll\win32\wshtcpip\wshtcpip.dll 1 +dll\win32\wsock32\wsock32.dll 1 +dll\win32\wtsapi32\wtsapi32.dll 1 +dll\win32\winmm\midimap\midimap.dll 1 +dll\win32\winmm\wavemap\msacm32.drv 1 optional ; Shell Extensions -;dll\shellext\deskadp\deskadp.dll 1 -;dll\shellext\deskmon\deskmon.dll 1 +dll\shellext\deskadp\deskadp.dll 1 +dll\shellext\deskmon\deskmon.dll 1 ; Drivers -;drivers\base\bootvid\bootvid.dll 1 -;drivers\base\beep\beep.sys 2 -;drivers\base\null\null.sys 2 +drivers\base\bootvid\bootvid.dll 1 +drivers\base\beep\beep.sys 2 +drivers\base\null\null.sys 2 -;drivers\bus\isapnp\isapnp.sys 2 +drivers\bus\isapnp\isapnp.sys 2 -;drivers\directx\dxapi\dxapi.sys 2 -;drivers\directx\dxg\dxg.sys 2 -;drivers\directx\dxgthk\dxgthk.sys 2 +drivers\directx\dxapi\dxapi.sys 2 +drivers\directx\dxg\dxg.sys 2 +drivers\directx\dxgthk\dxgthk.sys 2 -;drivers\filesystems\fs_rec\fs_rec.sys 2 -;drivers\filesystems\msfs\msfs.sys 2 -;drivers\filesystems\mup\mup.sys 2 -;drivers\filesystems\npfs\npfs.sys 2 +drivers\filesystems\fs_rec\fs_rec.sys 2 +drivers\filesystems\msfs\msfs.sys 2 +drivers\filesystems\mup\mup.sys 2 +drivers\filesystems\npfs\npfs.sys 2 -;drivers\input\mouclass\mouclass.sys 2 -;drivers\input\sermouse\sermouse.sys 2 +drivers\input\mouclass\mouclass.sys 2 +drivers\input\sermouse\sermouse.sys 2 -;drivers\network\afd\afd.sys 2 -;drivers\network\ndis\ndis.sys 2 -;drivers\network\tcpip\tcpip.sys 2 -;drivers\network\tdi\tdi.sys 2 -;drivers\network\dd\ne2000\ne2000.sys 2 -;drivers\network\dd\pcnet\pcnet.sys 2 +drivers\network\afd\afd.sys 2 +drivers\network\ndis\ndis.sys 2 +drivers\network\tcpip\tcpip.sys 2 +drivers\network\tdi\tdi.sys 2 +drivers\network\dd\ne2000\ne2000.sys 2 +drivers\network\dd\pcnet\pcnet.sys 2 -;drivers\serial\serenum\serenum.sys 2 -;drivers\serial\serial\serial.sys 2 +drivers\serial\serenum\serenum.sys 2 +drivers\serial\serial\serial.sys 2 -;drivers\storage\ide\pciide\pciide.sys 2 -;drivers\storage\ide\pciidex\pciidex.sys 2 +drivers\storage\ide\pciide\pciide.sys 2 +drivers\storage\ide\pciidex\pciidex.sys 2 -;;drivers\usb\miniport\usbohci\usbohci.sys 2 -;;drivers\usb\miniport\usbuhci\usbuhci.sys 2 -;;drivers\usb\usbhub\usbhub.sys 2 -;;drivers\usb\usbport\usbport.sys 2 -;drivers\usb\nt4compat\usbdriver\usbdriver.sys 2 +;drivers\usb\miniport\usbohci\usbohci.sys 2 +;drivers\usb\miniport\usbuhci\usbuhci.sys 2 +;drivers\usb\usbhub\usbhub.sys 2 +;drivers\usb\usbport\usbport.sys 2 +drivers\usb\nt4compat\usbdriver\usbdriver.sys 2 -;drivers\video\displays\vga\vgaddi.dll 1 -;drivers\video\displays\framebuf\framebuf.dll 1 -;drivers\video\miniport\vga\vgamp.sys 2 -;drivers\video\miniport\vbe\vbemp.sys 2 -;drivers\video\videoprt\videoprt.sys 2 +drivers\video\displays\vga\vgaddi.dll 1 +drivers\video\displays\framebuf\framebuf.dll 1 +drivers\video\miniport\vga\vgamp.sys 2 +drivers\video\miniport\vbe\vbemp.sys 2 +drivers\video\videoprt\videoprt.sys 2 -;drivers\wmi\wmilib.sys 2 +drivers\wmi\wmilib.sys 2 ; Media -;media\fonts\DejaVuSans.ttf 3 -;media\fonts\DejaVuSans-Bold.ttf 3 -;media\fonts\DejaVuSans-BoldOblique.ttf 3 -;media\fonts\DejaVuSansMono.ttf 3 -;media\fonts\DejaVuSansMono-Bold.ttf 3 -;media\fonts\DejaVuSansMono-BoldOblique.ttf 3 -;media\fonts\DejaVuSansMono-Oblique.ttf 3 -;media\fonts\DejaVuSans-Oblique.ttf 3 -;media\fonts\DejaVuSerif.ttf 3 -;media\fonts\DejaVuSerif-Bold.ttf 3 -;media\fonts\DejaVuSerif-BoldItalic.ttf 3 -;media\fonts\DejaVuSerif-Italic.ttf 3 +media\fonts\DejaVuSans.ttf 3 +media\fonts\DejaVuSans-Bold.ttf 3 +media\fonts\DejaVuSans-BoldOblique.ttf 3 +media\fonts\DejaVuSansMono.ttf 3 +media\fonts\DejaVuSansMono-Bold.ttf 3 +media\fonts\DejaVuSansMono-BoldOblique.ttf 3 +media\fonts\DejaVuSansMono-Oblique.ttf 3 +media\fonts\DejaVuSans-Oblique.ttf 3 +media\fonts\DejaVuSerif.ttf 3 +media\fonts\DejaVuSerif-Bold.ttf 3 +media\fonts\DejaVuSerif-BoldItalic.ttf 3 +media\fonts\DejaVuSerif-Italic.ttf 3 -;media\fonts\FreeMono.ttf 3 -;media\fonts\FreeMonoBold.ttf 3 -;media\fonts\FreeMonoBoldOblique.ttf 3 -;media\fonts\FreeMonoOblique.ttf 3 +media\fonts\FreeMono.ttf 3 +media\fonts\FreeMonoBold.ttf 3 +media\fonts\FreeMonoBoldOblique.ttf 3 +media\fonts\FreeMonoOblique.ttf 3 -;media\fonts\LiberationMono-Bold.ttf 3 -;media\fonts\LiberationMono-BoldItalic.ttf 3 -;media\fonts\LiberationMono-Italic.ttf 3 -;media\fonts\LiberationMono-Regular.ttf 3 -;media\fonts\LiberationSans-Bold.ttf 3 -;media\fonts\LiberationSans-BoldItalic.ttf 3 -;media\fonts\LiberationSans-Italic.ttf 3 -;media\fonts\LiberationSans-Regular.ttf 3 -;media\fonts\LiberationSerif-Bold.ttf 3 -;media\fonts\LiberationSerif-BoldItalic.ttf 3 -;media\fonts\LiberationSerif-Italic.ttf 3 -;media\fonts\LiberationSerif-Regular.ttf 3 +media\fonts\LiberationMono-Bold.ttf 3 +media\fonts\LiberationMono-BoldItalic.ttf 3 +media\fonts\LiberationMono-Italic.ttf 3 +media\fonts\LiberationMono-Regular.ttf 3 +media\fonts\LiberationSans-Bold.ttf 3 +media\fonts\LiberationSans-BoldItalic.ttf 3 +media\fonts\LiberationSans-Italic.ttf 3 +media\fonts\LiberationSans-Regular.ttf 3 +media\fonts\LiberationSerif-Bold.ttf 3 +media\fonts\LiberationSerif-BoldItalic.ttf 3 +media\fonts\LiberationSerif-Italic.ttf 3 +media\fonts\LiberationSerif-Regular.ttf 3 -;media\fonts\Marlett.ttf 3 -;media\fonts\tahoma.ttf 3 -;media\fonts\tahomabd.ttf 3 +media\fonts\Marlett.ttf 3 +media\fonts\tahoma.ttf 3 +media\fonts\tahomabd.ttf 3 -;media\nls\c_037.nls 1 -;media\nls\c_500.nls 1 -;media\nls\c_737.nls 1 -;media\nls\c_775.nls 1 -;media\nls\c_850.nls 1 -;media\nls\c_852.nls 1 -;media\nls\c_855.nls 1 -;media\nls\c_856.nls 1 -;media\nls\c_857.nls 1 -;media\nls\c_860.nls 1 -;media\nls\c_861.nls 1 -;media\nls\c_862.nls 1 -;media\nls\c_863.nls 1 -;media\nls\c_864.nls 1 -;media\nls\c_865.nls 1 -;media\nls\c_866.nls 1 -;media\nls\c_869.nls 1 -;media\nls\c_874.nls 1 -;media\nls\c_875.nls 1 -;media\nls\c_878.nls 1 -;media\nls\c_932.nls 1 -;media\nls\c_936.nls 1 -;media\nls\c_949.nls 1 -;media\nls\c_950.nls 1 -;media\nls\c_1006.nls 1 -;media\nls\c_1026.nls 1 -;media\nls\c_1250.nls 1 -;media\nls\c_1251.nls 1 -;media\nls\c_1253.nls 1 -;media\nls\c_1254.nls 1 -;media\nls\c_1255.nls 1 -;media\nls\c_1256.nls 1 -;media\nls\c_1257.nls 1 -;media\nls\c_1258.nls 1 -;media\nls\c_10000.nls 1 -;media\nls\c_10006.nls 1 -;media\nls\c_10007.nls 1 -;media\nls\c_10029.nls 1 -;media\nls\c_10079.nls 1 -;media\nls\c_10081.nls 1 -;media\nls\c_20866.nls 1 -;media\nls\c_28591.nls 1 -;media\nls\c_28592.nls 1 -;media\nls\c_28593.nls 1 -;media\nls\c_28594.nls 1 -;media\nls\c_28595.nls 1 -;media\nls\c_28596.nls 1 -;media\nls\c_28597.nls 1 -;media\nls\c_28598.nls 1 -;media\nls\c_28599.nls 1 -;media\drivers\etc\services 5 -;media\inf\acpi.inf 6 -;media\inf\cdrom.inf 6 -;media\inf\display.inf 6 -;media\inf\font.inf 6 -;media\inf\hdc.inf 6 -;media\inf\intl.inf 6 -;media\inf\layout.inf 6 -;media\inf\machine.inf 6 -;media\inf\msmouse.inf 6 -;media\inf\keyboard.inf 6 -;media\inf\NET_NIC.inf 6 -;media\inf\netamd.inf 6 -;media\inf\netisa.inf 6 -;media\inf\netrtpnt.inf 6 -;media\inf\nettcpip.inf 6 -;media\inf\ports.inf 6 -;media\inf\scsi.inf 6 -;media\inf\syssetup.inf 6 -;media\inf\usbport.inf 6 -;media\inf\usb.inf 6 -;media\inf\usbstor.inf 6 -;media\inf\xboxdisp.inf 6 +media\nls\c_037.nls 1 +media\nls\c_500.nls 1 +media\nls\c_737.nls 1 +media\nls\c_775.nls 1 +media\nls\c_850.nls 1 +media\nls\c_852.nls 1 +media\nls\c_855.nls 1 +media\nls\c_856.nls 1 +media\nls\c_857.nls 1 +media\nls\c_860.nls 1 +media\nls\c_861.nls 1 +media\nls\c_862.nls 1 +media\nls\c_863.nls 1 +media\nls\c_864.nls 1 +media\nls\c_865.nls 1 +media\nls\c_866.nls 1 +media\nls\c_869.nls 1 +media\nls\c_874.nls 1 +media\nls\c_875.nls 1 +media\nls\c_878.nls 1 +media\nls\c_932.nls 1 +media\nls\c_936.nls 1 +media\nls\c_949.nls 1 +media\nls\c_950.nls 1 +media\nls\c_1006.nls 1 +media\nls\c_1026.nls 1 +media\nls\c_1250.nls 1 +media\nls\c_1251.nls 1 +media\nls\c_1253.nls 1 +media\nls\c_1254.nls 1 +media\nls\c_1255.nls 1 +media\nls\c_1256.nls 1 +media\nls\c_1257.nls 1 +media\nls\c_1258.nls 1 +media\nls\c_10000.nls 1 +media\nls\c_10006.nls 1 +media\nls\c_10007.nls 1 +media\nls\c_10029.nls 1 +media\nls\c_10079.nls 1 +media\nls\c_10081.nls 1 +media\nls\c_20866.nls 1 +media\nls\c_28591.nls 1 +media\nls\c_28592.nls 1 +media\nls\c_28593.nls 1 +media\nls\c_28594.nls 1 +media\nls\c_28595.nls 1 +media\nls\c_28596.nls 1 +media\nls\c_28597.nls 1 +media\nls\c_28598.nls 1 +media\nls\c_28599.nls 1 +media\drivers\etc\services 5 +media\inf\acpi.inf 6 +media\inf\cdrom.inf 6 +media\inf\display.inf 6 +media\inf\font.inf 6 +media\inf\hdc.inf 6 +media\inf\intl.inf 6 +media\inf\layout.inf 6 +media\inf\machine.inf 6 +media\inf\msmouse.inf 6 +media\inf\keyboard.inf 6 +media\inf\NET_NIC.inf 6 +media\inf\netamd.inf 6 +media\inf\netisa.inf 6 +media\inf\netrtpnt.inf 6 +media\inf\nettcpip.inf 6 +media\inf\ports.inf 6 +media\inf\scsi.inf 6 +media\inf\syssetup.inf 6 +media\inf\usbport.inf 6 +media\inf\usb.inf 6 +media\inf\usbstor.inf 6 +media\inf\xboxdisp.inf 6 ; Subsystems -;subsystems\win32\csrss\csrss.exe 1 -;subsystems\win32\csrss\win32csr\win32csr.dll 1 -;subsystems\ntvdm\ntvdm.exe 1 -;subsystems\win32\win32k\win32k.sys 1 +subsystems\win32\csrss\csrss.exe 1 +subsystems\win32\csrss\win32csr\win32csr.dll 1 +subsystems\csr\csr.exe 1 optional +subsystems\csr\csrsrv\csrsrv.dll 1 optional +subsystems\win\basesrv\basesrv.dll 1 optional +subsystems\win\winsrv\winsrv.dll 1 optional +subsystems\ntvdm\ntvdm.exe 1 +subsystems\win32\win32k\win32k.sys 1 + boot\bootdata\bootcdregtest\testboot.bat 7 optional +tools\dbgprint\dbgprint.exe 7 optional ; Modules -;modules\rosapps\applications\screensavers\cylfrac\cylfrac.scr 1 optional -;modules\rosapps\applications\screensavers\matrix\matrix.scr 1 optional -;modules\rosapps\applications\screensavers\blankscr\scrnsave.scr 1 optional -;modules\rosapps\applications\screensavers\starfield\starfield.scr 1 optional -;modules\rosapps\applications\screensavers\mazescr\mazescr.scr 1 optional -;modules\rosapps\applications\screensavers\butterflies\butterflies.scr 1 optional -;modules\rosapps\applications\cmdutils\comp\comp.exe 1 optional -;modules\rosapps\applications\cmdutils\mode\mode.exe 1 optional -;modules\rosapps\applications\cmdutils\sort\sort.exe 1 optional -;modules\rosapps\applications\cmdutils\tee\tee.exe 1 optional -;modules\rosapps\applications\cmdutils\touch\touch.exe 1 optional -;modules\rosapps\applications\cmdutils\uptime\uptime.exe 1 optional -;modules\rosapps\applications\cmdutils\y\y.exe 1 optional -;modules\rosapps\applications\devutils\gdb2\gdb2.exe 1 optional -;modules\rosapps\applications\devutils\gdihv\gdihv.exe 1 optional -;modules\rosapps\applications\devutils\genguid\genguid.exe 1 optional -;modules\rosapps\applications\devutils\gettype\gettype.exe 1 optional -;modules\rosapps\applications\devutils\roswebparser\roswebparser.exe 1 optional -;modules\rosapps\applications\devutils\zoomin\zoomin.exe 1 optional -;modules\rosapps\applications\downloader\downloader.exe 1 optional -;modules\rosapps\applications\downloader\downloader.xml 1 optional -;modules\rosapps\applications\fontview\fontview.exe 1 optional -;modules\rosapps\applications\imagesoft\imagesoft.exe 1 optional -;modules\rosapps\applications\net\ncftp\ncftp.exe 1 optional -;modules\rosapps\applications\net\netreg\netreg.exe 1 optional -;modules\rosapps\applications\net\niclist\niclist.exe 1 optional -;modules\rosapps\applications\net\roshttpd\roshttpd.exe 1 optional -;modules\rosapps\applications\notevil\notevil.exe 1 optional -;modules\rosapps\applications\magnify\magnify.exe 1 optional -;modules\rosapps\applications\packmgr\cmd-line\rosget.exe 1 optional -;modules\rosapps\applications\packmgr\gui\packmgr.exe 1 optional -;modules\rosapps\applications\packmgr\lib\package.dll 1 optional -;modules\rosapps\applications\sysutils\chkdsk\chkdsk.exe 1 optional -;modules\rosapps\applications\sysutils\systeminfo\systeminfo.exe 1 optional -;modules\rosapps\applications\sysutils\chklib\chklib.exe 1 optional -;modules\rosapps\applications\sysutils\ctm\ctm.exe 1 optional -;modules\rosapps\applications\sysutils\dosfsck\dosfsck.exe 1 optional -;modules\rosapps\applications\sysutils\kill\kill.exe 1 optional -;modules\rosapps\applications\sysutils\lsdd\lsdd.exe 1 optional -;modules\rosapps\applications\sysutils\man\man.exe 1 optional -;modules\rosapps\applications\sysutils\pedump\pedump.exe 1 optional -;modules\rosapps\applications\sysutils\regexpl\regexpl.exe 1 optional -;modules\rosapps\applications\sysutils\tcat\tcat.exe 1 optional -;modules\rosapps\applications\sysutils\tlist\tlist.exe 1 optional -;modules\rosapps\applications\sysutils\screenshot\screenshot.exe 1 optional -;modules\rosapps\applications\sysutils\utils\binpatch\binpatch.exe 1 optional -;modules\rosapps\applications\sysutils\utils\cat\cat.exe 1 optional -;modules\rosapps\applications\sysutils\utils\driver\load\load.exe 1 optional -;modules\rosapps\applications\sysutils\utils\driver\unload\unload.exe 1 optional -;modules\rosapps\applications\sysutils\utils\infinst\infinst.exe 1 optional -;modules\rosapps\applications\sysutils\utils\nts2w32err\nts2w32err.exe 1 optional -;modules\rosapps\applications\sysutils\utils\objdir\objdir.exe 1 optional -;modules\rosapps\applications\sysutils\utils\partinfo\partinfo.exe 1 optional -;modules\rosapps\applications\sysutils\utils\ps\ps.exe 1 optional -;modules\rosapps\applications\sysutils\utils\rosperf\rosperf.exe 1 optional -;modules\rosapps\applications\sysutils\utils\stats\stats.exe 1 optional -;modules\rosapps\applications\sysutils\utils\tickcount\tickcount.exe 1 optional -;modules\rosapps\applications\winfile\winfile.exe 1 optional -;modules\rosapps\applications\winver\winver.exe 1 optional -;modules\rosapps\applications\write\write.exe 1 optional -;modules\rosapps\demos\ddraw\ddraw_demo.exe 1 optional -;modules\rosapps\demos\maze\maze.exe 1 optional -;modules\rosapps\dflat32\edit.exe 1 optional -;modules\rosapps\drivers\avtest\avtest.sys 1 optional -;modules\rosapps\drivers\ramdrv\ramdrv.sys 1 optional -;modules\rosapps\drivers\green\green.sys 1 optional -;modules\rosapps\templates\dialog\dialog.exe 1 optional -;modules\rostests\winetests\advapi32\advapi32_winetest.exe 7 optional -;modules\rostests\winetests\advpack\advpack_winetest.exe 7 optional -;modules\rostests\winetests\browseui\browseui_winetest.exe 7 optional -;modules\rostests\winetests\cabinet\cabinet_winetest.exe 7 optional -;modules\rostests\winetests\comcat\comcat_winetest.exe 7 optional -;modules\rostests\winetests\comctl32\comctl32_winetest.exe 7 optional -;modules\rostests\winetests\comdlg32\comdlg32_winetest.exe 7 optional -;modules\rostests\winetests\gdi32\gdi32_winetest.exe 7 optional -;modules\rostests\winetests\gdiplus\gdiplus_winetest.exe 7 optional -;modules\rostests\winetests\hlink\hlink_winetest.exe 7 optional -;modules\rostests\winetests\icmp\icmp_winetest.exe 7 optional -;modules\rostests\winetests\kernel32\kernel32_winetest.exe 7 optional -;modules\rostests\winetests\lz32\lz32_winetest.exe 7 optional -;modules\rostests\winetests\mapi32\mapi32_winetest.exe 7 optional -;modules\rostests\winetests\mlang\mlang_winetest.exe 7 optional -;modules\rostests\winetests\mshtml\mshtml_winetest.exe 7 optional -;modules\rostests\winetests\msi\msi_winetest.exe 7 optional -;modules\rostests\winetests\mstask\mstask_winetest.exe 7 optional -;modules\rostests\winetests\msvcrt\msvcrt_winetest.exe 7 optional -;modules\rostests\winetests\netapi32\netapi32_winetest.exe 7 optional -;modules\rostests\winetests\ntdll\ntdll_winetest.exe 7 optional -;modules\rostests\winetests\odbccp32\odbccp32_winetest.exe 7 optional -;modules\rostests\winetests\ole32\ole32_winetest.exe 7 optional -;modules\rostests\winetests\oleaut32\oleaut32_winetest.exe 7 optional -;modules\rostests\winetests\powrprof\powrprof_winetest.exe 7 optional -;modules\rostests\winetests\psapi\psapi_winetest.exe 7 optional -;modules\rostests\winetests\riched20\riched20_winetest.exe 7 optional -;modules\rostests\winetests\rpcrt4\rpcrt4_winetest.exe 7 optional -;modules\rostests\winetests\rsabase\rsabase_winetest.exe 7 optional -;modules\rostests\winetests\rsaenh\rsaenh_winetest.exe 7 optional -;modules\rostests\winetests\schannel\schannel_winetest.exe 7 optional -;modules\rostests\winetests\secur32\secur32_winetest.exe 7 optional -;modules\rostests\winetests\setupapi\setupapi_winetest.exe 7 optional -;modules\rostests\winetests\shdocvw\shdocvw_winetest.exe 7 optional -;modules\rostests\winetests\shell32\shell32_winetest.exe 7 optional -;modules\rostests\winetests\shlwapi\shlwapi_winetest.exe 7 optional -;modules\rostests\winetests\urlmon\urlmon_winetest.exe 7 optional -;modules\rostests\winetests\user32\user32_winetest.exe 7 optional -;modules\rostests\winetests\usp10\usp10_winetest.exe 7 optional -;modules\rostests\winetests\uxtheme\uxtheme_winetest.exe 7 optional -;modules\rostests\winetests\version\version_winetest.exe 7 optional -;modules\rostests\winetests\winhttp\winhttp_winetest.exe 7 optional -;modules\rostests\winetests\wininet\wininet_winetest.exe 7 optional -;modules\wallpaper\lake.bmp 4 optional +modules\os2\server\os2srv.dll 1 optional +modules\os2\dll\win32\doscalls\doscalls.dll 1 optional +modules\posix\server\psxsrv.dll 1 optional +modules\posix\dll\win32\psxdll\psxdll.dll 1 optional +modules\rosky\dll\win32\libsky\libsky.dll 1 optional +modules\rosky\dll\win32\libskygi\libskygi.dll 1 optional +modules\vms\server\vmssrv.dll 1 optional +modules\vms\dll\win32\vmsdll\vmsdll.dll 1 optional +modules\rosapps\applications\screensavers\cylfrac\cylfrac.scr 1 optional +modules\rosapps\applications\screensavers\matrix\matrix.scr 1 optional +modules\rosapps\applications\screensavers\blankscr\scrnsave.scr 1 optional +modules\rosapps\applications\screensavers\starfield\starfield.scr 1 optional +modules\rosapps\applications\screensavers\mazescr\mazescr.scr 1 optional +modules\rosapps\applications\screensavers\butterflies\butterflies.scr 1 optional +modules\rosapps\applications\cmdutils\comp\comp.exe 1 optional +modules\rosapps\applications\cmdutils\mode\mode.exe 1 optional +modules\rosapps\applications\cmdutils\sort\sort.exe 1 optional +modules\rosapps\applications\cmdutils\tee\tee.exe 1 optional +modules\rosapps\applications\cmdutils\touch\touch.exe 1 optional +modules\rosapps\applications\cmdutils\uptime\uptime.exe 1 optional +modules\rosapps\applications\cmdutils\y\y.exe 1 optional +modules\rosapps\applications\devutils\gdb2\gdb2.exe 1 optional +modules\rosapps\applications\devutils\gdihv\gdihv.exe 1 optional +modules\rosapps\applications\devutils\genguid\genguid.exe 1 optional +modules\rosapps\applications\devutils\gettype\gettype.exe 1 optional +modules\rosapps\applications\devutils\roswebparser\roswebparser.exe 1 optional +modules\rosapps\applications\devutils\zoomin\zoomin.exe 1 optional +modules\rosapps\applications\downloader\downloader.exe 1 optional +modules\rosapps\applications\downloader\downloader.xml 1 optional +modules\rosapps\applications\fontview\fontview.exe 1 optional +modules\rosapps\applications\imagesoft\imagesoft.exe 1 optional +modules\rosapps\applications\net\ncftp\ncftp.exe 1 optional +modules\rosapps\applications\net\netreg\netreg.exe 1 optional +modules\rosapps\applications\net\niclist\niclist.exe 1 optional +modules\rosapps\applications\net\roshttpd\roshttpd.exe 1 optional +modules\rosapps\applications\notevil\notevil.exe 1 optional +modules\rosapps\applications\magnify\magnify.exe 1 optional +modules\rosapps\applications\packmgr\cmd-line\rosget.exe 1 optional +modules\rosapps\applications\packmgr\gui\packmgr.exe 1 optional +modules\rosapps\applications\packmgr\lib\package.dll 1 optional +modules\rosapps\applications\sysutils\chkdsk\chkdsk.exe 1 optional +modules\rosapps\applications\sysutils\systeminfo\systeminfo.exe 1 optional +modules\rosapps\applications\sysutils\chklib\chklib.exe 1 optional +modules\rosapps\applications\sysutils\ctm\ctm.exe 1 optional +modules\rosapps\applications\sysutils\dosfsck\dosfsck.exe 1 optional +modules\rosapps\applications\sysutils\kill\kill.exe 1 optional +modules\rosapps\applications\sysutils\lsdd\lsdd.exe 1 optional +modules\rosapps\applications\sysutils\man\man.exe 1 optional +modules\rosapps\applications\sysutils\pedump\pedump.exe 1 optional +modules\rosapps\applications\sysutils\regexpl\regexpl.exe 1 optional +modules\rosapps\applications\sysutils\tcat\tcat.exe 1 optional +modules\rosapps\applications\sysutils\tlist\tlist.exe 1 optional +modules\rosapps\applications\sysutils\screenshot\screenshot.exe 1 optional +modules\rosapps\applications\sysutils\utils\binpatch\binpatch.exe 1 optional +modules\rosapps\applications\sysutils\utils\cat\cat.exe 1 optional +modules\rosapps\applications\sysutils\utils\driver\load\load.exe 1 optional +modules\rosapps\applications\sysutils\utils\driver\unload\unload.exe 1 optional +modules\rosapps\applications\sysutils\utils\infinst\infinst.exe 1 optional +modules\rosapps\applications\sysutils\utils\nts2w32err\nts2w32err.exe 1 optional +modules\rosapps\applications\sysutils\utils\objdir\objdir.exe 1 optional +modules\rosapps\applications\sysutils\utils\partinfo\partinfo.exe 1 optional +modules\rosapps\applications\sysutils\utils\ps\ps.exe 1 optional +modules\rosapps\applications\sysutils\utils\rosperf\rosperf.exe 1 optional +modules\rosapps\applications\sysutils\utils\stats\stats.exe 1 optional +modules\rosapps\applications\sysutils\utils\tickcount\tickcount.exe 1 optional +modules\rosapps\applications\winfile\winfile.exe 1 optional +modules\rosapps\applications\winver\winver.exe 1 optional +modules\rosapps\applications\write\write.exe 1 optional +modules\rosapps\demos\ddraw\ddraw_demo.exe 1 optional +modules\rosapps\demos\maze\maze.exe 1 optional +modules\rosapps\dflat32\edit.exe 1 optional +modules\rosapps\drivers\avtest\avtest.sys 1 optional +modules\rosapps\drivers\ramdrv\ramdrv.sys 1 optional +modules\rosapps\drivers\green\green.sys 1 optional +modules\rosapps\lib\dflat32\dflat32.dll 1 optional +modules\rosapps\templates\dialog.exe 1 optional +modules\rosapps\templates\mdi.exe 1 optional +modules\rostests\winetests\advapi32\advapi32_winetest.exe 7 optional +modules\rostests\winetests\advpack\advpack_winetest.exe 7 optional +modules\rostests\winetests\browseui\browseui_winetest.exe 7 optional +modules\rostests\winetests\cabinet\cabinet_winetest.exe 7 optional +modules\rostests\winetests\comcat\comcat_winetest.exe 7 optional +modules\rostests\winetests\comctl32\comctl32_winetest.exe 7 optional +modules\rostests\winetests\comdlg32\comdlg32_winetest.exe 7 optional +modules\rostests\winetests\gdi32\gdi32_winetest.exe 7 optional +modules\rostests\winetests\gdiplus\gdiplus_winetest.exe 7 optional +modules\rostests\winetests\hlink\hlink_winetest.exe 7 optional +modules\rostests\winetests\icmp\icmp_winetest.exe 7 optional +modules\rostests\winetests\kernel32\kernel32_winetest.exe 7 optional +modules\rostests\winetests\lz32\lz32_winetest.exe 7 optional +modules\rostests\winetests\mapi32\mapi32_winetest.exe 7 optional +modules\rostests\winetests\mlang\mlang_winetest.exe 7 optional +modules\rostests\winetests\mshtml\mshtml_winetest.exe 7 optional +modules\rostests\winetests\msi\msi_winetest.exe 7 optional +modules\rostests\winetests\msvcrt\msvcrt_winetest.exe 7 optional +modules\rostests\winetests\netapi32\netapi32_winetest.exe 7 optional +modules\rostests\winetests\ntdll\ntdll_winetest.exe 7 optional +modules\rostests\winetests\odbccp32\odbccp32_winetest.exe 7 optional +modules\rostests\winetests\ole32\ole32_winetest.exe 7 optional +modules\rostests\winetests\oleaut32\oleaut32_winetest.exe 7 optional +modules\rostests\winetests\powrprof\powrprof_winetest.exe 7 optional +modules\rostests\winetests\psapi\psapi_winetest.exe 7 optional +modules\rostests\winetests\riched20\riched20_winetest.exe 7 optional +modules\rostests\winetests\rpcrt4\rpcrt4_winetest.exe 7 optional +modules\rostests\winetests\rsabase\rsabase_winetest.exe 7 optional +modules\rostests\winetests\rsaenh\rsaenh_winetest.exe 7 optional +modules\rostests\winetests\schannel\schannel_winetest.exe 7 optional +modules\rostests\winetests\secur32\secur32_winetest.exe 7 optional +modules\rostests\winetests\setupapi\setupapi_winetest.exe 7 optional +modules\rostests\winetests\shdocvw\shdocvw_winetest.exe 7 optional +modules\rostests\winetests\shell32\shell32_winetest.exe 7 optional +modules\rostests\winetests\shlwapi\shlwapi_winetest.exe 7 optional +modules\rostests\winetests\urlmon\urlmon_winetest.exe 7 optional +modules\rostests\winetests\user32\user32_winetest.exe 7 optional +modules\rostests\winetests\usp10\usp10_winetest.exe 7 optional +modules\rostests\winetests\uxtheme\uxtheme_winetest.exe 7 optional +modules\rostests\winetests\version\version_winetest.exe 7 optional +modules\rostests\winetests\winhttp\winhttp_winetest.exe 7 optional +modules\rostests\winetests\wininet\wininet_winetest.exe 7 optional +modules\wallpaper\lake.bmp 4 optional ; Native libraries -;modules\windows\mfc42.dll 1 optional -;modules\windows\vmx_fb.dll 1 optional -;modules\windows\vmx_mode.dll 1 optional -;modules\windows\vmx_svga.sys 2 optional -;modules\windows\vmx_svga.inf 6 optional -;modules\windows\kvmnet.sys 2 optional -;modules\windows\kvmnet.inf 6 optional +modules\windows\mfc42.dll 1 optional +modules\windows\vmx_fb.dll 1 optional +modules\windows\vmx_mode.dll 1 optional +modules\windows\vmx_svga.sys 2 optional +modules\windows\vmx_svga.inf 6 optional +modules\windows\kvmnet.sys 2 optional +modules\windows\kvmnet.inf 6 optional diff --git a/reactos/dll/3rdparty/dxtn/dxtn.rbuild b/reactos/dll/3rdparty/dxtn/dxtn.rbuild index 0a30d6919a5..d16c584e9e5 100644 --- a/reactos/dll/3rdparty/dxtn/dxtn.rbuild +++ b/reactos/dll/3rdparty/dxtn/dxtn.rbuild @@ -2,11 +2,8 @@ . - - msvcrt - fxt1.c dxtn.c wrapper.c texstore.c - \ No newline at end of file + diff --git a/reactos/dll/3rdparty/freetype/freetype.rbuild b/reactos/dll/3rdparty/freetype/freetype.rbuild index 4a6fa0f6986..1ca3cf07b4c 100644 --- a/reactos/dll/3rdparty/freetype/freetype.rbuild +++ b/reactos/dll/3rdparty/freetype/freetype.rbuild @@ -1,6 +1,6 @@ - + include @@ -15,7 +15,6 @@ ntoskrnl - libcntpr setjmplongjmp.s diff --git a/reactos/dll/cpl/appwiz-new/appwiz.rbuild b/reactos/dll/cpl/appwiz-new/appwiz.rbuild index 69d7ad08b97..6e1519d6d73 100644 --- a/reactos/dll/cpl/appwiz-new/appwiz.rbuild +++ b/reactos/dll/cpl/appwiz-new/appwiz.rbuild @@ -15,5 +15,4 @@ appwiz.c createlink.c appwiz.rc - appwiz.spec diff --git a/reactos/dll/cpl/appwiz/appwiz.rbuild b/reactos/dll/cpl/appwiz/appwiz.rbuild index 76b8da0f21e..fb67d5a66b8 100644 --- a/reactos/dll/cpl/appwiz/appwiz.rbuild +++ b/reactos/dll/cpl/appwiz/appwiz.rbuild @@ -17,5 +17,4 @@ createlink.c updates.c appwiz.rc - appwiz.spec diff --git a/reactos/dll/cpl/desk/desk.rbuild b/reactos/dll/cpl/desk/desk.rbuild index 6e074b2a832..c08264f0580 100644 --- a/reactos/dll/cpl/desk/desk.rbuild +++ b/reactos/dll/cpl/desk/desk.rbuild @@ -31,5 +31,4 @@ monslctl.c general.c desk.rc - desk.spec diff --git a/reactos/dll/cpl/desk/lang/sk-SK.rc b/reactos/dll/cpl/desk/lang/sk-SK.rc index d84c2eab7e7..45370fc8399 100644 --- a/reactos/dll/cpl/desk/lang/sk-SK.rc +++ b/reactos/dll/cpl/desk/lang/sk-SK.rc @@ -1,9 +1,9 @@ /* * FILE: dll/cpl/desk/lang/sk-SK.rc * PURPOSE: Slovak Language File for desk - * TRANSLATOR: Kario + * TRANSLATOR: Mбrio Kaиmбr aka Kario * DATE OF TR.: 15-09-2007 - * LAST CHANGE: 11-07-2008 + * LAST CHANGE: 05-10-2008 */ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT @@ -39,12 +39,12 @@ BEGIN COMBOBOX IDC_SCREENS_LIST, 14, 103, 100, 100, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Nastavenie",IDC_SCREENS_SETTINGS, 120, 103, 50, 13, WS_GROUP PUSHBUTTON "&Ukбћka",IDC_SCREENS_TESTSC, 175, 103, 50, 13 - LTEXT "&Poиkaќ",IDC_WAITTEXT, 14, 125, 16, 9 - EDITTEXT IDC_SCREENS_TIMEDELAY, 34, 123, 32, 13, ES_RIGHT | WS_GROUP + LTEXT "&Poиkaќ",IDC_WAITTEXT, 14, 125, 20, 9 + EDITTEXT IDC_SCREENS_TIMEDELAY, 38, 123, 32, 13, ES_RIGHT | WS_GROUP CONTROL "",IDC_SCREENS_TIME ,UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | - WS_BORDER | WS_GROUP, 54, 123, 12, 13 - LTEXT "minъt", IDC_MINTEXT, 70, 125, 26, 9 + WS_BORDER | WS_GROUP, 58, 123, 12, 13 + LTEXT "minъt", IDC_MINTEXT, 74, 125, 26, 9 CONTROL "Pri obnovenн chrбniќ &heslom.",IDC_SCREENS_USEPASSCHK,"button", BS_AUTOCHECKBOX | WS_TABSTOP, 108, 120, 104, 19 GROUPBOX "Napбjani&e monitora", IDC_SCREENS_DUMMY2, 6, 155, 232, 41 diff --git a/reactos/dll/cpl/input/input.rbuild b/reactos/dll/cpl/input/input.rbuild index 6c8902b710c..e41bb38e7b3 100644 --- a/reactos/dll/cpl/input/input.rbuild +++ b/reactos/dll/cpl/input/input.rbuild @@ -14,5 +14,4 @@ add.c changekeyseq.c input.rc - input.spec diff --git a/reactos/dll/cpl/input/lang/uk-UA.rc b/reactos/dll/cpl/input/lang/uk-UA.rc index 3cdd7a620bd..78a504d4245 100644 --- a/reactos/dll/cpl/input/lang/uk-UA.rc +++ b/reactos/dll/cpl/input/lang/uk-UA.rc @@ -10,17 +10,17 @@ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT IDD_PROPPAGESETTINGS DIALOGEX 0, 0, 254, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Settings" +CAPTION "Параметри" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Select the services that you want for each input language shown in the list.\nUse the Add and Remove buttons to modify this list.", -1, 9, 6, 238, 25 CONTROL "TEXT", IDC_KEYLAYOUT_LIST, "SYSLISTVIEW32", WS_BORDER | WS_VSCROLL | WS_TABSTOP | LVS_SORTASCENDING | LVS_REPORT | 0x0000808D, 8, 36, 237, 101 - PUSHBUTTON "&Set Default", IDC_SET_DEFAULT, 101, 159, 144, 14 - PUSHBUTTON "A&dd...", IDC_ADD_BUTTON, 27, 142, 70, 14 - PUSHBUTTON "&Remove...", IDC_REMOVE_BUTTON, 101, 142, 70, 14 - PUSHBUTTON "&Properties...", IDC_PROP_BUTTON, 175, 142, 70, 14 - GROUPBOX "Preferences", -1, 7, 185, 240, 36 - PUSHBUTTON "&Key Settings...", IDC_KEY_SET_BTN, 14, 198, 110, 14 + PUSHBUTTON "Замов&чування", IDC_SET_DEFAULT, 101, 159, 144, 14 + PUSHBUTTON "&Додати...", IDC_ADD_BUTTON, 27, 142, 70, 14 + PUSHBUTTON "В&идалити...", IDC_REMOVE_BUTTON, 101, 142, 70, 14 + PUSHBUTTON "В&ластивості...", IDC_PROP_BUTTON, 175, 142, 70, 14 + GROUPBOX "Настройка", -1, 7, 185, 240, 36 + PUSHBUTTON "&Параметри клавіатури...", IDC_KEY_SET_BTN, 14, 198, 110, 14 END IDD_KEYSETTINGS DIALOGEX 0, 0, 272, 163 @@ -55,22 +55,22 @@ END IDD_CHANGE_KEY_SEQ DIALOGEX 5, 100, 230, 125 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Change Key Sequence" +CAPTION "Зміна сполучення клавіш" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "", -1, 9, 5, 155, 110 - AUTOCHECKBOX "&Switch input languages", IDC_SWITCH_INPUT_LANG_CB, 15, 15, 105, 12 + AUTOCHECKBOX "&Переключати мови ввод", IDC_SWITCH_INPUT_LANG_CB, 15, 15, 105, 12 LTEXT "Shift", -1, 73, 37, 27, 12 CTEXT "+", -1, 62, 37, 8, 9 AUTORADIOBUTTON "&Ctrl", IDC_CTRL_LANG, 29, 31, 30, 11 - AUTORADIOBUTTON "Left &ALT", IDC_LEFT_ALT_LANG, 29, 45, 46, 12 - AUTOCHECKBOX "S&witch keyboard layouts", IDC_SWITCH_KBLAYOUTS_CB, 16, 65, 141, 12 + AUTORADIOBUTTON "ALT з&ліва", IDC_LEFT_ALT_LANG, 29, 45, 46, 12 + AUTOCHECKBOX "Пере&ключати розкладки клавіатури", IDC_SWITCH_KBLAYOUTS_CB, 16, 65, 141, 12 LTEXT "Shift", -1, 74, 87, 27, 12 CTEXT "+", -1, 63, 87, 8, 9 AUTORADIOBUTTON "C&trl", IDC_CTRL_LAYOUT, 30, 81, 30, 11 - AUTORADIOBUTTON "Left A<", IDC_LEFT_ALT_LAYOUT, 30, 95, 44, 12 + AUTORADIOBUTTON "ALT &зліва", IDC_LEFT_ALT_LAYOUT, 30, 95, 44, 12 DEFPUSHBUTTON "OK", IDOK, 172, 9, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, 172, 27, 50, 14 + PUSHBUTTON "Скасувати", IDCANCEL, 172, 27, 50, 14 END IDD_INPUT_LANG_PROP DIALOGEX 20, 20, 227, 75 @@ -96,15 +96,15 @@ BEGIN IDS_UNKNOWN "(Немає даних)" IDS_RESTART "Ви дійсно бажаєте перезавантажити комп'ютер зараз?" IDS_WHATS_THIS "Що це?" - IDS_LANGUAGE "Language" - IDS_LAYOUT "Keyboard Layout" - IDS_REM_QUESTION "Do you want to remove selected keyboard layout?" - IDS_CONFIRMATION "Confirmation" - IDS_LAYOUT_EXISTS "This layout already exists." - IDS_LAYOUT_EXISTS2 "This layout already exists and can not be added." + IDS_LANGUAGE "Мова" + IDS_LAYOUT "Розкладка клавіатури" + IDS_REM_QUESTION "Ви дійсно хочете видалити вибрану розкладку клавіатури?" + IDS_CONFIRMATION "Підтвердження" + IDS_LAYOUT_EXISTS "Ця розкладка вже існує." + IDS_LAYOUT_EXISTS2 "Ця розкладка вже існує і не може бути додана." IDS_CTRL_SHIFT "Ctrl+Shift" - IDS_LEFT_ALT_SHIFT "Left Alt+Shift" - IDS_SWITCH_BET_INLANG "Switch between input languages" + IDS_LEFT_ALT_SHIFT "Alt зліва+Shift" + IDS_SWITCH_BET_INLANG "Переключення мов вводу" END STRINGTABLE @@ -241,10 +241,10 @@ BEGIN IDS_DIVEHI_TYPEWRITER_LAYOUT, "Мальдівська (друкарська машинка)" IDS_BULGARIAN_PHONETIC_CLASSIC_LAYOUT, "Болгарська фонетична (класична)" IDS_BULGARIAN_PHONETIC_BDS_LAYOUT, "Болгарська фонетична (BDS)" - IDS_BULGARIAN_BDS_LAYOUT, "Bulgarian BDS 5237-1978" - IDS_GERMAN_RISTOME_LAYOUT, "German (RISTOME)" - IDS_GERMAN_NEO_11_LAYOUT, "German (NEO-1.1)" - IDS_GERMAN_DE_ERGO_LAYOUT, "German (de_ergo)" - IDS_BURMESE_LAYOUT, "Burmese" - IDS_UKRAINIAN_STUDENT_LAYOUT, "Ukrainian (Student)" + IDS_BULGARIAN_BDS_LAYOUT, "Болгарська BDS 5237-1978" + IDS_GERMAN_RISTOME_LAYOUT, "Німецька (RISTOME)" + IDS_GERMAN_NEO_11_LAYOUT, "Німецька (NEO-1.1)" + IDS_GERMAN_DE_ERGO_LAYOUT, "Німецька (de_ergo)" + IDS_BURMESE_LAYOUT, "Бірманська" + IDS_UKRAINIAN_STUDENT_LAYOUT, "Українська (студентська)" END diff --git a/reactos/dll/cpl/intl/intl.rbuild b/reactos/dll/cpl/intl/intl.rbuild index 14db686a97e..469c1d8bcf9 100644 --- a/reactos/dll/cpl/intl/intl.rbuild +++ b/reactos/dll/cpl/intl/intl.rbuild @@ -8,7 +8,6 @@ comctl32 advapi32 setupapi - msvcrt shell32 currency.c date.c @@ -22,5 +21,4 @@ advanced.c sort.c intl.rc - intl.spec diff --git a/reactos/dll/cpl/joy/joy.rbuild b/reactos/dll/cpl/joy/joy.rbuild index 9dfcc2adaa7..89b60137f61 100644 --- a/reactos/dll/cpl/joy/joy.rbuild +++ b/reactos/dll/cpl/joy/joy.rbuild @@ -12,5 +12,4 @@ shell32 joy.c joy.rc - joy.spec diff --git a/reactos/dll/cpl/main/lang/uk-UA.rc b/reactos/dll/cpl/main/lang/uk-UA.rc index 992bed618b5..294ae12836a 100644 --- a/reactos/dll/cpl/main/lang/uk-UA.rc +++ b/reactos/dll/cpl/main/lang/uk-UA.rc @@ -176,5 +176,5 @@ BEGIN IDS_REMOVE_TEXT "Ви дійсно бажаєте видалити схему '%s' із системи?" IDS_OVERWRITE_TITLE "Підтвердження заміни схеми" IDS_OVERWRITE_TEXT "Вибрана схема вказівників уже використовується. Замінити вихідну схему?" - IDS_ANIMATE_CURSOR "Animated Cursor" + IDS_ANIMATE_CURSOR "Анімований вказівник" END diff --git a/reactos/dll/cpl/main/main.rbuild b/reactos/dll/cpl/main/main.rbuild index 2084203b35d..5a6d2804df4 100644 --- a/reactos/dll/cpl/main/main.rbuild +++ b/reactos/dll/cpl/main/main.rbuild @@ -15,5 +15,4 @@ main.c mouse.c main.rc - main.spec diff --git a/reactos/dll/cpl/mmsys/sounds.c b/reactos/dll/cpl/mmsys/sounds.c index d30371bb87b..5f3596c2d96 100644 --- a/reactos/dll/cpl/mmsys/sounds.c +++ b/reactos/dll/cpl/mmsys/sounds.c @@ -648,35 +648,35 @@ LoadSoundProfiles(HWND hwndDlg) BOOL LoadSoundFiles(HWND hwndDlg) { - TCHAR szPath[MAX_PATH]; - TCHAR szNone[MAX_PATH]; - TCHAR * ptr; - WIN32_FIND_DATA FileData; + WCHAR szPath[MAX_PATH]; + WCHAR * ptr; + WIN32_FIND_DATAW FileData; HANDLE hFile; LRESULT lResult; UINT length; - length = GetWindowsDirectory(szPath, sizeof(szPath) / sizeof(TCHAR)); - if (length == 0 || length > (sizeof(szPath) / sizeof(TCHAR))) + length = GetWindowsDirectoryW(szPath, MAX_PATH); + if (length == 0 || length >= MAX_PATH - 9) { return FALSE; } - if (szPath[length-1] != _T('\\')) + if (szPath[length-1] != L'\\') { - szPath[length] = _T('\\'); + szPath[length] = L'\\'; length++; } - _tcscpy(&szPath[length], _T("media\\*")); + wcscpy(&szPath[length], L"media\\*"); length += 7; - hFile = FindFirstFile(szPath, &FileData); + hFile = FindFirstFileW(szPath, &FileData); if (hFile == INVALID_HANDLE_VALUE) { return FALSE; } - if (LoadString(hApplet, IDS_NO_SOUND, szNone, MAX_PATH)) + if (LoadString(hApplet, IDS_NO_SOUND, szPath, MAX_PATH)) { - SendDlgItemMessage(hwndDlg, IDC_SOUND_LIST, CB_ADDSTRING, (WPARAM)0, (LPARAM)szNone); + szPath[(sizeof(szPath)/sizeof(WCHAR))-1] = L'\0'; + SendDlgItemMessageW(hwndDlg, IDC_SOUND_LIST, CB_ADDSTRING, (WPARAM)0, (LPARAM)szPath); } do @@ -684,7 +684,7 @@ LoadSoundFiles(HWND hwndDlg) if (FileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) continue; - ptr = _tcsrchr(FileData.cFileName, _T('\\')); + ptr = wcsrchr(FileData.cFileName, L'\\'); if (ptr) { ptr++; @@ -693,13 +693,13 @@ LoadSoundFiles(HWND hwndDlg) { ptr = FileData.cFileName; } - lResult = SendDlgItemMessage(hwndDlg, IDC_SOUND_LIST, CB_ADDSTRING, (WPARAM)0, (LPARAM)ptr); + lResult = SendDlgItemMessageW(hwndDlg, IDC_SOUND_LIST, CB_ADDSTRING, (WPARAM)0, (LPARAM)ptr); if (lResult != CB_ERR) { - _tcscpy(&szPath[length-1], FileData.cFileName); - SendDlgItemMessage(hwndDlg, IDC_SOUND_LIST, CB_SETITEMDATA, (WPARAM)lResult, (LPARAM)_tcsdup(szPath)); + wcscpy(&szPath[length-1], FileData.cFileName); + SendDlgItemMessageW(hwndDlg, IDC_SOUND_LIST, CB_SETITEMDATA, (WPARAM)lResult, (LPARAM)wcsdup(szPath)); } - }while(FindNextFile(hFile, &FileData) != 0); + }while(FindNextFileW(hFile, &FileData) != 0); FindClose(hFile); return TRUE; diff --git a/reactos/dll/cpl/ncpa/ncpa.rbuild b/reactos/dll/cpl/ncpa/ncpa.rbuild index 86559595297..7f3ff1437fc 100644 --- a/reactos/dll/cpl/ncpa/ncpa.rbuild +++ b/reactos/dll/cpl/ncpa/ncpa.rbuild @@ -10,5 +10,4 @@ advapi32 shell32 ncpa.c - ncpa.spec diff --git a/reactos/dll/cpl/odbccp32/odbccp32.rbuild b/reactos/dll/cpl/odbccp32/odbccp32.rbuild index dd29bee1a31..2137e029d0a 100644 --- a/reactos/dll/cpl/odbccp32/odbccp32.rbuild +++ b/reactos/dll/cpl/odbccp32/odbccp32.rbuild @@ -8,5 +8,4 @@ comctl32 odbccp32.c odbccp32.rc - odbccp32.spec diff --git a/reactos/dll/cpl/powercfg/powercfg.rbuild b/reactos/dll/cpl/powercfg/powercfg.rbuild index 5dc6964752b..474cd142f40 100644 --- a/reactos/dll/cpl/powercfg/powercfg.rbuild +++ b/reactos/dll/cpl/powercfg/powercfg.rbuild @@ -16,5 +16,4 @@ advanced.c hibernate.c powercfg.rc - powercfg.spec diff --git a/reactos/dll/cpl/sysdm/lang/sk-SK.rc b/reactos/dll/cpl/sysdm/lang/sk-SK.rc index 24bbb596d13..3cd1219727e 100644 --- a/reactos/dll/cpl/sysdm/lang/sk-SK.rc +++ b/reactos/dll/cpl/sysdm/lang/sk-SK.rc @@ -1,8 +1,9 @@ /* * FILE: dll/cpl/sysdm/lang/sk-SK.rc * PURPOSE: Slovak Language File for sysdm - * TRANSLATOR: Kario + * TRANSLATOR: Mбrio Kaиmбr aka Kario * DATE OF TR.: 20-09-2007 + * LAST CHANGE: 16-10-2009 */ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT @@ -125,7 +126,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_USERPROF, IDC_STATIC, 6, 11, 16, 16, SS_ICON LTEXT "Pouћнvateѕskй profily obsahujъ nastavenia pracovnej plochy a inй informбcie tэkajъce sa pouћнvateѕskйho konta. Na kaћdom pouћнvanom poинtaиi je moћnй vytvoriќ inэ profil alebo je moћnй vybraќ zdieѕanэ profil, ktorэ je rovnakэ na vљetkэch pouћнvanэch poинtaиoch.", - IDC_STATIC, 40, 11, 204, 35 + IDC_STATIC, 40, 11, 204, 44 LTEXT "&Profily uloћenй na tomto poинtaиi:", IDC_STATIC, 16, 51, 204, 9 CONTROL "", IDC_USERPROFILE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 6, 66, 244, 85, WS_EX_CLIENTEDGE @@ -149,11 +150,11 @@ BEGIN LTEXT "Predvolenэ operaиnэ &systйm:", IDC_STATIC, 14, 26, 100, 8 COMBOBOX IDC_STRECOSCOMBO, 14, 37, 224, 46, CBS_DROPDOWNLIST AUTOCHECKBOX "&Zobraziќ zoznam operaиnэch systйmov na:", IDC_STRECLIST, 14, 56, 150, 8 - EDITTEXT IDC_STRRECLISTEDIT, 179, 54, 30, 12, ES_NUMBER + EDITTEXT IDC_STRRECLISTEDIT, 183, 54, 30, 12, ES_NUMBER CONTROL "", IDC_STRRECLISTUPDWN, "msctls_updown32", UDS_WRAP | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 0, 0, 8, 13 LTEXT "sekъnd", IDC_STATIC, 215, 56, 25, 8 - AUTOCHECKBOX "Ak sъ &potrebnй moћnosti obnovenia, zobraziќ ich na:", IDC_STRRECREC, 14, 70, 163, 8 - EDITTEXT IDC_STRRECRECEDIT, 179, 68, 30, 12, ES_NUMBER + AUTOCHECKBOX "Ak sъ &potrebnй moћnosti obnovenia, zobraziќ ich na:", IDC_STRRECREC, 14, 70, 167, 8 + EDITTEXT IDC_STRRECRECEDIT, 183, 68, 30, 12, ES_NUMBER CONTROL "", IDC_STRRECRECUPDWN, "msctls_updown32", UDS_WRAP | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 0, 0, 8, 13 LTEXT "sekъnd", IDC_STATIC, 215, 70, 25, 8 LTEXT "Ak chcete manuбlne upraviќ sъbor s moћnosќami spustenia systйmu, kliknite na tlaиidlo Upraviќ.", IDC_STATIC, 14, 89, 187, 8 @@ -180,29 +181,29 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS CAPTION "Virtuбlna pamдќ" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Jednotka [menovka zvдzku]", IDC_STATIC, 12, 5, 96, 9 - LTEXT "Veѕkosќ strбnkovacieho sъboru (v MB)", IDC_STATIC, 115, 5, 96, 9 + LTEXT "Jednotka [menovka zvдzku]", IDC_STATIC, 10, 5, 96, 9 + LTEXT "Veѕkosќ strбnkovacieho sъboru (v MB)", IDC_STATIC, 112, 5, 96, 9 LISTBOX IDC_PAGEFILELIST, 10, 16, 204, 52, LBS_NOTIFY | LBS_USETABSTOPS GROUPBOX "Veѕkosќ strбnkovacieho sъboru pre vybranъ jednotku", IDC_DRIVEGROUP, 10, 70, 204, 104 - LTEXT "Jednotka:", IDC_STATIC, 20, 80, 20, 8 + LTEXT "Jednotka:", IDC_STATIC, 20, 80, 30, 8 LTEXT "", IDC_DRIVE, 88, 81, 100, 9 LTEXT "Dostupnй miesto:", IDC_STATIC, 20, 92, 56, 9 LTEXT "", IDC_SPACEAVAIL, 88, 92, 104, 9 - LTEXT "&Poиiatoиnб veѕkosќ (v MB):", -1, 22, 118, 54, 9 - LTEXT "Ma&ximбlna veѕkosќ (v MB):", -1, 22, 131, 64, 9 - AUTORADIOBUTTON "&Vlastnб veѕkosќ:", IDC_CUSTOM, 20, 105, 54, 9, WS_GROUP - AUTORADIOBUTTON "Veѕkosќ urиovanб &systйmom", IDC_SYSMANSIZE, 20, 145, 88, 9 - AUTORADIOBUTTON "N&epouћнvaќ strбnkovacн sъbor", IDC_NOPAGEFILE, 20, 158, 78,9 + LTEXT "&Poиiatoиnб veѕkosќ (v MB):", -1, 22, 118, 74, 9 + LTEXT "Ma&ximбlna veѕkosќ (v MB):", -1, 22, 131, 74, 9 + AUTORADIOBUTTON "&Vlastnб veѕkosќ:", IDC_CUSTOM, 20, 105, 74, 9, WS_GROUP + AUTORADIOBUTTON "Veѕkosќ urиovanб &systйmom", IDC_SYSMANSIZE, 20, 145, 98, 9 + AUTORADIOBUTTON "N&epouћнvaќ strбnkovacн sъbor", IDC_NOPAGEFILE, 20, 158, 108,9 EDITTEXT IDC_INITIALSIZE, 100, 114, 44, 13, NOT WS_BORDER, WS_EX_CLIENTEDGE EDITTEXT IDC_MAXSIZE, 100, 129, 44, 13, NOT WS_BORDER, WS_EX_CLIENTEDGE PUSHBUTTON "&Nastaviќ", IDC_SET, 158, 155, 50, 14 GROUPBOX "Celkovб veѕkosќ strбnkovacieho sъboru pre vљetky jednotky", IDC_TOTALGROUP, 10, 177, 204, 46 - LTEXT "Najmenљia povolenб:", IDC_STATIC, 18, 188, 58, 9 + LTEXT "Najmenљia povolenб:", IDC_STATIC, 18, 188, 78, 9 LTEXT "", IDC_MINIMUM, 88, 188, 100, 9 LTEXT "Odporъиanб:", IDC_STATIC, 18, 199, 52, 9 LTEXT "", IDC_RECOMMENDED, 88, 197, 100, 9 - LTEXT "Aktuбlne vyhradenб:", IDC_STATIC, 18, 210, 66, 9 + LTEXT "Aktuбlne vyhradenб:", IDC_STATIC, 18, 210, 76, 9 LTEXT "", IDC_CURRENT, 88, 208, 100, 9 DEFPUSHBUTTON "OK", IDOK, 114, 232, 48, 14 diff --git a/reactos/dll/cpl/sysdm/precomp.h b/reactos/dll/cpl/sysdm/precomp.h index 3236bf4039d..3ef2ee0d259 100644 --- a/reactos/dll/cpl/sysdm/precomp.h +++ b/reactos/dll/cpl/sysdm/precomp.h @@ -69,9 +69,9 @@ typedef struct _VIRTMEM typedef struct _BOOTRECORD { DWORD BootType; - TCHAR szSectionName[128]; - TCHAR szBootPath[MAX_PATH]; - TCHAR szOptions[512]; + WCHAR szSectionName[128]; + WCHAR szBootPath[MAX_PATH]; + WCHAR szOptions[512]; }BOOTRECORD, *PBOOTRECORD; diff --git a/reactos/dll/cpl/sysdm/startrec.c b/reactos/dll/cpl/sysdm/startrec.c index b24b4f8ca98..6fe10194745 100644 --- a/reactos/dll/cpl/sysdm/startrec.c +++ b/reactos/dll/cpl/sysdm/startrec.c @@ -12,9 +12,9 @@ typedef struct _STARTINFO { - TCHAR szFreeldrIni[MAX_PATH + 15]; - TCHAR szDumpFile[MAX_PATH]; - TCHAR szMinidumpDir[MAX_PATH]; + WCHAR szFreeldrIni[MAX_PATH + 15]; + WCHAR szDumpFile[MAX_PATH]; + WCHAR szMinidumpDir[MAX_PATH]; DWORD dwCrashDumpEnabled; INT iFreeLdrIni; } STARTINFO, *PSTARTINFO; @@ -33,8 +33,8 @@ SetTimeout(HWND hwndDlg, INT Timeout) EnableWindow(GetDlgItem(hwndDlg, IDC_STRRECLISTUPDWN), TRUE); EnableWindow(GetDlgItem(hwndDlg, IDC_STRRECLISTEDIT), TRUE); } - SendDlgItemMessage(hwndDlg, IDC_STRRECLISTUPDWN, UDM_SETRANGE, (WPARAM) 0, (LPARAM) MAKELONG((short) 999, 0)); - SendDlgItemMessage(hwndDlg, IDC_STRRECLISTUPDWN, UDM_SETPOS, (WPARAM) 0, (LPARAM) MAKELONG((short) Timeout, 0)); + SendDlgItemMessageW(hwndDlg, IDC_STRRECLISTUPDWN, UDM_SETRANGE, (WPARAM) 0, (LPARAM) MAKELONG((short) 999, 0)); + SendDlgItemMessageW(hwndDlg, IDC_STRRECLISTUPDWN, UDM_SETPOS, (WPARAM) 0, (LPARAM) MAKELONG((short) Timeout, 0)); } static VOID @@ -50,33 +50,33 @@ SetRecoveryTimeout(HWND hwndDlg, INT Timeout) EnableWindow(GetDlgItem(hwndDlg, IDC_STRRECRECUPDWN), TRUE); EnableWindow(GetDlgItem(hwndDlg, IDC_STRRECRECEDIT), TRUE); } - SendDlgItemMessage(hwndDlg, IDC_STRRECRECUPDWN, UDM_SETRANGE, (WPARAM) 0, (LPARAM) MAKELONG((short) 999, 0)); - SendDlgItemMessage(hwndDlg, IDC_STRRECRECUPDWN, UDM_SETPOS, (WPARAM) 0, (LPARAM) MAKELONG((short) Timeout, 0)); + SendDlgItemMessageW(hwndDlg, IDC_STRRECRECUPDWN, UDM_SETRANGE, (WPARAM) 0, (LPARAM) MAKELONG((short) 999, 0)); + SendDlgItemMessageW(hwndDlg, IDC_STRRECRECUPDWN, UDM_SETPOS, (WPARAM) 0, (LPARAM) MAKELONG((short) Timeout, 0)); } static DWORD -GetSystemDrive(TCHAR **szSystemDrive) +GetSystemDrive(WCHAR **szSystemDrive) { DWORD dwBufSize; /* get Path to freeldr.ini or boot.ini */ - *szSystemDrive = HeapAlloc(GetProcessHeap(), 0, MAX_PATH * sizeof(TCHAR)); + *szSystemDrive = HeapAlloc(GetProcessHeap(), 0, MAX_PATH * sizeof(WCHAR)); if (szSystemDrive != NULL) { - dwBufSize = GetEnvironmentVariable(_T("SystemDrive"), *szSystemDrive, MAX_PATH); + dwBufSize = GetEnvironmentVariableW(L"SystemDrive", *szSystemDrive, MAX_PATH); if (dwBufSize > MAX_PATH) { - TCHAR *szTmp; + WCHAR *szTmp; DWORD dwBufSize2; - szTmp = HeapReAlloc(GetProcessHeap(), 0, *szSystemDrive, dwBufSize * sizeof(TCHAR)); + szTmp = HeapReAlloc(GetProcessHeap(), 0, *szSystemDrive, dwBufSize * sizeof(WCHAR)); if (szTmp == NULL) goto FailGetSysDrive; *szSystemDrive = szTmp; - dwBufSize2 = GetEnvironmentVariable(_T("SystemDrive"), *szSystemDrive, dwBufSize); + dwBufSize2 = GetEnvironmentVariableW(L"SystemDrive", *szSystemDrive, dwBufSize); if (dwBufSize2 > dwBufSize || dwBufSize2 == 0) goto FailGetSysDrive; } @@ -95,15 +95,15 @@ FailGetSysDrive: } static PBOOTRECORD -ReadFreeldrSection(HINF hInf, TCHAR *szSectionName) +ReadFreeldrSection(HINF hInf, WCHAR *szSectionName) { PBOOTRECORD pRecord; INFCONTEXT InfContext; - TCHAR szName[MAX_PATH]; - TCHAR szValue[MAX_PATH]; + WCHAR szName[MAX_PATH]; + WCHAR szValue[MAX_PATH]; DWORD LineLength; - if (!SetupFindFirstLine(hInf, + if (!SetupFindFirstLineW(hInf, szSectionName, NULL, &InfContext)) @@ -118,31 +118,31 @@ ReadFreeldrSection(HINF hInf, TCHAR *szSectionName) return NULL; } - _tcscpy(pRecord->szSectionName, szSectionName); + wcscpy(pRecord->szSectionName, szSectionName); do { - if (!SetupGetStringField(&InfContext, + if (!SetupGetStringFieldW(&InfContext, 0, szName, - sizeof(szName) / sizeof(TCHAR), + sizeof(szName) / sizeof(WCHAR), &LineLength)) { break; } - if (!SetupGetStringField(&InfContext, + if (!SetupGetStringFieldW(&InfContext, 1, szValue, - sizeof(szValue) / sizeof(TCHAR), + sizeof(szValue) / sizeof(WCHAR), &LineLength)) { break; } - if (!_tcsnicmp(szName, _T("BootType"), 8)) + if (!wcsnicmp(szName, L"BootType", 8)) { - if (!_tcsnicmp(szValue, _T("ReactOS"), 7)) + if (!wcsnicmp(szValue, L"ReactOS", 7)) { //FIXME store as enum pRecord->BootType = 1; @@ -152,14 +152,14 @@ ReadFreeldrSection(HINF hInf, TCHAR *szSectionName) pRecord->BootType = 0; } } - else if (!_tcsnicmp(szName, _T("SystemPath"), 10)) + else if (!wcsnicmp(szName, L"SystemPath", 10)) { - _tcscpy(pRecord->szBootPath, szValue); + wcscpy(pRecord->szBootPath, szValue); } - else if (!_tcsnicmp(szName, _T("Options"), 7)) + else if (!wcsnicmp(szName, L"Options", 7)) { //FIXME store flags as values - _tcscpy(pRecord->szOptions, szValue); + wcscpy(pRecord->szOptions, szValue); } } @@ -174,35 +174,35 @@ LoadFreeldrSettings(HINF hInf, HWND hwndDlg) { INFCONTEXT InfContext; PBOOTRECORD pRecord; - TCHAR szDefaultOs[MAX_PATH]; - TCHAR szName[MAX_PATH]; - TCHAR szValue[MAX_PATH]; + WCHAR szDefaultOs[MAX_PATH]; + WCHAR szName[MAX_PATH]; + WCHAR szValue[MAX_PATH]; DWORD LineLength; DWORD TimeOut; LRESULT lResult; - if (!SetupFindFirstLine(hInf, - _T("FREELOADER"), - _T("DefaultOS"), + if (!SetupFindFirstLineW(hInf, + L"FREELOADER", + L"DefaultOS", &InfContext)) { /* failed to find default os */ return FALSE; } - if (!SetupGetStringField(&InfContext, + if (!SetupGetStringFieldW(&InfContext, 1, szDefaultOs, - sizeof(szDefaultOs) / sizeof(TCHAR), + sizeof(szDefaultOs) / sizeof(WCHAR), &LineLength)) { /* no key */ return FALSE; } - if (!SetupFindFirstLine(hInf, - _T("FREELOADER"), - _T("TimeOut"), + if (!SetupFindFirstLineW(hInf, + L"FREELOADER", + L"TimeOut", &InfContext)) { /* expected to find timeout value */ @@ -218,8 +218,8 @@ LoadFreeldrSettings(HINF hInf, HWND hwndDlg) return FALSE; } - if (!SetupFindFirstLine(hInf, - _T("Operating Systems"), + if (!SetupFindFirstLineW(hInf, + L"Operating Systems", NULL, &InfContext)) { @@ -229,20 +229,20 @@ LoadFreeldrSettings(HINF hInf, HWND hwndDlg) do { - if (!SetupGetStringField(&InfContext, + if (!SetupGetStringFieldW(&InfContext, 0, szName, - sizeof(szName) / sizeof(TCHAR), + sizeof(szName) / sizeof(WCHAR), &LineLength)) { /* the ini file is messed up */ return FALSE; } - if (!SetupGetStringField(&InfContext, + if (!SetupGetStringFieldW(&InfContext, 1, szValue, - sizeof(szValue) / sizeof(TCHAR), + sizeof(szValue) / sizeof(WCHAR), &LineLength)) { /* the ini file is messed up */ @@ -252,14 +252,14 @@ LoadFreeldrSettings(HINF hInf, HWND hwndDlg) pRecord = ReadFreeldrSection(hInf, szName); if (pRecord) { - lResult = SendDlgItemMessage(hwndDlg, IDC_STRECOSCOMBO, CB_ADDSTRING, (WPARAM)0, (LPARAM)szValue); + lResult = SendDlgItemMessageW(hwndDlg, IDC_STRECOSCOMBO, CB_ADDSTRING, (WPARAM)0, (LPARAM)szValue); if (lResult != CB_ERR) { - SendDlgItemMessage(hwndDlg, IDC_STRECOSCOMBO, CB_SETITEMDATA, (WPARAM)lResult, (LPARAM)pRecord); - if (!_tcscmp(szDefaultOs, szName)) + SendDlgItemMessageW(hwndDlg, IDC_STRECOSCOMBO, CB_SETITEMDATA, (WPARAM)lResult, (LPARAM)pRecord); + if (!wcscmp(szDefaultOs, szName)) { /* we store the friendly name as key */ - _tcscpy(szDefaultOs, szValue); + wcscpy(szDefaultOs, szValue); } } else @@ -271,16 +271,16 @@ LoadFreeldrSettings(HINF hInf, HWND hwndDlg) while (SetupFindNextLine(&InfContext, &InfContext)); /* find default os in list */ - lResult = SendDlgItemMessage(hwndDlg, IDC_STRECOSCOMBO, CB_FINDSTRING, (WPARAM)-1, (LPARAM)szDefaultOs); + lResult = SendDlgItemMessageW(hwndDlg, IDC_STRECOSCOMBO, CB_FINDSTRING, (WPARAM)-1, (LPARAM)szDefaultOs); if (lResult != CB_ERR) { /* set cur sel */ - SendDlgItemMessage(hwndDlg, IDC_STRECOSCOMBO, CB_SETCURSEL, (WPARAM)lResult, (LPARAM)0); + SendDlgItemMessageW(hwndDlg, IDC_STRECOSCOMBO, CB_SETCURSEL, (WPARAM)lResult, (LPARAM)0); } if(TimeOut) { - SendDlgItemMessage(hwndDlg, IDC_STRECLIST, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); + SendDlgItemMessageW(hwndDlg, IDC_STRECLIST, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); } SetTimeout(hwndDlg, TimeOut); @@ -292,17 +292,17 @@ static INT LoadBootSettings(HINF hInf, HWND hwndDlg) { INFCONTEXT InfContext; - TCHAR szName[MAX_PATH]; - TCHAR szValue[MAX_PATH]; + WCHAR szName[MAX_PATH]; + WCHAR szValue[MAX_PATH]; DWORD LineLength; DWORD TimeOut = 0; - TCHAR szDefaultOS[MAX_PATH]; - TCHAR szOptions[MAX_PATH]; + WCHAR szDefaultOS[MAX_PATH]; + WCHAR szOptions[MAX_PATH]; PBOOTRECORD pRecord; LRESULT lResult; - if(!SetupFindFirstLine(hInf, - _T("boot loader"), + if(!SetupFindFirstLineW(hInf, + L"boot loader", NULL, &InfContext)) { @@ -311,39 +311,39 @@ LoadBootSettings(HINF hInf, HWND hwndDlg) do { - if (!SetupGetStringField(&InfContext, + if (!SetupGetStringFieldW(&InfContext, 0, szName, - sizeof(szName) / sizeof(TCHAR), + sizeof(szName) / sizeof(WCHAR), &LineLength)) { return FALSE; } - if (!SetupGetStringField(&InfContext, + if (!SetupGetStringFieldW(&InfContext, 1, szValue, - sizeof(szValue) / sizeof(TCHAR), + sizeof(szValue) / sizeof(WCHAR), &LineLength)) { return FALSE; } - if (!_tcsnicmp(szName, _T("timeout"), 7)) + if (!wcsnicmp(szName, L"timeout", 7)) { - TimeOut = _ttoi(szValue); + TimeOut = _wtoi(szValue); } - if (!_tcsnicmp(szName, _T("default"), 7)) + if (!wcsnicmp(szName, L"default", 7)) { - _tcscpy(szDefaultOS, szValue); + wcscpy(szDefaultOS, szValue); } } while (SetupFindNextLine(&InfContext, &InfContext)); - if (!SetupFindFirstLine(hInf, - _T("operating systems"), + if (!SetupFindFirstLineW(hInf, + L"operating systems", NULL, &InfContext)) { @@ -353,48 +353,48 @@ LoadBootSettings(HINF hInf, HWND hwndDlg) do { - if (!SetupGetStringField(&InfContext, + if (!SetupGetStringFieldW(&InfContext, 0, szName, - sizeof(szName) / sizeof(TCHAR), + sizeof(szName) / sizeof(WCHAR), &LineLength)) { return FALSE; } - if (!SetupGetStringField(&InfContext, + if (!SetupGetStringFieldW(&InfContext, 1, szValue, - sizeof(szValue) / sizeof(TCHAR), + sizeof(szValue) / sizeof(WCHAR), &LineLength)) { return FALSE; } - SetupGetStringField(&InfContext, + SetupGetStringFieldW(&InfContext, 2, szOptions, - sizeof(szOptions) / sizeof(TCHAR), + sizeof(szOptions) / sizeof(WCHAR), &LineLength); pRecord = (PBOOTRECORD) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(BOOTRECORD)); if (pRecord) { pRecord->BootType = 0; - _tcscpy(pRecord->szBootPath, szName); - _tcscpy(pRecord->szSectionName, szValue); - _tcscpy(pRecord->szOptions, szOptions); + wcscpy(pRecord->szBootPath, szName); + wcscpy(pRecord->szSectionName, szValue); + wcscpy(pRecord->szOptions, szOptions); - if (!_tcscmp(szName, szDefaultOS)) + if (!wcscmp(szName, szDefaultOS)) { /* ms boot ini stores the path not the friendly name */ - _tcscpy(szDefaultOS, szValue); + wcscpy(szDefaultOS, szValue); } - lResult = SendDlgItemMessage(hwndDlg, IDC_STRECOSCOMBO, CB_ADDSTRING, (WPARAM)0, (LPARAM)szValue); + lResult = SendDlgItemMessageW(hwndDlg, IDC_STRECOSCOMBO, CB_ADDSTRING, (WPARAM)0, (LPARAM)szValue); if (lResult != CB_ERR) { - SendDlgItemMessage(hwndDlg, IDC_STRECOSCOMBO, CB_SETITEMDATA, (WPARAM)lResult, (LPARAM)pRecord); + SendDlgItemMessageW(hwndDlg, IDC_STRECOSCOMBO, CB_SETITEMDATA, (WPARAM)lResult, (LPARAM)pRecord); } else { @@ -406,16 +406,16 @@ LoadBootSettings(HINF hInf, HWND hwndDlg) while (SetupFindNextLine(&InfContext, &InfContext)); /* find default os in list */ - lResult = SendDlgItemMessage(hwndDlg, IDC_STRECOSCOMBO, CB_FINDSTRING, (WPARAM)0, (LPARAM)szDefaultOS); + lResult = SendDlgItemMessageW(hwndDlg, IDC_STRECOSCOMBO, CB_FINDSTRING, (WPARAM)0, (LPARAM)szDefaultOS); if (lResult != CB_ERR) { /* set cur sel */ - SendDlgItemMessage(hwndDlg, IDC_STRECOSCOMBO, CB_SETCURSEL, (WPARAM)lResult, (LPARAM)0); + SendDlgItemMessageW(hwndDlg, IDC_STRECOSCOMBO, CB_SETCURSEL, (WPARAM)lResult, (LPARAM)0); } if(TimeOut) { - SendDlgItemMessage(hwndDlg, IDC_STRECLIST, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); + SendDlgItemMessageW(hwndDlg, IDC_STRECLIST, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); } SetTimeout(hwndDlg, TimeOut); @@ -430,40 +430,40 @@ DeleteBootRecords(HWND hwndDlg) LONG index; PBOOTRECORD pRecord; - lIndex = SendDlgItemMessage(hwndDlg, IDC_STRECOSCOMBO, CB_GETCOUNT, (WPARAM)0, (LPARAM)0); + lIndex = SendDlgItemMessageW(hwndDlg, IDC_STRECOSCOMBO, CB_GETCOUNT, (WPARAM)0, (LPARAM)0); if (lIndex == CB_ERR) return; for (index = 0; index szFreeldrIni, szSystemDrive); - _tcscat(pStartInfo->szFreeldrIni, _T("\\freeldr.ini")); + wcscpy(pStartInfo->szFreeldrIni, szSystemDrive); + wcscat(pStartInfo->szFreeldrIni, L"\\freeldr.ini"); - if (PathFileExists(pStartInfo->szFreeldrIni)) + if (PathFileExistsW(pStartInfo->szFreeldrIni)) { /* freeldr.ini exists */ - hInf = SetupOpenInfFile(pStartInfo->szFreeldrIni, + hInf = SetupOpenInfFileW(pStartInfo->szFreeldrIni, NULL, INF_STYLE_OLDNT, NULL); @@ -479,13 +479,13 @@ LoadOSList(HWND hwndDlg, PSTARTINFO pStartInfo) } /* try load boot.ini settings */ - _tcscpy(pStartInfo->szFreeldrIni, szSystemDrive); - _tcscat(pStartInfo->szFreeldrIni, _T("\\boot.ini")); + wcscpy(pStartInfo->szFreeldrIni, szSystemDrive); + wcscat(pStartInfo->szFreeldrIni, L"\\boot.ini"); - if (PathFileExists(pStartInfo->szFreeldrIni)) + if (PathFileExistsW(pStartInfo->szFreeldrIni)) { /* load boot.ini settings */ - hInf = SetupOpenInfFile(pStartInfo->szFreeldrIni, + hInf = SetupOpenInfFileW(pStartInfo->szFreeldrIni, NULL, INF_STYLE_OLDNT, NULL); @@ -518,16 +518,16 @@ SetCrashDlgItems(HWND hwnd, PSTARTINFO pStartInfo) /* minidump type */ EnableWindow(GetDlgItem(hwnd, IDC_STRRECDUMPFILE), TRUE); EnableWindow(GetDlgItem(hwnd, IDC_STRRECOVERWRITE), FALSE); - SendMessage(GetDlgItem(hwnd, IDC_STRRECDUMPFILE), WM_SETTEXT, (WPARAM)0, (LPARAM)pStartInfo->szMinidumpDir); + SendMessageW(GetDlgItem(hwnd, IDC_STRRECDUMPFILE), WM_SETTEXT, (WPARAM)0, (LPARAM)pStartInfo->szMinidumpDir); } else if (pStartInfo->dwCrashDumpEnabled == 1 || pStartInfo->dwCrashDumpEnabled == 2) { /* kernel or complete dump */ EnableWindow(GetDlgItem(hwnd, IDC_STRRECDUMPFILE), TRUE); EnableWindow(GetDlgItem(hwnd, IDC_STRRECOVERWRITE), TRUE); - SendMessage(GetDlgItem(hwnd, IDC_STRRECDUMPFILE), WM_SETTEXT, (WPARAM)0, (LPARAM)pStartInfo->szDumpFile); + SendMessageW(GetDlgItem(hwnd, IDC_STRRECDUMPFILE), WM_SETTEXT, (WPARAM)0, (LPARAM)pStartInfo->szDumpFile); } - SendDlgItemMessage(hwnd, IDC_STRRECDEBUGCOMBO, CB_SETCURSEL, (WPARAM)pStartInfo->dwCrashDumpEnabled, (LPARAM)0); + SendDlgItemMessageW(hwnd, IDC_STRRECDEBUGCOMBO, CB_SETCURSEL, (WPARAM)pStartInfo->dwCrashDumpEnabled, (LPARAM)0); } static VOID @@ -536,8 +536,8 @@ WriteStartupRecoveryOptions(HWND hwndDlg, PSTARTINFO pStartInfo) HKEY hKey; DWORD lResult; - if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, - _T("System\\CurrentControlSet\\Control\\CrashControl"), + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"System\\CurrentControlSet\\Control\\CrashControl", 0, KEY_WRITE, &hKey) != ERROR_SUCCESS) @@ -547,30 +547,30 @@ WriteStartupRecoveryOptions(HWND hwndDlg, PSTARTINFO pStartInfo) } lResult = (DWORD) SendDlgItemMessage(hwndDlg, IDC_STRRECWRITEEVENT, BM_GETCHECK, (WPARAM)0, (LPARAM)0); - RegSetValueEx(hKey, _T("LogEvent"), 0, REG_DWORD, (LPBYTE)&lResult, sizeof(lResult)); + RegSetValueExW(hKey, L"LogEvent", 0, REG_DWORD, (LPBYTE)&lResult, sizeof(lResult)); lResult = (DWORD) SendDlgItemMessage(hwndDlg, IDC_STRRECSENDALERT, BM_GETCHECK, (WPARAM)0, (LPARAM)0); - RegSetValueEx(hKey, _T("SendAlert"), 0, REG_DWORD, (LPBYTE)&lResult, sizeof(lResult)); + RegSetValueExW(hKey, L"SendAlert", 0, REG_DWORD, (LPBYTE)&lResult, sizeof(lResult)); lResult = (DWORD) SendDlgItemMessage(hwndDlg, IDC_STRRECRESTART, BM_GETCHECK, (WPARAM)0, (LPARAM)0); - RegSetValueEx(hKey, _T("AutoReboot"), 0, REG_DWORD, (LPBYTE)&lResult, sizeof(lResult)); + RegSetValueExW(hKey, L"AutoReboot", 0, REG_DWORD, (LPBYTE)&lResult, sizeof(lResult)); lResult = (DWORD) SendDlgItemMessage(hwndDlg, IDC_STRRECOVERWRITE, BM_GETCHECK, (WPARAM)0, (LPARAM)0); - RegSetValueEx(hKey, _T("Overwrite"), 0, REG_DWORD, (LPBYTE)&lResult, sizeof(lResult)); + RegSetValueExW(hKey, L"Overwrite", 0, REG_DWORD, (LPBYTE)&lResult, sizeof(lResult)); if (pStartInfo->dwCrashDumpEnabled == 1 || pStartInfo->dwCrashDumpEnabled == 2) { - SendDlgItemMessage(hwndDlg, IDC_STRRECDUMPFILE, WM_GETTEXT, (WPARAM)sizeof(pStartInfo->szDumpFile) / sizeof(TCHAR), (LPARAM)pStartInfo->szDumpFile); - RegSetValueEx(hKey, _T("DumpFile"), 0, REG_EXPAND_SZ, (LPBYTE)pStartInfo->szDumpFile, (_tcslen(pStartInfo->szDumpFile) + 1) * sizeof(TCHAR)); + SendDlgItemMessage(hwndDlg, IDC_STRRECDUMPFILE, WM_GETTEXT, (WPARAM)sizeof(pStartInfo->szDumpFile) / sizeof(WCHAR), (LPARAM)pStartInfo->szDumpFile); + RegSetValueExW(hKey, L"DumpFile", 0, REG_EXPAND_SZ, (LPBYTE)pStartInfo->szDumpFile, (wcslen(pStartInfo->szDumpFile) + 1) * sizeof(WCHAR)); } else if (pStartInfo->dwCrashDumpEnabled == 3) { - SendDlgItemMessage(hwndDlg, IDC_STRRECDUMPFILE, WM_GETTEXT, (WPARAM)sizeof(pStartInfo->szDumpFile) / sizeof(TCHAR), (LPARAM)pStartInfo->szDumpFile); - RegSetValueEx(hKey, _T("MinidumpDir"), 0, REG_EXPAND_SZ, (LPBYTE)pStartInfo->szDumpFile, (_tcslen(pStartInfo->szDumpFile) + 1) * sizeof(TCHAR)); + SendDlgItemMessage(hwndDlg, IDC_STRRECDUMPFILE, WM_GETTEXT, (WPARAM)sizeof(pStartInfo->szDumpFile) / sizeof(WCHAR), (LPARAM)pStartInfo->szDumpFile); + RegSetValueExW(hKey, L"MinidumpDir", 0, REG_EXPAND_SZ, (LPBYTE)pStartInfo->szDumpFile, (wcslen(pStartInfo->szDumpFile) + 1) * sizeof(WCHAR)); } - RegSetValueEx(hKey, _T("CrashDumpEnabled"), 0, REG_DWORD, (LPBYTE)(DWORD_PTR)pStartInfo->dwCrashDumpEnabled, sizeof(pStartInfo->dwCrashDumpEnabled)); + RegSetValueExW(hKey, L"CrashDumpEnabled", 0, REG_DWORD, (LPBYTE)(DWORD_PTR)pStartInfo->dwCrashDumpEnabled, sizeof(pStartInfo->dwCrashDumpEnabled)); RegCloseKey(hKey); } @@ -578,13 +578,11 @@ static VOID LoadRecoveryOptions(HWND hwndDlg, PSTARTINFO pStartInfo) { HKEY hKey; - DWORD dwValues; - TCHAR szName[MAX_PATH]; - TCHAR szValue[MAX_PATH]; - DWORD i, dwName, dwValue, dwValueLength, dwType; + WCHAR szName[MAX_PATH]; + DWORD dwValue, dwValueLength, dwType; if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, - _T("System\\CurrentControlSet\\Control\\CrashControl"), + L"System\\CurrentControlSet\\Control\\CrashControl", 0, KEY_READ, &hKey) != ERROR_SUCCESS) @@ -593,88 +591,57 @@ LoadRecoveryOptions(HWND hwndDlg, PSTARTINFO pStartInfo) return; } - if (RegQueryInfoKey(hKey, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - &dwValues, - NULL, - NULL, - NULL, - NULL) != ERROR_SUCCESS) + dwValueLength = sizeof(DWORD); + if (RegQueryValueExW(hKey, L"LogEvent", NULL, &dwType, (LPBYTE)&dwValue, &dwValueLength) == ERROR_SUCCESS && dwType == REG_DWORD && dwValue) + SendDlgItemMessageW(hwndDlg, IDC_STRRECWRITEEVENT, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); + + dwValueLength = sizeof(DWORD); + if (RegQueryValueExW(hKey, L"SendAlert", NULL, &dwType, (LPBYTE)&dwValue, &dwValueLength) == ERROR_SUCCESS && dwType == REG_DWORD && dwValue) + SendDlgItemMessageW(hwndDlg, IDC_STRRECSENDALERT, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); + + dwValueLength = sizeof(DWORD); + if (RegQueryValueExW(hKey, L"AutoReboot", NULL, &dwType, (LPBYTE)&dwValue, &dwValueLength) == ERROR_SUCCESS && dwType == REG_DWORD && dwValue) + SendDlgItemMessageW(hwndDlg, IDC_STRRECRESTART, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); + + dwValueLength = sizeof(DWORD); + if (RegQueryValueExW(hKey, L"Overwrite", NULL, &dwType, (LPBYTE)&dwValue, &dwValueLength) == ERROR_SUCCESS && dwType == REG_DWORD && dwValue) + SendDlgItemMessageW(hwndDlg, IDC_STRRECOVERWRITE, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); + + dwValueLength = sizeof(DWORD); + if (RegQueryValueExW(hKey, L"CrashDumpEnabled", NULL, &dwType, (LPBYTE)&dwValue, &dwValueLength) == ERROR_SUCCESS && dwType == REG_DWORD && dwValue) + pStartInfo->dwCrashDumpEnabled = dwValue; + + dwValueLength = sizeof(pStartInfo->szDumpFile); + if (RegQueryValueExW(hKey, L"DumpFile", NULL, &dwType, (LPBYTE)pStartInfo->szDumpFile, &dwValueLength) != ERROR_SUCCESS) + pStartInfo->szDumpFile[0] = L'\0'; + + dwValueLength = sizeof(pStartInfo->szMinidumpDir); + if (RegQueryValueExW(hKey, L"MinidumpDir", NULL, &dwType, (LPBYTE)pStartInfo->szMinidumpDir, &dwValueLength) != ERROR_SUCCESS) + pStartInfo->szMinidumpDir[0] = L'\0'; + + if (LoadStringW(hApplet, IDS_NO_DUMP, szName, sizeof(szName) / sizeof(WCHAR))) { - RegCloseKey(hKey); - return; + szName[(sizeof(szName)/sizeof(WCHAR))-1] = L'\0'; + SendDlgItemMessageW(hwndDlg, IDC_STRRECDEBUGCOMBO, CB_ADDSTRING, (WPARAM)0, (LPARAM) szName); } - for (i = 0; i < dwValues; i++) + if (LoadString(hApplet, IDS_FULL_DUMP, szName, sizeof(szName) / sizeof(WCHAR))) { - dwName = sizeof(szName) / sizeof(TCHAR); - - RegEnumValue(hKey, i, szName, &dwName, NULL, &dwType, NULL, NULL); - if (dwType == REG_DWORD) - { - dwValueLength = sizeof(dwValue); - dwName = sizeof(szName) / sizeof(TCHAR); - if (RegEnumValue(hKey, i, szName, &dwName, NULL, &dwType, (LPBYTE)&dwValue, &dwValueLength) != ERROR_SUCCESS) - continue; - } - else - { - dwValueLength = sizeof(szValue); - dwName = sizeof(szName) / sizeof(TCHAR); - if (RegEnumValue(hKey, i, szName, &dwName, NULL, &dwType, (LPBYTE)&szValue, &dwValueLength) != ERROR_SUCCESS) - continue; - } - - if (!_tcscmp(szName, _T("LogEvent"))) - { - if (dwValue) - SendDlgItemMessage(hwndDlg, IDC_STRRECWRITEEVENT, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); - } - else if (!_tcscmp(szName, _T("SendAlert"))) - { - if (dwValue) - SendDlgItemMessage(hwndDlg, IDC_STRRECSENDALERT, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); - } - else if (!_tcscmp(szName, _T("AutoReboot"))) - { - if (dwValue) - SendDlgItemMessage(hwndDlg, IDC_STRRECRESTART, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); - } - else if (!_tcscmp(szName, _T("Overwrite"))) - { - if (dwValue) - SendDlgItemMessage(hwndDlg, IDC_STRRECOVERWRITE, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); - } - else if (!_tcscmp(szName, _T("DumpFile"))) - { - _tcscpy(pStartInfo->szDumpFile, szValue); - } - else if (!_tcscmp(szName, _T("MinidumpDir"))) - { - _tcscpy(pStartInfo->szMinidumpDir, szValue); - } - else if (!_tcscmp(szName, _T("CrashDumpEnabled"))) - { - pStartInfo->dwCrashDumpEnabled = dwValue; - } + szName[(sizeof(szName)/sizeof(WCHAR))-1] = L'\0'; + SendDlgItemMessageW(hwndDlg, IDC_STRRECDEBUGCOMBO, CB_ADDSTRING, (WPARAM)0, (LPARAM) szName); } - if (LoadString(hApplet, IDS_NO_DUMP, szValue, sizeof(szValue) / sizeof(TCHAR)) < sizeof(szValue) / sizeof(TCHAR)) - SendDlgItemMessage(hwndDlg, IDC_STRRECDEBUGCOMBO, CB_ADDSTRING, (WPARAM)0, (LPARAM) szValue); + if (LoadStringW(hApplet, IDS_KERNEL_DUMP, szName, sizeof(szName) / sizeof(WCHAR))) + { + szName[(sizeof(szName)/sizeof(WCHAR))-1] = L'\0'; + SendDlgItemMessageW(hwndDlg, IDC_STRRECDEBUGCOMBO, CB_ADDSTRING, (WPARAM)0, (LPARAM) szName); + } - if (LoadString(hApplet, IDS_FULL_DUMP, szValue, sizeof(szValue) / sizeof(TCHAR)) < sizeof(szValue) / sizeof(TCHAR)) - SendDlgItemMessage(hwndDlg, IDC_STRRECDEBUGCOMBO, CB_ADDSTRING, (WPARAM)0, (LPARAM) szValue); - - if (LoadString(hApplet, IDS_KERNEL_DUMP, szValue, sizeof(szValue) / sizeof(TCHAR)) < sizeof(szValue) / sizeof(TCHAR)) - SendDlgItemMessage(hwndDlg, IDC_STRRECDEBUGCOMBO, CB_ADDSTRING, (WPARAM)0, (LPARAM) szValue); - - if (LoadString(hApplet, IDS_MINI_DUMP, szValue, sizeof(szValue) / sizeof(TCHAR)) < sizeof(szValue) / sizeof(TCHAR)) - SendDlgItemMessage(hwndDlg, IDC_STRRECDEBUGCOMBO, CB_ADDSTRING, (WPARAM)0, (LPARAM) szValue); + if (LoadStringW(hApplet, IDS_MINI_DUMP, szName, sizeof(szName) / sizeof(WCHAR))) + { + szName[(sizeof(szName)/sizeof(WCHAR))-1] = L'\0'; + SendDlgItemMessageW(hwndDlg, IDC_STRRECDEBUGCOMBO, CB_ADDSTRING, (WPARAM)0, (LPARAM) szName); + } SetCrashDlgItems(hwndDlg, pStartInfo); RegCloseKey(hKey); @@ -692,7 +659,7 @@ StartRecDlgProc(HWND hwndDlg, PBOOTRECORD pRecord; int iTimeout; LRESULT lResult; - TCHAR szTimeout[10]; + WCHAR szTimeout[10]; UNREFERENCED_PARAMETER(lParam); @@ -717,7 +684,7 @@ StartRecDlgProc(HWND hwndDlg, switch(LOWORD(wParam)) { case IDC_STRRECEDIT: - ShellExecute(0, _T("open"), _T("notepad"), pStartInfo->szFreeldrIni, NULL, SW_SHOWNORMAL); + ShellExecuteW(0, L"open", L"notepad", pStartInfo->szFreeldrIni, NULL, SW_SHOWNORMAL); // FIXME use CreateProcess and wait untill finished // DeleteBootRecords(hwndDlg); // LoadOSList(hwndDlg); @@ -729,9 +696,9 @@ StartRecDlgProc(HWND hwndDlg, iTimeout = SendDlgItemMessage(hwndDlg, IDC_STRRECLISTUPDWN, UDM_GETPOS, (WPARAM)0, (LPARAM)0); else iTimeout = 0; - _stprintf(szTimeout, _T("%i"), iTimeout); + swprintf(szTimeout, L"%i", iTimeout); - lResult = SendDlgItemMessage(hwndDlg, IDC_STRECOSCOMBO, CB_GETCURSEL, (WPARAM)0, (LPARAM)0); + lResult = SendDlgItemMessageW(hwndDlg, IDC_STRECOSCOMBO, CB_GETCURSEL, (WPARAM)0, (LPARAM)0); if (lResult == CB_ERR) { /* ? */ @@ -746,13 +713,13 @@ StartRecDlgProc(HWND hwndDlg, if (pStartInfo->iFreeLdrIni == 1) // FreeLdrIni style { /* set default timeout */ - WritePrivateProfileString(_T("FREELOADER"), - _T("TimeOut"), + WritePrivateProfileStringW(L"FREELOADER", + L"TimeOut", szTimeout, pStartInfo->szFreeldrIni); /* set default os */ - WritePrivateProfileString(_T("FREELOADER"), - _T("DefaultOS"), + WritePrivateProfileStringW(L"FREELOADER", + L"DefaultOS", pRecord->szSectionName, pStartInfo->szFreeldrIni); @@ -760,13 +727,13 @@ StartRecDlgProc(HWND hwndDlg, else if (pStartInfo->iFreeLdrIni == 2) // BootIni style { /* set default timeout */ - WritePrivateProfileString(_T("boot loader"), - _T("timeout"), + WritePrivateProfileStringW(L"boot loader", + L"timeout", szTimeout, pStartInfo->szFreeldrIni); /* set default os */ - WritePrivateProfileString(_T("boot loader"), - _T("default"), + WritePrivateProfileStringW(L"boot loader", + L"default", pRecord->szBootPath, pStartInfo->szFreeldrIni); @@ -807,11 +774,11 @@ StartRecDlgProc(HWND hwndDlg, { if (pStartInfo->dwCrashDumpEnabled == 1 || pStartInfo->dwCrashDumpEnabled == 2) { - SendDlgItemMessage(hwndDlg, IDC_STRRECDUMPFILE, WM_GETTEXT, (WPARAM)sizeof(pStartInfo->szDumpFile) / sizeof(TCHAR), (LPARAM)pStartInfo->szDumpFile); + SendDlgItemMessageW(hwndDlg, IDC_STRRECDUMPFILE, WM_GETTEXT, (WPARAM)sizeof(pStartInfo->szDumpFile) / sizeof(WCHAR), (LPARAM)pStartInfo->szDumpFile); } else if (pStartInfo->dwCrashDumpEnabled == 3) { - SendDlgItemMessage(hwndDlg, IDC_STRRECDUMPFILE, WM_GETTEXT, (WPARAM)sizeof(pStartInfo->szMinidumpDir) / sizeof(TCHAR), (LPARAM)pStartInfo->szMinidumpDir); + SendDlgItemMessageW(hwndDlg, IDC_STRRECDUMPFILE, WM_GETTEXT, (WPARAM)sizeof(pStartInfo->szMinidumpDir) / sizeof(WCHAR), (LPARAM)pStartInfo->szMinidumpDir); } pStartInfo->dwCrashDumpEnabled = lResult; diff --git a/reactos/dll/cpl/sysdm/sysdm.rbuild b/reactos/dll/cpl/sysdm/sysdm.rbuild index c6c3f94f7a0..2a2954128b4 100644 --- a/reactos/dll/cpl/sysdm/sysdm.rbuild +++ b/reactos/dll/cpl/sysdm/sysdm.rbuild @@ -9,7 +9,6 @@ user32 gdi32 comctl32 - ntdll msimg32 shell32 shlwapi @@ -26,6 +25,5 @@ userprofile.c virtmem.c sysdm.rc - sysdm.spec precomp.h diff --git a/reactos/dll/cpl/telephon/telephon.rbuild b/reactos/dll/cpl/telephon/telephon.rbuild index 15c97d8fdf3..3592ef5dd4a 100644 --- a/reactos/dll/cpl/telephon/telephon.rbuild +++ b/reactos/dll/cpl/telephon/telephon.rbuild @@ -12,5 +12,4 @@ shell32 telephon.c telephon.rc - telephon.spec diff --git a/reactos/dll/cpl/timedate/timedate.rbuild b/reactos/dll/cpl/timedate/timedate.rbuild index f0f0a9dc89d..fd8f125a798 100644 --- a/reactos/dll/cpl/timedate/timedate.rbuild +++ b/reactos/dll/cpl/timedate/timedate.rbuild @@ -18,6 +18,5 @@ timedate.c timezone.c timedate.rc - timedate.spec diff --git a/reactos/dll/cpl/usrmgr/usrmgr.rbuild b/reactos/dll/cpl/usrmgr/usrmgr.rbuild index 64ffbbf3e31..1988b4d3e5e 100644 --- a/reactos/dll/cpl/usrmgr/usrmgr.rbuild +++ b/reactos/dll/cpl/usrmgr/usrmgr.rbuild @@ -18,5 +18,4 @@ users.c usrmgr.c usrmgr.rc - usrmgr.spec diff --git a/reactos/dll/directx/d3d8/d3d8.rbuild b/reactos/dll/directx/d3d8/d3d8.rbuild index 3c14ab2b963..bbcbf25c3b8 100644 --- a/reactos/dll/directx/d3d8/d3d8.rbuild +++ b/reactos/dll/directx/d3d8/d3d8.rbuild @@ -4,5 +4,4 @@ d3d8.c d3d8.rc - d3d8.spec diff --git a/reactos/dll/directx/d3d9/adapter.c b/reactos/dll/directx/d3d9/adapter.c index 513888f9303..868b13bca2f 100644 --- a/reactos/dll/directx/d3d9/adapter.c +++ b/reactos/dll/directx/d3d9/adapter.c @@ -6,7 +6,7 @@ * PROGRAMERS: Gregor Brunmar */ -#define _WIN32_WINNT 0x0502 +//#define _WIN32_WINNT 0x0502 #include "d3d9_common.h" #include #include diff --git a/reactos/dll/directx/msdmo/msdmo.rbuild b/reactos/dll/directx/msdmo/msdmo.rbuild index 87c455a3405..1c57c75faed 100644 --- a/reactos/dll/directx/msdmo/msdmo.rbuild +++ b/reactos/dll/directx/msdmo/msdmo.rbuild @@ -9,6 +9,5 @@ ntdll msdmo.c msdmo.rc - msdmo.spec diff --git a/reactos/dll/directx/quartz/quartz.rbuild b/reactos/dll/directx/quartz/quartz.rbuild index c7027648ba1..381bf1d2d1a 100644 --- a/reactos/dll/directx/quartz/quartz.rbuild +++ b/reactos/dll/directx/quartz/quartz.rbuild @@ -47,6 +47,5 @@ control.c avisplit.c version.rc - quartz.spec \ No newline at end of file diff --git a/reactos/dll/directx/wine/d3d9/d3d9.rbuild b/reactos/dll/directx/wine/d3d9/d3d9.rbuild index 867df67cf03..c9b788d7938 100644 --- a/reactos/dll/directx/wine/d3d9/d3d9.rbuild +++ b/reactos/dll/directx/wine/d3d9/d3d9.rbuild @@ -35,5 +35,4 @@ volume.c volumetexture.c version.rc - d3d9.spec diff --git a/reactos/dll/directx/wine/wined3d/wined3d.rbuild b/reactos/dll/directx/wine/wined3d/wined3d.rbuild index 67e7e44b481..ac972254a58 100644 --- a/reactos/dll/directx/wine/wined3d/wined3d.rbuild +++ b/reactos/dll/directx/wine/wined3d/wined3d.rbuild @@ -14,7 +14,6 @@ advapi32 kernel32 uuid - msvcrt ati_fragment_shader.c arb_program_shader.c diff --git a/reactos/dll/nls/idndl_redist/idndl_redist.rbuild b/reactos/dll/nls/idndl_redist/idndl_redist.rbuild index 2f4fc4b6f7f..b5826dcf817 100644 --- a/reactos/dll/nls/idndl_redist/idndl_redist.rbuild +++ b/reactos/dll/nls/idndl_redist/idndl_redist.rbuild @@ -1,9 +1,8 @@ - + kernel32 scripts - libcntpr -fno-exceptions -fno-rtti --entry=0 diff --git a/reactos/dll/nls/nls.rbuild b/reactos/dll/nls/nls.rbuild index 83c07573344..060c5e9585f 100644 --- a/reactos/dll/nls/nls.rbuild +++ b/reactos/dll/nls/nls.rbuild @@ -4,13 +4,13 @@ - + - + diff --git a/reactos/dll/nls/normaliz_redist/normaliz_redist.rbuild b/reactos/dll/nls/normaliz_redist/normaliz_redist.rbuild index f25c82280f2..2876cc0602a 100644 --- a/reactos/dll/nls/normaliz_redist/normaliz_redist.rbuild +++ b/reactos/dll/nls/normaliz_redist/normaliz_redist.rbuild @@ -4,11 +4,10 @@ icu/source/common icudt38.c - + normalize idna normaliz_redist_data - libcntpr kernel32 -fno-exceptions -fno-rtti diff --git a/reactos/dll/ntdll/dispatch/dispatch.c b/reactos/dll/ntdll/dispatch/dispatch.c index 6fd4f70024f..c6f749c70bd 100644 --- a/reactos/dll/ntdll/dispatch/dispatch.c +++ b/reactos/dll/ntdll/dispatch/dispatch.c @@ -15,10 +15,6 @@ typedef NTSTATUS (NTAPI *USER_CALL)(PVOID Argument, ULONG ArgumentLength); -EXCEPTION_DISPOSITION NTAPI -RtlpExecuteVectoredExceptionHandlers(IN PEXCEPTION_RECORD ExceptionRecord, - IN PCONTEXT Context); - /* FUNCTIONS ****************************************************************/ /* @@ -32,26 +28,16 @@ KiUserExceptionDispatcher(PEXCEPTION_RECORD ExceptionRecord, EXCEPTION_RECORD NestedExceptionRecord; NTSTATUS Status; - /* call the vectored exception handlers */ - if(RtlpExecuteVectoredExceptionHandlers(ExceptionRecord, - Context) != ExceptionContinueExecution) + /* Dispatch the exception and check the result */ + if (RtlDispatchException(ExceptionRecord, Context)) { - goto ContinueExecution; + /* Continue executing */ + Status = NtContinue(Context, FALSE); } else { - /* Dispatch the exception and check the result */ - if(RtlDispatchException(ExceptionRecord, Context)) - { -ContinueExecution: - /* Continue executing */ - Status = NtContinue(Context, FALSE); - } - else - { - /* Raise an exception */ - Status = NtRaiseException(ExceptionRecord, Context, FALSE); - } + /* Raise an exception */ + Status = NtRaiseException(ExceptionRecord, Context, FALSE); } /* Setup the Exception record */ diff --git a/reactos/dll/ntdll/dispatch/i386/dispatch.S b/reactos/dll/ntdll/dispatch/i386/dispatch.S index 526e5b8f189..a586f6f27e7 100644 --- a/reactos/dll/ntdll/dispatch/i386/dispatch.S +++ b/reactos/dll/ntdll/dispatch/i386/dispatch.S @@ -183,52 +183,22 @@ _KiRaiseUserExceptionDispatcher@0: .globl _KiUserExceptionDispatcher@8 _KiUserExceptionDispatcher@8: - /* clear the direct flag - * text from bug 2279 - * if it not clear it means that if an exception occurs while - * the direction flag is set (typically inside memmove), the - * exception handlers will be called with the direction flag still - * set. The Windows x86-32 and x86-64 ABI requires that the - * direction flag be Calling memset() with a compile-time constant - * size on both GCC and MSVC will result in inlining a "rep stosd" - * instruction. Because of the ABI, they will assume that the - * direction flag is clear and not emit a "cld" instruction. - * Using memset() in an exception handler therefore will - * corrupt memory if the exception occurred during a reverse copy - * such as a forward overlapping memmove(). - * - * For reliability and ease of debugging, please add "cld" to the beginning of - * KiUserExceptionDispatcher. Note that the same will be true of x86-64 whenever - * that happens. This does not affect continuing execution; the CONTEXT of the - * exception has the direction flag set and will be restored upon NtContinue. - * KiUserApcDispatcher and KiUserCallbackDispatcher need to be evaluated for this - * issue. - */ - + /* Clear direction flag */ cld /* Save the Context and Exception Records */ mov ecx, [esp+4] mov ebx, [esp] - /* Call the vectored exception handler */ + /* Dispatch the exception */ push ecx push ebx - call _RtlpExecuteVectoredExceptionHandlers@8 - - /* Check for success */ - or al, al - jnz ContinueExecution - - /* Dispatch the exception */ - sub esp, 8 call _RtlDispatchException@8 /* Check for success */ or al, al jz RaiseException -ContinueExecution: /* Pop off the records */ pop ebx pop ecx diff --git a/reactos/dll/ntdll/ntdll.rbuild b/reactos/dll/ntdll/ntdll.rbuild index cb7a22855b4..832604d60e1 100644 --- a/reactos/dll/ntdll/ntdll.rbuild +++ b/reactos/dll/ntdll/ntdll.rbuild @@ -1,7 +1,10 @@ - + + + + include diff --git a/reactos/dll/shellext/deskmon/deskmon.rbuild b/reactos/dll/shellext/deskmon/deskmon.rbuild index 91442c16c57..36252dc14ab 100644 --- a/reactos/dll/shellext/deskmon/deskmon.rbuild +++ b/reactos/dll/shellext/deskmon/deskmon.rbuild @@ -11,6 +11,5 @@ deskmon.c shxiface.c deskmon.rc - deskmon.spec precomp.h diff --git a/reactos/dll/shellext/fontext/fontext.rbuild b/reactos/dll/shellext/fontext/fontext.rbuild index 058d3df9ad0..5418840f553 100644 --- a/reactos/dll/shellext/fontext/fontext.rbuild +++ b/reactos/dll/shellext/fontext/fontext.rbuild @@ -14,5 +14,4 @@ fontext.c regsvr.c fontext.rc - fontext.spec diff --git a/reactos/dll/win32/advapi32/advapi32.rbuild b/reactos/dll/win32/advapi32/advapi32.rbuild index 17d7eddcc0a..c5e0c4d6022 100644 --- a/reactos/dll/win32/advapi32/advapi32.rbuild +++ b/reactos/dll/win32/advapi32/advapi32.rbuild @@ -18,7 +18,6 @@ pseh ntdll advapi32.h - advapi32.spec crypt.c crypt_arc4.c diff --git a/reactos/dll/win32/advapi32/misc/shutdown.c b/reactos/dll/win32/advapi32/misc/shutdown.c index 494c7aaaf31..0d7411fbe07 100644 --- a/reactos/dll/win32/advapi32/misc/shutdown.c +++ b/reactos/dll/win32/advapi32/misc/shutdown.c @@ -109,6 +109,9 @@ InitiateSystemShutdownA(LPSTR lpMachineName, INT LastError; BOOL rv; + MachineNameW.Buffer = NULL; + MessageW.Buffer = NULL; + if (lpMachineName) { RtlInitAnsiString(&MachineNameA, lpMachineName); @@ -126,7 +129,7 @@ InitiateSystemShutdownA(LPSTR lpMachineName, Status = RtlAnsiStringToUnicodeString(&MessageW, &MessageA, TRUE); if (STATUS_SUCCESS != Status) { - if (MachineNameW.Length) + if (MachineNameW.Buffer) { RtlFreeUnicodeString(&MachineNameW); } diff --git a/reactos/dll/win32/advapi32/reg/reg.c b/reactos/dll/win32/advapi32/reg/reg.c index 0fe44a71837..20f0b59f441 100644 --- a/reactos/dll/win32/advapi32/reg/reg.c +++ b/reactos/dll/win32/advapi32/reg/reg.c @@ -917,6 +917,8 @@ CreateNestedKey(PHKEY KeyHandle, LocalObjectAttributes.ObjectName = &LocalKeyName; FullNameLength = LocalKeyName.Length / sizeof(WCHAR); + LocalKeyHandle = NULL; + /* Remove the last part of the key name and try to create the key again. */ while (Status == STATUS_OBJECT_NAME_NOT_FOUND) { @@ -949,7 +951,8 @@ CreateNestedKey(PHKEY KeyHandle, Length = wcslen (LocalKeyName.Buffer); while (TRUE) { - NtClose (LocalKeyHandle); + if (LocalKeyHandle) + NtClose (LocalKeyHandle); LocalKeyName.Buffer[Length] = L'\\'; Length = wcslen (LocalKeyName.Buffer); @@ -2544,7 +2547,7 @@ RegEnumKeyExA (HKEY hKey, } } - TRACE("Key Namea0 Length %d\n", StringU.Length); + /*TRACE("Key Namea0 Length %d\n", StringU.Length);*/ /* BUGBUG could be uninitialized */ TRACE("Key Namea1 Length %d\n", NameLength); TRACE("Key Namea Length %d\n", *lpcbName); TRACE("Key Namea %s\n", lpName); @@ -4685,13 +4688,14 @@ RegSetValueExA (HKEY hKey, { RtlCreateUnicodeStringFromAsciiz (&ValueName, (PSTR)lpValueName); - pValueName = (LPWSTR)ValueName.Buffer; } else { - pValueName = NULL; + ValueName.Buffer = NULL; } + pValueName = (LPWSTR)ValueName.Buffer; + if (((dwType == REG_SZ) || (dwType == REG_MULTI_SZ) || (dwType == REG_EXPAND_SZ)) && diff --git a/reactos/dll/win32/advapi32/sec/lsa.c b/reactos/dll/win32/advapi32/sec/lsa.c index 9cb5d4b1a75..5a2ebebd826 100644 --- a/reactos/dll/win32/advapi32/sec/lsa.c +++ b/reactos/dll/win32/advapi32/sec/lsa.c @@ -26,9 +26,9 @@ PLSAPR_SERVER_NAME_bind(PLSAPR_SERVER_NAME pszSystemName) TRACE("PLSAPR_SERVER_NAME_bind() called\n"); - status = RpcStringBindingComposeW(pszSystemName, + status = RpcStringBindingComposeW(NULL, L"ncacn_np", - NULL, + pszSystemName, L"\\pipe\\lsarpc", NULL, &pszStringBinding); diff --git a/reactos/dll/win32/advapi32/sec/misc.c b/reactos/dll/win32/advapi32/sec/misc.c index a75b1fa830f..7110e58076d 100644 --- a/reactos/dll/win32/advapi32/sec/misc.c +++ b/reactos/dll/win32/advapi32/sec/misc.c @@ -1252,6 +1252,8 @@ LookupPrivilegeValueA(LPCSTR lpSystemName, RtlCreateUnicodeStringFromAsciiz(&SystemName, (LPSTR)lpSystemName); } + else + SystemName.Buffer = NULL; /* Check the privilege name is not NULL */ if (lpName == NULL) @@ -1263,14 +1265,14 @@ LookupPrivilegeValueA(LPCSTR lpSystemName, RtlCreateUnicodeStringFromAsciiz(&Name, (LPSTR)lpName); - Result = LookupPrivilegeValueW((lpSystemName != NULL) ? SystemName.Buffer : NULL, + Result = LookupPrivilegeValueW(SystemName.Buffer, Name.Buffer, lpLuid); RtlFreeUnicodeString(&Name); /* Remote system? */ - if (lpSystemName != NULL) + if (SystemName.Buffer != NULL) { RtlFreeUnicodeString(&SystemName); } diff --git a/reactos/dll/win32/advapi32/service/eventlog.c b/reactos/dll/win32/advapi32/service/eventlog.c index a842c421ab4..78c1cc64e81 100644 --- a/reactos/dll/win32/advapi32/service/eventlog.c +++ b/reactos/dll/win32/advapi32/service/eventlog.c @@ -27,15 +27,119 @@ WINE_DEFAULT_DEBUG_CHANNEL(advapi); WINE_DECLARE_DEBUG_CHANNEL(eventlog); -typedef struct _LOG_INFO -{ - RPC_BINDING_HANDLE BindingHandle; - IELF_HANDLE LogHandle; - BOOL bLocal; -} LOG_INFO, *PLOG_INFO; - static RPC_UNICODE_STRING EmptyString = { 0, 0, L"" }; + +handle_t __RPC_USER +EVENTLOG_HANDLE_A_bind(EVENTLOG_HANDLE_A UNCServerName) +{ + handle_t hBinding = NULL; + UCHAR *pszStringBinding; + RPC_STATUS status; + + TRACE("EVENTLOG_HANDLE_A_bind() called\n"); + + status = RpcStringBindingComposeA(NULL, + (UCHAR *)"ncacn_np", + (UCHAR *)UNCServerName, + (UCHAR *)"\\pipe\\ntsvcs", + NULL, + (UCHAR **)&pszStringBinding); + if (status) + { + ERR("RpcStringBindingCompose returned 0x%x\n", status); + return NULL; + } + + /* Set the binding handle that will be used to bind to the server. */ + status = RpcBindingFromStringBindingA(pszStringBinding, + &hBinding); + if (status) + { + ERR("RpcBindingFromStringBinding returned 0x%x\n", status); + } + + status = RpcStringFreeA(&pszStringBinding); + if (status) + { + ERR("RpcStringFree returned 0x%x\n", status); + } + + return hBinding; +} + + +void __RPC_USER +EVENTLOG_HANDLE_A_unbind(EVENTLOG_HANDLE_A UNCServerName, + handle_t hBinding) +{ + RPC_STATUS status; + + TRACE("EVENTLOG_HANDLE_A_unbind() called\n"); + + status = RpcBindingFree(&hBinding); + if (status) + { + ERR("RpcBindingFree returned 0x%x\n", status); + } +} + + +handle_t __RPC_USER +EVENTLOG_HANDLE_W_bind(EVENTLOG_HANDLE_W UNCServerName) +{ + handle_t hBinding = NULL; + LPWSTR pszStringBinding; + RPC_STATUS status; + + TRACE("EVENTLOG_HANDLE_W_bind() called\n"); + + status = RpcStringBindingComposeW(NULL, + L"ncacn_np", + (LPWSTR)UNCServerName, + L"\\pipe\\EventLog", + NULL, + &pszStringBinding); + if (status) + { + ERR("RpcStringBindingCompose returned 0x%x\n", status); + return NULL; + } + + /* Set the binding handle that will be used to bind to the server. */ + status = RpcBindingFromStringBindingW(pszStringBinding, + &hBinding); + if (status) + { + ERR("RpcBindingFromStringBinding returned 0x%x\n", status); + } + + status = RpcStringFreeW(&pszStringBinding); + if (status) + { + ERR("RpcStringFree returned 0x%x\n", status); + } + + return hBinding; +} + + +void __RPC_USER +EVENTLOG_HANDLE_W_unbind(EVENTLOG_HANDLE_W UNCServerName, + handle_t hBinding) +{ + RPC_STATUS status; + + TRACE("EVENTLOG_HANDLE_W_unbind() called\n"); + + status = RpcBindingFree(&hBinding); + if (status) + { + ERR("RpcBindingFree returned 0x%x\n", status); + } +} + + /****************************************************************************** * BackupEventLogA [ADVAPI32.@] */ @@ -43,9 +147,8 @@ BOOL WINAPI BackupEventLogA(IN HANDLE hEventLog, IN LPCSTR lpBackupFileName) { - PLOG_INFO pLog; - NTSTATUS Status; RPC_STRING BackupFileName; + NTSTATUS Status; TRACE("%p, %s\n", hEventLog, lpBackupFileName); @@ -53,16 +156,17 @@ BackupEventLogA(IN HANDLE hEventLog, BackupFileName.Length = BackupFileName.MaximumLength = lpBackupFileName ? strlen(lpBackupFileName) : 0; - pLog = (PLOG_INFO)hEventLog; - if (!pLog) + _SEH_TRY { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; + Status = ElfrBackupELFA(hEventLog, + &BackupFileName); } + _SEH_HANDLE + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + _SEH_END; - Status = ElfrBackupELFA(pLog->BindingHandle, - pLog->LogHandle, - &BackupFileName); if (!NT_SUCCESS(Status)) { SetLastError(RtlNtStatusToDosError(Status)); @@ -83,9 +187,8 @@ BOOL WINAPI BackupEventLogW(IN HANDLE hEventLog, IN LPCWSTR lpBackupFileName) { - PLOG_INFO pLog; - NTSTATUS Status; RPC_UNICODE_STRING BackupFileName; + NTSTATUS Status; TRACE("%p, %s\n", hEventLog, debugstr_w(lpBackupFileName)); @@ -93,16 +196,17 @@ BackupEventLogW(IN HANDLE hEventLog, BackupFileName.Length = BackupFileName.MaximumLength = lpBackupFileName ? wcslen(lpBackupFileName) * sizeof(WCHAR) : 0; - pLog = (PLOG_INFO)hEventLog; - if (!pLog) + _SEH_TRY { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; + Status = ElfrBackupELFW(hEventLog, + &BackupFileName); } + _SEH_HANDLE + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + _SEH_END; - Status = ElfrBackupELFW(pLog->BindingHandle, - pLog->LogHandle, - &BackupFileName); if (!NT_SUCCESS(Status)) { SetLastError(RtlNtStatusToDosError(Status)); @@ -120,9 +224,8 @@ BOOL WINAPI ClearEventLogA(IN HANDLE hEventLog, IN LPCSTR lpBackupFileName) { - PLOG_INFO pLog; - NTSTATUS Status; RPC_STRING BackupFileName; + NTSTATUS Status; TRACE("%p, %s\n", hEventLog, lpBackupFileName); @@ -130,16 +233,17 @@ ClearEventLogA(IN HANDLE hEventLog, BackupFileName.Length = BackupFileName.MaximumLength = lpBackupFileName ? strlen(lpBackupFileName) : 0; - pLog = (PLOG_INFO)hEventLog; - if (!pLog) + _SEH_TRY { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; + Status = ElfrClearELFA(hEventLog, + &BackupFileName); } + _SEH_HANDLE + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + _SEH_END; - Status = ElfrClearELFA(pLog->BindingHandle, - pLog->LogHandle, - &BackupFileName); if (!NT_SUCCESS(Status)) { SetLastError(RtlNtStatusToDosError(Status)); @@ -157,9 +261,8 @@ BOOL WINAPI ClearEventLogW(IN HANDLE hEventLog, IN LPCWSTR lpBackupFileName) { - PLOG_INFO pLog; - NTSTATUS Status; RPC_UNICODE_STRING BackupFileName; + NTSTATUS Status; TRACE("%p, %s\n", hEventLog, debugstr_w(lpBackupFileName)); @@ -167,16 +270,17 @@ ClearEventLogW(IN HANDLE hEventLog, BackupFileName.Length = BackupFileName.MaximumLength = lpBackupFileName ? wcslen(lpBackupFileName) * sizeof(WCHAR) : 0; - pLog = (PLOG_INFO)hEventLog; - if (!pLog) + _SEH_TRY { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; + Status = ElfrClearELFW(hEventLog, + &BackupFileName); } + _SEH_HANDLE + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + _SEH_END; - Status = ElfrClearELFW(pLog->BindingHandle, - pLog->LogHandle, - &BackupFileName); if (!NT_SUCCESS(Status)) { SetLastError(RtlNtStatusToDosError(Status)); @@ -193,35 +297,25 @@ ClearEventLogW(IN HANDLE hEventLog, BOOL WINAPI CloseEventLog(IN HANDLE hEventLog) { - PLOG_INFO pLog; NTSTATUS Status; TRACE("%p\n", hEventLog); - pLog = (PLOG_INFO)hEventLog; - if (!pLog) - return TRUE; - - if (pLog->bLocal == FALSE) + _SEH_TRY { - if (!EvtUnbindRpc(pLog->BindingHandle)) - { - SetLastError(ERROR_ACCESS_DENIED); - return FALSE; - } + Status = ElfrCloseEL(&hEventLog); } - else + _SEH_HANDLE { - Status = ElfrCloseEL(pLog->BindingHandle, - &pLog->LogHandle); - if (!NT_SUCCESS(Status)) - { - SetLastError(RtlNtStatusToDosError(Status)); - return FALSE; - } + Status = I_RpcMapWin32Status(RpcExceptionCode()); } + _SEH_END; - HeapFree(GetProcessHeap(), 0, pLog); + if (!NT_SUCCESS(Status)) + { + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } return TRUE; } @@ -239,17 +333,20 @@ CloseEventLog(IN HANDLE hEventLog) BOOL WINAPI DeregisterEventSource(IN HANDLE hEventLog) { - PLOG_INFO pLog; NTSTATUS Status; TRACE("%p\n", hEventLog); - pLog = (PLOG_INFO)hEventLog; - if (!pLog) - return TRUE; + _SEH_TRY + { + Status = ElfrDeregisterEventSource(&hEventLog); + } + _SEH_HANDLE + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + _SEH_END; - Status = ElfrDeregisterEventSource(pLog->BindingHandle, - &pLog->LogHandle); if (!NT_SUCCESS(Status)) { SetLastError(RtlNtStatusToDosError(Status)); @@ -271,22 +368,22 @@ BOOL WINAPI GetNumberOfEventLogRecords(IN HANDLE hEventLog, OUT PDWORD NumberOfRecords) { - PLOG_INFO pLog; NTSTATUS Status; DWORD Records; TRACE("%p, %p\n", hEventLog, NumberOfRecords); - pLog = (PLOG_INFO)hEventLog; - if (!pLog) + _SEH_TRY { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; + Status = ElfrNumberOfRecords(hEventLog, + &Records); } + _SEH_HANDLE + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + _SEH_END; - Status = ElfrNumberOfRecords(pLog->BindingHandle, - pLog->LogHandle, - &Records); if (!NT_SUCCESS(Status)) { SetLastError(RtlNtStatusToDosError(Status)); @@ -310,22 +407,22 @@ BOOL WINAPI GetOldestEventLogRecord(IN HANDLE hEventLog, OUT PDWORD OldestRecord) { - PLOG_INFO pLog; NTSTATUS Status; DWORD Oldest; TRACE("%p, %p\n", hEventLog, OldestRecord); - pLog = (PLOG_INFO)hEventLog; - if (!pLog) + _SEH_TRY { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; + Status = ElfrOldestRecord(hEventLog, + &Oldest); } + _SEH_HANDLE + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + _SEH_END; - Status = ElfrOldestRecord(pLog->BindingHandle, - pLog->LogHandle, - &Oldest); if (!NT_SUCCESS(Status)) { SetLastError(RtlNtStatusToDosError(Status)); @@ -403,9 +500,9 @@ HANDLE WINAPI OpenBackupEventLogW(IN LPCWSTR lpUNCServerName, IN LPCWSTR lpFileName) { - PLOG_INFO pLog; - NTSTATUS Status; RPC_UNICODE_STRING FileName; + IELF_HANDLE LogHandle; + NTSTATUS Status; TRACE("%s, %s\n", debugstr_w(lpUNCServerName), debugstr_w(lpFileName)); @@ -413,52 +510,27 @@ OpenBackupEventLogW(IN LPCWSTR lpUNCServerName, FileName.Length = FileName.MaximumLength = lpFileName ? wcslen(lpFileName) * sizeof(WCHAR) : 0; - pLog = HeapAlloc(GetProcessHeap(), 0, sizeof(LOG_INFO)); - if (!pLog) + _SEH_TRY { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return NULL; + Status = ElfrOpenBELW((LPWSTR)lpUNCServerName, + &FileName, + 0, + 0, + &LogHandle); } - - ZeroMemory(pLog, sizeof(LOG_INFO)); - - if (lpUNCServerName == NULL || *lpUNCServerName == 0) + _SEH_HANDLE { - pLog->bLocal = TRUE; - - if (!EvtGetLocalHandle(&pLog->BindingHandle)) - { - HeapFree(GetProcessHeap(), 0, pLog); - SetLastError(ERROR_GEN_FAILURE); - return NULL; - } + Status = I_RpcMapWin32Status(RpcExceptionCode()); } - else - { - pLog->bLocal = FALSE; + _SEH_END; - if (!EvtBindRpc(lpUNCServerName, &pLog->BindingHandle)) - { - HeapFree(GetProcessHeap(), 0, pLog); - SetLastError(ERROR_INVALID_COMPUTERNAME); - return NULL; - } - } - - Status = ElfrOpenBELW(pLog->BindingHandle, - (LPWSTR)lpUNCServerName, - &FileName, - 0, - 0, - &pLog->LogHandle); if (!NT_SUCCESS(Status)) { SetLastError(RtlNtStatusToDosError(Status)); - HeapFree(GetProcessHeap(), 0, pLog); return NULL; } - return pLog; + return (HANDLE)LogHandle; } @@ -507,9 +579,9 @@ HANDLE WINAPI OpenEventLogW(IN LPCWSTR lpUNCServerName, IN LPCWSTR lpSourceName) { - PLOG_INFO pLog; - NTSTATUS Status; RPC_UNICODE_STRING SourceName; + IELF_HANDLE LogHandle; + NTSTATUS Status; TRACE("%s, %s\n", debugstr_w(lpUNCServerName), debugstr_w(lpSourceName)); @@ -517,53 +589,28 @@ OpenEventLogW(IN LPCWSTR lpUNCServerName, SourceName.Length = SourceName.MaximumLength = lpSourceName ? wcslen(lpSourceName) * sizeof(WCHAR) : 0; - pLog = HeapAlloc(GetProcessHeap(), 0, sizeof(LOG_INFO)); - if (!pLog) + _SEH_TRY { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return NULL; + Status = ElfrOpenELW((LPWSTR)lpUNCServerName, + &SourceName, + &EmptyString, + 0, + 0, + &LogHandle); } - - ZeroMemory(pLog, sizeof(LOG_INFO)); - - if (lpUNCServerName == NULL || *lpUNCServerName == 0) + _SEH_HANDLE { - pLog->bLocal = TRUE; - - if (!EvtGetLocalHandle(&pLog->BindingHandle)) - { - HeapFree(GetProcessHeap(), 0, pLog); - SetLastError(ERROR_GEN_FAILURE); - return NULL; - } + Status = I_RpcMapWin32Status(RpcExceptionCode()); } - else - { - pLog->bLocal = FALSE; + _SEH_END; - if (!EvtBindRpc(lpUNCServerName, &pLog->BindingHandle)) - { - HeapFree(GetProcessHeap(), 0, pLog); - SetLastError(ERROR_INVALID_COMPUTERNAME); - return NULL; - } - } - - Status = ElfrOpenELW(pLog->BindingHandle, - (LPWSTR)lpUNCServerName, - &SourceName, - &EmptyString, - 0, - 0, - &pLog->LogHandle); if (!NT_SUCCESS(Status)) { SetLastError(RtlNtStatusToDosError(Status)); - HeapFree(GetProcessHeap(), 0, pLog); return NULL; } - return pLog; + return (HANDLE)LogHandle; } @@ -579,7 +626,6 @@ ReadEventLogA(IN HANDLE hEventLog, OUT DWORD *pnBytesRead, OUT DWORD *pnMinNumberOfBytesNeeded) { - PLOG_INFO pLog; NTSTATUS Status; DWORD bytesRead, minNumberOfBytesNeeded; @@ -587,21 +633,22 @@ ReadEventLogA(IN HANDLE hEventLog, hEventLog, dwReadFlags, dwRecordOffset, lpBuffer, nNumberOfBytesToRead, pnBytesRead, pnMinNumberOfBytesNeeded); - pLog = (PLOG_INFO)hEventLog; - if (!pLog) + _SEH_TRY { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; + Status = ElfrReadELA(hEventLog, + dwReadFlags, + dwRecordOffset, + nNumberOfBytesToRead, + lpBuffer, + &bytesRead, + &minNumberOfBytesNeeded); } + _SEH_HANDLE + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + _SEH_END; - Status = ElfrReadELA(pLog->BindingHandle, - pLog->LogHandle, - dwReadFlags, - dwRecordOffset, - nNumberOfBytesToRead, - lpBuffer, - &bytesRead, - &minNumberOfBytesNeeded); if (!NT_SUCCESS(Status)) { SetLastError(RtlNtStatusToDosError(Status)); @@ -636,7 +683,6 @@ ReadEventLogW(IN HANDLE hEventLog, OUT DWORD *pnBytesRead, OUT DWORD *pnMinNumberOfBytesNeeded) { - PLOG_INFO pLog; NTSTATUS Status; DWORD bytesRead, minNumberOfBytesNeeded; @@ -644,21 +690,22 @@ ReadEventLogW(IN HANDLE hEventLog, hEventLog, dwReadFlags, dwRecordOffset, lpBuffer, nNumberOfBytesToRead, pnBytesRead, pnMinNumberOfBytesNeeded); - pLog = (PLOG_INFO)hEventLog; - if (!pLog) + _SEH_TRY { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; + Status = ElfrReadELW(hEventLog, + dwReadFlags, + dwRecordOffset, + nNumberOfBytesToRead, + lpBuffer, + &bytesRead, + &minNumberOfBytesNeeded); } + _SEH_HANDLE + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + _SEH_END; - Status = ElfrReadELW(pLog->BindingHandle, - pLog->LogHandle, - dwReadFlags, - dwRecordOffset, - nNumberOfBytesToRead, - lpBuffer, - &bytesRead, - &minNumberOfBytesNeeded); if (!NT_SUCCESS(Status)) { SetLastError(RtlNtStatusToDosError(Status)); @@ -724,9 +771,9 @@ HANDLE WINAPI RegisterEventSourceW(IN LPCWSTR lpUNCServerName, IN LPCWSTR lpSourceName) { - PLOG_INFO pLog; - NTSTATUS Status; RPC_UNICODE_STRING SourceName; + IELF_HANDLE LogHandle; + NTSTATUS Status; TRACE("%s, %s\n", debugstr_w(lpUNCServerName), debugstr_w(lpSourceName)); @@ -734,53 +781,28 @@ RegisterEventSourceW(IN LPCWSTR lpUNCServerName, SourceName.Length = SourceName.MaximumLength = lpSourceName ? wcslen(lpSourceName) * sizeof(WCHAR) : 0; - pLog = HeapAlloc(GetProcessHeap(), 0, sizeof(LOG_INFO)); - if (!pLog) + _SEH_TRY { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return NULL; + Status = ElfrRegisterEventSourceW((LPWSTR)lpUNCServerName, + &SourceName, + &EmptyString, + 0, + 0, + &LogHandle); } - - ZeroMemory(pLog, sizeof(LOG_INFO)); - - if (lpUNCServerName == NULL || *lpUNCServerName == 0) + _SEH_HANDLE { - pLog->bLocal = TRUE; - - if (!EvtGetLocalHandle(&pLog->BindingHandle)) - { - HeapFree(GetProcessHeap(), 0, pLog); - SetLastError(ERROR_GEN_FAILURE); - return NULL; - } + Status = I_RpcMapWin32Status(RpcExceptionCode()); } - else - { - pLog->bLocal = FALSE; + _SEH_END; - if (!EvtBindRpc(lpUNCServerName, &pLog->BindingHandle)) - { - HeapFree(GetProcessHeap(), 0, pLog); - SetLastError(ERROR_INVALID_COMPUTERNAME); - return NULL; - } - } - - Status = ElfrRegisterEventSourceW(pLog->BindingHandle, - (LPWSTR)lpUNCServerName, - &SourceName, - &EmptyString, - 0, - 0, - &pLog->LogHandle); if (!NT_SUCCESS(Status)) { SetLastError(RtlNtStatusToDosError(Status)); - HeapFree(GetProcessHeap(), 0, pLog); return NULL; } - return pLog; + return (HANDLE)LogHandle; } @@ -850,7 +872,7 @@ ReportEventA(IN HANDLE hEventLog, HeapFree(GetProcessHeap(), 0, - wideStrArray); + (PVOID)wideStrArray); return ret; } @@ -882,21 +904,13 @@ ReportEventW(IN HANDLE hEventLog, IN LPVOID lpRawData) { #if 0 - PLOG_INFO pLog; NTSTATUS Status; UNICODE_STRING *Strings; WORD i; TRACE("%p, %u, %u, %lu, %p, %u, %lu, %p, %p\n", - hEventLog, wType, wCategory, dwEventID, lpUserSid, - wNumStrings, dwDataSize, lpStrings, lpRawData); - - pLog = (PLOG_INFO)hEventLog; - if (!pLog) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } + hEventLog, wType, wCategory, dwEventID, lpUserSid, + wNumStrings, dwDataSize, lpStrings, lpRawData); Strings = HeapAlloc(GetProcessHeap(), 0, @@ -910,21 +924,29 @@ ReportEventW(IN HANDLE hEventLog, for (i = 0; i < wNumStrings; i++) RtlInitUnicodeString(&Strings[i], lpStrings[i]); - Status = ElfrReportEventW(pLog->BindingHandle, - pLog->LogHandle, - 0, /* FIXME: Time */ - wType, - wCategory, - dwEventID, - wNumStrings, - dwDataSize, - L"", /* FIXME: ComputerName */ - lpUserSid, - (LPWSTR *)lpStrings, /* FIXME: should be Strings */ - lpRawData, - 0, - NULL, - NULL); + _SEH_TRY + { + Status = ElfrReportEventW(hEventLog, + 0, /* FIXME: Time */ + wType, + wCategory, + dwEventID, + wNumStrings, + dwDataSize, + L"", /* FIXME: ComputerName */ + lpUserSid, + (LPWSTR *)lpStrings, /* FIXME: should be Strings */ + lpRawData, + 0, + NULL, + NULL); + } + _SEH_HANDLE + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + _SEH_END; + HeapFree(GetProcessHeap(), 0, Strings); if (!NT_SUCCESS(Status)) diff --git a/reactos/dll/win32/advapi32/service/rpc.c b/reactos/dll/win32/advapi32/service/rpc.c index ad60e401fff..8f73560028e 100644 --- a/reactos/dll/win32/advapi32/service/rpc.c +++ b/reactos/dll/win32/advapi32/service/rpc.c @@ -10,69 +10,6 @@ #include -static RPC_BINDING_HANDLE LocalBindingHandle = NULL; - -RPC_STATUS -EvtBindRpc(LPCWSTR pszMachine, - RPC_BINDING_HANDLE* BindingHandle) -{ - PWSTR pszStringBinding = NULL; - RPC_STATUS Status; - - Status = RpcStringBindingComposeW(NULL, - L"ncacn_np", - (LPWSTR)pszMachine, - L"\\pipe\\EventLog", - NULL, - &pszStringBinding); - if (Status != RPC_S_OK) - return Status; - - Status = RpcBindingFromStringBindingW(pszStringBinding, - BindingHandle); - - RpcStringFreeW(&pszStringBinding); - - return Status; -} - -RPC_STATUS -EvtUnbindRpc(RPC_BINDING_HANDLE *BindingHandle) -{ - if (BindingHandle != NULL) - { - RpcBindingFree(*BindingHandle); - *BindingHandle = NULL; - } - - return RPC_S_OK; -} - -BOOL -EvtGetLocalHandle(RPC_BINDING_HANDLE *BindingHandle) -{ - if (LocalBindingHandle != NULL) - { - if (BindingHandle != NULL) - *BindingHandle = LocalBindingHandle; - - return TRUE; - } - - if (EvtBindRpc(NULL, &LocalBindingHandle) != RPC_S_OK) - return FALSE; - - if (BindingHandle != NULL) - *BindingHandle = LocalBindingHandle; - - return TRUE; -} - -RPC_STATUS -EvtUnbindLocalHandle(VOID) -{ - return EvtUnbindRpc(&LocalBindingHandle); -} void __RPC_FAR * __RPC_USER midl_user_allocate(size_t len) diff --git a/reactos/dll/win32/advapi32/service/scm.c b/reactos/dll/win32/advapi32/service/scm.c index beb5be0a2c3..6a4f23619c9 100644 --- a/reactos/dll/win32/advapi32/service/scm.c +++ b/reactos/dll/win32/advapi32/service/scm.c @@ -30,9 +30,9 @@ SVCCTL_HANDLEA_bind(SVCCTL_HANDLEA szMachineName) TRACE("SVCCTL_HANDLEA_bind() called\n"); - status = RpcStringBindingComposeA((UCHAR *)szMachineName, + status = RpcStringBindingComposeA(NULL, (UCHAR *)"ncacn_np", - NULL, + (UCHAR *)szMachineName, (UCHAR *)"\\pipe\\ntsvcs", NULL, (UCHAR **)&pszStringBinding); @@ -85,9 +85,9 @@ SVCCTL_HANDLEW_bind(SVCCTL_HANDLEW szMachineName) TRACE("SVCCTL_HANDLEW_bind() called\n"); - status = RpcStringBindingComposeW(szMachineName, + status = RpcStringBindingComposeW(NULL, L"ncacn_np", - NULL, + szMachineName, L"\\pipe\\ntsvcs", NULL, &pszStringBinding); diff --git a/reactos/dll/win32/advpack/advpack.rbuild b/reactos/dll/win32/advpack/advpack.rbuild index 0d261c670f9..43aba2d623d 100644 --- a/reactos/dll/win32/advpack/advpack.rbuild +++ b/reactos/dll/win32/advpack/advpack.rbuild @@ -10,7 +10,6 @@ files.c install.c reg.c - advpack.spec wine ole32 setupapi diff --git a/reactos/dll/win32/atl/atl.rbuild b/reactos/dll/win32/atl/atl.rbuild index cb88a00905c..e98915e4d72 100644 --- a/reactos/dll/win32/atl/atl.rbuild +++ b/reactos/dll/win32/atl/atl.rbuild @@ -13,7 +13,6 @@ registrar.c rsrc.rc . - atl.spec wine uuid ole32 diff --git a/reactos/dll/win32/avifil32/avifil32.rbuild b/reactos/dll/win32/avifil32/avifil32.rbuild index bcd336e781a..49e524cf776 100644 --- a/reactos/dll/win32/avifil32/avifil32.rbuild +++ b/reactos/dll/win32/avifil32/avifil32.rbuild @@ -20,7 +20,6 @@ tmpfile.c wavfile.c rsrc.rc - avifil32.spec wine uuid msacm32 diff --git a/reactos/dll/win32/browseui/browseui.rbuild b/reactos/dll/win32/browseui/browseui.rbuild index 4a417972175..881c743135c 100644 --- a/reactos/dll/win32/browseui/browseui.rbuild +++ b/reactos/dll/win32/browseui/browseui.rbuild @@ -21,5 +21,4 @@ browseui_main.c regsvr.c version.rc - browseui.spec diff --git a/reactos/dll/win32/cabinet/cabinet.rbuild b/reactos/dll/win32/cabinet/cabinet.rbuild index f37cbd32fa7..76322332efa 100644 --- a/reactos/dll/win32/cabinet/cabinet.rbuild +++ b/reactos/dll/win32/cabinet/cabinet.rbuild @@ -10,7 +10,6 @@ fci.c fdi.c cabinet.rc - cabinet.spec wine kernel32 ntdll diff --git a/reactos/dll/win32/cards/cards.rbuild b/reactos/dll/win32/cards/cards.rbuild index 065b1e17fa1..475fc1ca12d 100644 --- a/reactos/dll/win32/cards/cards.rbuild +++ b/reactos/dll/win32/cards/cards.rbuild @@ -10,5 +10,4 @@ user32 cards.c cards.rc - cards.spec diff --git a/reactos/dll/win32/clusapi/clusapi.rbuild b/reactos/dll/win32/clusapi/clusapi.rbuild index 83bb01777a0..5607268cf8d 100644 --- a/reactos/dll/win32/clusapi/clusapi.rbuild +++ b/reactos/dll/win32/clusapi/clusapi.rbuild @@ -9,5 +9,4 @@ kernel32 ntdll clusapi.c - clusapi.spec diff --git a/reactos/dll/win32/comcat/comcat.rbuild b/reactos/dll/win32/comcat/comcat.rbuild index 06c75d77554..f686d1bb8d7 100644 --- a/reactos/dll/win32/comcat/comcat.rbuild +++ b/reactos/dll/win32/comcat/comcat.rbuild @@ -21,5 +21,4 @@ register.c regsvr.c version.rc - comcat.spec diff --git a/reactos/dll/win32/comctl32/comctl32.rbuild b/reactos/dll/win32/comctl32/comctl32.rbuild index 88993314ace..df91996af40 100644 --- a/reactos/dll/win32/comctl32/comctl32.rbuild +++ b/reactos/dll/win32/comctl32/comctl32.rbuild @@ -43,7 +43,6 @@ treeview.c updown.c rsrc.rc - comctl32.spec wine user32 gdi32 diff --git a/reactos/dll/win32/comdlg32/comdlg32.rbuild b/reactos/dll/win32/comdlg32/comdlg32.rbuild index 566faddc059..1d2285fe728 100644 --- a/reactos/dll/win32/comdlg32/comdlg32.rbuild +++ b/reactos/dll/win32/comdlg32/comdlg32.rbuild @@ -15,7 +15,6 @@ fontdlg.c printdlg.c rsrc.rc - comdlg32.spec wine uuid shell32 diff --git a/reactos/dll/win32/compstui/compstui.rbuild b/reactos/dll/win32/compstui/compstui.rbuild index 5652687c4a9..8ed31853435 100644 --- a/reactos/dll/win32/compstui/compstui.rbuild +++ b/reactos/dll/win32/compstui/compstui.rbuild @@ -7,7 +7,6 @@ include/reactos/wine compstui_main.c - compstui.spec wine kernel32 ntdll diff --git a/reactos/dll/win32/credui/credui.rbuild b/reactos/dll/win32/credui/credui.rbuild index 0ef5423d39c..79a559cbaa8 100644 --- a/reactos/dll/win32/credui/credui.rbuild +++ b/reactos/dll/win32/credui/credui.rbuild @@ -10,7 +10,6 @@ 0x600 credui_main.c credui.rc - credui.spec wine advapi32 user32 diff --git a/reactos/dll/win32/crtdll/crtdll.rbuild b/reactos/dll/win32/crtdll/crtdll.rbuild index 2bf6601f660..ec156f961ab 100644 --- a/reactos/dll/win32/crtdll/crtdll.rbuild +++ b/reactos/dll/win32/crtdll/crtdll.rbuild @@ -1,4 +1,4 @@ - + . include @@ -21,5 +21,4 @@ precomp.h dllmain.c crtdll.rc - crtdll.spec diff --git a/reactos/dll/win32/crypt32/crypt32.rbuild b/reactos/dll/win32/crypt32/crypt32.rbuild index c02a8ba981e..1c4eaab0001 100644 --- a/reactos/dll/win32/crypt32/crypt32.rbuild +++ b/reactos/dll/win32/crypt32/crypt32.rbuild @@ -35,5 +35,4 @@ ctl.c message.c crypt32.rc - crypt32.spec diff --git a/reactos/dll/win32/cryptdll/cryptdll.rbuild b/reactos/dll/win32/cryptdll/cryptdll.rbuild index b43fc9b0c4f..c5fe617d7cd 100644 --- a/reactos/dll/win32/cryptdll/cryptdll.rbuild +++ b/reactos/dll/win32/cryptdll/cryptdll.rbuild @@ -10,5 +10,4 @@ kernel32 ntdll cryptdll.c - cryptdll.spec diff --git a/reactos/dll/win32/cryptnet/cryptnet.rbuild b/reactos/dll/win32/cryptnet/cryptnet.rbuild index 08e26fe308b..f305e535b87 100644 --- a/reactos/dll/win32/cryptnet/cryptnet.rbuild +++ b/reactos/dll/win32/cryptnet/cryptnet.rbuild @@ -13,6 +13,5 @@ wininet ntdll cryptnet_main.c - cryptnet.spec diff --git a/reactos/dll/win32/cryptui/cryptui.rbuild b/reactos/dll/win32/cryptui/cryptui.rbuild index d6cc54788e2..4c557e21ce2 100644 --- a/reactos/dll/win32/cryptui/cryptui.rbuild +++ b/reactos/dll/win32/cryptui/cryptui.rbuild @@ -8,7 +8,6 @@ include/reactos/wine main.c - cryptui.spec wine kernel32 ntdll diff --git a/reactos/dll/win32/dbghelp/dbghelp.rbuild b/reactos/dll/win32/dbghelp/dbghelp.rbuild index 4b63919f918..ede50cb61e9 100644 --- a/reactos/dll/win32/dbghelp/dbghelp.rbuild +++ b/reactos/dll/win32/dbghelp/dbghelp.rbuild @@ -25,7 +25,6 @@ storage.c symbol.c type.c - dbghelp.spec wine psapi kernel32 diff --git a/reactos/dll/win32/dciman32/dciman32.rbuild b/reactos/dll/win32/dciman32/dciman32.rbuild index 38154e3114f..0b66c35a7b6 100644 --- a/reactos/dll/win32/dciman32/dciman32.rbuild +++ b/reactos/dll/win32/dciman32/dciman32.rbuild @@ -7,7 +7,6 @@ include/reactos/wine dciman_main.c - dciman32.spec wine kernel32 ntdll diff --git a/reactos/dll/win32/devmgr/devmgr.rbuild b/reactos/dll/win32/devmgr/devmgr.rbuild index 25f74e8df42..293ff1451c1 100644 --- a/reactos/dll/win32/devmgr/devmgr.rbuild +++ b/reactos/dll/win32/devmgr/devmgr.rbuild @@ -12,6 +12,5 @@ hwpage.c misc.c stubs.c - devmgr.spec precomp.h diff --git a/reactos/dll/win32/dhcpcsvc/dhcpcsvc.rbuild b/reactos/dll/win32/dhcpcsvc/dhcpcsvc.rbuild index 716259251f6..d664f66aea5 100644 --- a/reactos/dll/win32/dhcpcsvc/dhcpcsvc.rbuild +++ b/reactos/dll/win32/dhcpcsvc/dhcpcsvc.rbuild @@ -8,5 +8,4 @@ iphlpapi dhcpcsvc.c dhcpcsvc.rc - dhcpcsvc.spec diff --git a/reactos/dll/win32/fmifs/fmifs.rbuild b/reactos/dll/win32/fmifs/fmifs.rbuild index e9101008b9a..39170c32b82 100644 --- a/reactos/dll/win32/fmifs/fmifs.rbuild +++ b/reactos/dll/win32/fmifs/fmifs.rbuild @@ -13,6 +13,5 @@ media.c query.c fmifs.rc - fmifs.spec precomp.h diff --git a/reactos/dll/win32/fusion/fusion.rbuild b/reactos/dll/win32/fusion/fusion.rbuild index c0e9128c52d..bef97c68936 100644 --- a/reactos/dll/win32/fusion/fusion.rbuild +++ b/reactos/dll/win32/fusion/fusion.rbuild @@ -14,5 +14,4 @@ assembly.c fusion.c fusion_main.c - fusion.spec diff --git a/reactos/dll/win32/gdi32/gdi32.rbuild b/reactos/dll/win32/gdi32/gdi32.rbuild index a02b13d973f..9c3608cb33a 100644 --- a/reactos/dll/win32/gdi32/gdi32.rbuild +++ b/reactos/dll/win32/gdi32/gdi32.rbuild @@ -10,7 +10,6 @@ pseh dxguid ntdll - precomp.h @@ -49,5 +48,4 @@ path.c gdi32.rc - gdi32.spec diff --git a/reactos/dll/win32/gdi32/include/gdi32p.h b/reactos/dll/win32/gdi32/include/gdi32p.h index 9656ba5fe6a..43020095184 100644 --- a/reactos/dll/win32/gdi32/include/gdi32p.h +++ b/reactos/dll/win32/gdi32/include/gdi32p.h @@ -31,7 +31,8 @@ typedef INT #define METAFILE_DISK 2 /* MACRO ********************************************************************/ -#define ROP_USES_SOURCE(Rop) ((Rop << 2) ^ Rop) & 0xCC0000 + +#define ROP_USES_SOURCE(Rop) (((Rop) << 2 ^ Rop) & 0xCC0000) /* TYPES *********************************************************************/ @@ -101,6 +102,11 @@ typedef struct _UMPDEV WCHAR String[188]; } UMPDEV, *PUMPDEV; +#define LOCALFONT_COUNT 10 +typedef struct _LOCALFONT +{ + FONT_ATTR lfa[LOCALFONT_COUNT]; +} LOCALFONT, *PLOCALFONT; /* FUNCTIONS *****************************************************************/ @@ -224,5 +230,7 @@ VOID STDCALL GdiSetLastError( DWORD dwErrCode ); +DWORD STDCALL GdiGetCodePage(HDC); + /* EOF */ diff --git a/reactos/dll/win32/gdi32/misc/stubs.c b/reactos/dll/win32/gdi32/misc/stubs.c index 6e440053f8f..4d876576946 100644 --- a/reactos/dll/win32/gdi32/misc/stubs.c +++ b/reactos/dll/win32/gdi32/misc/stubs.c @@ -173,21 +173,6 @@ GetMetaFileBitsEx( return 0; } - -/* - * @unimplemented - */ -DWORD -STDCALL -GetFontLanguageInfo( - HDC hDc - ) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - /* * @unimplemented */ @@ -561,7 +546,19 @@ STDCALL UnrealizeObject(HGDIOBJ hgdiobj) { BOOL retValue = TRUE; +/* + Win 2k Graphics API, Black Book. by coriolis.com + Page 62, Note that Steps 3, 5, and 6 are not required for Windows NT(tm) + and Windows 2000(tm). + Step 5. UnrealizeObject(hTrackBrush); + */ +/* + msdn.microsoft.com, + "Windows 2000/XP: If hgdiobj is a brush, UnrealizeObject does nothing, + and the function returns TRUE. Use SetBrushOrgEx to set the origin of + a brush." + */ if (GDI_HANDLE_GET_TYPE(hgdiobj) != GDI_OBJECT_TYPE_BRUSH) { retValue = NtGdiUnrealizeObject(hgdiobj); diff --git a/reactos/dll/win32/gdi32/objects/dc.c b/reactos/dll/win32/gdi32/objects/dc.c index bdb6d6b56c1..fbe4d05bf3e 100644 --- a/reactos/dll/win32/gdi32/objects/dc.c +++ b/reactos/dll/win32/gdi32/objects/dc.c @@ -1535,7 +1535,7 @@ SelectObject(HDC hDC, HGDIOBJ hGdiObj) { PDC_ATTR pDc_Attr; -// HGDIOBJ hOldObj = NULL; + HGDIOBJ hOldObj = NULL; // PTEB pTeb; if(!GdiGetHandleUserData(hDC, GDI_OBJECT_TYPE_DC, (PVOID)&pDc_Attr)) @@ -1580,10 +1580,15 @@ SelectObject(HDC hDC, return NtGdiSelectPen(hDC, hGdiObj); case GDI_OBJECT_TYPE_FONT: + hOldObj = pDc_Attr->hlfntNew; + if (hOldObj == hGdiObj) return hOldObj; #if 0 + pDc_Attr->ulDirty_ &= ~SLOW_WIDTHS; + pDc_Attr->ulDirty_ |= DIRTY_CHARSET; + pDc_Attr->hlfntNew = hGdiObj; pTeb = NtCurrentTeb(); if (((pTeb->GdiTebBatch.HDC == 0) || - (pTeb->GdiTebBatch.HDC == (ULONG)hDC)) && + (pTeb->GdiTebBatch.HDC == hDC)) && ((pTeb->GdiTebBatch.Offset + sizeof(GDIBSOBJECT)) <= GDIBATCHBUFSIZE) && (!(pDc_Attr->ulDirty_ & DC_DIBSECTION))) { @@ -1594,14 +1599,15 @@ SelectObject(HDC hDC, pgO->hgdiobj = hGdiObj; pTeb->GdiTebBatch.Offset += sizeof(GDIBSOBJECT); - pTeb->GdiTebBatch.HDC = (ULONG)hDC; + pTeb->GdiTebBatch.HDC = hDC; pTeb->GdiBatchCount++; if (pTeb->GdiBatchCount >= GDI_BatchLimit) NtGdiFlush(); - return pDc_Attr->hlfntNew; + return hOldObj; } #endif // default for select object font return NtGdiSelectFont(hDC, hGdiObj); + #if 0 case GDI_OBJECT_TYPE_METADC: return MFDRV_SelectObject( hDC, hGdiObj); diff --git a/reactos/dll/win32/gdi32/objects/font.c b/reactos/dll/win32/gdi32/objects/font.c index faf74891296..c826254019e 100644 --- a/reactos/dll/win32/gdi32/objects/font.c +++ b/reactos/dll/win32/gdi32/objects/font.c @@ -16,46 +16,45 @@ /* * For TranslateCharsetInfo */ -#define FS(x) {{0,0,0,0},{0x1<<(x),0}} #define MAXTCIINDEX 32 static const CHARSETINFO FONT_tci[MAXTCIINDEX] = { /* ANSI */ - { ANSI_CHARSET, 1252, FS(0)}, - { EASTEUROPE_CHARSET, 1250, FS(1)}, - { RUSSIAN_CHARSET, 1251, FS(2)}, - { GREEK_CHARSET, 1253, FS(3)}, - { TURKISH_CHARSET, 1254, FS(4)}, - { HEBREW_CHARSET, 1255, FS(5)}, - { ARABIC_CHARSET, 1256, FS(6)}, - { BALTIC_CHARSET, 1257, FS(7)}, - { VIETNAMESE_CHARSET, 1258, FS(8)}, + { ANSI_CHARSET, 1252, {{0,0,0,0},{FS_LATIN1,0}} }, + { EASTEUROPE_CHARSET, 1250, {{0,0,0,0},{FS_LATIN2,0}} }, + { RUSSIAN_CHARSET, 1251, {{0,0,0,0},{FS_CYRILLIC,0}} }, + { GREEK_CHARSET, 1253, {{0,0,0,0},{FS_GREEK,0}} }, + { TURKISH_CHARSET, 1254, {{0,0,0,0},{FS_TURKISH,0}} }, + { HEBREW_CHARSET, 1255, {{0,0,0,0},{FS_HEBREW,0}} }, + { ARABIC_CHARSET, 1256, {{0,0,0,0},{FS_ARABIC,0}} }, + { BALTIC_CHARSET, 1257, {{0,0,0,0},{FS_BALTIC,0}} }, + { VIETNAMESE_CHARSET, 1258, {{0,0,0,0},{FS_VIETNAMESE,0}} }, /* reserved by ANSI */ - { DEFAULT_CHARSET, 0, FS(0)}, - { DEFAULT_CHARSET, 0, FS(0)}, - { DEFAULT_CHARSET, 0, FS(0)}, - { DEFAULT_CHARSET, 0, FS(0)}, - { DEFAULT_CHARSET, 0, FS(0)}, - { DEFAULT_CHARSET, 0, FS(0)}, - { DEFAULT_CHARSET, 0, FS(0)}, + { DEFAULT_CHARSET, 0, {{0,0,0,0},{FS_LATIN1,0}} }, + { DEFAULT_CHARSET, 0, {{0,0,0,0},{FS_LATIN1,0}} }, + { DEFAULT_CHARSET, 0, {{0,0,0,0},{FS_LATIN1,0}} }, + { DEFAULT_CHARSET, 0, {{0,0,0,0},{FS_LATIN1,0}} }, + { DEFAULT_CHARSET, 0, {{0,0,0,0},{FS_LATIN1,0}} }, + { DEFAULT_CHARSET, 0, {{0,0,0,0},{FS_LATIN1,0}} }, + { DEFAULT_CHARSET, 0, {{0,0,0,0},{FS_LATIN1,0}} }, /* ANSI and OEM */ - { THAI_CHARSET, 874, FS(16)}, - { SHIFTJIS_CHARSET, 932, FS(17)}, - { GB2312_CHARSET, 936, FS(18)}, - { HANGEUL_CHARSET, 949, FS(19)}, - { CHINESEBIG5_CHARSET, 950, FS(20)}, - { JOHAB_CHARSET, 1361, FS(21)}, + { THAI_CHARSET, 874, {{0,0,0,0},{FS_THAI,0}} }, + { SHIFTJIS_CHARSET, 932, {{0,0,0,0},{FS_JISJAPAN,0}} }, + { GB2312_CHARSET, 936, {{0,0,0,0},{FS_CHINESESIMP,0}} }, + { HANGEUL_CHARSET, 949, {{0,0,0,0},{FS_WANSUNG,0}} }, + { CHINESEBIG5_CHARSET, 950, {{0,0,0,0},{FS_CHINESETRAD,0}} }, + { JOHAB_CHARSET, 1361, {{0,0,0,0},{FS_JOHAB,0}} }, /* reserved for alternate ANSI and OEM */ - { DEFAULT_CHARSET, 0, FS(0)}, - { DEFAULT_CHARSET, 0, FS(0)}, - { DEFAULT_CHARSET, 0, FS(0)}, - { DEFAULT_CHARSET, 0, FS(0)}, - { DEFAULT_CHARSET, 0, FS(0)}, - { DEFAULT_CHARSET, 0, FS(0)}, - { DEFAULT_CHARSET, 0, FS(0)}, - { DEFAULT_CHARSET, 0, FS(0)}, + { DEFAULT_CHARSET, 0, {{0,0,0,0},{FS_LATIN1,0}} }, + { DEFAULT_CHARSET, 0, {{0,0,0,0},{FS_LATIN1,0}} }, + { DEFAULT_CHARSET, 0, {{0,0,0,0},{FS_LATIN1,0}} }, + { DEFAULT_CHARSET, 0, {{0,0,0,0},{FS_LATIN1,0}} }, + { DEFAULT_CHARSET, 0, {{0,0,0,0},{FS_LATIN1,0}} }, + { DEFAULT_CHARSET, 0, {{0,0,0,0},{FS_LATIN1,0}} }, + { DEFAULT_CHARSET, 0, {{0,0,0,0},{FS_LATIN1,0}} }, + { DEFAULT_CHARSET, 0, {{0,0,0,0},{FS_LATIN1,0}} }, /* reserved for system */ - { DEFAULT_CHARSET, 0, FS(0)}, - { SYMBOL_CHARSET, CP_SYMBOL, FS(31)}, + { DEFAULT_CHARSET, 0, {{0,0,0,0},{FS_LATIN1,0}} }, + { SYMBOL_CHARSET, CP_SYMBOL, {{0,0,0,0},{FS_SYMBOL,0}} } }; #define INITIAL_FAMILY_COUNT 64 @@ -101,7 +100,7 @@ static void FONT_TextMetricWToA(const TEXTMETRICW *ptmW, LPTEXTMETRICA ptmA ) */ static LPWSTR FONT_mbtowc(HDC hdc, LPCSTR str, INT count, INT *plenW, UINT *pCP) { - UINT cp = CP_ACP; // GdiGetCodePage( hdc ); + UINT cp = GdiGetCodePage( hdc ); INT lenW; LPWSTR strW; @@ -660,7 +659,7 @@ GetCharWidthA( str[i] = (BYTE)(iFirstChar + i); str[i] = '\0'; - wstr = FONT_mbtowc(NULL, str, count+1, &wlen, NULL); + wstr = FONT_mbtowc(hdc, str, count+1, &wlen, NULL); if (!wstr) { HeapFree(GetProcessHeap(), 0, str); @@ -707,7 +706,7 @@ GetCharWidth32A( str[i] = (BYTE)(iFirstChar + i); str[i] = '\0'; - wstr = FONT_mbtowc(NULL, str, count+1, &wlen, NULL); + wstr = FONT_mbtowc(hdc, str, count+1, &wlen, NULL); if (!wstr) { HeapFree(GetProcessHeap(), 0, str); @@ -754,7 +753,7 @@ GetCharWidthFloatA( str[i] = (BYTE)(iFirstChar + i); str[i] = '\0'; - wstr = FONT_mbtowc(NULL, str, count+1, &wlen, NULL); + wstr = FONT_mbtowc(hdc, str, count+1, &wlen, NULL); if (!wstr) { HeapFree(GetProcessHeap(), 0, str); @@ -904,6 +903,18 @@ GetCharWidthI(HDC hdc, (PVOID) lpBuffer ); } +/* + * @implemented + */ +DWORD +STDCALL +GetFontLanguageInfo( + HDC hDc + ) +{ + return GetDCDWord(hDc, GdiGetFontLanguageInfo, GCP_ERROR); +} + /* * @implemented */ @@ -958,7 +969,7 @@ GetGlyphOutlineA( len = 1; mbchs[0] = (uChar & 0xff); } - p = FONT_mbtowc(NULL, mbchs, len, NULL, NULL); + p = FONT_mbtowc(hdc, mbchs, len, NULL, NULL); c = p[0]; } else c = uChar; @@ -1343,6 +1354,8 @@ CreateFontIndirectW( RtlZeroMemory( &Logfont.elfEnumLogfontEx.elfScript, sizeof(Logfont.elfEnumLogfontEx.elfScript)); + Logfont.elfDesignVector.dvNumAxes = 0; // No more than MM_MAX_NUMAXES + RtlZeroMemory( &Logfont.elfDesignVector, sizeof(DESIGNVECTOR)); return CreateFontIndirectExW(&Logfont); diff --git a/reactos/dll/win32/gdiplus/gdiplus.rbuild b/reactos/dll/win32/gdiplus/gdiplus.rbuild index 5d488f86d42..f8890964882 100644 --- a/reactos/dll/win32/gdiplus/gdiplus.rbuild +++ b/reactos/dll/win32/gdiplus/gdiplus.rbuild @@ -19,7 +19,6 @@ pen.c region.c stringformat.c - gdiplus.spec wine uuid shlwapi diff --git a/reactos/dll/win32/getuname/getuname.rbuild b/reactos/dll/win32/getuname/getuname.rbuild index 55656dd3293..164140cf35d 100644 --- a/reactos/dll/win32/getuname/getuname.rbuild +++ b/reactos/dll/win32/getuname/getuname.rbuild @@ -6,5 +6,4 @@ ntdll getuname.c getuname.rc - getuname.spec diff --git a/reactos/dll/win32/glu32/glu32.rbuild b/reactos/dll/win32/glu32/glu32.rbuild index bb5185877d4..23c14d76746 100644 --- a/reactos/dll/win32/glu32/glu32.rbuild +++ b/reactos/dll/win32/glu32/glu32.rbuild @@ -14,7 +14,6 @@ opengl32 kernel32 gdi32 - glu32.spec bezierEval.cc diff --git a/reactos/dll/win32/hhctrl.ocx/hhctrl.ocx.rbuild b/reactos/dll/win32/hhctrl.ocx/hhctrl.ocx.rbuild index e066e359a48..13c9f76ebe1 100644 --- a/reactos/dll/win32/hhctrl.ocx/hhctrl.ocx.rbuild +++ b/reactos/dll/win32/hhctrl.ocx/hhctrl.ocx.rbuild @@ -17,7 +17,6 @@ regsvr.c webbrowser.c hhctrl.rc - hhctrl.ocx.spec wine advapi32 comctl32 diff --git a/reactos/dll/win32/hlink/hlink.rbuild b/reactos/dll/win32/hlink/hlink.rbuild index 0b020802982..4d03b9de274 100644 --- a/reactos/dll/win32/hlink/hlink.rbuild +++ b/reactos/dll/win32/hlink/hlink.rbuild @@ -11,7 +11,6 @@ extserv.c hlink_main.c link.c - hlink.spec wine shell32 ole32 diff --git a/reactos/dll/win32/icmp/icmp.rbuild b/reactos/dll/win32/icmp/icmp.rbuild index 8da93de7a01..28c0bbfa90a 100644 --- a/reactos/dll/win32/icmp/icmp.rbuild +++ b/reactos/dll/win32/icmp/icmp.rbuild @@ -8,5 +8,4 @@ wine icmp_main.c icmp.rc - icmp.spec diff --git a/reactos/dll/win32/imagehlp/imagehlp.rbuild b/reactos/dll/win32/imagehlp/imagehlp.rbuild index 1abe0f839b8..79074245e4a 100644 --- a/reactos/dll/win32/imagehlp/imagehlp.rbuild +++ b/reactos/dll/win32/imagehlp/imagehlp.rbuild @@ -10,6 +10,5 @@ integrity.c modify.c imagehlp.rc - imagehlp.spec precomp.h diff --git a/reactos/dll/win32/imm32/imm32.rbuild b/reactos/dll/win32/imm32/imm32.rbuild index f6140f76ee0..c0cd3c67471 100644 --- a/reactos/dll/win32/imm32/imm32.rbuild +++ b/reactos/dll/win32/imm32/imm32.rbuild @@ -9,7 +9,6 @@ 0x600 imm.c version.rc - imm32.spec wine user32 gdi32 diff --git a/reactos/dll/win32/inetcomm/imaptransport.c b/reactos/dll/win32/inetcomm/imaptransport.c new file mode 100644 index 00000000000..4cef0838d23 --- /dev/null +++ b/reactos/dll/win32/inetcomm/imaptransport.c @@ -0,0 +1,511 @@ +/* + * IMAP Transport + * + * Copyright 2008 Hans Leidekker for CodeWeavers + * + * 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 COBJMACROS + +#include +#include + +#include "windef.h" +#include "winbase.h" +#include "winnt.h" +#include "winuser.h" +#include "objbase.h" +#include "mimeole.h" +#include "wine/debug.h" + +#include "inetcomm_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(inetcomm); + +typedef struct +{ + InternetTransport InetTransport; + ULONG refs; +} IMAPTransport; + +static HRESULT WINAPI IMAPTransport_QueryInterface(IIMAPTransport *iface, REFIID riid, void **ppv) +{ + TRACE("(%s, %p)\n", debugstr_guid(riid), ppv); + + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IInternetTransport) || + IsEqualIID(riid, &IID_IIMAPTransport)) + { + *ppv = iface; + IUnknown_AddRef(iface); + return S_OK; + } + *ppv = NULL; + FIXME("no interface for %s\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI IMAPTransport_AddRef(IIMAPTransport *iface) +{ + IMAPTransport *This = (IMAPTransport *)iface; + return InterlockedIncrement((LONG *)&This->refs); +} + +static ULONG WINAPI IMAPTransport_Release(IIMAPTransport *iface) +{ + IMAPTransport *This = (IMAPTransport *)iface; + ULONG refs = InterlockedDecrement((LONG *)&This->refs); + if (!refs) + { + TRACE("destroying %p\n", This); + if (This->InetTransport.Status != IXP_DISCONNECTED) + InternetTransport_DropConnection(&This->InetTransport); + if (This->InetTransport.pCallback) ITransportCallback_Release(This->InetTransport.pCallback); + HeapFree(GetProcessHeap(), 0, This); + } + return refs; +} + +static HRESULT WINAPI IMAPTransport_GetServerInfo(IIMAPTransport *iface, + LPINETSERVER pInetServer) +{ + IMAPTransport *This = (IMAPTransport *)iface; + + TRACE("(%p)\n", pInetServer); + return InternetTransport_GetServerInfo(&This->InetTransport, pInetServer); +} + +static IXPTYPE WINAPI IMAPTransport_GetIXPType(IIMAPTransport *iface) +{ + TRACE("()\n"); + return IXP_IMAP; +} + +static HRESULT WINAPI IMAPTransport_IsState(IIMAPTransport *iface, + IXPISSTATE isstate) +{ + FIXME("(%d): stub\n", isstate); + return E_NOTIMPL; +} + +static HRESULT WINAPI IMAPTransport_InetServerFromAccount( + IIMAPTransport *iface, IImnAccount *pAccount, LPINETSERVER pInetServer) +{ + IMAPTransport *This = (IMAPTransport *)iface; + + TRACE("(%p, %p)\n", pAccount, pInetServer); + return InternetTransport_InetServerFromAccount(&This->InetTransport, pAccount, pInetServer); +} + +static HRESULT WINAPI IMAPTransport_Connect(IIMAPTransport *iface, + LPINETSERVER pInetServer, boolean fAuthenticate, boolean fCommandLogging) +{ + IMAPTransport *This = (IMAPTransport *)iface; + HRESULT hr; + + TRACE("(%p, %s, %s)\n", pInetServer, fAuthenticate ? "TRUE" : "FALSE", fCommandLogging ? "TRUE" : "FALSE"); + + hr = InternetTransport_Connect(&This->InetTransport, pInetServer, fAuthenticate, fCommandLogging); + return hr; +} + +static HRESULT WINAPI IMAPTransport_HandsOffCallback(IIMAPTransport *iface) +{ + IMAPTransport *This = (IMAPTransport *)iface; + + TRACE("()\n"); + return InternetTransport_HandsOffCallback(&This->InetTransport); +} + +static HRESULT WINAPI IMAPTransport_Disconnect(IIMAPTransport *iface) +{ + FIXME("(): stub\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI IMAPTransport_DropConnection(IIMAPTransport *iface) +{ + IMAPTransport *This = (IMAPTransport *)iface; + + TRACE("()\n"); + return InternetTransport_DropConnection(&This->InetTransport); +} + +static HRESULT WINAPI IMAPTransport_GetStatus(IIMAPTransport *iface, + IXPSTATUS *pCurrentStatus) +{ + IMAPTransport *This = (IMAPTransport *)iface; + + TRACE("()\n"); + return InternetTransport_GetStatus(&This->InetTransport, pCurrentStatus); +} + +static HRESULT WINAPI IMAPTransport_InitNew(IIMAPTransport *iface, + LPSTR pszLogFilePath, IIMAPCallback *pCallback) +{ + IMAPTransport *This = (IMAPTransport *)iface; + + TRACE("(%s, %p)\n", debugstr_a(pszLogFilePath), pCallback); + + if (!pCallback) + return E_INVALIDARG; + + if (pszLogFilePath) + FIXME("not using log file of %s, use Wine debug logging instead\n", + debugstr_a(pszLogFilePath)); + + IIMAPCallback_AddRef(pCallback); + This->InetTransport.pCallback = (ITransportCallback *)pCallback; + This->InetTransport.fInitialised = TRUE; + + return S_OK; +} + +static HRESULT WINAPI IMAPTransport_NewIRangeList(IIMAPTransport *iface, + IRangeList **pprlNewRangeList) +{ + FIXME("(%p): stub\n", pprlNewRangeList); + return E_NOTIMPL; +} + +static HRESULT WINAPI IMAPTransport_Capability(IIMAPTransport *iface, + DWORD *pdwCapabilityFlags) +{ + FIXME("(%p): stub\n", pdwCapabilityFlags); + return E_NOTIMPL; +} + +static HRESULT WINAPI IMAPTransport_Select(IIMAPTransport *iface, + WPARAM wParam, LPARAM lParam, IIMAPCallback *pCBHandler, LPSTR lpszMailboxName) +{ + FIXME("(%ld, %ld, %p, %s): stub\n", wParam, lParam, pCBHandler, debugstr_a(lpszMailboxName)); + return E_NOTIMPL; +} + +static HRESULT WINAPI IMAPTransport_Examine(IIMAPTransport *iface, + WPARAM wParam, LPARAM lParam, IIMAPCallback *pCBHandler, LPSTR lpszMailboxName) +{ + FIXME("(%ld, %ld, %p, %s): stub\n", wParam, lParam, pCBHandler, debugstr_a(lpszMailboxName)); + return E_NOTIMPL; +} + +static HRESULT WINAPI IMAPTransport_Create(IIMAPTransport *iface, + WPARAM wParam, LPARAM lParam, IIMAPCallback *pCBHandler, LPSTR lpszMailboxName) +{ + FIXME("(%ld, %ld, %p, %s): stub\n", wParam, lParam, pCBHandler, debugstr_a(lpszMailboxName)); + return E_NOTIMPL; +} + +static HRESULT WINAPI IMAPTransport_Delete(IIMAPTransport *iface, + WPARAM wParam, LPARAM lParam, IIMAPCallback *pCBHandler, LPSTR lpszMailboxName) +{ + FIXME("(%ld, %ld, %p, %s): stub\n", wParam, lParam, pCBHandler, debugstr_a(lpszMailboxName)); + return E_NOTIMPL; +} + +static HRESULT WINAPI IMAPTransport_Rename(IIMAPTransport *iface, WPARAM wParam, LPARAM lParam, + IIMAPCallback *pCBHandler, LPSTR lpszMailboxName, LPSTR lpszNewMailboxName) +{ + FIXME("(%ld, %ld, %p, %s, %s): stub\n", wParam, lParam, pCBHandler, + debugstr_a(lpszMailboxName), debugstr_a(lpszNewMailboxName)); + return E_NOTIMPL; +} + +static HRESULT WINAPI IMAPTransport_Subscribe(IIMAPTransport *iface, + WPARAM wParam, LPARAM lParam, IIMAPCallback *pCBHandler, LPSTR lpszMailboxName) +{ + FIXME("(%ld, %ld, %p, %s): stub\n", wParam, lParam, pCBHandler, debugstr_a(lpszMailboxName)); + return E_NOTIMPL; +} + +static HRESULT WINAPI IMAPTransport_Unsubscribe(IIMAPTransport *iface, + WPARAM wParam, LPARAM lParam, IIMAPCallback *pCBHandler, LPSTR lpszMailboxName) +{ + FIXME("(%ld, %ld, %p, %s): stub\n", wParam, lParam, pCBHandler, debugstr_a(lpszMailboxName)); + return E_NOTIMPL; +} + +static HRESULT WINAPI IMAPTransport_List(IIMAPTransport *iface, WPARAM wParam, LPARAM lParam, + IIMAPCallback *pCBHandler, LPSTR lpszMailboxNameReference, LPSTR lpszMailboxNamePattern) +{ + FIXME("(%ld, %ld, %p, %s, %s): stub\n", wParam, lParam, pCBHandler, + debugstr_a(lpszMailboxNameReference), debugstr_a(lpszMailboxNamePattern)); + return E_NOTIMPL; +} + +static HRESULT WINAPI IMAPTransport_Lsub(IIMAPTransport *iface, WPARAM wParam, LPARAM lParam, + IIMAPCallback *pCBHandler, LPSTR lpszMailboxNameReference, LPSTR lpszMailboxNamePattern) +{ + FIXME("(%ld, %ld, %p, %s, %s): stub\n", wParam, lParam, pCBHandler, + debugstr_a(lpszMailboxNameReference), debugstr_a(lpszMailboxNamePattern)); + return E_NOTIMPL; +} + +static HRESULT WINAPI IMAPTransport_Append(IIMAPTransport *iface, + WPARAM wParam, LPARAM lParam, IIMAPCallback *pCBHandler, LPSTR lpszMailboxName, + LPSTR lpszMessageFlags, FILETIME ftMessageDateTime, LPSTREAM lpstmMessageToSave) +{ + FIXME("(%ld, %ld, %p, %s, %s, %p): stub\n", wParam, lParam, pCBHandler, + debugstr_a(lpszMailboxName), debugstr_a(lpszMessageFlags), lpstmMessageToSave); + return E_NOTIMPL; +} + +static HRESULT WINAPI IMAPTransport_Close(IIMAPTransport *iface, + WPARAM wParam, LPARAM lParam, IIMAPCallback *pCBHandler) +{ + FIXME("(%ld, %ld, %p): stub\n", wParam, lParam, pCBHandler); + return E_NOTIMPL; +} + +static HRESULT WINAPI IMAPTransport_Expunge(IIMAPTransport *iface, + WPARAM wParam, LPARAM lParam, IIMAPCallback *pCBHandler) +{ + FIXME("(%ld, %ld, %p): stub\n", wParam, lParam, pCBHandler); + return E_NOTIMPL; +} + +static HRESULT WINAPI IMAPTransport_Search(IIMAPTransport *iface, + WPARAM wParam, LPARAM lParam, IIMAPCallback *pCBHandler, LPSTR lpszSearchCriteria, + boolean bReturnUIDs, IRangeList *pMsgRange, boolean bUIDRangeList) +{ + FIXME("(%ld, %ld, %p, %s, %d, %p, %d): stub\n", wParam, lParam, pCBHandler, + debugstr_a(lpszSearchCriteria), bReturnUIDs, pMsgRange, bUIDRangeList); + return E_NOTIMPL; +} + +static HRESULT WINAPI IMAPTransport_Fetch(IIMAPTransport *iface, WPARAM wParam, LPARAM lParam, + IIMAPCallback *pCBHandler, IRangeList *pMsgRange, boolean bUIDMsgRange, LPSTR lpszFetchArgs) +{ + FIXME("(%ld, %ld, %p, %p, %d, %s): stub\n", wParam, lParam, pCBHandler, pMsgRange, + bUIDMsgRange, debugstr_a(lpszFetchArgs)); + return E_NOTIMPL; +} + +static HRESULT WINAPI IMAPTransport_Store(IIMAPTransport *iface, WPARAM wParam, LPARAM lParam, + IIMAPCallback *pCBHandler, IRangeList *pMsgRange, boolean bUIDRangeList, LPSTR lpszStoreArgs) +{ + FIXME("(%ld, %ld, %p, %p, %d, %s): stub\n", wParam, lParam, pCBHandler, pMsgRange, + bUIDRangeList, debugstr_a(lpszStoreArgs)); + return E_NOTIMPL; +} + +static HRESULT WINAPI IMAPTransport_Copy(IIMAPTransport *iface, WPARAM wParam, LPARAM lParam, + IIMAPCallback *pCBHandler, IRangeList *pMsgRange, boolean bUIDRangeList, LPSTR lpszMailboxName) +{ + FIXME("(%ld, %ld, %p, %p, %d, %s): stub\n", wParam, lParam, pCBHandler, pMsgRange, + bUIDRangeList, debugstr_a(lpszMailboxName)); + return E_NOTIMPL; +} + +static HRESULT WINAPI IMAPTransport_Noop(IIMAPTransport *iface, + WPARAM wParam, LPARAM lParam, IIMAPCallback *pCBHandler) +{ + FIXME("(%ld, %ld, %p): stub\n", wParam, lParam, pCBHandler); + return E_NOTIMPL; +} + +static HRESULT WINAPI IMAPTransport_ResizeMsgSeqNumTable(IIMAPTransport *iface, DWORD dwSizeOfMbox) +{ + FIXME("(%u): stub\n", dwSizeOfMbox); + return E_NOTIMPL; +} + +static HRESULT WINAPI IMAPTransport_UpdateSeqNumToUID(IIMAPTransport *iface, + DWORD dwMsgSeqNum, DWORD dwUID) +{ + FIXME("(%u, %u): stub\n", dwMsgSeqNum, dwUID); + return E_NOTIMPL; +} + +static HRESULT WINAPI IMAPTransport_RemoveSequenceNum(IIMAPTransport *iface, DWORD dwDeletedMsgSeqNum) +{ + FIXME("(%u): stub\n", dwDeletedMsgSeqNum); + return E_NOTIMPL; +} + +static HRESULT WINAPI IMAPTransport_MsgSeqNumToUID(IIMAPTransport *iface, DWORD dwMsgSeqNum, + DWORD *pdwUID) +{ + FIXME("(%u, %p): stub\n", dwMsgSeqNum, pdwUID); + return E_NOTIMPL; +} + +static HRESULT WINAPI IMAPTransport_GetMsgSeqNumToUIDArray(IIMAPTransport *iface, + DWORD **ppdwMsgSeqNumToUIDArray, DWORD *pdwNumberOfElements) +{ + FIXME("(%p, %p): stub\n", ppdwMsgSeqNumToUIDArray, pdwNumberOfElements); + return E_NOTIMPL; +} + +static HRESULT WINAPI IMAPTransport_GetHighestMsgSeqNum(IIMAPTransport *iface, DWORD *pdwHighestMSN) +{ + FIXME("(%p): stub\n", pdwHighestMSN); + return E_NOTIMPL; +} + +static HRESULT WINAPI IMAPTransport_ResetMsgSeqNumToUID(IIMAPTransport *iface) +{ + FIXME("(): stub\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI IMAPTransport_SetDefaultCBHandler(IIMAPTransport *iface, IIMAPCallback *pCBHandler) +{ + FIXME("(%p): stub\n", pCBHandler); + return E_NOTIMPL; +} + +static HRESULT WINAPI IMAPTransport_Status(IIMAPTransport *iface, WPARAM wParam, LPARAM lParam, + IIMAPCallback *pCBHandler, LPSTR pszMailboxName, LPSTR pszStatusCmdArgs) +{ + FIXME("(%ld, %ld, %p, %s, %s): stub\n", wParam, lParam, pCBHandler, + debugstr_a(pszMailboxName), debugstr_a(pszStatusCmdArgs)); + return E_NOTIMPL; +} + +static const IIMAPTransportVtbl IMAPTransportVtbl = +{ + IMAPTransport_QueryInterface, + IMAPTransport_AddRef, + IMAPTransport_Release, + IMAPTransport_GetServerInfo, + IMAPTransport_GetIXPType, + IMAPTransport_IsState, + IMAPTransport_InetServerFromAccount, + IMAPTransport_Connect, + IMAPTransport_HandsOffCallback, + IMAPTransport_Disconnect, + IMAPTransport_DropConnection, + IMAPTransport_GetStatus, + IMAPTransport_InitNew, + IMAPTransport_NewIRangeList, + IMAPTransport_Capability, + IMAPTransport_Select, + IMAPTransport_Examine, + IMAPTransport_Create, + IMAPTransport_Delete, + IMAPTransport_Rename, + IMAPTransport_Subscribe, + IMAPTransport_Unsubscribe, + IMAPTransport_List, + IMAPTransport_Lsub, + IMAPTransport_Append, + IMAPTransport_Close, + IMAPTransport_Expunge, + IMAPTransport_Search, + IMAPTransport_Fetch, + IMAPTransport_Store, + IMAPTransport_Copy, + IMAPTransport_Noop, + IMAPTransport_ResizeMsgSeqNumTable, + IMAPTransport_UpdateSeqNumToUID, + IMAPTransport_RemoveSequenceNum, + IMAPTransport_MsgSeqNumToUID, + IMAPTransport_GetMsgSeqNumToUIDArray, + IMAPTransport_GetHighestMsgSeqNum, + IMAPTransport_ResetMsgSeqNumToUID, + IMAPTransport_SetDefaultCBHandler, + IMAPTransport_Status +}; + +HRESULT WINAPI CreateIMAPTransport(IIMAPTransport **ppTransport) +{ + HRESULT hr; + IMAPTransport *This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + if (!This) + return E_OUTOFMEMORY; + + This->InetTransport.u.vtblIMAP = &IMAPTransportVtbl; + This->refs = 0; + hr = InternetTransport_Init(&This->InetTransport); + if (FAILED(hr)) + { + HeapFree(GetProcessHeap(), 0, This); + return hr; + } + + *ppTransport = (IIMAPTransport *)&This->InetTransport.u.vtblIMAP; + IIMAPTransport_AddRef(*ppTransport); + + return S_OK; +} + +static HRESULT WINAPI IMAPTransportCF_QueryInterface(LPCLASSFACTORY iface, + REFIID riid, LPVOID *ppv) +{ + *ppv = NULL; + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IClassFactory)) + { + *ppv = iface; + IUnknown_AddRef(iface); + return S_OK; + } + return E_NOINTERFACE; +} + +static ULONG WINAPI IMAPTransportCF_AddRef(LPCLASSFACTORY iface) +{ + return 2; /* non-heap based object */ +} + +static ULONG WINAPI IMAPTransportCF_Release(LPCLASSFACTORY iface) +{ + return 1; /* non-heap based object */ +} + +static HRESULT WINAPI IMAPTransportCF_CreateInstance(LPCLASSFACTORY iface, + LPUNKNOWN pUnk, REFIID riid, LPVOID *ppv) +{ + HRESULT hr; + IIMAPTransport *pImapTransport; + + TRACE("(%p, %s, %p)\n", pUnk, debugstr_guid(riid), ppv); + + *ppv = NULL; + + if (pUnk) + return CLASS_E_NOAGGREGATION; + + hr = CreateIMAPTransport(&pImapTransport); + if (FAILED(hr)) + return hr; + + hr = IIMAPTransport_QueryInterface(pImapTransport, riid, ppv); + IIMAPTransport_Release(pImapTransport); + + return hr; +} + +static HRESULT WINAPI IMAPTransportCF_LockServer(LPCLASSFACTORY iface, BOOL fLock) +{ + FIXME("(%d), stub!\n",fLock); + return S_OK; +} + +static const IClassFactoryVtbl IMAPTransportCFVtbl = +{ + IMAPTransportCF_QueryInterface, + IMAPTransportCF_AddRef, + IMAPTransportCF_Release, + IMAPTransportCF_CreateInstance, + IMAPTransportCF_LockServer +}; +static const IClassFactoryVtbl *IMAPTransportCF = &IMAPTransportCFVtbl; + +HRESULT IMAPTransportCF_Create(REFIID riid, LPVOID *ppv) +{ + return IClassFactory_QueryInterface((IClassFactory *)&IMAPTransportCF, riid, ppv); +} diff --git a/reactos/dll/win32/inetcomm/inetcomm.rbuild b/reactos/dll/win32/inetcomm/inetcomm.rbuild index 88ab3d28e90..e47321ffaa9 100644 --- a/reactos/dll/win32/inetcomm/inetcomm.rbuild +++ b/reactos/dll/win32/inetcomm/inetcomm.rbuild @@ -8,14 +8,18 @@ include/reactos/wine 0x600 + imaptransport.c inetcomm_main.c internettransport.c + mimeintl.c mimeole.c + pop3transport.c regsvr.c - inetcomm.spec + smtptransport.c wine uuid ole32 + oleaut32 ws2_32 user32 advapi32 diff --git a/reactos/dll/win32/inetcomm/inetcomm.spec b/reactos/dll/win32/inetcomm/inetcomm.spec index 36a5d8bd52f..0c90b4db28e 100644 --- a/reactos/dll/win32/inetcomm/inetcomm.spec +++ b/reactos/dll/win32/inetcomm/inetcomm.spec @@ -1,10 +1,10 @@ @ stub CreateIMAPTransport2 -@ stub CreateIMAPTransport +@ stdcall CreateIMAPTransport(ptr) @ stub CreateNNTPTransport -@ stub CreatePOP3Transport +@ stdcall CreatePOP3Transport(ptr) @ stub CreateRASTransport @ stub CreateRangeList -@ stub CreateSMTPTransport +@ stdcall CreateSMTPTransport(ptr) @ stdcall -private DllCanUnloadNow() @ stdcall -private DllGetClassObject(ptr ptr ptr) @ stdcall -private DllRegisterServer() @@ -59,7 +59,7 @@ @ stub MimeOleDecodeHeader @ stub MimeOleEncodeHeader @ stub MimeOleFileTimeToInetDate -@ stub MimeOleFindCharset +@ stdcall MimeOleFindCharset(str ptr) @ stub MimeOleGenerateCID @ stub MimeOleGenerateFileName @ stub MimeOleGenerateMID @@ -71,12 +71,12 @@ @ stub MimeOleGetCodePageCharset @ stub MimeOleGetCodePageInfo @ stub MimeOleGetContentTypeExt -@ stub MimeOleGetDefaultCharset +@ stdcall MimeOleGetDefaultCharset(ptr) @ stub MimeOleGetExtContentType @ stub MimeOleGetFileExtension @ stub MimeOleGetFileInfo @ stub MimeOleGetFileInfoW -@ stub MimeOleGetInternat +@ stdcall MimeOleGetInternat(ptr) @ stub MimeOleGetPropA @ stub MimeOleGetPropW @ stub MimeOleGetPropertySchema diff --git a/reactos/dll/win32/inetcomm/inetcomm_main.c b/reactos/dll/win32/inetcomm/inetcomm_main.c index 15350df89e2..1d71877782d 100644 --- a/reactos/dll/win32/inetcomm/inetcomm_main.c +++ b/reactos/dll/win32/inetcomm/inetcomm_main.c @@ -37,6 +37,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(inetcomm); BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { + static IMimeInternational *international; + TRACE("(%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); switch (fdwReason) @@ -47,8 +49,10 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) DisableThreadLibraryCalls(hinstDLL); if (!InternetTransport_RegisterClass(hinstDLL)) return FALSE; + MimeInternational_Construct(&international); break; case DLL_PROCESS_DETACH: + IMimeInternational_Release(international); InternetTransport_UnregisterClass(hinstDLL); break; default: @@ -133,6 +137,8 @@ static const struct IClassFactoryVtbl cf_vtbl = static cf mime_body_cf = { &cf_vtbl, MimeBody_create }; static cf mime_allocator_cf = { &cf_vtbl, MimeAllocator_create }; +static cf mime_message_cf = { &cf_vtbl, MimeMessage_create }; +static cf mime_security_cf = { &cf_vtbl, MimeSecurity_create }; /*********************************************************************** * DllGetClassObject (INETCOMM.@) @@ -143,7 +149,27 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) TRACE("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(iid), ppv ); - if( IsEqualCLSID( rclsid, &CLSID_IMimeBody )) + if (IsEqualCLSID(rclsid, &CLSID_ISMTPTransport)) + return SMTPTransportCF_Create(iid, ppv); + + if (IsEqualCLSID(rclsid, &CLSID_ISMTPTransport2)) + return SMTPTransportCF_Create(iid, ppv); + + if (IsEqualCLSID(rclsid, &CLSID_IIMAPTransport)) + return IMAPTransportCF_Create(iid, ppv); + + if (IsEqualCLSID(rclsid, &CLSID_IPOP3Transport)) + return POP3TransportCF_Create(iid, ppv); + + if ( IsEqualCLSID( rclsid, &CLSID_IMimeSecurity )) + { + cf = (IClassFactory*) &mime_security_cf.lpVtbl; + } + else if( IsEqualCLSID( rclsid, &CLSID_IMimeMessage )) + { + cf = (IClassFactory*) &mime_message_cf.lpVtbl; + } + else if( IsEqualCLSID( rclsid, &CLSID_IMimeBody )) { cf = (IClassFactory*) &mime_body_cf.lpVtbl; } diff --git a/reactos/dll/win32/inetcomm/inetcomm_private.h b/reactos/dll/win32/inetcomm/inetcomm_private.h index bf6e5ce31dd..589f92c3950 100644 --- a/reactos/dll/win32/inetcomm/inetcomm_private.h +++ b/reactos/dll/win32/inetcomm/inetcomm_private.h @@ -32,7 +32,9 @@ struct InternetTransport union { const IInternetTransportVtbl *vtbl; - const ISMTPTransportVtbl *vtblSMTP; + const ISMTPTransport2Vtbl *vtblSMTP2; + const IIMAPTransportVtbl *vtblIMAP; + const IPOP3TransportVtbl *vtblPOP3; } u; ITransportCallback *pCallback; @@ -65,9 +67,19 @@ HRESULT InternetTransport_ReadLine(InternetTransport *This, INETXPORT_COMPLETION_FUNCTION fnCompletion); HRESULT InternetTransport_Write(InternetTransport *This, const char *pvData, int cbSize, INETXPORT_COMPLETION_FUNCTION fnCompletion); +HRESULT InternetTransport_DoCommand(InternetTransport *This, + LPCSTR pszCommand, INETXPORT_COMPLETION_FUNCTION fnCompletion); BOOL InternetTransport_RegisterClass(HINSTANCE hInstance); void InternetTransport_UnregisterClass(HINSTANCE hInstance); HRESULT MimeBody_create(IUnknown *outer, void **obj); HRESULT MimeAllocator_create(IUnknown *outer, void **obj); +HRESULT MimeMessage_create(IUnknown *outer, void **obj); +HRESULT MimeSecurity_create(IUnknown *outer, void **obj); + +HRESULT MimeInternational_Construct(IMimeInternational **internat); + +HRESULT SMTPTransportCF_Create(REFIID riid, LPVOID *ppv); +HRESULT IMAPTransportCF_Create(REFIID riid, LPVOID *ppv); +HRESULT POP3TransportCF_Create(REFIID riid, LPVOID *ppv); diff --git a/reactos/dll/win32/inetcomm/internettransport.c b/reactos/dll/win32/inetcomm/internettransport.c index bba6aaba110..7cef414434a 100644 --- a/reactos/dll/win32/inetcomm/internettransport.c +++ b/reactos/dll/win32/inetcomm/internettransport.c @@ -26,8 +26,12 @@ #include "windef.h" #include "winbase.h" #include "winnt.h" +#include "winuser.h" #include "winsock2.h" #include "ws2tcpip.h" +#include "objbase.h" +#include "ole2.h" +#include "mimeole.h" #include "wine/debug.h" @@ -270,6 +274,23 @@ HRESULT InternetTransport_Write(InternetTransport *This, const char *pvData, return S_OK; } +HRESULT InternetTransport_DoCommand(InternetTransport *This, + LPCSTR pszCommand, INETXPORT_COMPLETION_FUNCTION fnCompletion) +{ + if (This->Status == IXP_DISCONNECTED) + return IXP_E_NOT_CONNECTED; + + if (This->fnCompletion) + return IXP_E_BUSY; + + if (This->pCallback && This->fCommandLogging) + { + ITransportCallback_OnCommand(This->pCallback, CMD_SEND, (LPSTR)pszCommand, 0, + (IInternetTransport *)&This->u.vtbl); + } + return InternetTransport_Write(This, pszCommand, strlen(pszCommand), fnCompletion); +} + static LRESULT CALLBACK InternetTransport_WndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { if (uMsg == IX_READ) diff --git a/reactos/dll/win32/inetcomm/mimeintl.c b/reactos/dll/win32/inetcomm/mimeintl.c new file mode 100644 index 00000000000..6d37147e2bf --- /dev/null +++ b/reactos/dll/win32/inetcomm/mimeintl.c @@ -0,0 +1,596 @@ +/* + * MIME OLE International interface + * + * Copyright 2008 Huw Davies for CodeWeavers + * + * 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 COBJMACROS +#define NONAMELESSUNION + +#include +#include + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "winnls.h" +#include "objbase.h" +#include "ole2.h" +#include "mimeole.h" +#include "mlang.h" + +#include "wine/list.h" +#include "wine/unicode.h" +#include "wine/debug.h" + +#include "inetcomm_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(inetcomm); + +typedef struct +{ + struct list entry; + INETCSETINFO cs_info; +} charset_entry; + +typedef struct +{ + const IMimeInternationalVtbl *lpVtbl; + LONG refs; + CRITICAL_SECTION cs; + + struct list charsets; + LONG next_charset_handle; + HCHARSET default_charset; +} internat; + +static inline internat *impl_from_IMimeInternational( IMimeInternational *iface ) +{ + return (internat *)((char*)iface - FIELD_OFFSET(internat, lpVtbl)); +} + +static inline HRESULT get_mlang(IMultiLanguage **ml) +{ + return CoCreateInstance(&CLSID_CMultiLanguage, NULL, CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, + &IID_IMultiLanguage, (void **)ml); +} + +static HRESULT WINAPI MimeInternat_QueryInterface( IMimeInternational *iface, REFIID riid, LPVOID *ppobj ) +{ + if (IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IMimeInternational)) + { + IMimeInternational_AddRef( iface ); + *ppobj = iface; + return S_OK; + } + + FIXME("interface %s not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI MimeInternat_AddRef( IMimeInternational *iface ) +{ + internat *This = impl_from_IMimeInternational( iface ); + return InterlockedIncrement(&This->refs); +} + +static ULONG WINAPI MimeInternat_Release( IMimeInternational *iface ) +{ + internat *This = impl_from_IMimeInternational( iface ); + ULONG refs; + + refs = InterlockedDecrement(&This->refs); + if (!refs) + { + charset_entry *charset, *cursor2; + + LIST_FOR_EACH_ENTRY_SAFE(charset, cursor2, &This->charsets, charset_entry, entry) + { + list_remove(&charset->entry); + HeapFree(GetProcessHeap(), 0, charset); + } + HeapFree(GetProcessHeap(), 0, This); + } + + return refs; +} + +static HRESULT WINAPI MimeInternat_SetDefaultCharset(IMimeInternational *iface, HCHARSET hCharset) +{ + internat *This = impl_from_IMimeInternational( iface ); + + TRACE("(%p)->(%p)\n", iface, hCharset); + + if(hCharset == NULL) return E_INVALIDARG; + /* FIXME check hCharset is valid */ + + InterlockedExchangePointer(&This->default_charset, hCharset); + + return S_OK; +} + +static HRESULT WINAPI MimeInternat_GetDefaultCharset(IMimeInternational *iface, LPHCHARSET phCharset) +{ + internat *This = impl_from_IMimeInternational( iface ); + HRESULT hr = S_OK; + + TRACE("(%p)->(%p)\n", iface, phCharset); + + if(This->default_charset == NULL) + { + HCHARSET hcs; + hr = IMimeInternational_GetCodePageCharset(iface, GetACP(), CHARSET_BODY, &hcs); + if(SUCCEEDED(hr)) + InterlockedCompareExchangePointer(&This->default_charset, hcs, NULL); + } + *phCharset = This->default_charset; + + return hr; +} + +static HRESULT mlang_getcodepageinfo(UINT cp, MIMECPINFO *mlang_cp_info) +{ + HRESULT hr; + IMultiLanguage *ml; + + hr = get_mlang(&ml); + + if(SUCCEEDED(hr)) + { + hr = IMultiLanguage_GetCodePageInfo(ml, cp, mlang_cp_info); + IMultiLanguage_Release(ml); + } + return hr; +} + +static HRESULT WINAPI MimeInternat_GetCodePageCharset(IMimeInternational *iface, CODEPAGEID cpiCodePage, + CHARSETTYPE ctCsetType, + LPHCHARSET phCharset) +{ + HRESULT hr; + MIMECPINFO mlang_cp_info; + + TRACE("(%p)->(%d, %d, %p)\n", iface, cpiCodePage, ctCsetType, phCharset); + + *phCharset = NULL; + + hr = mlang_getcodepageinfo(cpiCodePage, &mlang_cp_info); + if(SUCCEEDED(hr)) + { + const WCHAR *charset_nameW = NULL; + char *charset_name; + DWORD len; + + switch(ctCsetType) + { + case CHARSET_BODY: + charset_nameW = mlang_cp_info.wszBodyCharset; + break; + case CHARSET_HEADER: + charset_nameW = mlang_cp_info.wszHeaderCharset; + break; + case CHARSET_WEB: + charset_nameW = mlang_cp_info.wszWebCharset; + break; + default: + return MIME_E_INVALID_CHARSET_TYPE; + } + len = WideCharToMultiByte(CP_ACP, 0, charset_nameW, -1, NULL, 0, NULL, NULL); + charset_name = HeapAlloc(GetProcessHeap(), 0, len); + WideCharToMultiByte(CP_ACP, 0, charset_nameW, -1, charset_name, len, NULL, NULL); + hr = IMimeInternational_FindCharset(iface, charset_name, phCharset); + HeapFree(GetProcessHeap(), 0, charset_name); + } + return hr; +} + +static HRESULT mlang_getcsetinfo(const char *charset, MIMECSETINFO *mlang_info) +{ + DWORD len = MultiByteToWideChar(CP_ACP, 0, charset, -1, NULL, 0); + BSTR bstr = SysAllocStringLen(NULL, len - 1); + HRESULT hr; + IMultiLanguage *ml; + + MultiByteToWideChar(CP_ACP, 0, charset, -1, bstr, len); + + hr = get_mlang(&ml); + + if(SUCCEEDED(hr)) + { + hr = IMultiLanguage_GetCharsetInfo(ml, bstr, mlang_info); + IMultiLanguage_Release(ml); + } + SysFreeString(bstr); + if(FAILED(hr)) hr = MIME_E_NOT_FOUND; + return hr; +} + +static HCHARSET add_charset(struct list *list, MIMECSETINFO *mlang_info, HCHARSET handle) +{ + charset_entry *charset = HeapAlloc(GetProcessHeap(), 0, sizeof(*charset)); + + WideCharToMultiByte(CP_ACP, 0, mlang_info->wszCharset, -1, + charset->cs_info.szName, sizeof(charset->cs_info.szName), NULL, NULL); + charset->cs_info.cpiWindows = mlang_info->uiCodePage; + charset->cs_info.cpiInternet = mlang_info->uiInternetEncoding; + charset->cs_info.hCharset = handle; + charset->cs_info.dwReserved1 = 0; + list_add_head(list, &charset->entry); + + return charset->cs_info.hCharset; +} + +static HRESULT WINAPI MimeInternat_FindCharset(IMimeInternational *iface, LPCSTR pszCharset, + LPHCHARSET phCharset) +{ + internat *This = impl_from_IMimeInternational( iface ); + HRESULT hr = MIME_E_NOT_FOUND; + charset_entry *charset; + + TRACE("(%p)->(%s, %p)\n", iface, debugstr_a(pszCharset), phCharset); + + *phCharset = NULL; + + EnterCriticalSection(&This->cs); + + LIST_FOR_EACH_ENTRY(charset, &This->charsets, charset_entry, entry) + { + if(!lstrcmpiA(charset->cs_info.szName, pszCharset)) + { + *phCharset = charset->cs_info.hCharset; + hr = S_OK; + break; + } + } + + if(hr == MIME_E_NOT_FOUND) + { + MIMECSETINFO mlang_info; + + LeaveCriticalSection(&This->cs); + hr = mlang_getcsetinfo(pszCharset, &mlang_info); + EnterCriticalSection(&This->cs); + + if(SUCCEEDED(hr)) + *phCharset = add_charset(&This->charsets, &mlang_info, + (HCHARSET)InterlockedIncrement(&This->next_charset_handle)); + } + + LeaveCriticalSection(&This->cs); + return hr; +} + +static HRESULT WINAPI MimeInternat_GetCharsetInfo(IMimeInternational *iface, HCHARSET hCharset, + LPINETCSETINFO pCsetInfo) +{ + internat *This = impl_from_IMimeInternational( iface ); + HRESULT hr = MIME_E_INVALID_HANDLE; + charset_entry *charset; + + TRACE("(%p)->(%p, %p)\n", iface, hCharset, pCsetInfo); + + EnterCriticalSection(&This->cs); + + LIST_FOR_EACH_ENTRY(charset, &This->charsets, charset_entry, entry) + { + if(charset->cs_info.hCharset == hCharset) + { + *pCsetInfo = charset->cs_info; + hr = S_OK; + break; + } + } + + LeaveCriticalSection(&This->cs); + + return hr; +} + +static HRESULT WINAPI MimeInternat_GetCodePageInfo(IMimeInternational *iface, CODEPAGEID cpiCodePage, + LPCODEPAGEINFO pCodePageInfo) +{ + FIXME("stub\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI MimeInternat_CanConvertCodePages(IMimeInternational *iface, CODEPAGEID cpiSource, + CODEPAGEID cpiDest) +{ + HRESULT hr; + IMultiLanguage *ml; + + TRACE("(%p)->(%d, %d)\n", iface, cpiSource, cpiDest); + + /* Could call mlang.IsConvertINetStringAvailable() to avoid the COM overhead if need be. */ + + hr = get_mlang(&ml); + if(SUCCEEDED(hr)) + { + hr = IMultiLanguage_IsConvertible(ml, cpiSource, cpiDest); + IMultiLanguage_Release(ml); + } + + return hr; +} + +static HRESULT WINAPI MimeInternat_DecodeHeader(IMimeInternational *iface, HCHARSET hCharset, + LPCSTR pszData, + LPPROPVARIANT pDecoded, + LPRFC1522INFO pRfc1522Info) +{ + FIXME("stub\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI MimeInternat_EncodeHeader(IMimeInternational *iface, HCHARSET hCharset, + LPPROPVARIANT pData, + LPSTR *ppszEncoded, + LPRFC1522INFO pRfc1522Info) +{ + FIXME("stub\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI MimeInternat_ConvertBuffer(IMimeInternational *iface, CODEPAGEID cpiSource, + CODEPAGEID cpiDest, LPBLOB pIn, LPBLOB pOut, + ULONG *pcbRead) +{ + HRESULT hr; + IMultiLanguage *ml; + + TRACE("(%p)->(%d, %d, %p, %p, %p)\n", iface, cpiSource, cpiDest, pIn, pOut, pcbRead); + + *pcbRead = 0; + pOut->cbSize = 0; + + /* Could call mlang.ConvertINetString() to avoid the COM overhead if need be. */ + + hr = get_mlang(&ml); + if(SUCCEEDED(hr)) + { + DWORD mode = 0; + UINT in_size = pIn->cbSize, out_size; + + hr = IMultiLanguage_ConvertString(ml, &mode, cpiSource, cpiDest, pIn->pBlobData, &in_size, + NULL, &out_size); + if(hr == S_OK) /* S_FALSE means the conversion could not be performed */ + { + pOut->pBlobData = CoTaskMemAlloc(out_size); + if(!pOut->pBlobData) + hr = E_OUTOFMEMORY; + else + { + mode = 0; + in_size = pIn->cbSize; + hr = IMultiLanguage_ConvertString(ml, &mode, cpiSource, cpiDest, pIn->pBlobData, &in_size, + pOut->pBlobData, &out_size); + + if(hr == S_OK) + { + *pcbRead = in_size; + pOut->cbSize = out_size; + } + else + CoTaskMemFree(pOut->pBlobData); + } + } + IMultiLanguage_Release(ml); + } + + return hr; +} + +static HRESULT WINAPI MimeInternat_ConvertString(IMimeInternational *iface, CODEPAGEID cpiSource, + CODEPAGEID cpiDest, LPPROPVARIANT pIn, + LPPROPVARIANT pOut) +{ + HRESULT hr; + int src_len; + IMultiLanguage *ml; + + TRACE("(%p)->(%d, %d, %p %p)\n", iface, cpiSource, cpiDest, pIn, pOut); + + switch(pIn->vt) + { + case VT_LPSTR: + if(cpiSource == CP_UNICODE) cpiSource = GetACP(); + src_len = strlen(pIn->u.pszVal); + break; + case VT_LPWSTR: + cpiSource = CP_UNICODE; + src_len = strlenW(pIn->u.pwszVal) * sizeof(WCHAR); + break; + default: + return E_INVALIDARG; + } + + hr = get_mlang(&ml); + if(SUCCEEDED(hr)) + { + DWORD mode = 0; + UINT in_size = src_len, out_size; + + hr = IMultiLanguage_ConvertString(ml, &mode, cpiSource, cpiDest, (BYTE*)pIn->u.pszVal, &in_size, + NULL, &out_size); + if(hr == S_OK) /* S_FALSE means the conversion could not be performed */ + { + out_size += (cpiDest == CP_UNICODE) ? sizeof(WCHAR) : sizeof(char); + + pOut->u.pszVal = CoTaskMemAlloc(out_size); + if(!pOut->u.pszVal) + hr = E_OUTOFMEMORY; + else + { + mode = 0; + in_size = src_len; + hr = IMultiLanguage_ConvertString(ml, &mode, cpiSource, cpiDest, (BYTE*)pIn->u.pszVal, &in_size, + (BYTE*)pOut->u.pszVal, &out_size); + + if(hr == S_OK) + { + if(cpiDest == CP_UNICODE) + { + pOut->u.pwszVal[out_size / sizeof(WCHAR)] = 0; + pOut->vt = VT_LPWSTR; + } + else + { + pOut->u.pszVal[out_size] = '\0'; + pOut->vt = VT_LPSTR; + } + } + else + CoTaskMemFree(pOut->u.pszVal); + } + } + IMultiLanguage_Release(ml); + } + return hr; +} + +static HRESULT WINAPI MimeInternat_MLANG_ConvertInetReset(IMimeInternational *iface) +{ + FIXME("stub\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI MimeInternat_MLANG_ConvertInetString(IMimeInternational *iface, CODEPAGEID cpiSource, + CODEPAGEID cpiDest, + LPCSTR pSource, + int *pnSizeOfSource, + LPSTR pDestination, + int *pnDstSize) +{ + FIXME("stub\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI MimeInternat_Rfc1522Decode(IMimeInternational *iface, LPCSTR pszValue, + LPSTR pszCharset, + ULONG cchmax, + LPSTR *ppszDecoded) +{ + FIXME("stub\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI MimeInternat_Rfc1522Encode(IMimeInternational *iface, LPCSTR pszValue, + HCHARSET hCharset, + LPSTR *ppszEncoded) +{ + FIXME("stub\n"); + return E_NOTIMPL; +} + +static IMimeInternationalVtbl mime_internat_vtbl = +{ + MimeInternat_QueryInterface, + MimeInternat_AddRef, + MimeInternat_Release, + MimeInternat_SetDefaultCharset, + MimeInternat_GetDefaultCharset, + MimeInternat_GetCodePageCharset, + MimeInternat_FindCharset, + MimeInternat_GetCharsetInfo, + MimeInternat_GetCodePageInfo, + MimeInternat_CanConvertCodePages, + MimeInternat_DecodeHeader, + MimeInternat_EncodeHeader, + MimeInternat_ConvertBuffer, + MimeInternat_ConvertString, + MimeInternat_MLANG_ConvertInetReset, + MimeInternat_MLANG_ConvertInetString, + MimeInternat_Rfc1522Decode, + MimeInternat_Rfc1522Encode +}; + +static internat *global_internat; + +HRESULT MimeInternational_Construct(IMimeInternational **internat) +{ + global_internat = HeapAlloc(GetProcessHeap(), 0, sizeof(*global_internat)); + global_internat->lpVtbl = &mime_internat_vtbl; + global_internat->refs = 0; + InitializeCriticalSection(&global_internat->cs); + + list_init(&global_internat->charsets); + global_internat->next_charset_handle = 0; + global_internat->default_charset = NULL; + + *internat = (IMimeInternational*)&global_internat->lpVtbl; + + IMimeInternational_AddRef(*internat); + return S_OK; +} + +HRESULT WINAPI MimeOleGetInternat(IMimeInternational **internat) +{ + TRACE("(%p)\n", internat); + + *internat = (IMimeInternational *)&global_internat->lpVtbl; + IMimeInternational_AddRef(*internat); + return S_OK; +} + +HRESULT WINAPI MimeOleFindCharset(LPCSTR name, LPHCHARSET charset) +{ + IMimeInternational *internat; + HRESULT hr; + + TRACE("(%s, %p)\n", debugstr_a(name), charset); + + hr = MimeOleGetInternat(&internat); + if(SUCCEEDED(hr)) + { + hr = IMimeInternational_FindCharset(internat, name, charset); + IMimeInternational_Release(internat); + } + return hr; +} + +HRESULT WINAPI MimeOleGetCharsetInfo(HCHARSET hCharset, LPINETCSETINFO pCsetInfo) +{ + IMimeInternational *internat; + HRESULT hr; + + TRACE("(%p, %p)\n", hCharset, pCsetInfo); + + hr = MimeOleGetInternat(&internat); + if(SUCCEEDED(hr)) + { + hr = IMimeInternational_GetCharsetInfo(internat, hCharset, pCsetInfo); + IMimeInternational_Release(internat); + } + return hr; +} + +HRESULT WINAPI MimeOleGetDefaultCharset(LPHCHARSET charset) +{ + IMimeInternational *internat; + HRESULT hr; + + TRACE("(%p)\n", charset); + + hr = MimeOleGetInternat(&internat); + if(SUCCEEDED(hr)) + { + hr = IMimeInternational_GetDefaultCharset(internat, charset); + IMimeInternational_Release(internat); + } + return hr; +} diff --git a/reactos/dll/win32/inetcomm/mimeole.c b/reactos/dll/win32/inetcomm/mimeole.c index 7e9d709f5ce..07aa6bd0de7 100644 --- a/reactos/dll/win32/inetcomm/mimeole.c +++ b/reactos/dll/win32/inetcomm/mimeole.c @@ -69,7 +69,7 @@ static const property_t default_props[] = {"Content-Type", PID_HDR_CNTTYPE, MPF_MIME | MPF_HASPARAMS, VT_LPSTR}, {"Content-Transfer-Encoding", PID_HDR_CNTXFER, MPF_MIME, VT_LPSTR}, {"Content-ID", PID_HDR_CNTID, MPF_MIME, VT_LPSTR}, - {"Content-Disposition", PID_HDR_CNTDISP, MPF_MIME, VT_LPSTR}, + {"Content-Disposition", PID_HDR_CNTDISP, MPF_MIME | MPF_HASPARAMS, VT_LPSTR}, {"To", PID_HDR_TO, MPF_ADDRESS, VT_LPSTR}, {"Cc", PID_HDR_CC, MPF_ADDRESS, VT_LPSTR}, {"Sender", PID_HDR_SENDER, MPF_ADDRESS, VT_LPSTR}, @@ -820,8 +820,26 @@ static HRESULT WINAPI MimeBody_SetOption( const TYPEDID oid, LPCPROPVARIANT pValue) { - FIXME("(%p)->(%08x, %p): stub\n", iface, oid, pValue); - return E_NOTIMPL; + HRESULT hr = E_NOTIMPL; + TRACE("(%p)->(%08x, %p)\n", iface, oid, pValue); + + if(pValue->vt != TYPEDID_TYPE(oid)) + { + WARN("Called with vartype %04x and oid %08x\n", pValue->vt, oid); + return E_INVALIDARG; + } + + switch(oid) + { + case OID_SECURITY_HWND_OWNER: + FIXME("OID_SECURITY_HWND_OWNER (value %08x): ignoring\n", pValue->u.ulVal); + hr = S_OK; + break; + default: + FIXME("Unhandled oid %08x\n", oid); + } + + return hr; } static HRESULT WINAPI MimeBody_GetOption( @@ -846,8 +864,17 @@ static HRESULT WINAPI MimeBody_IsType( IMimeBody* iface, IMSGBODYTYPE bodytype) { - FIXME("(%p)->(%d): stub\n", iface, bodytype); - return E_NOTIMPL; + MimeBody *This = impl_from_IMimeBody(iface); + + TRACE("(%p)->(%d)\n", iface, bodytype); + switch(bodytype) + { + case IBT_EMPTY: + return This->data ? S_FALSE : S_OK; + default: + FIXME("Unimplemented bodytype %d - returning S_OK\n", bodytype); + } + return S_OK; } static HRESULT WINAPI MimeBody_SetDisplayName( @@ -2172,8 +2199,30 @@ static HRESULT WINAPI MimeMessage_SetOption( const TYPEDID oid, LPCPROPVARIANT pValue) { - FIXME("(%p)->(%08x, %p)\n", iface, oid, pValue); - return E_NOTIMPL; + HRESULT hr = E_NOTIMPL; + TRACE("(%p)->(%08x, %p)\n", iface, oid, pValue); + + if(pValue->vt != TYPEDID_TYPE(oid)) + { + WARN("Called with vartype %04x and oid %08x\n", pValue->vt, oid); + return E_INVALIDARG; + } + + switch(oid) + { + case OID_HIDE_TNEF_ATTACHMENTS: + FIXME("OID_HIDE_TNEF_ATTACHMENTS (value %d): ignoring\n", pValue->u.boolVal); + hr = S_OK; + break; + case OID_SHOW_MACBINARY: + FIXME("OID_SHOW_MACBINARY (value %d): ignoring\n", pValue->u.boolVal); + hr = S_OK; + break; + default: + FIXME("Unhandled oid %08x\n", oid); + } + + return hr; } static HRESULT WINAPI MimeMessage_GetOption( @@ -2491,22 +2540,19 @@ static const IMimeMessageVtbl MimeMessageVtbl = MimeMessage_GetRootMoniker, }; -/*********************************************************************** - * MimeOleCreateMessage (INETCOMM.@) - */ -HRESULT WINAPI MimeOleCreateMessage(IUnknown *pUnkOuter, IMimeMessage **ppMessage) +HRESULT MimeMessage_create(IUnknown *outer, void **obj) { MimeMessage *This; - TRACE("(%p, %p)\n", pUnkOuter, ppMessage); + TRACE("(%p, %p)\n", outer, obj); - if (pUnkOuter) + if (outer) { FIXME("outer unknown not supported yet\n"); return E_NOTIMPL; } - *ppMessage = NULL; + *obj = NULL; This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); if (!This) return E_OUTOFMEMORY; @@ -2517,10 +2563,19 @@ HRESULT WINAPI MimeOleCreateMessage(IUnknown *pUnkOuter, IMimeMessage **ppMessag list_init(&This->body_tree); This->next_hbody = (HBODY)1; - *ppMessage = (IMimeMessage *)&This->lpVtbl; + *obj = (IMimeMessage *)&This->lpVtbl; return S_OK; } +/*********************************************************************** + * MimeOleCreateMessage (INETCOMM.@) + */ +HRESULT WINAPI MimeOleCreateMessage(IUnknown *pUnkOuter, IMimeMessage **ppMessage) +{ + TRACE("(%p, %p)\n", pUnkOuter, ppMessage); + return MimeMessage_create(NULL, (void **)ppMessage); +} + /*********************************************************************** * MimeOleSetCompatMode (INETCOMM.@) */ @@ -2705,16 +2760,13 @@ static const IMimeSecurityVtbl MimeSecurityVtbl = MimeSecurity_GetCertData }; -/*********************************************************************** - * MimeOleCreateSecurity (INETCOMM.@) - */ -HRESULT WINAPI MimeOleCreateSecurity(IMimeSecurity **ppSecurity) +HRESULT MimeSecurity_create(IUnknown *outer, void **obj) { MimeSecurity *This; - TRACE("(%p)\n", ppSecurity); + *obj = NULL; - *ppSecurity = NULL; + if (outer) return CLASS_E_NOAGGREGATION; This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); if (!This) return E_OUTOFMEMORY; @@ -2722,10 +2774,17 @@ HRESULT WINAPI MimeOleCreateSecurity(IMimeSecurity **ppSecurity) This->lpVtbl = &MimeSecurityVtbl; This->refs = 1; - *ppSecurity = (IMimeSecurity *)&This->lpVtbl; + *obj = (IMimeSecurity *)&This->lpVtbl; return S_OK; } +/*********************************************************************** + * MimeOleCreateSecurity (INETCOMM.@) + */ +HRESULT WINAPI MimeOleCreateSecurity(IMimeSecurity **ppSecurity) +{ + return MimeSecurity_create(NULL, (void **)ppSecurity); +} typedef struct { @@ -2930,10 +2989,3 @@ HRESULT WINAPI MimeOleGetAllocator(IMimeAllocator **alloc) { return MimeAllocator_create(NULL, (void**)alloc); } - -HRESULT WINAPI MimeOleGetCharsetInfo(HCHARSET hCharset, LPINETCSETINFO pCsetInfo) -{ - FIXME("(%p, %p)\n", hCharset, pCsetInfo); - if(!hCharset) return E_INVALIDARG; - return E_FAIL; -} diff --git a/reactos/dll/win32/inetcomm/pop3transport.c b/reactos/dll/win32/inetcomm/pop3transport.c new file mode 100644 index 00000000000..afb4094b209 --- /dev/null +++ b/reactos/dll/win32/inetcomm/pop3transport.c @@ -0,0 +1,662 @@ +/* + * POP3 Transport + * + * Copyright 2008 Hans Leidekker for CodeWeavers + * + * 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 COBJMACROS + +#include +#include + +#include "windef.h" +#include "winbase.h" +#include "winnt.h" +#include "winuser.h" +#include "objbase.h" +#include "mimeole.h" +#include "wine/debug.h" + +#include "inetcomm_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(inetcomm); + +typedef struct +{ + InternetTransport InetTransport; + ULONG refs; + INETSERVER server; + POP3COMMAND command; +} POP3Transport; + +static HRESULT POP3Transport_ParseResponse(POP3Transport *This, char *pszResponse, POP3RESPONSE *pResponse) +{ + TRACE("response: %s\n", debugstr_a(pszResponse)); + + pResponse->command = This->command; + pResponse->fDone = TRUE; /* FIXME */ + + if (!memcmp(pszResponse, "+OK", 3)) + pResponse->rIxpResult.hrResult = S_OK; + else + pResponse->rIxpResult.hrResult = S_FALSE; + + pResponse->rIxpResult.pszResponse = pszResponse; + pResponse->rIxpResult.uiServerError = 0; + pResponse->rIxpResult.hrServerError = pResponse->rIxpResult.hrResult; + pResponse->rIxpResult.dwSocketError = 0; + pResponse->pTransport = (IPOP3Transport *)&This->InetTransport.u.vtblPOP3; + pResponse->fValidInfo = FALSE; /* FIXME */ + + if (This->InetTransport.pCallback && This->InetTransport.fCommandLogging) + { + ITransportCallback_OnCommand(This->InetTransport.pCallback, CMD_RESP, + pResponse->rIxpResult.pszResponse, pResponse->rIxpResult.hrServerError, + (IInternetTransport *)&This->InetTransport.u.vtbl); + } + return S_OK; +} + +static void POP3Transport_CallbackProcessLISTResp(IInternetTransport *iface, char *pBuffer, int cbBuffer) +{ + POP3Transport *This = (POP3Transport *)iface; + POP3RESPONSE response; + HRESULT hr; + + TRACE("\n"); + + hr = POP3Transport_ParseResponse(This, pBuffer, &response); + if (FAILED(hr)) + { + /* FIXME: handle error */ + return; + } + + IPOP3Callback_OnResponse((IPOP3Callback *)This->InetTransport.pCallback, &response); +} + +static void POP3Transport_CallbackRecvLISTResp(IInternetTransport *iface, char *pBuffer, int cbBuffer) +{ + POP3Transport *This = (POP3Transport *)iface; + + TRACE("\n"); + InternetTransport_ReadLine(&This->InetTransport, POP3Transport_CallbackProcessLISTResp); +} + +static void POP3Transport_CallbackProcessUIDLResp(IInternetTransport *iface, char *pBuffer, int cbBuffer) +{ + POP3Transport *This = (POP3Transport *)iface; + POP3RESPONSE response; + HRESULT hr; + + TRACE("\n"); + + hr = POP3Transport_ParseResponse(This, pBuffer, &response); + if (FAILED(hr)) + { + /* FIXME: handle error */ + return; + } + + IPOP3Callback_OnResponse((IPOP3Callback *)This->InetTransport.pCallback, &response); +} + +static void POP3Transport_CallbackRecvUIDLResp(IInternetTransport *iface, char *pBuffer, int cbBuffer) +{ + POP3Transport *This = (POP3Transport *)iface; + + TRACE("\n"); + InternetTransport_ReadLine(&This->InetTransport, POP3Transport_CallbackProcessUIDLResp); +} + +static void POP3Transport_CallbackProcessSTATResp(IInternetTransport *iface, char *pBuffer, int cbBuffer) +{ + POP3Transport *This = (POP3Transport *)iface; + POP3RESPONSE response; + HRESULT hr; + + TRACE("\n"); + + hr = POP3Transport_ParseResponse(This, pBuffer, &response); + if (FAILED(hr)) + { + /* FIXME: handle error */ + return; + } + + IPOP3Callback_OnResponse((IPOP3Callback *)This->InetTransport.pCallback, &response); +} + +static void POP3Transport_CallbackRecvSTATResp(IInternetTransport *iface, char *pBuffer, int cbBuffer) +{ + POP3Transport *This = (POP3Transport *)iface; + + TRACE("\n"); + InternetTransport_ReadLine(&This->InetTransport, POP3Transport_CallbackProcessSTATResp); +} + +static void POP3Transport_CallbackProcessPASSResp(IInternetTransport *iface, char *pBuffer, int cbBuffer) +{ + POP3Transport *This = (POP3Transport *)iface; + POP3RESPONSE response; + HRESULT hr; + + TRACE("\n"); + + hr = POP3Transport_ParseResponse(This, pBuffer, &response); + if (FAILED(hr)) + { + /* FIXME: handle error */ + return; + } + + InternetTransport_ChangeStatus(&This->InetTransport, IXP_AUTHORIZED); + InternetTransport_ChangeStatus(&This->InetTransport, IXP_CONNECTED); + + IPOP3Callback_OnResponse((IPOP3Callback *)This->InetTransport.pCallback, &response); +} + +static void POP3Transport_CallbackRecvPASSResp(IInternetTransport *iface, char *pBuffer, int cbBuffer) +{ + POP3Transport *This = (POP3Transport *)iface; + + TRACE("\n"); + InternetTransport_ReadLine(&This->InetTransport, POP3Transport_CallbackProcessPASSResp); +} + +static void POP3Transport_CallbackProcessUSERResp(IInternetTransport *iface, char *pBuffer, int cbBuffer) +{ + static char pass[] = "PASS "; + POP3Transport *This = (POP3Transport *)iface; + POP3RESPONSE response; + char *command; + int len; + HRESULT hr; + + TRACE("\n"); + + hr = POP3Transport_ParseResponse(This, pBuffer, &response); + if (FAILED(hr)) + { + /* FIXME: handle error */ + return; + } + + IPOP3Callback_OnResponse((IPOP3Callback *)This->InetTransport.pCallback, &response); + + len = sizeof(pass) + strlen(This->server.szPassword) + 2; /* "\r\n" */ + command = HeapAlloc(GetProcessHeap(), 0, len); + + strcpy(command, pass); + strcat(command, This->server.szPassword); + strcat(command, "\r\n"); + + InternetTransport_DoCommand(&This->InetTransport, command, POP3Transport_CallbackRecvPASSResp); + HeapFree(GetProcessHeap(), 0, command); +} + +static void POP3Transport_CallbackRecvUSERResp(IInternetTransport *iface, char *pBuffer, int cbBuffer) +{ + POP3Transport *This = (POP3Transport *)iface; + + TRACE("\n"); + InternetTransport_ReadLine(&This->InetTransport, POP3Transport_CallbackProcessUSERResp); +} + +static void POP3Transport_CallbackSendUSERCmd(IInternetTransport *iface, char *pBuffer, int cbBuffer) +{ + static char user[] = "USER "; + POP3Transport *This = (POP3Transport *)iface; + char *command; + int len; + + TRACE("\n"); + + len = sizeof(user) + strlen(This->server.szUserName) + 2; /* "\r\n" */ + command = HeapAlloc(GetProcessHeap(), 0, len); + + strcpy(command, user); + strcat(command, This->server.szUserName); + strcat(command, "\r\n"); + InternetTransport_DoCommand(&This->InetTransport, command, POP3Transport_CallbackRecvUSERResp); + + HeapFree(GetProcessHeap(), 0, command); +} + +static void POP3Transport_CallbackProcessQUITResponse(IInternetTransport *iface, char *pBuffer, int cbBuffer) +{ + POP3Transport *This = (POP3Transport *)iface; + POP3RESPONSE response; + HRESULT hr; + + TRACE("%s\n", debugstr_an(pBuffer, cbBuffer)); + + hr = POP3Transport_ParseResponse(This, pBuffer, &response); + if (FAILED(hr)) + { + /* FIXME: handle error */ + return; + } + + IPOP3Callback_OnResponse((IPOP3Callback *)This->InetTransport.pCallback, &response); + InternetTransport_DropConnection(&This->InetTransport); +} + +static void POP3Transport_CallbackRecvQUITResp(IInternetTransport *iface, char *pBuffer, int cbBuffer) +{ + POP3Transport *This = (POP3Transport *)iface; + + TRACE("\n"); + InternetTransport_ReadLine(&This->InetTransport, POP3Transport_CallbackProcessQUITResponse); +} + +static HRESULT WINAPI POP3Transport_QueryInterface(IPOP3Transport *iface, REFIID riid, void **ppv) +{ + TRACE("(%s, %p)\n", debugstr_guid(riid), ppv); + + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IInternetTransport) || + IsEqualIID(riid, &IID_IPOP3Transport)) + { + *ppv = iface; + IUnknown_AddRef(iface); + return S_OK; + } + *ppv = NULL; + FIXME("no interface for %s\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI POP3Transport_AddRef(IPOP3Transport *iface) +{ + POP3Transport *This = (POP3Transport *)iface; + return InterlockedIncrement((LONG *)&This->refs); +} + +static ULONG WINAPI POP3Transport_Release(IPOP3Transport *iface) +{ + POP3Transport *This = (POP3Transport *)iface; + ULONG refs = InterlockedDecrement((LONG *)&This->refs); + if (!refs) + { + TRACE("destroying %p\n", This); + if (This->InetTransport.Status != IXP_DISCONNECTED) + InternetTransport_DropConnection(&This->InetTransport); + if (This->InetTransport.pCallback) ITransportCallback_Release(This->InetTransport.pCallback); + HeapFree(GetProcessHeap(), 0, This); + } + return refs; +} + +static HRESULT WINAPI POP3Transport_GetServerInfo(IPOP3Transport *iface, + LPINETSERVER pInetServer) +{ + POP3Transport *This = (POP3Transport *)iface; + + TRACE("(%p)\n", pInetServer); + return InternetTransport_GetServerInfo(&This->InetTransport, pInetServer); +} + +static IXPTYPE WINAPI POP3Transport_GetIXPType(IPOP3Transport *iface) +{ + TRACE("()\n"); + return IXP_POP3; +} + +static HRESULT WINAPI POP3Transport_IsState(IPOP3Transport *iface, IXPISSTATE isstate) +{ + FIXME("(%u)\n", isstate); + return E_NOTIMPL; +} + +static HRESULT WINAPI POP3Transport_InetServerFromAccount( + IPOP3Transport *iface, IImnAccount *pAccount, LPINETSERVER pInetServer) +{ + POP3Transport *This = (POP3Transport *)iface; + + TRACE("(%p, %p)\n", pAccount, pInetServer); + return InternetTransport_InetServerFromAccount(&This->InetTransport, pAccount, pInetServer); +} + +static HRESULT WINAPI POP3Transport_Connect(IPOP3Transport *iface, + LPINETSERVER pInetServer, boolean fAuthenticate, boolean fCommandLogging) +{ + POP3Transport *This = (POP3Transport *)iface; + HRESULT hr; + + TRACE("(%p, %s, %s)\n", pInetServer, fAuthenticate ? "TRUE" : "FALSE", fCommandLogging ? "TRUE" : "FALSE"); + + hr = InternetTransport_Connect(&This->InetTransport, pInetServer, fAuthenticate, fCommandLogging); + if (FAILED(hr)) + return hr; + + This->command = POP3_USER; + This->server = *pInetServer; + return InternetTransport_ReadLine(&This->InetTransport, POP3Transport_CallbackSendUSERCmd); +} + +static HRESULT WINAPI POP3Transport_HandsOffCallback(IPOP3Transport *iface) +{ + POP3Transport *This = (POP3Transport *)iface; + + TRACE("()\n"); + return InternetTransport_HandsOffCallback(&This->InetTransport); +} + +static HRESULT WINAPI POP3Transport_Disconnect(IPOP3Transport *iface) +{ + TRACE("()\n"); + return IPOP3Transport_CommandQUIT(iface); +} + +static HRESULT WINAPI POP3Transport_DropConnection(IPOP3Transport *iface) +{ + POP3Transport *This = (POP3Transport *)iface; + + TRACE("()\n"); + return InternetTransport_DropConnection(&This->InetTransport); +} + +static HRESULT WINAPI POP3Transport_GetStatus(IPOP3Transport *iface, + IXPSTATUS *pCurrentStatus) +{ + POP3Transport *This = (POP3Transport *)iface; + + TRACE("()\n"); + return InternetTransport_GetStatus(&This->InetTransport, pCurrentStatus); +} + +static HRESULT WINAPI POP3Transport_InitNew(IPOP3Transport *iface, + LPSTR pszLogFilePath, IPOP3Callback *pCallback) +{ + POP3Transport *This = (POP3Transport *)iface; + + TRACE("(%s, %p)\n", debugstr_a(pszLogFilePath), pCallback); + + if (!pCallback) + return E_INVALIDARG; + + if (pszLogFilePath) + FIXME("not using log file of %s, use Wine debug logging instead\n", + debugstr_a(pszLogFilePath)); + + IPOP3Callback_AddRef(pCallback); + This->InetTransport.pCallback = (ITransportCallback *)pCallback; + This->InetTransport.fInitialised = TRUE; + + return S_OK; +} + +static HRESULT WINAPI POP3Transport_MarkItem(IPOP3Transport *iface, POP3MARKTYPE marktype, + DWORD dwPopId, boolean fMarked) +{ + FIXME("(%u, %u, %d)\n", marktype, dwPopId, fMarked); + return E_NOTIMPL; +} + +static HRESULT WINAPI POP3Transport_CommandAUTH(IPOP3Transport *iface, LPSTR pszAuthType) +{ + FIXME("(%s)\n", pszAuthType); + return E_NOTIMPL; +} + +static HRESULT WINAPI POP3Transport_CommandUSER(IPOP3Transport *iface, LPSTR username) +{ + static char user[] = "USER "; + POP3Transport *This = (POP3Transport *)iface; + char *command; + int len; + + TRACE("(%s)\n", username); + + len = sizeof(user) + strlen(username) + 2; /* "\r\n" */ + command = HeapAlloc(GetProcessHeap(), 0, len); + + strcpy(command, user); + strcat(command, username); + strcat(command, "\r\n"); + + This->command = POP3_USER; + InternetTransport_DoCommand(&This->InetTransport, command, POP3Transport_CallbackRecvUSERResp); + + HeapFree(GetProcessHeap(), 0, command); + return S_OK; +} + +static HRESULT WINAPI POP3Transport_CommandPASS(IPOP3Transport *iface, LPSTR password) +{ + static char pass[] = "PASS "; + POP3Transport *This = (POP3Transport *)iface; + char *command; + int len; + + TRACE("(%p)\n", password); + + len = sizeof(pass) + strlen(password) + 2; /* "\r\n" */ + command = HeapAlloc(GetProcessHeap(), 0, len); + + strcpy(command, pass); + strcat(command, password); + strcat(command, "\r\n"); + + This->command = POP3_PASS; + InternetTransport_DoCommand(&This->InetTransport, command, POP3Transport_CallbackRecvPASSResp); + + HeapFree(GetProcessHeap(), 0, command); + return S_OK; +} + +static HRESULT WINAPI POP3Transport_CommandLIST( + IPOP3Transport *iface, POP3CMDTYPE cmdtype, DWORD dwPopId) +{ + static char list[] = "LIST\r\n"; + POP3Transport *This = (POP3Transport *)iface; + + TRACE("(%u, %u)\n", cmdtype, dwPopId); + + This->command = POP3_LIST; + InternetTransport_DoCommand(&This->InetTransport, list, POP3Transport_CallbackRecvLISTResp); + return S_OK; +} + +static HRESULT WINAPI POP3Transport_CommandTOP( + IPOP3Transport *iface, POP3CMDTYPE cmdtype, DWORD dwPopId, DWORD cPreviewLines) +{ + FIXME("(%u, %u, %u)\n", cmdtype, dwPopId, cPreviewLines); + return E_NOTIMPL; +} + +static HRESULT WINAPI POP3Transport_CommandQUIT(IPOP3Transport *iface) +{ + static char command[] = "QUIT\r\n"; + POP3Transport *This = (POP3Transport *)iface; + + TRACE("()\n"); + + This->command = POP3_QUIT; + return InternetTransport_DoCommand(&This->InetTransport, command, POP3Transport_CallbackRecvQUITResp); +} + +static HRESULT WINAPI POP3Transport_CommandSTAT(IPOP3Transport *iface) +{ + static char stat[] = "STAT\r\n"; + POP3Transport *This = (POP3Transport *)iface; + + TRACE("\n"); + + This->command = POP3_STAT; + InternetTransport_DoCommand(&This->InetTransport, stat, POP3Transport_CallbackRecvSTATResp); + return S_OK; +} + +static HRESULT WINAPI POP3Transport_CommandNOOP(IPOP3Transport *iface) +{ + FIXME("()\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI POP3Transport_CommandRSET(IPOP3Transport *iface) +{ + FIXME("()\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI POP3Transport_CommandUIDL( + IPOP3Transport *iface, POP3CMDTYPE cmdtype, DWORD dwPopId) +{ + static char uidl[] = "UIDL\r\n"; + POP3Transport *This = (POP3Transport *)iface; + + TRACE("(%u, %u)\n", cmdtype, dwPopId); + + This->command = POP3_UIDL; + InternetTransport_DoCommand(&This->InetTransport, uidl, POP3Transport_CallbackRecvUIDLResp); + return S_OK; +} + +static HRESULT WINAPI POP3Transport_CommandDELE( + IPOP3Transport *iface, POP3CMDTYPE cmdtype, DWORD dwPopId) +{ + FIXME("(%u, %u)\n", cmdtype, dwPopId); + return E_NOTIMPL; +} + +static HRESULT WINAPI POP3Transport_CommandRETR( + IPOP3Transport *iface, POP3CMDTYPE cmdtype, DWORD dwPopId) +{ + FIXME("(%u, %u)\n", cmdtype, dwPopId); + return E_NOTIMPL; +} + +static const IPOP3TransportVtbl POP3TransportVtbl = +{ + POP3Transport_QueryInterface, + POP3Transport_AddRef, + POP3Transport_Release, + POP3Transport_GetServerInfo, + POP3Transport_GetIXPType, + POP3Transport_IsState, + POP3Transport_InetServerFromAccount, + POP3Transport_Connect, + POP3Transport_HandsOffCallback, + POP3Transport_Disconnect, + POP3Transport_DropConnection, + POP3Transport_GetStatus, + POP3Transport_InitNew, + POP3Transport_MarkItem, + POP3Transport_CommandAUTH, + POP3Transport_CommandUSER, + POP3Transport_CommandPASS, + POP3Transport_CommandLIST, + POP3Transport_CommandTOP, + POP3Transport_CommandQUIT, + POP3Transport_CommandSTAT, + POP3Transport_CommandNOOP, + POP3Transport_CommandRSET, + POP3Transport_CommandUIDL, + POP3Transport_CommandDELE, + POP3Transport_CommandRETR +}; + +HRESULT WINAPI CreatePOP3Transport(IPOP3Transport **ppTransport) +{ + HRESULT hr; + POP3Transport *This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + if (!This) + return E_OUTOFMEMORY; + + This->InetTransport.u.vtblPOP3 = &POP3TransportVtbl; + This->refs = 0; + hr = InternetTransport_Init(&This->InetTransport); + if (FAILED(hr)) + { + HeapFree(GetProcessHeap(), 0, This); + return hr; + } + + *ppTransport = (IPOP3Transport *)&This->InetTransport.u.vtblPOP3; + IPOP3Transport_AddRef(*ppTransport); + + return S_OK; +} + +static HRESULT WINAPI POP3TransportCF_QueryInterface(LPCLASSFACTORY iface, + REFIID riid, LPVOID *ppv) +{ + *ppv = NULL; + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IClassFactory)) + { + *ppv = iface; + IUnknown_AddRef(iface); + return S_OK; + } + return E_NOINTERFACE; +} + +static ULONG WINAPI POP3TransportCF_AddRef(LPCLASSFACTORY iface) +{ + return 2; /* non-heap based object */ +} + +static ULONG WINAPI POP3TransportCF_Release(LPCLASSFACTORY iface) +{ + return 1; /* non-heap based object */ +} + +static HRESULT WINAPI POP3TransportCF_CreateInstance(LPCLASSFACTORY iface, + LPUNKNOWN pUnk, REFIID riid, LPVOID *ppv) +{ + HRESULT hr; + IPOP3Transport *pPop3Transport; + + TRACE("(%p, %s, %p)\n", pUnk, debugstr_guid(riid), ppv); + + *ppv = NULL; + + if (pUnk) + return CLASS_E_NOAGGREGATION; + + hr = CreatePOP3Transport(&pPop3Transport); + if (FAILED(hr)) + return hr; + + hr = IPOP3Transport_QueryInterface(pPop3Transport, riid, ppv); + IPOP3Transport_Release(pPop3Transport); + + return hr; +} + +static HRESULT WINAPI POP3TransportCF_LockServer(LPCLASSFACTORY iface, BOOL fLock) +{ + FIXME("(%d)\n",fLock); + return S_OK; +} + +static const IClassFactoryVtbl POP3TransportCFVtbl = +{ + POP3TransportCF_QueryInterface, + POP3TransportCF_AddRef, + POP3TransportCF_Release, + POP3TransportCF_CreateInstance, + POP3TransportCF_LockServer +}; +static const IClassFactoryVtbl *POP3TransportCF = &POP3TransportCFVtbl; + +HRESULT POP3TransportCF_Create(REFIID riid, LPVOID *ppv) +{ + return IClassFactory_QueryInterface((IClassFactory *)&POP3TransportCF, riid, ppv); +} diff --git a/reactos/dll/win32/inetcomm/regsvr.c b/reactos/dll/win32/inetcomm/regsvr.c index 620cfa78ef4..4c7310cc172 100644 --- a/reactos/dll/win32/inetcomm/regsvr.c +++ b/reactos/dll/win32/inetcomm/regsvr.c @@ -31,8 +31,8 @@ #include "ocidl.h" #include "initguid.h" -#include "inetcomm_private.h" #include "mimeole.h" +#include "inetcomm_private.h" #include "wine/debug.h" @@ -404,6 +404,12 @@ static struct regsvr_coclass const coclass_list[] = { "inetcomm.dll", "Both" }, + { &CLSID_ISMTPTransport2, + "CLSID_ISMTPTransport2", + NULL, + "inetcomm.dll", + "Both" + }, { &CLSID_IPOP3Transport, "CLSID_IPOP3Transport", NULL, @@ -452,6 +458,12 @@ static struct regsvr_coclass const coclass_list[] = { "inetcomm.dll", "Both" }, + { &CLSID_IMimeSecurity, + "CLSID_IMimeSecurity", + NULL, + "inetcomm.dll", + "Both" + }, { NULL } /* list terminator */ }; diff --git a/reactos/dll/win32/inetcomm/smtptransport.c b/reactos/dll/win32/inetcomm/smtptransport.c new file mode 100644 index 00000000000..d704525e1ed --- /dev/null +++ b/reactos/dll/win32/inetcomm/smtptransport.c @@ -0,0 +1,1047 @@ +/* + * SMTP Transport + * + * Copyright 2006 Robert Shearman for CodeWeavers + * Copyright 2008 Hans Leidekker for CodeWeavers + * + * 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 COBJMACROS + +#include +#include + +#include "windef.h" +#include "winbase.h" +#include "winnt.h" +#include "winuser.h" +#include "objbase.h" +#include "mimeole.h" +#include "wine/debug.h" + +#include "inetcomm_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(inetcomm); + +typedef struct +{ + InternetTransport InetTransport; + ULONG refs; + BOOL fESMTP; + SMTPMESSAGE pending_message; + INETADDR *addrlist; + ULONG ulCurrentAddressIndex; +} SMTPTransport; + +static HRESULT SMTPTransport_ParseResponse(SMTPTransport *This, char *pszResponse, SMTPRESPONSE *pResponse) +{ + HRESULT hrServerError; + + TRACE("response: %s\n", debugstr_a(pszResponse)); + + if (!isdigit(*pszResponse)) + return IXP_E_SMTP_RESPONSE_ERROR; + pResponse->pTransport = (ISMTPTransport *)&This->InetTransport.u.vtblSMTP2; + pResponse->rIxpResult.pszResponse = pszResponse; + pResponse->rIxpResult.dwSocketError = 0; + pResponse->rIxpResult.uiServerError = strtol(pszResponse, &pszResponse, 10); + if (*pszResponse == '-') + { + pResponse->fDone = FALSE; + pszResponse++; + } + else + pResponse->fDone = TRUE; + + switch (pResponse->rIxpResult.uiServerError) + { + case 211: hrServerError = IXP_E_SMTP_211_SYSTEM_STATUS; break; + case 214: hrServerError = IXP_E_SMTP_214_HELP_MESSAGE; break; + case 220: hrServerError = IXP_E_SMTP_220_READY; break; + case 221: hrServerError = IXP_E_SMTP_221_CLOSING; break; + case 245: hrServerError = IXP_E_SMTP_245_AUTH_SUCCESS; break; + case 250: hrServerError = IXP_E_SMTP_250_MAIL_ACTION_OKAY; break; + case 251: hrServerError = IXP_E_SMTP_251_FORWARDING_MAIL; break; + case 334: hrServerError = IXP_E_SMTP_334_AUTH_READY_RESPONSE; break; + case 354: hrServerError = IXP_E_SMTP_354_START_MAIL_INPUT; break; + case 421: hrServerError = IXP_E_SMTP_421_NOT_AVAILABLE; break; + case 450: hrServerError = IXP_E_SMTP_450_MAILBOX_BUSY; break; + case 451: hrServerError = IXP_E_SMTP_451_ERROR_PROCESSING; break; + case 452: hrServerError = IXP_E_SMTP_452_NO_SYSTEM_STORAGE; break; + case 454: hrServerError = IXP_E_SMTP_454_STARTTLS_FAILED; break; + case 500: hrServerError = IXP_E_SMTP_500_SYNTAX_ERROR; break; + case 501: hrServerError = IXP_E_SMTP_501_PARAM_SYNTAX; break; + case 502: hrServerError = IXP_E_SMTP_502_COMMAND_NOTIMPL; break; + case 503: hrServerError = IXP_E_SMTP_503_COMMAND_SEQ; break; + case 504: hrServerError = IXP_E_SMTP_504_COMMAND_PARAM_NOTIMPL; break; + case 530: hrServerError = IXP_E_SMTP_530_STARTTLS_REQUIRED; break; + case 550: hrServerError = IXP_E_SMTP_550_MAILBOX_NOT_FOUND; break; + case 551: hrServerError = IXP_E_SMTP_551_USER_NOT_LOCAL; break; + case 552: hrServerError = IXP_E_SMTP_552_STORAGE_OVERFLOW; break; + case 553: hrServerError = IXP_E_SMTP_553_MAILBOX_NAME_SYNTAX; break; + case 554: hrServerError = IXP_E_SMTP_554_TRANSACT_FAILED; break; + default: + hrServerError = IXP_E_SMTP_RESPONSE_ERROR; + break; + } + pResponse->rIxpResult.hrResult = hrServerError; + pResponse->rIxpResult.hrServerError = hrServerError; + + if (This->InetTransport.pCallback && This->InetTransport.fCommandLogging) + { + ITransportCallback_OnCommand(This->InetTransport.pCallback, CMD_RESP, + pResponse->rIxpResult.pszResponse, hrServerError, + (IInternetTransport *)&This->InetTransport.u.vtbl); + } + return S_OK; +} + +static void SMTPTransport_CallbackDoNothing(IInternetTransport *iface, char *pBuffer, int cbBuffer) +{ + TRACE("\n"); +} + +static void SMTPTransport_CallbackReadResponseDoNothing(IInternetTransport *iface, char *pBuffer, int cbBuffer) +{ + SMTPTransport *This = (SMTPTransport *)iface; + + TRACE("\n"); + InternetTransport_ReadLine(&This->InetTransport, SMTPTransport_CallbackDoNothing); +} + +static void SMTPTransport_CallbackProcessDATAResponse(IInternetTransport *iface, char *pBuffer, int cbBuffer) +{ + SMTPTransport *This = (SMTPTransport *)iface; + SMTPRESPONSE response = { 0 }; + HRESULT hr; + + TRACE("\n"); + + hr = SMTPTransport_ParseResponse(This, pBuffer, &response); + if (FAILED(hr)) + { + /* FIXME: handle error */ + return; + } + + response.command = SMTP_DATA; + ISMTPCallback_OnResponse((ISMTPCallback *)This->InetTransport.pCallback, &response); + + if (FAILED(response.rIxpResult.hrServerError)) + { + ERR("server error: %s\n", debugstr_a(pBuffer)); + /* FIXME: handle error */ + return; + } +} + +static void SMTPTransport_CallbackReadDATAResponse(IInternetTransport *iface, char *pBuffer, int cbBuffer) +{ + SMTPTransport *This = (SMTPTransport *)iface; + + TRACE("\n"); + InternetTransport_ReadLine(&This->InetTransport, SMTPTransport_CallbackProcessDATAResponse); +} + +static void SMTPTransport_CallbackProcessMAILResponse(IInternetTransport *iface, char *pBuffer, int cbBuffer) +{ + SMTPTransport *This = (SMTPTransport *)iface; + SMTPRESPONSE response = { 0 }; + HRESULT hr; + + TRACE("\n"); + + hr = SMTPTransport_ParseResponse(This, pBuffer, &response); + if (FAILED(hr)) + { + /* FIXME: handle error */ + return; + } + + response.command = SMTP_MAIL; + ISMTPCallback_OnResponse((ISMTPCallback *)This->InetTransport.pCallback, &response); + + if (FAILED(response.rIxpResult.hrServerError)) + { + ERR("server error: %s\n", debugstr_a(pBuffer)); + /* FIXME: handle error */ + return; + } +} + +static void SMTPTransport_CallbackReadMAILResponse(IInternetTransport *iface, char *pBuffer, int cbBuffer) +{ + SMTPTransport *This = (SMTPTransport *)iface; + + TRACE("\n"); + InternetTransport_ReadLine(&This->InetTransport, SMTPTransport_CallbackProcessMAILResponse); +} + +static void SMTPTransport_CallbackProcessRCPTResponse(IInternetTransport *iface, char *pBuffer, int cbBuffer) +{ + SMTPTransport *This = (SMTPTransport *)iface; + SMTPRESPONSE response = { 0 }; + HRESULT hr; + + TRACE("\n"); + + HeapFree(GetProcessHeap(), 0, This->addrlist); + This->addrlist = NULL; + + hr = SMTPTransport_ParseResponse(This, pBuffer, &response); + if (FAILED(hr)) + { + /* FIXME: handle error */ + return; + } + + response.command = SMTP_RCPT; + ISMTPCallback_OnResponse((ISMTPCallback *)This->InetTransport.pCallback, &response); + + if (FAILED(response.rIxpResult.hrServerError)) + { + ERR("server error: %s\n", debugstr_a(pBuffer)); + /* FIXME: handle error */ + return; + } +} + +static void SMTPTransport_CallbackReadRCPTResponse(IInternetTransport *iface, char *pBuffer, int cbBuffer) +{ + SMTPTransport *This = (SMTPTransport *)iface; + + TRACE("\n"); + InternetTransport_ReadLine(&This->InetTransport, SMTPTransport_CallbackProcessRCPTResponse); +} + +static void SMTPTransport_CallbackProcessHelloResp(IInternetTransport *iface, char *pBuffer, int cbBuffer) +{ + SMTPTransport *This = (SMTPTransport *)iface; + SMTPRESPONSE response = { 0 }; + HRESULT hr; + + TRACE("\n"); + + hr = SMTPTransport_ParseResponse(This, pBuffer, &response); + if (FAILED(hr)) + { + /* FIXME: handle error */ + return; + } + + response.command = This->fESMTP ? SMTP_EHLO : SMTP_HELO; + ISMTPCallback_OnResponse((ISMTPCallback *)This->InetTransport.pCallback, &response); + + if (FAILED(response.rIxpResult.hrServerError)) + { + ERR("server error: %s\n", debugstr_a(pBuffer)); + /* FIXME: handle error */ + return; + } + + if (!response.fDone) + { + InternetTransport_ReadLine(&This->InetTransport, + SMTPTransport_CallbackProcessHelloResp); + return; + } + + /* FIXME: try to authorize */ + + /* always changed to this status, even if authorization not support on server */ + InternetTransport_ChangeStatus(&This->InetTransport, IXP_AUTHORIZED); + InternetTransport_ChangeStatus(&This->InetTransport, IXP_CONNECTED); + + memset(&response, 0, sizeof(response)); + response.command = SMTP_CONNECTED; + response.fDone = TRUE; + ISMTPCallback_OnResponse((ISMTPCallback *)This->InetTransport.pCallback, &response); +} + +static void SMTPTransport_CallbackRecvHelloResp(IInternetTransport *iface, char *pBuffer, int cbBuffer) +{ + SMTPTransport *This = (SMTPTransport *)iface; + + TRACE("\n"); + InternetTransport_ReadLine(&This->InetTransport, SMTPTransport_CallbackProcessHelloResp); +} + +static void SMTPTransport_CallbackSendHello(IInternetTransport *iface, char *pBuffer, int cbBuffer) +{ + SMTPTransport *This = (SMTPTransport *)iface; + SMTPRESPONSE response = { 0 }; + HRESULT hr; + const char *pszHello; + char *pszCommand; + const char szHostName[] = "localhost"; /* FIXME */ + + TRACE("\n"); + + hr = SMTPTransport_ParseResponse(This, pBuffer, &response); + if (FAILED(hr)) + { + /* FIXME: handle error */ + return; + } + + response.command = SMTP_BANNER; + ISMTPCallback_OnResponse((ISMTPCallback *)This->InetTransport.pCallback, &response); + + if (FAILED(response.rIxpResult.hrServerError)) + { + ERR("server error: %s\n", debugstr_a(pBuffer)); + /* FIXME: handle error */ + return; + } + + TRACE("(%s)\n", pBuffer); + + This->fESMTP = strstr(response.rIxpResult.pszResponse, "ESMTP") && + This->InetTransport.ServerInfo.dwFlags & (ISF_SSLONSAMEPORT|ISF_QUERYDSNSUPPORT|ISF_QUERYAUTHSUPPORT); + + if (This->fESMTP) + pszHello = "EHLO "; + else + pszHello = "HELO "; + + pszCommand = HeapAlloc(GetProcessHeap(), 0, strlen(pszHello) + strlen(szHostName) + 2); + strcpy(pszCommand, pszHello); + strcat(pszCommand, szHostName); + pszCommand[strlen(pszCommand)+1] = '\0'; + pszCommand[strlen(pszCommand)] = '\n'; + + InternetTransport_DoCommand(&This->InetTransport, pszCommand, + SMTPTransport_CallbackRecvHelloResp); + + HeapFree(GetProcessHeap(), 0, pszCommand); +} + +static void SMTPTransport_CallbackDisconnect(IInternetTransport *iface, char *pBuffer, int cbBuffer) +{ + SMTPTransport *This = (SMTPTransport *)iface; + SMTPRESPONSE response; + HRESULT hr; + + TRACE("\n"); + + if (pBuffer) + { + hr = SMTPTransport_ParseResponse(This, pBuffer, &response); + if (FAILED(hr)) + { + /* FIXME: handle error */ + return; + } + + if (FAILED(response.rIxpResult.hrServerError)) + { + ERR("server error: %s\n", debugstr_a(pBuffer)); + /* FIXME: handle error */ + return; + } + } + InternetTransport_DropConnection(&This->InetTransport); +} + +static void SMTPTransport_CallbackMessageProcessResponse(IInternetTransport *iface, char *pBuffer, int cbBuffer) +{ + SMTPTransport *This = (SMTPTransport *)iface; + SMTPRESPONSE response = { 0 }; + HRESULT hr; + + TRACE("\n"); + + hr = SMTPTransport_ParseResponse(This, pBuffer, &response); + if (FAILED(hr)) + { + /* FIXME: handle error */ + return; + } + + if (FAILED(response.rIxpResult.hrServerError)) + { + ERR("server error: %s\n", debugstr_a(pBuffer)); + /* FIXME: handle error */ + return; + } + + response.command = SMTP_SEND_MESSAGE; + response.rIxpResult.hrResult = S_OK; + ISMTPCallback_OnResponse((ISMTPCallback *)This->InetTransport.pCallback, &response); +} + +static void SMTPTransport_CallbackMessageReadResponse(IInternetTransport *iface, char *pBuffer, int cbBuffer) +{ + SMTPTransport *This = (SMTPTransport *)iface; + InternetTransport_ReadLine(&This->InetTransport, SMTPTransport_CallbackMessageProcessResponse); +} + +static void SMTPTransport_CallbackMessageSendDOT(IInternetTransport *iface, char *pBuffer, int cbBuffer) +{ + SMTPTransport *This = (SMTPTransport *)iface; + + IStream_Release(This->pending_message.pstmMsg); + InternetTransport_DoCommand(&This->InetTransport, "\n.\n", + SMTPTransport_CallbackMessageReadResponse); +} + +static void SMTPTransport_CallbackMessageSendDataStream(IInternetTransport *iface, char *pBuffer, int cbBuffer) +{ + SMTPTransport *This = (SMTPTransport *)iface; + SMTPRESPONSE response; + HRESULT hr; + char *pszBuffer; + ULONG cbSize; + + TRACE("\n"); + + hr = SMTPTransport_ParseResponse(This, pBuffer, &response); + if (FAILED(hr)) + { + /* FIXME: handle error */ + return; + } + + if (FAILED(response.rIxpResult.hrServerError)) + { + ERR("server error: %s\n", debugstr_a(pBuffer)); + /* FIXME: handle error */ + return; + } + + pszBuffer = HeapAlloc(GetProcessHeap(), 0, This->pending_message.cbSize); + hr = IStream_Read(This->pending_message.pstmMsg, pszBuffer, This->pending_message.cbSize, NULL); + if (FAILED(hr)) + { + /* FIXME: handle error */ + return; + } + cbSize = This->pending_message.cbSize; + + /* FIXME: map "\n.\n" to "\n..\n", reallocate memory, update cbSize */ + + /* FIXME: properly stream the message rather than writing it all at once */ + + hr = InternetTransport_Write(&This->InetTransport, pszBuffer, cbSize, + SMTPTransport_CallbackMessageSendDOT); + + HeapFree(GetProcessHeap(), 0, pszBuffer); +} + +static void SMTPTransport_CallbackMessageReadDataResponse(IInternetTransport *iface, char *pBuffer, int cbBuffer) +{ + SMTPTransport *This = (SMTPTransport *)iface; + + TRACE("\n"); + InternetTransport_ReadLine(&This->InetTransport, SMTPTransport_CallbackMessageSendDataStream); +} + +static void SMTPTransport_CallbackMessageSendTo(IInternetTransport *iface, char *pBuffer, int cbBuffer); + +static void SMTPTransport_CallbackMessageReadToResponse(IInternetTransport *iface, char *pBuffer, int cbBuffer) +{ + SMTPTransport *This = (SMTPTransport *)iface; + + TRACE("\n"); + InternetTransport_ReadLine(&This->InetTransport, SMTPTransport_CallbackMessageSendTo); +} + +static void SMTPTransport_CallbackMessageSendTo(IInternetTransport *iface, char *pBuffer, int cbBuffer) +{ + SMTPTransport *This = (SMTPTransport *)iface; + SMTPRESPONSE response; + HRESULT hr; + + TRACE("\n"); + + hr = SMTPTransport_ParseResponse(This, pBuffer, &response); + if (FAILED(hr)) + { + /* FIXME: handle error */ + return; + } + + if (FAILED(response.rIxpResult.hrServerError)) + { + ERR("server error: %s\n", debugstr_a(pBuffer)); + /* FIXME: handle error */ + return; + } + + for (; This->ulCurrentAddressIndex < This->pending_message.rAddressList.cAddress; This->ulCurrentAddressIndex++) + { + TRACE("address[%d]: %s\n", This->ulCurrentAddressIndex, + This->pending_message.rAddressList.prgAddress[This->ulCurrentAddressIndex].szEmail); + + if ((This->pending_message.rAddressList.prgAddress[This->ulCurrentAddressIndex].addrtype & ADDR_TOFROM_MASK) == ADDR_TO) + { + const char szCommandFormat[] = "RCPT TO: <%s>\n"; + char *szCommand; + int len = sizeof(szCommandFormat) - 2 /* "%s" */ + + strlen(This->pending_message.rAddressList.prgAddress[This->ulCurrentAddressIndex].szEmail); + + szCommand = HeapAlloc(GetProcessHeap(), 0, len); + if (!szCommand) + return; + + sprintf(szCommand, szCommandFormat, + This->pending_message.rAddressList.prgAddress[This->ulCurrentAddressIndex].szEmail); + + This->ulCurrentAddressIndex++; + hr = InternetTransport_DoCommand(&This->InetTransport, szCommand, + SMTPTransport_CallbackMessageReadToResponse); + + HeapFree(GetProcessHeap(), 0, szCommand); + return; + } + } + + hr = InternetTransport_DoCommand(&This->InetTransport, "DATA\n", + SMTPTransport_CallbackMessageReadDataResponse); +} + +static void SMTPTransport_CallbackMessageReadFromResponse(IInternetTransport *iface, char *pBuffer, int cbBuffer) +{ + SMTPTransport *This = (SMTPTransport *)iface; + + TRACE("\n"); + InternetTransport_ReadLine(&This->InetTransport, SMTPTransport_CallbackMessageSendTo); +} + +static HRESULT WINAPI SMTPTransport_QueryInterface(ISMTPTransport2 *iface, REFIID riid, void **ppv) +{ + TRACE("(%s, %p)\n", debugstr_guid(riid), ppv); + + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IInternetTransport) || + IsEqualIID(riid, &IID_ISMTPTransport) || + IsEqualIID(riid, &IID_ISMTPTransport2)) + { + *ppv = iface; + IUnknown_AddRef(iface); + return S_OK; + } + *ppv = NULL; + FIXME("no interface for %s\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI SMTPTransport_AddRef(ISMTPTransport2 *iface) +{ + SMTPTransport *This = (SMTPTransport *)iface; + return InterlockedIncrement((LONG *)&This->refs); +} + +static ULONG WINAPI SMTPTransport_Release(ISMTPTransport2 *iface) +{ + SMTPTransport *This = (SMTPTransport *)iface; + ULONG refs = InterlockedDecrement((LONG *)&This->refs); + if (!refs) + { + TRACE("destroying %p\n", This); + if (This->InetTransport.Status != IXP_DISCONNECTED) + InternetTransport_DropConnection(&This->InetTransport); + + if (This->InetTransport.pCallback) ITransportCallback_Release(This->InetTransport.pCallback); + HeapFree(GetProcessHeap(), 0, This->addrlist); + HeapFree(GetProcessHeap(), 0, This); + } + return refs; +} + +static HRESULT WINAPI SMTPTransport_GetServerInfo(ISMTPTransport2 *iface, + LPINETSERVER pInetServer) +{ + SMTPTransport *This = (SMTPTransport *)iface; + + TRACE("(%p)\n", pInetServer); + return InternetTransport_GetServerInfo(&This->InetTransport, pInetServer); +} + +static IXPTYPE WINAPI SMTPTransport_GetIXPType(ISMTPTransport2 *iface) +{ + TRACE("()\n"); + return IXP_SMTP; +} + +static HRESULT WINAPI SMTPTransport_IsState(ISMTPTransport2 *iface, + IXPISSTATE isstate) +{ + FIXME("(%d): stub\n", isstate); + return E_NOTIMPL; +} + +static HRESULT WINAPI SMTPTransport_InetServerFromAccount( + ISMTPTransport2 *iface, IImnAccount *pAccount, LPINETSERVER pInetServer) +{ + SMTPTransport *This = (SMTPTransport *)iface; + + TRACE("(%p, %p)\n", pAccount, pInetServer); + return InternetTransport_InetServerFromAccount(&This->InetTransport, pAccount, pInetServer); +} + +static HRESULT WINAPI SMTPTransport_Connect(ISMTPTransport2 *iface, + LPINETSERVER pInetServer, boolean fAuthenticate, boolean fCommandLogging) +{ + SMTPTransport *This = (SMTPTransport *)iface; + HRESULT hr; + + TRACE("(%p, %s, %s)\n", pInetServer, fAuthenticate ? "TRUE" : "FALSE", fCommandLogging ? "TRUE" : "FALSE"); + + hr = InternetTransport_Connect(&This->InetTransport, pInetServer, fAuthenticate, fCommandLogging); + if (FAILED(hr)) + return hr; + + /* this starts the state machine, which continues in SMTPTransport_CallbackSendHELO */ + return InternetTransport_ReadLine(&This->InetTransport, SMTPTransport_CallbackSendHello); +} + +static HRESULT WINAPI SMTPTransport_HandsOffCallback(ISMTPTransport2 *iface) +{ + SMTPTransport *This = (SMTPTransport *)iface; + + TRACE("()\n"); + return InternetTransport_HandsOffCallback(&This->InetTransport); +} + +static HRESULT WINAPI SMTPTransport_Disconnect(ISMTPTransport2 *iface) +{ + TRACE("()\n"); + return ISMTPTransport2_CommandQUIT(iface); +} + +static HRESULT WINAPI SMTPTransport_DropConnection(ISMTPTransport2 *iface) +{ + SMTPTransport *This = (SMTPTransport *)iface; + + TRACE("()\n"); + return InternetTransport_DropConnection(&This->InetTransport); +} + +static HRESULT WINAPI SMTPTransport_GetStatus(ISMTPTransport2 *iface, + IXPSTATUS *pCurrentStatus) +{ + SMTPTransport *This = (SMTPTransport *)iface; + + TRACE("()\n"); + return InternetTransport_GetStatus(&This->InetTransport, pCurrentStatus); +} + +static HRESULT WINAPI SMTPTransport_InitNew(ISMTPTransport2 *iface, + LPSTR pszLogFilePath, ISMTPCallback *pCallback) +{ + SMTPTransport *This = (SMTPTransport *)iface; + + TRACE("(%s, %p)\n", debugstr_a(pszLogFilePath), pCallback); + + if (!pCallback) + return E_INVALIDARG; + + if (pszLogFilePath) + FIXME("not using log file of %s, use Wine debug logging instead\n", + debugstr_a(pszLogFilePath)); + + ISMTPCallback_AddRef(pCallback); + This->InetTransport.pCallback = (ITransportCallback *)pCallback; + This->InetTransport.fInitialised = TRUE; + + return S_OK; +} + +static HRESULT WINAPI SMTPTransport_SendMessage(ISMTPTransport2 *iface, + LPSMTPMESSAGE pMessage) +{ + SMTPTransport *This = (SMTPTransport *)iface; + ULONG i, size; + LPSTR pszFromAddress = NULL; + const char szCommandFormat[] = "MAIL FROM: <%s>\n"; + char *szCommand; + int len; + HRESULT hr; + + TRACE("(%p)\n", pMessage); + + This->pending_message = *pMessage; + IStream_AddRef(pMessage->pstmMsg); + + size = pMessage->rAddressList.cAddress * sizeof(INETADDR); + This->addrlist = HeapAlloc(GetProcessHeap(), 0, size); + if (!This->addrlist) + return E_OUTOFMEMORY; + + memcpy(This->addrlist, pMessage->rAddressList.prgAddress, size); + This->pending_message.rAddressList.prgAddress = This->addrlist; + This->ulCurrentAddressIndex = 0; + + for (i = 0; i < pMessage->rAddressList.cAddress; i++) + { + if ((pMessage->rAddressList.prgAddress[i].addrtype & ADDR_TOFROM_MASK) == ADDR_FROM) + { + TRACE("address[%d]: ADDR_FROM, %s\n", i, + pMessage->rAddressList.prgAddress[i].szEmail); + pszFromAddress = pMessage->rAddressList.prgAddress[i].szEmail; + } + else if ((pMessage->rAddressList.prgAddress[i].addrtype & ADDR_TOFROM_MASK) == ADDR_TO) + { + TRACE("address[%d]: ADDR_TO, %s\n", i, + pMessage->rAddressList.prgAddress[i].szEmail); + } + } + + if (!pszFromAddress) + { + SMTPRESPONSE response; + memset(&response, 0, sizeof(response)); + response.command = SMTP_SEND_MESSAGE; + response.fDone = TRUE; + response.pTransport = (ISMTPTransport *)&This->InetTransport.u.vtblSMTP2; + response.rIxpResult.hrResult = IXP_E_SMTP_NO_SENDER; + ISMTPCallback_OnResponse((ISMTPCallback *)This->InetTransport.pCallback, &response); + return S_OK; + } + len = sizeof(szCommandFormat) - 2 /* "%s" */ + strlen(pszFromAddress); + + szCommand = HeapAlloc(GetProcessHeap(), 0, len); + if (!szCommand) + return E_OUTOFMEMORY; + + sprintf(szCommand, szCommandFormat, pszFromAddress); + + hr = InternetTransport_DoCommand(&This->InetTransport, szCommand, + SMTPTransport_CallbackMessageReadFromResponse); + + return hr; +} + +static HRESULT WINAPI SMTPTransport_CommandMAIL(ISMTPTransport2 *iface, LPSTR pszEmailFrom) +{ + SMTPTransport *This = (SMTPTransport *)iface; + const char szCommandFormat[] = "MAIL FROM: <%s>\n"; + char *szCommand; + int len = sizeof(szCommandFormat) - 2 /* "%s" */ + strlen(pszEmailFrom); + HRESULT hr; + + TRACE("(%s)\n", pszEmailFrom); + + if (!pszEmailFrom) + return E_INVALIDARG; + + szCommand = HeapAlloc(GetProcessHeap(), 0, len); + if (!szCommand) + return E_OUTOFMEMORY; + + sprintf(szCommand, szCommandFormat, pszEmailFrom); + + hr = InternetTransport_DoCommand(&This->InetTransport, szCommand, + SMTPTransport_CallbackReadMAILResponse); + + HeapFree(GetProcessHeap(), 0, szCommand); + return hr; +} + +static HRESULT WINAPI SMTPTransport_CommandRCPT(ISMTPTransport2 *iface, LPSTR pszEmailTo) +{ + SMTPTransport *This = (SMTPTransport *)iface; + const char szCommandFormat[] = "RCPT TO: <%s>\n"; + char *szCommand; + int len = sizeof(szCommandFormat) - 2 /* "%s" */ + strlen(pszEmailTo); + HRESULT hr; + + TRACE("(%s)\n", pszEmailTo); + + if (!pszEmailTo) + return E_INVALIDARG; + + szCommand = HeapAlloc(GetProcessHeap(), 0, len); + if (!szCommand) + return E_OUTOFMEMORY; + + sprintf(szCommand, szCommandFormat, pszEmailTo); + + hr = InternetTransport_DoCommand(&This->InetTransport, szCommand, + SMTPTransport_CallbackReadRCPTResponse); + + HeapFree(GetProcessHeap(), 0, szCommand); + return hr; +} + +static HRESULT WINAPI SMTPTransport_CommandEHLO(ISMTPTransport2 *iface) +{ + SMTPTransport *This = (SMTPTransport *)iface; + const char szCommandFormat[] = "EHLO %s\n"; + const char szHostname[] = "localhost"; /* FIXME */ + char *szCommand; + int len = sizeof(szCommandFormat) - 2 /* "%s" */ + sizeof(szHostname); + HRESULT hr; + + TRACE("\n"); + + szCommand = HeapAlloc(GetProcessHeap(), 0, len); + if (!szCommand) + return E_OUTOFMEMORY; + + sprintf(szCommand, szCommandFormat, szHostname); + + hr = InternetTransport_DoCommand(&This->InetTransport, szCommand, + SMTPTransport_CallbackReadResponseDoNothing); + + HeapFree(GetProcessHeap(), 0, szCommand); + return hr; +} + +static HRESULT WINAPI SMTPTransport_CommandHELO(ISMTPTransport2 *iface) +{ + SMTPTransport *This = (SMTPTransport *)iface; + const char szCommandFormat[] = "HELO %s\n"; + const char szHostname[] = "localhost"; /* FIXME */ + char *szCommand; + int len = sizeof(szCommandFormat) - 2 /* "%s" */ + sizeof(szHostname); + HRESULT hr; + + TRACE("()\n"); + + szCommand = HeapAlloc(GetProcessHeap(), 0, len); + if (!szCommand) + return E_OUTOFMEMORY; + + sprintf(szCommand, szCommandFormat, szHostname); + + hr = InternetTransport_DoCommand(&This->InetTransport, szCommand, + SMTPTransport_CallbackReadResponseDoNothing); + + HeapFree(GetProcessHeap(), 0, szCommand); + return hr; +} + +static HRESULT WINAPI SMTPTransport_CommandAUTH(ISMTPTransport2 *iface, + LPSTR pszAuthType) +{ + SMTPTransport *This = (SMTPTransport *)iface; + const char szCommandFormat[] = "AUTH %s\n"; + char *szCommand; + int len = sizeof(szCommandFormat) - 2 /* "%s" */ + strlen(pszAuthType); + HRESULT hr; + + TRACE("(%s)\n", pszAuthType); + + if (!pszAuthType) + return E_INVALIDARG; + + szCommand = HeapAlloc(GetProcessHeap(), 0, len); + if (!szCommand) + return E_OUTOFMEMORY; + + sprintf(szCommand, szCommandFormat, pszAuthType); + + hr = InternetTransport_DoCommand(&This->InetTransport, szCommand, + SMTPTransport_CallbackReadResponseDoNothing); + + HeapFree(GetProcessHeap(), 0, szCommand); + return hr; +} + +static HRESULT WINAPI SMTPTransport_CommandQUIT(ISMTPTransport2 *iface) +{ + SMTPTransport *This = (SMTPTransport *)iface; + + TRACE("()\n"); + + InternetTransport_ChangeStatus(&This->InetTransport, IXP_DISCONNECTING); + return InternetTransport_DoCommand(&This->InetTransport, "QUIT\n", + SMTPTransport_CallbackDisconnect); +} + +static HRESULT WINAPI SMTPTransport_CommandRSET(ISMTPTransport2 *iface) +{ + SMTPTransport *This = (SMTPTransport *)iface; + + TRACE("()\n"); + + return InternetTransport_DoCommand(&This->InetTransport, "RSET\n", + SMTPTransport_CallbackReadResponseDoNothing); +} + +static HRESULT WINAPI SMTPTransport_CommandDATA(ISMTPTransport2 *iface) +{ + SMTPTransport *This = (SMTPTransport *)iface; + + TRACE("()\n"); + + return InternetTransport_DoCommand(&This->InetTransport, "DATA\n", + SMTPTransport_CallbackReadDATAResponse); +} + +static HRESULT WINAPI SMTPTransport_CommandDOT(ISMTPTransport2 *iface) +{ + FIXME("()\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI SMTPTransport_SendDataStream(ISMTPTransport2 *iface, + IStream *pStream, ULONG cbSize) +{ + FIXME("(%p, %d)\n", pStream, cbSize); + return E_NOTIMPL; +} + +static HRESULT WINAPI SMTPTransport_SetWindow(ISMTPTransport2 *iface) +{ + FIXME("()\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI SMTPTransport_ResetWindow(ISMTPTransport2 *iface) +{ + FIXME("()\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI SMTPTransport_SendMessage2(ISMTPTransport2 *iface, LPSMTPMESSAGE2 pMessage) +{ + FIXME("(%p)\n", pMessage); + return E_NOTIMPL; +} + +static HRESULT WINAPI SMTPTransport_CommandRCPT2(ISMTPTransport2 *iface, LPSTR pszEmailTo, + INETADDRTYPE atDSN) +{ + FIXME("(%s, %u)\n", pszEmailTo, atDSN); + return E_NOTIMPL; +} + +static const ISMTPTransport2Vtbl SMTPTransport2Vtbl = +{ + SMTPTransport_QueryInterface, + SMTPTransport_AddRef, + SMTPTransport_Release, + SMTPTransport_GetServerInfo, + SMTPTransport_GetIXPType, + SMTPTransport_IsState, + SMTPTransport_InetServerFromAccount, + SMTPTransport_Connect, + SMTPTransport_HandsOffCallback, + SMTPTransport_Disconnect, + SMTPTransport_DropConnection, + SMTPTransport_GetStatus, + SMTPTransport_InitNew, + SMTPTransport_SendMessage, + SMTPTransport_CommandMAIL, + SMTPTransport_CommandRCPT, + SMTPTransport_CommandEHLO, + SMTPTransport_CommandHELO, + SMTPTransport_CommandAUTH, + SMTPTransport_CommandQUIT, + SMTPTransport_CommandRSET, + SMTPTransport_CommandDATA, + SMTPTransport_CommandDOT, + SMTPTransport_SendDataStream, + SMTPTransport_SetWindow, + SMTPTransport_ResetWindow, + SMTPTransport_SendMessage2, + SMTPTransport_CommandRCPT2 +}; + +HRESULT WINAPI CreateSMTPTransport(ISMTPTransport **ppTransport) +{ + HRESULT hr; + SMTPTransport *This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + if (!This) + return E_OUTOFMEMORY; + + This->InetTransport.u.vtblSMTP2 = &SMTPTransport2Vtbl; + This->refs = 0; + This->fESMTP = FALSE; + hr = InternetTransport_Init(&This->InetTransport); + if (FAILED(hr)) + { + HeapFree(GetProcessHeap(), 0, This); + return hr; + } + + *ppTransport = (ISMTPTransport *)&This->InetTransport.u.vtblSMTP2; + ISMTPTransport_AddRef(*ppTransport); + + return S_OK; +} + + +static HRESULT WINAPI SMTPTransportCF_QueryInterface(LPCLASSFACTORY iface, + REFIID riid, LPVOID *ppv) +{ + *ppv = NULL; + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IClassFactory)) + { + *ppv = iface; + IUnknown_AddRef(iface); + return S_OK; + } + return E_NOINTERFACE; +} + +static ULONG WINAPI SMTPTransportCF_AddRef(LPCLASSFACTORY iface) +{ + return 2; /* non-heap based object */ +} + +static ULONG WINAPI SMTPTransportCF_Release(LPCLASSFACTORY iface) +{ + return 1; /* non-heap based object */ +} + +static HRESULT WINAPI SMTPTransportCF_CreateInstance(LPCLASSFACTORY iface, + LPUNKNOWN pUnk, REFIID riid, LPVOID *ppv) +{ + HRESULT hr; + ISMTPTransport *pSmtpTransport; + + TRACE("(%p, %s, %p)\n", pUnk, debugstr_guid(riid), ppv); + + *ppv = NULL; + + if (pUnk) + return CLASS_E_NOAGGREGATION; + + hr = CreateSMTPTransport(&pSmtpTransport); + if (FAILED(hr)) + return hr; + + hr = ISMTPTransport_QueryInterface(pSmtpTransport, riid, ppv); + ISMTPTransport_Release(pSmtpTransport); + + return hr; +} + +static HRESULT WINAPI SMTPTransportCF_LockServer(LPCLASSFACTORY iface, BOOL fLock) +{ + FIXME("(%d)\n",fLock); + return S_OK; +} + +static const IClassFactoryVtbl SMTPTransportCFVtbl = +{ + SMTPTransportCF_QueryInterface, + SMTPTransportCF_AddRef, + SMTPTransportCF_Release, + SMTPTransportCF_CreateInstance, + SMTPTransportCF_LockServer +}; +static const IClassFactoryVtbl *SMTPTransportCF = &SMTPTransportCFVtbl; + +HRESULT SMTPTransportCF_Create(REFIID riid, LPVOID *ppv) +{ + return IClassFactory_QueryInterface((IClassFactory *)&SMTPTransportCF, riid, ppv); +} diff --git a/reactos/dll/win32/inetmib1/inetmib1.rbuild b/reactos/dll/win32/inetmib1/inetmib1.rbuild index becb511a21a..3176d30bc73 100644 --- a/reactos/dll/win32/inetmib1/inetmib1.rbuild +++ b/reactos/dll/win32/inetmib1/inetmib1.rbuild @@ -7,7 +7,6 @@ include/reactos/wine main.c - inetmib1.spec wine snmpapi kernel32 diff --git a/reactos/dll/win32/iphlpapi/iphlpapi.rbuild b/reactos/dll/win32/iphlpapi/iphlpapi.rbuild index 5acca9019ed..94b3d3126f8 100644 --- a/reactos/dll/win32/iphlpapi/iphlpapi.rbuild +++ b/reactos/dll/win32/iphlpapi/iphlpapi.rbuild @@ -17,5 +17,4 @@ resinfo_reactos.c route_reactos.c iphlpapi.rc - iphlpapi.spec diff --git a/reactos/dll/win32/iphlpapi/iphlpapi_main.c b/reactos/dll/win32/iphlpapi/iphlpapi_main.c index 49ca1740bc7..2fecb303c34 100644 --- a/reactos/dll/win32/iphlpapi/iphlpapi_main.c +++ b/reactos/dll/win32/iphlpapi/iphlpapi_main.c @@ -1388,8 +1388,32 @@ DWORD WINAPI GetNetworkParams(PFIXED_INFO pFixedInfo, PULONG pOutBufLen) CopyMemory(&pFixedInfo->DnsServerList, resInfo->DnsList, sizeof(IP_ADDR_STRING)); if (resInfo->riCount > 1) { - pFixedInfo->DnsServerList.Next = (struct _IP_ADDR_STRING*)((char*)pFixedInfo + sizeof(FIXED_INFO)); - CopyMemory(pFixedInfo->DnsServerList.Next, resInfo->DnsList->Next, sizeof(IP_ADDR_STRING) * (resInfo->riCount-1)); + IP_ADDR_STRING *pSrc = resInfo->DnsList->Next; + IP_ADDR_STRING *pTarget = (struct _IP_ADDR_STRING*)((char*)pFixedInfo + sizeof(FIXED_INFO)); + + pFixedInfo->DnsServerList.Next = pTarget; + + do + { + CopyMemory(pTarget, pSrc, sizeof(IP_ADDR_STRING)); + resInfo->riCount--; + if (resInfo->riCount > 1) + { + pTarget->Next = (IP_ADDR_STRING*)((char*)pTarget + sizeof(IP_ADDR_STRING)); + pTarget = pTarget->Next; + pSrc = pSrc->Next; + } + else + { + pTarget->Next = NULL; + break; + } + } + while(TRUE); + } + else + { + pFixedInfo->DnsServerList.Next = NULL; } } diff --git a/reactos/dll/win32/iphlpapi/resinfo.h b/reactos/dll/win32/iphlpapi/resinfo.h index 789026803c1..863f6acc89a 100644 --- a/reactos/dll/win32/iphlpapi/resinfo.h +++ b/reactos/dll/win32/iphlpapi/resinfo.h @@ -24,7 +24,6 @@ typedef struct _IPHLP_RES_INFO { DWORD riCount; IP_ADDR_STRING * DnsList; - struct sockaddr_in *riAddressList; } IPHLP_RES_INFO, *PIPHLP_RES_INFO; /* Get resolver info. This currently is limited to a list of IP addresses diff --git a/reactos/dll/win32/iphlpapi/resinfo_reactos.c b/reactos/dll/win32/iphlpapi/resinfo_reactos.c index 5a8a2313a22..3a540dcc664 100644 --- a/reactos/dll/win32/iphlpapi/resinfo_reactos.c +++ b/reactos/dll/win32/iphlpapi/resinfo_reactos.c @@ -244,6 +244,6 @@ PIPHLP_RES_INFO getResInfo() { VOID disposeResInfo( PIPHLP_RES_INFO InfoPtr ) { - RtlFreeHeap( GetProcessHeap(), 0, InfoPtr ); HeapFree(GetProcessHeap(), 0, InfoPtr->DnsList); + RtlFreeHeap( GetProcessHeap(), 0, InfoPtr ); } diff --git a/reactos/dll/win32/jscript/jscript.rbuild b/reactos/dll/win32/jscript/jscript.rbuild index 220b2fd516a..880339d31fa 100644 --- a/reactos/dll/win32/jscript/jscript.rbuild +++ b/reactos/dll/win32/jscript/jscript.rbuild @@ -27,7 +27,6 @@ function.c global.c rsrc.rc - jscript.spec stdole2 diff --git a/reactos/dll/win32/kernel32/include/kernel32.h b/reactos/dll/win32/kernel32/include/kernel32.h index d2ca65a40bb..87fdcbc8b53 100755 --- a/reactos/dll/win32/kernel32/include/kernel32.h +++ b/reactos/dll/win32/kernel32/include/kernel32.h @@ -38,6 +38,15 @@ #define SetLastErrorByStatus(__S__) \ ((void)SetLastError(RtlNtStatusToDosError(__S__))) +typedef struct _CODEPAGE_ENTRY +{ + LIST_ENTRY Entry; + UINT CodePage; + HANDLE SectionHandle; + PBYTE SectionMapping; + CPTABLEINFO CodePageTable; +} CODEPAGE_ENTRY, *PCODEPAGE_ENTRY; + typedef DWORD (*WaitForInputIdleType)( @@ -171,5 +180,8 @@ BasepMapFile(IN LPCWSTR lpApplicationName, OUT PHANDLE hSection, IN PUNICODE_STRING ApplicationName); +PCODEPAGE_ENTRY FASTCALL +IntGetCodePageEntry(UINT CodePage); + #endif /* ndef _KERNEL32_INCLUDE_KERNEL32_H */ diff --git a/reactos/dll/win32/kernel32/kernel32.rbuild b/reactos/dll/win32/kernel32/kernel32.rbuild index 870eca5d9b8..5ac5d5e95c1 100644 --- a/reactos/dll/win32/kernel32/kernel32.rbuild +++ b/reactos/dll/win32/kernel32/kernel32.rbuild @@ -57,6 +57,7 @@ actctx.c atom.c chartype.c + casemap.c comm.c computername.c console.c @@ -64,6 +65,7 @@ env.c error.c errormsg.c + fold.c handle.c lang.c ldr.c @@ -146,6 +148,5 @@ kernel32.rc ntdll - kernel32.spec diff --git a/reactos/dll/win32/kernel32/mem/heap.c b/reactos/dll/win32/kernel32/mem/heap.c index 0ab63f255bf..9dc2948fb81 100644 --- a/reactos/dll/win32/kernel32/mem/heap.c +++ b/reactos/dll/win32/kernel32/mem/heap.c @@ -251,16 +251,24 @@ HeapUsage(HANDLE hHeap, } /* - * @unimplemented + * @implemented */ BOOL STDCALL -HeapWalk(HANDLE hHeap, +HeapWalk(HANDLE hHeap, LPPROCESS_HEAP_ENTRY lpEntry) { - /* Not implemented */ - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + NTSTATUS Status; + + Status = RtlWalkHeap(hHeap, lpEntry); + + if (!NT_SUCCESS(Status)) + { + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + + return TRUE; } /* EOF */ diff --git a/reactos/dll/win32/kernel32/misc/casemap.c b/reactos/dll/win32/kernel32/misc/casemap.c new file mode 100644 index 00000000000..d038b895ab5 --- /dev/null +++ b/reactos/dll/win32/kernel32/misc/casemap.c @@ -0,0 +1,1715 @@ +/* Unicode case mappings */ +/* Automatically generated; DO NOT EDIT!! */ + +#include "wine/unicode.h" + +const WCHAR wine_casemap_lower[3318] = +{ + /* index */ + 0x01bf, 0x02bf, 0x03bf, 0x0439, 0x0539, 0x0639, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0699, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0799, 0x0892, + 0x0100, 0x098f, 0x0100, 0x0100, 0x0a13, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0b13, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0bf6, + /* defaults */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x0041 .. 0x00ff */ + 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, + 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, + 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, + 0x0020, 0x0020, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0020, + 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, + 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, + 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0000, 0x0020, + 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x0100 .. 0x01ff */ + 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, + 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, + 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, + 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, + 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, + 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, + 0xff39, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, + 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, + 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, + 0x0000, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, + 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, + 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, + 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, + 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, + 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, + 0xff87, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0000, + 0x0000, 0x00d2, 0x0001, 0x0000, 0x0001, 0x0000, 0x00ce, 0x0001, + 0x0000, 0x00cd, 0x00cd, 0x0001, 0x0000, 0x0000, 0x004f, 0x00ca, + 0x00cb, 0x0001, 0x0000, 0x00cd, 0x00cf, 0x0000, 0x00d3, 0x00d1, + 0x0001, 0x0000, 0x0000, 0x0000, 0x00d3, 0x00d5, 0x0000, 0x00d6, + 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x00da, 0x0001, + 0x0000, 0x00da, 0x0000, 0x0000, 0x0001, 0x0000, 0x00da, 0x0001, + 0x0000, 0x00d9, 0x00d9, 0x0001, 0x0000, 0x0001, 0x0000, 0x00db, + 0x0001, 0x0000, 0x0000, 0x0000, 0x0001, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0002, 0x0001, 0x0000, 0x0002, + 0x0001, 0x0000, 0x0002, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, + 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, + 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0000, 0x0001, 0x0000, + 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, + 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, + 0x0000, 0x0002, 0x0001, 0x0000, 0x0001, 0x0000, 0xff9f, 0xffc8, + 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, + /* 0x0200 .. 0x02ff */ + 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, + 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, + 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, + 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, + 0xff7e, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, + 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, + 0x0001, 0x0000, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x2a2b, 0x0001, 0x0000, 0xff5d, 0x2a28, 0x0000, + 0x0000, 0x0001, 0x0000, 0xff3d, 0x0045, 0x0047, 0x0001, 0x0000, + 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x0386 .. 0x03ff */ + 0x0026, 0x0000, 0x0025, 0x0025, 0x0025, 0x0000, 0x0040, 0x0000, + 0x003f, 0x003f, 0x0000, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, + 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, + 0x0020, 0x0020, 0x0020, 0x0020, 0x0000, 0x0020, 0x0020, 0x0020, + 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, + 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, + 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, + 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xffc4, 0x0000, + 0x0000, 0x0001, 0x0000, 0xfff9, 0x0001, 0x0000, 0x0000, 0xff7e, + 0xff7e, 0xff7e, + /* 0x0400 .. 0x04ff */ + 0x0050, 0x0050, 0x0050, 0x0050, 0x0050, 0x0050, 0x0050, 0x0050, + 0x0050, 0x0050, 0x0050, 0x0050, 0x0050, 0x0050, 0x0050, 0x0050, + 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, + 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, + 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, + 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, + 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, + 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, + 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, + 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, + 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, + 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, + 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, + 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, + 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, + 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, + 0x000f, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, + 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0000, + 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, + 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, + 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, + 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, + 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, + 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, + /* 0x0500 .. 0x05ff */ + 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, + 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, + 0x0001, 0x0000, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, + 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, + 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, + 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, + 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x10a0 .. 0x10ff */ + 0x1c60, 0x1c60, 0x1c60, 0x1c60, 0x1c60, 0x1c60, 0x1c60, 0x1c60, + 0x1c60, 0x1c60, 0x1c60, 0x1c60, 0x1c60, 0x1c60, 0x1c60, 0x1c60, + 0x1c60, 0x1c60, 0x1c60, 0x1c60, 0x1c60, 0x1c60, 0x1c60, 0x1c60, + 0x1c60, 0x1c60, 0x1c60, 0x1c60, 0x1c60, 0x1c60, 0x1c60, 0x1c60, + 0x1c60, 0x1c60, 0x1c60, 0x1c60, 0x1c60, 0x1c60, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x1e00 .. 0x1eff */ + 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, + 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, + 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, + 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, + 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, + 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, + 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, + 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, + 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, + 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, + 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, + 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, + 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, + 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, + 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, + 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, + 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, + 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, + 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, + 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, + 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, + 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, + 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, + 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, + 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, + 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, + 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, + 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, + 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, + 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x1f07 .. 0x1fff */ + 0x0000, 0xfff8, 0xfff8, 0xfff8, 0xfff8, 0xfff8, 0xfff8, 0xfff8, + 0xfff8, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0xfff8, 0xfff8, 0xfff8, 0xfff8, 0xfff8, 0xfff8, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0xfff8, 0xfff8, 0xfff8, 0xfff8, 0xfff8, 0xfff8, 0xfff8, + 0xfff8, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0xfff8, 0xfff8, 0xfff8, 0xfff8, 0xfff8, 0xfff8, 0xfff8, + 0xfff8, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0xfff8, 0xfff8, 0xfff8, 0xfff8, 0xfff8, 0xfff8, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0xfff8, 0x0000, 0xfff8, 0x0000, 0xfff8, 0x0000, + 0xfff8, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0xfff8, 0xfff8, 0xfff8, 0xfff8, 0xfff8, 0xfff8, 0xfff8, + 0xfff8, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0xfff8, 0xfff8, 0xfff8, 0xfff8, 0xfff8, 0xfff8, 0xfff8, + 0xfff8, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0xfff8, 0xfff8, 0xfff8, 0xfff8, 0xfff8, 0xfff8, 0xfff8, + 0xfff8, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0xfff8, 0xfff8, 0xfff8, 0xfff8, 0xfff8, 0xfff8, 0xfff8, + 0xfff8, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0xfff8, 0xfff8, 0xffb6, 0xffb6, 0xfff7, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0xffaa, 0xffaa, 0xffaa, 0xffaa, 0xfff7, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0xfff8, 0xfff8, 0xff9c, 0xff9c, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0xfff8, 0xfff8, 0xff90, 0xff90, 0xfff9, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0xff80, 0xff80, 0xff82, 0xff82, 0xfff7, 0x0000, 0x0000, + 0x0000, + /* 0x2103 .. 0x21ff */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0xe2a3, 0x0000, 0x0000, 0x0000, 0xdf41, + 0xdfba, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x001c, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0010, 0x0010, 0x0010, + 0x0010, 0x0010, 0x0010, 0x0010, 0x0010, 0x0010, 0x0010, 0x0010, + 0x0010, 0x0010, 0x0010, 0x0010, 0x0010, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x247c .. 0x24ff */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, + 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, + 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, 0x001a, + 0x001a, 0x001a, 0x001a, 0x001a, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x2c00 .. 0x2cff */ + 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, + 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, + 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, + 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, + 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, + 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0001, 0x0000, 0xd609, 0xf11a, 0xd619, 0x0000, 0x0000, 0x0001, + 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, + 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, + 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, + 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, + 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, + 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, + 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, + 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, + 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, + 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, + 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, + 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, + 0x0001, 0x0000, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0xff1d .. 0xffff */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0020, 0x0020, 0x0020, 0x0020, + 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, + 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, + 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000 +}; +const WCHAR wine_casemap_upper[3582] = +{ + /* index */ + 0x019f, 0x029f, 0x039f, 0x045a, 0x0556, 0x0656, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x06dd, 0x07dc, 0x08dc, + 0x0100, 0x09d0, 0x0100, 0x0100, 0x0a55, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0b3f, 0x0c3f, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0cfe, + /* defaults */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x0061 .. 0x00ff */ + 0xffe0, 0xffe0, 0xffe0, 0xffe0, 0xffe0, 0xffe0, 0xffe0, 0xffe0, + 0xffe0, 0xffe0, 0xffe0, 0xffe0, 0xffe0, 0xffe0, 0xffe0, 0xffe0, + 0xffe0, 0xffe0, 0xffe0, 0xffe0, 0xffe0, 0xffe0, 0xffe0, 0xffe0, + 0xffe0, 0xffe0, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x02e7, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xffe0, + 0xffe0, 0xffe0, 0xffe0, 0xffe0, 0xffe0, 0xffe0, 0xffe0, 0xffe0, + 0xffe0, 0xffe0, 0xffe0, 0xffe0, 0xffe0, 0xffe0, 0xffe0, 0xffe0, + 0xffe0, 0xffe0, 0xffe0, 0xffe0, 0xffe0, 0xffe0, 0x0000, 0xffe0, + 0xffe0, 0xffe0, 0xffe0, 0xffe0, 0xffe0, 0xffe0, 0x0079, + /* 0x0100 .. 0x01ff */ + 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, + 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, + 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, + 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, + 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, + 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, + 0x0000, 0xff18, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, + 0x0000, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, + 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, + 0xffff, 0x0000, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, + 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, + 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, + 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, + 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, + 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, + 0x0000, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0xfed4, + 0x00c3, 0x0000, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0x0000, + 0xffff, 0x0000, 0x0000, 0x0000, 0xffff, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0xffff, 0x0000, 0x0000, 0x0061, 0x0000, 0x0000, + 0x0000, 0xffff, 0x00a3, 0x0000, 0x0000, 0x0000, 0x0082, 0x0000, + 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0x0000, + 0xffff, 0x0000, 0x0000, 0x0000, 0x0000, 0xffff, 0x0000, 0x0000, + 0xffff, 0x0000, 0x0000, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, + 0x0000, 0xffff, 0x0000, 0x0000, 0x0000, 0xffff, 0x0000, 0x0038, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xffff, 0xfffe, 0x0000, + 0xffff, 0xfffe, 0x0000, 0xffff, 0xfffe, 0x0000, 0xffff, 0x0000, + 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, + 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0xffb1, 0x0000, 0xffff, + 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, + 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, + 0x0000, 0x0000, 0xffff, 0xfffe, 0x0000, 0xffff, 0x0000, 0x0000, + 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, + /* 0x0200 .. 0x02ff */ + 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, + 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, + 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, + 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, + 0x0000, 0x0000, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, + 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, + 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0xffff, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0xffff, 0x0000, 0x0000, 0x0000, 0x0000, 0xffff, + 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, + 0x0000, 0x0000, 0x0000, 0xff2e, 0xff32, 0x0000, 0xff33, 0xff33, + 0x0000, 0xff36, 0x0000, 0xff35, 0x0000, 0x0000, 0x0000, 0x0000, + 0xff33, 0x0000, 0x0000, 0xff31, 0x0000, 0x0000, 0x0000, 0x0000, + 0xff2f, 0xff2d, 0x0000, 0x29f7, 0x0000, 0x0000, 0x0000, 0xff2d, + 0x0000, 0x0000, 0xff2b, 0x0000, 0x0000, 0xff2a, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x29e7, 0x0000, 0x0000, + 0xff26, 0x0000, 0x0000, 0xff26, 0x0000, 0x0000, 0x0000, 0x0000, + 0xff26, 0xffbb, 0xff27, 0xff27, 0xffb9, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0xff25, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x0345 .. 0x03ff */ + 0x0054, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0082, 0x0082, + 0x0082, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xffda, + 0xffdb, 0xffdb, 0xffdb, 0x0000, 0xffe0, 0xffe0, 0xffe0, 0xffe0, + 0xffe0, 0xffe0, 0xffe0, 0xffe0, 0xffe0, 0xffe0, 0xffe0, 0xffe0, + 0xffe0, 0xffe0, 0xffe0, 0xffe0, 0xffe0, 0xffe1, 0xffe0, 0xffe0, + 0xffe0, 0xffe0, 0xffe0, 0xffe0, 0xffe0, 0xffe0, 0xffe0, 0xffc0, + 0xffc1, 0xffc1, 0x0000, 0xffc2, 0xffc7, 0x0000, 0x0000, 0x0000, + 0xffd1, 0xffca, 0x0000, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, + 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, + 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, + 0xffff, 0x0000, 0xffff, 0xffaa, 0xffb0, 0x0007, 0x0000, 0x0000, + 0xffa0, 0x0000, 0x0000, 0xffff, 0x0000, 0x0000, 0xffff, 0x0000, + 0x0000, 0x0000, 0x0000, + /* 0x0404 .. 0x04ff */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0xffe0, 0xffe0, 0xffe0, 0xffe0, + 0xffe0, 0xffe0, 0xffe0, 0xffe0, 0xffe0, 0xffe0, 0xffe0, 0xffe0, + 0xffe0, 0xffe0, 0xffe0, 0xffe0, 0xffe0, 0xffe0, 0xffe0, 0xffe0, + 0xffe0, 0xffe0, 0xffe0, 0xffe0, 0xffe0, 0xffe0, 0xffe0, 0xffe0, + 0xffe0, 0xffe0, 0xffe0, 0xffe0, 0xffb0, 0xffb0, 0xffb0, 0xffb0, + 0xffb0, 0xffb0, 0xffb0, 0xffb0, 0xffb0, 0xffb0, 0xffb0, 0xffb0, + 0xffb0, 0xffb0, 0xffb0, 0xffb0, 0x0000, 0xffff, 0x0000, 0xffff, + 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, + 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, + 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, + 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xffff, + 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, + 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, + 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, + 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, + 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, + 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, + 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0x0000, 0xffff, 0x0000, + 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, + 0xffff, 0x0000, 0xffff, 0xfff1, 0x0000, 0xffff, 0x0000, 0xffff, + 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, + 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, + 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, + 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, + 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, + 0x0000, 0xffff, 0x0000, 0xffff, + /* 0x0500 .. 0x05ff */ + 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, + 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, + 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0xffd0, 0xffd0, 0xffd0, 0xffd0, 0xffd0, 0xffd0, 0xffd0, + 0xffd0, 0xffd0, 0xffd0, 0xffd0, 0xffd0, 0xffd0, 0xffd0, 0xffd0, + 0xffd0, 0xffd0, 0xffd0, 0xffd0, 0xffd0, 0xffd0, 0xffd0, 0xffd0, + 0xffd0, 0xffd0, 0xffd0, 0xffd0, 0xffd0, 0xffd0, 0xffd0, 0xffd0, + 0xffd0, 0xffd0, 0xffd0, 0xffd0, 0xffd0, 0xffd0, 0xffd0, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x1d79 .. 0x1dff */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0ee6, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x1e01 .. 0x1eff */ + 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, + 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, + 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, + 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, + 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, + 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, + 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, + 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, + 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, + 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, + 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, + 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, + 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, + 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, + 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, + 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, + 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, + 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, + 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0xffc5, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, + 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, + 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, + 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, + 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, + 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, + 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, + 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, + 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, + 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, + 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, + 0xffff, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x1f00 .. 0x1fff */ + 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0008, 0x0000, 0x0008, 0x0000, 0x0008, 0x0000, 0x0008, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x004a, 0x004a, 0x0056, 0x0056, 0x0056, 0x0056, 0x0064, 0x0064, + 0x0080, 0x0080, 0x0070, 0x0070, 0x007e, 0x007e, 0x0000, 0x0000, + 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0008, 0x0008, 0x0000, 0x0009, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xe3db, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0009, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0008, 0x0008, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0008, 0x0008, 0x0000, 0x0000, 0x0000, 0x0007, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0009, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x210c .. 0x21ff */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0xffe4, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0xfff0, 0xfff0, 0xfff0, 0xfff0, + 0xfff0, 0xfff0, 0xfff0, 0xfff0, 0xfff0, 0xfff0, 0xfff0, 0xfff0, + 0xfff0, 0xfff0, 0xfff0, 0xfff0, 0x0000, 0x0000, 0x0000, 0x0000, + 0xffff, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x247b .. 0x24ff */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xffe6, 0xffe6, 0xffe6, + 0xffe6, 0xffe6, 0xffe6, 0xffe6, 0xffe6, 0xffe6, 0xffe6, 0xffe6, + 0xffe6, 0xffe6, 0xffe6, 0xffe6, 0xffe6, 0xffe6, 0xffe6, 0xffe6, + 0xffe6, 0xffe6, 0xffe6, 0xffe6, 0xffe6, 0xffe6, 0xffe6, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x2c16 .. 0x2cff */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0xffd0, 0xffd0, 0xffd0, 0xffd0, 0xffd0, 0xffd0, + 0xffd0, 0xffd0, 0xffd0, 0xffd0, 0xffd0, 0xffd0, 0xffd0, 0xffd0, + 0xffd0, 0xffd0, 0xffd0, 0xffd0, 0xffd0, 0xffd0, 0xffd0, 0xffd0, + 0xffd0, 0xffd0, 0xffd0, 0xffd0, 0xffd0, 0xffd0, 0xffd0, 0xffd0, + 0xffd0, 0xffd0, 0xffd0, 0xffd0, 0xffd0, 0xffd0, 0xffd0, 0xffd0, + 0xffd0, 0xffd0, 0xffd0, 0xffd0, 0xffd0, 0xffd0, 0xffd0, 0xffd0, + 0xffd0, 0x0000, 0x0000, 0xffff, 0x0000, 0x0000, 0x0000, 0xd5d5, + 0xd5d8, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0xffff, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, + 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, + 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, + 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, + 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, + 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, + 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, + 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, + 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, + 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, + 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, + 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, + 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, + /* 0x2d00 .. 0x2dff */ + 0xe3a0, 0xe3a0, 0xe3a0, 0xe3a0, 0xe3a0, 0xe3a0, 0xe3a0, 0xe3a0, + 0xe3a0, 0xe3a0, 0xe3a0, 0xe3a0, 0xe3a0, 0xe3a0, 0xe3a0, 0xe3a0, + 0xe3a0, 0xe3a0, 0xe3a0, 0xe3a0, 0xe3a0, 0xe3a0, 0xe3a0, 0xe3a0, + 0xe3a0, 0xe3a0, 0xe3a0, 0xe3a0, 0xe3a0, 0xe3a0, 0xe3a0, 0xe3a0, + 0xe3a0, 0xe3a0, 0xe3a0, 0xe3a0, 0xe3a0, 0xe3a0, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0xff41 .. 0xffff */ + 0xffe0, 0xffe0, 0xffe0, 0xffe0, 0xffe0, 0xffe0, 0xffe0, 0xffe0, + 0xffe0, 0xffe0, 0xffe0, 0xffe0, 0xffe0, 0xffe0, 0xffe0, 0xffe0, + 0xffe0, 0xffe0, 0xffe0, 0xffe0, 0xffe0, 0xffe0, 0xffe0, 0xffe0, + 0xffe0, 0xffe0, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 +}; +const WCHAR wine_digitmap[4619] = +{ + /* index */ + 0x01d0, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x028a, 0x0384, + 0x0100, 0x044e, 0x053e, 0x062e, 0x071e, 0x080e, 0x08be, 0x099e, + 0x0a5e, 0x0100, 0x0100, 0x0af5, 0x0100, 0x0100, 0x0100, 0x0b67, + 0x0c57, 0x0d11, 0x0100, 0x0deb, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0e7b, 0x0100, 0x0100, 0x0100, 0x0f1b, 0x0100, 0x0100, 0x101b, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x110b, + /* defaults */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x0030 .. 0x00ff */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0xff80, 0xff80, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0xff78, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x0646 .. 0x06ff */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0xf9d0, 0xf9d0, 0xf9d0, 0xf9d0, 0xf9d0, 0xf9d0, + 0xf9d0, 0xf9d0, 0xf9d0, 0xf9d0, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0xf940, 0xf940, 0xf940, 0xf940, 0xf940, 0xf940, + 0xf940, 0xf940, 0xf940, 0xf940, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, + /* 0x0706 .. 0x07ff */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0xf870, 0xf870, 0xf870, 0xf870, 0xf870, 0xf870, + 0xf870, 0xf870, 0xf870, 0xf870, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, + /* 0x0936 .. 0x09ff */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0xf6ca, 0xf6ca, 0xf6ca, 0xf6ca, 0xf6ca, 0xf6ca, 0xf6ca, 0xf6ca, + 0xf6ca, 0xf6ca, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0xf64a, 0xf64a, 0xf64a, 0xf64a, 0xf64a, 0xf64a, 0xf64a, 0xf64a, + 0xf64a, 0xf64a, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, + /* 0x0a10 .. 0x0aff */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xf5ca, 0xf5ca, + 0xf5ca, 0xf5ca, 0xf5ca, 0xf5ca, 0xf5ca, 0xf5ca, 0xf5ca, 0xf5ca, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xf54a, 0xf54a, + 0xf54a, 0xf54a, 0xf54a, 0xf54a, 0xf54a, 0xf54a, 0xf54a, 0xf54a, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x0b10 .. 0x0bff */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xf4ca, 0xf4ca, + 0xf4ca, 0xf4ca, 0xf4ca, 0xf4ca, 0xf4ca, 0xf4ca, 0xf4ca, 0xf4ca, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xf44a, 0xf44a, + 0xf44a, 0xf44a, 0xf44a, 0xf44a, 0xf44a, 0xf44a, 0xf44a, 0xf44a, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x0c10 .. 0x0cff */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xf3ca, 0xf3ca, + 0xf3ca, 0xf3ca, 0xf3ca, 0xf3ca, 0xf3ca, 0xf3ca, 0xf3ca, 0xf3ca, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xf34a, 0xf34a, + 0xf34a, 0xf34a, 0xf34a, 0xf34a, 0xf34a, 0xf34a, 0xf34a, 0xf34a, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x0d10 .. 0x0dff */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xf2ca, 0xf2ca, + 0xf2ca, 0xf2ca, 0xf2ca, 0xf2ca, 0xf2ca, 0xf2ca, 0xf2ca, 0xf2ca, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x0e50 .. 0x0eff */ + 0xf1e0, 0xf1e0, 0xf1e0, 0xf1e0, 0xf1e0, 0xf1e0, 0xf1e0, 0xf1e0, + 0xf1e0, 0xf1e0, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0xf160, 0xf160, 0xf160, 0xf160, 0xf160, 0xf160, 0xf160, 0xf160, + 0xf160, 0xf160, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x0f20 .. 0x0fff */ + 0xf110, 0xf110, 0xf110, 0xf110, 0xf110, 0xf110, 0xf110, 0xf110, + 0xf110, 0xf110, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x1040 .. 0x10ff */ + 0xeff0, 0xeff0, 0xeff0, 0xeff0, 0xeff0, 0xeff0, 0xeff0, 0xeff0, + 0xeff0, 0xeff0, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x1369 .. 0x13ff */ + 0xecc8, 0xecc8, 0xecc8, 0xecc8, 0xecc8, 0xecc8, 0xecc8, 0xecc8, + 0xecc8, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x178e .. 0x17ff */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0xe850, 0xe850, 0xe850, 0xe850, 0xe850, 0xe850, + 0xe850, 0xe850, 0xe850, 0xe850, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, + /* 0x1810 .. 0x18ff */ + 0xe820, 0xe820, 0xe820, 0xe820, 0xe820, 0xe820, 0xe820, 0xe820, + 0xe820, 0xe820, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x1946 .. 0x19ff */ + 0xe6ea, 0xe6ea, 0xe6ea, 0xe6ea, 0xe6ea, 0xe6ea, 0xe6ea, 0xe6ea, + 0xe6ea, 0xe6ea, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0xe660, 0xe660, 0xe660, 0xe660, 0xe660, 0xe660, + 0xe660, 0xe660, 0xe660, 0xe660, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, + /* 0x1b26 .. 0x1bff */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0xe4e0, 0xe4e0, 0xe4e0, 0xe4e0, 0xe4e0, 0xe4e0, + 0xe4e0, 0xe4e0, 0xe4e0, 0xe4e0, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, + /* 0x2070 .. 0x20ff */ + 0xdfc0, 0x0000, 0x0000, 0x0000, 0xdfc0, 0xdfc0, 0xdfc0, 0xdfc0, + 0xdfc0, 0xdfc0, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0xdfb0, 0xdfb0, 0xdfb0, 0xdfb0, 0xdfb0, 0xdfb0, 0xdfb0, 0xdfb0, + 0xdfb0, 0xdfb0, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0x2460 .. 0x24ff */ + 0xdbd1, 0xdbd1, 0xdbd1, 0xdbd1, 0xdbd1, 0xdbd1, 0xdbd1, 0xdbd1, + 0xdbd1, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0xdbbd, 0xdbbd, 0xdbbd, 0xdbbd, + 0xdbbd, 0xdbbd, 0xdbbd, 0xdbbd, 0xdbbd, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0xdba9, 0xdba9, 0xdba9, 0xdba9, 0xdba9, 0xdba9, 0xdba9, 0xdba9, + 0xdba9, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0xdb46, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xdb3c, 0xdb3c, 0xdb3c, + 0xdb3c, 0xdb3c, 0xdb3c, 0xdb3c, 0xdb3c, 0xdb3c, 0x0000, 0xdb31, + /* 0x2700 .. 0x27ff */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xd8bb, 0xd8bb, + 0xd8bb, 0xd8bb, 0xd8bb, 0xd8bb, 0xd8bb, 0xd8bb, 0xd8bb, 0x0000, + 0xd8b1, 0xd8b1, 0xd8b1, 0xd8b1, 0xd8b1, 0xd8b1, 0xd8b1, 0xd8b1, + 0xd8b1, 0x0000, 0xd8a7, 0xd8a7, 0xd8a7, 0xd8a7, 0xd8a7, 0xd8a7, + 0xd8a7, 0xd8a7, 0xd8a7, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0xff10 .. 0xffff */ + 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, + 0x0120, 0x0120, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 +}; +const WCHAR wine_compatmap[1497] = +{ + /* index */ + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0200, 0x0300, 0x0100, 0x0100, 0x0100, 0x03da, 0x04d9, + /* defaults */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0xf900 .. 0xf9ff */ + 0x9348, 0x6df3, 0x95c8, 0x93c5, 0x75cd, 0x552d, 0x5adf, 0xa695, + 0xa694, 0x6048, 0x98c7, 0x5c7c, 0x603c, 0x68e9, 0x7d5b, 0x8676, + 0x8d2f, 0x8ea9, 0x8fe6, 0x977c, 0x70ee, 0x7406, 0x77c3, 0x7ac7, + 0x8b25, 0x9851, 0xa0d7, 0x5567, 0x5a59, 0x71e7, 0x78fd, 0x8d0e, + 0xa4fe, 0x642f, 0x76c9, 0x8caa, 0x9040, 0x69a4, 0x88b2, 0x8ef8, + 0x65a2, 0x6dee, 0x7440, 0x79d1, 0x97a2, 0x5659, 0x5889, 0x59af, + 0x6b94, 0x71a2, 0x78de, 0x7db4, 0x86cd, 0x8cd1, 0x8d26, 0x94b8, + 0x9dfa, 0xa236, 0xa4c0, 0x7f51, 0x8043, 0x8463, 0x8a8b, 0x99c5, + 0xa53f, 0x9195, 0x5f9d, 0x65c1, 0x831c, 0x8739, 0x791c, 0x7f83, + 0x937a, 0x9dae, 0x5f8e, 0x6317, 0x70c7, 0x748d, 0x75c1, 0x83e0, + 0x84e7, 0x9cfa, 0x5980, 0x8738, 0x5888, 0x5877, 0x80c6, 0x8467, + 0x8a99, 0x9d1c, 0x9226, 0x6974, 0x70a6, 0x91a1, 0x54db, 0x6288, + 0x66b2, 0x7a26, 0x7c0e, 0x59b4, 0x7f97, 0x565a, 0x6643, 0x54a6, + 0x7364, 0x6c0f, 0x83b8, 0x5a58, 0x5ef2, 0x7d94, 0x8adb, 0x913b, + 0x724a, 0x963f, 0x7316, 0x698b, 0x8971, 0x6a2b, 0x7bef, 0x5537, + 0x57f1, 0x5850, 0x6f07, 0x836c, 0x88f3, 0x9155, 0x9851, 0x5976, + 0x5ac2, 0x5ff2, 0x656a, 0x6c42, 0x767a, 0x7fa5, 0x9c27, 0xa0e3, + 0xa50f, 0xa545, 0x5911, 0x6d3b, 0x71eb, 0x95d5, 0x64e6, 0x6801, + 0x6870, 0x6b09, 0x7591, 0x77b6, 0x7af5, 0x8035, 0x845e, 0x86d8, + 0x958e, 0x8b55, 0x9689, 0x99af, 0x587b, 0x5906, 0x5b1f, 0x7729, + 0x8f22, 0x9109, 0x6527, 0x6652, 0x69d7, 0x7209, 0x8298, 0x79ce, + 0x553c, 0x5d50, 0x623d, 0x640f, 0x6670, 0x7a05, 0x7abb, 0x85eb, + 0x8696, 0x9883, 0x9d44, 0x9d95, 0x9e64, 0x55d6, 0x7ff8, 0x97fd, + 0x9d00, 0x6728, 0x54cc, 0x571f, 0x6232, 0x6282, 0x6bdb, 0x7043, + 0x780e, 0x7c81, 0x8b3a, 0x96b9, 0xa5c9, 0x6cc3, 0x9c68, 0x58c2, + 0x6db3, 0x6e2a, 0x7377, 0x74d1, 0x7a3d, 0x7b8c, 0x7e9d, 0x8341, + 0x9e8e, 0x579c, 0x685c, 0x9ca5, 0x5657, 0x6344, 0x7414, 0x9553, + 0x65b3, 0x676b, 0x6e3d, 0x79ac, 0x9caa, 0x584c, 0x5a31, 0x6286, + 0x6c33, 0x6d6d, 0x6ec6, 0x7302, 0x7a22, 0x7bfd, 0x8593, 0x8ee8, + 0x8ef9, 0x97e3, 0x9cf8, 0x5954, 0x74ce, 0x5a30, 0x77e2, 0x7aa9, + 0x8c0a, 0x9cb2, 0xa265, 0xa4ac, 0x6da3, 0x73d6, 0x87f2, 0x80d4, + 0x8128, 0x8299, 0x78c6, 0x769e, 0x915c, 0x54c3, 0x8938, 0x583b, + /* 0xfa00 .. 0xfaff */ + 0x5807, 0x64a5, 0x68d1, 0x82d3, 0x6181, 0x7319, 0x6cae, 0x9534, + 0x8e44, 0x9c44, 0x8f81, 0x64c8, 0x5734, 0x5bb3, 0x0000, 0x0000, + 0x5e4a, 0x0000, 0x6c62, 0x0000, 0x0000, 0x57c9, 0x7914, 0x7cb3, + 0x7f24, 0x7f45, 0x7f4b, 0x7f74, 0x9d3a, 0x82a1, 0x859f, 0x0000, + 0x8bf2, 0x0000, 0x90d6, 0x0000, 0x0000, 0x9613, 0x96d7, 0x0000, + 0x0000, 0x0000, 0x9ec5, 0x9ed1, 0x9efc, 0xa387, 0x0000, 0x0000, + 0x557e, 0x56b6, 0x571b, 0x5896, 0x58b0, 0x591c, 0x5b67, 0x5bcf, + 0x5c30, 0x5e07, 0x5e6e, 0x6229, 0x6232, 0x6657, 0x672a, 0x674f, + 0x67b2, 0x6b0e, 0x6ba0, 0x6c4e, 0x6e41, 0x7332, 0x73d4, 0x74db, + 0x7726, 0x77e2, 0x79d8, 0x7e46, 0x7ef2, 0x7efc, 0x7efa, 0x7f01, + 0x7f06, 0x7f0c, 0x7f3b, 0x7f3b, 0x7fec, 0x802c, 0x816a, 0x839d, + 0x83b1, 0x83e8, 0x8518, 0x85aa, 0x8791, 0x881c, 0x881b, 0x89f8, + 0x8eb0, 0x8f35, 0x909f, 0x90d6, 0x926f, 0x92a3, 0x9550, 0x95d1, + 0x9c7b, 0x9d96, 0x9dd1, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x53b6, 0x5744, 0x56f6, 0x550d, 0x56d1, 0x570b, 0x5851, 0x5883, + 0x5b25, 0x5adc, 0x5b1f, 0x5b67, 0x5dde, 0x5e36, 0x5ec6, 0x5ed5, + 0x5fe2, 0x60a7, 0x6450, 0x6456, 0x64e5, 0x6528, 0x6652, 0x66c7, + 0x6680, 0x6705, 0x66d6, 0x6767, 0x67a8, 0x6937, 0x698e, 0x69c3, + 0x6ac6, 0x6be3, 0x6c85, 0x6c88, 0x6cc2, 0x70e4, 0x7124, 0x72aa, + 0x7443, 0x7432, 0x7488, 0x7583, 0x76d2, 0x7d0a, 0x7797, 0x7810, + 0x788a, 0x79d0, 0x7a64, 0x7a98, 0x7b79, 0x7b7a, 0x7c24, 0x7c34, + 0x7c4c, 0x7ca1, 0x7c96, 0x7e21, 0x8005, 0x8113, 0x81cd, 0x82ac, + 0x8344, 0x848d, 0x8553, 0x889f, 0x893b, 0x8cc4, 0x8e8b, 0x8ecf, + 0x8ede, 0x9006, 0x903e, 0x9010, 0x9045, 0x9041, 0x902f, 0x907a, + 0x90ca, 0x9247, 0x9476, 0x95af, 0x96d5, 0x97b1, 0x9bb6, 0x9c1c, + 0x9c8e, 0x9d12, 0x9d35, 0x9d40, 0x9d6f, 0xa045, 0xa4ce, 0x2d7b, + 0x2d74, 0x3904, 0x40cb, 0x4545, 0x4565, 0x5774, 0x61fa, 0x83fc, + 0xa46b, 0xa4b5, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0xfe26 .. 0xfeff */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x21f5, 0x21e3, 0x21e1, 0x022c, 0x022b, 0x01f3, + 0x01f3, 0x0244, 0x0245, 0x31db, 0x31db, 0x31d5, 0x31d5, 0x31cd, + 0x31cd, 0x31c9, 0x31c9, 0x31cb, 0x31cb, 0x31cb, 0x31cb, 0x0000, + 0x0000, 0x0214, 0x0215, 0x21f5, 0x21f4, 0x21f3, 0x21f2, 0x0212, + 0x0211, 0x0210, 0x01dc, 0x31b0, 0x01dc, 0x0000, 0x01e7, 0x01e5, + 0x01e9, 0x01ca, 0x21bc, 0x01cf, 0x01cf, 0x0220, 0x0221, 0x31b7, + 0x31b7, 0x01c4, 0x01c6, 0x01c9, 0x01c9, 0x01ca, 0x01d8, 0x01d9, + 0x01d7, 0x0000, 0x01f4, 0x01bb, 0x01bb, 0x01d5, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x07a1, 0x07a1, 0x07a0, 0x07a0, 0x079f, 0x079f, + 0x079e, 0x079e, 0x079d, 0x079d, 0x079c, 0x079b, 0x079a, 0x079a, + 0x0799, 0x0799, 0x0798, 0x0797, 0x0796, 0x0796, 0x0795, 0x0795, + 0x0794, 0x0793, 0x0792, 0x0792, 0x0791, 0x0790, 0x078f, 0x078f, + 0x078e, 0x078d, 0x078c, 0x078c, 0x078b, 0x078a, 0x0789, 0x0789, + 0x0788, 0x0787, 0x0786, 0x0786, 0x0785, 0x0785, 0x0784, 0x0784, + 0x0783, 0x0783, 0x0782, 0x0782, 0x0781, 0x0780, 0x077f, 0x077f, + 0x077e, 0x077d, 0x077c, 0x077c, 0x077b, 0x077a, 0x0779, 0x0779, + 0x0778, 0x0777, 0x0776, 0x0776, 0x0775, 0x0774, 0x0773, 0x0773, + 0x0772, 0x0771, 0x0770, 0x0770, 0x076f, 0x076e, 0x076d, 0x076d, + 0x076c, 0x076b, 0x076a, 0x0770, 0x076f, 0x076e, 0x076d, 0x076d, + 0x076c, 0x076b, 0x076a, 0x076a, 0x0769, 0x0768, 0x0767, 0x0767, + 0x0766, 0x0765, 0x0764, 0x0764, 0x0763, 0x0762, 0x0761, 0x0761, + 0x0760, 0x075f, 0x075e, 0x075e, 0x075d, 0x075c, 0x075b, 0x075b, + 0x075a, 0x075a, 0x0759, 0x0759, 0x0758, 0x0757, 0x0756, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, + /* 0xff01 .. 0xffff */ + 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, + 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, + 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, + 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, + 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, + 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, + 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, + 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, + 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, + 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, + 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, + 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, 0x0120, 0x2a26, 0x2a26, + 0x30a1, 0x30aa, 0x30aa, 0x309d, 0x3196, 0x318c, 0x313a, 0x313b, + 0x313c, 0x313d, 0x313e, 0x3177, 0x3178, 0x3179, 0x3154, 0x318c, + 0x3131, 0x3132, 0x3133, 0x3134, 0x3135, 0x3135, 0x3136, 0x3137, + 0x3138, 0x3139, 0x313a, 0x313b, 0x313c, 0x313d, 0x313e, 0x313f, + 0x3140, 0x3142, 0x3143, 0x3144, 0x3145, 0x3145, 0x3145, 0x3145, + 0x3145, 0x3145, 0x3147, 0x3149, 0x314b, 0x314d, 0x314f, 0x314f, + 0x314f, 0x314f, 0x314f, 0x3150, 0x3151, 0x3152, 0x3152, 0x3152, + 0x3152, 0x3152, 0x3152, 0x3153, 0x3156, 0x30fb, 0x30fb, 0x31c4, + 0x3190, 0x3190, 0x3190, 0x3190, 0x3190, 0x3190, 0x3190, 0x3190, + 0x3190, 0x3190, 0x3190, 0x3190, 0x3190, 0x3190, 0x3190, 0x3190, + 0x3190, 0x3190, 0x3190, 0x3190, 0x3190, 0x3190, 0x3190, 0x3190, + 0x3190, 0x3190, 0x3190, 0x3190, 0x3190, 0x3190, 0x0000, 0x0000, + 0x0000, 0x318d, 0x318d, 0x318d, 0x318d, 0x318d, 0x318d, 0x0000, + 0x0000, 0x318b, 0x318b, 0x318b, 0x318b, 0x318b, 0x318b, 0x0000, + 0x0000, 0x3189, 0x3189, 0x3189, 0x3189, 0x3189, 0x3189, 0x0000, + 0x0000, 0x3187, 0x3187, 0x3187, 0x0000, 0x0000, 0x0000, 0x00c2, + 0x00c2, 0x00ca, 0x00cc, 0x00c2, 0x00c0, 0x20c3, 0x0000, 0x251a, + 0x21a7, 0x21a7, 0x21a7, 0x21a7, 0x25b3, 0x25dd, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 +}; diff --git a/reactos/dll/win32/kernel32/misc/fold.c b/reactos/dll/win32/kernel32/misc/fold.c new file mode 100644 index 00000000000..87a4a418faa --- /dev/null +++ b/reactos/dll/win32/kernel32/misc/fold.c @@ -0,0 +1,198 @@ +/* + * String folding + * + * Copyright 2003 Jon Griffiths + * + * 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 + */ + +#include "wine/unicode.h" + +static inline WCHAR to_unicode_digit( WCHAR ch ) +{ + extern const WCHAR wine_digitmap[]; + return ch + wine_digitmap[wine_digitmap[ch >> 8] + (ch & 0xff)]; +} + +static inline WCHAR to_unicode_native( WCHAR ch ) +{ + extern const WCHAR wine_compatmap[]; + return ch + wine_compatmap[wine_compatmap[ch >> 8] + (ch & 0xff)]; +} + +static const WCHAR wine_ligatures[] = +{ + 0x00c6, 0x00de, 0x00df, 0x00e6, 0x00fe, 0x0132, 0x0133, 0x0152, + 0x0153, 0x01c4, 0x01c5, 0x01c6, 0x01c7, 0x01c8, 0x01c9, 0x01ca, + 0x01cb, 0x01cc, 0x01e2, 0x01e3, 0x01f1, 0x01f2, 0x01f3, 0x01fc, + 0x01fd, 0x05f0, 0x05f1, 0x05f2, 0xfb00, 0xfb01, 0xfb02, 0xfb03, + 0xfb04, 0xfb05, 0xfb06 +}; + +/* Unicode expanded ligatures */ +static const WCHAR wine_expanded_ligatures[][4] = +{ + { 'A','E','\0',1 }, + { 'T','H','\0',1 }, + { 's','s','\0',1 }, + { 'a','e','\0',1 }, + { 't','h','\0',1 }, + { 'I','J','\0',1 }, + { 'i','j','\0',1 }, + { 'O','E','\0',1 }, + { 'o','e','\0',1 }, + { 'D',0x017d,'\0',1 }, + { 'D',0x017e,'\0',1 }, + { 'd',0x017e,'\0',1 }, + { 'L','J','\0',1 }, + { 'L','j','\0',1 }, + { 'l','j','\0',1 }, + { 'N','J','\0',1 }, + { 'N','j','\0',1 }, + { 'n','j','\0',1 }, + { 0x0100,0x0112,'\0',1 }, + { 0x0101,0x0113,'\0',1 }, + { 'D','Z','\0',1 }, + { 'D','z','\0',1 }, + { 'd','z','\0',1 }, + { 0x00c1,0x00c9,'\0',1 }, + { 0x00e1,0x00e9,'\0',1 }, + { 0x05d5,0x05d5,'\0',1 }, + { 0x05d5,0x05d9,'\0',1 }, + { 0x05d9,0x05d9,'\0',1 }, + { 'f','f','\0',1 }, + { 'f','i','\0',1 }, + { 'f','l','\0',1 }, + { 'f','f','i',2 }, + { 'f','f','l',2 }, + { 0x017f,'t','\0',1 }, + { 's','t','\0',1 } +}; + +static inline int get_ligature_len( WCHAR wc ) +{ + int low = 0, high = sizeof(wine_ligatures)/sizeof(WCHAR) -1; + while (low <= high) + { + int pos = (low + high) / 2; + if (wine_ligatures[pos] < wc) + low = pos + 1; + else if (wine_ligatures[pos] > wc) + high = pos - 1; + else + return wine_expanded_ligatures[pos][3]; + } + return 0; +} + +static inline const WCHAR* get_ligature( WCHAR wc ) +{ + static const WCHAR empty_ligature[] = { '\0','\0','\0', 0 }; + int low = 0, high = sizeof(wine_ligatures)/sizeof(WCHAR) -1; + while (low <= high) + { + int pos = (low + high) / 2; + if (wine_ligatures[pos] < wc) + low = pos + 1; + else if (wine_ligatures[pos] > wc) + high = pos - 1; + else + return wine_expanded_ligatures[pos]; + } + return empty_ligature; +} + +/* fold a unicode string */ +int wine_fold_string( int flags, const WCHAR *src, int srclen, WCHAR *dst, int dstlen ) +{ + WCHAR *dstbase = dst; + const WCHAR *expand; + int i; + + if (srclen == -1) + srclen = strlenW(src) + 1; /* Include terminating NUL in count */ + + if (!dstlen) + { + /* Calculate the required size for dst */ + dstlen = srclen; + + if (flags & MAP_EXPAND_LIGATURES) + { + while (srclen--) + { + dstlen += get_ligature_len(*src); + src++; + } + } + else if (flags & MAP_COMPOSITE) + { + /* FIXME */ + } + else if (flags & MAP_PRECOMPOSED) + { + /* FIXME */ + } + return dstlen; + } + + if (srclen > dstlen) + return 0; + + dstlen -= srclen; + + /* Actually perform the mapping(s) specified */ + for (i = 0; i < srclen; i++) + { + WCHAR ch = *src; + + if (flags & MAP_EXPAND_LIGATURES) + { + expand = get_ligature(ch); + if (expand[0]) + { + if (!dstlen--) + return 0; + dst[0] = expand[0]; + if (expand[2]) + { + if (!dstlen--) + return 0; + *++dst = expand[1]; + ch = expand[2]; + } + else + ch = expand[1]; + dst++; + } + } + else if (flags & MAP_COMPOSITE) + { + /* FIXME */ + } + else if (flags & MAP_PRECOMPOSED) + { + /* FIXME */ + } + if (flags & MAP_FOLDDIGITS) + ch = to_unicode_digit(ch); + if (flags & MAP_FOLDCZONE) + ch = to_unicode_native(ch); + + *dst++ = ch; + src++; + } + return dst - dstbase; +} diff --git a/reactos/dll/win32/kernel32/misc/lang.c b/reactos/dll/win32/kernel32/misc/lang.c index 3020e8530ab..6c8e3611e3b 100644 --- a/reactos/dll/win32/kernel32/misc/lang.c +++ b/reactos/dll/win32/kernel32/misc/lang.c @@ -1267,32 +1267,89 @@ GetCPInfo ( /* - * @unimplemented + * @implemented */ BOOL STDCALL -GetCPInfoExW( - UINT CodePage, - DWORD dwFlags, - LPCPINFOEXW lpCPInfoEx) +GetCPInfoExW(UINT CodePage, + DWORD dwFlags, + LPCPINFOEXW lpCPInfoEx) { - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + if (!GetCPInfo(CodePage, (LPCPINFO) lpCPInfoEx)) + return FALSE; + + switch(CodePage) + { + case CP_UTF7: + { + static const WCHAR utf7[] = L"Unicode (UTF-7)\0"; + + lpCPInfoEx->CodePage = CP_UTF7; + lpCPInfoEx->UnicodeDefaultChar = 0x3f; + wcscpy(lpCPInfoEx->CodePageName, utf7); + } + break; + + case CP_UTF8: + { + static const WCHAR utf8[] = L"Unicode (UTF-8)\0"; + + lpCPInfoEx->CodePage = CP_UTF8; + lpCPInfoEx->UnicodeDefaultChar = 0x3f; + wcscpy(lpCPInfoEx->CodePageName, utf8); + } + + default: + { + PCODEPAGE_ENTRY CodePageEntry; + + CodePageEntry = IntGetCodePageEntry(CodePage); + if (CodePageEntry == NULL) + { + DPRINT1("Could not get CodePage Entry! CodePageEntry = 0\n"); + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + lpCPInfoEx->CodePage = CodePageEntry->CodePageTable.CodePage; + lpCPInfoEx->UnicodeDefaultChar = CodePageEntry->CodePageTable.UniDefaultChar; + /* FIXME: We need to get a codepage name */ + DPRINT1("FIXME: We need to get a codepage name!\n"); + wcscpy(lpCPInfoEx->CodePageName, L"Unknown\0"); + } + break; + } + + return TRUE; } /* - * @unimplemented + * @implemented */ BOOL STDCALL -GetCPInfoExA( - UINT CodePage, - DWORD dwFlags, - LPCPINFOEXA lpCPInfoEx) +GetCPInfoExA(UINT CodePage, + DWORD dwFlags, + LPCPINFOEXA lpCPInfoEx) { - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + CPINFOEXW CPInfo; + + if (!GetCPInfoExW(CodePage, dwFlags, &CPInfo)) + return FALSE; + + /* the layout is the same except for CodePageName */ + memcpy(lpCPInfoEx, &CPInfo, sizeof(CPINFOEXA)); + + WideCharToMultiByte(CP_ACP, + 0, + CPInfo.CodePageName, + -1, + lpCPInfoEx->CodePageName, + sizeof(lpCPInfoEx->CodePageName), + NULL, + NULL); + return TRUE; } static int @@ -1716,6 +1773,115 @@ __inline static UINT get_lcid_codepage( LCID lcid ) } +/************************************************************************* + * FoldStringA (KERNEL32.@) + * + * Map characters in a string. + * + * PARAMS + * dwFlags [I] Flags controlling chars to map (MAP_ constants from "winnls.h") + * src [I] String to map + * srclen [I] Length of src, or -1 if src is NUL terminated + * dst [O] Destination for mapped string + * dstlen [I] Length of dst, or 0 to find the required length for the mapped string + * + * RETURNS + * Success: The length of the string written to dst, including the terminating NUL. If + * dstlen is 0, the value returned is the same, but nothing is written to dst, + * and dst may be NULL. + * Failure: 0. Use GetLastError() to determine the cause. + */ +INT WINAPI FoldStringA(DWORD dwFlags, LPCSTR src, INT srclen, + LPSTR dst, INT dstlen) +{ + INT ret = 0, srclenW = 0; + WCHAR *srcW = NULL, *dstW = NULL; + + if (!src || !srclen || dstlen < 0 || (dstlen && !dst) || src == dst) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + + srclenW = MultiByteToWideChar(CP_ACP, dwFlags & MAP_COMPOSITE ? MB_COMPOSITE : 0, + src, srclen, NULL, 0); + srcW = HeapAlloc(GetProcessHeap(), 0, srclenW * sizeof(WCHAR)); + + if (!srcW) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto FoldStringA_exit; + } + + MultiByteToWideChar(CP_ACP, dwFlags & MAP_COMPOSITE ? MB_COMPOSITE : 0, + src, srclen, srcW, srclenW); + + dwFlags = (dwFlags & ~MAP_PRECOMPOSED) | MAP_FOLDCZONE; + + ret = FoldStringW(dwFlags, srcW, srclenW, NULL, 0); + if (ret && dstlen) + { + dstW = HeapAlloc(GetProcessHeap(), 0, ret * sizeof(WCHAR)); + + if (!dstW) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto FoldStringA_exit; + } + + ret = FoldStringW(dwFlags, srcW, srclenW, dstW, ret); + if (!WideCharToMultiByte(CP_ACP, 0, dstW, ret, dst, dstlen, NULL, NULL)) + { + ret = 0; + SetLastError(ERROR_INSUFFICIENT_BUFFER); + } + } + + HeapFree(GetProcessHeap(), 0, dstW); + +FoldStringA_exit: + HeapFree(GetProcessHeap(), 0, srcW); + return ret; +} + +extern int wine_fold_string( int flags, const WCHAR *src, int srclen, WCHAR *dst, int dstlen ); + +/************************************************************************* + * FoldStringW (KERNEL32.@) + * + * See FoldStringA. + */ +INT WINAPI FoldStringW(DWORD dwFlags, LPCWSTR src, INT srclen, + LPWSTR dst, INT dstlen) +{ + int ret; + + switch (dwFlags & (MAP_COMPOSITE|MAP_PRECOMPOSED|MAP_EXPAND_LIGATURES)) + { + case 0: + if (dwFlags) + break; + /* Fall through for dwFlags == 0 */ + case MAP_PRECOMPOSED|MAP_COMPOSITE: + case MAP_PRECOMPOSED|MAP_EXPAND_LIGATURES: + case MAP_COMPOSITE|MAP_EXPAND_LIGATURES: + SetLastError(ERROR_INVALID_FLAGS); + return 0; + } + + if (!src || !srclen || dstlen < 0 || (dstlen && !dst) || src == dst) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + + ret = wine_fold_string(dwFlags, src, srclen, dst, dstlen); + if (!ret) + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return ret; +} + + /* * @implemented */ diff --git a/reactos/dll/win32/kernel32/misc/nls.c b/reactos/dll/win32/kernel32/misc/nls.c index 2c0d48bd64a..f5b3aa4a681 100644 --- a/reactos/dll/win32/kernel32/misc/nls.c +++ b/reactos/dll/win32/kernel32/misc/nls.c @@ -20,15 +20,6 @@ /* GLOBAL VARIABLES ***********************************************************/ -typedef struct _CODEPAGE_ENTRY -{ - LIST_ENTRY Entry; - UINT CodePage; - HANDLE SectionHandle; - PBYTE SectionMapping; - CPTABLEINFO CodePageTable; -} CODEPAGE_ENTRY, *PCODEPAGE_ENTRY; - /* Sequence length based on the first character. */ static const char UTF8Length[128] = { @@ -185,7 +176,7 @@ IntGetLoadedCodePageEntry(UINT CodePage) * @return Code page entry. */ -static PCODEPAGE_ENTRY FASTCALL +PCODEPAGE_ENTRY FASTCALL IntGetCodePageEntry(UINT CodePage) { CHAR SectionName[40]; diff --git a/reactos/dll/win32/kernel32/misc/stubs.c b/reactos/dll/win32/kernel32/misc/stubs.c index a5ac6b9504f..fae6cff70d8 100644 --- a/reactos/dll/win32/kernel32/misc/stubs.c +++ b/reactos/dll/win32/kernel32/misc/stubs.c @@ -125,42 +125,6 @@ ExtendVirtualBuffer ( } -/* - * @unimplemented - */ -int -STDCALL -FoldStringW ( - DWORD dwMapFlags, - LPCWSTR lpSrcStr, - int cchSrc, - LPWSTR lpDestStr, - int cchDest - ) -{ - STUB; - return 0; -} - - -/* - * @unimplemented - */ -int -STDCALL -FoldStringA ( - DWORD dwMapFlags, - LPCSTR lpSrcStr, - int cchSrc, - LPSTR lpDestStr, - int cchDest - ) -{ - STUB; - return 0; -} - - /* * @unimplemented */ @@ -567,21 +531,6 @@ IsSystemResumeAutomatic( return 0; } -/* - * @unimplemented - */ -BOOL -STDCALL -IsWow64Process( - HANDLE hProcess, - PBOOL Wow64Process - ) -{ - STUB; - *Wow64Process = FALSE; - return TRUE; -} - /* * @unimplemented */ diff --git a/reactos/dll/win32/kernel32/nls/div.nls b/reactos/dll/win32/kernel32/nls/div.nls index 2383d4004a3..0d3886a1fff 100644 --- a/reactos/dll/win32/kernel32/nls/div.nls +++ b/reactos/dll/win32/kernel32/nls/div.nls @@ -18,139 +18,139 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma code_page(0) /* Unicode only */ +#pragma code_page(65001) /* UTF-8 */ STRINGTABLE LANGUAGE LANG_DIVEHI, SUBLANG_DEFAULT { LOCALE_FONTSIGNATURE L"\x002f\x8000\x3808\x0000\x0100\x0000\x0000\x0000\x0001\x0000\x0000\x4000\x0003\x0000\x0000\xc5d4" - LOCALE_ICALENDARTYPE L"6" - LOCALE_ICENTURY L"0" - LOCALE_ICOUNTRY L"960" - LOCALE_ICURRDIGITS L"2" - LOCALE_ICURRENCY L"3" - LOCALE_IDATE L"1" - LOCALE_IDAYLZERO L"1" - LOCALE_IDEFAULTANSICODEPAGE L"0" - LOCALE_IDEFAULTCODEPAGE L"1" - LOCALE_IDEFAULTCOUNTRY L"960" - LOCALE_IDEFAULTEBCDICCODEPAGE L"500" - LOCALE_IDEFAULTLANGUAGE L"0465" - LOCALE_IDEFAULTMACCODEPAGE L"2" - LOCALE_IDEFAULTUNIXCODEPAGE L"65001" - LOCALE_IDIGITS L"2" - LOCALE_IDIGITSUBSTITUTION L"1" - LOCALE_IFIRSTDAYOFWEEK L"6" - LOCALE_IFIRSTWEEKOFYEAR L"0" - LOCALE_IINTLCURRDIGITS L"2" - LOCALE_ILANGUAGE L"0465" - LOCALE_ILDATE L"1" - LOCALE_ILZERO L"1" - LOCALE_IMEASURE L"0" - LOCALE_IMONLZERO L"1" - LOCALE_INEGCURR L"10" - LOCALE_INEGNUMBER L"1" - LOCALE_INEGSEPBYSPACE L"1" - LOCALE_INEGSIGNPOSN L"4" - LOCALE_INEGSYMPRECEDES L"0" - LOCALE_IOPTIONALCALENDAR L"6" - LOCALE_IPAPERSIZE L"9" - LOCALE_IPOSSEPBYSPACE L"1" - LOCALE_IPOSSIGNPOSN L"4" - LOCALE_IPOSSYMPRECEDES L"0" - LOCALE_ITIME L"1" - LOCALE_ITIMEMARKPOSN L"0" - LOCALE_ITLZERO L"1" - LOCALE_S1159 L"\x0789\x0786" - LOCALE_S2359 L"\x0789\x078a" - LOCALE_SABBREVCTRYNAME L"MDV" - LOCALE_SABBREVDAYNAME1 L"\x0780\x07af\x0789\x07a6" - LOCALE_SABBREVDAYNAME2 L"\x0787\x07a6\x0782\x07b0\x078e\x07a7\x0783\x07a6" - LOCALE_SABBREVDAYNAME3 L"\x0784\x07aa\x078b\x07a6" - LOCALE_SABBREVDAYNAME4 L"\x0784\x07aa\x0783\x07a7\x0790\x07b0\x078a\x07a6\x078c\x07a8" - LOCALE_SABBREVDAYNAME5 L"\x0780\x07aa\x0786\x07aa\x0783\x07aa" - LOCALE_SABBREVDAYNAME6 L"\x0780\x07ae\x0782\x07a8\x0780\x07a8\x0783\x07aa" - LOCALE_SABBREVDAYNAME7 L"\x0787\x07a7\x078b\x07a9\x0787\x07b0\x078c\x07a6" - LOCALE_SABBREVLANGNAME L"DIV" - LOCALE_SABBREVMONTHNAME1 L"\x0796\x07ac\x0782\x07aa\x0787\x07a6\x0783\x07a9" - LOCALE_SABBREVMONTHNAME2 L"\x078a\x07ac\x0784\x07aa\x0783\x07aa\x0787\x07a6\x0783\x07a9" - LOCALE_SABBREVMONTHNAME3 L"\x0789\x07a7\x0797\x07b0" - LOCALE_SABBREVMONTHNAME4 L"\x0787\x07ac\x0795\x07b0\x0783\x07a8\x078d\x07b0" - LOCALE_SABBREVMONTHNAME5 L"\x0789\x07ad\x0787\x07a8" - LOCALE_SABBREVMONTHNAME6 L"\x0796\x07ab\x0782\x07b0" - LOCALE_SABBREVMONTHNAME7 L"\x0796\x07ab\x078d\x07a7\x0787\x07a8" - LOCALE_SABBREVMONTHNAME8 L"\x0787\x07af\x078e\x07a6\x0790\x07b0\x0793\x07b0" - LOCALE_SABBREVMONTHNAME9 L"\x0790\x07ac\x0795\x07b0\x0793\x07ac\x0789\x07b0\x0784\x07a6\x0783\x07aa" - LOCALE_SABBREVMONTHNAME10 L"\x0787\x07ae\x0786\x07b0\x0793\x07af\x0784\x07a6\x0783\x07aa" - LOCALE_SABBREVMONTHNAME11 L"\x0782\x07ae\x0788\x07ac\x0789\x07b0\x0784\x07a6\x0783\x07aa" - LOCALE_SABBREVMONTHNAME12 L"\x0791\x07a8\x0790\x07ac\x0789\x07b0\x0784\x07a6\x0783\x07aa" - LOCALE_SABBREVMONTHNAME13 L"" - LOCALE_SCOUNTRY L"Maldives" - LOCALE_SCURRENCY L"\x0783." - LOCALE_SDATE L"/" - LOCALE_SDAYNAME1 L"\x0780\x07af\x0789\x07a6\x078b\x07aa\x0788\x07a6\x0790\x07b0" - LOCALE_SDAYNAME2 L"\x0787\x07a6\x0782\x07b0\x078e\x07a7\x0783\x07a6\x078b\x07aa\x0788\x07a6\x0790\x07b0" - LOCALE_SDAYNAME3 L"\x0784\x07aa\x078b\x07a6\x078b\x07aa\x0788\x07a6\x0790\x07b0" - LOCALE_SDAYNAME4 L"\x0784\x07aa\x0783\x07a7\x0790\x07b0\x078a\x07a6\x078c\x07a8\x078b\x07aa\x0788\x07a6\x0790\x07b0" - LOCALE_SDAYNAME5 L"\x0780\x07aa\x0786\x07aa\x0783\x07aa\x078b\x07aa\x0788\x07a6\x0790\x07b0" - LOCALE_SDAYNAME6 L"\x0780\x07ae\x0782\x07a8\x0780\x07a8\x0783\x07aa\x078b\x07aa\x0788\x07a6\x0790\x07b0" - LOCALE_SDAYNAME7 L"\x0787\x07a7\x078b\x07a9\x0787\x07b0\x078c\x07a6\x078b\x07aa\x0788\x07a6\x0790\x07b0" - LOCALE_SDECIMAL L"." - LOCALE_SENGCOUNTRY L"Maldives" - LOCALE_SENGCURRNAME L"Rufiyaa" - LOCALE_SENGLANGUAGE L"Divehi" - LOCALE_SGROUPING L"3;0" - LOCALE_SINTLSYMBOL L"MVR" - LOCALE_SISO3166CTRYNAME L"MV" - LOCALE_SISO639LANGNAME L"dv" - LOCALE_SLANGUAGE L"Divehi" - LOCALE_SLIST L"\x060c" - LOCALE_SLONGDATE L"dd MMMM yyyy" - LOCALE_SMONDECIMALSEP L"." - LOCALE_SMONGROUPING L"3;0" - LOCALE_SMONTHNAME1 L"\x0796\x07ac\x0782\x07aa\x0787\x07a6\x0783\x07a9" - LOCALE_SMONTHNAME2 L"\x078a\x07ac\x0784\x07aa\x0783\x07aa\x0787\x07a6\x0783\x07a9" - LOCALE_SMONTHNAME3 L"\x0789\x07a7\x0797\x07b0" - LOCALE_SMONTHNAME4 L"\x0787\x07ac\x0795\x07b0\x0783\x07a8\x078d\x07b0" - LOCALE_SMONTHNAME5 L"\x0789\x07ad\x0787\x07a8" - LOCALE_SMONTHNAME6 L"\x0796\x07ab\x0782\x07b0" - LOCALE_SMONTHNAME7 L"\x0796\x07ab\x078d\x07a7\x0787\x07a8" - LOCALE_SMONTHNAME8 L"\x0787\x07af\x078e\x07a6\x0790\x07b0\x0793\x07b0" - LOCALE_SMONTHNAME9 L"\x0790\x07ac\x0795\x07b0\x0793\x07ac\x0789\x07b0\x0784\x07a6\x0783\x07aa" - LOCALE_SMONTHNAME10 L"\x0787\x07ae\x0786\x07b0\x0793\x07af\x0784\x07a6\x0783\x07aa" - LOCALE_SMONTHNAME11 L"\x0782\x07ae\x0788\x07ac\x0789\x07b0\x0784\x07a6\x0783\x07aa" - LOCALE_SMONTHNAME12 L"\x0791\x07a8\x0790\x07ac\x0789\x07b0\x0784\x07a6\x0783\x07aa" - LOCALE_SMONTHNAME13 L"" - LOCALE_SMONTHOUSANDSEP L"," - LOCALE_SNAME L"dv-MV" - LOCALE_SNATIVECTRYNAME L"\x078b\x07a8\x0788\x07ac\x0780\x07a8 \x0783\x07a7\x0787\x07b0\x0796\x07ac" - LOCALE_SNATIVECURRNAME L"\x0783\x07aa\x078a\x07a8\x0794\x07a7" - LOCALE_SNATIVEDIGITS L"0123456789" - LOCALE_SNATIVELANGNAME L"\x078b\x07a8\x0788\x07ac\x0780\x07a8\x0784\x07a6\x0790\x07b0" - LOCALE_SNEGATIVESIGN L"-" - LOCALE_SPOSITIVESIGN L"" - LOCALE_SSCRIPTS L"Thaa;" - LOCALE_SSHORTDATE L"dd/MM/yy" - LOCALE_SSORTNAME L"Default" - LOCALE_STHOUSAND L"," - LOCALE_STIME L":" - LOCALE_STIMEFORMAT L"HH:mm" - LOCALE_SYEARMONTH L"MMMM, yyyy" + LOCALE_ICALENDARTYPE "6" + LOCALE_ICENTURY "0" + LOCALE_ICOUNTRY "960" + LOCALE_ICURRDIGITS "2" + LOCALE_ICURRENCY "3" + LOCALE_IDATE "1" + LOCALE_IDAYLZERO "1" + LOCALE_IDEFAULTANSICODEPAGE "0" + LOCALE_IDEFAULTCODEPAGE "1" + LOCALE_IDEFAULTCOUNTRY "960" + LOCALE_IDEFAULTEBCDICCODEPAGE "500" + LOCALE_IDEFAULTLANGUAGE "0465" + LOCALE_IDEFAULTMACCODEPAGE "2" + LOCALE_IDEFAULTUNIXCODEPAGE "65001" + LOCALE_IDIGITS "2" + LOCALE_IDIGITSUBSTITUTION "1" + LOCALE_IFIRSTDAYOFWEEK "6" + LOCALE_IFIRSTWEEKOFYEAR "0" + LOCALE_IINTLCURRDIGITS "2" + LOCALE_ILANGUAGE "0465" + LOCALE_ILDATE "1" + LOCALE_ILZERO "1" + LOCALE_IMEASURE "0" + LOCALE_IMONLZERO "1" + LOCALE_INEGCURR "10" + LOCALE_INEGNUMBER "1" + LOCALE_INEGSEPBYSPACE "1" + LOCALE_INEGSIGNPOSN "4" + LOCALE_INEGSYMPRECEDES "0" + LOCALE_IOPTIONALCALENDAR "6" + LOCALE_IPAPERSIZE "9" + LOCALE_IPOSSEPBYSPACE "1" + LOCALE_IPOSSIGNPOSN "4" + LOCALE_IPOSSYMPRECEDES "0" + LOCALE_ITIME "1" + LOCALE_ITIMEMARKPOSN "0" + LOCALE_ITLZERO "1" + LOCALE_S1159 "Ю‰Ю†" + LOCALE_S2359 "Ю‰ЮЉ" + LOCALE_SABBREVCTRYNAME "MDV" + LOCALE_SABBREVDAYNAME1 "ЮЂЮЇЮ‰Ю¦" + LOCALE_SABBREVDAYNAME2 "Ю‡Ю¦Ю‚Ю°ЮЋЮ§ЮѓЮ¦" + LOCALE_SABBREVDAYNAME3 "Ю„ЮЄЮ‹Ю¦" + LOCALE_SABBREVDAYNAME4 "Ю„ЮЄЮѓЮ§ЮђЮ°ЮЉЮ¦ЮЊЮЁ" + LOCALE_SABBREVDAYNAME5 "ЮЂЮЄЮ†ЮЄЮѓЮЄ" + LOCALE_SABBREVDAYNAME6 "ЮЂЮ®Ю‚ЮЁЮЂЮЁЮѓЮЄ" + LOCALE_SABBREVDAYNAME7 "Ю‡Ю§Ю‹Ю©Ю‡Ю°ЮЊЮ¦" + LOCALE_SABBREVLANGNAME "DIV" + LOCALE_SABBREVMONTHNAME1 "Ю–Ю¬Ю‚ЮЄЮ‡Ю¦ЮѓЮ©" + LOCALE_SABBREVMONTHNAME2 "ЮЉЮ¬Ю„ЮЄЮѓЮЄЮ‡Ю¦ЮѓЮ©" + LOCALE_SABBREVMONTHNAME3 "Ю‰Ю§Ю—Ю°" + LOCALE_SABBREVMONTHNAME4 "Ю‡Ю¬Ю•Ю°ЮѓЮЁЮЌЮ°" + LOCALE_SABBREVMONTHNAME5 "Ю‰Ю­Ю‡ЮЁ" + LOCALE_SABBREVMONTHNAME6 "Ю–Ю«Ю‚Ю°" + LOCALE_SABBREVMONTHNAME7 "Ю–Ю«ЮЌЮ§Ю‡ЮЁ" + LOCALE_SABBREVMONTHNAME8 "Ю‡ЮЇЮЋЮ¦ЮђЮ°Ю“Ю°" + LOCALE_SABBREVMONTHNAME9 "ЮђЮ¬Ю•Ю°Ю“Ю¬Ю‰Ю°Ю„Ю¦ЮѓЮЄ" + LOCALE_SABBREVMONTHNAME10 "Ю‡Ю®Ю†Ю°Ю“ЮЇЮ„Ю¦ЮѓЮЄ" + LOCALE_SABBREVMONTHNAME11 "Ю‚Ю®Ю€Ю¬Ю‰Ю°Ю„Ю¦ЮѓЮЄ" + LOCALE_SABBREVMONTHNAME12 "Ю‘ЮЁЮђЮ¬Ю‰Ю°Ю„Ю¦ЮѓЮЄ" + LOCALE_SABBREVMONTHNAME13 "" + LOCALE_SCOUNTRY "Maldives" + LOCALE_SCURRENCY "Юѓ." + LOCALE_SDATE "/" + LOCALE_SDAYNAME1 "ЮЂЮЇЮ‰Ю¦Ю‹ЮЄЮ€Ю¦ЮђЮ°" + LOCALE_SDAYNAME2 "Ю‡Ю¦Ю‚Ю°ЮЋЮ§ЮѓЮ¦Ю‹ЮЄЮ€Ю¦ЮђЮ°" + LOCALE_SDAYNAME3 "Ю„ЮЄЮ‹Ю¦Ю‹ЮЄЮ€Ю¦ЮђЮ°" + LOCALE_SDAYNAME4 "Ю„ЮЄЮѓЮ§ЮђЮ°ЮЉЮ¦ЮЊЮЁЮ‹ЮЄЮ€Ю¦ЮђЮ°" + LOCALE_SDAYNAME5 "ЮЂЮЄЮ†ЮЄЮѓЮЄЮ‹ЮЄЮ€Ю¦ЮђЮ°" + LOCALE_SDAYNAME6 "ЮЂЮ®Ю‚ЮЁЮЂЮЁЮѓЮЄЮ‹ЮЄЮ€Ю¦ЮђЮ°" + LOCALE_SDAYNAME7 "Ю‡Ю§Ю‹Ю©Ю‡Ю°ЮЊЮ¦Ю‹ЮЄЮ€Ю¦ЮђЮ°" + LOCALE_SDECIMAL "." + LOCALE_SENGCOUNTRY "Maldives" + LOCALE_SENGCURRNAME "Rufiyaa" + LOCALE_SENGLANGUAGE "Divehi" + LOCALE_SGROUPING "3;0" + LOCALE_SINTLSYMBOL "MVR" + LOCALE_SISO3166CTRYNAME "MV" + LOCALE_SISO639LANGNAME "dv" + LOCALE_SLANGUAGE "Divehi" + LOCALE_SLIST "ШЊ" + LOCALE_SLONGDATE "dd MMMM yyyy" + LOCALE_SMONDECIMALSEP "." + LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHNAME1 "Ю–Ю¬Ю‚ЮЄЮ‡Ю¦ЮѓЮ©" + LOCALE_SMONTHNAME2 "ЮЉЮ¬Ю„ЮЄЮѓЮЄЮ‡Ю¦ЮѓЮ©" + LOCALE_SMONTHNAME3 "Ю‰Ю§Ю—Ю°" + LOCALE_SMONTHNAME4 "Ю‡Ю¬Ю•Ю°ЮѓЮЁЮЌЮ°" + LOCALE_SMONTHNAME5 "Ю‰Ю­Ю‡ЮЁ" + LOCALE_SMONTHNAME6 "Ю–Ю«Ю‚Ю°" + LOCALE_SMONTHNAME7 "Ю–Ю«ЮЌЮ§Ю‡ЮЁ" + LOCALE_SMONTHNAME8 "Ю‡ЮЇЮЋЮ¦ЮђЮ°Ю“Ю°" + LOCALE_SMONTHNAME9 "ЮђЮ¬Ю•Ю°Ю“Ю¬Ю‰Ю°Ю„Ю¦ЮѓЮЄ" + LOCALE_SMONTHNAME10 "Ю‡Ю®Ю†Ю°Ю“ЮЇЮ„Ю¦ЮѓЮЄ" + LOCALE_SMONTHNAME11 "Ю‚Ю®Ю€Ю¬Ю‰Ю°Ю„Ю¦ЮѓЮЄ" + LOCALE_SMONTHNAME12 "Ю‘ЮЁЮђЮ¬Ю‰Ю°Ю„Ю¦ЮѓЮЄ" + LOCALE_SMONTHNAME13 "" + LOCALE_SMONTHOUSANDSEP "," + LOCALE_SNAME "dv-MV" + LOCALE_SNATIVECTRYNAME "Ю‹ЮЁЮ€Ю¬ЮЂЮЁ ЮѓЮ§Ю‡Ю°Ю–Ю¬" + LOCALE_SNATIVECURRNAME "ЮѓЮЄЮЉЮЁЮ”Ю§" + LOCALE_SNATIVEDIGITS "0123456789" + LOCALE_SNATIVELANGNAME "Ю‹ЮЁЮ€Ю¬ЮЂЮЁЮ„Ю¦ЮђЮ°" + LOCALE_SNEGATIVESIGN "-" + LOCALE_SPOSITIVESIGN "" + LOCALE_SSCRIPTS "Thaa;" + LOCALE_SSHORTDATE "dd/MM/yy" + LOCALE_SSORTNAME "Default" + LOCALE_STHOUSAND "," + LOCALE_STIME ":" + LOCALE_STIMEFORMAT "HH:mm" + LOCALE_SYEARMONTH "MMMM, yyyy" - LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE L"Western Europe and United States" - LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE L"Central Europe" - LGRPID_BALTIC+LGRPID_RES_BASE L"Baltic" - LGRPID_GREEK+LGRPID_RES_BASE L"Greek" - LGRPID_CYRILLIC+LGRPID_RES_BASE L"Cyrillic" - LGRPID_TURKISH+LGRPID_RES_BASE L"Turkic" - LGRPID_JAPANESE+LGRPID_RES_BASE L"Japanese" - LGRPID_KOREAN+LGRPID_RES_BASE L"Korean" - LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE L"Traditional Chinese" - LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE L"Simplified Chinese" - LGRPID_THAI+LGRPID_RES_BASE L"Thai" - LGRPID_HEBREW+LGRPID_RES_BASE L"Hebrew" - LGRPID_ARABIC+LGRPID_RES_BASE L"Arabic" - LGRPID_VIETNAMESE+LGRPID_RES_BASE L"Vietnamese" - LGRPID_INDIC+LGRPID_RES_BASE L"Indic" - LGRPID_GEORGIAN+LGRPID_RES_BASE L"Georgian" - LGRPID_ARMENIAN+LGRPID_RES_BASE L"Armenian" + LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Western Europe and United States" + LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Central Europe" + LGRPID_BALTIC+LGRPID_RES_BASE "Baltic" + LGRPID_GREEK+LGRPID_RES_BASE "Greek" + LGRPID_CYRILLIC+LGRPID_RES_BASE "Cyrillic" + LGRPID_TURKISH+LGRPID_RES_BASE "Turkic" + LGRPID_JAPANESE+LGRPID_RES_BASE "Japanese" + LGRPID_KOREAN+LGRPID_RES_BASE "Korean" + LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Traditional Chinese" + LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" + LGRPID_THAI+LGRPID_RES_BASE "Thai" + LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" + LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" + LGRPID_INDIC+LGRPID_RES_BASE "Indic" + LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian" + LGRPID_ARMENIAN+LGRPID_RES_BASE "Armenian" } diff --git a/reactos/dll/win32/kernel32/nls/guj.nls b/reactos/dll/win32/kernel32/nls/guj.nls index 92c7ac6ed83..0c757c3b86b 100644 --- a/reactos/dll/win32/kernel32/nls/guj.nls +++ b/reactos/dll/win32/kernel32/nls/guj.nls @@ -18,139 +18,139 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma code_page(0) /* Unicode only */ +#pragma code_page(65001) /* Unicode only */ STRINGTABLE LANGUAGE LANG_GUJARATI, SUBLANG_DEFAULT { LOCALE_FONTSIGNATURE L"\x002f\x8004\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x4000\x0003\x0000\x0000\xc5d4" - LOCALE_ICALENDARTYPE L"1" - LOCALE_ICENTURY L"0" - LOCALE_ICOUNTRY L"91" - LOCALE_ICURRDIGITS L"2" - LOCALE_ICURRENCY L"2" - LOCALE_IDATE L"1" - LOCALE_IDAYLZERO L"1" - LOCALE_IDEFAULTANSICODEPAGE L"0" - LOCALE_IDEFAULTCODEPAGE L"1" - LOCALE_IDEFAULTCOUNTRY L"91" - LOCALE_IDEFAULTEBCDICCODEPAGE L"500" - LOCALE_IDEFAULTLANGUAGE L"0447" - LOCALE_IDEFAULTMACCODEPAGE L"2" - LOCALE_IDEFAULTUNIXCODEPAGE L"65001" - LOCALE_IDIGITS L"2" - LOCALE_IDIGITSUBSTITUTION L"1" - LOCALE_IFIRSTDAYOFWEEK L"0" - LOCALE_IFIRSTWEEKOFYEAR L"0" - LOCALE_IINTLCURRDIGITS L"2" - LOCALE_ILANGUAGE L"0447" - LOCALE_ILDATE L"1" - LOCALE_ILZERO L"1" - LOCALE_IMEASURE L"0" - LOCALE_IMONLZERO L"1" - LOCALE_INEGCURR L"12" - LOCALE_INEGNUMBER L"1" - LOCALE_INEGSEPBYSPACE L"1" - LOCALE_INEGSIGNPOSN L"4" - LOCALE_INEGSYMPRECEDES L"1" - LOCALE_IOPTIONALCALENDAR L"0" - LOCALE_IPAPERSIZE L"9" - LOCALE_IPOSSEPBYSPACE L"1" - LOCALE_IPOSSIGNPOSN L"4" - LOCALE_IPOSSYMPRECEDES L"1" - LOCALE_ITIME L"1" - LOCALE_ITIMEMARKPOSN L"1" - LOCALE_ITLZERO L"1" - LOCALE_S1159 L"\x0aaa\x0ac2\x0ab0\x0acd\x0ab5\x00a0\x0aae\x0aa7\x0acd\x0aaf\x0abe\x0ab9\x0acd\x0aa8" - LOCALE_S2359 L"\x0a89\x0aa4\x0acd\x0aa4\x0ab0\x00a0\x0aae\x0aa7\x0acd\x0aaf\x0abe\x0ab9\x0acd\x0aa8" - LOCALE_SABBREVCTRYNAME L"IND" - LOCALE_SABBREVDAYNAME1 L"\x0ab8\x0acb\x0aae" - LOCALE_SABBREVDAYNAME2 L"\x0aae\x0a82\x0a97\x0ab3" - LOCALE_SABBREVDAYNAME3 L"\x0aac\x0ac1\x0aa7" - LOCALE_SABBREVDAYNAME4 L"\x0a97\x0ac1\x0ab0\x0ac1" - LOCALE_SABBREVDAYNAME5 L"\x0ab6\x0ac1\x0a95\x0acd\x0ab0" - LOCALE_SABBREVDAYNAME6 L"\x0ab6\x0aa8\x0abf" - LOCALE_SABBREVDAYNAME7 L"\x0ab0\x0ab5\x0abf" - LOCALE_SABBREVLANGNAME L"GUJ" - LOCALE_SABBREVMONTHNAME1 L"\x0a9c\x0abe\x0aa8\x0acd\x0aaf\x0ac1" - LOCALE_SABBREVMONTHNAME2 L"\x0aab\x0ac7\x0aac\x0acd\x0ab0\x0ac1" - LOCALE_SABBREVMONTHNAME3 L"\x0aae\x0abe\x0ab0\x0acd\x0a9a" - LOCALE_SABBREVMONTHNAME4 L"\x0a8f\x0aaa\x0acd\x0ab0\x0abf\x0ab2" - LOCALE_SABBREVMONTHNAME5 L"\x0aae\x0ac7" - LOCALE_SABBREVMONTHNAME6 L"\x0a9c\x0ac2\x0aa8" - LOCALE_SABBREVMONTHNAME7 L"\x0a9c\x0ac1\x0ab2\x0abe\x0a88" - LOCALE_SABBREVMONTHNAME8 L"\x0a91\x0a97\x0ab8\x0acd\x0a9f" - LOCALE_SABBREVMONTHNAME9 L"\x0ab8\x0aaa\x0acd\x0a9f\x0ac7" - LOCALE_SABBREVMONTHNAME10 L"\x0a91\x0a95\x0acd\x0a9f\x0acb" - LOCALE_SABBREVMONTHNAME11 L"\x0aa8\x0ab5\x0ac7" - LOCALE_SABBREVMONTHNAME12 L"\x0aa1\x0abf\x0ab8\x0ac7" - LOCALE_SABBREVMONTHNAME13 L"" - LOCALE_SCOUNTRY L"India" - LOCALE_SCURRENCY L"\x0ab0\x0ac2" - LOCALE_SDATE L"-" - LOCALE_SDAYNAME1 L"\x0ab8\x0acb\x0aae\x0ab5\x0abe\x0ab0" - LOCALE_SDAYNAME2 L"\x0aae\x0a82\x0a97\x0ab3\x0ab5\x0abe\x0ab0" - LOCALE_SDAYNAME3 L"\x0aac\x0ac1\x0aa7\x0ab5\x0abe\x0ab0" - LOCALE_SDAYNAME4 L"\x0a97\x0ac1\x0ab0\x0ac1\x0ab5\x0abe\x0ab0" - LOCALE_SDAYNAME5 L"\x0ab6\x0ac1\x0a95\x0acd\x0ab0\x0ab5\x0abe\x0ab0" - LOCALE_SDAYNAME6 L"\x0ab6\x0aa8\x0abf\x0ab5\x0abe\x0ab0" - LOCALE_SDAYNAME7 L"\x0ab0\x0ab5\x0abf\x0ab5\x0abe\x0ab0" - LOCALE_SDECIMAL L"." - LOCALE_SENGCOUNTRY L"India" - LOCALE_SENGCURRNAME L"Indian Rupee" - LOCALE_SENGLANGUAGE L"Gujarati" - LOCALE_SGROUPING L"3;2;0" - LOCALE_SINTLSYMBOL L"INR" - LOCALE_SISO3166CTRYNAME L"IN" - LOCALE_SISO639LANGNAME L"gu" - LOCALE_SLANGUAGE L"Gujarati" - LOCALE_SLIST L"," - LOCALE_SLONGDATE L"dd MMMM yyyy" - LOCALE_SMONDECIMALSEP L"." - LOCALE_SMONGROUPING L"3;2;0" - LOCALE_SMONTHNAME1 L"\x0a9c\x0abe\x0aa8\x0acd\x0aaf\x0ac1\x0a86\x0ab0\x0ac0" - LOCALE_SMONTHNAME2 L"\x0aab\x0ac7\x0aac\x0acd\x0ab0\x0ac1\x0a86\x0ab0\x0ac0" - LOCALE_SMONTHNAME3 L"\x0aae\x0abe\x0ab0\x0acd\x0a9a" - LOCALE_SMONTHNAME4 L"\x0a8f\x0aaa\x0acd\x0ab0\x0abf\x0ab2" - LOCALE_SMONTHNAME5 L"\x0aae\x0ac7" - LOCALE_SMONTHNAME6 L"\x0a9c\x0ac2\x0aa8" - LOCALE_SMONTHNAME7 L"\x0a9c\x0ac1\x0ab2\x0abe\x0a88" - LOCALE_SMONTHNAME8 L"\x0a91\x0a97\x0ab8\x0acd\x0a9f" - LOCALE_SMONTHNAME9 L"\x0ab8\x0aaa\x0acd\x0a9f\x0ac7\x0aae\x0acd\x0aac\x0ab0" - LOCALE_SMONTHNAME10 L"\x0a91\x0a95\x0acd\x0a9f\x0acd\x0aac\x0ab0" - LOCALE_SMONTHNAME11 L"\x0aa8\x0ab5\x0ac7\x0aae\x0acd\x0aac\x0ab0" - LOCALE_SMONTHNAME12 L"\x0aa1\x0abf\x0ab8\x0ac7\x0aae\x0acd\x0aac\x0ab0" - LOCALE_SMONTHNAME13 L"" - LOCALE_SMONTHOUSANDSEP L"," - LOCALE_SNAME L"gu-IN" - LOCALE_SNATIVECTRYNAME L"\x0aad\x0abe\x0ab0\x0aa4" - LOCALE_SNATIVECURRNAME L"\x0ab0\x0ac2\x0aaa\x0abf\x0aaf\x0acb" - LOCALE_SNATIVEDIGITS L"\x0ae6\x0ae7\x0ae8\x0ae9\x0aea\x0aeb\x0aec\x0aed\x0aee\x0aef" - LOCALE_SNATIVELANGNAME L"\x0a97\x0ac1\x0a9c\x0ab0\x0abe\x0aa4\x0ac0" - LOCALE_SNEGATIVESIGN L"-" - LOCALE_SPOSITIVESIGN L"" - LOCALE_SSCRIPTS L"Gujr;" - LOCALE_SSHORTDATE L"dd-MM-yy" - LOCALE_SSORTNAME L"Default" - LOCALE_STHOUSAND L"," - LOCALE_STIME L":" - LOCALE_STIMEFORMAT L"HH:mm:ss" - LOCALE_SYEARMONTH L"MMMM, yyyy" + LOCALE_ICALENDARTYPE "1" + LOCALE_ICENTURY "0" + LOCALE_ICOUNTRY "91" + LOCALE_ICURRDIGITS "2" + LOCALE_ICURRENCY "2" + LOCALE_IDATE "1" + LOCALE_IDAYLZERO "1" + LOCALE_IDEFAULTANSICODEPAGE "0" + LOCALE_IDEFAULTCODEPAGE "1" + LOCALE_IDEFAULTCOUNTRY "91" + LOCALE_IDEFAULTEBCDICCODEPAGE "500" + LOCALE_IDEFAULTLANGUAGE "0447" + LOCALE_IDEFAULTMACCODEPAGE "2" + LOCALE_IDEFAULTUNIXCODEPAGE "65001" + LOCALE_IDIGITS "2" + LOCALE_IDIGITSUBSTITUTION "1" + LOCALE_IFIRSTDAYOFWEEK "0" + LOCALE_IFIRSTWEEKOFYEAR "0" + LOCALE_IINTLCURRDIGITS "2" + LOCALE_ILANGUAGE "0447" + LOCALE_ILDATE "1" + LOCALE_ILZERO "1" + LOCALE_IMEASURE "0" + LOCALE_IMONLZERO "1" + LOCALE_INEGCURR "12" + LOCALE_INEGNUMBER "1" + LOCALE_INEGSEPBYSPACE "1" + LOCALE_INEGSIGNPOSN "4" + LOCALE_INEGSYMPRECEDES "1" + LOCALE_IOPTIONALCALENDAR "0" + LOCALE_IPAPERSIZE "9" + LOCALE_IPOSSEPBYSPACE "1" + LOCALE_IPOSSIGNPOSN "4" + LOCALE_IPOSSYMPRECEDES "1" + LOCALE_ITIME "1" + LOCALE_ITIMEMARKPOSN "1" + LOCALE_ITLZERO "1" + LOCALE_S1159 "аЄЄа«‚аЄ°а«ЌаЄµВ аЄ®аЄ§а«ЌаЄЇаЄѕаЄ№а«ЌаЄЁ" + LOCALE_S2359 "аЄ‰аЄ¤а«ЌаЄ¤аЄ°В аЄ®аЄ§а«ЌаЄЇаЄѕаЄ№а«ЌаЄЁ" + LOCALE_SABBREVCTRYNAME "IND" + LOCALE_SABBREVDAYNAME1 "аЄёа«‹аЄ®" + LOCALE_SABBREVDAYNAME2 "аЄ®аЄ‚аЄ—аЄі" + LOCALE_SABBREVDAYNAME3 "аЄ¬а«ЃаЄ§" + LOCALE_SABBREVDAYNAME4 "аЄ—а«ЃаЄ°а«Ѓ" + LOCALE_SABBREVDAYNAME5 "аЄ¶а«ЃаЄ•а«ЌаЄ°" + LOCALE_SABBREVDAYNAME6 "аЄ¶аЄЁаЄї" + LOCALE_SABBREVDAYNAME7 "аЄ°аЄµаЄї" + LOCALE_SABBREVLANGNAME "GUJ" + LOCALE_SABBREVMONTHNAME1 "аЄњаЄѕаЄЁа«ЌаЄЇа«Ѓ" + LOCALE_SABBREVMONTHNAME2 "ફેબ્રુ" + LOCALE_SABBREVMONTHNAME3 "аЄ®аЄѕаЄ°а«ЌаЄљ" + LOCALE_SABBREVMONTHNAME4 "аЄЏаЄЄа«ЌаЄ°аЄїаЄІ" + LOCALE_SABBREVMONTHNAME5 "મે" + LOCALE_SABBREVMONTHNAME6 "аЄња«‚аЄЁ" + LOCALE_SABBREVMONTHNAME7 "аЄња«ЃаЄІаЄѕаЄ€" + LOCALE_SABBREVMONTHNAME8 "аЄ‘аЄ—аЄёа«ЌаЄџ" + LOCALE_SABBREVMONTHNAME9 "સપ્ટે" + LOCALE_SABBREVMONTHNAME10 "аЄ‘аЄ•а«ЌаЄџа«‹" + LOCALE_SABBREVMONTHNAME11 "નવે" + LOCALE_SABBREVMONTHNAME12 "ડિસે" + LOCALE_SABBREVMONTHNAME13 "" + LOCALE_SCOUNTRY "India" + LOCALE_SCURRENCY "аЄ°а«‚" + LOCALE_SDATE "-" + LOCALE_SDAYNAME1 "аЄёа«‹аЄ®аЄµаЄѕаЄ°" + LOCALE_SDAYNAME2 "аЄ®аЄ‚аЄ—аЄіаЄµаЄѕаЄ°" + LOCALE_SDAYNAME3 "аЄ¬а«ЃаЄ§аЄµаЄѕаЄ°" + LOCALE_SDAYNAME4 "аЄ—а«ЃаЄ°а«ЃаЄµаЄѕаЄ°" + LOCALE_SDAYNAME5 "аЄ¶а«ЃаЄ•а«ЌаЄ°аЄµаЄѕаЄ°" + LOCALE_SDAYNAME6 "аЄ¶аЄЁаЄїаЄµаЄѕаЄ°" + LOCALE_SDAYNAME7 "аЄ°аЄµаЄїаЄµаЄѕаЄ°" + LOCALE_SDECIMAL "." + LOCALE_SENGCOUNTRY "India" + LOCALE_SENGCURRNAME "Indian Rupee" + LOCALE_SENGLANGUAGE "Gujarati" + LOCALE_SGROUPING "3;2;0" + LOCALE_SINTLSYMBOL "INR" + LOCALE_SISO3166CTRYNAME "IN" + LOCALE_SISO639LANGNAME "gu" + LOCALE_SLANGUAGE "Gujarati" + LOCALE_SLIST "," + LOCALE_SLONGDATE "dd MMMM yyyy" + LOCALE_SMONDECIMALSEP "." + LOCALE_SMONGROUPING "3;2;0" + LOCALE_SMONTHNAME1 "аЄњаЄѕаЄЁа«ЌаЄЇа«ЃаЄ†аЄ°а«Ђ" + LOCALE_SMONTHNAME2 "ફેબ્રુઆરી" + LOCALE_SMONTHNAME3 "аЄ®аЄѕаЄ°а«ЌаЄљ" + LOCALE_SMONTHNAME4 "аЄЏаЄЄа«ЌаЄ°аЄїаЄІ" + LOCALE_SMONTHNAME5 "મે" + LOCALE_SMONTHNAME6 "аЄња«‚аЄЁ" + LOCALE_SMONTHNAME7 "аЄња«ЃаЄІаЄѕаЄ€" + LOCALE_SMONTHNAME8 "аЄ‘аЄ—аЄёа«ЌаЄџ" + LOCALE_SMONTHNAME9 "સપ્ટેમ્બર" + LOCALE_SMONTHNAME10 "аЄ‘аЄ•а«ЌаЄџа«ЌаЄ¬аЄ°" + LOCALE_SMONTHNAME11 "નવેમ્બર" + LOCALE_SMONTHNAME12 "ડિસેમ્બર" + LOCALE_SMONTHNAME13 "" + LOCALE_SMONTHOUSANDSEP "," + LOCALE_SNAME "gu-IN" + LOCALE_SNATIVECTRYNAME "аЄ­аЄѕаЄ°аЄ¤" + LOCALE_SNATIVECURRNAME "аЄ°а«‚аЄЄаЄїаЄЇа«‹" + LOCALE_SNATIVEDIGITS "૦૧૨૩૪૫૬૭૮૯" + LOCALE_SNATIVELANGNAME "аЄ—а«ЃаЄњаЄ°аЄѕаЄ¤а«Ђ" + LOCALE_SNEGATIVESIGN "-" + LOCALE_SPOSITIVESIGN "" + LOCALE_SSCRIPTS "Gujr;" + LOCALE_SSHORTDATE "dd-MM-yy" + LOCALE_SSORTNAME "Default" + LOCALE_STHOUSAND "," + LOCALE_STIME ":" + LOCALE_STIMEFORMAT "HH:mm:ss" + LOCALE_SYEARMONTH "MMMM, yyyy" - LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE L"Western Europe and United States" - LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE L"Central Europe" - LGRPID_BALTIC+LGRPID_RES_BASE L"Baltic" - LGRPID_GREEK+LGRPID_RES_BASE L"Greek" - LGRPID_CYRILLIC+LGRPID_RES_BASE L"Cyrillic" - LGRPID_TURKISH+LGRPID_RES_BASE L"Turkic" - LGRPID_JAPANESE+LGRPID_RES_BASE L"Japanese" - LGRPID_KOREAN+LGRPID_RES_BASE L"Korean" - LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE L"Traditional Chinese" - LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE L"Simplified Chinese" - LGRPID_THAI+LGRPID_RES_BASE L"Thai" - LGRPID_HEBREW+LGRPID_RES_BASE L"Hebrew" - LGRPID_ARABIC+LGRPID_RES_BASE L"Arabic" - LGRPID_VIETNAMESE+LGRPID_RES_BASE L"Vietnamese" - LGRPID_INDIC+LGRPID_RES_BASE L"Indic" - LGRPID_GEORGIAN+LGRPID_RES_BASE L"Georgian" - LGRPID_ARMENIAN+LGRPID_RES_BASE L"Armenian" + LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Western Europe and United States" + LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Central Europe" + LGRPID_BALTIC+LGRPID_RES_BASE "Baltic" + LGRPID_GREEK+LGRPID_RES_BASE "Greek" + LGRPID_CYRILLIC+LGRPID_RES_BASE "Cyrillic" + LGRPID_TURKISH+LGRPID_RES_BASE "Turkic" + LGRPID_JAPANESE+LGRPID_RES_BASE "Japanese" + LGRPID_KOREAN+LGRPID_RES_BASE "Korean" + LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Traditional Chinese" + LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" + LGRPID_THAI+LGRPID_RES_BASE "Thai" + LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" + LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" + LGRPID_INDIC+LGRPID_RES_BASE "Indic" + LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian" + LGRPID_ARMENIAN+LGRPID_RES_BASE "Armenian" } diff --git a/reactos/dll/win32/kernel32/nls/hin.nls b/reactos/dll/win32/kernel32/nls/hin.nls index b336b3c080f..b8893d2722c 100644 --- a/reactos/dll/win32/kernel32/nls/hin.nls +++ b/reactos/dll/win32/kernel32/nls/hin.nls @@ -18,139 +18,139 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma code_page(0) /* Unicode only */ +#pragma code_page(65001) /* UTF-8 */ STRINGTABLE LANGUAGE LANG_HINDI, SUBLANG_DEFAULT { LOCALE_FONTSIGNATURE L"\x802f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x4000\x0003\x0000\x0000\xc5d4" - LOCALE_ICALENDARTYPE L"1" - LOCALE_ICENTURY L"1" - LOCALE_ICOUNTRY L"91" - LOCALE_ICURRDIGITS L"2" - LOCALE_ICURRENCY L"2" - LOCALE_IDATE L"1" - LOCALE_IDAYLZERO L"1" - LOCALE_IDEFAULTANSICODEPAGE L"0" - LOCALE_IDEFAULTCODEPAGE L"1" - LOCALE_IDEFAULTCOUNTRY L"91" - LOCALE_IDEFAULTEBCDICCODEPAGE L"500" - LOCALE_IDEFAULTLANGUAGE L"0439" - LOCALE_IDEFAULTMACCODEPAGE L"2" - LOCALE_IDEFAULTUNIXCODEPAGE L"65001" - LOCALE_IDIGITS L"2" - LOCALE_IDIGITSUBSTITUTION L"1" - LOCALE_IFIRSTDAYOFWEEK L"0" - LOCALE_IFIRSTWEEKOFYEAR L"0" - LOCALE_IINTLCURRDIGITS L"2" - LOCALE_ILANGUAGE L"0439" - LOCALE_ILDATE L"1" - LOCALE_ILZERO L"1" - LOCALE_IMEASURE L"0" - LOCALE_IMONLZERO L"1" - LOCALE_INEGCURR L"12" - LOCALE_INEGNUMBER L"1" - LOCALE_INEGSEPBYSPACE L"1" - LOCALE_INEGSIGNPOSN L"4" - LOCALE_INEGSYMPRECEDES L"1" - LOCALE_IOPTIONALCALENDAR L"0" - LOCALE_IPAPERSIZE L"9" - LOCALE_IPOSSEPBYSPACE L"1" - LOCALE_IPOSSIGNPOSN L"4" - LOCALE_IPOSSYMPRECEDES L"1" - LOCALE_ITIME L"1" - LOCALE_ITIMEMARKPOSN L"1" - LOCALE_ITLZERO L"1" - LOCALE_S1159 L"\x092a\x0942\x0930\x094d\x0935\x093e\x0939\x094d\x0928" - LOCALE_S2359 L"\x0905\x092a\x0930\x093e\x0939\x094d\x0928" - LOCALE_SABBREVCTRYNAME L"IND" - LOCALE_SABBREVDAYNAME1 L"\x0938\x094b\x092e." - LOCALE_SABBREVDAYNAME2 L"\x092e\x0902\x0917\x0932." - LOCALE_SABBREVDAYNAME3 L"\x092c\x0941\x0927." - LOCALE_SABBREVDAYNAME4 L"\x0917\x0941\x0930\x0941." - LOCALE_SABBREVDAYNAME5 L"\x0936\x0941\x0915\x094d\x0930." - LOCALE_SABBREVDAYNAME6 L"\x0936\x0928\x093f." - LOCALE_SABBREVDAYNAME7 L"\x0930\x0935\x093f." - LOCALE_SABBREVLANGNAME L"HIN" - LOCALE_SABBREVMONTHNAME1 L"\x091c\x0928\x0935\x0930\x0940" - LOCALE_SABBREVMONTHNAME2 L"\x092b\x0930\x0935\x0930\x0940" - LOCALE_SABBREVMONTHNAME3 L"\x092e\x093e\x0930\x094d\x091a" - LOCALE_SABBREVMONTHNAME4 L"\x0905\x092a\x094d\x0930\x0948\x0932" - LOCALE_SABBREVMONTHNAME5 L"\x092e\x0908" - LOCALE_SABBREVMONTHNAME6 L"\x091c\x0942\x0928" - LOCALE_SABBREVMONTHNAME7 L"\x091c\x0941\x0932\x093e\x0908" - LOCALE_SABBREVMONTHNAME8 L"\x0905\x0917\x0938\x094d\x0924" - LOCALE_SABBREVMONTHNAME9 L"\x0938\x093f\x0924\x092e\x094d\x092c\x0930" - LOCALE_SABBREVMONTHNAME10 L"\x0905\x0915\x094d\x0924\x0942\x092c\x0930" - LOCALE_SABBREVMONTHNAME11 L"\x0928\x0935\x092e\x094d\x092c\x0930" - LOCALE_SABBREVMONTHNAME12 L"\x0926\x093f\x0938\x092e\x094d\x092c\x0930" - LOCALE_SABBREVMONTHNAME13 L"" - LOCALE_SCOUNTRY L"India" - LOCALE_SCURRENCY L"\x0930\x0941" - LOCALE_SDATE L"-" - LOCALE_SDAYNAME1 L"\x0938\x094b\x092e\x0935\x093e\x0930" - LOCALE_SDAYNAME2 L"\x092e\x0902\x0917\x0932\x0935\x093e\x0930" - LOCALE_SDAYNAME3 L"\x092c\x0941\x0927\x0935\x093e\x0930" - LOCALE_SDAYNAME4 L"\x0917\x0941\x0930\x0941\x0935\x093e\x0930" - LOCALE_SDAYNAME5 L"\x0936\x0941\x0915\x094d\x0930\x0935\x093e\x0930" - LOCALE_SDAYNAME6 L"\x0936\x0928\x093f\x0935\x093e\x0930" - LOCALE_SDAYNAME7 L"\x0930\x0935\x093f\x0935\x093e\x0930" - LOCALE_SDECIMAL L"." - LOCALE_SENGCOUNTRY L"India" - LOCALE_SENGCURRNAME L"Indian Rupee" - LOCALE_SENGLANGUAGE L"Hindi" - LOCALE_SGROUPING L"3;2;0" - LOCALE_SINTLSYMBOL L"INR" - LOCALE_SISO3166CTRYNAME L"IN" - LOCALE_SISO639LANGNAME L"hi" - LOCALE_SLANGUAGE L"Hindi" - LOCALE_SLIST L"," - LOCALE_SLONGDATE L"dd MMMM yyyy" - LOCALE_SMONDECIMALSEP L"." - LOCALE_SMONGROUPING L"3;2;0" - LOCALE_SMONTHNAME1 L"\x091c\x0928\x0935\x0930\x0940" - LOCALE_SMONTHNAME2 L"\x092b\x0930\x0935\x0930\x0940" - LOCALE_SMONTHNAME3 L"\x092e\x093e\x0930\x094d\x091a" - LOCALE_SMONTHNAME4 L"\x0905\x092a\x094d\x0930\x0948\x0932" - LOCALE_SMONTHNAME5 L"\x092e\x0908" - LOCALE_SMONTHNAME6 L"\x091c\x0942\x0928" - LOCALE_SMONTHNAME7 L"\x091c\x0941\x0932\x093e\x0908" - LOCALE_SMONTHNAME8 L"\x0905\x0917\x0938\x094d\x0924" - LOCALE_SMONTHNAME9 L"\x0938\x093f\x0924\x092e\x094d\x092c\x0930" - LOCALE_SMONTHNAME10 L"\x0905\x0915\x094d\x0924\x0942\x092c\x0930" - LOCALE_SMONTHNAME11 L"\x0928\x0935\x092e\x094d\x092c\x0930" - LOCALE_SMONTHNAME12 L"\x0926\x093f\x0938\x092e\x094d\x092c\x0930" - LOCALE_SMONTHNAME13 L"" - LOCALE_SMONTHOUSANDSEP L"," - LOCALE_SNAME L"hi-IN" - LOCALE_SNATIVECTRYNAME L"\x092d\x093e\x0930\x0924" - LOCALE_SNATIVECURRNAME L"\x0930\x0941\x092a\x092f\x093e" - LOCALE_SNATIVEDIGITS L"0123456789" - LOCALE_SNATIVELANGNAME L"\x0939\x093f\x0902\x0926\x0940" - LOCALE_SNEGATIVESIGN L"-" - LOCALE_SPOSITIVESIGN L"" - LOCALE_SSCRIPTS L"Deva;" - LOCALE_SSHORTDATE L"dd-MM-yyyy" - LOCALE_SSORTNAME L"Default" - LOCALE_STHOUSAND L"," - LOCALE_STIME L":" - LOCALE_STIMEFORMAT L"HH:mm:ss" - LOCALE_SYEARMONTH L"MMMM, yyyy" + LOCALE_ICALENDARTYPE "1" + LOCALE_ICENTURY "1" + LOCALE_ICOUNTRY "91" + LOCALE_ICURRDIGITS "2" + LOCALE_ICURRENCY "2" + LOCALE_IDATE "1" + LOCALE_IDAYLZERO "1" + LOCALE_IDEFAULTANSICODEPAGE "0" + LOCALE_IDEFAULTCODEPAGE "1" + LOCALE_IDEFAULTCOUNTRY "91" + LOCALE_IDEFAULTEBCDICCODEPAGE "500" + LOCALE_IDEFAULTLANGUAGE "0439" + LOCALE_IDEFAULTMACCODEPAGE "2" + LOCALE_IDEFAULTUNIXCODEPAGE "65001" + LOCALE_IDIGITS "2" + LOCALE_IDIGITSUBSTITUTION "1" + LOCALE_IFIRSTDAYOFWEEK "0" + LOCALE_IFIRSTWEEKOFYEAR "0" + LOCALE_IINTLCURRDIGITS "2" + LOCALE_ILANGUAGE "0439" + LOCALE_ILDATE "1" + LOCALE_ILZERO "1" + LOCALE_IMEASURE "0" + LOCALE_IMONLZERO "1" + LOCALE_INEGCURR "12" + LOCALE_INEGNUMBER "1" + LOCALE_INEGSEPBYSPACE "1" + LOCALE_INEGSIGNPOSN "4" + LOCALE_INEGSYMPRECEDES "1" + LOCALE_IOPTIONALCALENDAR "0" + LOCALE_IPAPERSIZE "9" + LOCALE_IPOSSEPBYSPACE "1" + LOCALE_IPOSSIGNPOSN "4" + LOCALE_IPOSSYMPRECEDES "1" + LOCALE_ITIME "1" + LOCALE_ITIMEMARKPOSN "1" + LOCALE_ITLZERO "1" + LOCALE_S1159 "पूर्वाह्न" + LOCALE_S2359 "अपराह्न" + LOCALE_SABBREVCTRYNAME "IND" + LOCALE_SABBREVDAYNAME1 "सोम." + LOCALE_SABBREVDAYNAME2 "मंगल." + LOCALE_SABBREVDAYNAME3 "बुध." + LOCALE_SABBREVDAYNAME4 "गुरु." + LOCALE_SABBREVDAYNAME5 "शुक्र." + LOCALE_SABBREVDAYNAME6 "शनि." + LOCALE_SABBREVDAYNAME7 "रवि." + LOCALE_SABBREVLANGNAME "HIN" + LOCALE_SABBREVMONTHNAME1 "जनवरी" + LOCALE_SABBREVMONTHNAME2 "फरवरी" + LOCALE_SABBREVMONTHNAME3 "मार्च" + LOCALE_SABBREVMONTHNAME4 "अप्रैल" + LOCALE_SABBREVMONTHNAME5 "मई" + LOCALE_SABBREVMONTHNAME6 "जून" + LOCALE_SABBREVMONTHNAME7 "जुलाई" + LOCALE_SABBREVMONTHNAME8 "अगस्त" + LOCALE_SABBREVMONTHNAME9 "सितम्बर" + LOCALE_SABBREVMONTHNAME10 "अक्तूबर" + LOCALE_SABBREVMONTHNAME11 "नवम्बर" + LOCALE_SABBREVMONTHNAME12 "दिसम्बर" + LOCALE_SABBREVMONTHNAME13 "" + LOCALE_SCOUNTRY "India" + LOCALE_SCURRENCY "रु" + LOCALE_SDATE "-" + LOCALE_SDAYNAME1 "सोमवार" + LOCALE_SDAYNAME2 "मंगलवार" + LOCALE_SDAYNAME3 "बुधवार" + LOCALE_SDAYNAME4 "गुरुवार" + LOCALE_SDAYNAME5 "शुक्रवार" + LOCALE_SDAYNAME6 "शनिवार" + LOCALE_SDAYNAME7 "रविवार" + LOCALE_SDECIMAL "." + LOCALE_SENGCOUNTRY "India" + LOCALE_SENGCURRNAME "Indian Rupee" + LOCALE_SENGLANGUAGE "Hindi" + LOCALE_SGROUPING "3;2;0" + LOCALE_SINTLSYMBOL "INR" + LOCALE_SISO3166CTRYNAME "IN" + LOCALE_SISO639LANGNAME "hi" + LOCALE_SLANGUAGE "Hindi" + LOCALE_SLIST "," + LOCALE_SLONGDATE "dd MMMM yyyy" + LOCALE_SMONDECIMALSEP "." + LOCALE_SMONGROUPING "3;2;0" + LOCALE_SMONTHNAME1 "जनवरी" + LOCALE_SMONTHNAME2 "फरवरी" + LOCALE_SMONTHNAME3 "मार्च" + LOCALE_SMONTHNAME4 "अप्रैल" + LOCALE_SMONTHNAME5 "मई" + LOCALE_SMONTHNAME6 "जून" + LOCALE_SMONTHNAME7 "जुलाई" + LOCALE_SMONTHNAME8 "अगस्त" + LOCALE_SMONTHNAME9 "सितम्बर" + LOCALE_SMONTHNAME10 "अक्तूबर" + LOCALE_SMONTHNAME11 "नवम्बर" + LOCALE_SMONTHNAME12 "दिसम्बर" + LOCALE_SMONTHNAME13 "" + LOCALE_SMONTHOUSANDSEP "," + LOCALE_SNAME "hi-IN" + LOCALE_SNATIVECTRYNAME "भारत" + LOCALE_SNATIVECURRNAME "रुपया" + LOCALE_SNATIVEDIGITS "0123456789" + LOCALE_SNATIVELANGNAME "हिंदी" + LOCALE_SNEGATIVESIGN "-" + LOCALE_SPOSITIVESIGN "" + LOCALE_SSCRIPTS "Deva;" + LOCALE_SSHORTDATE "dd-MM-yyyy" + LOCALE_SSORTNAME "Default" + LOCALE_STHOUSAND "," + LOCALE_STIME ":" + LOCALE_STIMEFORMAT "HH:mm:ss" + LOCALE_SYEARMONTH "MMMM, yyyy" - LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE L"Western Europe and United States" - LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE L"Central Europe" - LGRPID_BALTIC+LGRPID_RES_BASE L"Baltic" - LGRPID_GREEK+LGRPID_RES_BASE L"Greek" - LGRPID_CYRILLIC+LGRPID_RES_BASE L"Cyrillic" - LGRPID_TURKISH+LGRPID_RES_BASE L"Turkic" - LGRPID_JAPANESE+LGRPID_RES_BASE L"Japanese" - LGRPID_KOREAN+LGRPID_RES_BASE L"Korean" - LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE L"Traditional Chinese" - LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE L"Simplified Chinese" - LGRPID_THAI+LGRPID_RES_BASE L"Thai" - LGRPID_HEBREW+LGRPID_RES_BASE L"Hebrew" - LGRPID_ARABIC+LGRPID_RES_BASE L"Arabic" - LGRPID_VIETNAMESE+LGRPID_RES_BASE L"Vietnamese" - LGRPID_INDIC+LGRPID_RES_BASE L"Indic" - LGRPID_GEORGIAN+LGRPID_RES_BASE L"Georgian" - LGRPID_ARMENIAN+LGRPID_RES_BASE L"Armenian" + LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Western Europe and United States" + LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Central Europe" + LGRPID_BALTIC+LGRPID_RES_BASE "Baltic" + LGRPID_GREEK+LGRPID_RES_BASE "Greek" + LGRPID_CYRILLIC+LGRPID_RES_BASE "Cyrillic" + LGRPID_TURKISH+LGRPID_RES_BASE "Turkic" + LGRPID_JAPANESE+LGRPID_RES_BASE "Japanese" + LGRPID_KOREAN+LGRPID_RES_BASE "Korean" + LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Traditional Chinese" + LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" + LGRPID_THAI+LGRPID_RES_BASE "Thai" + LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" + LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" + LGRPID_INDIC+LGRPID_RES_BASE "Indic" + LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian" + LGRPID_ARMENIAN+LGRPID_RES_BASE "Armenian" } diff --git a/reactos/dll/win32/kernel32/nls/hye.nls b/reactos/dll/win32/kernel32/nls/hye.nls index 507cbfd84ee..dc64d53f0f3 100644 --- a/reactos/dll/win32/kernel32/nls/hye.nls +++ b/reactos/dll/win32/kernel32/nls/hye.nls @@ -18,139 +18,139 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma code_page(0) /* Unicode only */ +#pragma code_page(65001) /* UTF-8 */ STRINGTABLE LANGUAGE LANG_ARMENIAN, SUBLANG_DEFAULT { LOCALE_FONTSIGNATURE L"\x042f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x4000\x0013\x0000\x0000\xc5d4" - LOCALE_ICALENDARTYPE L"1" - LOCALE_ICENTURY L"1" - LOCALE_ICOUNTRY L"374" - LOCALE_ICURRDIGITS L"2" - LOCALE_ICURRENCY L"3" - LOCALE_IDATE L"1" - LOCALE_IDAYLZERO L"1" - LOCALE_IDEFAULTANSICODEPAGE L"0" - LOCALE_IDEFAULTCODEPAGE L"1" - LOCALE_IDEFAULTCOUNTRY L"374" - LOCALE_IDEFAULTEBCDICCODEPAGE L"500" - LOCALE_IDEFAULTLANGUAGE L"042b" - LOCALE_IDEFAULTMACCODEPAGE L"2" - LOCALE_IDEFAULTUNIXCODEPAGE L"65001" - LOCALE_IDIGITS L"2" - LOCALE_IDIGITSUBSTITUTION L"1" - LOCALE_IFIRSTDAYOFWEEK L"0" - LOCALE_IFIRSTWEEKOFYEAR L"0" - LOCALE_IINTLCURRDIGITS L"2" - LOCALE_ILANGUAGE L"042b" - LOCALE_ILDATE L"1" - LOCALE_ILZERO L"1" - LOCALE_IMEASURE L"0" - LOCALE_IMONLZERO L"1" - LOCALE_INEGCURR L"8" - LOCALE_INEGNUMBER L"1" - LOCALE_INEGSEPBYSPACE L"1" - LOCALE_INEGSIGNPOSN L"1" - LOCALE_INEGSYMPRECEDES L"0" - LOCALE_IOPTIONALCALENDAR L"0" - LOCALE_IPAPERSIZE L"9" - LOCALE_IPOSSEPBYSPACE L"1" - LOCALE_IPOSSIGNPOSN L"1" - LOCALE_IPOSSYMPRECEDES L"0" - LOCALE_ITIME L"1" - LOCALE_ITIMEMARKPOSN L"0" - LOCALE_ITLZERO L"0" - LOCALE_S1159 L"" - LOCALE_S2359 L"" - LOCALE_SABBREVCTRYNAME L"ARM" - LOCALE_SABBREVDAYNAME1 L"\x0535\x0580\x056f" - LOCALE_SABBREVDAYNAME2 L"\x0535\x0580\x0584" - LOCALE_SABBREVDAYNAME3 L"\x0549\x0580\x0584" - LOCALE_SABBREVDAYNAME4 L"\x0540\x0576\x0563" - LOCALE_SABBREVDAYNAME5 L"\x0548\x0552\x0580" - LOCALE_SABBREVDAYNAME6 L"\x0547\x0562\x0569" - LOCALE_SABBREVDAYNAME7 L"\x053f\x056b\x0580" - LOCALE_SABBREVLANGNAME L"HYE" - LOCALE_SABBREVMONTHNAME1 L"\x0540\x0546\x054e" - LOCALE_SABBREVMONTHNAME2 L"\x0553\x054f\x054e" - LOCALE_SABBREVMONTHNAME3 L"\x0544\x0550\x054f" - LOCALE_SABBREVMONTHNAME4 L"\x0531\x054a\x0550" - LOCALE_SABBREVMONTHNAME5 L"\x0544\x0545\x054d" - LOCALE_SABBREVMONTHNAME6 L"\x0540\x0546\x054d" - LOCALE_SABBREVMONTHNAME7 L"\x0540\x053c\x054d" - LOCALE_SABBREVMONTHNAME8 L"\x0555\x0533\x054d" - LOCALE_SABBREVMONTHNAME9 L"\x054d\x0535\x054a" - LOCALE_SABBREVMONTHNAME10 L"\x0540\x0548\x053f" - LOCALE_SABBREVMONTHNAME11 L"\x0546\x0548\x0545" - LOCALE_SABBREVMONTHNAME12 L"\x0534\x0535\x053f" - LOCALE_SABBREVMONTHNAME13 L"" - LOCALE_SCOUNTRY L"Armenia" - LOCALE_SCURRENCY L"\x0564\x0580." - LOCALE_SDATE L"." - LOCALE_SDAYNAME1 L"\x0535\x0580\x056f\x0578\x0582\x0577\x0561\x0562\x0569\x056b" - LOCALE_SDAYNAME2 L"\x0535\x0580\x0565\x0584\x0577\x0561\x0562\x0569\x056b" - LOCALE_SDAYNAME3 L"\x0549\x0578\x0580\x0565\x0584\x0577\x0561\x0562\x0569\x056b" - LOCALE_SDAYNAME4 L"\x0540\x056b\x0576\x0563\x0577\x0561\x0562\x0569\x056b" - LOCALE_SDAYNAME5 L"\x0548\x0552\x0580\x0562\x0561\x0569" - LOCALE_SDAYNAME6 L"\x0547\x0561\x0562\x0561\x0569" - LOCALE_SDAYNAME7 L"\x053f\x056b\x0580\x0561\x056f\x056b" - LOCALE_SDECIMAL L"." - LOCALE_SENGCOUNTRY L"Armenia" - LOCALE_SENGCURRNAME L"Armenian Dram" - LOCALE_SENGLANGUAGE L"Armenian" - LOCALE_SGROUPING L"3;0" - LOCALE_SINTLSYMBOL L"AMD" - LOCALE_SISO3166CTRYNAME L"AM" - LOCALE_SISO639LANGNAME L"hy" - LOCALE_SLANGUAGE L"Armenian" - LOCALE_SLIST L"," - LOCALE_SLONGDATE L"d MMMM, yyyy" - LOCALE_SMONDECIMALSEP L"." - LOCALE_SMONGROUPING L"3;0" - LOCALE_SMONTHNAME1 L"\x0540\x0578\x0582\x0576\x057e\x0561\x0580" - LOCALE_SMONTHNAME2 L"\x0553\x0565\x057f\x0580\x057e\x0561\x0580" - LOCALE_SMONTHNAME3 L"\x0544\x0561\x0580\x057f" - LOCALE_SMONTHNAME4 L"\x0531\x057a\x0580\x056b\x056c" - LOCALE_SMONTHNAME5 L"\x0544\x0561\x0575\x056b\x057d" - LOCALE_SMONTHNAME6 L"\x0540\x0578\x0582\x0576\x056b\x057d" - LOCALE_SMONTHNAME7 L"\x0540\x0578\x0582\x056c\x056b\x057d" - LOCALE_SMONTHNAME8 L"\x0555\x0563\x0578\x057d\x057f\x0578\x057d" - LOCALE_SMONTHNAME9 L"\x054d\x0565\x057a\x057f\x0565\x0574\x0562\x0565\x0580" - LOCALE_SMONTHNAME10 L"\x0540\x0578\x056f\x057f\x0565\x0574\x0562\x0565\x0580" - LOCALE_SMONTHNAME11 L"\x0546\x0578\x0575\x0565\x0574\x0562\x0565\x0580" - LOCALE_SMONTHNAME12 L"\x0534\x0565\x056f\x057f\x0565\x0574\x0562\x0565\x0580" - LOCALE_SMONTHNAME13 L"" - LOCALE_SMONTHOUSANDSEP L"," - LOCALE_SNAME L"hy-AM" - LOCALE_SNATIVECTRYNAME L"\x0540\x0561\x0575\x0561\x057d\x057f\x0561\x0576" - LOCALE_SNATIVECURRNAME L"\x0564\x0580\x0561\x0574" - LOCALE_SNATIVEDIGITS L"0123456789" - LOCALE_SNATIVELANGNAME L"\x0540\x0561\x0575\x0565\x0580\x0565\x0576" - LOCALE_SNEGATIVESIGN L"-" - LOCALE_SPOSITIVESIGN L"" - LOCALE_SSCRIPTS L"Armn;" - LOCALE_SSHORTDATE L"dd.MM.yyyy" - LOCALE_SSORTNAME L"Default" - LOCALE_STHOUSAND L"," - LOCALE_STIME L":" - LOCALE_STIMEFORMAT L"H:mm:ss" - LOCALE_SYEARMONTH L"MMMM, yyyy" + LOCALE_ICALENDARTYPE "1" + LOCALE_ICENTURY "1" + LOCALE_ICOUNTRY "374" + LOCALE_ICURRDIGITS "2" + LOCALE_ICURRENCY "3" + LOCALE_IDATE "1" + LOCALE_IDAYLZERO "1" + LOCALE_IDEFAULTANSICODEPAGE "0" + LOCALE_IDEFAULTCODEPAGE "1" + LOCALE_IDEFAULTCOUNTRY "374" + LOCALE_IDEFAULTEBCDICCODEPAGE "500" + LOCALE_IDEFAULTLANGUAGE "042b" + LOCALE_IDEFAULTMACCODEPAGE "2" + LOCALE_IDEFAULTUNIXCODEPAGE "65001" + LOCALE_IDIGITS "2" + LOCALE_IDIGITSUBSTITUTION "1" + LOCALE_IFIRSTDAYOFWEEK "0" + LOCALE_IFIRSTWEEKOFYEAR "0" + LOCALE_IINTLCURRDIGITS "2" + LOCALE_ILANGUAGE "042b" + LOCALE_ILDATE "1" + LOCALE_ILZERO "1" + LOCALE_IMEASURE "0" + LOCALE_IMONLZERO "1" + LOCALE_INEGCURR "8" + LOCALE_INEGNUMBER "1" + LOCALE_INEGSEPBYSPACE "1" + LOCALE_INEGSIGNPOSN "1" + LOCALE_INEGSYMPRECEDES "0" + LOCALE_IOPTIONALCALENDAR "0" + LOCALE_IPAPERSIZE "9" + LOCALE_IPOSSEPBYSPACE "1" + LOCALE_IPOSSIGNPOSN "1" + LOCALE_IPOSSYMPRECEDES "0" + LOCALE_ITIME "1" + LOCALE_ITIMEMARKPOSN "0" + LOCALE_ITLZERO "0" + LOCALE_S1159 "" + LOCALE_S2359 "" + LOCALE_SABBREVCTRYNAME "ARM" + LOCALE_SABBREVDAYNAME1 "ФµЦЂХЇ" + LOCALE_SABBREVDAYNAME2 "ФµЦЂЦ„" + LOCALE_SABBREVDAYNAME3 "Х‰ЦЂЦ„" + LOCALE_SABBREVDAYNAME4 "ХЂХ¶ХЈ" + LOCALE_SABBREVDAYNAME5 "Х€Х’ЦЂ" + LOCALE_SABBREVDAYNAME6 "Х‡ХўХ©" + LOCALE_SABBREVDAYNAME7 "ФїХ«ЦЂ" + LOCALE_SABBREVLANGNAME "HYE" + LOCALE_SABBREVMONTHNAME1 "ХЂХ†ХЋ" + LOCALE_SABBREVMONTHNAME2 "Х“ХЏХЋ" + LOCALE_SABBREVMONTHNAME3 "Х„ХђХЏ" + LOCALE_SABBREVMONTHNAME4 "Ф±ХЉХђ" + LOCALE_SABBREVMONTHNAME5 "Х„Х…ХЌ" + LOCALE_SABBREVMONTHNAME6 "ХЂХ†ХЌ" + LOCALE_SABBREVMONTHNAME7 "ХЂФјХЌ" + LOCALE_SABBREVMONTHNAME8 "Х•ФіХЌ" + LOCALE_SABBREVMONTHNAME9 "ХЌФµХЉ" + LOCALE_SABBREVMONTHNAME10 "ХЂХ€Фї" + LOCALE_SABBREVMONTHNAME11 "Х†Х€Х…" + LOCALE_SABBREVMONTHNAME12 "ФґФµФї" + LOCALE_SABBREVMONTHNAME13 "" + LOCALE_SCOUNTRY "Armenia" + LOCALE_SCURRENCY "Х¤ЦЂ." + LOCALE_SDATE "." + LOCALE_SDAYNAME1 "ФµЦЂХЇХёЦ‚Х·ХЎХўХ©Х«" + LOCALE_SDAYNAME2 "ФµЦЂХҐЦ„Х·ХЎХўХ©Х«" + LOCALE_SDAYNAME3 "Х‰ХёЦЂХҐЦ„Х·ХЎХўХ©Х«" + LOCALE_SDAYNAME4 "ХЂХ«Х¶ХЈХ·ХЎХўХ©Х«" + LOCALE_SDAYNAME5 "Х€Х’ЦЂХўХЎХ©" + LOCALE_SDAYNAME6 "Х‡ХЎХўХЎХ©" + LOCALE_SDAYNAME7 "ФїХ«ЦЂХЎХЇХ«" + LOCALE_SDECIMAL "." + LOCALE_SENGCOUNTRY "Armenia" + LOCALE_SENGCURRNAME "Armenian Dram" + LOCALE_SENGLANGUAGE "Armenian" + LOCALE_SGROUPING "3;0" + LOCALE_SINTLSYMBOL "AMD" + LOCALE_SISO3166CTRYNAME "AM" + LOCALE_SISO639LANGNAME "hy" + LOCALE_SLANGUAGE "Armenian" + LOCALE_SLIST "," + LOCALE_SLONGDATE "d MMMM, yyyy" + LOCALE_SMONDECIMALSEP "." + LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHNAME1 "ХЂХёЦ‚Х¶ХѕХЎЦЂ" + LOCALE_SMONTHNAME2 "Х“ХҐХїЦЂХѕХЎЦЂ" + LOCALE_SMONTHNAME3 "Х„ХЎЦЂХї" + LOCALE_SMONTHNAME4 "Ф±ХєЦЂХ«Х¬" + LOCALE_SMONTHNAME5 "Х„ХЎХµХ«ХЅ" + LOCALE_SMONTHNAME6 "ХЂХёЦ‚Х¶Х«ХЅ" + LOCALE_SMONTHNAME7 "ХЂХёЦ‚Х¬Х«ХЅ" + LOCALE_SMONTHNAME8 "Х•ХЈХёХЅХїХёХЅ" + LOCALE_SMONTHNAME9 "ХЌХҐХєХїХҐХґХўХҐЦЂ" + LOCALE_SMONTHNAME10 "ХЂХёХЇХїХҐХґХўХҐЦЂ" + LOCALE_SMONTHNAME11 "Х†ХёХµХҐХґХўХҐЦЂ" + LOCALE_SMONTHNAME12 "ФґХҐХЇХїХҐХґХўХҐЦЂ" + LOCALE_SMONTHNAME13 "" + LOCALE_SMONTHOUSANDSEP "," + LOCALE_SNAME "hy-AM" + LOCALE_SNATIVECTRYNAME "ХЂХЎХµХЎХЅХїХЎХ¶" + LOCALE_SNATIVECURRNAME "Х¤ЦЂХЎХґ" + LOCALE_SNATIVEDIGITS "0123456789" + LOCALE_SNATIVELANGNAME "ХЂХЎХµХҐЦЂХҐХ¶" + LOCALE_SNEGATIVESIGN "-" + LOCALE_SPOSITIVESIGN "" + LOCALE_SSCRIPTS "Armn;" + LOCALE_SSHORTDATE "dd.MM.yyyy" + LOCALE_SSORTNAME "Default" + LOCALE_STHOUSAND "," + LOCALE_STIME ":" + LOCALE_STIMEFORMAT "H:mm:ss" + LOCALE_SYEARMONTH "MMMM, yyyy" - LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE L"Western Europe and United States" - LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE L"Central Europe" - LGRPID_BALTIC+LGRPID_RES_BASE L"Baltic" - LGRPID_GREEK+LGRPID_RES_BASE L"Greek" - LGRPID_CYRILLIC+LGRPID_RES_BASE L"Cyrillic" - LGRPID_TURKISH+LGRPID_RES_BASE L"Turkic" - LGRPID_JAPANESE+LGRPID_RES_BASE L"Japanese" - LGRPID_KOREAN+LGRPID_RES_BASE L"Korean" - LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE L"Traditional Chinese" - LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE L"Simplified Chinese" - LGRPID_THAI+LGRPID_RES_BASE L"Thai" - LGRPID_HEBREW+LGRPID_RES_BASE L"Hebrew" - LGRPID_ARABIC+LGRPID_RES_BASE L"Arabic" - LGRPID_VIETNAMESE+LGRPID_RES_BASE L"Vietnamese" - LGRPID_INDIC+LGRPID_RES_BASE L"Indic" - LGRPID_GEORGIAN+LGRPID_RES_BASE L"Georgian" - LGRPID_ARMENIAN+LGRPID_RES_BASE L"Armenian" + LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Western Europe and United States" + LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Central Europe" + LGRPID_BALTIC+LGRPID_RES_BASE "Baltic" + LGRPID_GREEK+LGRPID_RES_BASE "Greek" + LGRPID_CYRILLIC+LGRPID_RES_BASE "Cyrillic" + LGRPID_TURKISH+LGRPID_RES_BASE "Turkic" + LGRPID_JAPANESE+LGRPID_RES_BASE "Japanese" + LGRPID_KOREAN+LGRPID_RES_BASE "Korean" + LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Traditional Chinese" + LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" + LGRPID_THAI+LGRPID_RES_BASE "Thai" + LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" + LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" + LGRPID_INDIC+LGRPID_RES_BASE "Indic" + LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian" + LGRPID_ARMENIAN+LGRPID_RES_BASE "Armenian" } diff --git a/reactos/dll/win32/kernel32/nls/kan.nls b/reactos/dll/win32/kernel32/nls/kan.nls index dc58af47b8c..725ba84e471 100644 --- a/reactos/dll/win32/kernel32/nls/kan.nls +++ b/reactos/dll/win32/kernel32/nls/kan.nls @@ -18,139 +18,139 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma code_page(0) /* Unicode only */ +#pragma code_page(65001) /* UTF-8 */ STRINGTABLE LANGUAGE LANG_KANNADA, SUBLANG_DEFAULT { LOCALE_FONTSIGNATURE L"\x002f\x8040\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x4000\x0003\x0000\x0000\xc5d4" - LOCALE_ICALENDARTYPE L"1" - LOCALE_ICENTURY L"0" - LOCALE_ICOUNTRY L"91" - LOCALE_ICURRDIGITS L"2" - LOCALE_ICURRENCY L"2" - LOCALE_IDATE L"1" - LOCALE_IDAYLZERO L"1" - LOCALE_IDEFAULTANSICODEPAGE L"0" - LOCALE_IDEFAULTCODEPAGE L"1" - LOCALE_IDEFAULTCOUNTRY L"91" - LOCALE_IDEFAULTEBCDICCODEPAGE L"500" - LOCALE_IDEFAULTLANGUAGE L"044b" - LOCALE_IDEFAULTMACCODEPAGE L"2" - LOCALE_IDEFAULTUNIXCODEPAGE L"65001" - LOCALE_IDIGITS L"2" - LOCALE_IDIGITSUBSTITUTION L"1" - LOCALE_IFIRSTDAYOFWEEK L"0" - LOCALE_IFIRSTWEEKOFYEAR L"0" - LOCALE_IINTLCURRDIGITS L"2" - LOCALE_ILANGUAGE L"044b" - LOCALE_ILDATE L"1" - LOCALE_ILZERO L"1" - LOCALE_IMEASURE L"0" - LOCALE_IMONLZERO L"1" - LOCALE_INEGCURR L"12" - LOCALE_INEGNUMBER L"1" - LOCALE_INEGSEPBYSPACE L"1" - LOCALE_INEGSIGNPOSN L"4" - LOCALE_INEGSYMPRECEDES L"1" - LOCALE_IOPTIONALCALENDAR L"0" - LOCALE_IPAPERSIZE L"9" - LOCALE_IPOSSEPBYSPACE L"1" - LOCALE_IPOSSIGNPOSN L"4" - LOCALE_IPOSSYMPRECEDES L"1" - LOCALE_ITIME L"1" - LOCALE_ITIMEMARKPOSN L"1" - LOCALE_ITLZERO L"1" - LOCALE_S1159 L"\x0caa\x0cc2\x0cb0\x0ccd\x0cb5\x0cbe\x0cb9\x0ccd\x0ca8" - LOCALE_S2359 L"\x0c85\x0caa\x0cb0\x0cbe\x0cb9\x0ccd\x0ca8" - LOCALE_SABBREVCTRYNAME L"IND" - LOCALE_SABBREVDAYNAME1 L"\x0cb8\x0ccb." - LOCALE_SABBREVDAYNAME2 L"\x0cae\x0c82." - LOCALE_SABBREVDAYNAME3 L"\x0cac\x0cc1." - LOCALE_SABBREVDAYNAME4 L"\x0c97\x0cc1." - LOCALE_SABBREVDAYNAME5 L"\x0cb6\x0cc1." - LOCALE_SABBREVDAYNAME6 L"\x0cb6\x0ca8\x0cbf." - LOCALE_SABBREVDAYNAME7 L"\x0cb0." - LOCALE_SABBREVLANGNAME L"KAN" - LOCALE_SABBREVMONTHNAME1 L"\x0c9c\x0ca8\x0cb5\x0cb0\x0cc0" - LOCALE_SABBREVMONTHNAME2 L"\x0cab\x0cc6\x0cac\x0ccd\x0cb0\x0cb5\x0cb0\x0cc0" - LOCALE_SABBREVMONTHNAME3 L"\x0cae\x0cbe\x0cb0\x0ccd\x0c9a\x0ccd" - LOCALE_SABBREVMONTHNAME4 L"\x0c8e\x0caa\x0ccd\x0cb0\x0cbf\x0cb2\x0ccd" - LOCALE_SABBREVMONTHNAME5 L"\x0cae\x0cc6" - LOCALE_SABBREVMONTHNAME6 L"\x0c9c\x0cc2\x0ca8\x0ccd" - LOCALE_SABBREVMONTHNAME7 L"\x0c9c\x0cc1\x0cb2\x0cc8" - LOCALE_SABBREVMONTHNAME8 L"\x0c86\x0c97\x0cb8\x0ccd\x0c9f\x0ccd" - LOCALE_SABBREVMONTHNAME9 L"\x0cb8\x0caa\x0ccd\x0c9f\x0cc6\x0c82\x0cac\x0cb0\x0ccd" - LOCALE_SABBREVMONTHNAME10 L"\x0c85\x0c95\x0ccd\x0c9f\x0ccb\x0cac\x0cb0\x0ccd" - LOCALE_SABBREVMONTHNAME11 L"\x0ca8\x0cb5\x0cc6\x0c82\x0cac\x0cb0\x0ccd" - LOCALE_SABBREVMONTHNAME12 L"\x0ca1\x0cbf\x0cb8\x0cc6\x0c82\x0cac\x0cb0\x0ccd" - LOCALE_SABBREVMONTHNAME13 L"" - LOCALE_SCOUNTRY L"India" - LOCALE_SCURRENCY L"\x0cb0\x0cc2" - LOCALE_SDATE L"-" - LOCALE_SDAYNAME1 L"\x0cb8\x0ccb\x0cae\x0cb5\x0cbe\x0cb0" - LOCALE_SDAYNAME2 L"\x0cae\x0c82\x0c97\x0cb3\x0cb5\x0cbe\x0cb0" - LOCALE_SDAYNAME3 L"\x0cac\x0cc1\x0ca7\x0cb5\x0cbe\x0cb0" - LOCALE_SDAYNAME4 L"\x0c97\x0cc1\x0cb0\x0cc1\x0cb5\x0cbe\x0cb0" - LOCALE_SDAYNAME5 L"\x0cb6\x0cc1\x0c95\x0ccd\x0cb0\x0cb5\x0cbe\x0cb0" - LOCALE_SDAYNAME6 L"\x0cb6\x0ca8\x0cbf\x0cb5\x0cbe\x0cb0" - LOCALE_SDAYNAME7 L"\x0cb0\x0cb5\x0cbf\x0cb5\x0cbe\x0cb0" - LOCALE_SDECIMAL L"." - LOCALE_SENGCOUNTRY L"India" - LOCALE_SENGCURRNAME L"Indian Rupee" - LOCALE_SENGLANGUAGE L"Kannada" - LOCALE_SGROUPING L"3;2;0" - LOCALE_SINTLSYMBOL L"INR" - LOCALE_SISO3166CTRYNAME L"IN" - LOCALE_SISO639LANGNAME L"kn" - LOCALE_SLANGUAGE L"Kannada" - LOCALE_SLIST L"," - LOCALE_SLONGDATE L"dd MMMM yyyy" - LOCALE_SMONDECIMALSEP L"." - LOCALE_SMONGROUPING L"3;2;0" - LOCALE_SMONTHNAME1 L"\x0c9c\x0ca8\x0cb5\x0cb0\x0cc0" - LOCALE_SMONTHNAME2 L"\x0cab\x0cc6\x0cac\x0ccd\x0cb0\x0cb5\x0cb0\x0cc0" - LOCALE_SMONTHNAME3 L"\x0cae\x0cbe\x0cb0\x0ccd\x0c9a\x0ccd" - LOCALE_SMONTHNAME4 L"\x0c8e\x0caa\x0ccd\x0cb0\x0cbf\x0cb2\x0ccd" - LOCALE_SMONTHNAME5 L"\x0cae\x0cc6" - LOCALE_SMONTHNAME6 L"\x0c9c\x0cc2\x0ca8\x0ccd" - LOCALE_SMONTHNAME7 L"\x0c9c\x0cc1\x0cb2\x0cc8" - LOCALE_SMONTHNAME8 L"\x0c86\x0c97\x0cb8\x0ccd\x0c9f\x0ccd" - LOCALE_SMONTHNAME9 L"\x0cb8\x0caa\x0ccd\x0c9f\x0cc6\x0c82\x0cac\x0cb0\x0ccd" - LOCALE_SMONTHNAME10 L"\x0c85\x0c95\x0ccd\x0c9f\x0ccb\x0cac\x0cb0\x0ccd" - LOCALE_SMONTHNAME11 L"\x0ca8\x0cb5\x0cc6\x0c82\x0cac\x0cb0\x0ccd" - LOCALE_SMONTHNAME12 L"\x0ca1\x0cbf\x0cb8\x0cc6\x0c82\x0cac\x0cb0\x0ccd" - LOCALE_SMONTHNAME13 L"" - LOCALE_SMONTHOUSANDSEP L"," - LOCALE_SNAME L"kn-IN" - LOCALE_SNATIVECTRYNAME L"\x0cad\x0cbe\x0cb0\x0ca4" - LOCALE_SNATIVECURRNAME L"\x0cb0\x0cc2\x0caa\x0cbe\x0caf\x0cbf" - LOCALE_SNATIVEDIGITS L"\x0ce6\x0ce7\x0ce8\x0ce9\x0cea\x0ceb\x0cec\x0ced\x0cee\x0cef" - LOCALE_SNATIVELANGNAME L"\x0c95\x0ca8\x0ccd\x0ca8\x0ca1" - LOCALE_SNEGATIVESIGN L"-" - LOCALE_SPOSITIVESIGN L"" - LOCALE_SSCRIPTS L"Knda;" - LOCALE_SSHORTDATE L"dd-MM-yy" - LOCALE_SSORTNAME L"Default" - LOCALE_STHOUSAND L"," - LOCALE_STIME L":" - LOCALE_STIMEFORMAT L"HH:mm:ss" - LOCALE_SYEARMONTH L"MMMM, yyyy" + LOCALE_ICALENDARTYPE "1" + LOCALE_ICENTURY "0" + LOCALE_ICOUNTRY "91" + LOCALE_ICURRDIGITS "2" + LOCALE_ICURRENCY "2" + LOCALE_IDATE "1" + LOCALE_IDAYLZERO "1" + LOCALE_IDEFAULTANSICODEPAGE "0" + LOCALE_IDEFAULTCODEPAGE "1" + LOCALE_IDEFAULTCOUNTRY "91" + LOCALE_IDEFAULTEBCDICCODEPAGE "500" + LOCALE_IDEFAULTLANGUAGE "044b" + LOCALE_IDEFAULTMACCODEPAGE "2" + LOCALE_IDEFAULTUNIXCODEPAGE "65001" + LOCALE_IDIGITS "2" + LOCALE_IDIGITSUBSTITUTION "1" + LOCALE_IFIRSTDAYOFWEEK "0" + LOCALE_IFIRSTWEEKOFYEAR "0" + LOCALE_IINTLCURRDIGITS "2" + LOCALE_ILANGUAGE "044b" + LOCALE_ILDATE "1" + LOCALE_ILZERO "1" + LOCALE_IMEASURE "0" + LOCALE_IMONLZERO "1" + LOCALE_INEGCURR "12" + LOCALE_INEGNUMBER "1" + LOCALE_INEGSEPBYSPACE "1" + LOCALE_INEGSIGNPOSN "4" + LOCALE_INEGSYMPRECEDES "1" + LOCALE_IOPTIONALCALENDAR "0" + LOCALE_IPAPERSIZE "9" + LOCALE_IPOSSEPBYSPACE "1" + LOCALE_IPOSSIGNPOSN "4" + LOCALE_IPOSSYMPRECEDES "1" + LOCALE_ITIME "1" + LOCALE_ITIMEMARKPOSN "1" + LOCALE_ITLZERO "1" + LOCALE_S1159 "аІЄаі‚аІ°аіЌаІµаІѕаІ№аіЌаІЁ" + LOCALE_S2359 "аІ…аІЄаІ°аІѕаІ№аіЌаІЁ" + LOCALE_SABBREVCTRYNAME "IND" + LOCALE_SABBREVDAYNAME1 "аІёаі‹." + LOCALE_SABBREVDAYNAME2 "аІ®аІ‚." + LOCALE_SABBREVDAYNAME3 "аІ¬аіЃ." + LOCALE_SABBREVDAYNAME4 "аІ—аіЃ." + LOCALE_SABBREVDAYNAME5 "аІ¶аіЃ." + LOCALE_SABBREVDAYNAME6 "аІ¶аІЁаІї." + LOCALE_SABBREVDAYNAME7 "аІ°." + LOCALE_SABBREVLANGNAME "KAN" + LOCALE_SABBREVMONTHNAME1 "аІњаІЁаІµаІ°аіЂ" + LOCALE_SABBREVMONTHNAME2 "аІ«аі†аІ¬аіЌаІ°аІµаІ°аіЂ" + LOCALE_SABBREVMONTHNAME3 "аІ®аІѕаІ°аіЌаІљаіЌ" + LOCALE_SABBREVMONTHNAME4 "аІЋаІЄаіЌаІ°аІїаІІаіЌ" + LOCALE_SABBREVMONTHNAME5 "аІ®аі†" + LOCALE_SABBREVMONTHNAME6 "аІњаі‚аІЁаіЌ" + LOCALE_SABBREVMONTHNAME7 "аІњаіЃаІІаі€" + LOCALE_SABBREVMONTHNAME8 "аІ†аІ—аІёаіЌаІџаіЌ" + LOCALE_SABBREVMONTHNAME9 "аІёаІЄаіЌаІџаі†аІ‚аІ¬аІ°аіЌ" + LOCALE_SABBREVMONTHNAME10 "аІ…аІ•аіЌаІџаі‹аІ¬аІ°аіЌ" + LOCALE_SABBREVMONTHNAME11 "аІЁаІµаі†аІ‚аІ¬аІ°аіЌ" + LOCALE_SABBREVMONTHNAME12 "аІЎаІїаІёаі†аІ‚аІ¬аІ°аіЌ" + LOCALE_SABBREVMONTHNAME13 "" + LOCALE_SCOUNTRY "India" + LOCALE_SCURRENCY "аІ°аі‚" + LOCALE_SDATE "-" + LOCALE_SDAYNAME1 "аІёаі‹аІ®аІµаІѕаІ°" + LOCALE_SDAYNAME2 "аІ®аІ‚аІ—аІіаІµаІѕаІ°" + LOCALE_SDAYNAME3 "аІ¬аіЃаІ§аІµаІѕаІ°" + LOCALE_SDAYNAME4 "аІ—аіЃаІ°аіЃаІµаІѕаІ°" + LOCALE_SDAYNAME5 "аІ¶аіЃаІ•аіЌаІ°аІµаІѕаІ°" + LOCALE_SDAYNAME6 "аІ¶аІЁаІїаІµаІѕаІ°" + LOCALE_SDAYNAME7 "аІ°аІµаІїаІµаІѕаІ°" + LOCALE_SDECIMAL "." + LOCALE_SENGCOUNTRY "India" + LOCALE_SENGCURRNAME "Indian Rupee" + LOCALE_SENGLANGUAGE "Kannada" + LOCALE_SGROUPING "3;2;0" + LOCALE_SINTLSYMBOL "INR" + LOCALE_SISO3166CTRYNAME "IN" + LOCALE_SISO639LANGNAME "kn" + LOCALE_SLANGUAGE "Kannada" + LOCALE_SLIST "," + LOCALE_SLONGDATE "dd MMMM yyyy" + LOCALE_SMONDECIMALSEP "." + LOCALE_SMONGROUPING "3;2;0" + LOCALE_SMONTHNAME1 "аІњаІЁаІµаІ°аіЂ" + LOCALE_SMONTHNAME2 "аІ«аі†аІ¬аіЌаІ°аІµаІ°аіЂ" + LOCALE_SMONTHNAME3 "аІ®аІѕаІ°аіЌаІљаіЌ" + LOCALE_SMONTHNAME4 "аІЋаІЄаіЌаІ°аІїаІІаіЌ" + LOCALE_SMONTHNAME5 "аІ®аі†" + LOCALE_SMONTHNAME6 "аІњаі‚аІЁаіЌ" + LOCALE_SMONTHNAME7 "аІњаіЃаІІаі€" + LOCALE_SMONTHNAME8 "аІ†аІ—аІёаіЌаІџаіЌ" + LOCALE_SMONTHNAME9 "аІёаІЄаіЌаІџаі†аІ‚аІ¬аІ°аіЌ" + LOCALE_SMONTHNAME10 "аІ…аІ•аіЌаІџаі‹аІ¬аІ°аіЌ" + LOCALE_SMONTHNAME11 "аІЁаІµаі†аІ‚аІ¬аІ°аіЌ" + LOCALE_SMONTHNAME12 "аІЎаІїаІёаі†аІ‚аІ¬аІ°аіЌ" + LOCALE_SMONTHNAME13 "" + LOCALE_SMONTHOUSANDSEP "," + LOCALE_SNAME "kn-IN" + LOCALE_SNATIVECTRYNAME "аІ­аІѕаІ°аІ¤" + LOCALE_SNATIVECURRNAME "аІ°аі‚аІЄаІѕаІЇаІї" + LOCALE_SNATIVEDIGITS "аі¦аі§аіЁаі©аіЄаі«аі¬аі­аі®аіЇ" + LOCALE_SNATIVELANGNAME "аІ•аІЁаіЌаІЁаІЎ" + LOCALE_SNEGATIVESIGN "-" + LOCALE_SPOSITIVESIGN "" + LOCALE_SSCRIPTS "Knda;" + LOCALE_SSHORTDATE "dd-MM-yy" + LOCALE_SSORTNAME "Default" + LOCALE_STHOUSAND "," + LOCALE_STIME ":" + LOCALE_STIMEFORMAT "HH:mm:ss" + LOCALE_SYEARMONTH "MMMM, yyyy" - LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE L"Western Europe and United States" - LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE L"Central Europe" - LGRPID_BALTIC+LGRPID_RES_BASE L"Baltic" - LGRPID_GREEK+LGRPID_RES_BASE L"Greek" - LGRPID_CYRILLIC+LGRPID_RES_BASE L"Cyrillic" - LGRPID_TURKISH+LGRPID_RES_BASE L"Turkic" - LGRPID_JAPANESE+LGRPID_RES_BASE L"Japanese" - LGRPID_KOREAN+LGRPID_RES_BASE L"Korean" - LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE L"Traditional Chinese" - LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE L"Simplified Chinese" - LGRPID_THAI+LGRPID_RES_BASE L"Thai" - LGRPID_HEBREW+LGRPID_RES_BASE L"Hebrew" - LGRPID_ARABIC+LGRPID_RES_BASE L"Arabic" - LGRPID_VIETNAMESE+LGRPID_RES_BASE L"Vietnamese" - LGRPID_INDIC+LGRPID_RES_BASE L"Indic" - LGRPID_GEORGIAN+LGRPID_RES_BASE L"Georgian" - LGRPID_ARMENIAN+LGRPID_RES_BASE L"Armenian" + LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Western Europe and United States" + LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Central Europe" + LGRPID_BALTIC+LGRPID_RES_BASE "Baltic" + LGRPID_GREEK+LGRPID_RES_BASE "Greek" + LGRPID_CYRILLIC+LGRPID_RES_BASE "Cyrillic" + LGRPID_TURKISH+LGRPID_RES_BASE "Turkic" + LGRPID_JAPANESE+LGRPID_RES_BASE "Japanese" + LGRPID_KOREAN+LGRPID_RES_BASE "Korean" + LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Traditional Chinese" + LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" + LGRPID_THAI+LGRPID_RES_BASE "Thai" + LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" + LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" + LGRPID_INDIC+LGRPID_RES_BASE "Indic" + LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian" + LGRPID_ARMENIAN+LGRPID_RES_BASE "Armenian" } diff --git a/reactos/dll/win32/kernel32/nls/kat.nls b/reactos/dll/win32/kernel32/nls/kat.nls index 52002fa75ca..d9d1430bb45 100644 --- a/reactos/dll/win32/kernel32/nls/kat.nls +++ b/reactos/dll/win32/kernel32/nls/kat.nls @@ -18,139 +18,139 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma code_page(0) /* Unicode only */ +#pragma code_page(65001) /* UTF-8 */ STRINGTABLE LANGUAGE LANG_GEORGIAN, SUBLANG_DEFAULT { LOCALE_FONTSIGNATURE L"\x002f\x8400\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x4000\x0013\x0000\x0000\xc5d4" - LOCALE_ICALENDARTYPE L"1" - LOCALE_ICENTURY L"1" - LOCALE_ICOUNTRY L"995" - LOCALE_ICURRDIGITS L"2" - LOCALE_ICURRENCY L"3" - LOCALE_IDATE L"1" - LOCALE_IDAYLZERO L"1" - LOCALE_IDEFAULTANSICODEPAGE L"0" - LOCALE_IDEFAULTCODEPAGE L"1" - LOCALE_IDEFAULTCOUNTRY L"995" - LOCALE_IDEFAULTEBCDICCODEPAGE L"500" - LOCALE_IDEFAULTLANGUAGE L"0437" - LOCALE_IDEFAULTMACCODEPAGE L"2" - LOCALE_IDEFAULTUNIXCODEPAGE L"65001" - LOCALE_IDIGITS L"2" - LOCALE_IDIGITSUBSTITUTION L"1" - LOCALE_IFIRSTDAYOFWEEK L"0" - LOCALE_IFIRSTWEEKOFYEAR L"0" - LOCALE_IINTLCURRDIGITS L"2" - LOCALE_ILANGUAGE L"0437" - LOCALE_ILDATE L"1" - LOCALE_ILZERO L"1" - LOCALE_IMEASURE L"0" - LOCALE_IMONLZERO L"1" - LOCALE_INEGCURR L"8" - LOCALE_INEGNUMBER L"1" - LOCALE_INEGSEPBYSPACE L"1" - LOCALE_INEGSIGNPOSN L"1" - LOCALE_INEGSYMPRECEDES L"0" - LOCALE_IOPTIONALCALENDAR L"0" - LOCALE_IPAPERSIZE L"9" - LOCALE_IPOSSEPBYSPACE L"1" - LOCALE_IPOSSIGNPOSN L"1" - LOCALE_IPOSSYMPRECEDES L"0" - LOCALE_ITIME L"1" - LOCALE_ITIMEMARKPOSN L"0" - LOCALE_ITLZERO L"0" - LOCALE_S1159 L"" - LOCALE_S2359 L"" - LOCALE_SABBREVCTRYNAME L"GEO" - LOCALE_SABBREVDAYNAME1 L"\x10dd\x10e0\x10e8\x10d0\x10d1\x10d0\x10d7\x10d8" - LOCALE_SABBREVDAYNAME2 L"\x10e1\x10d0\x10db\x10e8\x10d0\x10d1\x10d0\x10d7\x10d8" - LOCALE_SABBREVDAYNAME3 L"\x10dd\x10d7\x10ee\x10e8\x10d0\x10d1\x10d0\x10d7\x10d8" - LOCALE_SABBREVDAYNAME4 L"\x10ee\x10e3\x10d7\x10e8\x10d0\x10d1\x10d0\x10d7\x10d8" - LOCALE_SABBREVDAYNAME5 L"\x10de\x10d0\x10e0\x10d0\x10e1\x10d9\x10d4\x10d5\x10d8" - LOCALE_SABBREVDAYNAME6 L"\x10e8\x10d0\x10d1\x10d0\x10d7\x10d8" - LOCALE_SABBREVDAYNAME7 L"\x10d9\x10d5\x10d8\x10e0\x10d0" - LOCALE_SABBREVLANGNAME L"KAT" - LOCALE_SABBREVMONTHNAME1 L"\x10d8\x10d0\x10dc" - LOCALE_SABBREVMONTHNAME2 L"\x10d7\x10d4\x10d1" - LOCALE_SABBREVMONTHNAME3 L"\x10db\x10d0\x10e0" - LOCALE_SABBREVMONTHNAME4 L"\x10d0\x10de\x10e0" - LOCALE_SABBREVMONTHNAME5 L"\x10db\x10d0\x10d8\x10e1" - LOCALE_SABBREVMONTHNAME6 L"\x10d8\x10d5\x10dc" - LOCALE_SABBREVMONTHNAME7 L"\x10d8\x10d5\x10da" - LOCALE_SABBREVMONTHNAME8 L"\x10d0\x10d2\x10d5" - LOCALE_SABBREVMONTHNAME9 L"\x10e1\x10d4\x10e5" - LOCALE_SABBREVMONTHNAME10 L"\x10dd\x10e5\x10e2" - LOCALE_SABBREVMONTHNAME11 L"\x10dc\x10dd\x10d4\x10db" - LOCALE_SABBREVMONTHNAME12 L"\x10d3\x10d4\x10d9" - LOCALE_SABBREVMONTHNAME13 L"" - LOCALE_SCOUNTRY L"Georgia" - LOCALE_SCURRENCY L"Lari" - LOCALE_SDATE L"." - LOCALE_SDAYNAME1 L"\x10dd\x10e0\x10e8\x10d0\x10d1\x10d0\x10d7\x10d8" - LOCALE_SDAYNAME2 L"\x10e1\x10d0\x10db\x10e8\x10d0\x10d1\x10d0\x10d7\x10d8" - LOCALE_SDAYNAME3 L"\x10dd\x10d7\x10ee\x10e8\x10d0\x10d1\x10d0\x10d7\x10d8" - LOCALE_SDAYNAME4 L"\x10ee\x10e3\x10d7\x10e8\x10d0\x10d1\x10d0\x10d7\x10d8" - LOCALE_SDAYNAME5 L"\x10de\x10d0\x10e0\x10d0\x10e1\x10d9\x10d4\x10d5\x10d8" - LOCALE_SDAYNAME6 L"\x10e8\x10d0\x10d1\x10d0\x10d7\x10d8" - LOCALE_SDAYNAME7 L"\x10d9\x10d5\x10d8\x10e0\x10d0" - LOCALE_SDECIMAL L"," - LOCALE_SENGCOUNTRY L"Georgia" - LOCALE_SENGCURRNAME L"Lari" - LOCALE_SENGLANGUAGE L"Georgian" - LOCALE_SGROUPING L"3;0" - LOCALE_SINTLSYMBOL L"GEL" - LOCALE_SISO3166CTRYNAME L"GE" - LOCALE_SISO639LANGNAME L"ka" - LOCALE_SLANGUAGE L"Georgian" - LOCALE_SLIST L";" - LOCALE_SLONGDATE L"yyyy '\x10ec\x10da\x10d8\x10e1' dd MM, dddd" - LOCALE_SMONDECIMALSEP L"," - LOCALE_SMONGROUPING L"3;0" - LOCALE_SMONTHNAME1 L"\x10d8\x10d0\x10dc\x10d5\x10d0\x10e0\x10d8" - LOCALE_SMONTHNAME2 L"\x10d7\x10d4\x10d1\x10d4\x10e0\x10d5\x10d0\x10da\x10d8" - LOCALE_SMONTHNAME3 L"\x10db\x10d0\x10e0\x10e2\x10d8" - LOCALE_SMONTHNAME4 L"\x10d0\x10de\x10e0\x10d8\x10da\x10d8" - LOCALE_SMONTHNAME5 L"\x10db\x10d0\x10d8\x10e1\x10d8" - LOCALE_SMONTHNAME6 L"\x10d8\x10d5\x10dc\x10d8\x10e1\x10d8" - LOCALE_SMONTHNAME7 L"\x10d8\x10d5\x10da\x10d8\x10e1\x10d8" - LOCALE_SMONTHNAME8 L"\x10d0\x10d2\x10d5\x10d8\x10e1\x10e2\x10dd" - LOCALE_SMONTHNAME9 L"\x10e1\x10d4\x10e5\x10e2\x10d4\x10db\x10d1\x10d4\x10e0\x10d8" - LOCALE_SMONTHNAME10 L"\x10dd\x10e5\x10e2\x10dd\x10db\x10d1\x10d4\x10e0\x10d8" - LOCALE_SMONTHNAME11 L"\x10dc\x10dd\x10d4\x10db\x10d1\x10d4\x10e0\x10d8" - LOCALE_SMONTHNAME12 L"\x10d3\x10d4\x10d9\x10d4\x10db\x10d1\x10d4\x10e0\x10d8" - LOCALE_SMONTHNAME13 L"" - LOCALE_SMONTHOUSANDSEP L"\x00a0" - LOCALE_SNAME L"ka-GE" - LOCALE_SNATIVECTRYNAME L"\x10e1\x10d0\x10e5\x10d0\x10e0\x10d7\x10d5\x10d4\x10da\x10dd" - LOCALE_SNATIVECURRNAME L"\x10da\x10d0\x10e0\x10d8" - LOCALE_SNATIVEDIGITS L"0123456789" - LOCALE_SNATIVELANGNAME L"\x10e5\x10d0\x10e0\x10d7\x10e3\x10da\x10d8" - LOCALE_SNEGATIVESIGN L"-" - LOCALE_SPOSITIVESIGN L"" - LOCALE_SSCRIPTS L"Geor;" - LOCALE_SSHORTDATE L"dd.MM.yyyy" - LOCALE_SSORTNAME L"Traditional" - LOCALE_STHOUSAND L"\x00a0" - LOCALE_STIME L":" - LOCALE_STIMEFORMAT L"H:mm:ss" - LOCALE_SYEARMONTH L"MMMM yyyy" + LOCALE_ICALENDARTYPE "1" + LOCALE_ICENTURY "1" + LOCALE_ICOUNTRY "995" + LOCALE_ICURRDIGITS "2" + LOCALE_ICURRENCY "3" + LOCALE_IDATE "1" + LOCALE_IDAYLZERO "1" + LOCALE_IDEFAULTANSICODEPAGE "0" + LOCALE_IDEFAULTCODEPAGE "1" + LOCALE_IDEFAULTCOUNTRY "995" + LOCALE_IDEFAULTEBCDICCODEPAGE "500" + LOCALE_IDEFAULTLANGUAGE "0437" + LOCALE_IDEFAULTMACCODEPAGE "2" + LOCALE_IDEFAULTUNIXCODEPAGE "65001" + LOCALE_IDIGITS "2" + LOCALE_IDIGITSUBSTITUTION "1" + LOCALE_IFIRSTDAYOFWEEK "0" + LOCALE_IFIRSTWEEKOFYEAR "0" + LOCALE_IINTLCURRDIGITS "2" + LOCALE_ILANGUAGE "0437" + LOCALE_ILDATE "1" + LOCALE_ILZERO "1" + LOCALE_IMEASURE "0" + LOCALE_IMONLZERO "1" + LOCALE_INEGCURR "8" + LOCALE_INEGNUMBER "1" + LOCALE_INEGSEPBYSPACE "1" + LOCALE_INEGSIGNPOSN "1" + LOCALE_INEGSYMPRECEDES "0" + LOCALE_IOPTIONALCALENDAR "0" + LOCALE_IPAPERSIZE "9" + LOCALE_IPOSSEPBYSPACE "1" + LOCALE_IPOSSIGNPOSN "1" + LOCALE_IPOSSYMPRECEDES "0" + LOCALE_ITIME "1" + LOCALE_ITIMEMARKPOSN "0" + LOCALE_ITLZERO "0" + LOCALE_S1159 "" + LOCALE_S2359 "" + LOCALE_SABBREVCTRYNAME "GEO" + LOCALE_SABBREVDAYNAME1 "бѓќбѓ бѓЁбѓђбѓ‘бѓђбѓ—бѓ" + LOCALE_SABBREVDAYNAME2 "бѓЎбѓђбѓ›бѓЁбѓђбѓ‘бѓђбѓ—бѓ" + LOCALE_SABBREVDAYNAME3 "бѓќбѓ—бѓ®бѓЁбѓђбѓ‘бѓђбѓ—бѓ" + LOCALE_SABBREVDAYNAME4 "бѓ®бѓЈбѓ—бѓЁбѓђбѓ‘бѓђбѓ—бѓ" + LOCALE_SABBREVDAYNAME5 "бѓћбѓђбѓ бѓђбѓЎбѓ™бѓ”бѓ•бѓ" + LOCALE_SABBREVDAYNAME6 "бѓЁбѓђбѓ‘бѓђбѓ—бѓ" + LOCALE_SABBREVDAYNAME7 "бѓ™бѓ•бѓбѓ бѓђ" + LOCALE_SABBREVLANGNAME "KAT" + LOCALE_SABBREVMONTHNAME1 "бѓбѓђбѓњ" + LOCALE_SABBREVMONTHNAME2 "бѓ—бѓ”бѓ‘" + LOCALE_SABBREVMONTHNAME3 "бѓ›бѓђбѓ " + LOCALE_SABBREVMONTHNAME4 "бѓђбѓћбѓ " + LOCALE_SABBREVMONTHNAME5 "бѓ›бѓђбѓбѓЎ" + LOCALE_SABBREVMONTHNAME6 "бѓбѓ•бѓњ" + LOCALE_SABBREVMONTHNAME7 "бѓбѓ•бѓљ" + LOCALE_SABBREVMONTHNAME8 "бѓђбѓ’бѓ•" + LOCALE_SABBREVMONTHNAME9 "სექ" + LOCALE_SABBREVMONTHNAME10 "ოქტ" + LOCALE_SABBREVMONTHNAME11 "бѓњбѓќбѓ”бѓ›" + LOCALE_SABBREVMONTHNAME12 "бѓ“бѓ”бѓ™" + LOCALE_SABBREVMONTHNAME13 "" + LOCALE_SCOUNTRY "Georgia" + LOCALE_SCURRENCY "Lari" + LOCALE_SDATE "." + LOCALE_SDAYNAME1 "бѓќбѓ бѓЁбѓђбѓ‘бѓђбѓ—бѓ" + LOCALE_SDAYNAME2 "бѓЎбѓђбѓ›бѓЁбѓђбѓ‘бѓђбѓ—бѓ" + LOCALE_SDAYNAME3 "бѓќбѓ—бѓ®бѓЁбѓђбѓ‘бѓђбѓ—бѓ" + LOCALE_SDAYNAME4 "бѓ®бѓЈбѓ—бѓЁбѓђбѓ‘бѓђбѓ—бѓ" + LOCALE_SDAYNAME5 "бѓћбѓђбѓ бѓђбѓЎбѓ™бѓ”бѓ•бѓ" + LOCALE_SDAYNAME6 "бѓЁбѓђбѓ‘бѓђбѓ—бѓ" + LOCALE_SDAYNAME7 "бѓ™бѓ•бѓбѓ бѓђ" + LOCALE_SDECIMAL "," + LOCALE_SENGCOUNTRY "Georgia" + LOCALE_SENGCURRNAME "Lari" + LOCALE_SENGLANGUAGE "Georgian" + LOCALE_SGROUPING "3;0" + LOCALE_SINTLSYMBOL "GE" + LOCALE_SISO3166CTRYNAME "GE" + LOCALE_SISO639LANGNAME "ka" + LOCALE_SLANGUAGE "Georgian" + LOCALE_SLIST ";" + LOCALE_SLONGDATE "yyyy 'бѓ¬бѓљбѓбѓЎ' dd MM, dddd" + LOCALE_SMONDECIMALSEP "," + LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHNAME1 "бѓбѓђбѓњбѓ•бѓђбѓ бѓ" + LOCALE_SMONTHNAME2 "бѓ—бѓ”бѓ‘бѓ”бѓ бѓ•бѓђбѓљбѓ" + LOCALE_SMONTHNAME3 "бѓ›бѓђбѓ бѓўбѓ" + LOCALE_SMONTHNAME4 "бѓђбѓћбѓ бѓбѓљбѓ" + LOCALE_SMONTHNAME5 "бѓ›бѓђбѓбѓЎбѓ" + LOCALE_SMONTHNAME6 "бѓбѓ•бѓњбѓбѓЎбѓ" + LOCALE_SMONTHNAME7 "бѓбѓ•бѓљбѓбѓЎбѓ" + LOCALE_SMONTHNAME8 "бѓђбѓ’бѓ•бѓбѓЎбѓўбѓќ" + LOCALE_SMONTHNAME9 "სექტემბერбѓ" + LOCALE_SMONTHNAME10 "ოქტომბერбѓ" + LOCALE_SMONTHNAME11 "бѓњбѓќбѓ”бѓ›бѓ‘бѓ”бѓ бѓ" + LOCALE_SMONTHNAME12 "бѓ“бѓ”бѓ™бѓ”бѓ›бѓ‘бѓ”бѓ бѓ" + LOCALE_SMONTHNAME13 "" + LOCALE_SMONTHOUSANDSEP "В " + LOCALE_SNAME "ka-GE" + LOCALE_SNATIVECTRYNAME "საქართველო" + LOCALE_SNATIVECURRNAME "бѓљбѓђбѓ бѓ" + LOCALE_SNATIVEDIGITS "0123456789" + LOCALE_SNATIVELANGNAME "ქართულбѓ" + LOCALE_SNEGATIVESIGN "-" + LOCALE_SPOSITIVESIGN "" + LOCALE_SSCRIPTS "Geor;" + LOCALE_SSHORTDATE "dd.MM.yyyy" + LOCALE_SSORTNAME "Traditional" + LOCALE_STHOUSAND "В " + LOCALE_STIME ":" + LOCALE_STIMEFORMAT "H:mm:ss" + LOCALE_SYEARMONTH "MMMM yyyy" - LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE L"Western Europe and United States" - LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE L"Central Europe" - LGRPID_BALTIC+LGRPID_RES_BASE L"Baltic" - LGRPID_GREEK+LGRPID_RES_BASE L"Greek" - LGRPID_CYRILLIC+LGRPID_RES_BASE L"Cyrillic" - LGRPID_TURKISH+LGRPID_RES_BASE L"Turkic" - LGRPID_JAPANESE+LGRPID_RES_BASE L"Japanese" - LGRPID_KOREAN+LGRPID_RES_BASE L"Korean" - LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE L"Traditional Chinese" - LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE L"Simplified Chinese" - LGRPID_THAI+LGRPID_RES_BASE L"Thai" - LGRPID_HEBREW+LGRPID_RES_BASE L"Hebrew" - LGRPID_ARABIC+LGRPID_RES_BASE L"Arabic" - LGRPID_VIETNAMESE+LGRPID_RES_BASE L"Vietnamese" - LGRPID_INDIC+LGRPID_RES_BASE L"Indic" - LGRPID_GEORGIAN+LGRPID_RES_BASE L"Georgian" - LGRPID_ARMENIAN+LGRPID_RES_BASE L"Armenian" + LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Western Europe and United States" + LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Central Europe" + LGRPID_BALTIC+LGRPID_RES_BASE "Baltic" + LGRPID_GREEK+LGRPID_RES_BASE "Greek" + LGRPID_CYRILLIC+LGRPID_RES_BASE "Cyrillic" + LGRPID_TURKISH+LGRPID_RES_BASE "Turkic" + LGRPID_JAPANESE+LGRPID_RES_BASE "Japanese" + LGRPID_KOREAN+LGRPID_RES_BASE "Korean" + LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Traditional Chinese" + LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" + LGRPID_THAI+LGRPID_RES_BASE "Thai" + LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" + LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" + LGRPID_INDIC+LGRPID_RES_BASE "Indic" + LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian" + LGRPID_ARMENIAN+LGRPID_RES_BASE "Armenian" } diff --git a/reactos/dll/win32/kernel32/nls/knk.nls b/reactos/dll/win32/kernel32/nls/knk.nls index 02c564c7466..705398d26cb 100644 --- a/reactos/dll/win32/kernel32/nls/knk.nls +++ b/reactos/dll/win32/kernel32/nls/knk.nls @@ -18,139 +18,139 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma code_page(0) /* Unicode only */ +#pragma code_page(65001) /* UTF-8 */ STRINGTABLE LANGUAGE LANG_KONKANI, SUBLANG_DEFAULT { LOCALE_FONTSIGNATURE L"\x802f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x4000\x0003\x0000\x0000\xc5d4" - LOCALE_ICALENDARTYPE L"1" - LOCALE_ICENTURY L"1" - LOCALE_ICOUNTRY L"91" - LOCALE_ICURRDIGITS L"2" - LOCALE_ICURRENCY L"2" - LOCALE_IDATE L"1" - LOCALE_IDAYLZERO L"1" - LOCALE_IDEFAULTANSICODEPAGE L"0" - LOCALE_IDEFAULTCODEPAGE L"1" - LOCALE_IDEFAULTCOUNTRY L"91" - LOCALE_IDEFAULTEBCDICCODEPAGE L"500" - LOCALE_IDEFAULTLANGUAGE L"0457" - LOCALE_IDEFAULTMACCODEPAGE L"2" - LOCALE_IDEFAULTUNIXCODEPAGE L"65001" - LOCALE_IDIGITS L"2" - LOCALE_IDIGITSUBSTITUTION L"1" - LOCALE_IFIRSTDAYOFWEEK L"0" - LOCALE_IFIRSTWEEKOFYEAR L"0" - LOCALE_IINTLCURRDIGITS L"2" - LOCALE_ILANGUAGE L"0457" - LOCALE_ILDATE L"1" - LOCALE_ILZERO L"1" - LOCALE_IMEASURE L"0" - LOCALE_IMONLZERO L"1" - LOCALE_INEGCURR L"12" - LOCALE_INEGNUMBER L"1" - LOCALE_INEGSEPBYSPACE L"1" - LOCALE_INEGSIGNPOSN L"4" - LOCALE_INEGSYMPRECEDES L"1" - LOCALE_IOPTIONALCALENDAR L"0" - LOCALE_IPAPERSIZE L"9" - LOCALE_IPOSSEPBYSPACE L"1" - LOCALE_IPOSSIGNPOSN L"4" - LOCALE_IPOSSYMPRECEDES L"1" - LOCALE_ITIME L"1" - LOCALE_ITIMEMARKPOSN L"1" - LOCALE_ITLZERO L"1" - LOCALE_S1159 L"\x092e.\x092a\x0942." - LOCALE_S2359 L"\x092e.\x0928\x0902." - LOCALE_SABBREVCTRYNAME L"IND" - LOCALE_SABBREVDAYNAME1 L"\x0938\x094b\x092e." - LOCALE_SABBREVDAYNAME2 L"\x092e\x0902\x0917\x0933." - LOCALE_SABBREVDAYNAME3 L"\x092c\x0941\x0927." - LOCALE_SABBREVDAYNAME4 L"\x092c\x093f\x0930\x0947." - LOCALE_SABBREVDAYNAME5 L"\x0938\x0941\x0915\x094d\x0930." - LOCALE_SABBREVDAYNAME6 L"\x0936\x0947\x0928." - LOCALE_SABBREVDAYNAME7 L"\x0906\x092f." - LOCALE_SABBREVLANGNAME L"KNK" - LOCALE_SABBREVMONTHNAME1 L"\x091c\x093e\x0928\x0947\x0935\x093e\x0930\x0940" - LOCALE_SABBREVMONTHNAME2 L"\x092b\x0947\x092c\x094d\x0930\x0941\x0935\x093e\x0930\x0940" - LOCALE_SABBREVMONTHNAME3 L"\x092e\x093e\x0930\x094d\x091a" - LOCALE_SABBREVMONTHNAME4 L"\x090f\x092a\x094d\x0930\x093f\x0932" - LOCALE_SABBREVMONTHNAME5 L"\x092e\x0947" - LOCALE_SABBREVMONTHNAME6 L"\x091c\x0942\x0928" - LOCALE_SABBREVMONTHNAME7 L"\x091c\x0941\x0932\x0948" - LOCALE_SABBREVMONTHNAME8 L"\x0911\x0917\x0938\x094d\x091f" - LOCALE_SABBREVMONTHNAME9 L"\x0938\x092a\x094d\x091f\x0947\x0902\x092c\x0930" - LOCALE_SABBREVMONTHNAME10 L"\x0911\x0915\x094d\x091f\x094b\x092c\x0930" - LOCALE_SABBREVMONTHNAME11 L"\x0928\x094b\x0935\x0947\x092e\x094d\x092c\x0930" - LOCALE_SABBREVMONTHNAME12 L"\x0921\x093f\x0938\x0947\x0902\x092c\x0930" - LOCALE_SABBREVMONTHNAME13 L"" - LOCALE_SCOUNTRY L"India" - LOCALE_SCURRENCY L"\x0930\x0941" - LOCALE_SDATE L"-" - LOCALE_SDAYNAME1 L"\x0938\x094b\x092e\x093e\x0930" - LOCALE_SDAYNAME2 L"\x092e\x0902\x0917\x0933\x093e\x0930" - LOCALE_SDAYNAME3 L"\x092c\x0941\x0927\x0935\x093e\x0930" - LOCALE_SDAYNAME4 L"\x092c\x093f\x0930\x0947\x0938\x094d\x0924\x093e\x0930" - LOCALE_SDAYNAME5 L"\x0938\x0941\x0915\x094d\x0930\x093e\x0930" - LOCALE_SDAYNAME6 L"\x0936\x0947\x0928\x0935\x093e\x0930" - LOCALE_SDAYNAME7 L"\x0906\x092f\x0924\x093e\x0930" - LOCALE_SDECIMAL L"." - LOCALE_SENGCOUNTRY L"India" - LOCALE_SENGCURRNAME L"Indian Rupee" - LOCALE_SENGLANGUAGE L"Konkani" - LOCALE_SGROUPING L"3;2;0" - LOCALE_SINTLSYMBOL L"INR" - LOCALE_SISO3166CTRYNAME L"IN" - LOCALE_SISO639LANGNAME L"kok" - LOCALE_SLANGUAGE L"Konkani" - LOCALE_SLIST L"," - LOCALE_SLONGDATE L"dd MMMM yyyy" - LOCALE_SMONDECIMALSEP L"." - LOCALE_SMONGROUPING L"3;2;0" - LOCALE_SMONTHNAME1 L"\x091c\x093e\x0928\x0947\x0935\x093e\x0930\x0940" - LOCALE_SMONTHNAME2 L"\x092b\x0947\x092c\x094d\x0930\x0941\x0935\x093e\x0930\x0940" - LOCALE_SMONTHNAME3 L"\x092e\x093e\x0930\x094d\x091a" - LOCALE_SMONTHNAME4 L"\x090f\x092a\x094d\x0930\x093f\x0932" - LOCALE_SMONTHNAME5 L"\x092e\x0947" - LOCALE_SMONTHNAME6 L"\x091c\x0942\x0928" - LOCALE_SMONTHNAME7 L"\x091c\x0941\x0932\x0948" - LOCALE_SMONTHNAME8 L"\x0911\x0917\x0938\x094d\x091f" - LOCALE_SMONTHNAME9 L"\x0938\x092a\x094d\x091f\x0947\x0902\x092c\x0930" - LOCALE_SMONTHNAME10 L"\x0911\x0915\x094d\x091f\x094b\x092c\x0930" - LOCALE_SMONTHNAME11 L"\x0928\x094b\x0935\x0947\x092e\x094d\x092c\x0930" - LOCALE_SMONTHNAME12 L"\x0921\x093f\x0938\x0947\x0902\x092c\x0930" - LOCALE_SMONTHNAME13 L"" - LOCALE_SMONTHOUSANDSEP L"," - LOCALE_SNAME L"kok-IN" - LOCALE_SNATIVECTRYNAME L"\x092d\x093e\x0930\x0924" - LOCALE_SNATIVECURRNAME L"\x0930\x0941\x092a\x092f" - LOCALE_SNATIVEDIGITS L"\x0966\x0967\x0968\x0969\x096a\x096b\x096c\x096d\x096e\x096f" - LOCALE_SNATIVELANGNAME L"\x0915\x094b\x0902\x0915\x0923\x0940" - LOCALE_SNEGATIVESIGN L"-" - LOCALE_SPOSITIVESIGN L"" - LOCALE_SSCRIPTS L"Deva;" - LOCALE_SSHORTDATE L"dd-MM-yyyy" - LOCALE_SSORTNAME L"Default" - LOCALE_STHOUSAND L"," - LOCALE_STIME L":" - LOCALE_STIMEFORMAT L"HH:mm:ss" - LOCALE_SYEARMONTH L"MMMM, yyyy" + LOCALE_ICALENDARTYPE "1" + LOCALE_ICENTURY "1" + LOCALE_ICOUNTRY "91" + LOCALE_ICURRDIGITS "2" + LOCALE_ICURRENCY "2" + LOCALE_IDATE "1" + LOCALE_IDAYLZERO "1" + LOCALE_IDEFAULTANSICODEPAGE "0" + LOCALE_IDEFAULTCODEPAGE "1" + LOCALE_IDEFAULTCOUNTRY "91" + LOCALE_IDEFAULTEBCDICCODEPAGE "500" + LOCALE_IDEFAULTLANGUAGE "0457" + LOCALE_IDEFAULTMACCODEPAGE "2" + LOCALE_IDEFAULTUNIXCODEPAGE "65001" + LOCALE_IDIGITS "2" + LOCALE_IDIGITSUBSTITUTION "1" + LOCALE_IFIRSTDAYOFWEEK "0" + LOCALE_IFIRSTWEEKOFYEAR "0" + LOCALE_IINTLCURRDIGITS "2" + LOCALE_ILANGUAGE "0457" + LOCALE_ILDATE "1" + LOCALE_ILZERO "1" + LOCALE_IMEASURE "0" + LOCALE_IMONLZERO "1" + LOCALE_INEGCURR "12" + LOCALE_INEGNUMBER "1" + LOCALE_INEGSEPBYSPACE "1" + LOCALE_INEGSIGNPOSN "4" + LOCALE_INEGSYMPRECEDES "1" + LOCALE_IOPTIONALCALENDAR "0" + LOCALE_IPAPERSIZE "9" + LOCALE_IPOSSEPBYSPACE "1" + LOCALE_IPOSSIGNPOSN "4" + LOCALE_IPOSSYMPRECEDES "1" + LOCALE_ITIME "1" + LOCALE_ITIMEMARKPOSN "1" + LOCALE_ITLZERO "1" + LOCALE_S1159 "म.पू." + LOCALE_S2359 "म.नं." + LOCALE_SABBREVCTRYNAME "IND" + LOCALE_SABBREVDAYNAME1 "सोम." + LOCALE_SABBREVDAYNAME2 "मंगळ." + LOCALE_SABBREVDAYNAME3 "बुध." + LOCALE_SABBREVDAYNAME4 "बिरे." + LOCALE_SABBREVDAYNAME5 "सुक्र." + LOCALE_SABBREVDAYNAME6 "शेन." + LOCALE_SABBREVDAYNAME7 "आय." + LOCALE_SABBREVLANGNAME "KNK" + LOCALE_SABBREVMONTHNAME1 "जानेवारी" + LOCALE_SABBREVMONTHNAME2 "फेब्रुवारी" + LOCALE_SABBREVMONTHNAME3 "मार्च" + LOCALE_SABBREVMONTHNAME4 "एप्रिल" + LOCALE_SABBREVMONTHNAME5 "मे" + LOCALE_SABBREVMONTHNAME6 "जून" + LOCALE_SABBREVMONTHNAME7 "जुलै" + LOCALE_SABBREVMONTHNAME8 "ऑगस्ट" + LOCALE_SABBREVMONTHNAME9 "सप्टेंबर" + LOCALE_SABBREVMONTHNAME10 "ऑक्टोबर" + LOCALE_SABBREVMONTHNAME11 "नोवेम्बर" + LOCALE_SABBREVMONTHNAME12 "डिसेंबर" + LOCALE_SABBREVMONTHNAME13 "" + LOCALE_SCOUNTRY "India" + LOCALE_SCURRENCY "रु" + LOCALE_SDATE "-" + LOCALE_SDAYNAME1 "सोमार" + LOCALE_SDAYNAME2 "मंगळार" + LOCALE_SDAYNAME3 "बुधवार" + LOCALE_SDAYNAME4 "बिरेस्तार" + LOCALE_SDAYNAME5 "सुक्रार" + LOCALE_SDAYNAME6 "शेनवार" + LOCALE_SDAYNAME7 "आयतार" + LOCALE_SDECIMAL "." + LOCALE_SENGCOUNTRY "India" + LOCALE_SENGCURRNAME "Indian Rupee" + LOCALE_SENGLANGUAGE "Konkani" + LOCALE_SGROUPING "3;2;0" + LOCALE_SINTLSYMBOL "INR" + LOCALE_SISO3166CTRYNAME "IN" + LOCALE_SISO639LANGNAME "kok" + LOCALE_SLANGUAGE "Konkani" + LOCALE_SLIST "," + LOCALE_SLONGDATE "dd MMMM yyyy" + LOCALE_SMONDECIMALSEP "." + LOCALE_SMONGROUPING "3;2;0" + LOCALE_SMONTHNAME1 "जानेवारी" + LOCALE_SMONTHNAME2 "फेब्रुवारी" + LOCALE_SMONTHNAME3 "मार्च" + LOCALE_SMONTHNAME4 "एप्रिल" + LOCALE_SMONTHNAME5 "मे" + LOCALE_SMONTHNAME6 "जून" + LOCALE_SMONTHNAME7 "जुलै" + LOCALE_SMONTHNAME8 "ऑगस्ट" + LOCALE_SMONTHNAME9 "सप्टेंबर" + LOCALE_SMONTHNAME10 "ऑक्टोबर" + LOCALE_SMONTHNAME11 "नोवेम्बर" + LOCALE_SMONTHNAME12 "डिसेंबर" + LOCALE_SMONTHNAME13 "" + LOCALE_SMONTHOUSANDSEP "," + LOCALE_SNAME "kok-IN" + LOCALE_SNATIVECTRYNAME "भारत" + LOCALE_SNATIVECURRNAME "रुपय" + LOCALE_SNATIVEDIGITS "०१२३४५६७८९" + LOCALE_SNATIVELANGNAME "कोंकणी" + LOCALE_SNEGATIVESIGN "-" + LOCALE_SPOSITIVESIGN "" + LOCALE_SSCRIPTS "Deva;" + LOCALE_SSHORTDATE "dd-MM-yyyy" + LOCALE_SSORTNAME "Default" + LOCALE_STHOUSAND "," + LOCALE_STIME ":" + LOCALE_STIMEFORMAT "HH:mm:ss" + LOCALE_SYEARMONTH "MMMM, yyyy" - LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE L"Western Europe and United States" - LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE L"Central Europe" - LGRPID_BALTIC+LGRPID_RES_BASE L"Baltic" - LGRPID_GREEK+LGRPID_RES_BASE L"Greek" - LGRPID_CYRILLIC+LGRPID_RES_BASE L"Cyrillic" - LGRPID_TURKISH+LGRPID_RES_BASE L"Turkic" - LGRPID_JAPANESE+LGRPID_RES_BASE L"Japanese" - LGRPID_KOREAN+LGRPID_RES_BASE L"Korean" - LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE L"Traditional Chinese" - LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE L"Simplified Chinese" - LGRPID_THAI+LGRPID_RES_BASE L"Thai" - LGRPID_HEBREW+LGRPID_RES_BASE L"Hebrew" - LGRPID_ARABIC+LGRPID_RES_BASE L"Arabic" - LGRPID_VIETNAMESE+LGRPID_RES_BASE L"Vietnamese" - LGRPID_INDIC+LGRPID_RES_BASE L"Indic" - LGRPID_GEORGIAN+LGRPID_RES_BASE L"Georgian" - LGRPID_ARMENIAN+LGRPID_RES_BASE L"Armenian" + LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Western Europe and United States" + LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Central Europe" + LGRPID_BALTIC+LGRPID_RES_BASE "Baltic" + LGRPID_GREEK+LGRPID_RES_BASE "Greek" + LGRPID_CYRILLIC+LGRPID_RES_BASE "Cyrillic" + LGRPID_TURKISH+LGRPID_RES_BASE "Turkic" + LGRPID_JAPANESE+LGRPID_RES_BASE "Japanese" + LGRPID_KOREAN+LGRPID_RES_BASE "Korean" + LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Traditional Chinese" + LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" + LGRPID_THAI+LGRPID_RES_BASE "Thai" + LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" + LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" + LGRPID_INDIC+LGRPID_RES_BASE "Indic" + LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian" + LGRPID_ARMENIAN+LGRPID_RES_BASE "Armenian" } diff --git a/reactos/dll/win32/kernel32/nls/mar.nls b/reactos/dll/win32/kernel32/nls/mar.nls index 8d2b151c958..531819599a0 100644 --- a/reactos/dll/win32/kernel32/nls/mar.nls +++ b/reactos/dll/win32/kernel32/nls/mar.nls @@ -18,139 +18,139 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma code_page(0) /* Unicode only */ +#pragma code_page(65001) /* UTF-8 */ STRINGTABLE LANGUAGE LANG_MARATHI, SUBLANG_DEFAULT { LOCALE_FONTSIGNATURE L"\x802f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x4000\x0003\x0000\x0000\xc5d4" - LOCALE_ICALENDARTYPE L"1" - LOCALE_ICENTURY L"1" - LOCALE_ICOUNTRY L"91" - LOCALE_ICURRDIGITS L"2" - LOCALE_ICURRENCY L"2" - LOCALE_IDATE L"1" - LOCALE_IDAYLZERO L"1" - LOCALE_IDEFAULTANSICODEPAGE L"0" - LOCALE_IDEFAULTCODEPAGE L"1" - LOCALE_IDEFAULTCOUNTRY L"91" - LOCALE_IDEFAULTEBCDICCODEPAGE L"500" - LOCALE_IDEFAULTLANGUAGE L"044e" - LOCALE_IDEFAULTMACCODEPAGE L"2" - LOCALE_IDEFAULTUNIXCODEPAGE L"65001" - LOCALE_IDIGITS L"2" - LOCALE_IDIGITSUBSTITUTION L"1" - LOCALE_IFIRSTDAYOFWEEK L"0" - LOCALE_IFIRSTWEEKOFYEAR L"0" - LOCALE_IINTLCURRDIGITS L"2" - LOCALE_ILANGUAGE L"044e" - LOCALE_ILDATE L"1" - LOCALE_ILZERO L"1" - LOCALE_IMEASURE L"0" - LOCALE_IMONLZERO L"1" - LOCALE_INEGCURR L"12" - LOCALE_INEGNUMBER L"1" - LOCALE_INEGSEPBYSPACE L"1" - LOCALE_INEGSIGNPOSN L"4" - LOCALE_INEGSYMPRECEDES L"1" - LOCALE_IOPTIONALCALENDAR L"0" - LOCALE_IPAPERSIZE L"9" - LOCALE_IPOSSEPBYSPACE L"1" - LOCALE_IPOSSIGNPOSN L"4" - LOCALE_IPOSSYMPRECEDES L"1" - LOCALE_ITIME L"1" - LOCALE_ITIMEMARKPOSN L"1" - LOCALE_ITLZERO L"1" - LOCALE_S1159 L"\x092e.\x092a\x0942." - LOCALE_S2359 L"\x092e.\x0928\x0902." - LOCALE_SABBREVCTRYNAME L"IND" - LOCALE_SABBREVDAYNAME1 L"\x0938\x094b\x092e." - LOCALE_SABBREVDAYNAME2 L"\x092e\x0902\x0917\x0933." - LOCALE_SABBREVDAYNAME3 L"\x092c\x0941\x0927." - LOCALE_SABBREVDAYNAME4 L"\x0917\x0941\x0930\x0941." - LOCALE_SABBREVDAYNAME5 L"\x0936\x0941\x0915\x094d\x0930." - LOCALE_SABBREVDAYNAME6 L"\x0936\x0928\x093f." - LOCALE_SABBREVDAYNAME7 L"\x0930\x0935\x093f." - LOCALE_SABBREVLANGNAME L"MAR" - LOCALE_SABBREVMONTHNAME1 L"\x091c\x093e\x0928\x0947." - LOCALE_SABBREVMONTHNAME2 L"\x092b\x0947\x092c\x094d\x0930\x0941." - LOCALE_SABBREVMONTHNAME3 L"\x092e\x093e\x0930\x094d\x091a" - LOCALE_SABBREVMONTHNAME4 L"\x090f\x092a\x094d\x0930\x093f\x0932" - LOCALE_SABBREVMONTHNAME5 L"\x092e\x0947" - LOCALE_SABBREVMONTHNAME6 L"\x091c\x0942\x0928" - LOCALE_SABBREVMONTHNAME7 L"\x091c\x0941\x0932\x0948" - LOCALE_SABBREVMONTHNAME8 L"\x0911\x0917\x0938\x094d\x091f" - LOCALE_SABBREVMONTHNAME9 L"\x0938\x092a\x094d\x091f\x0947\x0902." - LOCALE_SABBREVMONTHNAME10 L"\x0911\x0915\x094d\x091f\x094b." - LOCALE_SABBREVMONTHNAME11 L"\x0928\x094b\x0935\x094d\x0939\x0947\x0902." - LOCALE_SABBREVMONTHNAME12 L"\x0921\x093f\x0938\x0947\x0902." - LOCALE_SABBREVMONTHNAME13 L"" - LOCALE_SCOUNTRY L"India" - LOCALE_SCURRENCY L"\x0930\x0941" - LOCALE_SDATE L"-" - LOCALE_SDAYNAME1 L"\x0938\x094b\x092e\x0935\x093e\x0930" - LOCALE_SDAYNAME2 L"\x092e\x0902\x0917\x0933\x0935\x093e\x0930" - LOCALE_SDAYNAME3 L"\x092c\x0941\x0927\x0935\x093e\x0930" - LOCALE_SDAYNAME4 L"\x0917\x0941\x0930\x0941\x0935\x093e\x0930" - LOCALE_SDAYNAME5 L"\x0936\x0941\x0915\x094d\x0930\x0935\x093e\x0930" - LOCALE_SDAYNAME6 L"\x0936\x0928\x093f\x0935\x093e\x0930" - LOCALE_SDAYNAME7 L"\x0930\x0935\x093f\x0935\x093e\x0930" - LOCALE_SDECIMAL L"." - LOCALE_SENGCOUNTRY L"India" - LOCALE_SENGCURRNAME L"Indian Rupee" - LOCALE_SENGLANGUAGE L"Marathi" - LOCALE_SGROUPING L"3;2;0" - LOCALE_SINTLSYMBOL L"INR" - LOCALE_SISO3166CTRYNAME L"IN" - LOCALE_SISO639LANGNAME L"mr" - LOCALE_SLANGUAGE L"Marathi" - LOCALE_SLIST L"," - LOCALE_SLONGDATE L"dd MMMM yyyy" - LOCALE_SMONDECIMALSEP L"." - LOCALE_SMONGROUPING L"3;2;0" - LOCALE_SMONTHNAME1 L"\x091c\x093e\x0928\x0947\x0935\x093e\x0930\x0940" - LOCALE_SMONTHNAME2 L"\x092b\x0947\x092c\x094d\x0930\x0941\x0935\x093e\x0930\x0940" - LOCALE_SMONTHNAME3 L"\x092e\x093e\x0930\x094d\x091a" - LOCALE_SMONTHNAME4 L"\x090f\x092a\x094d\x0930\x093f\x0932" - LOCALE_SMONTHNAME5 L"\x092e\x0947" - LOCALE_SMONTHNAME6 L"\x091c\x0942\x0928" - LOCALE_SMONTHNAME7 L"\x091c\x0941\x0932\x0948" - LOCALE_SMONTHNAME8 L"\x0911\x0917\x0938\x094d\x091f" - LOCALE_SMONTHNAME9 L"\x0938\x092a\x094d\x091f\x0947\x0902\x092c\x0930" - LOCALE_SMONTHNAME10 L"\x0911\x0915\x094d\x091f\x094b\x092c\x0930" - LOCALE_SMONTHNAME11 L"\x0928\x094b\x0935\x094d\x0939\x0947\x0902\x092c\x0930" - LOCALE_SMONTHNAME12 L"\x0921\x093f\x0938\x0947\x0902\x092c\x0930" - LOCALE_SMONTHNAME13 L"" - LOCALE_SMONTHOUSANDSEP L"," - LOCALE_SNAME L"mr-IN" - LOCALE_SNATIVECTRYNAME L"\x092d\x093e\x0930\x0924" - LOCALE_SNATIVECURRNAME L"\x0930\x0941\x092a\x092f\x093e" - LOCALE_SNATIVEDIGITS L"\x0966\x0967\x0968\x0969\x096a\x096b\x096c\x096d\x096e\x096f" - LOCALE_SNATIVELANGNAME L"\x092e\x0930\x093e\x0920\x0940" - LOCALE_SNEGATIVESIGN L"-" - LOCALE_SPOSITIVESIGN L"" - LOCALE_SSCRIPTS L"Mlym;" - LOCALE_SSHORTDATE L"dd-MM-yyyy" - LOCALE_SSORTNAME L"Default" - LOCALE_STHOUSAND L"," - LOCALE_STIME L":" - LOCALE_STIMEFORMAT L"HH:mm:ss" - LOCALE_SYEARMONTH L"MMMM, yyyy" + LOCALE_ICALENDARTYPE "1" + LOCALE_ICENTURY "1" + LOCALE_ICOUNTRY "91" + LOCALE_ICURRDIGITS "2" + LOCALE_ICURRENCY "2" + LOCALE_IDATE "1" + LOCALE_IDAYLZERO "1" + LOCALE_IDEFAULTANSICODEPAGE "0" + LOCALE_IDEFAULTCODEPAGE "1" + LOCALE_IDEFAULTCOUNTRY "91" + LOCALE_IDEFAULTEBCDICCODEPAGE "500" + LOCALE_IDEFAULTLANGUAGE "044e" + LOCALE_IDEFAULTMACCODEPAGE "2" + LOCALE_IDEFAULTUNIXCODEPAGE "65001" + LOCALE_IDIGITS "2" + LOCALE_IDIGITSUBSTITUTION "1" + LOCALE_IFIRSTDAYOFWEEK "0" + LOCALE_IFIRSTWEEKOFYEAR "0" + LOCALE_IINTLCURRDIGITS "2" + LOCALE_ILANGUAGE "044e" + LOCALE_ILDATE "1" + LOCALE_ILZERO "1" + LOCALE_IMEASURE "0" + LOCALE_IMONLZERO "1" + LOCALE_INEGCURR "12" + LOCALE_INEGNUMBER "1" + LOCALE_INEGSEPBYSPACE "1" + LOCALE_INEGSIGNPOSN "4" + LOCALE_INEGSYMPRECEDES "1" + LOCALE_IOPTIONALCALENDAR "0" + LOCALE_IPAPERSIZE "9" + LOCALE_IPOSSEPBYSPACE "1" + LOCALE_IPOSSIGNPOSN "4" + LOCALE_IPOSSYMPRECEDES "1" + LOCALE_ITIME "1" + LOCALE_ITIMEMARKPOSN "1" + LOCALE_ITLZERO "1" + LOCALE_S1159 "म.पू." + LOCALE_S2359 "म.नं." + LOCALE_SABBREVCTRYNAME "IND" + LOCALE_SABBREVDAYNAME1 "सोम." + LOCALE_SABBREVDAYNAME2 "मंगळ." + LOCALE_SABBREVDAYNAME3 "बुध." + LOCALE_SABBREVDAYNAME4 "गुरु." + LOCALE_SABBREVDAYNAME5 "शुक्र." + LOCALE_SABBREVDAYNAME6 "शनि." + LOCALE_SABBREVDAYNAME7 "रवि." + LOCALE_SABBREVLANGNAME "MAR" + LOCALE_SABBREVMONTHNAME1 "जाने." + LOCALE_SABBREVMONTHNAME2 "फेब्रु." + LOCALE_SABBREVMONTHNAME3 "मार्च" + LOCALE_SABBREVMONTHNAME4 "एप्रिल" + LOCALE_SABBREVMONTHNAME5 "मे" + LOCALE_SABBREVMONTHNAME6 "जून" + LOCALE_SABBREVMONTHNAME7 "जुलै" + LOCALE_SABBREVMONTHNAME8 "ऑगस्ट" + LOCALE_SABBREVMONTHNAME9 "सप्टें." + LOCALE_SABBREVMONTHNAME10 "ऑक्टो." + LOCALE_SABBREVMONTHNAME11 "नोव्हें." + LOCALE_SABBREVMONTHNAME12 "डिसें." + LOCALE_SABBREVMONTHNAME13 "" + LOCALE_SCOUNTRY "India" + LOCALE_SCURRENCY "रु" + LOCALE_SDATE "-" + LOCALE_SDAYNAME1 "सोमवार" + LOCALE_SDAYNAME2 "मंगळवार" + LOCALE_SDAYNAME3 "बुधवार" + LOCALE_SDAYNAME4 "गुरुवार" + LOCALE_SDAYNAME5 "शुक्रवार" + LOCALE_SDAYNAME6 "शनिवार" + LOCALE_SDAYNAME7 "रविवार" + LOCALE_SDECIMAL "." + LOCALE_SENGCOUNTRY "India" + LOCALE_SENGCURRNAME "Indian Rupee" + LOCALE_SENGLANGUAGE "Marathi" + LOCALE_SGROUPING "3;2;0" + LOCALE_SINTLSYMBOL "INR" + LOCALE_SISO3166CTRYNAME "IN" + LOCALE_SISO639LANGNAME "mr" + LOCALE_SLANGUAGE "Marathi" + LOCALE_SLIST "," + LOCALE_SLONGDATE "dd MMMM yyyy" + LOCALE_SMONDECIMALSEP "." + LOCALE_SMONGROUPING "3;2;0" + LOCALE_SMONTHNAME1 "जानेवारी" + LOCALE_SMONTHNAME2 "फेब्रुवारी" + LOCALE_SMONTHNAME3 "मार्च" + LOCALE_SMONTHNAME4 "एप्रिल" + LOCALE_SMONTHNAME5 "मे" + LOCALE_SMONTHNAME6 "जून" + LOCALE_SMONTHNAME7 "जुलै" + LOCALE_SMONTHNAME8 "ऑगस्ट" + LOCALE_SMONTHNAME9 "सप्टेंबर" + LOCALE_SMONTHNAME10 "ऑक्टोबर" + LOCALE_SMONTHNAME11 "नोव्हेंबर" + LOCALE_SMONTHNAME12 "डिसेंबर" + LOCALE_SMONTHNAME13 "" + LOCALE_SMONTHOUSANDSEP "," + LOCALE_SNAME "mr-IN" + LOCALE_SNATIVECTRYNAME "भारत" + LOCALE_SNATIVECURRNAME "रुपया" + LOCALE_SNATIVEDIGITS "०१२३४५६७८९" + LOCALE_SNATIVELANGNAME "मराठी" + LOCALE_SNEGATIVESIGN "-" + LOCALE_SPOSITIVESIGN "" + LOCALE_SSCRIPTS "Mlym;" + LOCALE_SSHORTDATE "dd-MM-yyyy" + LOCALE_SSORTNAME "Default" + LOCALE_STHOUSAND "," + LOCALE_STIME ":" + LOCALE_STIMEFORMAT "HH:mm:ss" + LOCALE_SYEARMONTH "MMMM, yyyy" - LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE L"Western Europe and United States" - LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE L"Central Europe" - LGRPID_BALTIC+LGRPID_RES_BASE L"Baltic" - LGRPID_GREEK+LGRPID_RES_BASE L"Greek" - LGRPID_CYRILLIC+LGRPID_RES_BASE L"Cyrillic" - LGRPID_TURKISH+LGRPID_RES_BASE L"Turkic" - LGRPID_JAPANESE+LGRPID_RES_BASE L"Japanese" - LGRPID_KOREAN+LGRPID_RES_BASE L"Korean" - LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE L"Traditional Chinese" - LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE L"Simplified Chinese" - LGRPID_THAI+LGRPID_RES_BASE L"Thai" - LGRPID_HEBREW+LGRPID_RES_BASE L"Hebrew" - LGRPID_ARABIC+LGRPID_RES_BASE L"Arabic" - LGRPID_VIETNAMESE+LGRPID_RES_BASE L"Vietnamese" - LGRPID_INDIC+LGRPID_RES_BASE L"Indic" - LGRPID_GEORGIAN+LGRPID_RES_BASE L"Georgian" - LGRPID_ARMENIAN+LGRPID_RES_BASE L"Armenian" + LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Western Europe and United States" + LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Central Europe" + LGRPID_BALTIC+LGRPID_RES_BASE "Baltic" + LGRPID_GREEK+LGRPID_RES_BASE "Greek" + LGRPID_CYRILLIC+LGRPID_RES_BASE "Cyrillic" + LGRPID_TURKISH+LGRPID_RES_BASE "Turkic" + LGRPID_JAPANESE+LGRPID_RES_BASE "Japanese" + LGRPID_KOREAN+LGRPID_RES_BASE "Korean" + LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Traditional Chinese" + LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" + LGRPID_THAI+LGRPID_RES_BASE "Thai" + LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" + LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" + LGRPID_INDIC+LGRPID_RES_BASE "Indic" + LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian" + LGRPID_ARMENIAN+LGRPID_RES_BASE "Armenian" } diff --git a/reactos/dll/win32/kernel32/nls/pan.nls b/reactos/dll/win32/kernel32/nls/pan.nls index 2c237e08693..febaa1d7f52 100644 --- a/reactos/dll/win32/kernel32/nls/pan.nls +++ b/reactos/dll/win32/kernel32/nls/pan.nls @@ -18,139 +18,139 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma code_page(0) /* Unicode only */ +#pragma code_page(65001) /* UTF-8 */ STRINGTABLE LANGUAGE LANG_PUNJABI, SUBLANG_DEFAULT { LOCALE_FONTSIGNATURE L"\x002f\x8002\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x4000\x0003\x0000\x0000\xc5d4" - LOCALE_ICALENDARTYPE L"1" - LOCALE_ICENTURY L"0" - LOCALE_ICOUNTRY L"91" - LOCALE_ICURRDIGITS L"2" - LOCALE_ICURRENCY L"2" - LOCALE_IDATE L"1" - LOCALE_IDAYLZERO L"1" - LOCALE_IDEFAULTANSICODEPAGE L"0" - LOCALE_IDEFAULTCODEPAGE L"1" - LOCALE_IDEFAULTCOUNTRY L"91" - LOCALE_IDEFAULTEBCDICCODEPAGE L"500" - LOCALE_IDEFAULTLANGUAGE L"0446" - LOCALE_IDEFAULTMACCODEPAGE L"2" - LOCALE_IDEFAULTUNIXCODEPAGE L"65001" - LOCALE_IDIGITS L"2" - LOCALE_IDIGITSUBSTITUTION L"1" - LOCALE_IFIRSTDAYOFWEEK L"0" - LOCALE_IFIRSTWEEKOFYEAR L"0" - LOCALE_IINTLCURRDIGITS L"2" - LOCALE_ILANGUAGE L"0446" - LOCALE_ILDATE L"1" - LOCALE_ILZERO L"1" - LOCALE_IMEASURE L"0" - LOCALE_IMONLZERO L"1" - LOCALE_INEGCURR L"12" - LOCALE_INEGNUMBER L"1" - LOCALE_INEGSEPBYSPACE L"1" - LOCALE_INEGSIGNPOSN L"4" - LOCALE_INEGSYMPRECEDES L"1" - LOCALE_IOPTIONALCALENDAR L"0" - LOCALE_IPAPERSIZE L"9" - LOCALE_IPOSSEPBYSPACE L"1" - LOCALE_IPOSSIGNPOSN L"4" - LOCALE_IPOSSYMPRECEDES L"1" - LOCALE_ITIME L"0" - LOCALE_ITIMEMARKPOSN L"1" - LOCALE_ITLZERO L"1" - LOCALE_S1159 L"\x0a38\x0a35\x0a47\x0a30\x0a47" - LOCALE_S2359 L"\x0a36\x0a3e\x0a2e" - LOCALE_SABBREVCTRYNAME L"IND" - LOCALE_SABBREVDAYNAME1 L"\x0a38\x0a4b\x0a2e." - LOCALE_SABBREVDAYNAME2 L"\x0a2e\x0a70\x0a17\x0a32." - LOCALE_SABBREVDAYNAME3 L"\x0a2c\x0a41\x0a27." - LOCALE_SABBREVDAYNAME4 L"\x0a35\x0a40\x0a30." - LOCALE_SABBREVDAYNAME5 L"\x0a36\x0a41\x0a15\x0a30." - LOCALE_SABBREVDAYNAME6 L"\x0a36\x0a28\x0a40." - LOCALE_SABBREVDAYNAME7 L"\x0a10\x0a24." - LOCALE_SABBREVLANGNAME L"PAN" - LOCALE_SABBREVMONTHNAME1 L"\x0a1c\x0a28\x0a35\x0a30\x0a40" - LOCALE_SABBREVMONTHNAME2 L"\x0a5e\x0a30\x0a35\x0a30\x0a40" - LOCALE_SABBREVMONTHNAME3 L"\x0a2e\x0a3e\x0a30\x0a1a" - LOCALE_SABBREVMONTHNAME4 L"\x0a05\x0a2a\x0a4d\x0a30\x0a48\x0a32" - LOCALE_SABBREVMONTHNAME5 L"\x0a2e\x0a08" - LOCALE_SABBREVMONTHNAME6 L"\x0a1c\x0a42\x0a28" - LOCALE_SABBREVMONTHNAME7 L"\x0a1c\x0a41\x0a32\x0a3e\x0a08" - LOCALE_SABBREVMONTHNAME8 L"\x0a05\x0a17\x0a38\x0a24" - LOCALE_SABBREVMONTHNAME9 L"\x0a38\x0a24\x0a70\x0a2c\x0a30" - LOCALE_SABBREVMONTHNAME10 L"\x0a05\x0a15\x0a24\x0a42\x0a2c\x0a30" - LOCALE_SABBREVMONTHNAME11 L"\x0a28\x0a35\x0a70\x0a2c\x0a30" - LOCALE_SABBREVMONTHNAME12 L"\x0a26\x0a38\x0a70\x0a2c\x0a30" - LOCALE_SABBREVMONTHNAME13 L"" - LOCALE_SCOUNTRY L"India" - LOCALE_SCURRENCY L"\x0a30\x0a41" - LOCALE_SDATE L"-" - LOCALE_SDAYNAME1 L"\x0a38\x0a4b\x0a2e\x0a35\x0a3e\x0a30" - LOCALE_SDAYNAME2 L"\x0a2e\x0a70\x0a17\x0a32\x0a35\x0a3e\x0a30" - LOCALE_SDAYNAME3 L"\x0a2c\x0a41\x0a27\x0a35\x0a3e\x0a30" - LOCALE_SDAYNAME4 L"\x0a35\x0a40\x0a30\x0a35\x0a3e\x0a30" - LOCALE_SDAYNAME5 L"\x0a36\x0a41\x0a71\x0a15\x0a30\x0a35\x0a3e\x0a30" - LOCALE_SDAYNAME6 L"\x0a36\x0a28\x0a40\x0a1a\x0a30\x0a35\x0a3e\x0a30" - LOCALE_SDAYNAME7 L"\x0a10\x0a24\x0a35\x0a3e\x0a30" - LOCALE_SDECIMAL L"." - LOCALE_SENGCOUNTRY L"India" - LOCALE_SENGCURRNAME L"Indian Rupee" - LOCALE_SENGLANGUAGE L"Punjabi" - LOCALE_SGROUPING L"3;2;0" - LOCALE_SINTLSYMBOL L"INR" - LOCALE_SISO3166CTRYNAME L"IN" - LOCALE_SISO639LANGNAME L"pa" - LOCALE_SLANGUAGE L"Punjabi" - LOCALE_SLIST L"," - LOCALE_SLONGDATE L"dd MMMM yyyy dddd" - LOCALE_SMONDECIMALSEP L"." - LOCALE_SMONGROUPING L"3;2;0" - LOCALE_SMONTHNAME1 L"\x0a1c\x0a28\x0a35\x0a30\x0a40" - LOCALE_SMONTHNAME2 L"\x0a5e\x0a30\x0a35\x0a30\x0a40" - LOCALE_SMONTHNAME3 L"\x0a2e\x0a3e\x0a30\x0a1a" - LOCALE_SMONTHNAME4 L"\x0a05\x0a2a\x0a4d\x0a30\x0a48\x0a32" - LOCALE_SMONTHNAME5 L"\x0a2e\x0a08" - LOCALE_SMONTHNAME6 L"\x0a1c\x0a42\x0a28" - LOCALE_SMONTHNAME7 L"\x0a1c\x0a41\x0a32\x0a3e\x0a08" - LOCALE_SMONTHNAME8 L"\x0a05\x0a17\x0a38\x0a24" - LOCALE_SMONTHNAME9 L"\x0a38\x0a24\x0a70\x0a2c\x0a30" - LOCALE_SMONTHNAME10 L"\x0a05\x0a15\x0a24\x0a42\x0a2c\x0a30" - LOCALE_SMONTHNAME11 L"\x0a28\x0a35\x0a70\x0a2c\x0a30" - LOCALE_SMONTHNAME12 L"\x0a26\x0a38\x0a70\x0a2c\x0a30" - LOCALE_SMONTHNAME13 L"" - LOCALE_SMONTHOUSANDSEP L"," - LOCALE_SNAME L"pa-IN" - LOCALE_SNATIVECTRYNAME L"\x0a2d\x0a3e\x0a30\x0a24" - LOCALE_SNATIVECURRNAME L"\x0a30\x0a41\x0a2a\x0a3f\x0a06" - LOCALE_SNATIVEDIGITS L"\x0a66\x0a67\x0a68\x0a69\x0a6a\x0a6b\x0a6c\x0a6d\x0a6e\x0a6f" - LOCALE_SNATIVELANGNAME L"\x0a2a\x0a70\x0a1c\x0a3e\x0a2c\x0a40" - LOCALE_SNEGATIVESIGN L"-" - LOCALE_SPOSITIVESIGN L"" - LOCALE_SSCRIPTS L"Guru;" - LOCALE_SSHORTDATE L"dd-MM-yy" - LOCALE_SSORTNAME L"Default" - LOCALE_STHOUSAND L"," - LOCALE_STIME L":" - LOCALE_STIMEFORMAT L"tt hh:mm:ss" - LOCALE_SYEARMONTH L"MMMM, yyyy" + LOCALE_ICALENDARTYPE "1" + LOCALE_ICENTURY "0" + LOCALE_ICOUNTRY "91" + LOCALE_ICURRDIGITS "2" + LOCALE_ICURRENCY "2" + LOCALE_IDATE "1" + LOCALE_IDAYLZERO "1" + LOCALE_IDEFAULTANSICODEPAGE "0" + LOCALE_IDEFAULTCODEPAGE "1" + LOCALE_IDEFAULTCOUNTRY "91" + LOCALE_IDEFAULTEBCDICCODEPAGE "500" + LOCALE_IDEFAULTLANGUAGE "0446" + LOCALE_IDEFAULTMACCODEPAGE "2" + LOCALE_IDEFAULTUNIXCODEPAGE "65001" + LOCALE_IDIGITS "2" + LOCALE_IDIGITSUBSTITUTION "1" + LOCALE_IFIRSTDAYOFWEEK "0" + LOCALE_IFIRSTWEEKOFYEAR "0" + LOCALE_IINTLCURRDIGITS "2" + LOCALE_ILANGUAGE "0446" + LOCALE_ILDATE "1" + LOCALE_ILZERO "1" + LOCALE_IMEASURE "0" + LOCALE_IMONLZERO "1" + LOCALE_INEGCURR "12" + LOCALE_INEGNUMBER "1" + LOCALE_INEGSEPBYSPACE "1" + LOCALE_INEGSIGNPOSN "4" + LOCALE_INEGSYMPRECEDES "1" + LOCALE_IOPTIONALCALENDAR "0" + LOCALE_IPAPERSIZE "9" + LOCALE_IPOSSEPBYSPACE "1" + LOCALE_IPOSSIGNPOSN "4" + LOCALE_IPOSSYMPRECEDES "1" + LOCALE_ITIME "0" + LOCALE_ITIMEMARKPOSN "1" + LOCALE_ITLZERO "1" + LOCALE_S1159 "ਸਵੇਰੇ" + LOCALE_S2359 "аЁ¶аЁѕаЁ®" + LOCALE_SABBREVCTRYNAME "IND" + LOCALE_SABBREVDAYNAME1 "аЁёа©‹аЁ®." + LOCALE_SABBREVDAYNAME2 "аЁ®а©°аЁ—аЁІ." + LOCALE_SABBREVDAYNAME3 "аЁ¬а©ЃаЁ§." + LOCALE_SABBREVDAYNAME4 "аЁµа©ЂаЁ°." + LOCALE_SABBREVDAYNAME5 "аЁ¶а©ЃаЁ•аЁ°." + LOCALE_SABBREVDAYNAME6 "аЁ¶аЁЁа©Ђ." + LOCALE_SABBREVDAYNAME7 "аЁђаЁ¤." + LOCALE_SABBREVLANGNAME "PAN" + LOCALE_SABBREVMONTHNAME1 "аЁњаЁЁаЁµаЁ°а©Ђ" + LOCALE_SABBREVMONTHNAME2 "а©ћаЁ°аЁµаЁ°а©Ђ" + LOCALE_SABBREVMONTHNAME3 "аЁ®аЁѕаЁ°аЁљ" + LOCALE_SABBREVMONTHNAME4 "аЁ…аЁЄа©ЌаЁ°а©€аЁІ" + LOCALE_SABBREVMONTHNAME5 "аЁ®аЁ€" + LOCALE_SABBREVMONTHNAME6 "аЁња©‚аЁЁ" + LOCALE_SABBREVMONTHNAME7 "аЁња©ЃаЁІаЁѕаЁ€" + LOCALE_SABBREVMONTHNAME8 "аЁ…аЁ—аЁёаЁ¤" + LOCALE_SABBREVMONTHNAME9 "аЁёаЁ¤а©°аЁ¬аЁ°" + LOCALE_SABBREVMONTHNAME10 "аЁ…аЁ•аЁ¤а©‚аЁ¬аЁ°" + LOCALE_SABBREVMONTHNAME11 "аЁЁаЁµа©°аЁ¬аЁ°" + LOCALE_SABBREVMONTHNAME12 "аЁ¦аЁёа©°аЁ¬аЁ°" + LOCALE_SABBREVMONTHNAME13 "" + LOCALE_SCOUNTRY "India" + LOCALE_SCURRENCY "аЁ°а©Ѓ" + LOCALE_SDATE "-" + LOCALE_SDAYNAME1 "аЁёа©‹аЁ®аЁµаЁѕаЁ°" + LOCALE_SDAYNAME2 "аЁ®а©°аЁ—аЁІаЁµаЁѕаЁ°" + LOCALE_SDAYNAME3 "аЁ¬а©ЃаЁ§аЁµаЁѕаЁ°" + LOCALE_SDAYNAME4 "аЁµа©ЂаЁ°аЁµаЁѕаЁ°" + LOCALE_SDAYNAME5 "аЁ¶а©Ѓа©±аЁ•аЁ°аЁµаЁѕаЁ°" + LOCALE_SDAYNAME6 "аЁ¶аЁЁа©ЂаЁљаЁ°аЁµаЁѕаЁ°" + LOCALE_SDAYNAME7 "аЁђаЁ¤аЁµаЁѕаЁ°" + LOCALE_SDECIMAL "." + LOCALE_SENGCOUNTRY "India" + LOCALE_SENGCURRNAME "Indian Rupee" + LOCALE_SENGLANGUAGE "Punjabi" + LOCALE_SGROUPING "3;2;0" + LOCALE_SINTLSYMBOL "INR" + LOCALE_SISO3166CTRYNAME "IN" + LOCALE_SISO639LANGNAME "pa" + LOCALE_SLANGUAGE "Punjabi" + LOCALE_SLIST "," + LOCALE_SLONGDATE "dd MMMM yyyy dddd" + LOCALE_SMONDECIMALSEP "." + LOCALE_SMONGROUPING "3;2;0" + LOCALE_SMONTHNAME1 "аЁњаЁЁаЁµаЁ°а©Ђ" + LOCALE_SMONTHNAME2 "а©ћаЁ°аЁµаЁ°а©Ђ" + LOCALE_SMONTHNAME3 "аЁ®аЁѕаЁ°аЁљ" + LOCALE_SMONTHNAME4 "аЁ…аЁЄа©ЌаЁ°а©€аЁІ" + LOCALE_SMONTHNAME5 "аЁ®аЁ€" + LOCALE_SMONTHNAME6 "аЁња©‚аЁЁ" + LOCALE_SMONTHNAME7 "аЁња©ЃаЁІаЁѕаЁ€" + LOCALE_SMONTHNAME8 "аЁ…аЁ—аЁёаЁ¤" + LOCALE_SMONTHNAME9 "аЁёаЁ¤а©°аЁ¬аЁ°" + LOCALE_SMONTHNAME10 "аЁ…аЁ•аЁ¤а©‚аЁ¬аЁ°" + LOCALE_SMONTHNAME11 "аЁЁаЁµа©°аЁ¬аЁ°" + LOCALE_SMONTHNAME12 "аЁ¦аЁёа©°аЁ¬аЁ°" + LOCALE_SMONTHNAME13 "" + LOCALE_SMONTHOUSANDSEP "," + LOCALE_SNAME "pa-IN" + LOCALE_SNATIVECTRYNAME "аЁ­аЁѕаЁ°аЁ¤" + LOCALE_SNATIVECURRNAME "аЁ°а©ЃаЁЄаЁїаЁ†" + LOCALE_SNATIVEDIGITS "੦੧੨੩੪੫੬੭੮੯" + LOCALE_SNATIVELANGNAME "аЁЄа©°аЁњаЁѕаЁ¬а©Ђ" + LOCALE_SNEGATIVESIGN "-" + LOCALE_SPOSITIVESIGN "" + LOCALE_SSCRIPTS "Guru;" + LOCALE_SSHORTDATE "dd-MM-yy" + LOCALE_SSORTNAME "Default" + LOCALE_STHOUSAND "," + LOCALE_STIME ":" + LOCALE_STIMEFORMAT "tt hh:mm:ss" + LOCALE_SYEARMONTH "MMMM, yyyy" - LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE L"Western Europe and United States" - LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE L"Central Europe" - LGRPID_BALTIC+LGRPID_RES_BASE L"Baltic" - LGRPID_GREEK+LGRPID_RES_BASE L"Greek" - LGRPID_CYRILLIC+LGRPID_RES_BASE L"Cyrillic" - LGRPID_TURKISH+LGRPID_RES_BASE L"Turkic" - LGRPID_JAPANESE+LGRPID_RES_BASE L"Japanese" - LGRPID_KOREAN+LGRPID_RES_BASE L"Korean" - LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE L"Traditional Chinese" - LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE L"Simplified Chinese" - LGRPID_THAI+LGRPID_RES_BASE L"Thai" - LGRPID_HEBREW+LGRPID_RES_BASE L"Hebrew" - LGRPID_ARABIC+LGRPID_RES_BASE L"Arabic" - LGRPID_VIETNAMESE+LGRPID_RES_BASE L"Vietnamese" - LGRPID_INDIC+LGRPID_RES_BASE L"Indic" - LGRPID_GEORGIAN+LGRPID_RES_BASE L"Georgian" - LGRPID_ARMENIAN+LGRPID_RES_BASE L"Armenian" + LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Western Europe and United States" + LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Central Europe" + LGRPID_BALTIC+LGRPID_RES_BASE "Baltic" + LGRPID_GREEK+LGRPID_RES_BASE "Greek" + LGRPID_CYRILLIC+LGRPID_RES_BASE "Cyrillic" + LGRPID_TURKISH+LGRPID_RES_BASE "Turkic" + LGRPID_JAPANESE+LGRPID_RES_BASE "Japanese" + LGRPID_KOREAN+LGRPID_RES_BASE "Korean" + LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Traditional Chinese" + LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" + LGRPID_THAI+LGRPID_RES_BASE "Thai" + LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" + LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" + LGRPID_INDIC+LGRPID_RES_BASE "Indic" + LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian" + LGRPID_ARMENIAN+LGRPID_RES_BASE "Armenian" } diff --git a/reactos/dll/win32/kernel32/nls/san.nls b/reactos/dll/win32/kernel32/nls/san.nls index ce236d7ce04..d6f353f3858 100644 --- a/reactos/dll/win32/kernel32/nls/san.nls +++ b/reactos/dll/win32/kernel32/nls/san.nls @@ -18,139 +18,139 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma code_page(0) /* Unicode only */ +#pragma code_page(65001) /* UTF-8 */ STRINGTABLE LANGUAGE LANG_SANSKRIT, SUBLANG_DEFAULT { LOCALE_FONTSIGNATURE L"\x802f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x4000\x0003\x0000\x0000\xc5d4" - LOCALE_ICALENDARTYPE L"1" - LOCALE_ICENTURY L"1" - LOCALE_ICOUNTRY L"91" - LOCALE_ICURRDIGITS L"2" - LOCALE_ICURRENCY L"2" - LOCALE_IDATE L"1" - LOCALE_IDAYLZERO L"1" - LOCALE_IDEFAULTANSICODEPAGE L"0" - LOCALE_IDEFAULTCODEPAGE L"1" - LOCALE_IDEFAULTCOUNTRY L"91" - LOCALE_IDEFAULTEBCDICCODEPAGE L"500" - LOCALE_IDEFAULTLANGUAGE L"044f" - LOCALE_IDEFAULTMACCODEPAGE L"2" - LOCALE_IDEFAULTUNIXCODEPAGE L"65001" - LOCALE_IDIGITS L"2" - LOCALE_IDIGITSUBSTITUTION L"1" - LOCALE_IFIRSTDAYOFWEEK L"6" - LOCALE_IFIRSTWEEKOFYEAR L"0" - LOCALE_IINTLCURRDIGITS L"2" - LOCALE_ILANGUAGE L"044f" - LOCALE_ILDATE L"1" - LOCALE_ILZERO L"1" - LOCALE_IMEASURE L"0" - LOCALE_IMONLZERO L"1" - LOCALE_INEGCURR L"12" - LOCALE_INEGNUMBER L"1" - LOCALE_INEGSEPBYSPACE L"1" - LOCALE_INEGSIGNPOSN L"4" - LOCALE_INEGSYMPRECEDES L"1" - LOCALE_IOPTIONALCALENDAR L"0" - LOCALE_IPAPERSIZE L"9" - LOCALE_IPOSSEPBYSPACE L"1" - LOCALE_IPOSSIGNPOSN L"4" - LOCALE_IPOSSYMPRECEDES L"1" - LOCALE_ITIME L"1" - LOCALE_ITIMEMARKPOSN L"1" - LOCALE_ITLZERO L"1" - LOCALE_S1159 L"\x092a\x0942\x0930\x094d\x0935\x093e\x0939\x094d\x0928" - LOCALE_S2359 L"\x0905\x092a\x0930\x093e\x0939\x094d\x0928" - LOCALE_SABBREVCTRYNAME L"IND" - LOCALE_SABBREVDAYNAME1 L"\x0938\x094b\x092e\x0935\x093e\x0938\x0930\x0903" - LOCALE_SABBREVDAYNAME2 L"\x092e\x0919\x094d\x0917\x0932\x0935\x093e\x0938\x0930\x0903" - LOCALE_SABBREVDAYNAME3 L"\x092c\x0941\x0927\x0935\x093e\x0938\x0930\x0903" - LOCALE_SABBREVDAYNAME4 L"\x0917\x0941\x0930\x0941\x0935\x093e\x0938\x0930\x0903" - LOCALE_SABBREVDAYNAME5 L"\x0936\x0941\x0915\x094d\x0930\x0935\x093e\x0938\x0930\x0903" - LOCALE_SABBREVDAYNAME6 L"\x0936\x0928\x093f\x0935\x093e\x0938\x0930\x0903" - LOCALE_SABBREVDAYNAME7 L"\x0930\x0935\x093f\x0935\x093e\x0938\x0930\x0903" - LOCALE_SABBREVLANGNAME L"SAN" - LOCALE_SABBREVMONTHNAME1 L"\x091c\x0928\x0935\x0930\x0940" - LOCALE_SABBREVMONTHNAME2 L"\x092b\x0930\x0935\x0930\x0940" - LOCALE_SABBREVMONTHNAME3 L"\x092e\x093e\x0930\x094d\x091a" - LOCALE_SABBREVMONTHNAME4 L"\x0905\x092a\x094d\x0930\x0948\x0932" - LOCALE_SABBREVMONTHNAME5 L"\x092e\x0908" - LOCALE_SABBREVMONTHNAME6 L"\x091c\x0942\x0928" - LOCALE_SABBREVMONTHNAME7 L"\x091c\x0941\x0932\x093e\x0908" - LOCALE_SABBREVMONTHNAME8 L"\x0905\x0917\x0938\x094d\x0924" - LOCALE_SABBREVMONTHNAME9 L"\x0938\x093f\x0924\x092e\x094d\x092c\x0930" - LOCALE_SABBREVMONTHNAME10 L"\x0905\x0915\x094d\x0924\x0942\x092c\x0930" - LOCALE_SABBREVMONTHNAME11 L"\x0928\x0935\x092e\x094d\x092c\x0930" - LOCALE_SABBREVMONTHNAME12 L"\x0926\x093f\x0938\x092e\x094d\x092c\x0930" - LOCALE_SABBREVMONTHNAME13 L"" - LOCALE_SCOUNTRY L"India" - LOCALE_SCURRENCY L"\x0930\x0941" - LOCALE_SDATE L"-" - LOCALE_SDAYNAME1 L"\x0938\x094b\x092e\x0935\x093e\x0938\x0930\x0903" - LOCALE_SDAYNAME2 L"\x092e\x0919\x094d\x0917\x0932\x0935\x093e\x0938\x0930\x0903" - LOCALE_SDAYNAME3 L"\x092c\x0941\x0927\x0935\x093e\x0938\x0930\x0903" - LOCALE_SDAYNAME4 L"\x0917\x0941\x0930\x0941\x0935\x093e\x0938\x0930\x0903" - LOCALE_SDAYNAME5 L"\x0936\x0941\x0915\x094d\x0930\x0935\x093e\x0938\x0930\x0903" - LOCALE_SDAYNAME6 L"\x0936\x0928\x093f\x0935\x093e\x0938\x0930\x0903" - LOCALE_SDAYNAME7 L"\x0930\x0935\x093f\x0935\x093e\x0938\x0930\x0903" - LOCALE_SDECIMAL L"." - LOCALE_SENGCOUNTRY L"India" - LOCALE_SENGCURRNAME L"Indian Rupee" - LOCALE_SENGLANGUAGE L"Sanskrit" - LOCALE_SGROUPING L"3;2;0" - LOCALE_SINTLSYMBOL L"INR" - LOCALE_SISO3166CTRYNAME L"IN" - LOCALE_SISO639LANGNAME L"sa" - LOCALE_SLANGUAGE L"Sanskrit" - LOCALE_SLIST L"," - LOCALE_SLONGDATE L"dd MMMM yyyy dddd" - LOCALE_SMONDECIMALSEP L"." - LOCALE_SMONGROUPING L"3;2;0" - LOCALE_SMONTHNAME1 L"\x091c\x0928\x0935\x0930\x0940" - LOCALE_SMONTHNAME2 L"\x092b\x0930\x0935\x0930\x0940" - LOCALE_SMONTHNAME3 L"\x092e\x093e\x0930\x094d\x091a" - LOCALE_SMONTHNAME4 L"\x0905\x092a\x094d\x0930\x0948\x0932" - LOCALE_SMONTHNAME5 L"\x092e\x0908" - LOCALE_SMONTHNAME6 L"\x091c\x0942\x0928" - LOCALE_SMONTHNAME7 L"\x091c\x0941\x0932\x093e\x0908" - LOCALE_SMONTHNAME8 L"\x0905\x0917\x0938\x094d\x0924" - LOCALE_SMONTHNAME9 L"\x0938\x093f\x0924\x092e\x094d\x092c\x0930" - LOCALE_SMONTHNAME10 L"\x0905\x0915\x094d\x0924\x0942\x092c\x0930" - LOCALE_SMONTHNAME11 L"\x0928\x0935\x092e\x094d\x092c\x0930" - LOCALE_SMONTHNAME12 L"\x0926\x093f\x0938\x092e\x094d\x092c\x0930" - LOCALE_SMONTHNAME13 L"" - LOCALE_SMONTHOUSANDSEP L"," - LOCALE_SNAME L"sa-IN" - LOCALE_SNATIVECTRYNAME L"\x092d\x093e\x0930\x0924\x092e\x094d" - LOCALE_SNATIVECURRNAME L"\x0930\x0941\x094d\x092f\x0915\x092e\x094d" - LOCALE_SNATIVEDIGITS L"\x0966\x0967\x0968\x0969\x096a\x096b\x096c\x096d\x096e\x096f" - LOCALE_SNATIVELANGNAME L"\x0938\x0902\x0938\x094d\x0915\x0943\x0924" - LOCALE_SNEGATIVESIGN L"-" - LOCALE_SPOSITIVESIGN L"" - LOCALE_SSCRIPTS L"Deva;" - LOCALE_SSHORTDATE L"dd-MM-yyyy" - LOCALE_SSORTNAME L"Default" - LOCALE_STHOUSAND L"," - LOCALE_STIME L":" - LOCALE_STIMEFORMAT L"HH:mm:ss" - LOCALE_SYEARMONTH L"MMMM, yyyy" + LOCALE_ICALENDARTYPE "1" + LOCALE_ICENTURY "1" + LOCALE_ICOUNTRY "91" + LOCALE_ICURRDIGITS "2" + LOCALE_ICURRENCY "2" + LOCALE_IDATE "1" + LOCALE_IDAYLZERO "1" + LOCALE_IDEFAULTANSICODEPAGE "0" + LOCALE_IDEFAULTCODEPAGE "1" + LOCALE_IDEFAULTCOUNTRY "91" + LOCALE_IDEFAULTEBCDICCODEPAGE "500" + LOCALE_IDEFAULTLANGUAGE "044f" + LOCALE_IDEFAULTMACCODEPAGE "2" + LOCALE_IDEFAULTUNIXCODEPAGE "65001" + LOCALE_IDIGITS "2" + LOCALE_IDIGITSUBSTITUTION "1" + LOCALE_IFIRSTDAYOFWEEK "6" + LOCALE_IFIRSTWEEKOFYEAR "0" + LOCALE_IINTLCURRDIGITS "2" + LOCALE_ILANGUAGE "044f" + LOCALE_ILDATE "1" + LOCALE_ILZERO "1" + LOCALE_IMEASURE "0" + LOCALE_IMONLZERO "1" + LOCALE_INEGCURR "12" + LOCALE_INEGNUMBER "1" + LOCALE_INEGSEPBYSPACE "1" + LOCALE_INEGSIGNPOSN "4" + LOCALE_INEGSYMPRECEDES "1" + LOCALE_IOPTIONALCALENDAR "0" + LOCALE_IPAPERSIZE "9" + LOCALE_IPOSSEPBYSPACE "1" + LOCALE_IPOSSIGNPOSN "4" + LOCALE_IPOSSYMPRECEDES "1" + LOCALE_ITIME "1" + LOCALE_ITIMEMARKPOSN "1" + LOCALE_ITLZERO "1" + LOCALE_S1159 "पूर्वाह्न" + LOCALE_S2359 "अपराह्न" + LOCALE_SABBREVCTRYNAME "IND" + LOCALE_SABBREVDAYNAME1 "सोमवासरः" + LOCALE_SABBREVDAYNAME2 "मङ्गलवासरः" + LOCALE_SABBREVDAYNAME3 "बुधवासरः" + LOCALE_SABBREVDAYNAME4 "गुरुवासरः" + LOCALE_SABBREVDAYNAME5 "शुक्रवासरः" + LOCALE_SABBREVDAYNAME6 "शनिवासरः" + LOCALE_SABBREVDAYNAME7 "रविवासरः" + LOCALE_SABBREVLANGNAME "SAN" + LOCALE_SABBREVMONTHNAME1 "जनवरी" + LOCALE_SABBREVMONTHNAME2 "फरवरी" + LOCALE_SABBREVMONTHNAME3 "मार्च" + LOCALE_SABBREVMONTHNAME4 "अप्रैल" + LOCALE_SABBREVMONTHNAME5 "मई" + LOCALE_SABBREVMONTHNAME6 "जून" + LOCALE_SABBREVMONTHNAME7 "जुलाई" + LOCALE_SABBREVMONTHNAME8 "अगस्त" + LOCALE_SABBREVMONTHNAME9 "सितम्बर" + LOCALE_SABBREVMONTHNAME10 "अक्तूबर" + LOCALE_SABBREVMONTHNAME11 "नवम्बर" + LOCALE_SABBREVMONTHNAME12 "दिसम्बर" + LOCALE_SABBREVMONTHNAME13 "" + LOCALE_SCOUNTRY "India" + LOCALE_SCURRENCY "रु" + LOCALE_SDATE "-" + LOCALE_SDAYNAME1 "सोमवासरः" + LOCALE_SDAYNAME2 "मङ्गलवासरः" + LOCALE_SDAYNAME3 "बुधवासरः" + LOCALE_SDAYNAME4 "गुरुवासरः" + LOCALE_SDAYNAME5 "शुक्रवासरः" + LOCALE_SDAYNAME6 "शनिवासरः" + LOCALE_SDAYNAME7 "रविवासरः" + LOCALE_SDECIMAL "." + LOCALE_SENGCOUNTRY "India" + LOCALE_SENGCURRNAME "Indian Rupee" + LOCALE_SENGLANGUAGE "Sanskrit" + LOCALE_SGROUPING "3;2;0" + LOCALE_SINTLSYMBOL "INR" + LOCALE_SISO3166CTRYNAME "IN" + LOCALE_SISO639LANGNAME "sa" + LOCALE_SLANGUAGE "Sanskrit" + LOCALE_SLIST "," + LOCALE_SLONGDATE "dd MMMM yyyy dddd" + LOCALE_SMONDECIMALSEP "." + LOCALE_SMONGROUPING "3;2;0" + LOCALE_SMONTHNAME1 "जनवरी" + LOCALE_SMONTHNAME2 "फरवरी" + LOCALE_SMONTHNAME3 "मार्च" + LOCALE_SMONTHNAME4 "अप्रैल" + LOCALE_SMONTHNAME5 "मई" + LOCALE_SMONTHNAME6 "जून" + LOCALE_SMONTHNAME7 "जुलाई" + LOCALE_SMONTHNAME8 "अगस्त" + LOCALE_SMONTHNAME9 "सितम्बर" + LOCALE_SMONTHNAME10 "अक्तूबर" + LOCALE_SMONTHNAME11 "नवम्बर" + LOCALE_SMONTHNAME12 "दिसम्बर" + LOCALE_SMONTHNAME13 "" + LOCALE_SMONTHOUSANDSEP "," + LOCALE_SNAME "sa-IN" + LOCALE_SNATIVECTRYNAME "भारतम्" + LOCALE_SNATIVECURRNAME "रु्यकम्" + LOCALE_SNATIVEDIGITS "०१२३४५६७८९" + LOCALE_SNATIVELANGNAME "संस्कृत" + LOCALE_SNEGATIVESIGN "-" + LOCALE_SPOSITIVESIGN "" + LOCALE_SSCRIPTS "Deva;" + LOCALE_SSHORTDATE "dd-MM-yyyy" + LOCALE_SSORTNAME "Default" + LOCALE_STHOUSAND "," + LOCALE_STIME ":" + LOCALE_STIMEFORMAT "HH:mm:ss" + LOCALE_SYEARMONTH "MMMM, yyyy" - LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE L"Western Europe and United States" - LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE L"Central Europe" - LGRPID_BALTIC+LGRPID_RES_BASE L"Baltic" - LGRPID_GREEK+LGRPID_RES_BASE L"Greek" - LGRPID_CYRILLIC+LGRPID_RES_BASE L"Cyrillic" - LGRPID_TURKISH+LGRPID_RES_BASE L"Turkic" - LGRPID_JAPANESE+LGRPID_RES_BASE L"Japanese" - LGRPID_KOREAN+LGRPID_RES_BASE L"Korean" - LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE L"Traditional Chinese" - LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE L"Simplified Chinese" - LGRPID_THAI+LGRPID_RES_BASE L"Thai" - LGRPID_HEBREW+LGRPID_RES_BASE L"Hebrew" - LGRPID_ARABIC+LGRPID_RES_BASE L"Arabic" - LGRPID_VIETNAMESE+LGRPID_RES_BASE L"Vietnamese" - LGRPID_INDIC+LGRPID_RES_BASE L"Indic" - LGRPID_GEORGIAN+LGRPID_RES_BASE L"Georgian" - LGRPID_ARMENIAN+LGRPID_RES_BASE L"Armenian" + LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Western Europe and United States" + LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Central Europe" + LGRPID_BALTIC+LGRPID_RES_BASE "Baltic" + LGRPID_GREEK+LGRPID_RES_BASE "Greek" + LGRPID_CYRILLIC+LGRPID_RES_BASE "Cyrillic" + LGRPID_TURKISH+LGRPID_RES_BASE "Turkic" + LGRPID_JAPANESE+LGRPID_RES_BASE "Japanese" + LGRPID_KOREAN+LGRPID_RES_BASE "Korean" + LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Traditional Chinese" + LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" + LGRPID_THAI+LGRPID_RES_BASE "Thai" + LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" + LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" + LGRPID_INDIC+LGRPID_RES_BASE "Indic" + LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian" + LGRPID_ARMENIAN+LGRPID_RES_BASE "Armenian" } diff --git a/reactos/dll/win32/kernel32/nls/syr.nls b/reactos/dll/win32/kernel32/nls/syr.nls index 8cead3b864b..45bb96c25a0 100644 --- a/reactos/dll/win32/kernel32/nls/syr.nls +++ b/reactos/dll/win32/kernel32/nls/syr.nls @@ -18,139 +18,139 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma code_page(0) /* Unicode only */ +#pragma code_page(65001) /* UTF-8 */ STRINGTABLE LANGUAGE LANG_SYRIAC, SUBLANG_DEFAULT { LOCALE_FONTSIGNATURE L"\x60af\x8000\x3848\x1000\x0088\x0000\x0000\x0800\x0040\x0000\x0000\x2000\x0040\x0000\x0000\x2008" - LOCALE_ICALENDARTYPE L"1" - LOCALE_ICENTURY L"1" - LOCALE_ICOUNTRY L"963" - LOCALE_ICURRDIGITS L"2" - LOCALE_ICURRENCY L"2" - LOCALE_IDATE L"1" - LOCALE_IDAYLZERO L"1" - LOCALE_IDEFAULTANSICODEPAGE L"0" - LOCALE_IDEFAULTCODEPAGE L"1" - LOCALE_IDEFAULTCOUNTRY L"963" - LOCALE_IDEFAULTEBCDICCODEPAGE L"500" - LOCALE_IDEFAULTLANGUAGE L"045a" - LOCALE_IDEFAULTMACCODEPAGE L"2" - LOCALE_IDEFAULTUNIXCODEPAGE L"65001" - LOCALE_IDIGITS L"2" - LOCALE_IDIGITSUBSTITUTION L"1" - LOCALE_IFIRSTDAYOFWEEK L"5" - LOCALE_IFIRSTWEEKOFYEAR L"0" - LOCALE_IINTLCURRDIGITS L"2" - LOCALE_ILANGUAGE L"045a" - LOCALE_ILDATE L"1" - LOCALE_ILZERO L"1" - LOCALE_IMEASURE L"0" - LOCALE_IMONLZERO L"1" - LOCALE_INEGCURR L"3" - LOCALE_INEGNUMBER L"1" - LOCALE_INEGSEPBYSPACE L"0" - LOCALE_INEGSIGNPOSN L"2" - LOCALE_INEGSYMPRECEDES L"1" - LOCALE_IOPTIONALCALENDAR L"0" - LOCALE_IPAPERSIZE L"1" - LOCALE_IPOSSEPBYSPACE L"1" - LOCALE_IPOSSIGNPOSN L"2" - LOCALE_IPOSSYMPRECEDES L"1" - LOCALE_ITIME L"0" - LOCALE_ITIMEMARKPOSN L"0" - LOCALE_ITLZERO L"1" - LOCALE_S1159 L"\x0729.\x071b" - LOCALE_S2359 L"\x0712.\x071b" - LOCALE_SABBREVCTRYNAME L"SYR" - LOCALE_SABBREVDAYNAME1 L"\x070f\x0712\x00a0\x070f\x0712\x072b" - LOCALE_SABBREVDAYNAME2 L"\x070f\x0713\x00a0\x070f\x0712\x072b" - LOCALE_SABBREVDAYNAME3 L"\x070f\x0715\x00a0\x070f\x0712\x072b" - LOCALE_SABBREVDAYNAME4 L"\x070f\x0717\x00a0\x070f\x0712\x072b" - LOCALE_SABBREVDAYNAME5 L"\x070f\x0725\x072a\x0718\x0712" - LOCALE_SABBREVDAYNAME6 L"\x070f\x072b\x0712" - LOCALE_SABBREVDAYNAME7 L"\x070f\x0710\x00a0\x070f\x0712\x072b" - LOCALE_SABBREVLANGNAME L"SYR" - LOCALE_SABBREVMONTHNAME1 L"\x070f\x071f\x0722\x00a0\x070f\x0712" - LOCALE_SABBREVMONTHNAME2 L"\x072b\x0712\x071b" - LOCALE_SABBREVMONTHNAME3 L"\x0710\x0715\x072a" - LOCALE_SABBREVMONTHNAME4 L"\x0722\x071d\x0723\x0722" - LOCALE_SABBREVMONTHNAME5 L"\x0710\x071d\x072a" - LOCALE_SABBREVMONTHNAME6 L"\x071a\x0719\x071d\x072a\x0722" - LOCALE_SABBREVMONTHNAME7 L"\x072c\x0721\x0718\x0719" - LOCALE_SABBREVMONTHNAME8 L"\x0710\x0712" - LOCALE_SABBREVMONTHNAME9 L"\x0710\x071d\x0720\x0718\x0720" - LOCALE_SABBREVMONTHNAME10 L"\x070f\x072c\x072b\x00a0\x070f\x0710" - LOCALE_SABBREVMONTHNAME11 L"\x070f\x072c\x072b\x00a0\x070f\x0712" - LOCALE_SABBREVMONTHNAME12 L"\x070f\x071f\x0722\x00a0\x070f\x0710" - LOCALE_SABBREVMONTHNAME13 L"" - LOCALE_SCOUNTRY L"Syria" - LOCALE_SCURRENCY L"\x0644.\x0633.\x200f" - LOCALE_SDATE L"/" - LOCALE_SDAYNAME1 L"\x072c\x072a\x071d\x0722\x00a0\x0712\x072b\x0712\x0710" - LOCALE_SDAYNAME2 L"\x072c\x0720\x072c\x0710\x00a0\x0712\x072b\x0712\x0710" - LOCALE_SDAYNAME3 L"\x0710\x072a\x0712\x0725\x0710\x00a0\x0712\x072b\x0712\x0710" - LOCALE_SDAYNAME4 L"\x071a\x0721\x072b\x0710\x00a0\x0712\x072b\x0712\x0710" - LOCALE_SDAYNAME5 L"\x0725\x072a\x0718\x0712\x072c\x0710" - LOCALE_SDAYNAME6 L"\x072b\x0712\x072c\x0710" - LOCALE_SDAYNAME7 L"\x071a\x0715\x00a0\x0712\x072b\x0712\x0710" - LOCALE_SDECIMAL L"." - LOCALE_SENGCOUNTRY L"Syria" - LOCALE_SENGCURRNAME L"Syrian Pound" - LOCALE_SENGLANGUAGE L"Syriac" - LOCALE_SGROUPING L"3;0" - LOCALE_SINTLSYMBOL L"SYP" - LOCALE_SISO3166CTRYNAME L"SY" - LOCALE_SISO639LANGNAME L"syr" - LOCALE_SLANGUAGE L"Syriac" - LOCALE_SLIST L"," - LOCALE_SLONGDATE L"dd MMMM, yyyy" - LOCALE_SMONDECIMALSEP L"." - LOCALE_SMONGROUPING L"3;0" - LOCALE_SMONTHNAME1 L"\x071f\x0722\x0718\x0722\x00a0\x0710\x071a\x072a\x071d" - LOCALE_SMONTHNAME2 L"\x072b\x0712\x071b" - LOCALE_SMONTHNAME3 L"\x0710\x0715\x072a" - LOCALE_SMONTHNAME4 L"\x0722\x071d\x0723\x0722" - LOCALE_SMONTHNAME5 L"\x0710\x071d\x072a" - LOCALE_SMONTHNAME6 L"\x071a\x0719\x071d\x072a\x0722" - LOCALE_SMONTHNAME7 L"\x072c\x0721\x0718\x0719" - LOCALE_SMONTHNAME8 L"\x0710\x0712" - LOCALE_SMONTHNAME9 L"\x0710\x071d\x0720\x0718\x0720" - LOCALE_SMONTHNAME10 L"\x072c\x072b\x072a\x071d\x00a0\x0729\x0715\x071d\x0721" - LOCALE_SMONTHNAME11 L"\x072c\x072b\x072a\x071d\x00a0\x0710\x071a\x072a\x071d" - LOCALE_SMONTHNAME12 L"\x071f\x0722\x0718\x0722\x00a0\x0729\x0715\x071d\x0721" - LOCALE_SMONTHNAME13 L"" - LOCALE_SMONTHOUSANDSEP L"," - LOCALE_SNAME L"syr-SY" - LOCALE_SNATIVECTRYNAME L"\x0633\x0648\x0631\x064a\x0627" - LOCALE_SNATIVECURRNAME L"\x062c\x0646\x064a\x0647\x00a0\x0633\x0648\x0631\x064a" - LOCALE_SNATIVEDIGITS L"0123456789" - LOCALE_SNATIVELANGNAME L"\x0723\x0718\x072a\x071d\x071d\x0710" - LOCALE_SNEGATIVESIGN L"-" - LOCALE_SPOSITIVESIGN L"+" - LOCALE_SSCRIPTS L"Syrc;" - LOCALE_SSHORTDATE L"dd/MM/yyyy" - LOCALE_SSORTNAME L"Default" - LOCALE_STHOUSAND L"," - LOCALE_STIME L":" - LOCALE_STIMEFORMAT L"hh:mm:ss tt" - LOCALE_SYEARMONTH L"MMMM, yyyy" + LOCALE_ICALENDARTYPE "1" + LOCALE_ICENTURY "1" + LOCALE_ICOUNTRY "963" + LOCALE_ICURRDIGITS "2" + LOCALE_ICURRENCY "2" + LOCALE_IDATE "1" + LOCALE_IDAYLZERO "1" + LOCALE_IDEFAULTANSICODEPAGE "0" + LOCALE_IDEFAULTCODEPAGE "1" + LOCALE_IDEFAULTCOUNTRY "963" + LOCALE_IDEFAULTEBCDICCODEPAGE "500" + LOCALE_IDEFAULTLANGUAGE "045a" + LOCALE_IDEFAULTMACCODEPAGE "2" + LOCALE_IDEFAULTUNIXCODEPAGE "65001" + LOCALE_IDIGITS "2" + LOCALE_IDIGITSUBSTITUTION "1" + LOCALE_IFIRSTDAYOFWEEK "5" + LOCALE_IFIRSTWEEKOFYEAR "0" + LOCALE_IINTLCURRDIGITS "2" + LOCALE_ILANGUAGE "045a" + LOCALE_ILDATE "1" + LOCALE_ILZERO "1" + LOCALE_IMEASURE "0" + LOCALE_IMONLZERO "1" + LOCALE_INEGCURR "3" + LOCALE_INEGNUMBER "1" + LOCALE_INEGSEPBYSPACE "0" + LOCALE_INEGSIGNPOSN "2" + LOCALE_INEGSYMPRECEDES "1" + LOCALE_IOPTIONALCALENDAR "0" + LOCALE_IPAPERSIZE "1" + LOCALE_IPOSSEPBYSPACE "1" + LOCALE_IPOSSIGNPOSN "2" + LOCALE_IPOSSYMPRECEDES "1" + LOCALE_ITIME "0" + LOCALE_ITIMEMARKPOSN "0" + LOCALE_ITLZERO "1" + LOCALE_S1159 "Ь©.Ь›" + LOCALE_S2359 "Ь’.Ь›" + LOCALE_SABBREVCTRYNAME "SYR" + LOCALE_SABBREVDAYNAME1 "ЬЏЬ’В ЬЏЬ’Ь«" + LOCALE_SABBREVDAYNAME2 "ЬЏЬ“В ЬЏЬ’Ь«" + LOCALE_SABBREVDAYNAME3 "ЬЏЬ•В ЬЏЬ’Ь«" + LOCALE_SABBREVDAYNAME4 "ЬЏЬ—В ЬЏЬ’Ь«" + LOCALE_SABBREVDAYNAME5 "ЬЏЬҐЬЄЬЬ’" + LOCALE_SABBREVDAYNAME6 "ЬЏЬ«Ь’" + LOCALE_SABBREVDAYNAME7 "ЬЏЬђВ ЬЏЬ’Ь«" + LOCALE_SABBREVLANGNAME "SYR" + LOCALE_SABBREVMONTHNAME1 "ЬЏЬџЬўВ ЬЏЬ’" + LOCALE_SABBREVMONTHNAME2 "Ь«Ь’Ь›" + LOCALE_SABBREVMONTHNAME3 "ЬђЬ•ЬЄ" + LOCALE_SABBREVMONTHNAME4 "ЬўЬќЬЈЬў" + LOCALE_SABBREVMONTHNAME5 "ЬђЬќЬЄ" + LOCALE_SABBREVMONTHNAME6 "ЬљЬ™ЬќЬЄЬў" + LOCALE_SABBREVMONTHNAME7 "Ь¬ЬЎЬЬ™" + LOCALE_SABBREVMONTHNAME8 "ЬђЬ’" + LOCALE_SABBREVMONTHNAME9 "ЬђЬќЬ ЬЬ " + LOCALE_SABBREVMONTHNAME10 "ЬЏЬ¬Ь«В ЬЏЬђ" + LOCALE_SABBREVMONTHNAME11 "ЬЏЬ¬Ь«В ЬЏЬ’" + LOCALE_SABBREVMONTHNAME12 "ЬЏЬџЬўВ ЬЏЬђ" + LOCALE_SABBREVMONTHNAME13 "" + LOCALE_SCOUNTRY "Syria" + LOCALE_SCURRENCY "Щ„.Ші.‏" + LOCALE_SDATE "/" + LOCALE_SDAYNAME1 "Ь¬ЬЄЬќЬўВ Ь’Ь«Ь’Ьђ" + LOCALE_SDAYNAME2 "Ь¬Ь Ь¬ЬђВ Ь’Ь«Ь’Ьђ" + LOCALE_SDAYNAME3 "ЬђЬЄЬ’ЬҐЬђВ Ь’Ь«Ь’Ьђ" + LOCALE_SDAYNAME4 "ЬљЬЎЬ«ЬђВ Ь’Ь«Ь’Ьђ" + LOCALE_SDAYNAME5 "ЬҐЬЄЬЬ’Ь¬Ьђ" + LOCALE_SDAYNAME6 "Ь«Ь’Ь¬Ьђ" + LOCALE_SDAYNAME7 "ЬљЬ•В Ь’Ь«Ь’Ьђ" + LOCALE_SDECIMAL "." + LOCALE_SENGCOUNTRY "Syria" + LOCALE_SENGCURRNAME "Syrian Pound" + LOCALE_SENGLANGUAGE "Syriac" + LOCALE_SGROUPING "3;0" + LOCALE_SINTLSYMBOL "SYP" + LOCALE_SISO3166CTRYNAME "SY" + LOCALE_SISO639LANGNAME "syr" + LOCALE_SLANGUAGE "Syriac" + LOCALE_SLIST "," + LOCALE_SLONGDATE "dd MMMM, yyyy" + LOCALE_SMONDECIMALSEP "." + LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHNAME1 "ЬџЬўЬЬўВ ЬђЬљЬЄЬќ" + LOCALE_SMONTHNAME2 "Ь«Ь’Ь›" + LOCALE_SMONTHNAME3 "ЬђЬ•ЬЄ" + LOCALE_SMONTHNAME4 "ЬўЬќЬЈЬў" + LOCALE_SMONTHNAME5 "ЬђЬќЬЄ" + LOCALE_SMONTHNAME6 "ЬљЬ™ЬќЬЄЬў" + LOCALE_SMONTHNAME7 "Ь¬ЬЎЬЬ™" + LOCALE_SMONTHNAME8 "ЬђЬ’" + LOCALE_SMONTHNAME9 "ЬђЬќЬ ЬЬ " + LOCALE_SMONTHNAME10 "Ь¬Ь«ЬЄЬќВ Ь©Ь•ЬќЬЎ" + LOCALE_SMONTHNAME11 "Ь¬Ь«ЬЄЬќВ ЬђЬљЬЄЬќ" + LOCALE_SMONTHNAME12 "ЬџЬўЬЬўВ Ь©Ь•ЬќЬЎ" + LOCALE_SMONTHNAME13 "" + LOCALE_SMONTHOUSANDSEP "," + LOCALE_SNAME "syr-SY" + LOCALE_SNATIVECTRYNAME "ШіЩ€Ш±ЩЉШ§" + LOCALE_SNATIVECURRNAME "Ш¬Щ†ЩЉЩ‡В ШіЩ€Ш±ЩЉ" + LOCALE_SNATIVEDIGITS "0123456789" + LOCALE_SNATIVELANGNAME "ЬЈЬЬЄЬќЬќЬђ" + LOCALE_SNEGATIVESIGN "-" + LOCALE_SPOSITIVESIGN "+" + LOCALE_SSCRIPTS "Syrc;" + LOCALE_SSHORTDATE "dd/MM/yyyy" + LOCALE_SSORTNAME "Default" + LOCALE_STHOUSAND "," + LOCALE_STIME ":" + LOCALE_STIMEFORMAT "hh:mm:ss tt" + LOCALE_SYEARMONTH "MMMM, yyyy" - LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE L"Western Europe and United States" - LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE L"Central Europe" - LGRPID_BALTIC+LGRPID_RES_BASE L"Baltic" - LGRPID_GREEK+LGRPID_RES_BASE L"Greek" - LGRPID_CYRILLIC+LGRPID_RES_BASE L"Cyrillic" - LGRPID_TURKISH+LGRPID_RES_BASE L"Turkic" - LGRPID_JAPANESE+LGRPID_RES_BASE L"Japanese" - LGRPID_KOREAN+LGRPID_RES_BASE L"Korean" - LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE L"Traditional Chinese" - LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE L"Simplified Chinese" - LGRPID_THAI+LGRPID_RES_BASE L"Thai" - LGRPID_HEBREW+LGRPID_RES_BASE L"Hebrew" - LGRPID_ARABIC+LGRPID_RES_BASE L"Arabic" - LGRPID_VIETNAMESE+LGRPID_RES_BASE L"Vietnamese" - LGRPID_INDIC+LGRPID_RES_BASE L"Indic" - LGRPID_GEORGIAN+LGRPID_RES_BASE L"Georgian" - LGRPID_ARMENIAN+LGRPID_RES_BASE L"Armenian" + LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Western Europe and United States" + LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Central Europe" + LGRPID_BALTIC+LGRPID_RES_BASE "Baltic" + LGRPID_GREEK+LGRPID_RES_BASE "Greek" + LGRPID_CYRILLIC+LGRPID_RES_BASE "Cyrillic" + LGRPID_TURKISH+LGRPID_RES_BASE "Turkic" + LGRPID_JAPANESE+LGRPID_RES_BASE "Japanese" + LGRPID_KOREAN+LGRPID_RES_BASE "Korean" + LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Traditional Chinese" + LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" + LGRPID_THAI+LGRPID_RES_BASE "Thai" + LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" + LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" + LGRPID_INDIC+LGRPID_RES_BASE "Indic" + LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian" + LGRPID_ARMENIAN+LGRPID_RES_BASE "Armenian" } diff --git a/reactos/dll/win32/kernel32/nls/tam.nls b/reactos/dll/win32/kernel32/nls/tam.nls index 00e112bf63d..9820517264b 100644 --- a/reactos/dll/win32/kernel32/nls/tam.nls +++ b/reactos/dll/win32/kernel32/nls/tam.nls @@ -18,139 +18,139 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma code_page(0) /* Unicode only */ +#pragma code_page(65001) /* UTF-8 */ STRINGTABLE LANGUAGE LANG_TAMIL, SUBLANG_DEFAULT { LOCALE_FONTSIGNATURE L"\x002f\x8010\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x4000\x0003\x0000\x0000\xc5d4" - LOCALE_ICALENDARTYPE L"1" - LOCALE_ICENTURY L"1" - LOCALE_ICOUNTRY L"91" - LOCALE_ICURRDIGITS L"2" - LOCALE_ICURRENCY L"2" - LOCALE_IDATE L"1" - LOCALE_IDAYLZERO L"1" - LOCALE_IDEFAULTANSICODEPAGE L"0" - LOCALE_IDEFAULTCODEPAGE L"1" - LOCALE_IDEFAULTCOUNTRY L"91" - LOCALE_IDEFAULTEBCDICCODEPAGE L"500" - LOCALE_IDEFAULTLANGUAGE L"0449" - LOCALE_IDEFAULTMACCODEPAGE L"2" - LOCALE_IDEFAULTUNIXCODEPAGE L"65001" - LOCALE_IDIGITS L"2" - LOCALE_IDIGITSUBSTITUTION L"1" - LOCALE_IFIRSTDAYOFWEEK L"0" - LOCALE_IFIRSTWEEKOFYEAR L"0" - LOCALE_IINTLCURRDIGITS L"2" - LOCALE_ILANGUAGE L"0449" - LOCALE_ILDATE L"1" - LOCALE_ILZERO L"1" - LOCALE_IMEASURE L"0" - LOCALE_IMONLZERO L"1" - LOCALE_INEGCURR L"12" - LOCALE_INEGNUMBER L"1" - LOCALE_INEGSEPBYSPACE L"1" - LOCALE_INEGSIGNPOSN L"4" - LOCALE_INEGSYMPRECEDES L"1" - LOCALE_IOPTIONALCALENDAR L"0" - LOCALE_IPAPERSIZE L"9" - LOCALE_IPOSSEPBYSPACE L"1" - LOCALE_IPOSSIGNPOSN L"4" - LOCALE_IPOSSYMPRECEDES L"1" - LOCALE_ITIME L"1" - LOCALE_ITIMEMARKPOSN L"1" - LOCALE_ITLZERO L"1" - LOCALE_S1159 L"\x0b95\x0bbe\x0bb2\x0bc8" - LOCALE_S2359 L"\x0bae\x0bbe\x0bb2\x0bc8" - LOCALE_SABBREVCTRYNAME L"IND" - LOCALE_SABBREVDAYNAME1 L"\x0ba4\x0bbf" - LOCALE_SABBREVDAYNAME2 L"\x0b9a\x0bc6" - LOCALE_SABBREVDAYNAME3 L"\x0baa\x0bc1" - LOCALE_SABBREVDAYNAME4 L"\x0bb5\x0bbf" - LOCALE_SABBREVDAYNAME5 L"\x0bb5\x0bc6" - LOCALE_SABBREVDAYNAME6 L"\x0b9a" - LOCALE_SABBREVDAYNAME7 L"\x0b9e\x0bbe" - LOCALE_SABBREVLANGNAME L"TAM" - LOCALE_SABBREVMONTHNAME1 L"\x0b9c\x0ba9." - LOCALE_SABBREVMONTHNAME2 L"\x0baa\x0bc6\x0baa\x0bcd." - LOCALE_SABBREVMONTHNAME3 L"\x0bae\x0bbe\x0bb0\x0bcd." - LOCALE_SABBREVMONTHNAME4 L"\x0b8f\x0baa\x0bcd." - LOCALE_SABBREVMONTHNAME5 L"\x0bae\x0bc7" - LOCALE_SABBREVMONTHNAME6 L"\x0b9c\x0bc2\x0ba9\x0bcd" - LOCALE_SABBREVMONTHNAME7 L"\x0b9c\x0bc2\x0bb2\x0bc8" - LOCALE_SABBREVMONTHNAME8 L"\x0b86\x0b95." - LOCALE_SABBREVMONTHNAME9 L"\x0b9a\x0bc6\x0baa\x0bcd." - LOCALE_SABBREVMONTHNAME10 L"\x0b85\x0b95\x0bcd." - LOCALE_SABBREVMONTHNAME11 L"\x0ba8\x0bb5." - LOCALE_SABBREVMONTHNAME12 L"\x0b9f\x0bbf\x0b9a." - LOCALE_SABBREVMONTHNAME13 L"" - LOCALE_SCOUNTRY L"India" - LOCALE_SCURRENCY L"\x0bb0\x0bc2" - LOCALE_SDATE L"-" - LOCALE_SDAYNAME1 L"\x0ba4\x0bbf\x0b99\x0bcd\x0b95\x0bb3\x0bcd" - LOCALE_SDAYNAME2 L"\x0b9a\x0bc6\x0bb5\x0bcd\x0bb5\x0bbe\x0baf\x0bcd" - LOCALE_SDAYNAME3 L"\x0baa\x0bc1\x0ba4\x0ba9\x0bcd" - LOCALE_SDAYNAME4 L"\x0bb5\x0bbf\x0baf\x0bbe\x0bb4\x0ba9\x0bcd" - LOCALE_SDAYNAME5 L"\x0bb5\x0bc6\x0bb3\x0bcd\x0bb3\x0bbf" - LOCALE_SDAYNAME6 L"\x0b9a\x0ba9\x0bbf" - LOCALE_SDAYNAME7 L"\x0b9e\x0bbe\x0baf\x0bbf\x0bb1\x0bc1" - LOCALE_SDECIMAL L"." - LOCALE_SENGCOUNTRY L"India" - LOCALE_SENGCURRNAME L"Indian Rupee" - LOCALE_SENGLANGUAGE L"Tamil" - LOCALE_SGROUPING L"3;2;0" - LOCALE_SINTLSYMBOL L"INR" - LOCALE_SISO3166CTRYNAME L"IN" - LOCALE_SISO639LANGNAME L"ta" - LOCALE_SLANGUAGE L"Tamil" - LOCALE_SLIST L"," - LOCALE_SLONGDATE L"dd MMMM yyyy" - LOCALE_SMONDECIMALSEP L"." - LOCALE_SMONGROUPING L"3;2;0" - LOCALE_SMONTHNAME1 L"\x0b9c\x0ba9\x0bb5\x0bb0\x0bbf" - LOCALE_SMONTHNAME2 L"\x0baa\x0bc6\x0baa\x0bcd\x0bb0\x0bb5\x0bb0\x0bbf" - LOCALE_SMONTHNAME3 L"\x0bae\x0bbe\x0bb0\x0bcd\x0b9a\x0bcd" - LOCALE_SMONTHNAME4 L"\x0b8f\x0baa\x0bcd\x0bb0\x0bb2\x0bcd" - LOCALE_SMONTHNAME5 L"\x0bae\x0bc7" - LOCALE_SMONTHNAME6 L"\x0b9c\x0bc2\x0ba9\x0bcd" - LOCALE_SMONTHNAME7 L"\x0b9c\x0bc2\x0bb2\x0bc8" - LOCALE_SMONTHNAME8 L"\x0b86\x0b95\x0bb8\x0bcd\x0b9f\x0bcd" - LOCALE_SMONTHNAME9 L"\x0b9a\x0bc6\x0baa\x0bcd\x0b9f\x0bae\x0bcd\x0baa\x0bb0\x0bcd" - LOCALE_SMONTHNAME10 L"\x0b85\x0b95\x0bcd\x0b9f\x0bcb\x0baa\x0bb0\x0bcd" - LOCALE_SMONTHNAME11 L"\x0ba8\x0bb5\x0bae\x0bcd\x0baa\x0bb0\x0bcd" - LOCALE_SMONTHNAME12 L"\x0b9f\x0bbf\x0b9a\x0bae\x0bcd\x0baa\x0bb0\x0bcd" - LOCALE_SMONTHNAME13 L"" - LOCALE_SMONTHOUSANDSEP L"," - LOCALE_SNAME L"ta-IN" - LOCALE_SNATIVECTRYNAME L"\x0b87\x0ba8\x0bcd\x0ba4\x0bbf\x0baf\x0bbe" - LOCALE_SNATIVECURRNAME L"\x0bb0\x0bc2\x0baa\x0bbe\x0baf\x0bcd" - LOCALE_SNATIVEDIGITS L"0123456789" - LOCALE_SNATIVELANGNAME L"\x0ba4\x0bae\x0bbf\x0bb4\x0bcd" - LOCALE_SNEGATIVESIGN L"-" - LOCALE_SPOSITIVESIGN L"" - LOCALE_SSCRIPTS L"Taml;" - LOCALE_SSHORTDATE L"dd-MM-yyyy" - LOCALE_SSORTNAME L"Default" - LOCALE_STHOUSAND L"," - LOCALE_STIME L":" - LOCALE_STIMEFORMAT L"HH:mm:ss" - LOCALE_SYEARMONTH L"MMMM yyyy" + LOCALE_ICALENDARTYPE "1" + LOCALE_ICENTURY "1" + LOCALE_ICOUNTRY "91" + LOCALE_ICURRDIGITS "2" + LOCALE_ICURRENCY "2" + LOCALE_IDATE "1" + LOCALE_IDAYLZERO "1" + LOCALE_IDEFAULTANSICODEPAGE "0" + LOCALE_IDEFAULTCODEPAGE "1" + LOCALE_IDEFAULTCOUNTRY "91" + LOCALE_IDEFAULTEBCDICCODEPAGE "500" + LOCALE_IDEFAULTLANGUAGE "0449" + LOCALE_IDEFAULTMACCODEPAGE "2" + LOCALE_IDEFAULTUNIXCODEPAGE "65001" + LOCALE_IDIGITS "2" + LOCALE_IDIGITSUBSTITUTION "1" + LOCALE_IFIRSTDAYOFWEEK "0" + LOCALE_IFIRSTWEEKOFYEAR "0" + LOCALE_IINTLCURRDIGITS "2" + LOCALE_ILANGUAGE "0449" + LOCALE_ILDATE "1" + LOCALE_ILZERO "1" + LOCALE_IMEASURE "0" + LOCALE_IMONLZERO "1" + LOCALE_INEGCURR "12" + LOCALE_INEGNUMBER "1" + LOCALE_INEGSEPBYSPACE "1" + LOCALE_INEGSIGNPOSN "4" + LOCALE_INEGSYMPRECEDES "1" + LOCALE_IOPTIONALCALENDAR "0" + LOCALE_IPAPERSIZE "9" + LOCALE_IPOSSEPBYSPACE "1" + LOCALE_IPOSSIGNPOSN "4" + LOCALE_IPOSSYMPRECEDES "1" + LOCALE_ITIME "1" + LOCALE_ITIMEMARKPOSN "1" + LOCALE_ITLZERO "1" + LOCALE_S1159 "а®•а®ѕа®ІаЇ€" + LOCALE_S2359 "а®®а®ѕа®ІаЇ€" + LOCALE_SABBREVCTRYNAME "IND" + LOCALE_SABBREVDAYNAME1 "தி" + LOCALE_SABBREVDAYNAME2 "а®љаЇ†" + LOCALE_SABBREVDAYNAME3 "а®ЄаЇЃ" + LOCALE_SABBREVDAYNAME4 "а®µа®ї" + LOCALE_SABBREVDAYNAME5 "а®µаЇ†" + LOCALE_SABBREVDAYNAME6 "а®љ" + LOCALE_SABBREVDAYNAME7 "а®ћа®ѕ" + LOCALE_SABBREVLANGNAME "TAM" + LOCALE_SABBREVMONTHNAME1 "а®ња®©." + LOCALE_SABBREVMONTHNAME2 "а®ЄаЇ†а®ЄаЇЌ." + LOCALE_SABBREVMONTHNAME3 "а®®а®ѕа®°аЇЌ." + LOCALE_SABBREVMONTHNAME4 "а®Џа®ЄаЇЌ." + LOCALE_SABBREVMONTHNAME5 "а®®аЇ‡" + LOCALE_SABBREVMONTHNAME6 "а®њаЇ‚а®©аЇЌ" + LOCALE_SABBREVMONTHNAME7 "а®њаЇ‚а®ІаЇ€" + LOCALE_SABBREVMONTHNAME8 "ஆக." + LOCALE_SABBREVMONTHNAME9 "а®љаЇ†а®ЄаЇЌ." + LOCALE_SABBREVMONTHNAME10 "а®…а®•аЇЌ." + LOCALE_SABBREVMONTHNAME11 "а®Ёа®µ." + LOCALE_SABBREVMONTHNAME12 "а®џа®їа®љ." + LOCALE_SABBREVMONTHNAME13 "" + LOCALE_SCOUNTRY "India" + LOCALE_SCURRENCY "а®°аЇ‚" + LOCALE_SDATE "-" + LOCALE_SDAYNAME1 "திங்கள்" + LOCALE_SDAYNAME2 "а®љаЇ†а®µаЇЌа®µа®ѕа®ЇаЇЌ" + LOCALE_SDAYNAME3 "புதன்" + LOCALE_SDAYNAME4 "வியாழன்" + LOCALE_SDAYNAME5 "а®µаЇ†а®іаЇЌа®іа®ї" + LOCALE_SDAYNAME6 "а®ља®©а®ї" + LOCALE_SDAYNAME7 "а®ћа®ѕа®Їа®їа®±аЇЃ" + LOCALE_SDECIMAL "." + LOCALE_SENGCOUNTRY "India" + LOCALE_SENGCURRNAME "Indian Rupee" + LOCALE_SENGLANGUAGE "Tamil" + LOCALE_SGROUPING "3;2;0" + LOCALE_SINTLSYMBOL "INR" + LOCALE_SISO3166CTRYNAME "IN" + LOCALE_SISO639LANGNAME "ta" + LOCALE_SLANGUAGE "Tamil" + LOCALE_SLIST "," + LOCALE_SLONGDATE "dd MMMM yyyy" + LOCALE_SMONDECIMALSEP "." + LOCALE_SMONGROUPING "3;2;0" + LOCALE_SMONTHNAME1 "а®ња®©а®µа®°а®ї" + LOCALE_SMONTHNAME2 "а®ЄаЇ†а®ЄаЇЌа®°а®µа®°а®ї" + LOCALE_SMONTHNAME3 "а®®а®ѕа®°аЇЌа®љаЇЌ" + LOCALE_SMONTHNAME4 "а®Џа®ЄаЇЌа®°а®ІаЇЌ" + LOCALE_SMONTHNAME5 "а®®аЇ‡" + LOCALE_SMONTHNAME6 "а®њаЇ‚а®©аЇЌ" + LOCALE_SMONTHNAME7 "а®њаЇ‚а®ІаЇ€" + LOCALE_SMONTHNAME8 "ஆகஸ்ட்" + LOCALE_SMONTHNAME9 "а®љаЇ†а®ЄаЇЌа®џа®®аЇЌа®Єа®°аЇЌ" + LOCALE_SMONTHNAME10 "а®…а®•аЇЌа®џаЇ‹а®Єа®°аЇЌ" + LOCALE_SMONTHNAME11 "а®Ёа®µа®®аЇЌа®Єа®°аЇЌ" + LOCALE_SMONTHNAME12 "а®џа®їа®ља®®аЇЌа®Єа®°аЇЌ" + LOCALE_SMONTHNAME13 "" + LOCALE_SMONTHOUSANDSEP "," + LOCALE_SNAME "ta-IN" + LOCALE_SNATIVECTRYNAME "இந்தியா" + LOCALE_SNATIVECURRNAME "а®°аЇ‚а®Єа®ѕа®ЇаЇЌ" + LOCALE_SNATIVEDIGITS "0123456789" + LOCALE_SNATIVELANGNAME "தமிழ்" + LOCALE_SNEGATIVESIGN "-" + LOCALE_SPOSITIVESIGN "" + LOCALE_SSCRIPTS "Taml;" + LOCALE_SSHORTDATE "dd-MM-yyyy" + LOCALE_SSORTNAME "Default" + LOCALE_STHOUSAND "," + LOCALE_STIME ":" + LOCALE_STIMEFORMAT "HH:mm:ss" + LOCALE_SYEARMONTH "MMMM yyyy" - LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE L"Western Europe and United States" - LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE L"Central Europe" - LGRPID_BALTIC+LGRPID_RES_BASE L"Baltic" - LGRPID_GREEK+LGRPID_RES_BASE L"Greek" - LGRPID_CYRILLIC+LGRPID_RES_BASE L"Cyrillic" - LGRPID_TURKISH+LGRPID_RES_BASE L"Turkic" - LGRPID_JAPANESE+LGRPID_RES_BASE L"Japanese" - LGRPID_KOREAN+LGRPID_RES_BASE L"Korean" - LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE L"Traditional Chinese" - LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE L"Simplified Chinese" - LGRPID_THAI+LGRPID_RES_BASE L"Thai" - LGRPID_HEBREW+LGRPID_RES_BASE L"Hebrew" - LGRPID_ARABIC+LGRPID_RES_BASE L"Arabic" - LGRPID_VIETNAMESE+LGRPID_RES_BASE L"Vietnamese" - LGRPID_INDIC+LGRPID_RES_BASE L"Indic" - LGRPID_GEORGIAN+LGRPID_RES_BASE L"Georgian" - LGRPID_ARMENIAN+LGRPID_RES_BASE L"Armenian" + LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Western Europe and United States" + LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Central Europe" + LGRPID_BALTIC+LGRPID_RES_BASE "Baltic" + LGRPID_GREEK+LGRPID_RES_BASE "Greek" + LGRPID_CYRILLIC+LGRPID_RES_BASE "Cyrillic" + LGRPID_TURKISH+LGRPID_RES_BASE "Turkic" + LGRPID_JAPANESE+LGRPID_RES_BASE "Japanese" + LGRPID_KOREAN+LGRPID_RES_BASE "Korean" + LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Traditional Chinese" + LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" + LGRPID_THAI+LGRPID_RES_BASE "Thai" + LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" + LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" + LGRPID_INDIC+LGRPID_RES_BASE "Indic" + LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian" + LGRPID_ARMENIAN+LGRPID_RES_BASE "Armenian" } diff --git a/reactos/dll/win32/kernel32/nls/tel.nls b/reactos/dll/win32/kernel32/nls/tel.nls index 72a4991ecf2..370a6c96104 100644 --- a/reactos/dll/win32/kernel32/nls/tel.nls +++ b/reactos/dll/win32/kernel32/nls/tel.nls @@ -18,139 +18,139 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma code_page(0) /* Unicode only */ +#pragma code_page(65001) /* UTF-8 */ STRINGTABLE LANGUAGE LANG_TELUGU, SUBLANG_DEFAULT { LOCALE_FONTSIGNATURE L"\x002f\x8020\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x4000\x0003\x0000\x0000\xc5d4" - LOCALE_ICALENDARTYPE L"1" - LOCALE_ICENTURY L"0" - LOCALE_ICOUNTRY L"91" - LOCALE_ICURRDIGITS L"2" - LOCALE_ICURRENCY L"2" - LOCALE_IDATE L"1" - LOCALE_IDAYLZERO L"1" - LOCALE_IDEFAULTANSICODEPAGE L"0" - LOCALE_IDEFAULTCODEPAGE L"1" - LOCALE_IDEFAULTCOUNTRY L"91" - LOCALE_IDEFAULTEBCDICCODEPAGE L"500" - LOCALE_IDEFAULTLANGUAGE L"044a" - LOCALE_IDEFAULTMACCODEPAGE L"2" - LOCALE_IDEFAULTUNIXCODEPAGE L"65001" - LOCALE_IDIGITS L"2" - LOCALE_IDIGITSUBSTITUTION L"1" - LOCALE_IFIRSTDAYOFWEEK L"0" - LOCALE_IFIRSTWEEKOFYEAR L"0" - LOCALE_IINTLCURRDIGITS L"2" - LOCALE_ILANGUAGE L"044a" - LOCALE_ILDATE L"1" - LOCALE_ILZERO L"1" - LOCALE_IMEASURE L"0" - LOCALE_IMONLZERO L"1" - LOCALE_INEGCURR L"12" - LOCALE_INEGNUMBER L"1" - LOCALE_INEGSEPBYSPACE L"1" - LOCALE_INEGSIGNPOSN L"4" - LOCALE_INEGSYMPRECEDES L"1" - LOCALE_IOPTIONALCALENDAR L"0" - LOCALE_IPAPERSIZE L"9" - LOCALE_IPOSSEPBYSPACE L"1" - LOCALE_IPOSSIGNPOSN L"4" - LOCALE_IPOSSYMPRECEDES L"1" - LOCALE_ITIME L"1" - LOCALE_ITIMEMARKPOSN L"1" - LOCALE_ITLZERO L"1" - LOCALE_S1159 L"\x0c2a\x0c42\x0c30\x0c4d\x0c35\x0c3e\x0c39\x0c4d\x0c28" - LOCALE_S2359 L"\x0c05\x0c2a\x0c30\x0c3e\x0c39\x0c4d\x0c28" - LOCALE_SABBREVCTRYNAME L"IND" - LOCALE_SABBREVDAYNAME1 L"\x0c38\x0c4b\x0c2e." - LOCALE_SABBREVDAYNAME2 L"\x0c2e\x0c02\x0c17\x0c33." - LOCALE_SABBREVDAYNAME3 L"\x0c2c\x0c41\x0c27." - LOCALE_SABBREVDAYNAME4 L"\x0c17\x0c41\x0c30\x0c41." - LOCALE_SABBREVDAYNAME5 L"\x0c36\x0c41\x0c15\x0c4d\x0c30." - LOCALE_SABBREVDAYNAME6 L"\x0c36\x0c28\x0c3f." - LOCALE_SABBREVDAYNAME7 L"\x0c06\x0c26\x0c3f." - LOCALE_SABBREVLANGNAME L"TEL" - LOCALE_SABBREVMONTHNAME1 L"\x0c1c\x0c28\x0c35\x0c30\x0c3f" - LOCALE_SABBREVMONTHNAME2 L"\x0c2b\x0c3f\x0c2c\x0c4d\x0c30\x0c35\x0c30\x0c3f" - LOCALE_SABBREVMONTHNAME3 L"\x0c2e\x0c3e\x0c30\x0c4d\x0c1a\x0c3f" - LOCALE_SABBREVMONTHNAME4 L"\x0c0f\x0c2a\x0c4d\x0c30\x0c3f\x0c32\x0c4d" - LOCALE_SABBREVMONTHNAME5 L"\x0c2e\x0c47" - LOCALE_SABBREVMONTHNAME6 L"\x0c1c\x0c42\x0c28\x0c4d" - LOCALE_SABBREVMONTHNAME7 L"\x0c1c\x0c42\x0c32\x0c48" - LOCALE_SABBREVMONTHNAME8 L"\x0c06\x0c17\x0c38\x0c4d\x0c1f\x0c41" - LOCALE_SABBREVMONTHNAME9 L"\x0c38\x0c46\x0c2a\x0c4d\x0c1f\x0c46\x0c02\x0c2c\x0c30\x0c4d" - LOCALE_SABBREVMONTHNAME10 L"\x0c05\x0c15\x0c4d\x0c1f\x0c4b\x0c2c\x0c30\x0c4d" - LOCALE_SABBREVMONTHNAME11 L"\x0c28\x0c35\x0c02\x0c2c\x0c30\x0c4d" - LOCALE_SABBREVMONTHNAME12 L"\x0c21\x0c3f\x0c38\x0c46\x0c02\x0c2c\x0c30\x0c4d" - LOCALE_SABBREVMONTHNAME13 L"" - LOCALE_SCOUNTRY L"India" - LOCALE_SCURRENCY L"\x0c30\x0c42" - LOCALE_SDATE L"-" - LOCALE_SDAYNAME1 L"\x0c38\x0c4b\x0c2e\x0c35\x0c3e\x0c30\x0c02" - LOCALE_SDAYNAME2 L"\x0c2e\x0c02\x0c17\x0c33\x0c35\x0c3e\x0c30\x0c02" - LOCALE_SDAYNAME3 L"\x0c2c\x0c41\x0c27\x0c35\x0c3e\x0c30\x0c02" - LOCALE_SDAYNAME4 L"\x0c17\x0c41\x0c30\x0c41\x0c35\x0c3e\x0c30\x0c02" - LOCALE_SDAYNAME5 L"\x0c36\x0c41\x0c15\x0c4d\x0c30\x0c35\x0c3e\x0c30\x0c02" - LOCALE_SDAYNAME6 L"\x0c36\x0c28\x0c3f\x0c35\x0c3e\x0c30\x0c02" - LOCALE_SDAYNAME7 L"\x0c06\x0c26\x0c3f\x0c35\x0c3e\x0c30\x0c02" - LOCALE_SDECIMAL L"." - LOCALE_SENGCOUNTRY L"India" - LOCALE_SENGCURRNAME L"Indian Rupee" - LOCALE_SENGLANGUAGE L"Telugu" - LOCALE_SGROUPING L"3;2;0" - LOCALE_SINTLSYMBOL L"INR" - LOCALE_SISO3166CTRYNAME L"IN" - LOCALE_SISO639LANGNAME L"te" - LOCALE_SLANGUAGE L"Telugu" - LOCALE_SLIST L"," - LOCALE_SLONGDATE L"dd MMMM yyyy" - LOCALE_SMONDECIMALSEP L"." - LOCALE_SMONGROUPING L"3;2;0" - LOCALE_SMONTHNAME1 L"\x0c1c\x0c28\x0c35\x0c30\x0c3f" - LOCALE_SMONTHNAME2 L"\x0c2b\x0c3f\x0c2c\x0c4d\x0c30\x0c35\x0c30\x0c3f" - LOCALE_SMONTHNAME3 L"\x0c2e\x0c3e\x0c30\x0c4d\x0c1a\x0c3f" - LOCALE_SMONTHNAME4 L"\x0c0f\x0c2a\x0c4d\x0c30\x0c3f\x0c32\x0c4d" - LOCALE_SMONTHNAME5 L"\x0c2e\x0c47" - LOCALE_SMONTHNAME6 L"\x0c1c\x0c42\x0c28\x0c4d" - LOCALE_SMONTHNAME7 L"\x0c1c\x0c42\x0c32\x0c48" - LOCALE_SMONTHNAME8 L"\x0c06\x0c17\x0c38\x0c4d\x0c1f\x0c41" - LOCALE_SMONTHNAME9 L"\x0c38\x0c46\x0c2a\x0c4d\x0c1f\x0c46\x0c02\x0c2c\x0c30\x0c4d" - LOCALE_SMONTHNAME10 L"\x0c05\x0c15\x0c4d\x0c1f\x0c4b\x0c2c\x0c30\x0c4d" - LOCALE_SMONTHNAME11 L"\x0c28\x0c35\x0c02\x0c2c\x0c30\x0c4d" - LOCALE_SMONTHNAME12 L"\x0c21\x0c3f\x0c38\x0c46\x0c02\x0c2c\x0c30\x0c4d" - LOCALE_SMONTHNAME13 L"" - LOCALE_SMONTHOUSANDSEP L"," - LOCALE_SNAME L"te-IN" - LOCALE_SNATIVECTRYNAME L"\x0c2d\x0c3e\x0c30\x0c24\x00a0\x0c26\x0c47\x0c36\x0c02" - LOCALE_SNATIVECURRNAME L"\x0c30\x0c42\x0c2a\x0c3e\x0c2f\x0c3f" - LOCALE_SNATIVEDIGITS L"\x0c66\x0c67\x0c68\x0c69\x0c6a\x0c6b\x0c6c\x0c6d\x0c6e\x0c6f" - LOCALE_SNATIVELANGNAME L"\x0c24\x0c46\x0c32\x0c41\x0c17\x0c41" - LOCALE_SNEGATIVESIGN L"-" - LOCALE_SPOSITIVESIGN L"" - LOCALE_SSCRIPTS L"Telu;" - LOCALE_SSHORTDATE L"dd-MM-yy" - LOCALE_SSORTNAME L"Default" - LOCALE_STHOUSAND L"," - LOCALE_STIME L":" - LOCALE_STIMEFORMAT L"HH:mm:ss" - LOCALE_SYEARMONTH L"MMMM, yyyy" + LOCALE_ICALENDARTYPE "1" + LOCALE_ICENTURY "0" + LOCALE_ICOUNTRY "91" + LOCALE_ICURRDIGITS "2" + LOCALE_ICURRENCY "2" + LOCALE_IDATE "1" + LOCALE_IDAYLZERO "1" + LOCALE_IDEFAULTANSICODEPAGE "0" + LOCALE_IDEFAULTCODEPAGE "1" + LOCALE_IDEFAULTCOUNTRY "91" + LOCALE_IDEFAULTEBCDICCODEPAGE "500" + LOCALE_IDEFAULTLANGUAGE "044a" + LOCALE_IDEFAULTMACCODEPAGE "2" + LOCALE_IDEFAULTUNIXCODEPAGE "65001" + LOCALE_IDIGITS "2" + LOCALE_IDIGITSUBSTITUTION "1" + LOCALE_IFIRSTDAYOFWEEK "0" + LOCALE_IFIRSTWEEKOFYEAR "0" + LOCALE_IINTLCURRDIGITS "2" + LOCALE_ILANGUAGE "044a" + LOCALE_ILDATE "1" + LOCALE_ILZERO "1" + LOCALE_IMEASURE "0" + LOCALE_IMONLZERO "1" + LOCALE_INEGCURR "12" + LOCALE_INEGNUMBER "1" + LOCALE_INEGSEPBYSPACE "1" + LOCALE_INEGSIGNPOSN "4" + LOCALE_INEGSYMPRECEDES "1" + LOCALE_IOPTIONALCALENDAR "0" + LOCALE_IPAPERSIZE "9" + LOCALE_IPOSSEPBYSPACE "1" + LOCALE_IPOSSIGNPOSN "4" + LOCALE_IPOSSYMPRECEDES "1" + LOCALE_ITIME "1" + LOCALE_ITIMEMARKPOSN "1" + LOCALE_ITLZERO "1" + LOCALE_S1159 "పూర్వాహ్న" + LOCALE_S2359 "а°…а°Єа°°а°ѕа°№а±Ќа°Ё" + LOCALE_SABBREVCTRYNAME "IND" + LOCALE_SABBREVDAYNAME1 "సోమ." + LOCALE_SABBREVDAYNAME2 "а°®а°‚а°—а°і." + LOCALE_SABBREVDAYNAME3 "а°¬а±Ѓа°§." + LOCALE_SABBREVDAYNAME4 "а°—а±Ѓа°°а±Ѓ." + LOCALE_SABBREVDAYNAME5 "а°¶а±Ѓа°•а±Ќа°°." + LOCALE_SABBREVDAYNAME6 "а°¶а°Ёа°ї." + LOCALE_SABBREVDAYNAME7 "а°†а°¦а°ї." + LOCALE_SABBREVLANGNAME "TE" + LOCALE_SABBREVMONTHNAME1 "а°ња°Ёа°µа°°а°ї" + LOCALE_SABBREVMONTHNAME2 "а°«а°їа°¬а±Ќа°°а°µа°°а°ї" + LOCALE_SABBREVMONTHNAME3 "а°®а°ѕа°°а±Ќа°ља°ї" + LOCALE_SABBREVMONTHNAME4 "а°Џа°Єа±Ќа°°а°їа°Іа±Ќ" + LOCALE_SABBREVMONTHNAME5 "మే" + LOCALE_SABBREVMONTHNAME6 "జూన్" + LOCALE_SABBREVMONTHNAME7 "జూలై" + LOCALE_SABBREVMONTHNAME8 "а°†а°—а°ёа±Ќа°џа±Ѓ" + LOCALE_SABBREVMONTHNAME9 "సెప్టెంబర్" + LOCALE_SABBREVMONTHNAME10 "అక్టోబర్" + LOCALE_SABBREVMONTHNAME11 "а°Ёа°µа°‚а°¬а°°а±Ќ" + LOCALE_SABBREVMONTHNAME12 "డిసెంబర్" + LOCALE_SABBREVMONTHNAME13 "" + LOCALE_SCOUNTRY "India" + LOCALE_SCURRENCY "రూ" + LOCALE_SDATE "-" + LOCALE_SDAYNAME1 "సోమవారం" + LOCALE_SDAYNAME2 "а°®а°‚а°—а°іа°µа°ѕа°°а°‚" + LOCALE_SDAYNAME3 "а°¬а±Ѓа°§а°µа°ѕа°°а°‚" + LOCALE_SDAYNAME4 "а°—а±Ѓа°°а±Ѓа°µа°ѕа°°а°‚" + LOCALE_SDAYNAME5 "а°¶а±Ѓа°•а±Ќа°°а°µа°ѕа°°а°‚" + LOCALE_SDAYNAME6 "а°¶а°Ёа°їа°µа°ѕа°°а°‚" + LOCALE_SDAYNAME7 "а°†а°¦а°їа°µа°ѕа°°а°‚" + LOCALE_SDECIMAL "." + LOCALE_SENGCOUNTRY "India" + LOCALE_SENGCURRNAME "Indian Rupee" + LOCALE_SENGLANGUAGE "Telugu" + LOCALE_SGROUPING "3;2;0" + LOCALE_SINTLSYMBOL "INR" + LOCALE_SISO3166CTRYNAME "IN" + LOCALE_SISO639LANGNAME "te" + LOCALE_SLANGUAGE "Telugu" + LOCALE_SLIST "," + LOCALE_SLONGDATE "dd MMMM yyyy" + LOCALE_SMONDECIMALSEP "." + LOCALE_SMONGROUPING "3;2;0" + LOCALE_SMONTHNAME1 "а°ња°Ёа°µа°°а°ї" + LOCALE_SMONTHNAME2 "а°«а°їа°¬а±Ќа°°а°µа°°а°ї" + LOCALE_SMONTHNAME3 "а°®а°ѕа°°а±Ќа°ља°ї" + LOCALE_SMONTHNAME4 "а°Џа°Єа±Ќа°°а°їа°Іа±Ќ" + LOCALE_SMONTHNAME5 "మే" + LOCALE_SMONTHNAME6 "జూన్" + LOCALE_SMONTHNAME7 "జూలై" + LOCALE_SMONTHNAME8 "а°†а°—а°ёа±Ќа°џа±Ѓ" + LOCALE_SMONTHNAME9 "సెప్టెంబర్" + LOCALE_SMONTHNAME10 "అక్టోబర్" + LOCALE_SMONTHNAME11 "а°Ёа°µа°‚а°¬а°°а±Ќ" + LOCALE_SMONTHNAME12 "డిసెంబర్" + LOCALE_SMONTHNAME13 "" + LOCALE_SMONTHOUSANDSEP "," + LOCALE_SNAME "te-IN" + LOCALE_SNATIVECTRYNAME "భారత దేశం" + LOCALE_SNATIVECURRNAME "రూపాయి" + LOCALE_SNATIVEDIGITS "౦౧౨౩౪౫౬౭౮౯" + LOCALE_SNATIVELANGNAME "తెలుగు" + LOCALE_SNEGATIVESIGN "-" + LOCALE_SPOSITIVESIGN "" + LOCALE_SSCRIPTS "Telu;" + LOCALE_SSHORTDATE "dd-MM-yy" + LOCALE_SSORTNAME "Default" + LOCALE_STHOUSAND "," + LOCALE_STIME ":" + LOCALE_STIMEFORMAT "HH:mm:ss" + LOCALE_SYEARMONTH "MMMM, yyyy" - LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE L"Western Europe and United States" - LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE L"Central Europe" - LGRPID_BALTIC+LGRPID_RES_BASE L"Baltic" - LGRPID_GREEK+LGRPID_RES_BASE L"Greek" - LGRPID_CYRILLIC+LGRPID_RES_BASE L"Cyrillic" - LGRPID_TURKISH+LGRPID_RES_BASE L"Turkic" - LGRPID_JAPANESE+LGRPID_RES_BASE L"Japanese" - LGRPID_KOREAN+LGRPID_RES_BASE L"Korean" - LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE L"Traditional Chinese" - LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE L"Simplified Chinese" - LGRPID_THAI+LGRPID_RES_BASE L"Thai" - LGRPID_HEBREW+LGRPID_RES_BASE L"Hebrew" - LGRPID_ARABIC+LGRPID_RES_BASE L"Arabic" - LGRPID_VIETNAMESE+LGRPID_RES_BASE L"Vietnamese" - LGRPID_INDIC+LGRPID_RES_BASE L"Indic" - LGRPID_GEORGIAN+LGRPID_RES_BASE L"Georgian" - LGRPID_ARMENIAN+LGRPID_RES_BASE L"Armenian" + LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Western Europe and United States" + LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Central Europe" + LGRPID_BALTIC+LGRPID_RES_BASE "Baltic" + LGRPID_GREEK+LGRPID_RES_BASE "Greek" + LGRPID_CYRILLIC+LGRPID_RES_BASE "Cyrillic" + LGRPID_TURKISH+LGRPID_RES_BASE "Turkic" + LGRPID_JAPANESE+LGRPID_RES_BASE "Japanese" + LGRPID_KOREAN+LGRPID_RES_BASE "Korean" + LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Traditional Chinese" + LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" + LGRPID_THAI+LGRPID_RES_BASE "Thai" + LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" + LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" + LGRPID_INDIC+LGRPID_RES_BASE "Indic" + LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian" + LGRPID_ARMENIAN+LGRPID_RES_BASE "Armenian" } diff --git a/reactos/dll/win32/kernel32/process/proc.c b/reactos/dll/win32/kernel32/process/proc.c index f86cf80f537..6b16595f59c 100644 --- a/reactos/dll/win32/kernel32/process/proc.c +++ b/reactos/dll/win32/kernel32/process/proc.c @@ -17,6 +17,8 @@ #include +typedef INT (WINAPI *MessageBoxW_Proc) (HWND, LPCWSTR, LPCWSTR, UINT); + /* GLOBALS *******************************************************************/ WaitForInputIdleType lpfnGlobalRegisterWaitForInputIdle; @@ -617,8 +619,8 @@ TerminateProcess (HANDLE hProcess, * @unimplemented */ VOID STDCALL -FatalAppExitA (UINT uAction, - LPCSTR lpMessageText) +FatalAppExitA(UINT uAction, + LPCSTR lpMessageText) { UNICODE_STRING MessageTextU; ANSI_STRING MessageText; @@ -640,9 +642,24 @@ FatalAppExitA (UINT uAction, */ VOID STDCALL FatalAppExitW(UINT uAction, - LPCWSTR lpMessageText) + LPCWSTR lpMessageText) { - return; + static const WCHAR szUser32[] = L"user32.dll\0"; + + HMODULE hModule = GetModuleHandleW(szUser32); + MessageBoxW_Proc pMessageBoxW = NULL; + + DPRINT1("AppExit\n"); + + if (hModule) + pMessageBoxW = (MessageBoxW_Proc) GetProcAddress(hModule, "MessageBoxW"); + + if (pMessageBoxW) + pMessageBoxW(0, lpMessageText, NULL, MB_SYSTEMMODAL | MB_OK); + else + DPRINT1("%s\n", lpMessageText); + + ExitProcess(0); } @@ -895,4 +912,34 @@ GetProcessHandleCount(HANDLE hProcess, return FALSE; } + +/* + * @implemented + */ +BOOL +STDCALL +IsWow64Process( + HANDLE hProcess, + PBOOL Wow64Process + ) +{ + ULONG pbi; + NTSTATUS Status; + + Status = NtQueryInformationProcess(hProcess, + ProcessWow64Information, + &pbi, + sizeof(pbi), + NULL); + + if (!NT_SUCCESS(Status)) + { + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + + *Wow64Process = (pbi != 0); + return TRUE; +} + /* EOF */ diff --git a/reactos/dll/win32/lpk/lpk.rbuild b/reactos/dll/win32/lpk/lpk.rbuild index 596ef1414a3..44d703b1040 100644 --- a/reactos/dll/win32/lpk/lpk.rbuild +++ b/reactos/dll/win32/lpk/lpk.rbuild @@ -12,5 +12,4 @@ stub.c lpk.rc - lpk.spec diff --git a/reactos/dll/win32/lsasrv/lsasrv.c b/reactos/dll/win32/lsasrv/lsasrv.c index 758cc05e2eb..ba058895d43 100644 --- a/reactos/dll/win32/lsasrv/lsasrv.c +++ b/reactos/dll/win32/lsasrv/lsasrv.c @@ -42,9 +42,4 @@ void __RPC_USER midl_user_free(void __RPC_FAR * ptr) RtlFreeHeap(RtlGetProcessHeap(), 0, ptr); } -void __RPC_USER LSAPR_HANDLE_rundown(LSAPR_HANDLE hObject) -{ -} - - /* EOF */ diff --git a/reactos/dll/win32/lsasrv/lsasrv.rbuild b/reactos/dll/win32/lsasrv/lsasrv.rbuild index 94e3d0b7f98..16a6d3d969f 100644 --- a/reactos/dll/win32/lsasrv/lsasrv.rbuild +++ b/reactos/dll/win32/lsasrv/lsasrv.rbuild @@ -11,5 +11,4 @@ lsarpc.c lsasrv.c lsasrv.rc - lsasrv.spec \ No newline at end of file diff --git a/reactos/dll/win32/lz32/lz32.rbuild b/reactos/dll/win32/lz32/lz32.rbuild index e07f179026c..5417ca96e0f 100644 --- a/reactos/dll/win32/lz32/lz32.rbuild +++ b/reactos/dll/win32/lz32/lz32.rbuild @@ -9,5 +9,4 @@ kernel32 ntdll version.rc - lz32.spec diff --git a/reactos/dll/win32/mapi32/mapi32.rbuild b/reactos/dll/win32/mapi32/mapi32.rbuild index 503114e4182..39e527d1a8c 100644 --- a/reactos/dll/win32/mapi32/mapi32.rbuild +++ b/reactos/dll/win32/mapi32/mapi32.rbuild @@ -11,7 +11,6 @@ prop.c sendmail.c util.c - mapi32.spec wine shlwapi shell32 diff --git a/reactos/dll/win32/mlang/mlang.rbuild b/reactos/dll/win32/mlang/mlang.rbuild index 357b7b840b9..b53438c5ab9 100644 --- a/reactos/dll/win32/mlang/mlang.rbuild +++ b/reactos/dll/win32/mlang/mlang.rbuild @@ -10,7 +10,6 @@ 0x600 mlang.c regsvr.c - mlang.spec wine ole32 user32 diff --git a/reactos/dll/win32/mmdrv/mmdrv.rbuild b/reactos/dll/win32/mmdrv/mmdrv.rbuild index 44430714713..b7779f386f4 100644 --- a/reactos/dll/win32/mmdrv/mmdrv.rbuild +++ b/reactos/dll/win32/mmdrv/mmdrv.rbuild @@ -13,5 +13,4 @@ common.c wave.c wave_io.c - mmdrv.spec diff --git a/reactos/dll/win32/modemui/modemui.rbuild b/reactos/dll/win32/modemui/modemui.rbuild index 1f9a1decbe4..f3500094f82 100644 --- a/reactos/dll/win32/modemui/modemui.rbuild +++ b/reactos/dll/win32/modemui/modemui.rbuild @@ -10,5 +10,4 @@ netapi32 modemui.c modemui.rc - modemui.spec diff --git a/reactos/dll/win32/mpr/mpr.rbuild b/reactos/dll/win32/mpr/mpr.rbuild index d73fa25e234..4f7b67ac1d1 100644 --- a/reactos/dll/win32/mpr/mpr.rbuild +++ b/reactos/dll/win32/mpr/mpr.rbuild @@ -13,7 +13,6 @@ pwcache.c wnet.c mpr.rc - mpr.spec wine user32 advapi32 diff --git a/reactos/dll/win32/mprapi/mprapi.rbuild b/reactos/dll/win32/mprapi/mprapi.rbuild index 6507d49d1a2..c6a9bfbc783 100644 --- a/reactos/dll/win32/mprapi/mprapi.rbuild +++ b/reactos/dll/win32/mprapi/mprapi.rbuild @@ -6,5 +6,4 @@ wine kernel32 mprapi.c - mprapi.spec diff --git a/reactos/dll/win32/msacm32/msacm32.rbuild b/reactos/dll/win32/msacm32/msacm32.rbuild index ccd2b01752e..dd2f8c3c4de 100644 --- a/reactos/dll/win32/msacm32/msacm32.rbuild +++ b/reactos/dll/win32/msacm32/msacm32.rbuild @@ -15,5 +15,4 @@ msacm32_main.c pcmconverter.c stream.c - msacm32.spec diff --git a/reactos/dll/win32/msafd/misc/dllmain.c b/reactos/dll/win32/msafd/misc/dllmain.c index 48d6e314085..f8501528d67 100644 --- a/reactos/dll/win32/msafd/misc/dllmain.c +++ b/reactos/dll/win32/msafd/misc/dllmain.c @@ -666,7 +666,7 @@ WSPSelect( if (readfds != NULL) { for (i = 0; i < readfds->fd_count; i++, j++) { - PollInfo->Handles[j].Handle = readfds->fd_array[i]; + PollInfo->Handles[j].Handle = LongToHandle(readfds->fd_array[i]); PollInfo->Handles[j].Events = AFD_EVENT_RECEIVE | AFD_EVENT_DISCONNECT | AFD_EVENT_ABORT | @@ -675,14 +675,14 @@ WSPSelect( } if (writefds != NULL) { for (i = 0; i < writefds->fd_count; i++, j++) { - PollInfo->Handles[j].Handle = writefds->fd_array[i]; + PollInfo->Handles[j].Handle = LongToHandle(writefds->fd_array[i]); PollInfo->Handles[j].Events = AFD_EVENT_SEND | AFD_EVENT_CONNECT; } } if (exceptfds != NULL) { for (i = 0; i < exceptfds->fd_count; i++, j++) { - PollInfo->Handles[j].Handle = exceptfds->fd_array[i]; + PollInfo->Handles[j].Handle = LongToHandle(exceptfds->fd_array[i]); PollInfo->Handles[j].Events = AFD_EVENT_OOB_RECEIVE | AFD_EVENT_CONNECT_FAIL; } @@ -786,9 +786,9 @@ WSPAPI WSPAccept( SOCKET Handle, struct sockaddr *SocketAddress, - int *SocketAddressLength, + LPINT SocketAddressLength, LPCONDITIONPROC lpfnCondition, - DWORD_PTR dwCallbackData, + DWORD dwCallbackData, LPINT lpErrno) { IO_STATUS_BLOCK IOSB; diff --git a/reactos/dll/win32/msafd/msafd.rbuild b/reactos/dll/win32/msafd/msafd.rbuild index 6e8b186d8b5..0f1fce57183 100644 --- a/reactos/dll/win32/msafd/msafd.rbuild +++ b/reactos/dll/win32/msafd/msafd.rbuild @@ -1,4 +1,4 @@ - + . include diff --git a/reactos/dll/win32/mscoree/mscoree.rbuild b/reactos/dll/win32/mscoree/mscoree.rbuild index 76726a3e57f..f10592da560 100644 --- a/reactos/dll/win32/mscoree/mscoree.rbuild +++ b/reactos/dll/win32/mscoree/mscoree.rbuild @@ -7,5 +7,4 @@ uuid corruntimehost.c mscoree_main.c - mscoree.spec diff --git a/reactos/dll/win32/msgina/msgina.rbuild b/reactos/dll/win32/msgina/msgina.rbuild index 951dc1c97e2..bb8049dde5f 100644 --- a/reactos/dll/win32/msgina/msgina.rbuild +++ b/reactos/dll/win32/msgina/msgina.rbuild @@ -14,5 +14,4 @@ stubs.c tui.c msgina.rc - msgina.spec diff --git a/reactos/dll/win32/mshtml.tlb/mshtml.tlb.rbuild b/reactos/dll/win32/mshtml.tlb/mshtml.tlb.rbuild index 9964034d696..e026dcd46c0 100644 --- a/reactos/dll/win32/mshtml.tlb/mshtml.tlb.rbuild +++ b/reactos/dll/win32/mshtml.tlb/mshtml.tlb.rbuild @@ -9,7 +9,6 @@ mshtml_tlb kernel32 - mshtml.tlb.spec rsrc.rc \ No newline at end of file diff --git a/reactos/dll/win32/mshtml/mshtml.rbuild b/reactos/dll/win32/mshtml/mshtml.rbuild index a50fba317ce..0853b793656 100644 --- a/reactos/dll/win32/mshtml/mshtml.rbuild +++ b/reactos/dll/win32/mshtml/mshtml.rbuild @@ -57,7 +57,6 @@ view.c rsrc.rc . - mshtml.spec wine strmiids uuid diff --git a/reactos/dll/win32/msi/msi.rbuild b/reactos/dll/win32/msi/msi.rbuild index 52b94462da2..08880b7adc6 100644 --- a/reactos/dll/win32/msi/msi.rbuild +++ b/reactos/dll/win32/msi/msi.rbuild @@ -52,7 +52,6 @@ where.c msi.rc . - msi.spec wine uuid urlmon diff --git a/reactos/dll/win32/msimg32/msimg32.rbuild b/reactos/dll/win32/msimg32/msimg32.rbuild index ef9162b3ffa..116eb5673be 100644 --- a/reactos/dll/win32/msimg32/msimg32.rbuild +++ b/reactos/dll/win32/msimg32/msimg32.rbuild @@ -10,5 +10,4 @@ kernel32 ntdll msimg32_main.c - msimg32.spec diff --git a/reactos/dll/win32/mstask/mstask.rbuild b/reactos/dll/win32/mstask/mstask.rbuild index 02843751570..e2ed3c4a5cd 100644 --- a/reactos/dll/win32/mstask/mstask.rbuild +++ b/reactos/dll/win32/mstask/mstask.rbuild @@ -16,7 +16,6 @@ task_trigger.c mstask_local.idl rsrc.rc - mstask.spec wine uuid ole32 diff --git a/reactos/dll/win32/msvcrt/msvcrt-i386.def b/reactos/dll/win32/msvcrt/msvcrt-i386.def index 6c45a0fed01..73c775482b5 100644 --- a/reactos/dll/win32/msvcrt/msvcrt-i386.def +++ b/reactos/dll/win32/msvcrt/msvcrt-i386.def @@ -846,3 +846,5 @@ EXPORTS wctomb @840 wprintf @841 wscanf @842 + + _swprintf=swprintf diff --git a/reactos/dll/win32/msvcrt/msvcrt.rbuild b/reactos/dll/win32/msvcrt/msvcrt.rbuild index bc22908ec08..cb249245acf 100644 --- a/reactos/dll/win32/msvcrt/msvcrt.rbuild +++ b/reactos/dll/win32/msvcrt/msvcrt.rbuild @@ -1,4 +1,4 @@ - + . include diff --git a/reactos/dll/win32/msvcrt20/msvcrt20.rbuild b/reactos/dll/win32/msvcrt20/msvcrt20.rbuild index e6990b60397..fdf7e88f30e 100644 --- a/reactos/dll/win32/msvcrt20/msvcrt20.rbuild +++ b/reactos/dll/win32/msvcrt20/msvcrt20.rbuild @@ -1,14 +1,14 @@ - + . include/reactos/wine msvcrt20.c - msvcrt20.spec wine + msvcrt kernel32 ntdll diff --git a/reactos/dll/win32/msvcrt20/msvcrt20.spec b/reactos/dll/win32/msvcrt20/msvcrt20.spec index 339cb1c063f..b107ea7272d 100644 --- a/reactos/dll/win32/msvcrt20/msvcrt20.spec +++ b/reactos/dll/win32/msvcrt20/msvcrt20.spec @@ -464,7 +464,7 @@ @ cdecl __dllonexit(ptr ptr ptr) msvcrt.__dllonexit @ cdecl __doserrno() msvcrt.__doserrno @ cdecl __fpecode() msvcrt.__fpecode -@ cdecl __getmainargs(ptr ptr ptr long long) MSVCRT20__getmainargs +@ cdecl __getmainargs(ptr ptr ptr ptr ptr) MSVCRT20__getmainargs @ extern __initenv msvcrt.__initenv @ cdecl __isascii(long) msvcrt.__isascii @ cdecl __iscsym(long) msvcrt.__iscsym diff --git a/reactos/dll/win32/msvcrt40/msvcrt40.rbuild b/reactos/dll/win32/msvcrt40/msvcrt40.rbuild index e3516be4215..4e7ab666f4f 100644 --- a/reactos/dll/win32/msvcrt40/msvcrt40.rbuild +++ b/reactos/dll/win32/msvcrt40/msvcrt40.rbuild @@ -1,13 +1,12 @@ - + . include/reactos/wine msvcrt40.c - msvcrt40.spec wine kernel32 diff --git a/reactos/dll/win32/msvfw32/msvfw32.rbuild b/reactos/dll/win32/msvfw32/msvfw32.rbuild index db7b8feba25..37ffd8aa7e3 100644 --- a/reactos/dll/win32/msvfw32/msvfw32.rbuild +++ b/reactos/dll/win32/msvfw32/msvfw32.rbuild @@ -10,7 +10,6 @@ msvideo_main.c drawdib.c rsrc.rc - msvfw32.spec wine winmm version diff --git a/reactos/dll/win32/msxml3/msxml3.rbuild b/reactos/dll/win32/msxml3/msxml3.rbuild index 1496ec2aa71..da71855fecb 100644 --- a/reactos/dll/win32/msxml3/msxml3.rbuild +++ b/reactos/dll/win32/msxml3/msxml3.rbuild @@ -53,7 +53,6 @@ domimpl.c entityref.c version.rc - msxml3.spec stdole2 diff --git a/reactos/dll/win32/nddeapi/nddeapi.rbuild b/reactos/dll/win32/nddeapi/nddeapi.rbuild index e2ce0e47cc3..a675b40fc8c 100644 --- a/reactos/dll/win32/nddeapi/nddeapi.rbuild +++ b/reactos/dll/win32/nddeapi/nddeapi.rbuild @@ -7,5 +7,4 @@ kernel32 ntdll nddeapi.c - nddeapi.spec diff --git a/reactos/dll/win32/netapi32/netapi32.rbuild b/reactos/dll/win32/netapi32/netapi32.rbuild index c9ed4eaff81..256dcc4a30d 100644 --- a/reactos/dll/win32/netapi32/netapi32.rbuild +++ b/reactos/dll/win32/netapi32/netapi32.rbuild @@ -18,7 +18,6 @@ netbios.c share.c wksta.c - netapi32.spec wine iphlpapi ws2_32 diff --git a/reactos/dll/win32/netcfgx/inetcfgcomp_iface.c b/reactos/dll/win32/netcfgx/inetcfgcomp_iface.c index f44b7ff3eb6..f166fb8a51c 100644 --- a/reactos/dll/win32/netcfgx/inetcfgcomp_iface.c +++ b/reactos/dll/win32/netcfgx/inetcfgcomp_iface.c @@ -442,10 +442,11 @@ INetCfgComponent_fnRaisePropertyUi( hr = CreateNotificationObject(This,iface, pUnk); if (FAILED(hr)) return hr; - if (dwFlags == NCRP_QUERY_PROPERTY_UI) - return S_OK; } + if (dwFlags == NCRP_QUERY_PROPERTY_UI) + return S_OK; + dwDefPages = 0; Pages = 0; diff --git a/reactos/dll/win32/netcfgx/lang/ru-RU.rc b/reactos/dll/win32/netcfgx/lang/ru-RU.rc index 54e3223938c..fb2eba038f3 100644 --- a/reactos/dll/win32/netcfgx/lang/ru-RU.rc +++ b/reactos/dll/win32/netcfgx/lang/ru-RU.rc @@ -8,7 +8,7 @@ BEGIN LTEXT "Параметры протокола IP могут назначаться автоматически, если сеть поддерживает такую возможность. В противном случае эти параметры можно получить у сетевого администратора.", -1, 9, 9, 228, 27 CONTROL "Получать IP-адрес автоматически", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12 GROUPBOX "", -1, 9, 61, 228, 70, BS_GROUPBOX - CONTROL "&Использовать указанный IP-адрес:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 105, 12 + CONTROL "&Использовать указанный IP-адрес:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 140, 12 LTEXT "IP-адрес:", -1, 14, 75, 135, 8 CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP,150,75-2,80,12 LTEXT "Маска подсети:", -1, 14, 90, 135, 8 @@ -17,32 +17,32 @@ BEGIN CONTROL "",IDC_DEFGATEWAY,"SysIPAddress32",WS_TABSTOP,150,105-2,80,12 CONTROL "Получать адрес DNS-сервера автоматически", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 139, 210, 12 GROUPBOX "", -1, 9, 157, 228, 47, BS_GROUPBOX - CONTROL "&Использовать следующие адреса DNS-серверов", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 155, 142, 12 + CONTROL "&Использовать следующие адреса DNS-серверов", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 155, 185, 12 LTEXT "Предпочитаемый DNS-сервер:", -1, 14, 171, 135, 8 CONTROL "",IDC_DNS1,"SysIPAddress32",WS_TABSTOP,150,171-2,80,12 LTEXT "Альтернативный DNS-сервер:", -1, 14, 186, 135, 8 CONTROL "",IDC_DNS2,"SysIPAddress32",WS_TABSTOP,150,186-2,80,12 - PUSHBUTTON "&Дополнительно", IDC_ADVANCED, 186, 209, 50, 14, WS_TABSTOP + PUSHBUTTON "&Дополнительно", IDC_ADVANCED, 162, 209, 74, 14, WS_TABSTOP END IDD_TCPIP_ALTCF_DLG DIALOGEX DISCARDABLE 0, 0, 246, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION -CAPTION "Alternate Configuration" +CAPTION "Альтернативная конфигурация" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "If this computer is used on more than one network, enter the alternate IP settings below", -1, 9, 9, 220, 20 - CONTROL "Au&tomatic private IP address", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12 + LTEXT "Если этот компьютер используется в нескольких сетях, введите параметры альтернативной конфигурации протокола IP:", -1, 9, 9, 230, 20 + CONTROL "А&втоматический частный IP-адрес", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12 GROUPBOX "", -1, 9, 55, 228, 80, BS_GROUPBOX - CONTROL "U&ser configured", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 70, 12 - LTEXT "&IP адрес:", -1, 14, 75, 135, 8 + CONTROL "Настраиваем&ый пользователем", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 130, 12 + LTEXT "IP-&адрес:", -1, 14, 75, 135, 8 CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP, 150, 75, 80, 12 - LTEXT "&Маска подсети:", -1, 14, 95, 135, 8 + LTEXT "Ма&ска подсети:", -1, 14, 95, 135, 8 CONTROL "",IDC_SUBNETMASK,"SysIPAddress32",WS_TABSTOP, 150, 95, 80, 12 - LTEXT "&Шлюз по умолчанию:", -1, 14, 115, 135, 8 + LTEXT "&Основной шлюз:", -1, 14, 115, 135, 8 CONTROL "",IDC_DEFGATEWAY,"SysIPAddress32",WS_TABSTOP, 150, 115, 80, 12 - LTEXT "&Основной DNS сервер:", -1, 14, 150, 135, 8 + LTEXT "Пр&едпочитаемый DNS-сервер:", -1, 14, 150, 135, 8 CONTROL "",IDC_DNS1,"SysIPAddress32",WS_TABSTOP, 150, 150, 80, 12 - LTEXT "&Дополнительный DNS сервер:", -1, 14, 165, 180, 8 + LTEXT "Ал&ьтернативный DNS-сервер:", -1, 14, 165, 180, 8 CONTROL "",IDC_DNS2,"SysIPAddress32",WS_TABSTOP, 150, 165, 80, 12 END @@ -51,19 +51,19 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Параметры IP" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "IP addressen", -1, 5, 5, 240, 90 + GROUPBOX "IP-&адреса", -1, 5, 5, 240, 90 CONTROL "", IDC_IPLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 15, 210, 55 - PUSHBUTTON "Добавить...", IDC_IPADD, 60, 75, 50, 14, WS_TABSTOP - PUSHBUTTON "Изменить...", IDC_IPMOD, 120, 75, 50, 14, WS_TABSTOP - PUSHBUTTON "Удалить", IDC_IPDEL, 180, 75, 50, 14, WS_TABSTOP - GROUPBOX "Default gateways:", -1, 5, 100, 240, 90 + PUSHBUTTON "&Добавить...", IDC_IPADD, 60, 75, 50, 14, WS_TABSTOP + PUSHBUTTON "&Изменить...", IDC_IPMOD, 120, 75, 50, 14, WS_TABSTOP + PUSHBUTTON "&Удалить", IDC_IPDEL, 180, 75, 50, 14, WS_TABSTOP + GROUPBOX "&Основные шлюзы:", -1, 5, 100, 240, 90 CONTROL "", IDC_GWLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 110, 210, 55 - PUSHBUTTON "Добавить...", IDC_GWADD, 60, 170, 50, 14, WS_TABSTOP - PUSHBUTTON "Изменить...", IDC_GWMOD, 120, 170, 50, 14, WS_TABSTOP - PUSHBUTTON "Удалить", IDC_GWDEL, 180, 170, 50, 14, WS_TABSTOP + PUSHBUTTON "До&бавить...", IDC_GWADD, 60, 170, 50, 14, WS_TABSTOP + PUSHBUTTON "И&зменить...", IDC_GWMOD, 120, 170, 50, 14, WS_TABSTOP + PUSHBUTTON "Уда&лить", IDC_GWDEL, 180, 170, 50, 14, WS_TABSTOP GROUPBOX "", -1, 5, 200, 240, 30 - CHECKBOX "Автоматическая метрика", IDC_AUTOMETRIC, 9, 200, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP - LTEXT "Метрика интерфейса:", -1, 15, 215, 90, 12 + CHECKBOX "А&втоматическое назначение метрики", IDC_AUTOMETRIC, 9, 200, 146, 12, BS_AUTOCHECKBOX | WS_TABSTOP + LTEXT "Метрика ин&терфейса:", -1, 15, 215, 90, 12 EDITTEXT IDC_METRIC, 110, 212, 50, 12, WS_TABSTOP | ES_NUMBER END @@ -73,26 +73,26 @@ CAPTION "DNS" FONT 8, "MS Shell Dlg" BEGIN LISTBOX IDC_DNSADDRLIST, 5, 15, 180, 60, LBS_NOTIFY - LTEXT "D&NS server addresses, in order of use:", -1, 5, 5, 180, 12 + LTEXT "&Адреса DNS-серверов, в порядке использования:", -1, 5, 5, 180, 10 PUSHBUTTON "Вверх", IDC_DNSADDRUP, 190, 30, 50, 14, WS_TABSTOP PUSHBUTTON "Вниз", IDC_DNSADDRDOWN, 190, 50, 50, 14, WS_TABSTOP PUSHBUTTON "&Добавить...", IDC_DNSADDRADD, 30, 70, 50, 14, WS_TABSTOP - PUSHBUTTON "&Изменить...", IDC_DNSADDRMOD, 100, 70, 50, 14, WS_TABSTOP + PUSHBUTTON "И&зменить...", IDC_DNSADDRMOD, 100, 70, 50, 14, WS_TABSTOP PUSHBUTTON "&Удалить", IDC_DNSADDRDEL, 170, 70, 50, 14, WS_TABSTOP - LTEXT "The following three settings are applied to all connections with TCP/IP enabled. For resolution of unqualified names:", -1, 5, 90, 220, 24 - CONTROL "Append &primary and connection specific DNS suffixes", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 110, 160, 12 - CHECKBOX "Append parent suffi&xes of the primary DNS suffix", IDC_TOPPRIMSUFFIX, 15, 125, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP - CONTROL "Append t&hese DNS suffixes(in order):", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 140, 190, 12 + LTEXT "Следующие три параметра применяются для всех подключений, использующих TCP/IP. Для разрешения неизвестных имен:", -1, 5, 90, 238, 20 + CONTROL "Дописывать &основной DNS-суффикс и суффикс подключения", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 110, 234, 12 + CHECKBOX "Дописывать роди&тельские суффиксы осн. DNS-суффикса", IDC_TOPPRIMSUFFIX, 15, 125, 220, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CONTROL "Дописывать сл&едующие DNS-суффиксы (по порядку):", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 140, 206, 12 LISTBOX IDC_DNSSUFFIXLIST, 5, 155, 180, 60, LBS_NOTIFY PUSHBUTTON "Вверх", IDC_DNSSUFFIXUP, 190, 170, 50, 14, WS_TABSTOP PUSHBUTTON "Вниз", IDC_DNSSUFFIXDOWN, 190, 190, 50, 14, WS_TABSTOP - PUSHBUTTON "Д&обавить...", IDC_DNSSUFFIXADD, 30, 210, 50, 14, WS_TABSTOP - PUSHBUTTON "И&зменить...", IDC_DNSSUFFIXMOD, 100, 210, 50, 14, WS_TABSTOP - PUSHBUTTON "Уд&алить", IDC_DNSSUFFIXDEL, 170, 210, 50, 14, WS_TABSTOP - LTEXT "DNS &suffix for this connection:", -1, 5, 225, 110, 14 + PUSHBUTTON "До&бавить...", IDC_DNSSUFFIXADD, 30, 210, 50, 14, WS_TABSTOP + PUSHBUTTON "Из&менить...", IDC_DNSSUFFIXMOD, 100, 210, 50, 14, WS_TABSTOP + PUSHBUTTON "Уда&лить", IDC_DNSSUFFIXDEL, 170, 210, 50, 14, WS_TABSTOP + LTEXT "DNS-&суффикс подключения:", -1, 5, 225, 110, 14 EDITTEXT IDC_SUFFIX, 120, 225, 100, 12, WS_TABSTOP - CHECKBOX "&Register this connection's addresses in DNS", IDC_REGSUFFIX, 15, 240, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "&Use this connection's DNS suffix in DNS registration", IDC_USESUFFIX, 15, 255, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "Заре&гистрировать адреса этого подключения в DNS", IDC_REGSUFFIX, 8, 240, 204, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "&Использовать DNS-суффикс подключения при регистрации в DNS", IDC_USESUFFIX, 8, 255, 270, 12, BS_AUTOCHECKBOX | WS_TABSTOP END @@ -148,39 +148,39 @@ END IDD_TCPIPSUFFIX_DLG DIALOGEX DISCARDABLE 0, 0, 200, 80 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "TCP/IP Domain Suffix" +CAPTION "Доменный суффикс TCP/IP" FONT 8, "MS Shell Dlg" BEGIN EDITTEXT IDC_SUFFIX, 5, 25, 190, 12, WS_TABSTOP - LTEXT "Domain suffix:", -1, 5, 10, 120, 12 + LTEXT "&Доменный суффикс:", -1, 5, 10, 120, 12 PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP PUSHBUTTON "Отмена", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END IDD_TCPIP_FILTER_DLG DIALOGEX DISCARDABLE 0, 0, 305, 220 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "TCP/IP фильтрация" +CAPTION "Фильтрация TCP/IP" FONT 8, "MS Shell Dlg" BEGIN - CHECKBOX "Enable TCP/IP-Filtering (All adapters)", IDC_USE_FILTER, 15, 5, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "&Задействовать фильтрацию TCP/IP (все адаптеры)", IDC_USE_FILTER, 15, 5, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP GROUPBOX "", -1, 5, 30, 90, 150 - CONTROL "Permit All", IDC_TCP_ALLOW_ALL, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 30, 70, 12 - CONTROL "Permit Only", IDC_TCP_RESTRICT, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 44, 70, 12 + CONTROL "&Можно все", IDC_TCP_ALLOW_ALL, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 30, 70, 12 + CONTROL "&Только", IDC_TCP_RESTRICT, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 44, 70, 12 CONTROL "", IDC_TCP_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 11, 62, 72, 75 - PUSHBUTTON "Добавить", IDC_TCP_ADD, 15, 141, 50, 14, WS_TABSTOP - PUSHBUTTON "Удалить", IDC_TCP_DEL, 15, 161, 50, 14, WS_TABSTOP + PUSHBUTTON "Добавить...", IDC_TCP_ADD, 15, 141, 50, 14, WS_TABSTOP + PUSHBUTTON "&Удалить", IDC_TCP_DEL, 15, 161, 50, 14, WS_TABSTOP GROUPBOX "", -1, 105, 30, 90, 150 - CONTROL "Permit All", IDC_UDP_ALLOW_ALL, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 115, 30, 70, 12 - CONTROL "Permit Only", IDC_UDP_RESTRICT, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 115, 44, 70, 12 + CONTROL "Мо&жно все", IDC_UDP_ALLOW_ALL, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 115, 30, 70, 12 + CONTROL "То&лько", IDC_UDP_RESTRICT, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 115, 44, 70, 12 CONTROL "", IDC_UDP_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 111, 62, 72, 75 - PUSHBUTTON "Добавить", IDC_UDP_ADD, 115, 141, 50, 14, WS_TABSTOP - PUSHBUTTON "Удалить", IDC_UDP_DEL, 115, 161, 50, 14, WS_TABSTOP + PUSHBUTTON "Добавить...", IDC_UDP_ADD, 115, 141, 50, 14, WS_TABSTOP + PUSHBUTTON "Уд&алить", IDC_UDP_DEL, 115, 161, 50, 14, WS_TABSTOP GROUPBOX "", -1, 205, 30, 90, 150 - CONTROL "Permit All", IDC_IP_ALLOW_ALL, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 215, 30, 70, 12 - CONTROL "Permit Only", IDC_IP_RESTRICT, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 215, 44, 70, 12 + CONTROL "Можно &все", IDC_IP_ALLOW_ALL, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 215, 30, 70, 12 + CONTROL "Тол&ько", IDC_IP_RESTRICT, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 215, 44, 70, 12 CONTROL "", IDC_IP_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 211, 62, 72, 75 - PUSHBUTTON "Добавить", IDC_IP_ADD, 215, 141, 50, 14, WS_TABSTOP - PUSHBUTTON "Удалить", IDC_IP_DEL, 215, 161, 50, 14, WS_TABSTOP + PUSHBUTTON "Добавить...", IDC_IP_ADD, 215, 141, 50, 14, WS_TABSTOP + PUSHBUTTON "Удал&ить", IDC_IP_DEL, 215, 161, 50, 14, WS_TABSTOP PUSHBUTTON "OK", IDC_OK, 150, 190, 50, 14, WS_TABSTOP PUSHBUTTON "Отмена", IDCANCEL, 210, 190, 50, 14, WS_TABSTOP END @@ -198,32 +198,32 @@ END STRINGTABLE BEGIN - IDS_NET_CONNECT "Сетевое подключение" - IDS_NO_IPADDR_SET "The adapter requires at least one IP address. Please enter one." - IDS_NO_SUBMASK_SET "You have entered an address that is missing its subnet mask. Please add a subnet mask." - IDS_TCPFILTERDESC "TCP/IP filtering allows you to control the type of TCP/IP network traffic that reaches your computer." - IDS_TCPFILTER "TCP/IP Filtering" - IDS_IPADDR "IP адрес" + IDS_NET_CONNECT "Сетевые подключения" + IDS_NO_IPADDR_SET "Этот адаптер требует ввода хотя бы одного IP-адреса. Введите адрес." + IDS_NO_SUBMASK_SET "Введен адрес без указания маски подсети. Введите маску подсети." + IDS_TCPFILTERDESC "Фильтрация TCP/IP позволяет контролировать сетевой трафик TCP/IP, поступающий на данный компьютер." + IDS_TCPFILTER "Фильтрация TCP/IP" + IDS_IPADDR "IP-адрес" IDS_SUBMASK "Маска подсети" IDS_GATEWAY "Шлюз" IDS_METRIC "Метрика" IDS_DHCPACTIVE "DHCP включен" IDS_AUTOMATIC "Автоматически" - IDS_NOITEMSEL "You have not selected an item. Select one first." + IDS_NOITEMSEL "Не выбрано ни одного элемента. Следует выбрать хоты бы один элемент." IDS_TCPIP "ReactOS-TCP/IP" IDS_ADD "Добавить" IDS_MOD "OK" - IDS_TCP_PORTS "TCP проты" - IDS_UDP_PORTS "UDP проты" - IDS_IP_PROTO "IP протоколы" - IDS_PORT_RANGE "Port numbers must be greater than 0 and less than 65536. Please enter a number within this range." - IDS_PROT_RANGE "Protocol numbers must be greater than 0 and less than 256. Please enter a number within this range." - IDS_DUP_NUMBER "The number you are trying to add is already in the list. Please enter a different number." - IDS_DISABLE_FILTER "Disabling this global TCP/IP setting will affect all adapters." - IDS_NO_SUFFIX "The current setting of search method requires at least one DNS suffix. Please enter one or change the setting." - IDS_DOMAIN_SUFFIX "Domain suffix is not a valid suffix." - IDS_DNS_SUFFIX "The DNS domain name ""%s"" is not a valid DNS name." - IDS_DUP_SUFFIX "The DNS suffix is already on the list." - IDS_DUP_IPADDR "IP адрес уже в списке." + IDS_TCP_PORTS "TCP-проты" + IDS_UDP_PORTS "UDP-проты" + IDS_IP_PROTO "IP-протоколы" + IDS_PORT_RANGE "Номера портов должны быть больше 0 и меньше 65536. Введите номер в этом диапазоне." + IDS_PROT_RANGE "Номера протоколов должны быть больше 0 и меньше 256. Введите номер в этом диапазоне." + IDS_DUP_NUMBER "Номер, который вы хотите добавить, уже имеется в списке. Введите другой номер." + IDS_DISABLE_FILTER "Запрещение этого глобального параметра TCP/IP повлияет на все адаптеры." + IDS_NO_SUFFIX "Текущие установки метода поиска требуют указания по меньшей мере одного суффикса DNS. Введите суффикс или измените установки." + IDS_DOMAIN_SUFFIX "Неправильный суффикс домена." + IDS_DNS_SUFFIX "DNS-имя домена ""%s"" не является допустимым DNS-именем." + IDS_DUP_SUFFIX "DNS-суфикс уже имеется в списке." + IDS_DUP_IPADDR "IP-адрес уже имеется в списке." IDS_DUP_GW "Шлюз по умолчанию уже в списке." END diff --git a/reactos/dll/win32/netcfgx/lang/sk-SK.rc b/reactos/dll/win32/netcfgx/lang/sk-SK.rc index a84a8065dbd..253e7eb74ea 100644 --- a/reactos/dll/win32/netcfgx/lang/sk-SK.rc +++ b/reactos/dll/win32/netcfgx/lang/sk-SK.rc @@ -34,7 +34,7 @@ BEGIN CONTROL "Au&tomatic private IP address", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12 GROUPBOX "", -1, 9, 55, 228, 80, BS_GROUPBOX CONTROL "U&ser configured", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 70, 12 - LTEXT "&IP address:", -1, 14, 75, 135, 8 + LTEXT "Adresa &IP:", -1, 14, 75, 135, 8 CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP, 150, 75, 80, 12 LTEXT "S&ubnet mask:", -1, 14, 95, 135, 8 CONTROL "",IDC_SUBNETMASK,"SysIPAddress32",WS_TABSTOP, 150, 95, 80, 12 @@ -53,16 +53,16 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "IP addressen", -1, 5, 5, 240, 90 CONTROL "", IDC_IPLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 15, 210, 55 - PUSHBUTTON "Add...", IDC_IPADD, 60, 75, 50, 14, WS_TABSTOP - PUSHBUTTON "Edit...", IDC_IPMOD, 120, 75, 50, 14, WS_TABSTOP - PUSHBUTTON "Remove", IDC_IPDEL, 180, 75, 50, 14, WS_TABSTOP + PUSHBUTTON "Pridaќ...", IDC_IPADD, 60, 75, 50, 14, WS_TABSTOP + PUSHBUTTON "Upraviќ...", IDC_IPMOD, 120, 75, 50, 14, WS_TABSTOP + PUSHBUTTON "Odstrбniќ", IDC_IPDEL, 180, 75, 50, 14, WS_TABSTOP GROUPBOX "Default gateways:", -1, 5, 100, 240, 90 CONTROL "", IDC_GWLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 110, 210, 55 - PUSHBUTTON "Add...", IDC_GWADD, 60, 170, 50, 14, WS_TABSTOP - PUSHBUTTON "Edit...", IDC_GWMOD, 120, 170, 50, 14, WS_TABSTOP - PUSHBUTTON "Remove", IDC_GWDEL, 180, 170, 50, 14, WS_TABSTOP + PUSHBUTTON "Pridaќ...", IDC_GWADD, 60, 170, 50, 14, WS_TABSTOP + PUSHBUTTON "Upraviќ...", IDC_GWMOD, 120, 170, 50, 14, WS_TABSTOP + PUSHBUTTON "Odstrбniќ", IDC_GWDEL, 180, 170, 50, 14, WS_TABSTOP GROUPBOX "", -1, 5, 200, 240, 30 - CHECKBOX "Automatic metric", IDC_AUTOMETRIC, 9, 200, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "Automatickб metrika", IDC_AUTOMETRIC, 9, 200, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP LTEXT "Interface metric:", -1, 15, 215, 90, 12 EDITTEXT IDC_METRIC, 110, 212, 50, 12, WS_TABSTOP | ES_NUMBER END @@ -98,41 +98,41 @@ END IDD_TCPIP_ADVOPT_DLG DIALOGEX DISCARDABLE 0, 0, 247, 247 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION -CAPTION "Options" +CAPTION "Moћnosti" FONT 8, "MS Shell Dlg" BEGIN LISTBOX IDC_OPTLIST, 5, 30, 230, 70 - LTEXT "&Optional settings", -1, 5, 15, 130, 12 - PUSHBUTTON "&Properties", IDC_OPTPROP, 160, 100, 70, 14, WS_TABSTOP + LTEXT "&Optional settings", -1, 5, 15, 130, 12 //volitelnй nastavenia + PUSHBUTTON "Vl&astnosti", IDC_OPTPROP, 160, 100, 70, 14, WS_TABSTOP GROUPBOX "Description:", -1, 5, 120, 240, 70 LTEXT "", IDC_OPTDESC, 15, 130, 220, 33 END IDD_TCPIPADDIP_DLG DIALOGEX DISCARDABLE 0, 0, 200, 70 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "TCP/IP Address" +CAPTION "Adresa TCP/IP" FONT 8, "MS Shell Dlg" BEGIN CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP, 100, 15, 80, 12 - LTEXT "IP address:", -1, 5, 15, 70, 12 - LTEXT "Subnet mask:", -1, 5, 30, 70, 12 + LTEXT "Adresa IP:", -1, 5, 15, 70, 12 + LTEXT "Maska podsiete:", -1, 5, 30, 70, 12 CONTROL "",IDC_SUBNETMASK,"SysIPAddress32", WS_TABSTOP, 100, 30, 80, 12 PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP - PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "Zruљiќ", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END IDD_TCPIPGW_DLG DIALOGEX DISCARDABLE 0, 0, 200, 80 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "TCP/IP Gateway Address" +CAPTION "TCP/IP adresa brбny" //TCP/IP Gateway Address FONT 8, "MS Shell Dlg" BEGIN CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP, 100, 15, 80, 12 - LTEXT "Gateway:", -1, 5, 15, 70, 12 - CHECKBOX "Automatic metric", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP - LTEXT "&Metric:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED + LTEXT "Brбna:", -1, 5, 15, 70, 12 + CHECKBOX "Automatickб metrika", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP + LTEXT "&Metrika:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP - PUSHBUTTON "Cancel", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP + PUSHBUTTON "Zruљiќ", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP END IDD_TCPIPDNS_DLG DIALOGEX DISCARDABLE 0, 0, 200, 80 @@ -143,7 +143,7 @@ BEGIN CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP, 5, 25, 80, 12 LTEXT "DNS server:", -1, 5, 10, 120, 12 PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP - PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "Zruљiќ", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END IDD_TCPIPSUFFIX_DLG DIALOGEX DISCARDABLE 0, 0, 200, 80 @@ -154,7 +154,7 @@ BEGIN EDITTEXT IDC_SUFFIX, 5, 25, 190, 12, WS_TABSTOP LTEXT "Domain suffix:", -1, 5, 10, 120, 12 PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP - PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "Zruљiќ", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END IDD_TCPIP_FILTER_DLG DIALOGEX DISCARDABLE 0, 0, 305, 220 @@ -167,22 +167,22 @@ BEGIN CONTROL "Permit All", IDC_TCP_ALLOW_ALL, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 30, 70, 12 CONTROL "Permit Only", IDC_TCP_RESTRICT, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 44, 70, 12 CONTROL "", IDC_TCP_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 11, 62, 72, 75 - PUSHBUTTON "Add", IDC_TCP_ADD, 15, 141, 50, 14, WS_TABSTOP - PUSHBUTTON "Remove", IDC_TCP_DEL, 15, 161, 50, 14, WS_TABSTOP + PUSHBUTTON "Pridaќ", IDC_TCP_ADD, 15, 141, 50, 14, WS_TABSTOP + PUSHBUTTON "Odstrбniќ", IDC_TCP_DEL, 15, 161, 50, 14, WS_TABSTOP GROUPBOX "", -1, 105, 30, 90, 150 CONTROL "Permit All", IDC_UDP_ALLOW_ALL, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 115, 30, 70, 12 CONTROL "Permit Only", IDC_UDP_RESTRICT, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 115, 44, 70, 12 CONTROL "", IDC_UDP_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 111, 62, 72, 75 - PUSHBUTTON "Add", IDC_UDP_ADD, 115, 141, 50, 14, WS_TABSTOP - PUSHBUTTON "Remove", IDC_UDP_DEL, 115, 161, 50, 14, WS_TABSTOP + PUSHBUTTON "Pridaќ", IDC_UDP_ADD, 115, 141, 50, 14, WS_TABSTOP + PUSHBUTTON "Odstrбniќ", IDC_UDP_DEL, 115, 161, 50, 14, WS_TABSTOP GROUPBOX "", -1, 205, 30, 90, 150 CONTROL "Permit All", IDC_IP_ALLOW_ALL, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 215, 30, 70, 12 CONTROL "Permit Only", IDC_IP_RESTRICT, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 215, 44, 70, 12 CONTROL "", IDC_IP_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 211, 62, 72, 75 - PUSHBUTTON "Add", IDC_IP_ADD, 215, 141, 50, 14, WS_TABSTOP - PUSHBUTTON "Remove", IDC_IP_DEL, 215, 161, 50, 14, WS_TABSTOP + PUSHBUTTON "Pridaќ", IDC_IP_ADD, 215, 141, 50, 14, WS_TABSTOP + PUSHBUTTON "Odstrбniќ", IDC_IP_DEL, 215, 161, 50, 14, WS_TABSTOP PUSHBUTTON "OK", IDC_OK, 150, 190, 50, 14, WS_TABSTOP - PUSHBUTTON "Cancel", IDCANCEL, 210, 190, 50, 14, WS_TABSTOP + PUSHBUTTON "Zruљiќ", IDCANCEL, 210, 190, 50, 14, WS_TABSTOP END IDD_TCPIP_PORT_DLG DIALOGEX DISCARDABLE 0, 0, 200, 60 @@ -193,7 +193,7 @@ BEGIN EDITTEXT IDC_PORT_VAL, 5, 30, 70, 12, WS_TABSTOP | ES_NUMBER LTEXT "", IDC_PORT_DESC, 5, 15, 40, 12 PUSHBUTTON "OK", IDC_OK, 120, 15, 50, 14, WS_TABSTOP - PUSHBUTTON "Cancel", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP + PUSHBUTTON "Zruљiќ", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP END STRINGTABLE @@ -203,19 +203,19 @@ BEGIN IDS_NO_SUBMASK_SET "You have entered an address that is missing its subnet mask. Please add a subnet mask." IDS_TCPFILTERDESC "TCP/IP filtering allows you to control the type of TCP/IP network traffic that reaches your computer." IDS_TCPFILTER "TCP/IP Filtering" - IDS_IPADDR "IP address" - IDS_SUBMASK "Subnet mask" - IDS_GATEWAY "Gateway" - IDS_METRIC "Metric" + IDS_IPADDR "Adresa IP" + IDS_SUBMASK "Maska podsiete" + IDS_GATEWAY "Brбna" + IDS_METRIC "Metrika" IDS_DHCPACTIVE "DHCP Enabled" IDS_AUTOMATIC "Automatic" IDS_NOITEMSEL "You have not selected an item. Select one first." IDS_TCPIP "ReactOS-TCP/IP" - IDS_ADD "Add" + IDS_ADD "Pridaќ" IDS_MOD "OK" - IDS_TCP_PORTS "TCP Ports" - IDS_UDP_PORTS "UDP Ports" - IDS_IP_PROTO "IP protocols" + IDS_TCP_PORTS "TCP porty" + IDS_UDP_PORTS "UDP porty" + IDS_IP_PROTO "IP protokoly" IDS_PORT_RANGE "Port numbers must be greater than 0 and less than 65536. Please enter a number within this range." IDS_PROT_RANGE "Protocol numbers must be greater than 0 and less than 256. Please enter a number within this range." IDS_DUP_NUMBER "The number you are trying to add is already in the list. Please enter a different number." diff --git a/reactos/dll/win32/netcfgx/netcfgx.rbuild b/reactos/dll/win32/netcfgx/netcfgx.rbuild index f520bd7149f..342b84acc8e 100644 --- a/reactos/dll/win32/netcfgx/netcfgx.rbuild +++ b/reactos/dll/win32/netcfgx/netcfgx.rbuild @@ -16,7 +16,6 @@ comctl32 ws2_32 netcfgx.c - netcfgx.spec classfactory.c netcfg_iface.c inetcfgcomp_iface.c diff --git a/reactos/dll/win32/netid/netid.rbuild b/reactos/dll/win32/netid/netid.rbuild index 3272cc530a9..62edbd39b54 100644 --- a/reactos/dll/win32/netid/netid.rbuild +++ b/reactos/dll/win32/netid/netid.rbuild @@ -10,5 +10,4 @@ netapi32 netid.c netid.rc - netid.spec diff --git a/reactos/dll/win32/netshell/README b/reactos/dll/win32/netshell/README new file mode 100644 index 00000000000..5f7fa4a9b18 --- /dev/null +++ b/reactos/dll/win32/netshell/README @@ -0,0 +1,58 @@ +=== Introduction === + +The netshell library is responsible for managing network connections. The user interface is accessed +by opening the control panel and selecting the "Network Connections" folder. +The netshell library provides COM interfaces to enumerate available network adapters, network protocols, network clients and network transports +and receive detailed information about them. However, it cannot configure these components. For configuration, look in the netcfgx documentation +(Hint: INetCfg) + +=== Interface === + +The user interface is exposed by implementing the IShellFolder interface as required by explorer +namespace extension. The code is currently placed in shfldr_netconnect.c + +The enumeration of the available network connections is performed by the IShellFolder::EnumObjects +(ISF_NetConnect_fnEnumObjects). It uses the INetConnectionManager interface implemented by netshell +in connectmanager.c to enumerate all available network connections. + +The context menu of network connection items is populated by the IContextMenu::QueryContextMenu +(ISF_NetConnect_IContextMenu3_QueryContextMenu) which is obtained by IShellFolder::GetUIObjectOf. The actions are performed by the +IContextMenu::InvokeCommand function (ISF_NetConnect_IContextMenu3_InvokeCommand). At the moment +the actions "Status" / "Properties" are implemented. + +=== Status Dialog & Notification Area === + +The status dialog is implemented by IOleCommandTarget interface(CLSID_LanConnectStatusUI). This interface manages all status dialogs +for all available dialogs. The interface is implemented as a singleton to advoid multiple notification icons +appear in the Notification area of the explorer. Everytime the IShellFolder object is created (ISF_NetConnect_Constructor), +it creates a reference to IOleCommandTarget interface and calls its IOleCommandTarget::Exec function with CGID_ShellServiceObject. +This causes IOleCommandTarget interface to enumerate all available network connections, check if they should be shown (NCCF_SHOW_ICON flag set +in the NETCON_PROPERTIES dwCharacter), and add them to notification area with Shell_NotifyIcon. For that purpose a hidden window is created (dialog +procedure is LANStatusDlg) which receives WM_SHOWSTATUSDLG msg when it shall show display the status dialog. + +When a user wants to display the status dialog by clicking on the context menu of network connection item, the IShellFolder sends the NetCfgInstanceId of +the selected network connection to IOleCommandTarget::Exec function. The function then looks up the specified notification item and then sends +the WM_SHOWSTATUSDLG msg to specific window. + +=== Network Connections Property Dialog === + +The network connections property dialog is implemented by the INetConnectionPropertyUi2 interface. The class id is obtained by calling +INetConnection::GetUiObjectClassId of the current selected network connection. After obtaining the interface by calling CoCreateInstance, the +selected network connection is stored as reference by calling INetConnectionPropertyUi::SetConnection. The next step is to call +INetConnectionPropertyUi::AddPages to add custom property pages to the property sheet set. If the function suceeds, the caller can then invoke +PropertySheetW function to display the properties. + Note: If the context doesnt match, i.e. the INetConnectionPropertyUi2 cannot work together + with current INetConnection, then it should fail INetConnectionPropertyUi::AddPages + Note: The function ShowNetConnectionProperties in shlfdr_netconnect.c shows how to invoke the Network Connections Property Dialog + +The enumeration of network components (protocols, client, transport) is done by using the INetCfg api). Initialization is performed in InitializeLANPropertiesUIDlg +function. When a user accepts changes, it calls INetCfg::Apply or when it aborts the changes INetCfg::Cancel. + +=== Known Issues === +* The notification icons are only added once IShellFolder of netshell is created for the first time +* Status changes of an adapter are not automatically updated because the information is cached +* There seems to be an icon problem which makes icon blink in the status dialog + +Last Update 31/10/2008 + + diff --git a/reactos/dll/win32/netshell/lanconnectui.c b/reactos/dll/win32/netshell/lanconnectui.c index 4c9b41ed149..34d3c6a02c8 100644 --- a/reactos/dll/win32/netshell/lanconnectui.c +++ b/reactos/dll/win32/netshell/lanconnectui.c @@ -307,7 +307,11 @@ LANPropertiesUIDlg( PNET_ITEM pItem; INetConnectionPropertyUiImpl * This; LPPSHNOTIFY lppsn; + DWORD dwShowIcon; HRESULT hr; + WCHAR szKey[200]; + LPOLESTR pStr; + HKEY hKey; switch(uMsg) { @@ -326,14 +330,31 @@ LANPropertiesUIDlg( if (This->pNCfg) { hr = INetCfg_Apply(This->pNCfg); - if (SUCCEEDED(hr)) - return PSNRET_NOERROR; - else + if (FAILED(hr)) return PSNRET_INVALID; } + + if (SendDlgItemMessageW(hwndDlg, IDC_SHOWTASKBAR, BM_GETCHECK, 0, 0) == BST_CHECKED) + dwShowIcon = 1; + else + dwShowIcon = 0; + + + if (StringFromCLSID(&This->pProperties->guidId, &pStr) == ERROR_SUCCESS) + { + swprintf(szKey, L"SYSTEM\\CurrentControlSet\\Control\\Network\\{4D36E972-E325-11CE-BFC1-08002BE10318}\\%s\\Connection", pStr); + CoTaskMemFree(pStr); + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, szKey, 0, KEY_WRITE, &hKey) == ERROR_SUCCESS) + { + RegSetValueExW(hKey, L"ShowIcon", 0, REG_DWORD, (LPBYTE)&dwShowIcon, sizeof(DWORD)); + RegCloseKey(hKey); + } + } + return PSNRET_NOERROR; } - else if (lppsn->hdr.code == PSN_APPLY) +#if 0 + else if (lppsn->hdr.code == PSN_CANCEL) { This = (INetConnectionPropertyUiImpl*)GetWindowLongPtr(hwndDlg, DWLP_USER); if (This->pNCfg) @@ -346,6 +367,7 @@ LANPropertiesUIDlg( } return PSNRET_NOERROR; } +#endif if (lppl->hdr.code == LVN_ITEMCHANGING) { ZeroMemory(&li, sizeof(li)); diff --git a/reactos/dll/win32/netshell/lang/es-ES.rc b/reactos/dll/win32/netshell/lang/es-ES.rc index 64000115d4a..14df7e1c781 100644 --- a/reactos/dll/win32/netshell/lang/es-ES.rc +++ b/reactos/dll/win32/netshell/lang/es-ES.rc @@ -64,27 +64,27 @@ END IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE 0, 0, 200,200 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION -CAPTION "Network Connection Details" +CAPTION "Detalles de la conexiуn de red" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Network Connection &Details:", -1, 15, 9, 170, 12 + LTEXT "&Detalles de la conexiуn de red:", -1, 15, 9, 170, 12 CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 25, 170, 130 - PUSHBUTTON "&Close", IDC_CLOSE, 125, 165, 62, 14 + PUSHBUTTON "&Cerrar", IDC_CLOSE, 125, 165, 62, 14 END STRINGTABLE DISCARDABLE BEGIN - IDS_PHYSICAL_ADDRESS "Physical Address" - IDS_IP_ADDRESS "IP Address" - IDS_SUBNET_MASK "Subnet Mask" - IDS_DEF_GATEWAY "Default Gateway" - IDS_DHCP_SERVER "DHCP Server" - IDS_LEASE_OBTAINED "Lease Obtained" - IDS_LEASE_EXPIRES "Lease Expires" - IDS_DNS_SERVERS "DNS Servers" - IDS_WINS_SERVERS "WINS Servers" - IDS_PROPERTY "Property" - IDS_VALUE "Value" + IDS_PHYSICAL_ADDRESS "Direcciуn fнsica" + IDS_IP_ADDRESS "Direcciуn IP" + IDS_SUBNET_MASK "Mбscara de subred" + IDS_DEF_GATEWAY "Puerta de enlace predeterminada" + IDS_DHCP_SERVER "Servidor DHCP" + IDS_LEASE_OBTAINED "Concesiуn obtenida" + IDS_LEASE_EXPIRES "La concesiуn caduca" + IDS_DNS_SERVERS "Servidor DNS" + IDS_WINS_SERVERS "Servidor WINS" + IDS_PROPERTY "Propiedad" + IDS_VALUE "Valor" IDS_NETWORKCONNECTION "Conexiones de red" IDS_SHV_COLUMN_NAME "Nombre" IDS_SHV_COLUMN_TYPE "Tipo" diff --git a/reactos/dll/win32/netshell/lang/sk-SK.rc b/reactos/dll/win32/netshell/lang/sk-SK.rc index 3555bac4795..4d0baf0e486 100644 --- a/reactos/dll/win32/netshell/lang/sk-SK.rc +++ b/reactos/dll/win32/netshell/lang/sk-SK.rc @@ -1,6 +1,6 @@ /* TRANSLATOR : Mбrio Kaиmбr /Mario Kacmar/ aka Kario (kario@szm.sk) * DATE OF TR.: 31-08-2008 - * LAST CHANGE: 19-09-2008 + * LAST CHANGE: 23-10-2008 */ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT @@ -75,48 +75,48 @@ END IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE 0, 0, 200,200 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION -CAPTION "Network Connection Details" +CAPTION "Podrobnosti sieќovйho pripojenia" //Sieќovй pripojenie - podrobnosti FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Network Connection &Details:", -1, 15, 9, 170, 12 + LTEXT "Po&drobnosti sieќovйho pripojenia:", -1, 15, 9, 170, 12 CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 25, 170, 130 - PUSHBUTTON "&Close", IDC_CLOSE, 125, 165, 62, 14 + PUSHBUTTON "&Zavrieќ", IDC_CLOSE, 125, 165, 62, 14 END STRINGTABLE DISCARDABLE BEGIN - IDS_PHYSICAL_ADDRESS "Physical Address" - IDS_IP_ADDRESS "IP Address" - IDS_SUBNET_MASK "Subnet Mask" - IDS_DEF_GATEWAY "Default Gateway" + IDS_PHYSICAL_ADDRESS "Fyzickб adresa" + IDS_IP_ADDRESS "Adresa IP" + IDS_SUBNET_MASK "Maska podsiete" + IDS_DEF_GATEWAY "Predvolenб brбna" IDS_DHCP_SERVER "DHCP Server" IDS_LEASE_OBTAINED "Lease Obtained" IDS_LEASE_EXPIRES "Lease Expires" - IDS_DNS_SERVERS "DNS Servers" - IDS_WINS_SERVERS "WINS Servers" - IDS_PROPERTY "Property" - IDS_VALUE "Value" - IDS_NETWORKCONNECTION "Network Connection" + IDS_DNS_SERVERS "Servery DNS" + IDS_WINS_SERVERS "Servery WINS" + IDS_PROPERTY "Vlastnosќ" + IDS_VALUE "Hodnota" + IDS_NETWORKCONNECTION "Sieќovй pripojenie" IDS_SHV_COLUMN_NAME "Nбzov" IDS_SHV_COLUMN_TYPE "Typ" - IDS_SHV_COLUMN_STATE "Status" + IDS_SHV_COLUMN_STATE "Stav" IDS_SHV_COLUMN_DEVNAME "Nбzov zariadenia" - IDS_SHV_COLUMN_PHONE "Phone # or Host Address" - IDS_SHV_COLUMN_OWNER "Owner" - IDS_TYPE_ETHERNET "LAN or High-Speed Internet" - IDS_STATUS_NON_OPERATIONAL "Disabled" - IDS_STATUS_UNREACHABLE "Not Connected" - IDS_STATUS_DISCONNECTED "Network cable unplugged" - IDS_STATUS_CONNECTING "Acquiring network address" - IDS_STATUS_CONNECTED "Connected" - IDS_STATUS_OPERATIONAL "Connected" + IDS_SHV_COLUMN_PHONE "Telefуnne инslo alebo adresa hostiteѕa" + IDS_SHV_COLUMN_OWNER "Vlastnнk" + IDS_TYPE_ETHERNET "Lokбlna sieќ alebo vysokorэchlostnэ Internet" + IDS_STATUS_NON_OPERATIONAL "Vypnutй" + IDS_STATUS_UNREACHABLE "Nepripojenй" + IDS_STATUS_DISCONNECTED "Sieќovэ kбbel je odpojenэ" + IDS_STATUS_CONNECTING "Zнskavanie sieќovej adresy" + IDS_STATUS_CONNECTED "Pripojenй" + IDS_STATUS_OPERATIONAL "Pripojenй" - IDS_NET_ACTIVATE "Enable" - IDS_NET_DEACTIVATE "Disable" + IDS_NET_ACTIVATE "Zapnъќ" + IDS_NET_DEACTIVATE "Vypnъќ" IDS_NET_STATUS "Stav" IDS_NET_REPAIR "Opraviќ" IDS_NET_CREATELINK "Vytvoriќ odkaz" - IDS_NET_DELETE "Delete" + IDS_NET_DELETE "Odstrбniќ" IDS_NET_RENAME "Premenovaќ" IDS_NET_PROPERTIES "Vlastnosti" diff --git a/reactos/dll/win32/netshell/lanstatusui.c b/reactos/dll/win32/netshell/lanstatusui.c index 9d8f8232864..83de28d3569 100644 --- a/reactos/dll/win32/netshell/lanstatusui.c +++ b/reactos/dll/win32/netshell/lanstatusui.c @@ -556,6 +556,157 @@ LANStatusUiAdvancedDlg( return FALSE; } +BOOL +FindNetworkAdapter(HDEVINFO hInfo, SP_DEVINFO_DATA *pDevInfo, LPWSTR pGuid) +{ + DWORD dwIndex, dwSize; + HKEY hSubKey; + WCHAR szNetCfg[50]; + WCHAR szDetail[200] = L"SYSTEM\\CurrentControlSet\\Control\\Class\\"; + + dwIndex = 0; + do + { + + ZeroMemory(pDevInfo, sizeof(SP_DEVINFO_DATA)); + pDevInfo->cbSize = sizeof(SP_DEVINFO_DATA); + + /* get device info */ + if (!SetupDiEnumDeviceInfo(hInfo, dwIndex++, pDevInfo)) + break; + + /* get device software registry path */ + if (!SetupDiGetDeviceRegistryPropertyW(hInfo, pDevInfo, SPDRP_DRIVER, NULL, (LPBYTE)&szDetail[39], sizeof(szDetail)/sizeof(WCHAR) - 40, &dwSize)) + break; + + /* open device registry key */ + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, szDetail, 0, KEY_READ, &hSubKey) != ERROR_SUCCESS) + break; + + /* query NetCfgInstanceId for current device */ + dwSize = sizeof(szNetCfg); + if (RegQueryValueExW(hSubKey, L"NetCfgInstanceId", NULL, NULL, (LPBYTE)szNetCfg, &dwSize) != ERROR_SUCCESS) + { + RegCloseKey(hSubKey); + break; + } + RegCloseKey(hSubKey); + if (!wcsicmp(pGuid, szNetCfg)) + { + return TRUE; + } + } + while(TRUE); + + return FALSE; +} + + + +VOID +DisableNetworkAdapter(INetConnection * pNet, LANSTATUSUI_CONTEXT * pContext, HWND hwndDlg) +{ + HKEY hKey; + NETCON_PROPERTIES * pProperties; + LPOLESTR pDisplayName; + WCHAR szPath[200]; + DWORD dwSize, dwType; + LPWSTR pPnp; + HDEVINFO hInfo; + SP_DEVINFO_DATA DevInfo; + SP_PROPCHANGE_PARAMS PropChangeParams; + BOOL bClose = FALSE; + NOTIFYICONDATAW nid; + + if (FAILED(INetConnection_GetProperties(pNet, &pProperties))) + return; + + + hInfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_NET, NULL, NULL, DIGCF_PRESENT ); + if (!hInfo) + { + NcFreeNetconProperties(pProperties); + return; + } + + if (FAILED(StringFromCLSID(&pProperties->guidId, &pDisplayName))) + { + NcFreeNetconProperties(pProperties); + SetupDiDestroyDeviceInfoList(hInfo); + return; + } + NcFreeNetconProperties(pProperties); + + if (FindNetworkAdapter(hInfo, &DevInfo, pDisplayName)) + { + PropChangeParams.ClassInstallHeader.cbSize = sizeof(SP_CLASSINSTALL_HEADER); + PropChangeParams.ClassInstallHeader.InstallFunction = DIF_PROPERTYCHANGE; //; + PropChangeParams.StateChange = DICS_DISABLE; + PropChangeParams.Scope = DICS_FLAG_CONFIGSPECIFIC; + PropChangeParams.HwProfile = 0; + + if (SetupDiSetClassInstallParams(hInfo, &DevInfo, &PropChangeParams.ClassInstallHeader, sizeof(SP_PROPCHANGE_PARAMS))) + { + if (SetupDiCallClassInstaller(DIF_PROPERTYCHANGE, hInfo, &DevInfo)) + bClose = TRUE; + } + } + SetupDiDestroyDeviceInfoList(hInfo); + + swprintf(szPath, L"SYSTEM\\CurrentControlSet\\Control\\Network\\{4D36E972-E325-11CE-BFC1-08002BE10318}\\%s\\Connection", pDisplayName); + CoTaskMemFree(pDisplayName); + + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, szPath, 0, KEY_READ, &hKey) != ERROR_SUCCESS) + return; + + dwSize = 0; + if (RegQueryValueExW(hKey, L"PnpInstanceID", NULL, &dwType, NULL, &dwSize) != ERROR_SUCCESS || dwType != REG_SZ) + { + RegCloseKey(hKey); + return; + } + + pPnp = (LPWSTR)CoTaskMemAlloc(dwSize); + if (!pPnp) + { + RegCloseKey(hKey); + return; + } + + if (RegQueryValueExW(hKey, L"PnpInstanceID", NULL, &dwType, (LPBYTE)pPnp, &dwSize) != ERROR_SUCCESS) + { + CoTaskMemFree(pPnp); + RegCloseKey(hKey); + return; + } + RegCloseKey(hKey); + + swprintf(szPath, L"System\\CurrentControlSet\\Hardware Profiles\\Current\\System\\CurrentControlSet\\Enum\\%s", pPnp); + CoTaskMemFree(pPnp); + + if (RegCreateKeyExW(HKEY_LOCAL_MACHINE, szPath, 0, NULL, 0, KEY_WRITE, NULL, &hKey, NULL) != ERROR_SUCCESS) + return; + + dwSize = 1; /* enable = 0, disable = 1 */ + RegSetValueExW(hKey, L"CSConfigFlags", 0, REG_DWORD, (LPBYTE)&dwSize, sizeof(DWORD)); + RegCloseKey(hKey); + + if (!bClose) + return; + + PropSheet_PressButton(GetParent(hwndDlg), PSBTN_CANCEL); + ZeroMemory(&nid, sizeof(nid)); + nid.cbSize = sizeof(nid); + nid.uID = pContext->uID; + nid.hWnd = pContext->hwndDlg; + nid.uFlags = NIF_STATE; + nid.dwState = NIS_HIDDEN; + nid.dwStateMask = NIS_HIDDEN; + + Shell_NotifyIconW(NIM_MODIFY, &nid); +} + + INT_PTR CALLBACK LANStatusUiDlg( @@ -591,8 +742,7 @@ LANStatusUiDlg( } else if (LOWORD(wParam) == IDC_ENDISABLE) { - //FIXME - // disable network adapter + DisableNetworkAdapter(pContext->pNet, pContext, hwndDlg); break; } case WM_NOTIFY: diff --git a/reactos/dll/win32/netshell/netshell.rbuild b/reactos/dll/win32/netshell/netshell.rbuild index 0fb25f7ca2c..f84175bf9fc 100644 --- a/reactos/dll/win32/netshell/netshell.rbuild +++ b/reactos/dll/win32/netshell/netshell.rbuild @@ -23,7 +23,6 @@ netshell.rc classfactory.c connectmanager.c - netshell.spec lanconnectui.c lanstatusui.c diff --git a/reactos/dll/win32/newdev/newdev.rbuild b/reactos/dll/win32/newdev/newdev.rbuild index 814e0750b02..2b3b27d898e 100644 --- a/reactos/dll/win32/newdev/newdev.rbuild +++ b/reactos/dll/win32/newdev/newdev.rbuild @@ -5,7 +5,6 @@ stubs.c wizard.c newdev.rc - newdev.spec wine gdi32 comctl32 diff --git a/reactos/dll/win32/ntdsapi/ntdsapi.rbuild b/reactos/dll/win32/ntdsapi/ntdsapi.rbuild index 415b74eab51..2609543d4cc 100644 --- a/reactos/dll/win32/ntdsapi/ntdsapi.rbuild +++ b/reactos/dll/win32/ntdsapi/ntdsapi.rbuild @@ -8,5 +8,4 @@ kernel32 ntdll ntdsapi.c - ntdsapi.spec diff --git a/reactos/dll/win32/ntmarta/ntmarta.rbuild b/reactos/dll/win32/ntmarta/ntmarta.rbuild index faf28f26c8f..0bc6d679953 100644 --- a/reactos/dll/win32/ntmarta/ntmarta.rbuild +++ b/reactos/dll/win32/ntmarta/ntmarta.rbuild @@ -8,6 +8,5 @@ user32 ntmarta.c ntmarta.rc - ntmarta.spec ntmarta.h diff --git a/reactos/dll/win32/objsel/objsel.rbuild b/reactos/dll/win32/objsel/objsel.rbuild index b9e080fc5d0..4298f36481a 100644 --- a/reactos/dll/win32/objsel/objsel.rbuild +++ b/reactos/dll/win32/objsel/objsel.rbuild @@ -19,6 +19,5 @@ objsel.c regsvr.c objsel.rc - objsel.spec diff --git a/reactos/dll/win32/odbc32/odbc32.rbuild b/reactos/dll/win32/odbc32/odbc32.rbuild index 87205067049..6a71d3dae22 100644 --- a/reactos/dll/win32/odbc32/odbc32.rbuild +++ b/reactos/dll/win32/odbc32/odbc32.rbuild @@ -9,6 +9,5 @@ wine kernel32 proxyodbc.c - odbc32.spec diff --git a/reactos/dll/win32/odbccp32/odbccp32.rbuild b/reactos/dll/win32/odbccp32/odbccp32.rbuild index e30fbc515aa..a05c9fb918b 100644 --- a/reactos/dll/win32/odbccp32/odbccp32.rbuild +++ b/reactos/dll/win32/odbccp32/odbccp32.rbuild @@ -12,6 +12,5 @@ uuid ntdll odbccp32.c - odbccp32.spec diff --git a/reactos/dll/win32/ole32/clipboard.c b/reactos/dll/win32/ole32/clipboard.c index 909b21547d2..0e9d55c4eca 100644 --- a/reactos/dll/win32/ole32/clipboard.c +++ b/reactos/dll/win32/ole32/clipboard.c @@ -956,7 +956,7 @@ static HRESULT OLEClipbrd_RenderFormat(IDataObject *pIDataObject, LPFORMATETC pF /* Get the metafile picture out of it */ - if (!FAILED(hr = IDataObject_GetData(theOleClipboard->pIDataObjectSrc, &fmt2, &std2))) + if (SUCCEEDED(hr = IDataObject_GetData(theOleClipboard->pIDataObjectSrc, &fmt2, &std2))) { mfp = (METAFILEPICT *)GlobalLock(std2.u.hGlobal); } diff --git a/reactos/dll/win32/ole32/comcat.c b/reactos/dll/win32/ole32/comcat.c new file mode 100644 index 00000000000..9120df09126 --- /dev/null +++ b/reactos/dll/win32/ole32/comcat.c @@ -0,0 +1,1353 @@ +/* + * Comcat implementation + * + * Copyright (C) 2002 John K. Hohm + * + * 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 + */ + +#include +#include + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "winreg.h" +#include "winerror.h" + +#include "ole2.h" +#include "comcat.h" +#include "wine/unicode.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(ole); + +typedef struct +{ + const ICatRegisterVtbl *lpVtbl; + const ICatInformationVtbl *infVtbl; +} ComCatMgrImpl; + +struct class_categories { + LPCWSTR impl_strings; + LPCWSTR req_strings; +}; + +static LPENUMCATEGORYINFO COMCAT_IEnumCATEGORYINFO_Construct(LCID lcid); +static LPENUMGUID COMCAT_CLSID_IEnumGUID_Construct(struct class_categories *class_categories); +static LPENUMGUID COMCAT_CATID_IEnumGUID_Construct(REFCLSID rclsid, LPCWSTR impl_req); + +/********************************************************************** + * File-scope string constants + */ +static const WCHAR comcat_keyname[] = { + 'C','o','m','p','o','n','e','n','t',' ','C','a','t','e','g','o','r','i','e','s',0 }; +static const WCHAR impl_keyname[] = { + 'I','m','p','l','e','m','e','n','t','e','d',' ','C','a','t','e','g','o','r','i','e','s',0 }; +static const WCHAR req_keyname[] = { + 'R','e','q','u','i','r','e','d',' ','C','a','t','e','g','o','r','i','e','s',0 }; +static const WCHAR clsid_keyname[] = { 'C','L','S','I','D',0 }; + + +static inline ComCatMgrImpl *impl_from_ICatInformation( ICatInformation *iface ) +{ + return (ComCatMgrImpl *)((char*)iface - FIELD_OFFSET(ComCatMgrImpl, infVtbl)); +} + + +/********************************************************************** + * COMCAT_RegisterClassCategories + */ +static HRESULT COMCAT_RegisterClassCategories( + REFCLSID rclsid, + LPCWSTR type, + ULONG cCategories, + const CATID *rgcatid) +{ + WCHAR keyname[39]; + HRESULT res; + HKEY clsid_key, class_key, type_key; + + if (cCategories && rgcatid == NULL) return E_POINTER; + + /* Format the class key name. */ + res = StringFromGUID2(rclsid, keyname, 39); + if (FAILED(res)) return res; + + /* Create (or open) the CLSID key. */ + res = RegCreateKeyExW(HKEY_CLASSES_ROOT, clsid_keyname, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &clsid_key, NULL); + if (res != ERROR_SUCCESS) return E_FAIL; + + /* Create (or open) the class key. */ + res = RegCreateKeyExW(clsid_key, keyname, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &class_key, NULL); + if (res == ERROR_SUCCESS) { + /* Create (or open) the category type key. */ + res = RegCreateKeyExW(class_key, type, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &type_key, NULL); + if (res == ERROR_SUCCESS) { + for (; cCategories; --cCategories, ++rgcatid) { + HKEY key; + + /* Format the category key name. */ + res = StringFromGUID2(rgcatid, keyname, 39); + if (FAILED(res)) continue; + + /* Do the register. */ + res = RegCreateKeyExW(type_key, keyname, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &key, NULL); + if (res == ERROR_SUCCESS) RegCloseKey(key); + } + res = S_OK; + } else res = E_FAIL; + RegCloseKey(class_key); + } else res = E_FAIL; + RegCloseKey(clsid_key); + + return res; +} + +/********************************************************************** + * COMCAT_UnRegisterClassCategories + */ +static HRESULT COMCAT_UnRegisterClassCategories( + REFCLSID rclsid, + LPCWSTR type, + ULONG cCategories, + const CATID *rgcatid) +{ + WCHAR keyname[68] = { 'C', 'L', 'S', 'I', 'D', '\\' }; + HRESULT res; + HKEY type_key; + + if (cCategories && rgcatid == NULL) return E_POINTER; + + /* Format the class category type key name. */ + res = StringFromGUID2(rclsid, keyname + 6, 39); + if (FAILED(res)) return res; + keyname[44] = '\\'; + lstrcpyW(keyname + 45, type); + + /* Open the class category type key. */ + res = RegOpenKeyExW(HKEY_CLASSES_ROOT, keyname, 0, + KEY_READ | KEY_WRITE, &type_key); + if (res != ERROR_SUCCESS) return E_FAIL; + + for (; cCategories; --cCategories, ++rgcatid) { + /* Format the category key name. */ + res = StringFromGUID2(rgcatid, keyname, 39); + if (FAILED(res)) continue; + + /* Do the unregister. */ + RegDeleteKeyW(type_key, keyname); + } + RegCloseKey(type_key); + + return S_OK; +} + +/********************************************************************** + * COMCAT_GetCategoryDesc + */ +static HRESULT COMCAT_GetCategoryDesc(HKEY key, LCID lcid, PWCHAR pszDesc, + ULONG buf_wchars) +{ + static const WCHAR fmt[] = { '%', 'l', 'X', 0 }; + WCHAR valname[5]; + HRESULT res; + DWORD type, size = (buf_wchars - 1) * sizeof(WCHAR); + + if (pszDesc == NULL) return E_INVALIDARG; + + /* FIXME: lcid comparisons are more complex than this! */ + wsprintfW(valname, fmt, lcid); + res = RegQueryValueExW(key, valname, 0, &type, (LPBYTE)pszDesc, &size); + if (res != ERROR_SUCCESS || type != REG_SZ) { + FIXME("Simplified lcid comparison\n"); + return CAT_E_NODESCRIPTION; + } + pszDesc[size / sizeof(WCHAR)] = (WCHAR)0; + + return S_OK; +} + +/********************************************************************** + * COMCAT_PrepareClassCategories + */ +static struct class_categories *COMCAT_PrepareClassCategories( + ULONG impl_count, const CATID *impl_catids, ULONG req_count, const CATID *req_catids) +{ + struct class_categories *categories; + WCHAR *strings; + + categories = HeapAlloc( + GetProcessHeap(), HEAP_ZERO_MEMORY, + sizeof(struct class_categories) + + ((impl_count + req_count) * 39 + 2) * sizeof(WCHAR)); + if (categories == NULL) return categories; + + strings = (WCHAR *)(categories + 1); + categories->impl_strings = strings; + while (impl_count--) { + StringFromGUID2(impl_catids++, strings, 39); + strings += 39; + } + *strings++ = 0; + + categories->req_strings = strings; + while (req_count--) { + StringFromGUID2(req_catids++, strings, 39); + strings += 39; + } + *strings++ = 0; + + return categories; +} + +/********************************************************************** + * COMCAT_IsClassOfCategories + */ +static HRESULT COMCAT_IsClassOfCategories( + HKEY key, + struct class_categories const* categories) +{ + static const WCHAR impl_keyname[] = { 'I', 'm', 'p', 'l', 'e', 'm', 'e', 'n', + 't', 'e', 'd', ' ', 'C', 'a', 't', 'e', + 'g', 'o', 'r', 'i', 'e', 's', 0 }; + static const WCHAR req_keyname[] = { 'R', 'e', 'q', 'u', 'i', 'r', 'e', 'd', + ' ', 'C', 'a', 't', 'e', 'g', 'o', 'r', + 'i', 'e', 's', 0 }; + HKEY subkey; + HRESULT res; + DWORD index; + LPCWSTR string; + + /* Check that every given category is implemented by class. */ + res = RegOpenKeyExW(key, impl_keyname, 0, KEY_READ, &subkey); + if (res != ERROR_SUCCESS) return S_FALSE; + for (string = categories->impl_strings; *string; string += 39) { + HKEY catkey; + res = RegOpenKeyExW(subkey, string, 0, 0, &catkey); + if (res != ERROR_SUCCESS) { + RegCloseKey(subkey); + return S_FALSE; + } + RegCloseKey(catkey); + } + RegCloseKey(subkey); + + /* Check that all categories required by class are given. */ + res = RegOpenKeyExW(key, req_keyname, 0, KEY_READ, &subkey); + if (res == ERROR_SUCCESS) { + for (index = 0; ; ++index) { + WCHAR keyname[39]; + DWORD size = 39; + + res = RegEnumKeyExW(subkey, index, keyname, &size, + NULL, NULL, NULL, NULL); + if (res != ERROR_SUCCESS && res != ERROR_MORE_DATA) break; + if (size != 38) continue; /* bogus catid in registry */ + for (string = categories->req_strings; *string; string += 39) + if (!strcmpiW(string, keyname)) break; + if (!*string) { + RegCloseKey(subkey); + return S_FALSE; + } + } + RegCloseKey(subkey); + } + + return S_OK; +} + +/********************************************************************** + * COMCAT_ICatRegister_QueryInterface + */ +static HRESULT WINAPI COMCAT_ICatRegister_QueryInterface( + LPCATREGISTER iface, + REFIID riid, + LPVOID *ppvObj) +{ + ComCatMgrImpl *This = (ComCatMgrImpl *)iface; + TRACE("\n\tIID:\t%s\n",debugstr_guid(riid)); + + if (ppvObj == NULL) return E_POINTER; + + if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_ICatRegister)) { + *ppvObj = iface; + IUnknown_AddRef(iface); + return S_OK; + } + + if (IsEqualGUID(riid, &IID_ICatInformation)) { + *ppvObj = &This->infVtbl; + IUnknown_AddRef(iface); + return S_OK; + } + + return E_NOINTERFACE; +} + +/********************************************************************** + * COMCAT_ICatRegister_AddRef + */ +static ULONG WINAPI COMCAT_ICatRegister_AddRef(LPCATREGISTER iface) +{ + return 2; /* non-heap based object */ +} + +/********************************************************************** + * COMCAT_ICatRegister_Release + */ +static ULONG WINAPI COMCAT_ICatRegister_Release(LPCATREGISTER iface) +{ + return 1; /* non-heap based object */ +} + +/********************************************************************** + * COMCAT_ICatRegister_RegisterCategories + */ +static HRESULT WINAPI COMCAT_ICatRegister_RegisterCategories( + LPCATREGISTER iface, + ULONG cCategories, + CATEGORYINFO *rgci) +{ + HKEY comcat_key; + HRESULT res; + + TRACE("\n"); + + if (cCategories && rgci == NULL) + return E_POINTER; + + /* Create (or open) the component categories key. */ + res = RegCreateKeyExW(HKEY_CLASSES_ROOT, comcat_keyname, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &comcat_key, NULL); + if (res != ERROR_SUCCESS) return E_FAIL; + + for (; cCategories; --cCategories, ++rgci) { + static const WCHAR fmt[] = { '%', 'l', 'X', 0 }; + WCHAR keyname[39]; + WCHAR valname[9]; + HKEY cat_key; + + /* Create (or open) the key for this category. */ + if (!StringFromGUID2(&rgci->catid, keyname, 39)) continue; + res = RegCreateKeyExW(comcat_key, keyname, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &cat_key, NULL); + if (res != ERROR_SUCCESS) continue; + + /* Set the value for this locale's description. */ + wsprintfW(valname, fmt, rgci->lcid); + RegSetValueExW(cat_key, valname, 0, REG_SZ, + (CONST BYTE*)(rgci->szDescription), + (lstrlenW(rgci->szDescription) + 1) * sizeof(WCHAR)); + + RegCloseKey(cat_key); + } + + RegCloseKey(comcat_key); + return S_OK; +} + +/********************************************************************** + * COMCAT_ICatRegister_UnRegisterCategories + */ +static HRESULT WINAPI COMCAT_ICatRegister_UnRegisterCategories( + LPCATREGISTER iface, + ULONG cCategories, + CATID *rgcatid) +{ + HKEY comcat_key; + HRESULT res; + + TRACE("\n"); + + if (cCategories && rgcatid == NULL) + return E_POINTER; + + /* Open the component categories key. */ + res = RegOpenKeyExW(HKEY_CLASSES_ROOT, comcat_keyname, 0, + KEY_READ | KEY_WRITE, &comcat_key); + if (res != ERROR_SUCCESS) return E_FAIL; + + for (; cCategories; --cCategories, ++rgcatid) { + WCHAR keyname[39]; + + /* Delete the key for this category. */ + if (!StringFromGUID2(rgcatid, keyname, 39)) continue; + RegDeleteKeyW(comcat_key, keyname); + } + + RegCloseKey(comcat_key); + return S_OK; +} + +/********************************************************************** + * COMCAT_ICatRegister_RegisterClassImplCategories + */ +static HRESULT WINAPI COMCAT_ICatRegister_RegisterClassImplCategories( + LPCATREGISTER iface, + REFCLSID rclsid, + ULONG cCategories, + CATID *rgcatid) +{ + TRACE("\n"); + + return COMCAT_RegisterClassCategories( + rclsid, impl_keyname, cCategories, rgcatid); +} + +/********************************************************************** + * COMCAT_ICatRegister_UnRegisterClassImplCategories + */ +static HRESULT WINAPI COMCAT_ICatRegister_UnRegisterClassImplCategories( + LPCATREGISTER iface, + REFCLSID rclsid, + ULONG cCategories, + CATID *rgcatid) +{ + TRACE("\n"); + + return COMCAT_UnRegisterClassCategories( + rclsid, impl_keyname, cCategories, rgcatid); +} + +/********************************************************************** + * COMCAT_ICatRegister_RegisterClassReqCategories + */ +static HRESULT WINAPI COMCAT_ICatRegister_RegisterClassReqCategories( + LPCATREGISTER iface, + REFCLSID rclsid, + ULONG cCategories, + CATID *rgcatid) +{ + TRACE("\n"); + + return COMCAT_RegisterClassCategories( + rclsid, req_keyname, cCategories, rgcatid); +} + +/********************************************************************** + * COMCAT_ICatRegister_UnRegisterClassReqCategories + */ +static HRESULT WINAPI COMCAT_ICatRegister_UnRegisterClassReqCategories( + LPCATREGISTER iface, + REFCLSID rclsid, + ULONG cCategories, + CATID *rgcatid) +{ + TRACE("\n"); + + return COMCAT_UnRegisterClassCategories( + rclsid, req_keyname, cCategories, rgcatid); +} + +/********************************************************************** + * COMCAT_ICatInformation_QueryInterface + */ +static HRESULT WINAPI COMCAT_ICatInformation_QueryInterface( + LPCATINFORMATION iface, + REFIID riid, + LPVOID *ppvObj) +{ + ComCatMgrImpl *This = impl_from_ICatInformation( iface ); + return IUnknown_QueryInterface((LPUNKNOWN)This, riid, ppvObj); +} + +/********************************************************************** + * COMCAT_ICatInformation_AddRef + */ +static ULONG WINAPI COMCAT_ICatInformation_AddRef(LPCATINFORMATION iface) +{ + ComCatMgrImpl *This = impl_from_ICatInformation( iface ); + return IUnknown_AddRef((LPUNKNOWN)This); +} + +/********************************************************************** + * COMCAT_ICatInformation_Release + */ +static ULONG WINAPI COMCAT_ICatInformation_Release(LPCATINFORMATION iface) +{ + ComCatMgrImpl *This = impl_from_ICatInformation( iface ); + return IUnknown_Release((LPUNKNOWN)This); +} + +/********************************************************************** + * COMCAT_ICatInformation_EnumCategories + */ +static HRESULT WINAPI COMCAT_ICatInformation_EnumCategories( + LPCATINFORMATION iface, + LCID lcid, + LPENUMCATEGORYINFO *ppenumCatInfo) +{ + TRACE("\n"); + + if (ppenumCatInfo == NULL) return E_POINTER; + + *ppenumCatInfo = COMCAT_IEnumCATEGORYINFO_Construct(lcid); + if (*ppenumCatInfo == NULL) return E_OUTOFMEMORY; + IEnumCATEGORYINFO_AddRef(*ppenumCatInfo); + return S_OK; +} + +/********************************************************************** + * COMCAT_ICatInformation_GetCategoryDesc + */ +static HRESULT WINAPI COMCAT_ICatInformation_GetCategoryDesc( + LPCATINFORMATION iface, + REFCATID rcatid, + LCID lcid, + PWCHAR *ppszDesc) +{ + WCHAR keyname[60] = { 'C', 'o', 'm', 'p', 'o', 'n', 'e', 'n', + 't', ' ', 'C', 'a', 't', 'e', 'g', 'o', + 'r', 'i', 'e', 's', '\\', 0 }; + HKEY key; + HRESULT res; + + TRACE("\n\tCATID:\t%s\n\tLCID:\t%X\n",debugstr_guid(rcatid), lcid); + + if (rcatid == NULL || ppszDesc == NULL) return E_INVALIDARG; + + /* Open the key for this category. */ + if (!StringFromGUID2(rcatid, keyname + 21, 39)) return E_FAIL; + res = RegOpenKeyExW(HKEY_CLASSES_ROOT, keyname, 0, KEY_READ, &key); + if (res != ERROR_SUCCESS) return CAT_E_CATIDNOEXIST; + + /* Allocate a sensible amount of memory for the description. */ + *ppszDesc = (PWCHAR) CoTaskMemAlloc(128 * sizeof(WCHAR)); + if (*ppszDesc == NULL) { + RegCloseKey(key); + return E_OUTOFMEMORY; + } + + /* Get the description, and make sure it's null terminated. */ + res = COMCAT_GetCategoryDesc(key, lcid, *ppszDesc, 128); + RegCloseKey(key); + if (FAILED(res)) { + CoTaskMemFree(*ppszDesc); + return res; + } + + return S_OK; +} + +/********************************************************************** + * COMCAT_ICatInformation_EnumClassesOfCategories + */ +static HRESULT WINAPI COMCAT_ICatInformation_EnumClassesOfCategories( + LPCATINFORMATION iface, + ULONG cImplemented, + CATID *rgcatidImpl, + ULONG cRequired, + CATID *rgcatidReq, + LPENUMCLSID *ppenumCLSID) +{ + struct class_categories *categories; + + TRACE("\n"); + + if (cImplemented == (ULONG)-1) + cImplemented = 0; + if (cRequired == (ULONG)-1) + cRequired = 0; + + if (ppenumCLSID == NULL || + (cImplemented && rgcatidImpl == NULL) || + (cRequired && rgcatidReq == NULL)) return E_POINTER; + + categories = COMCAT_PrepareClassCategories(cImplemented, rgcatidImpl, + cRequired, rgcatidReq); + if (categories == NULL) return E_OUTOFMEMORY; + *ppenumCLSID = COMCAT_CLSID_IEnumGUID_Construct(categories); + if (*ppenumCLSID == NULL) { + HeapFree(GetProcessHeap(), 0, categories); + return E_OUTOFMEMORY; + } + IEnumGUID_AddRef(*ppenumCLSID); + return S_OK; +} + +/********************************************************************** + * COMCAT_ICatInformation_IsClassOfCategories + */ +static HRESULT WINAPI COMCAT_ICatInformation_IsClassOfCategories( + LPCATINFORMATION iface, + REFCLSID rclsid, + ULONG cImplemented, + CATID *rgcatidImpl, + ULONG cRequired, + CATID *rgcatidReq) +{ + WCHAR keyname[45] = { 'C', 'L', 'S', 'I', 'D', '\\', 0 }; + HRESULT res; + struct class_categories *categories; + HKEY key; + + if (WINE_TRACE_ON(ole)) { + ULONG count; + TRACE("\n\tCLSID:\t%s\n\tImplemented %u\n",debugstr_guid(rclsid),cImplemented); + for (count = 0; count < cImplemented; ++count) + TRACE("\t\t%s\n",debugstr_guid(&rgcatidImpl[count])); + TRACE("\tRequired %u\n",cRequired); + for (count = 0; count < cRequired; ++count) + TRACE("\t\t%s\n",debugstr_guid(&rgcatidReq[count])); + } + + if ((cImplemented && rgcatidImpl == NULL) || + (cRequired && rgcatidReq == NULL)) return E_POINTER; + + res = StringFromGUID2(rclsid, keyname + 6, 39); + if (FAILED(res)) return res; + + categories = COMCAT_PrepareClassCategories(cImplemented, rgcatidImpl, + cRequired, rgcatidReq); + if (categories == NULL) return E_OUTOFMEMORY; + + res = RegOpenKeyExW(HKEY_CLASSES_ROOT, keyname, 0, KEY_READ, &key); + if (res == ERROR_SUCCESS) { + res = COMCAT_IsClassOfCategories(key, categories); + RegCloseKey(key); + } else res = S_FALSE; + + HeapFree(GetProcessHeap(), 0, categories); + + return res; +} + +/********************************************************************** + * COMCAT_ICatInformation_EnumImplCategoriesOfClass + */ +static HRESULT WINAPI COMCAT_ICatInformation_EnumImplCategoriesOfClass( + LPCATINFORMATION iface, + REFCLSID rclsid, + LPENUMCATID *ppenumCATID) +{ + static const WCHAR postfix[24] = { '\\', 'I', 'm', 'p', 'l', 'e', 'm', 'e', + 'n', 't', 'e', 'd', ' ', 'C', 'a', 't', + 'e', 'g', 'o', 'r', 'i', 'e', 's', 0 }; + + TRACE("\n\tCLSID:\t%s\n",debugstr_guid(rclsid)); + + if (rclsid == NULL || ppenumCATID == NULL) + return E_POINTER; + + *ppenumCATID = COMCAT_CATID_IEnumGUID_Construct(rclsid, postfix); + if (*ppenumCATID == NULL) return E_OUTOFMEMORY; + return S_OK; +} + +/********************************************************************** + * COMCAT_ICatInformation_EnumReqCategoriesOfClass + */ +static HRESULT WINAPI COMCAT_ICatInformation_EnumReqCategoriesOfClass( + LPCATINFORMATION iface, + REFCLSID rclsid, + LPENUMCATID *ppenumCATID) +{ + static const WCHAR postfix[21] = { '\\', 'R', 'e', 'q', 'u', 'i', 'r', 'e', + 'd', ' ', 'C', 'a', 't', 'e', 'g', 'o', + 'r', 'i', 'e', 's', 0 }; + + TRACE("\n\tCLSID:\t%s\n",debugstr_guid(rclsid)); + + if (rclsid == NULL || ppenumCATID == NULL) + return E_POINTER; + + *ppenumCATID = COMCAT_CATID_IEnumGUID_Construct(rclsid, postfix); + if (*ppenumCATID == NULL) return E_OUTOFMEMORY; + return S_OK; +} + +/********************************************************************** + * COMCAT_ICatRegister_Vtbl + */ +static const ICatRegisterVtbl COMCAT_ICatRegister_Vtbl = +{ + COMCAT_ICatRegister_QueryInterface, + COMCAT_ICatRegister_AddRef, + COMCAT_ICatRegister_Release, + COMCAT_ICatRegister_RegisterCategories, + COMCAT_ICatRegister_UnRegisterCategories, + COMCAT_ICatRegister_RegisterClassImplCategories, + COMCAT_ICatRegister_UnRegisterClassImplCategories, + COMCAT_ICatRegister_RegisterClassReqCategories, + COMCAT_ICatRegister_UnRegisterClassReqCategories +}; + + +/********************************************************************** + * COMCAT_ICatInformation_Vtbl + */ +static const ICatInformationVtbl COMCAT_ICatInformation_Vtbl = +{ + COMCAT_ICatInformation_QueryInterface, + COMCAT_ICatInformation_AddRef, + COMCAT_ICatInformation_Release, + COMCAT_ICatInformation_EnumCategories, + COMCAT_ICatInformation_GetCategoryDesc, + COMCAT_ICatInformation_EnumClassesOfCategories, + COMCAT_ICatInformation_IsClassOfCategories, + COMCAT_ICatInformation_EnumImplCategoriesOfClass, + COMCAT_ICatInformation_EnumReqCategoriesOfClass +}; + +/********************************************************************** + * static ComCatMgr instance + */ +static ComCatMgrImpl COMCAT_ComCatMgr = +{ + &COMCAT_ICatRegister_Vtbl, + &COMCAT_ICatInformation_Vtbl +}; + +/********************************************************************** + * COMCAT_IClassFactory_QueryInterface (also IUnknown) + */ +static HRESULT WINAPI COMCAT_IClassFactory_QueryInterface( + LPCLASSFACTORY iface, + REFIID riid, + LPVOID *ppvObj) +{ + TRACE("\n\tIID:\t%s\n",debugstr_guid(riid)); + + if (ppvObj == NULL) return E_POINTER; + + if (IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IClassFactory)) + { + *ppvObj = (LPVOID)iface; + IUnknown_AddRef(iface); + return S_OK; + } + + return E_NOINTERFACE; +} + +/********************************************************************** + * COMCAT_IClassFactory_AddRef (also IUnknown) + */ +static ULONG WINAPI COMCAT_IClassFactory_AddRef(LPCLASSFACTORY iface) +{ + return 2; /* non-heap based object */ +} + +/********************************************************************** + * COMCAT_IClassFactory_Release (also IUnknown) + */ +static ULONG WINAPI COMCAT_IClassFactory_Release(LPCLASSFACTORY iface) +{ + return 1; /* non-heap based object */ +} + +/********************************************************************** + * COMCAT_IClassFactory_CreateInstance + */ +static HRESULT WINAPI COMCAT_IClassFactory_CreateInstance( + LPCLASSFACTORY iface, + LPUNKNOWN pUnkOuter, + REFIID riid, + LPVOID *ppvObj) +{ + HRESULT res; + TRACE("\n\tIID:\t%s\n",debugstr_guid(riid)); + + if (ppvObj == NULL) return E_POINTER; + + /* Don't support aggregation (Windows doesn't) */ + if (pUnkOuter != NULL) return CLASS_E_NOAGGREGATION; + + res = IUnknown_QueryInterface((LPUNKNOWN)&COMCAT_ComCatMgr, riid, ppvObj); + if (SUCCEEDED(res)) { + return res; + } + + return CLASS_E_CLASSNOTAVAILABLE; +} + +/********************************************************************** + * COMCAT_IClassFactory_LockServer + */ +static HRESULT WINAPI COMCAT_IClassFactory_LockServer( + LPCLASSFACTORY iface, + BOOL fLock) +{ + FIXME("(%d), stub!\n",fLock); + return S_OK; +} + +/********************************************************************** + * static ClassFactory instance + */ +static const IClassFactoryVtbl ComCatCFVtbl = +{ + COMCAT_IClassFactory_QueryInterface, + COMCAT_IClassFactory_AddRef, + COMCAT_IClassFactory_Release, + COMCAT_IClassFactory_CreateInstance, + COMCAT_IClassFactory_LockServer +}; + +static const IClassFactoryVtbl *ComCatCF = &ComCatCFVtbl; + +HRESULT ComCatCF_Create(REFIID riid, LPVOID *ppv) +{ + return IClassFactory_QueryInterface((IClassFactory *)&ComCatCF, riid, ppv); +} + +/********************************************************************** + * IEnumCATEGORYINFO implementation + * + * This implementation is not thread-safe. The manager itself is, but + * I can't imagine a valid use of an enumerator in several threads. + */ +typedef struct +{ + const IEnumCATEGORYINFOVtbl *lpVtbl; + LONG ref; + LCID lcid; + HKEY key; + DWORD next_index; +} IEnumCATEGORYINFOImpl; + +static ULONG WINAPI COMCAT_IEnumCATEGORYINFO_AddRef(LPENUMCATEGORYINFO iface) +{ + IEnumCATEGORYINFOImpl *This = (IEnumCATEGORYINFOImpl *)iface; + + TRACE("\n"); + + return InterlockedIncrement(&This->ref); +} + +static HRESULT WINAPI COMCAT_IEnumCATEGORYINFO_QueryInterface( + LPENUMCATEGORYINFO iface, + REFIID riid, + LPVOID *ppvObj) +{ + TRACE("\n\tIID:\t%s\n",debugstr_guid(riid)); + + if (ppvObj == NULL) return E_POINTER; + + if (IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IEnumCATEGORYINFO)) + { + *ppvObj = (LPVOID)iface; + COMCAT_IEnumCATEGORYINFO_AddRef(iface); + return S_OK; + } + + return E_NOINTERFACE; +} + +static ULONG WINAPI COMCAT_IEnumCATEGORYINFO_Release(LPENUMCATEGORYINFO iface) +{ + IEnumCATEGORYINFOImpl *This = (IEnumCATEGORYINFOImpl *)iface; + ULONG ref; + + TRACE("\n"); + + ref = InterlockedDecrement(&This->ref); + if (ref == 0) { + if (This->key) RegCloseKey(This->key); + HeapFree(GetProcessHeap(), 0, This); + return 0; + } + return ref; +} + +static HRESULT WINAPI COMCAT_IEnumCATEGORYINFO_Next( + LPENUMCATEGORYINFO iface, + ULONG celt, + CATEGORYINFO *rgelt, + ULONG *pceltFetched) +{ + IEnumCATEGORYINFOImpl *This = (IEnumCATEGORYINFOImpl *)iface; + ULONG fetched = 0; + + TRACE("\n"); + + if (rgelt == NULL) return E_POINTER; + + if (This->key) while (fetched < celt) { + LSTATUS res; + HRESULT hr; + WCHAR catid[39]; + DWORD cName = 39; + HKEY subkey; + + res = RegEnumKeyExW(This->key, This->next_index, catid, &cName, + NULL, NULL, NULL, NULL); + if (res != ERROR_SUCCESS && res != ERROR_MORE_DATA) break; + ++(This->next_index); + + hr = CLSIDFromString(catid, &rgelt->catid); + if (FAILED(hr)) continue; + + res = RegOpenKeyExW(This->key, catid, 0, KEY_READ, &subkey); + if (res != ERROR_SUCCESS) continue; + + hr = COMCAT_GetCategoryDesc(subkey, This->lcid, + rgelt->szDescription, 128); + RegCloseKey(subkey); + if (FAILED(hr)) continue; + + rgelt->lcid = This->lcid; + ++fetched; + ++rgelt; + } + + if (pceltFetched) *pceltFetched = fetched; + return fetched == celt ? S_OK : S_FALSE; +} + +static HRESULT WINAPI COMCAT_IEnumCATEGORYINFO_Skip( + LPENUMCATEGORYINFO iface, + ULONG celt) +{ + IEnumCATEGORYINFOImpl *This = (IEnumCATEGORYINFOImpl *)iface; + + TRACE("\n"); + + This->next_index += celt; + /* This should return S_FALSE when there aren't celt elems to skip. */ + return S_OK; +} + +static HRESULT WINAPI COMCAT_IEnumCATEGORYINFO_Reset(LPENUMCATEGORYINFO iface) +{ + IEnumCATEGORYINFOImpl *This = (IEnumCATEGORYINFOImpl *)iface; + + TRACE("\n"); + + This->next_index = 0; + return S_OK; +} + +static HRESULT WINAPI COMCAT_IEnumCATEGORYINFO_Clone( + LPENUMCATEGORYINFO iface, + IEnumCATEGORYINFO **ppenum) +{ + IEnumCATEGORYINFOImpl *This = (IEnumCATEGORYINFOImpl *)iface; + static const WCHAR keyname[] = { 'C', 'o', 'm', 'p', 'o', 'n', 'e', 'n', + 't', ' ', 'C', 'a', 't', 'e', 'g', 'o', + 'r', 'i', 'e', 's', 0 }; + IEnumCATEGORYINFOImpl *new_this; + + TRACE("\n"); + + if (ppenum == NULL) return E_POINTER; + + new_this = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IEnumCATEGORYINFOImpl)); + if (new_this == NULL) return E_OUTOFMEMORY; + + new_this->lpVtbl = This->lpVtbl; + new_this->ref = 1; + new_this->lcid = This->lcid; + /* FIXME: could we more efficiently use DuplicateHandle? */ + RegOpenKeyExW(HKEY_CLASSES_ROOT, keyname, 0, KEY_READ, &new_this->key); + new_this->next_index = This->next_index; + + *ppenum = (LPENUMCATEGORYINFO)new_this; + return S_OK; +} + +static const IEnumCATEGORYINFOVtbl COMCAT_IEnumCATEGORYINFO_Vtbl = +{ + COMCAT_IEnumCATEGORYINFO_QueryInterface, + COMCAT_IEnumCATEGORYINFO_AddRef, + COMCAT_IEnumCATEGORYINFO_Release, + COMCAT_IEnumCATEGORYINFO_Next, + COMCAT_IEnumCATEGORYINFO_Skip, + COMCAT_IEnumCATEGORYINFO_Reset, + COMCAT_IEnumCATEGORYINFO_Clone +}; + +static LPENUMCATEGORYINFO COMCAT_IEnumCATEGORYINFO_Construct(LCID lcid) +{ + IEnumCATEGORYINFOImpl *This; + + This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IEnumCATEGORYINFOImpl)); + if (This) { + static const WCHAR keyname[] = { 'C', 'o', 'm', 'p', 'o', 'n', 'e', 'n', + 't', ' ', 'C', 'a', 't', 'e', 'g', 'o', + 'r', 'i', 'e', 's', 0 }; + + This->lpVtbl = &COMCAT_IEnumCATEGORYINFO_Vtbl; + This->lcid = lcid; + RegOpenKeyExW(HKEY_CLASSES_ROOT, keyname, 0, KEY_READ, &This->key); + } + return (LPENUMCATEGORYINFO)This; +} + +/********************************************************************** + * ClassesOfCategories IEnumCLSID (IEnumGUID) implementation + * + * This implementation is not thread-safe. The manager itself is, but + * I can't imagine a valid use of an enumerator in several threads. + */ +typedef struct +{ + const IEnumGUIDVtbl *lpVtbl; + LONG ref; + struct class_categories *categories; + HKEY key; + DWORD next_index; +} CLSID_IEnumGUIDImpl; + +static ULONG WINAPI COMCAT_CLSID_IEnumGUID_AddRef(LPENUMGUID iface) +{ + CLSID_IEnumGUIDImpl *This = (CLSID_IEnumGUIDImpl *)iface; + TRACE("\n"); + + return InterlockedIncrement(&This->ref); +} + +static HRESULT WINAPI COMCAT_CLSID_IEnumGUID_QueryInterface( + LPENUMGUID iface, + REFIID riid, + LPVOID *ppvObj) +{ + TRACE("\n\tIID:\t%s\n",debugstr_guid(riid)); + + if (ppvObj == NULL) return E_POINTER; + + if (IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IEnumGUID)) + { + *ppvObj = (LPVOID)iface; + COMCAT_CLSID_IEnumGUID_AddRef(iface); + return S_OK; + } + + return E_NOINTERFACE; +} + +static ULONG WINAPI COMCAT_CLSID_IEnumGUID_Release(LPENUMGUID iface) +{ + CLSID_IEnumGUIDImpl *This = (CLSID_IEnumGUIDImpl *)iface; + ULONG ref; + + TRACE("\n"); + + ref = InterlockedDecrement(&This->ref); + if (ref == 0) { + if (This->key) RegCloseKey(This->key); + HeapFree(GetProcessHeap(), 0, (LPVOID)This->categories); + HeapFree(GetProcessHeap(), 0, This); + return 0; + } + return ref; +} + +static HRESULT WINAPI COMCAT_CLSID_IEnumGUID_Next( + LPENUMGUID iface, + ULONG celt, + GUID *rgelt, + ULONG *pceltFetched) +{ + CLSID_IEnumGUIDImpl *This = (CLSID_IEnumGUIDImpl *)iface; + ULONG fetched = 0; + + TRACE("\n"); + + if (rgelt == NULL) return E_POINTER; + + if (This->key) while (fetched < celt) { + LSTATUS res; + HRESULT hr; + WCHAR clsid[39]; + DWORD cName = 39; + HKEY subkey; + + res = RegEnumKeyExW(This->key, This->next_index, clsid, &cName, + NULL, NULL, NULL, NULL); + if (res != ERROR_SUCCESS && res != ERROR_MORE_DATA) break; + ++(This->next_index); + + hr = CLSIDFromString(clsid, rgelt); + if (FAILED(hr)) continue; + + res = RegOpenKeyExW(This->key, clsid, 0, KEY_READ, &subkey); + if (res != ERROR_SUCCESS) continue; + + hr = COMCAT_IsClassOfCategories(subkey, This->categories); + RegCloseKey(subkey); + if (hr != S_OK) continue; + + ++fetched; + ++rgelt; + } + + if (pceltFetched) *pceltFetched = fetched; + return fetched == celt ? S_OK : S_FALSE; +} + +static HRESULT WINAPI COMCAT_CLSID_IEnumGUID_Skip( + LPENUMGUID iface, + ULONG celt) +{ + CLSID_IEnumGUIDImpl *This = (CLSID_IEnumGUIDImpl *)iface; + + TRACE("\n"); + + This->next_index += celt; + FIXME("Never returns S_FALSE\n"); + return S_OK; +} + +static HRESULT WINAPI COMCAT_CLSID_IEnumGUID_Reset(LPENUMGUID iface) +{ + CLSID_IEnumGUIDImpl *This = (CLSID_IEnumGUIDImpl *)iface; + + TRACE("\n"); + + This->next_index = 0; + return S_OK; +} + +static HRESULT WINAPI COMCAT_CLSID_IEnumGUID_Clone( + LPENUMGUID iface, + IEnumGUID **ppenum) +{ + CLSID_IEnumGUIDImpl *This = (CLSID_IEnumGUIDImpl *)iface; + static const WCHAR keyname[] = { 'C', 'L', 'S', 'I', 'D', 0 }; + CLSID_IEnumGUIDImpl *new_this; + DWORD size; + + TRACE("\n"); + + if (ppenum == NULL) return E_POINTER; + + new_this = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(CLSID_IEnumGUIDImpl)); + if (new_this == NULL) return E_OUTOFMEMORY; + + new_this->lpVtbl = This->lpVtbl; + new_this->ref = 1; + size = HeapSize(GetProcessHeap(), 0, (LPVOID)This->categories); + new_this->categories = + HeapAlloc(GetProcessHeap(), 0, size); + if (new_this->categories == NULL) { + HeapFree(GetProcessHeap(), 0, new_this); + return E_OUTOFMEMORY; + } + memcpy((LPVOID)new_this->categories, This->categories, size); + /* FIXME: could we more efficiently use DuplicateHandle? */ + RegOpenKeyExW(HKEY_CLASSES_ROOT, keyname, 0, KEY_READ, &new_this->key); + new_this->next_index = This->next_index; + + *ppenum = (LPENUMGUID)new_this; + return S_OK; +} + +static const IEnumGUIDVtbl COMCAT_CLSID_IEnumGUID_Vtbl = +{ + COMCAT_CLSID_IEnumGUID_QueryInterface, + COMCAT_CLSID_IEnumGUID_AddRef, + COMCAT_CLSID_IEnumGUID_Release, + COMCAT_CLSID_IEnumGUID_Next, + COMCAT_CLSID_IEnumGUID_Skip, + COMCAT_CLSID_IEnumGUID_Reset, + COMCAT_CLSID_IEnumGUID_Clone +}; + +static LPENUMGUID COMCAT_CLSID_IEnumGUID_Construct(struct class_categories *categories) +{ + CLSID_IEnumGUIDImpl *This; + + This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(CLSID_IEnumGUIDImpl)); + if (This) { + static const WCHAR keyname[] = { 'C', 'L', 'S', 'I', 'D', 0 }; + + This->lpVtbl = &COMCAT_CLSID_IEnumGUID_Vtbl; + This->categories = categories; + RegOpenKeyExW(HKEY_CLASSES_ROOT, keyname, 0, KEY_READ, &This->key); + } + return (LPENUMGUID)This; +} + +/********************************************************************** + * CategoriesOfClass IEnumCATID (IEnumGUID) implementation + * + * This implementation is not thread-safe. The manager itself is, but + * I can't imagine a valid use of an enumerator in several threads. + */ +typedef struct +{ + const IEnumGUIDVtbl *lpVtbl; + LONG ref; + WCHAR keyname[68]; + HKEY key; + DWORD next_index; +} CATID_IEnumGUIDImpl; + +static ULONG WINAPI COMCAT_CATID_IEnumGUID_AddRef(LPENUMGUID iface) +{ + CATID_IEnumGUIDImpl *This = (CATID_IEnumGUIDImpl *)iface; + TRACE("\n"); + + return InterlockedIncrement(&This->ref); +} + +static HRESULT WINAPI COMCAT_CATID_IEnumGUID_QueryInterface( + LPENUMGUID iface, + REFIID riid, + LPVOID *ppvObj) +{ + TRACE("\n\tIID:\t%s\n",debugstr_guid(riid)); + + if (ppvObj == NULL) return E_POINTER; + + if (IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IEnumGUID)) + { + *ppvObj = (LPVOID)iface; + COMCAT_CATID_IEnumGUID_AddRef(iface); + return S_OK; + } + + return E_NOINTERFACE; +} + +static ULONG WINAPI COMCAT_CATID_IEnumGUID_Release(LPENUMGUID iface) +{ + CATID_IEnumGUIDImpl *This = (CATID_IEnumGUIDImpl *)iface; + ULONG ref; + + TRACE("\n"); + + ref = InterlockedDecrement(&This->ref); + if (ref == 0) { + if (This->key) RegCloseKey(This->key); + HeapFree(GetProcessHeap(), 0, This); + return 0; + } + return ref; +} + +static HRESULT WINAPI COMCAT_CATID_IEnumGUID_Next( + LPENUMGUID iface, + ULONG celt, + GUID *rgelt, + ULONG *pceltFetched) +{ + CATID_IEnumGUIDImpl *This = (CATID_IEnumGUIDImpl *)iface; + ULONG fetched = 0; + + TRACE("\n"); + + if (rgelt == NULL) return E_POINTER; + + if (This->key) while (fetched < celt) { + LSTATUS res; + HRESULT hr; + WCHAR catid[39]; + DWORD cName = 39; + + res = RegEnumKeyExW(This->key, This->next_index, catid, &cName, + NULL, NULL, NULL, NULL); + if (res != ERROR_SUCCESS && res != ERROR_MORE_DATA) break; + ++(This->next_index); + + hr = CLSIDFromString(catid, rgelt); + if (FAILED(hr)) continue; + + ++fetched; + ++rgelt; + } + + if (pceltFetched) *pceltFetched = fetched; + return fetched == celt ? S_OK : S_FALSE; +} + +static HRESULT WINAPI COMCAT_CATID_IEnumGUID_Skip( + LPENUMGUID iface, + ULONG celt) +{ + CATID_IEnumGUIDImpl *This = (CATID_IEnumGUIDImpl *)iface; + + TRACE("\n"); + + This->next_index += celt; + FIXME("Never returns S_FALSE\n"); + return S_OK; +} + +static HRESULT WINAPI COMCAT_CATID_IEnumGUID_Reset(LPENUMGUID iface) +{ + CATID_IEnumGUIDImpl *This = (CATID_IEnumGUIDImpl *)iface; + + TRACE("\n"); + + This->next_index = 0; + return S_OK; +} + +static HRESULT WINAPI COMCAT_CATID_IEnumGUID_Clone( + LPENUMGUID iface, + IEnumGUID **ppenum) +{ + CATID_IEnumGUIDImpl *This = (CATID_IEnumGUIDImpl *)iface; + CATID_IEnumGUIDImpl *new_this; + + TRACE("\n"); + + if (ppenum == NULL) return E_POINTER; + + new_this = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(CATID_IEnumGUIDImpl)); + if (new_this == NULL) return E_OUTOFMEMORY; + + new_this->lpVtbl = This->lpVtbl; + new_this->ref = 1; + lstrcpyW(new_this->keyname, This->keyname); + /* FIXME: could we more efficiently use DuplicateHandle? */ + RegOpenKeyExW(HKEY_CLASSES_ROOT, new_this->keyname, 0, KEY_READ, &new_this->key); + new_this->next_index = This->next_index; + + *ppenum = (LPENUMGUID)new_this; + return S_OK; +} + +static const IEnumGUIDVtbl COMCAT_CATID_IEnumGUID_Vtbl = +{ + COMCAT_CATID_IEnumGUID_QueryInterface, + COMCAT_CATID_IEnumGUID_AddRef, + COMCAT_CATID_IEnumGUID_Release, + COMCAT_CATID_IEnumGUID_Next, + COMCAT_CATID_IEnumGUID_Skip, + COMCAT_CATID_IEnumGUID_Reset, + COMCAT_CATID_IEnumGUID_Clone +}; + +static LPENUMGUID COMCAT_CATID_IEnumGUID_Construct( + REFCLSID rclsid, LPCWSTR postfix) +{ + CATID_IEnumGUIDImpl *This; + + This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(CATID_IEnumGUIDImpl)); + if (This) { + WCHAR prefix[6] = { 'C', 'L', 'S', 'I', 'D', '\\' }; + + This->lpVtbl = &COMCAT_CATID_IEnumGUID_Vtbl; + memcpy(This->keyname, prefix, sizeof(prefix)); + StringFromGUID2(rclsid, This->keyname + 6, 39); + lstrcpyW(This->keyname + 44, postfix); + RegOpenKeyExW(HKEY_CLASSES_ROOT, This->keyname, 0, KEY_READ, &This->key); + } + return (LPENUMGUID)This; +} diff --git a/reactos/dll/win32/ole32/compobj.c b/reactos/dll/win32/ole32/compobj.c index 69f42fcc997..37907eccca1 100644 --- a/reactos/dll/win32/ole32/compobj.c +++ b/reactos/dll/win32/ole32/compobj.c @@ -34,9 +34,6 @@ * - Implement the OXID resolver so we don't need magic endpoint names for * clients and servers to meet up * - * - Make all ole interface marshaling use NDR to be wire compatible with - * native DCOM - * */ #include "config.h" @@ -66,14 +63,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); -HINSTANCE OLE32_hInstance = 0; /* FIXME: make static ... */ +HINSTANCE OLE32_hInstance = 0; #define ARRAYSIZE(array) (sizeof(array)/sizeof((array)[0])) /**************************************************************************** * This section defines variables internal to the COM module. - * - * TODO: Most of these things will have to be made thread-safe. */ static HRESULT COM_GetRegisteredClassObject(const struct apartment *apt, REFCLSID rclsid, @@ -116,7 +111,7 @@ static LONG s_COMServerProcessReferences = 0; * objects. * * TODO: Make this data structure aware of inter-process communication. This - * means that parts of this will be exported to the Wine Server. + * means that parts of this will be exported to rpcss. */ typedef struct tagRegisteredClass { @@ -209,8 +204,8 @@ static void COMPOBJ_InitProcess( void ) * following class is created. The *caller* of CoMarshalInterface (i.e., the * application) is responsible for pumping the message loop in that thread. * The WM_USER messages which point to the RPCs are then dispatched to - * COM_AptWndProc by the user's code from the apartment in which the interface - * was unmarshalled. + * apartment_wndproc by the user's code from the apartment in which the + * interface was unmarshalled. */ memset(&wclass, 0, sizeof(wclass)); wclass.lpfnWndProc = apartment_wndproc; @@ -560,6 +555,8 @@ struct host_thread_params HWND apartment_hwnd; }; +/* thread for hosting an object to allow an object to appear to be created in + * an apartment with an incompatible threading model */ static DWORD CALLBACK apartment_hostobject_thread(LPVOID p) { struct host_thread_params *params = p; @@ -609,7 +606,12 @@ static DWORD CALLBACK apartment_hostobject_thread(LPVOID p) return S_OK; } -static HRESULT apartment_hostobject_in_hostapt(struct apartment *apt, BOOL multi_threaded, BOOL main_apartment, HKEY hkeydll, REFCLSID rclsid, REFIID riid, void **ppv) +/* finds or creates a host apartment, creates the object inside it and returns + * a proxy to it so that the object can be used in the apartment of the + * caller of this function */ +static HRESULT apartment_hostobject_in_hostapt( + struct apartment *apt, BOOL multi_threaded, BOOL main_apartment, + HKEY hkeydll, REFCLSID rclsid, REFIID riid, void **ppv) { struct host_object_params params; HWND apartment_hwnd = NULL; @@ -715,6 +717,8 @@ static HRESULT apartment_hostobject_in_hostapt(struct apartment *apt, BOOL multi return hr; } +/* create a window for the apartment or return the current one if one has + * already been created */ HRESULT apartment_createwindowifneeded(struct apartment *apt) { if (apt->multi_threaded) @@ -738,6 +742,7 @@ HRESULT apartment_createwindowifneeded(struct apartment *apt) return S_OK; } +/* retrieves the window for the main- or apartment-threaded apartment */ HWND apartment_getwindow(const struct apartment *apt) { assert(!apt->multi_threaded); @@ -750,6 +755,8 @@ void apartment_joinmta(void) COM_CurrentInfo()->apt = MTA; } +/* gets the specified class object by loading the appropriate DLL, if + * necessary and calls the DllGetClassObject function for the DLL */ static HRESULT apartment_getclassobject(struct apartment *apt, LPCWSTR dllpath, BOOL apartment_threaded, REFCLSID rclsid, REFIID riid, void **ppv) @@ -822,6 +829,8 @@ static HRESULT apartment_getclassobject(struct apartment *apt, LPCWSTR dllpath, return hr; } +/* frees unused libraries loaded by apartment_getclassobject by calling the + * DLL's DllCanUnloadNow entry point */ static void apartment_freeunusedlibraries(struct apartment *apt, DWORD delay) { struct apartment_loaded_dll *entry, *next; @@ -834,6 +843,10 @@ static void apartment_freeunusedlibraries(struct apartment *apt, DWORD delay) if (real_delay == INFINITE) { + /* DLLs that return multi-threaded objects aren't unloaded + * straight away to cope for programs that have races between + * last object destruction and threads in the DLLs that haven't + * finished, despite DllCanUnloadNow returning S_OK */ if (entry->multi_threaded) real_delay = 10 * 60 * 1000; /* 10 minutes */ else diff --git a/reactos/dll/win32/ole32/compobj_private.h b/reactos/dll/win32/ole32/compobj_private.h index fbfe37c2b9c..81d591ea3fb 100644 --- a/reactos/dll/win32/ole32/compobj_private.h +++ b/reactos/dll/win32/ole32/compobj_private.h @@ -4,7 +4,7 @@ * Copyright 1999 Francis Beaudet * Copyright 1999 Sylvain St-Germain * Copyright 2002 Marcus Meissner - * Copyright 2003 Ove Kеven, TransGaming Technologies + * Copyright 2003 Ove KГҐven, TransGaming Technologies * Copyright 2004 Mike Hearn, Rob Shearman, CodeWeavers Inc * * This library is free software; you can redistribute it and/or diff --git a/reactos/dll/win32/ole32/dcom.idl b/reactos/dll/win32/ole32/dcom.idl index d4abf43e721..a1c0dcd5689 100644 --- a/reactos/dll/win32/ole32/dcom.idl +++ b/reactos/dll/win32/ole32/dcom.idl @@ -1,5 +1,5 @@ /* - * Copyright 2003 Ove Kеven, TransGaming Technologies + * Copyright 2003 Ove KГҐven, TransGaming Technologies * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/reactos/dll/win32/ole32/defaulthandler.c b/reactos/dll/win32/ole32/defaulthandler.c index afacc510dd7..6844ee86b3a 100644 --- a/reactos/dll/win32/ole32/defaulthandler.c +++ b/reactos/dll/win32/ole32/defaulthandler.c @@ -64,6 +64,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); +enum storage_state +{ + storage_state_uninitialised, + storage_state_initialised, + storage_state_loaded +}; + /**************************************************************************** * DefaultHandler * @@ -119,16 +126,14 @@ struct DefaultHandler /* connection cookie for the advise on the delegate OLE object */ DWORD dwAdvConn; + + /* storage passed to Load or InitNew */ + IStorage *storage; + enum storage_state storage_state; }; typedef struct DefaultHandler DefaultHandler; -/* - * Here, I define utility functions to help with the casting of the - * "This" parameter. - * There is a version to accommodate all of the VTables implemented - * by this object. - */ static inline DefaultHandler *impl_from_IOleObject( IOleObject *iface ) { return (DefaultHandler *)((char*)iface - FIELD_OFFSET(DefaultHandler, lpVtbl)); @@ -186,7 +191,6 @@ static HRESULT WINAPI DefaultHandler_NDIUnknown_QueryInterface( { DefaultHandler *This = impl_from_NDIUnknown(iface); - /* Perform a sanity check on the parameters. */ if (!ppvObject) return E_INVALIDARG; @@ -258,7 +262,6 @@ static ULONG WINAPI DefaultHandler_NDIUnknown_Release( DefaultHandler *This = impl_from_NDIUnknown(iface); ULONG ref; - /* Decrease the reference count on this object. */ ref = InterlockedDecrement(&This->ref); if (!ref) DefaultHandler_Destroy(This); @@ -361,7 +364,6 @@ static HRESULT WINAPI DefaultHandler_GetClientSite( { DefaultHandler *This = impl_from_IOleObject(iface); - /* Sanity check. */ if (!ppClientSite) return E_POINTER; @@ -402,7 +404,6 @@ static HRESULT WINAPI DefaultHandler_SetHostNames( HeapFree( GetProcessHeap(), 0, This->containerObj ); This->containerObj = NULL; - /* Copy the string supplied. */ if (szContainerApp) { if ((This->containerApp = HeapAlloc( GetProcessHeap(), 0, @@ -419,8 +420,8 @@ static HRESULT WINAPI DefaultHandler_SetHostNames( return S_OK; } -/* undos the work done by DefaultHandler_Run */ -static void WINAPI DefaultHandler_Stop(DefaultHandler *This) +/* undoes the work done by DefaultHandler_Run */ +static void DefaultHandler_Stop(DefaultHandler *This) { if (!object_is_running(This)) return; @@ -631,8 +632,15 @@ static HRESULT WINAPI DefaultHandler_EnumVerbs( static HRESULT WINAPI DefaultHandler_Update( IOleObject* iface) { - FIXME(": Stub\n"); - return E_NOTIMPL; + DefaultHandler *This = impl_from_IOleObject(iface); + TRACE("(%p)\n", iface); + + if (!object_is_running(This)) + { + FIXME("Should run object\n"); + return E_NOTIMPL; + } + return IOleObject_Update(This->pOleDelegate); } /************************************************************************ @@ -645,9 +653,13 @@ static HRESULT WINAPI DefaultHandler_Update( static HRESULT WINAPI DefaultHandler_IsUpToDate( IOleObject* iface) { - TRACE("(%p)\n", iface); + DefaultHandler *This = impl_from_IOleObject(iface); + TRACE("(%p)\n", iface); - return OLE_E_NOTRUNNING; + if (object_is_running(This)) + return IOleObject_IsUpToDate(This->pOleDelegate); + + return OLE_E_NOTRUNNING; } /************************************************************************ @@ -668,7 +680,6 @@ static HRESULT WINAPI DefaultHandler_GetUserClassID( if (object_is_running(This)) return IOleObject_GetUserClassID(This->pOleDelegate, pClsid); - /* Sanity check. */ if (!pClsid) return E_POINTER; @@ -693,6 +704,8 @@ static HRESULT WINAPI DefaultHandler_GetUserType( DefaultHandler *This = impl_from_IOleObject(iface); TRACE("(%p, %d, %p)\n", iface, dwFormOfType, pszUserType); + if (object_is_running(This)) + return IOleObject_GetUserType(This->pOleDelegate, dwFormOfType, pszUserType); return OleRegGetUserType(&This->clsid, dwFormOfType, pszUserType); } @@ -764,9 +777,6 @@ static HRESULT WINAPI DefaultHandler_GetExtent( targetDevice, psizel); - /* - * Cleanup - */ IViewObject2_Release(cacheView); return hres; @@ -845,7 +855,6 @@ static HRESULT WINAPI DefaultHandler_EnumAdvise( TRACE("(%p, %p)\n", iface, ppenumAdvise); - /* Sanity check */ if (!ppenumAdvise) return E_POINTER; @@ -1202,7 +1211,6 @@ static HRESULT WINAPI DefaultHandler_EnumDAdvise( TRACE("(%p, %p)\n", iface, ppenumAdvise); - /* Sanity check */ if (!ppenumAdvise) return E_POINTER; @@ -1305,7 +1313,12 @@ static HRESULT WINAPI DefaultHandler_Run( IOleObject_QueryInterface(This->pOleDelegate, &IID_IPersistStorage, (void **)&This->pPSDelegate); if (This->pPSDelegate) - hr = IPersistStorage_InitNew(This->pPSDelegate, NULL); + { + if(This->storage_state == storage_state_initialised) + hr = IPersistStorage_InitNew(This->pPSDelegate, This->storage); + else if(This->storage_state == storage_state_loaded) + hr = IPersistStorage_Load(This->pPSDelegate, This->storage); + } } if (SUCCEEDED(hr) && This->containerApp) @@ -1507,9 +1520,17 @@ static HRESULT WINAPI DefaultHandler_IPersistStorage_GetClassID( IPersistStorage* iface, CLSID* clsid) { - DefaultHandler *This = impl_from_IPersistStorage(iface); + DefaultHandler *This = impl_from_IPersistStorage(iface); + HRESULT hr; - return IPersistStorage_GetClassID(This->dataCache_PersistStg, clsid); + TRACE("(%p)->(%p)\n", iface, clsid); + + if(object_is_running(This)) + hr = IPersistStorage_GetClassID(This->pPSDelegate, clsid); + else + hr = IPersistStorage_GetClassID(This->dataCache_PersistStg, clsid); + + return hr; } /************************************************************************ @@ -1519,9 +1540,106 @@ static HRESULT WINAPI DefaultHandler_IPersistStorage_GetClassID( static HRESULT WINAPI DefaultHandler_IPersistStorage_IsDirty( IPersistStorage* iface) { - DefaultHandler *This = impl_from_IPersistStorage(iface); + DefaultHandler *This = impl_from_IPersistStorage(iface); + HRESULT hr; - return IPersistStorage_IsDirty(This->dataCache_PersistStg); + TRACE("(%p)\n", iface); + + hr = IPersistStorage_IsDirty(This->dataCache_PersistStg); + if(hr != S_FALSE) return hr; + + if(object_is_running(This)) + hr = IPersistStorage_IsDirty(This->pPSDelegate); + + return hr; +} + +/*********************************************************************** + * init_ole_stream + * + * Creates the '\1Ole' stream. + * The format of this stream is as follows: + * + * DWORD Version == 0x02000001 + * DWORD Flags - low bit set indicates the object is a link otherwise it's embedded. + * DWORD LinkupdateOption - [MS-OLEDS describes this as an implementation specific hint + * supplied by the app that creates the data structure. May be + * ignored on processing]. + * + * DWORD Reserved == 0 + * DWORD MonikerStreamSize - size of the rest of the data (ie CLSID + moniker stream data). + * CLSID clsid - class id of object capable of processing the moniker + * BYTE data[] - moniker data for a link + */ + +static const WCHAR OleStream[] = {1,'O','l','e',0}; +typedef struct +{ + DWORD version; + DWORD flags; + DWORD link_update_opt; + DWORD res; + DWORD moniker_size; +} ole_stream_header_t; +static const DWORD ole_stream_version = 0x02000001; + +static void init_ole_stream(IStorage *storage) +{ + HRESULT hr; + IStream *stream; + + hr = IStorage_CreateStream(storage, OleStream, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &stream); + if(SUCCEEDED(hr)) + { + DWORD written; + ole_stream_header_t header; + + header.version = ole_stream_version; + header.flags = 0; + header.link_update_opt = 0; + header.res = 0; + header.moniker_size = 0; + + IStream_Write(stream, &header, sizeof(header), &written); + IStream_Release(stream); + } + return; +} + +static HRESULT load_ole_stream(DefaultHandler *This, IStorage *storage) +{ + IStream *stream; + HRESULT hr; + + hr = IStorage_OpenStream(storage, OleStream, NULL, STGM_READ | STGM_SHARE_EXCLUSIVE, 0, &stream); + + if(SUCCEEDED(hr)) + { + DWORD read; + ole_stream_header_t header; + + hr = IStream_Read(stream, &header, sizeof(header), &read); + if(hr == S_OK && read == sizeof(header) && header.version == ole_stream_version) + { + if(header.flags & 1) + { + /* FIXME: Read the moniker and deal with the link */ + FIXME("Linked objects are not supported yet\n"); + } + } + else + { + WARN("Incorrect OleStream header\n"); + hr = DV_E_CLIPFORMAT; + } + IStream_Release(stream); + } + else + { + init_ole_stream(storage); + hr = S_OK; + } + return hr; } /************************************************************************ @@ -1532,9 +1650,25 @@ static HRESULT WINAPI DefaultHandler_IPersistStorage_InitNew( IPersistStorage* iface, IStorage* pStg) { - DefaultHandler *This = impl_from_IPersistStorage(iface); + DefaultHandler *This = impl_from_IPersistStorage(iface); + HRESULT hr; - return IPersistStorage_InitNew(This->dataCache_PersistStg, pStg); + TRACE("(%p)->(%p)\n", iface, pStg); + init_ole_stream(pStg); + + hr = IPersistStorage_InitNew(This->dataCache_PersistStg, pStg); + + if(SUCCEEDED(hr) && object_is_running(This)) + hr = IPersistStorage_InitNew(This->pPSDelegate, pStg); + + if(SUCCEEDED(hr)) + { + IStorage_AddRef(pStg); + This->storage = pStg; + This->storage_state = storage_state_initialised; + } + + return hr; } @@ -1546,9 +1680,26 @@ static HRESULT WINAPI DefaultHandler_IPersistStorage_Load( IPersistStorage* iface, IStorage* pStg) { - DefaultHandler *This = impl_from_IPersistStorage(iface); + DefaultHandler *This = impl_from_IPersistStorage(iface); + HRESULT hr; - return IPersistStorage_Load(This->dataCache_PersistStg, pStg); + TRACE("(%p)->(%p)\n", iface, pStg); + + hr = load_ole_stream(This, pStg); + + if(SUCCEEDED(hr)) + hr = IPersistStorage_Load(This->dataCache_PersistStg, pStg); + + if(SUCCEEDED(hr) && object_is_running(This)) + hr = IPersistStorage_Load(This->pPSDelegate, pStg); + + if(SUCCEEDED(hr)) + { + IStorage_AddRef(pStg); + This->storage = pStg; + This->storage_state = storage_state_loaded; + } + return hr; } @@ -1559,11 +1710,18 @@ static HRESULT WINAPI DefaultHandler_IPersistStorage_Load( static HRESULT WINAPI DefaultHandler_IPersistStorage_Save( IPersistStorage* iface, IStorage* pStgSave, - BOOL fSaveAsLoad) + BOOL fSameAsLoad) { - DefaultHandler *This = impl_from_IPersistStorage(iface); + DefaultHandler *This = impl_from_IPersistStorage(iface); + HRESULT hr; - return IPersistStorage_Save(This->dataCache_PersistStg, pStgSave, fSaveAsLoad); + TRACE("(%p)->(%p, %d)\n", iface, pStgSave, fSameAsLoad); + + hr = IPersistStorage_Save(This->dataCache_PersistStg, pStgSave, fSameAsLoad); + if(SUCCEEDED(hr) && object_is_running(This)) + hr = IPersistStorage_Save(This->pPSDelegate, pStgSave, fSameAsLoad); + + return hr; } @@ -1575,9 +1733,25 @@ static HRESULT WINAPI DefaultHandler_IPersistStorage_SaveCompleted( IPersistStorage* iface, IStorage* pStgNew) { - DefaultHandler *This = impl_from_IPersistStorage(iface); + DefaultHandler *This = impl_from_IPersistStorage(iface); + HRESULT hr; - return IPersistStorage_SaveCompleted(This->dataCache_PersistStg, pStgNew); + TRACE("(%p)->(%p)\n", iface, pStgNew); + + hr = IPersistStorage_SaveCompleted(This->dataCache_PersistStg, pStgNew); + + if(SUCCEEDED(hr) && object_is_running(This)) + hr = IPersistStorage_SaveCompleted(This->pPSDelegate, pStgNew); + + if(pStgNew) + { + IStorage_AddRef(pStgNew); + if(This->storage) IStorage_Release(This->storage); + This->storage = pStgNew; + This->storage_state = storage_state_loaded; + } + + return hr; } @@ -1588,9 +1762,21 @@ static HRESULT WINAPI DefaultHandler_IPersistStorage_SaveCompleted( static HRESULT WINAPI DefaultHandler_IPersistStorage_HandsOffStorage( IPersistStorage* iface) { - DefaultHandler *This = impl_from_IPersistStorage(iface); + DefaultHandler *This = impl_from_IPersistStorage(iface); + HRESULT hr; - return IPersistStorage_HandsOffStorage(This->dataCache_PersistStg); + TRACE("(%p)\n", iface); + + hr = IPersistStorage_HandsOffStorage(This->dataCache_PersistStg); + + if(SUCCEEDED(hr) && object_is_running(This)) + hr = IPersistStorage_HandsOffStorage(This->pPSDelegate); + + if(This->storage) IStorage_Release(This->storage); + This->storage = NULL; + This->storage_state = storage_state_uninitialised; + + return hr; } @@ -1696,9 +1882,6 @@ static DefaultHandler* DefaultHandler_Construct( DefaultHandler* This = NULL; HRESULT hr; - /* - * Allocate space for the object. - */ This = HeapAlloc(GetProcessHeap(), 0, sizeof(DefaultHandler)); if (!This) @@ -1741,9 +1924,7 @@ static DefaultHandler* DefaultHandler_Construct( hr = IUnknown_QueryInterface(This->dataCache, &IID_IPersistStorage, (void**)&This->dataCache_PersistStg); if(FAILED(hr)) ERR("Unexpected error creating data cache\n"); - /* - * Initialize the other data members of the class. - */ + This->clsid = *clsid; This->clientSite = NULL; This->oleAdviseHolder = NULL; @@ -1755,6 +1936,8 @@ static DefaultHandler* DefaultHandler_Construct( This->pDataDelegate = NULL; This->dwAdvConn = 0; + This->storage = NULL; + This->storage_state = storage_state_uninitialised; return This; } @@ -1765,13 +1948,11 @@ static void DefaultHandler_Destroy( /* release delegates */ DefaultHandler_Stop(This); - /* Free the strings idenfitying the object */ HeapFree( GetProcessHeap(), 0, This->containerApp ); This->containerApp = NULL; HeapFree( GetProcessHeap(), 0, This->containerObj ); This->containerObj = NULL; - /* Release our reference to the data cache. */ if (This->dataCache) { IPersistStorage_Release(This->dataCache_PersistStg); @@ -1780,28 +1961,30 @@ static void DefaultHandler_Destroy( This->dataCache = NULL; } - /* Same thing for the client site. */ if (This->clientSite) { IOleClientSite_Release(This->clientSite); This->clientSite = NULL; } - /* And the advise holder. */ if (This->oleAdviseHolder) { IOleAdviseHolder_Release(This->oleAdviseHolder); This->oleAdviseHolder = NULL; } - /* And the data advise holder. */ if (This->dataAdviseHolder) { IDataAdviseHolder_Release(This->dataAdviseHolder); This->dataAdviseHolder = NULL; } - /* Free the actual default handler structure. */ + if (This->storage) + { + IStorage_Release(This->storage); + This->storage = NULL; + } + HeapFree(GetProcessHeap(), 0, This); } @@ -1819,9 +2002,6 @@ HRESULT WINAPI OleCreateDefaultHandler( TRACE("(%s, %p, %s, %p)\n", debugstr_guid(clsid), pUnkOuter, debugstr_guid(riid), ppvObj); - /* - * Sanity check - */ if (!ppvObj) return E_POINTER; diff --git a/reactos/dll/win32/ole32/filemoniker.c b/reactos/dll/win32/ole32/filemoniker.c index 74c867a2a8e..3dae13970aa 100644 --- a/reactos/dll/win32/ole32/filemoniker.c +++ b/reactos/dll/win32/ole32/filemoniker.c @@ -358,12 +358,12 @@ FileMonikerImpl_Save(IMoniker* iface, IStream* pStm, BOOL fClearDirty) /* write a 0 WORD */ res=IStream_Write(pStm,&ZERO,sizeof(WORD),NULL); - if (!SUCCEEDED(res)) return res; + if (FAILED(res)) return res; /* write length of filePath string ( 0 included )*/ bytesA = WideCharToMultiByte( CP_ACP, 0, filePathW, -1, NULL, 0, NULL, NULL ); res=IStream_Write(pStm,&bytesA,sizeof(DWORD),NULL); - if (!SUCCEEDED(res)) return res; + if (FAILED(res)) return res; /* write A string (with '\0') */ filePathA=HeapAlloc(GetProcessHeap(),0,bytesA); @@ -372,17 +372,17 @@ FileMonikerImpl_Save(IMoniker* iface, IStream* pStm, BOOL fClearDirty) WideCharToMultiByte( CP_ACP, 0, filePathW, -1, filePathA, bytesA, NULL, &bUsedDefault); res=IStream_Write(pStm,filePathA,bytesA,NULL); HeapFree(GetProcessHeap(),0,filePathA); - if (!SUCCEEDED(res)) return res; + if (FAILED(res)) return res; /* write a DWORD 0xDEADFFFF */ res=IStream_Write(pStm,&DEADFFFF,sizeof(DWORD),NULL); - if (!SUCCEEDED(res)) return res; + if (FAILED(res)) return res; /* write 5 zero DWORDs */ for(i=0;i<5;i++) { res=IStream_Write(pStm,&ZERO,sizeof(DWORD),NULL); - if (!SUCCEEDED(res)) return res; + if (FAILED(res)) return res; } /* Write the wide version if: @@ -414,16 +414,16 @@ FileMonikerImpl_Save(IMoniker* iface, IStream* pStm, BOOL fClearDirty) /* write bytes needed for the filepathW (without 0) + 6 */ bytesW = len*sizeof(WCHAR) + 6; res=IStream_Write(pStm,&bytesW,sizeof(DWORD),NULL); - if (!SUCCEEDED(res)) return res; + if (FAILED(res)) return res; /* try again, without the extra 6 */ bytesW -= 6; res=IStream_Write(pStm,&bytesW,sizeof(DWORD),NULL); - if (!SUCCEEDED(res)) return res; + if (FAILED(res)) return res; /* write a WORD 3 */ res=IStream_Write(pStm,&THREE,sizeof(WORD),NULL); - if (!SUCCEEDED(res)) return res; + if (FAILED(res)) return res; /* write W string (no 0) */ res=IStream_Write(pStm,filePathW,bytesW,NULL); diff --git a/reactos/dll/win32/ole32/moniker.c b/reactos/dll/win32/ole32/moniker.c index a4d2a5efc59..4e5646279b2 100644 --- a/reactos/dll/win32/ole32/moniker.c +++ b/reactos/dll/win32/ole32/moniker.c @@ -19,14 +19,11 @@ * 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 - * - * TODO: - * - IRunningObjectTable should work interprocess, but currently doesn't. - * Native (on Win2k at least) uses an undocumented RPC interface, IROT, to - * communicate with RPCSS which contains the table of marshalled data. */ -#include +#include "config.h" +#include "wine/port.h" + #include #include @@ -42,25 +39,33 @@ #include "wine/list.h" #include "wine/debug.h" #include "wine/unicode.h" +#include "wine/exception.h" #include "compobj_private.h" #include "moniker.h" +#include "irot.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); /* see MSDN docs for IROTData::GetComparisonData, which states what this - * constant is (http://msdn2.microsoft.com/en-us/library/ms693773.aspx) */ + * constant is + */ #define MAX_COMPARISON_DATA 2048 +static LONG WINAPI rpc_filter(EXCEPTION_POINTERS *eptr) +{ + return I_RpcExceptionFilter(eptr->ExceptionRecord->ExceptionCode); +} + /* define the structure of the running object table elements */ struct rot_entry { struct list entry; - MInterfacePointer* object; /* marshaled running object*/ - MInterfacePointer* moniker; /* marshaled moniker that identifies this object */ - MInterfacePointer* moniker_data; /* moniker comparison data that identifies this object */ + InterfaceData* object; /* marshaled running object*/ + MonikerComparisonData* moniker_data; /* moniker comparison data that identifies this object */ DWORD cookie; /* cookie identifying this object */ FILETIME last_modified; + IrotContextHandle ctxt_handle; }; /* define the RunningObjectTableImpl structure */ @@ -74,16 +79,7 @@ typedef struct RunningObjectTableImpl } RunningObjectTableImpl; static RunningObjectTableImpl* runningObjectTableInstance = NULL; - - - -static inline HRESULT WINAPI -IrotRegister(DWORD *cookie) -{ - static LONG last_cookie = 1; - *cookie = InterlockedIncrement(&last_cookie); - return S_OK; -} +static IrotHandle irot_handle; /* define the EnumMonikerImpl structure */ typedef struct EnumMonikerImpl @@ -91,17 +87,79 @@ typedef struct EnumMonikerImpl const IEnumMonikerVtbl *lpVtbl; LONG ref; - MInterfacePointer **monikers; - ULONG moniker_count; + InterfaceList *moniker_list; ULONG pos; } EnumMonikerImpl; /* IEnumMoniker Local functions*/ -static HRESULT WINAPI EnumMonikerImpl_CreateEnumROTMoniker(MInterfacePointer **monikers, - ULONG moniker_count, ULONG pos, IEnumMoniker **ppenumMoniker); +static HRESULT WINAPI EnumMonikerImpl_CreateEnumROTMoniker(InterfaceList *moniker_list, + ULONG pos, IEnumMoniker **ppenumMoniker); -static HRESULT create_stream_on_mip_ro(const MInterfacePointer *mip, IStream **stream) +static IrotHandle get_irot_handle(void) +{ + if (!irot_handle) + { + RPC_STATUS status; + RPC_WSTR binding; + IrotHandle new_handle; + unsigned short ncacn_np[] = IROT_PROTSEQ; + unsigned short endpoint[] = IROT_ENDPOINT; + status = RpcStringBindingComposeW(NULL, ncacn_np, NULL, endpoint, NULL, &binding); + if (status == RPC_S_OK) + { + status = RpcBindingFromStringBindingW(binding, &new_handle); + RpcStringFreeW(&binding); + } + if (status != RPC_S_OK) + return NULL; + if (InterlockedCompareExchangePointer(&irot_handle, new_handle, NULL)) + /* another thread beat us to it */ + RpcBindingFree(&new_handle); + } + return irot_handle; +} + +static BOOL start_rpcss(void) +{ + PROCESS_INFORMATION pi; + STARTUPINFOW si; + static WCHAR cmd[6]; + static const WCHAR rpcss[] = {'r','p','c','s','s',0}; + BOOL rslt; + + TRACE("\n"); + + ZeroMemory(&pi, sizeof(PROCESS_INFORMATION)); + ZeroMemory(&si, sizeof(STARTUPINFOA)); + si.cb = sizeof(STARTUPINFOA); + + memcpy(cmd, rpcss, sizeof(rpcss)); + + rslt = CreateProcessW( + NULL, /* executable */ + cmd, /* command line */ + NULL, /* process security attributes */ + NULL, /* primary thread security attributes */ + FALSE, /* inherit handles */ + 0, /* creation flags */ + NULL, /* use parent's environment */ + NULL, /* use parent's current directory */ + &si, /* STARTUPINFO pointer */ + &pi /* PROCESS_INFORMATION */ + ); + + if (rslt) + { + CloseHandle(pi.hProcess); + CloseHandle(pi.hThread); + Sleep(100); + } + + return rslt; +} + +static HRESULT create_stream_on_mip_ro(const InterfaceData *mip, IStream **stream) { HGLOBAL hglobal = GlobalAlloc(0, mip->ulCntData); void *pv = GlobalLock(hglobal); @@ -112,7 +170,33 @@ static HRESULT create_stream_on_mip_ro(const MInterfacePointer *mip, IStream **s static inline void rot_entry_delete(struct rot_entry *rot_entry) { - /* FIXME: revoke entry from rpcss's copy of the ROT */ + if (rot_entry->cookie) + { + InterfaceData *object = NULL; + InterfaceData *moniker = NULL; + __TRY + { + IrotRevoke(get_irot_handle(), rot_entry->cookie, + &rot_entry->ctxt_handle, &object, &moniker); + } + __EXCEPT(rpc_filter) + { + } + __ENDTRY + MIDL_user_free(object); + if (moniker) + { + IStream *stream; + HRESULT hr; + hr = create_stream_on_mip_ro(moniker, &stream); + if (hr == S_OK) + { + CoReleaseMarshalData(stream); + IUnknown_Release(stream); + } + } + MIDL_user_free(moniker); + } if (rot_entry->object) { IStream *stream; @@ -124,25 +208,13 @@ static inline void rot_entry_delete(struct rot_entry *rot_entry) IUnknown_Release(stream); } } - if (rot_entry->moniker) - { - IStream *stream; - HRESULT hr; - hr = create_stream_on_mip_ro(rot_entry->moniker, &stream); - if (hr == S_OK) - { - CoReleaseMarshalData(stream); - IUnknown_Release(stream); - } - } HeapFree(GetProcessHeap(), 0, rot_entry->object); - HeapFree(GetProcessHeap(), 0, rot_entry->moniker); HeapFree(GetProcessHeap(), 0, rot_entry->moniker_data); HeapFree(GetProcessHeap(), 0, rot_entry); } /* moniker_data must be freed with HeapFree when no longer in use */ -static HRESULT get_moniker_comparison_data(IMoniker *pMoniker, MInterfacePointer **moniker_data) +static HRESULT get_moniker_comparison_data(IMoniker *pMoniker, MonikerComparisonData **moniker_data) { HRESULT hr; IROTData *pROTData = NULL; @@ -150,8 +222,14 @@ static HRESULT get_moniker_comparison_data(IMoniker *pMoniker, MInterfacePointer if (SUCCEEDED(hr)) { ULONG size = MAX_COMPARISON_DATA; - *moniker_data = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(MInterfacePointer, abData[size])); + *moniker_data = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(MonikerComparisonData, abData[size])); + if (!*moniker_data) + { + IROTData_Release(pROTData); + return E_OUTOFMEMORY; + } hr = IROTData_GetComparisonData(pROTData, (*moniker_data)->abData, size, &size); + IROTData_Release(pROTData); if (hr != S_OK) { ERR("Failed to copy comparison data into buffer, hr = 0x%08x\n", hr); @@ -185,7 +263,7 @@ static HRESULT get_moniker_comparison_data(IMoniker *pMoniker, MInterfacePointer len = strlenW(pszDisplayName); *moniker_data = HeapAlloc(GetProcessHeap(), 0, - FIELD_OFFSET(MInterfacePointer, abData[sizeof(CLSID) + (len+1)*sizeof(WCHAR)])); + FIELD_OFFSET(MonikerComparisonData, abData[sizeof(CLSID) + (len+1)*sizeof(WCHAR)])); if (!*moniker_data) { CoTaskMemFree(pszDisplayName); @@ -195,6 +273,7 @@ static HRESULT get_moniker_comparison_data(IMoniker *pMoniker, MInterfacePointer memcpy(&(*moniker_data)->abData[0], &clsid, sizeof(clsid)); memcpy(&(*moniker_data)->abData[sizeof(clsid)], pszDisplayName, (len+1)*sizeof(WCHAR)); + CoTaskMemFree(pszDisplayName); } return S_OK; } @@ -267,6 +346,7 @@ static HRESULT WINAPI RunningObjectTableImpl_Destroy(void) { struct list *cursor, *cursor2; + IrotHandle old_handle; TRACE("()\n"); @@ -288,6 +368,11 @@ RunningObjectTableImpl_Destroy(void) HeapFree(GetProcessHeap(),0,runningObjectTableInstance); runningObjectTableInstance = NULL; + old_handle = irot_handle; + irot_handle = NULL; + if (old_handle) + RpcBindingFree(&old_handle); + return S_OK; } @@ -341,6 +426,7 @@ RunningObjectTableImpl_Register(IRunningObjectTable* iface, DWORD grfFlags, IStream *pStream = NULL; DWORD mshlflags; IBindCtx *pbc; + InterfaceData *moniker = NULL; TRACE("(%p,%d,%p,%p,%p)\n",This,grfFlags,punkObject,pmkObjectName,pdwRegister); @@ -378,7 +464,7 @@ RunningObjectTableImpl_Register(IRunningObjectTable* iface, DWORD grfFlags, const void *pv = GlobalLock(hglobal); rot_entry->object = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(MInterfacePointer, abData[size])); rot_entry->object->ulCntData = size; - memcpy(&rot_entry->object->abData, pv, size); + memcpy(rot_entry->object->abData, pv, size); GlobalUnlock(hglobal); } } @@ -442,9 +528,9 @@ RunningObjectTableImpl_Register(IRunningObjectTable* iface, DWORD grfFlags, { SIZE_T size = GlobalSize(hglobal); const void *pv = GlobalLock(hglobal); - rot_entry->moniker = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(MInterfacePointer, abData[size])); - rot_entry->moniker->ulCntData = size; - memcpy(&rot_entry->moniker->abData, pv, size); + moniker = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(InterfaceData, abData[size])); + moniker->ulCntData = size; + memcpy(moniker->abData, pv, size); GlobalUnlock(hglobal); } } @@ -452,13 +538,35 @@ RunningObjectTableImpl_Register(IRunningObjectTable* iface, DWORD grfFlags, IMoniker_Release(pmkObjectName); if (hr != S_OK) { + HeapFree(GetProcessHeap(), 0, moniker); rot_entry_delete(rot_entry); return hr; } - /* FIXME: not the right signature of IrotRegister function */ - hr = IrotRegister(&rot_entry->cookie); - if (hr != S_OK) + + while (TRUE) + { + __TRY + { + hr = IrotRegister(get_irot_handle(), rot_entry->moniker_data, + rot_entry->object, moniker, + &rot_entry->last_modified, grfFlags, + &rot_entry->cookie, &rot_entry->ctxt_handle); + } + __EXCEPT(rpc_filter) + { + hr = HRESULT_FROM_WIN32(GetExceptionCode()); + } + __ENDTRY + if (hr == HRESULT_FROM_WIN32(RPC_S_SERVER_UNAVAILABLE)) + { + if (start_rpcss()) + continue; + } + break; + } + HeapFree(GetProcessHeap(), 0, moniker); + if (FAILED(hr)) { rot_entry_delete(rot_entry); return hr; @@ -468,7 +576,6 @@ RunningObjectTableImpl_Register(IRunningObjectTable* iface, DWORD grfFlags, *pdwRegister = rot_entry->cookie; EnterCriticalSection(&This->lock); - /* FIXME: see if object was registered before and return MK_S_MONIKERALREADYREGISTERED */ list_add_tail(&This->rot, &rot_entry->entry); LeaveCriticalSection(&This->lock); @@ -516,9 +623,9 @@ static HRESULT WINAPI RunningObjectTableImpl_IsRunning( IRunningObjectTable* iface, IMoniker *pmkObjectName) { RunningObjectTableImpl *This = (RunningObjectTableImpl *)iface; - MInterfacePointer *moniker_data; + MonikerComparisonData *moniker_data; HRESULT hr; - struct rot_entry *rot_entry; + const struct rot_entry *rot_entry; TRACE("(%p,%p)\n",This,pmkObjectName); @@ -532,10 +639,10 @@ RunningObjectTableImpl_IsRunning( IRunningObjectTable* iface, IMoniker *pmkObjec hr = S_FALSE; EnterCriticalSection(&This->lock); - LIST_FOR_EACH_ENTRY(rot_entry, &This->rot, struct rot_entry, entry) + LIST_FOR_EACH_ENTRY(rot_entry, &This->rot, const struct rot_entry, entry) { if ((rot_entry->moniker_data->ulCntData == moniker_data->ulCntData) && - !memcmp(&moniker_data->abData, &rot_entry->moniker_data->abData, moniker_data->ulCntData)) + !memcmp(moniker_data->abData, rot_entry->moniker_data->abData, moniker_data->ulCntData)) { hr = S_OK; break; @@ -543,7 +650,27 @@ RunningObjectTableImpl_IsRunning( IRunningObjectTable* iface, IMoniker *pmkObjec } LeaveCriticalSection(&This->lock); - /* FIXME: call IrotIsRunning */ + if (hr == S_FALSE) + { + while (TRUE) + { + __TRY + { + hr = IrotIsRunning(get_irot_handle(), moniker_data); + } + __EXCEPT(rpc_filter) + { + hr = HRESULT_FROM_WIN32(GetExceptionCode()); + } + __ENDTRY + if (hr == HRESULT_FROM_WIN32(RPC_S_SERVER_UNAVAILABLE)) + { + if (start_rpcss()) + continue; + } + break; + } + } HeapFree(GetProcessHeap(), 0, moniker_data); @@ -562,7 +689,9 @@ RunningObjectTableImpl_GetObject( IRunningObjectTable* iface, IMoniker *pmkObjectName, IUnknown **ppunkObject) { RunningObjectTableImpl *This = (RunningObjectTableImpl *)iface; - MInterfacePointer *moniker_data; + MonikerComparisonData *moniker_data; + InterfaceData *object = NULL; + IrotCookie cookie; HRESULT hr; struct rot_entry *rot_entry; @@ -585,7 +714,7 @@ RunningObjectTableImpl_GetObject( IRunningObjectTable* iface, LIST_FOR_EACH_ENTRY(rot_entry, &This->rot, struct rot_entry, entry) { if ((rot_entry->moniker_data->ulCntData == moniker_data->ulCntData) && - !memcmp(&moniker_data->abData, &rot_entry->moniker_data->abData, moniker_data->ulCntData)) + !memcmp(moniker_data->abData, rot_entry->moniker_data->abData, moniker_data->ulCntData)) { IStream *pStream; hr = create_stream_on_mip_ro(rot_entry->object, &pStream); @@ -603,9 +732,39 @@ RunningObjectTableImpl_GetObject( IRunningObjectTable* iface, } LeaveCriticalSection(&This->lock); - /* FIXME: call IrotGetObject */ - WARN("Moniker unavailable - app may require interprocess running object table\n"); - hr = MK_E_UNAVAILABLE; + TRACE("moniker unavailable locally, calling SCM\n"); + + while (TRUE) + { + __TRY + { + hr = IrotGetObject(get_irot_handle(), moniker_data, &object, &cookie); + } + __EXCEPT(rpc_filter) + { + hr = HRESULT_FROM_WIN32(GetExceptionCode()); + } + __ENDTRY + if (hr == HRESULT_FROM_WIN32(RPC_S_SERVER_UNAVAILABLE)) + { + if (start_rpcss()) + continue; + } + break; + } + + if (SUCCEEDED(hr)) + { + IStream *pStream; + hr = create_stream_on_mip_ro(object, &pStream); + if (hr == S_OK) + { + hr = CoUnmarshalInterface(pStream, &IID_IUnknown, (void **)ppunkObject); + IStream_Release(pStream); + } + } + else + WARN("Moniker unavailable, IrotGetObject returned 0x%08x\n", hr); HeapFree(GetProcessHeap(), 0, moniker_data); @@ -625,6 +784,7 @@ RunningObjectTableImpl_NoteChangeTime(IRunningObjectTable* iface, { RunningObjectTableImpl *This = (RunningObjectTableImpl *)iface; struct rot_entry *rot_entry; + HRESULT hr = E_INVALIDARG; TRACE("(%p,%d,%p)\n",This,dwRegister,pfiletime); @@ -635,14 +795,34 @@ RunningObjectTableImpl_NoteChangeTime(IRunningObjectTable* iface, { rot_entry->last_modified = *pfiletime; LeaveCriticalSection(&This->lock); - return S_OK; + + while (TRUE) + { + __TRY + { + hr = IrotNoteChangeTime(get_irot_handle(), dwRegister, pfiletime); + } + __EXCEPT(rpc_filter) + { + hr = HRESULT_FROM_WIN32(GetExceptionCode()); + } + __ENDTRY + if (hr == HRESULT_FROM_WIN32(RPC_S_SERVER_UNAVAILABLE)) + { + if (start_rpcss()) + continue; + } + break; + } + + goto done; } } LeaveCriticalSection(&This->lock); - /* FIXME: call IrotNoteChangeTime */ - - return E_INVALIDARG; +done: + TRACE("-- 0x08%x\n", hr); + return hr; } /*********************************************************************** @@ -658,8 +838,8 @@ RunningObjectTableImpl_GetTimeOfLastChange(IRunningObjectTable* iface, { HRESULT hr = MK_E_UNAVAILABLE; RunningObjectTableImpl *This = (RunningObjectTableImpl *)iface; - MInterfacePointer *moniker_data; - struct rot_entry *rot_entry; + MonikerComparisonData *moniker_data; + const struct rot_entry *rot_entry; TRACE("(%p,%p,%p)\n",This,pmkObjectName,pfiletime); @@ -677,10 +857,10 @@ RunningObjectTableImpl_GetTimeOfLastChange(IRunningObjectTable* iface, hr = MK_E_UNAVAILABLE; EnterCriticalSection(&This->lock); - LIST_FOR_EACH_ENTRY(rot_entry, &This->rot, struct rot_entry, entry) + LIST_FOR_EACH_ENTRY(rot_entry, &This->rot, const struct rot_entry, entry) { if ((rot_entry->moniker_data->ulCntData == moniker_data->ulCntData) && - !memcmp(&moniker_data->abData, &rot_entry->moniker_data->abData, moniker_data->ulCntData)) + !memcmp(moniker_data->abData, rot_entry->moniker_data->abData, moniker_data->ulCntData)) { *pfiletime = rot_entry->last_modified; hr = S_OK; @@ -689,9 +869,31 @@ RunningObjectTableImpl_GetTimeOfLastChange(IRunningObjectTable* iface, } LeaveCriticalSection(&This->lock); - /* FIXME: if (hr != S_OK) call IrotGetTimeOfLastChange */ + if (hr != S_OK) + { + while (TRUE) + { + __TRY + { + hr = IrotGetTimeOfLastChange(get_irot_handle(), moniker_data, pfiletime); + } + __EXCEPT(rpc_filter) + { + hr = HRESULT_FROM_WIN32(GetExceptionCode()); + } + __ENDTRY + if (hr == HRESULT_FROM_WIN32(RPC_S_SERVER_UNAVAILABLE)) + { + if (start_rpcss()) + continue; + } + break; + } + } HeapFree(GetProcessHeap(), 0, moniker_data); + + TRACE("-- 0x%08x\n", hr); return hr; } @@ -705,33 +907,36 @@ static HRESULT WINAPI RunningObjectTableImpl_EnumRunning(IRunningObjectTable* iface, IEnumMoniker **ppenumMoniker) { - HRESULT hr; RunningObjectTableImpl *This = (RunningObjectTableImpl *)iface; - MInterfacePointer **monikers; - ULONG moniker_count = 0; - const struct rot_entry *rot_entry; - ULONG i = 0; + InterfaceList *interface_list = NULL; + HRESULT hr; - EnterCriticalSection(&This->lock); + TRACE("(%p, %p)\n", This, ppenumMoniker); - LIST_FOR_EACH_ENTRY( rot_entry, &This->rot, const struct rot_entry, entry ) - moniker_count++; + *ppenumMoniker = NULL; - monikers = HeapAlloc(GetProcessHeap(), 0, moniker_count * sizeof(*monikers)); - - LIST_FOR_EACH_ENTRY( rot_entry, &This->rot, const struct rot_entry, entry ) + while (TRUE) { - SIZE_T size = FIELD_OFFSET(MInterfacePointer, abData[rot_entry->moniker->ulCntData]); - monikers[i] = HeapAlloc(GetProcessHeap(), 0, size); - memcpy(monikers[i], rot_entry->moniker, size); - i++; + __TRY + { + hr = IrotEnumRunning(get_irot_handle(), &interface_list); + } + __EXCEPT(rpc_filter) + { + hr = HRESULT_FROM_WIN32(GetExceptionCode()); + } + __ENDTRY + if (hr == HRESULT_FROM_WIN32(RPC_S_SERVER_UNAVAILABLE)) + { + if (start_rpcss()) + continue; + } + break; } - LeaveCriticalSection(&This->lock); - - /* FIXME: call IrotEnumRunning and append data */ - - hr = EnumMonikerImpl_CreateEnumROTMoniker(monikers, moniker_count, 0, ppenumMoniker); + if (SUCCEEDED(hr)) + hr = EnumMonikerImpl_CreateEnumROTMoniker(interface_list, + 0, ppenumMoniker); return hr; } @@ -767,9 +972,9 @@ HRESULT WINAPI RunningObjectTableImpl_Initialize(void) /* initialize the virtual table function */ runningObjectTableInstance->lpVtbl = &VT_RunningObjectTableImpl; - /* the initial reference is set to "1" ! because if set to "0" it will be not practis when */ - /* the ROT referred many times not in the same time (all the objects in the ROT will */ - /* be removed every time the ROT is removed ) */ + /* the initial reference is set to "1" so that it isn't destroyed after its + * first use until the process is destroyed, as the running object table is + * a process-wide cache of a global table */ runningObjectTableInstance->ref = 1; list_init(&runningObjectTableInstance->rot); @@ -873,6 +1078,21 @@ static HRESULT get_moniker_for_progid_display_name(LPBC pbc, IParseDisplayName *pdn; hr = IMoniker_BindToObject(class_moniker, pbc, NULL, &IID_IParseDisplayName, (void **)&pdn); + /* fallback to using IClassFactory to get IParseDisplayName - + * adsldp.dll depends on this */ + if (FAILED(hr)) + { + IClassFactory *pcf; + hr = IMoniker_BindToObject(class_moniker, pbc, NULL, + &IID_IClassFactory, (void **)&pcf); + if (SUCCEEDED(hr)) + { + hr = IClassFactory_CreateInstance(pcf, NULL, + &IID_IParseDisplayName, + (void **)&pdn); + IClassFactory_Release(pcf); + } + } IMoniker_Release(class_moniker); if (SUCCEEDED(hr)) { @@ -991,9 +1211,9 @@ HRESULT WINAPI GetClassFile(LPCOLESTR filePathName,CLSID *pclsid) return res; } - /* if the file is not a storage object then attemps to match various bits in the file against a - pattern in the registry. this case is not frequently used ! so I present only the psodocode for - this case + /* If the file is not a storage object then attempt to match various bits in the file against a + pattern in the registry. This case is not frequently used, so I present only the pseudocode for + this case. for(i=0;imoniker_count; i++) - HeapFree(GetProcessHeap(), 0, This->monikers[i]); - HeapFree(GetProcessHeap(), 0, This->monikers); + for (i = 0; i < This->moniker_list->size; i++) + HeapFree(GetProcessHeap(), 0, This->moniker_list->interfaces[i]); + HeapFree(GetProcessHeap(), 0, This->moniker_list); HeapFree(GetProcessHeap(), 0, This); } @@ -1132,13 +1352,13 @@ static HRESULT WINAPI EnumMonikerImpl_Next(IEnumMoniker* iface, ULONG celt, IM EnumMonikerImpl *This = (EnumMonikerImpl *)iface; HRESULT hr = S_OK; - TRACE("(%p) TabCurrentPos %d Tablastindx %d\n", This, This->pos, This->moniker_count); + TRACE("(%p) TabCurrentPos %d Tablastindx %d\n", This, This->pos, This->moniker_list->size); /* retrieve the requested number of moniker from the current position */ - for(i = 0; (This->pos < This->moniker_count) && (i < celt); i++) + for(i = 0; (This->pos < This->moniker_list->size) && (i < celt); i++) { IStream *stream; - hr = create_stream_on_mip_ro(This->monikers[This->pos++], &stream); + hr = create_stream_on_mip_ro(This->moniker_list->interfaces[This->pos++], &stream); if (hr != S_OK) break; hr = CoUnmarshalInterface(stream, &IID_IMoniker, (void **)&rgelt[i]); IStream_Release(stream); @@ -1167,7 +1387,7 @@ static HRESULT WINAPI EnumMonikerImpl_Skip(IEnumMoniker* iface, ULONG celt) TRACE("(%p)\n",This); - if (This->pos + celt >= This->moniker_count) + if (This->pos + celt >= This->moniker_list->size) return S_FALSE; This->pos += celt; @@ -1195,21 +1415,35 @@ static HRESULT WINAPI EnumMonikerImpl_Reset(IEnumMoniker* iface) static HRESULT WINAPI EnumMonikerImpl_Clone(IEnumMoniker* iface, IEnumMoniker ** ppenum) { EnumMonikerImpl *This = (EnumMonikerImpl *)iface; - MInterfacePointer **monikers = HeapAlloc(GetProcessHeap(), 0, sizeof(*monikers)*This->moniker_count); + InterfaceList *moniker_list; ULONG i; TRACE("(%p)\n",This); - for (i = 0; i < This->moniker_count; i++) + *ppenum = NULL; + + moniker_list = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(InterfaceList, interfaces[This->moniker_list->size])); + if (!moniker_list) + return E_OUTOFMEMORY; + + moniker_list->size = This->moniker_list->size; + for (i = 0; i < This->moniker_list->size; i++) { - SIZE_T size = FIELD_OFFSET(MInterfacePointer, abData[This->monikers[i]->ulCntData]); - monikers[i] = HeapAlloc(GetProcessHeap(), 0, size); - memcpy(monikers[i], This->monikers[i], size); + SIZE_T size = FIELD_OFFSET(InterfaceData, abData[This->moniker_list->interfaces[i]->ulCntData]); + moniker_list->interfaces[i] = HeapAlloc(GetProcessHeap(), 0, size); + if (!moniker_list->interfaces[i]) + { + ULONG end = i; + for (i = 0; i < end; i++) + HeapFree(GetProcessHeap(), 0, moniker_list->interfaces[i]); + HeapFree(GetProcessHeap(), 0, moniker_list); + return E_OUTOFMEMORY; + } + memcpy(moniker_list->interfaces[i], This->moniker_list->interfaces[i], size); } /* copy the enum structure */ - return EnumMonikerImpl_CreateEnumROTMoniker(monikers, This->moniker_count, - This->pos, ppenum); + return EnumMonikerImpl_CreateEnumROTMoniker(moniker_list, This->pos, ppenum); } /* Virtual function table for the IEnumMoniker class. */ @@ -1229,8 +1463,7 @@ static const IEnumMonikerVtbl VT_EnumMonikerImpl = * Used by EnumRunning to create the structure and EnumClone * to copy the structure */ -static HRESULT WINAPI EnumMonikerImpl_CreateEnumROTMoniker(MInterfacePointer **monikers, - ULONG moniker_count, +static HRESULT WINAPI EnumMonikerImpl_CreateEnumROTMoniker(InterfaceList *moniker_list, ULONG current_pos, IEnumMoniker **ppenumMoniker) { @@ -1250,8 +1483,7 @@ static HRESULT WINAPI EnumMonikerImpl_CreateEnumROTMoniker(MInterfacePointer **m /* the initial reference is set to "1" */ This->ref = 1; /* set the ref count to one */ This->pos = current_pos; /* Set the list start posn */ - This->moniker_count = moniker_count; /* Need the same size table as ROT */ - This->monikers = monikers; + This->moniker_list = moniker_list; *ppenumMoniker = (IEnumMoniker*)This; @@ -1427,3 +1659,13 @@ HRESULT MonikerMarshal_Create(IMoniker *inner, IUnknown **outer) *outer = (IUnknown *)&This->lpVtbl; return S_OK; } + +void * __RPC_USER MIDL_user_allocate(size_t size) +{ + return HeapAlloc(GetProcessHeap(), 0, size); +} + +void __RPC_USER MIDL_user_free(void *p) +{ + HeapFree(GetProcessHeap(), 0, p); +} diff --git a/reactos/dll/win32/ole32/moniker.h b/reactos/dll/win32/ole32/moniker.h index 32335c133a5..207b0e07491 100644 --- a/reactos/dll/win32/ole32/moniker.h +++ b/reactos/dll/win32/ole32/moniker.h @@ -36,6 +36,7 @@ HRESULT AntiMonikerCF_Create(REFIID riid, LPVOID *ppv); HRESULT CompositeMonikerCF_Create(REFIID riid, LPVOID *ppv); HRESULT ClassMonikerCF_Create(REFIID riid, LPVOID *ppv); HRESULT PointerMonikerCF_Create(REFIID riid, LPVOID *ppv); +HRESULT ComCatCF_Create(REFIID riid, LPVOID *ppv); /* This function decomposes a String path to a String Table containing all the elements ("\" or "subDirectory" or "Directory" or "FileName") of the path */ int FileMonikerImpl_DecomposePath(LPCOLESTR str, LPOLESTR** stringTable); diff --git a/reactos/dll/win32/ole32/ole2.c b/reactos/dll/win32/ole32/ole2.c index 5cee7a1e9fe..bdbf6da7861 100644 --- a/reactos/dll/win32/ole32/ole2.c +++ b/reactos/dll/win32/ole32/ole2.c @@ -1299,7 +1299,7 @@ static OleMenuHookItem * OLEMenu_IsHookInstalled( DWORD tid ) */ static BOOL OLEMenu_FindMainMenuIndex( HMENU hMainMenu, HMENU hPopupMenu, UINT *pnPos ) { - UINT i, nItems; + INT i, nItems; nItems = GetMenuItemCount( hMainMenu ); diff --git a/reactos/dll/win32/ole32/ole2nls.c b/reactos/dll/win32/ole32/ole2nls.c index f42ddf9b92c..b21601b5390 100644 --- a/reactos/dll/win32/ole32/ole2nls.c +++ b/reactos/dll/win32/ole32/ole2nls.c @@ -3,7 +3,7 @@ * * Copyright 1995 Martin von Loewis * Copyright 1998 David Lee Lambert - * Copyright 2000 Julio Cйsar Gбzquez + * Copyright 2000 Julio CГ©sar GГЎzquez * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/reactos/dll/win32/ole32/ole2stubs.c b/reactos/dll/win32/ole32/ole2stubs.c index e3396516564..7c457047e57 100644 --- a/reactos/dll/win32/ole32/ole2stubs.c +++ b/reactos/dll/win32/ole32/ole2stubs.c @@ -119,3 +119,12 @@ HRESULT WINAPI OleRegEnumFormatEtc ( return E_NOTIMPL; } + +/*********************************************************************** + * CoGetCallerTID [OLE32.@] + */ +HRESULT WINAPI CoGetCallerTID(LPDWORD lpdwTID) +{ + FIXME("stub!\n"); + return E_NOTIMPL; +} diff --git a/reactos/dll/win32/ole32/ole32.rbuild b/reactos/dll/win32/ole32/ole32.rbuild index 275b9d0bdb0..2bcc7974f7b 100644 --- a/reactos/dll/win32/ole32/ole32.rbuild +++ b/reactos/dll/win32/ole32/ole32.rbuild @@ -14,6 +14,7 @@ advapi32 user32 gdi32 + ole32_irot_client ole32_proxy rpcrt4 kernel32 @@ -24,6 +25,7 @@ bindctx.c classmoniker.c clipboard.c + comcat.c compobj.c compositemoniker.c datacache.c @@ -59,7 +61,6 @@ dcom.idl irot.idl . - ole32.spec irot.idl diff --git a/reactos/dll/win32/ole32/ole32.spec b/reactos/dll/win32/ole32/ole32.spec index 7561156884c..789da37e3e4 100644 --- a/reactos/dll/win32/ole32/ole32.spec +++ b/reactos/dll/win32/ole32/ole32.spec @@ -22,7 +22,7 @@ @ stdcall CoFreeUnusedLibraries() @ stdcall CoFreeUnusedLibrariesEx(long long) @ stdcall CoGetCallContext(ptr ptr) -@ stub CoGetCallerTID +@ stdcall CoGetCallerTID(ptr) @ stdcall CoGetClassObject(ptr long ptr ptr ptr) @ stdcall CoGetContextToken(ptr) @ stub CoGetCurrentLogicalThreadId @@ -276,4 +276,4 @@ @ stdcall WriteClassStm(ptr ptr) @ stdcall WriteFmtUserTypeStg(ptr long ptr) @ stub WriteOleStg -@ stub WriteStringStream +@ stub WriteStringStream \ No newline at end of file diff --git a/reactos/dll/win32/ole32/oleproxy.c b/reactos/dll/win32/ole32/oleproxy.c index 64f4441a51a..99a86f009e3 100644 --- a/reactos/dll/win32/ole32/oleproxy.c +++ b/reactos/dll/win32/ole32/oleproxy.c @@ -2,7 +2,7 @@ * OLE32 proxy/stub handler * * Copyright 2002 Marcus Meissner - * Copyright 2001 Ove Kеven, TransGaming Technologies + * Copyright 2001 Ove KГҐven, TransGaming Technologies * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -40,6 +40,7 @@ #include "compobj_private.h" #include "moniker.h" +#include "comcat.h" #include "wine/debug.h" @@ -88,6 +89,8 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid,LPVOID *ppv) return ClassMonikerCF_Create(iid, ppv); if (IsEqualCLSID(rclsid, &CLSID_PointerMoniker)) return PointerMonikerCF_Create(iid, ppv); + if (IsEqualGUID(rclsid, &CLSID_StdComponentCategoriesMgr)) + return ComCatCF_Create(iid, ppv); return NdrDllGetClassObject(rclsid, iid, ppv, OLE32_ProxyFileList, &CLSID_PSFactoryBuffer, &PSFactoryBuffer); diff --git a/reactos/dll/win32/ole32/regsvr.c b/reactos/dll/win32/ole32/regsvr.c index e4109317b12..07ddde01661 100644 --- a/reactos/dll/win32/ole32/regsvr.c +++ b/reactos/dll/win32/ole32/regsvr.c @@ -32,6 +32,7 @@ #include "ole2.h" #include "olectl.h" +#include "comcat.h" #include "initguid.h" #include "compobj_private.h" #include "moniker.h" @@ -406,6 +407,9 @@ static GUID const CLSID_StdOleLink = { static GUID const CLSID_PackagerMoniker = { 0x00000308, 0x0000, 0x0000, {0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46} }; +static GUID const CLSID_PSFactoryBuffer_actxprxy = { + 0xB8DA6310, 0xE19B, 0x11D0, {0x93,0x3C,0x00,0xA0,0xC9,0x0D,0xCA,0xA9} }; + extern GUID const CLSID_Picture_Metafile; extern GUID const CLSID_Picture_Dib; @@ -492,6 +496,12 @@ static struct regsvr_coclass const coclass_list[] = { "ole32.dll", "Apartment" }, + { &CLSID_StdComponentCategoriesMgr, + "Component Categories Manager", + NULL, + "ole32.dll", + "Both" + }, { NULL } /* list terminator */ }; @@ -502,6 +512,7 @@ static struct regsvr_coclass const coclass_list[] = { #define INTERFACE_ENTRY(interface, base, clsid32, clsid16) { &IID_##interface, #interface, base, sizeof(interface##Vtbl)/sizeof(void*), clsid16, clsid32 } #define BAS_INTERFACE_ENTRY(interface, base) INTERFACE_ENTRY(interface, &IID_##base, &CLSID_PSFactoryBuffer, NULL) #define STD_INTERFACE_ENTRY(interface) INTERFACE_ENTRY(interface, NULL, &CLSID_PSFactoryBuffer, NULL) +#define ACTX_INTERFACE_ENTRY(interface) INTERFACE_ENTRY(interface, NULL, &CLSID_PSFactoryBuffer_actxprxy, NULL) #define LCL_INTERFACE_ENTRY(interface) INTERFACE_ENTRY(interface, NULL, NULL, NULL) static const struct regsvr_interface interface_list[] = { @@ -561,6 +572,10 @@ static const struct regsvr_interface interface_list[] = { LCL_INTERFACE_ENTRY(IClientSecurity), LCL_INTERFACE_ENTRY(IServerSecurity), STD_INTERFACE_ENTRY(ISequentialStream), + ACTX_INTERFACE_ENTRY(IEnumGUID), + ACTX_INTERFACE_ENTRY(IEnumCATEGORYINFO), + ACTX_INTERFACE_ENTRY(ICatRegister), + ACTX_INTERFACE_ENTRY(ICatInformation), { NULL } /* list terminator */ }; diff --git a/reactos/dll/win32/ole32/rpc.c b/reactos/dll/win32/ole32/rpc.c index b805dba656b..74d7968f3b4 100644 --- a/reactos/dll/win32/ole32/rpc.c +++ b/reactos/dll/win32/ole32/rpc.c @@ -1,7 +1,7 @@ /* * RPC Manager * - * Copyright 2001 Ove Kеven, TransGaming Technologies + * Copyright 2001 Ove KГҐven, TransGaming Technologies * Copyright 2002 Marcus Meissner * Copyright 2005 Mike Hearn, Rob Shearman for CodeWeavers * diff --git a/reactos/dll/win32/ole32/storage32.c b/reactos/dll/win32/ole32/storage32.c index 705585bd3d7..3c88a36f766 100644 --- a/reactos/dll/win32/ole32/storage32.c +++ b/reactos/dll/win32/ole32/storage32.c @@ -1906,7 +1906,7 @@ static HRESULT WINAPI StorageImpl_Stat( IStorage* iface, StorageImpl* const This = (StorageImpl*)iface; HRESULT result = StorageBaseImpl_Stat( iface, pstatstg, grfStatFlag ); - if ( !FAILED(result) && ((grfStatFlag & STATFLAG_NONAME) == 0) && This->pwcsName ) + if ( SUCCEEDED(result) && ((grfStatFlag & STATFLAG_NONAME) == 0) && This->pwcsName ) { CoTaskMemFree(pstatstg->pwcsName); pstatstg->pwcsName = CoTaskMemAlloc((lstrlenW(This->pwcsName)+1)*sizeof(WCHAR)); @@ -5895,7 +5895,7 @@ HRESULT WINAPI StgOpenStorageEx(const WCHAR* pwcsName, DWORD grfMode, DWORD stgf return STG_E_INVALIDPARAMETER; } - return StgOpenStorage(pwcsName, NULL, grfMode, (SNB)NULL, 0, (IStorage **)ppObjectOpen); + return StgOpenStorage(pwcsName, NULL, grfMode, NULL, 0, (IStorage **)ppObjectOpen); } @@ -6335,13 +6335,13 @@ HRESULT WINAPI OleLoadFromStream(IStream *pStm,REFIID iidInterface,void** ppvOb TRACE("(%p,%s,%p)\n",pStm,debugstr_guid(iidInterface),ppvObj); res=ReadClassStm(pStm,&clsid); - if (!SUCCEEDED(res)) + if (FAILED(res)) return res; res=CoCreateInstance(&clsid,NULL,CLSCTX_INPROC_SERVER,iidInterface,ppvObj); - if (!SUCCEEDED(res)) + if (FAILED(res)) return res; res=IUnknown_QueryInterface((IUnknown*)*ppvObj,&IID_IPersistStream,(LPVOID*)&xstm); - if (!SUCCEEDED(res)) { + if (FAILED(res)) { IUnknown_Release((IUnknown*)*ppvObj); return res; } @@ -6583,7 +6583,7 @@ static HRESULT OLECONVERT_LoadOLE10(LPOLESTREAM pOleStream, OLECONVERT_OLESTREAM int max_try = 6; pData->pData = NULL; - pData->pstrOleObjFileName = (CHAR *) NULL; + pData->pstrOleObjFileName = NULL; for( nTryCnt=0;nTryCnt < max_try; nTryCnt++) { diff --git a/reactos/dll/win32/ole32/usrmarshal.c b/reactos/dll/win32/ole32/usrmarshal.c index b8487c30031..e504485cb08 100644 --- a/reactos/dll/win32/ole32/usrmarshal.c +++ b/reactos/dll/win32/ole32/usrmarshal.c @@ -2010,8 +2010,10 @@ HRESULT CALLBACK IEnumUnknown_Next_Proxy( IUnknown **rgelt, ULONG *pceltFetched) { - FIXME(":stub\n"); - return E_NOTIMPL; + ULONG fetched; + TRACE("(%p)->(%d, %p, %p)\n", This, celt, rgelt, pceltFetched); + if (!pceltFetched) pceltFetched = &fetched; + return IEnumUnknown_RemoteNext_Proxy(This, celt, rgelt, pceltFetched); } HRESULT __RPC_STUB IEnumUnknown_Next_Stub( @@ -2020,8 +2022,12 @@ HRESULT __RPC_STUB IEnumUnknown_Next_Stub( IUnknown **rgelt, ULONG *pceltFetched) { - FIXME(":stub\n"); - return E_NOTIMPL; + HRESULT hr; + TRACE("(%p)->(%d, %p, %p)\n", This, celt, rgelt, pceltFetched); + *pceltFetched = 0; + hr = IEnumUnknown_Next(This, celt, rgelt, pceltFetched); + if (hr == S_OK) *pceltFetched = celt; + return hr; } HRESULT CALLBACK IBindCtx_SetBindOptions_Proxy( @@ -2062,8 +2068,10 @@ HRESULT CALLBACK IEnumMoniker_Next_Proxy( IMoniker **rgelt, ULONG *pceltFetched) { - FIXME(":stub\n"); - return E_NOTIMPL; + ULONG fetched; + TRACE("(%p)->(%d, %p, %p)\n", This, celt, rgelt, pceltFetched); + if (!pceltFetched) pceltFetched = &fetched; + return IEnumMoniker_RemoteNext_Proxy(This, celt, rgelt, pceltFetched); } HRESULT __RPC_STUB IEnumMoniker_Next_Stub( @@ -2072,8 +2080,12 @@ HRESULT __RPC_STUB IEnumMoniker_Next_Stub( IMoniker **rgelt, ULONG *pceltFetched) { - FIXME(":stub\n"); - return E_NOTIMPL; + HRESULT hr; + TRACE("(%p)->(%d, %p, %p)\n", This, celt, rgelt, pceltFetched); + *pceltFetched = 0; + hr = IEnumMoniker_Next(This, celt, rgelt, pceltFetched); + if (hr == S_OK) *pceltFetched = celt; + return hr; } BOOL CALLBACK IRunnableObject_IsRunning_Proxy( @@ -2142,8 +2154,10 @@ HRESULT CALLBACK IEnumString_Next_Proxy( LPOLESTR *rgelt, ULONG *pceltFetched) { - FIXME(":stub\n"); - return E_NOTIMPL; + ULONG fetched; + TRACE("(%p)->(%d, %p, %p)\n", This, celt, rgelt, pceltFetched); + if (!pceltFetched) pceltFetched = &fetched; + return IEnumString_RemoteNext_Proxy(This, celt, rgelt, pceltFetched); } HRESULT __RPC_STUB IEnumString_Next_Stub( @@ -2152,8 +2166,12 @@ HRESULT __RPC_STUB IEnumString_Next_Stub( LPOLESTR *rgelt, ULONG *pceltFetched) { - FIXME(":stub\n"); - return E_NOTIMPL; + HRESULT hr; + TRACE("(%p)->(%d, %p, %p)\n", This, celt, rgelt, pceltFetched); + *pceltFetched = 0; + hr = IEnumString_Next(This, celt, rgelt, pceltFetched); + if (hr == S_OK) *pceltFetched = celt; + return hr; } HRESULT CALLBACK ISequentialStream_Read_Proxy( @@ -2244,8 +2262,10 @@ HRESULT CALLBACK IEnumSTATSTG_Next_Proxy( STATSTG *rgelt, ULONG *pceltFetched) { - FIXME(":stub\n"); - return E_NOTIMPL; + ULONG fetched; + TRACE("(%p)->(%d, %p, %p)\n", This, celt, rgelt, pceltFetched); + if (!pceltFetched) pceltFetched = &fetched; + return IEnumSTATSTG_RemoteNext_Proxy(This, celt, rgelt, pceltFetched); } HRESULT __RPC_STUB IEnumSTATSTG_Next_Stub( @@ -2254,8 +2274,12 @@ HRESULT __RPC_STUB IEnumSTATSTG_Next_Stub( STATSTG *rgelt, ULONG *pceltFetched) { - FIXME(":stub\n"); - return E_NOTIMPL; + HRESULT hr; + TRACE("(%p)->(%d, %p, %p)\n", This, celt, rgelt, pceltFetched); + *pceltFetched = 0; + hr = IEnumSTATSTG_Next(This, celt, rgelt, pceltFetched); + if (hr == S_OK) *pceltFetched = celt; + return hr; } HRESULT CALLBACK IStorage_OpenStream_Proxy( @@ -2398,8 +2422,9 @@ HRESULT CALLBACK IEnumFORMATETC_Next_Proxy( FORMATETC *rgelt, ULONG *pceltFetched) { - FIXME(":stub\n"); - return E_NOTIMPL; + ULONG fetched; + if (!pceltFetched) pceltFetched = &fetched; + return IEnumFORMATETC_RemoteNext_Proxy(This, celt, rgelt, pceltFetched); } HRESULT __RPC_STUB IEnumFORMATETC_Next_Stub( @@ -2408,8 +2433,11 @@ HRESULT __RPC_STUB IEnumFORMATETC_Next_Stub( FORMATETC *rgelt, ULONG *pceltFetched) { - FIXME(":stub\n"); - return E_NOTIMPL; + HRESULT hr; + *pceltFetched = 0; + hr = IEnumFORMATETC_Next(This, celt, rgelt, pceltFetched); + if (hr == S_OK) *pceltFetched = celt; + return hr; } HRESULT CALLBACK IEnumSTATDATA_Next_Proxy( @@ -2418,8 +2446,10 @@ HRESULT CALLBACK IEnumSTATDATA_Next_Proxy( STATDATA *rgelt, ULONG *pceltFetched) { - FIXME(":stub\n"); - return E_NOTIMPL; + ULONG fetched; + TRACE("(%p)->(%d, %p, %p)\n", This, celt, rgelt, pceltFetched); + if (!pceltFetched) pceltFetched = &fetched; + return IEnumSTATDATA_RemoteNext_Proxy(This, celt, rgelt, pceltFetched); } HRESULT __RPC_STUB IEnumSTATDATA_Next_Stub( @@ -2428,8 +2458,12 @@ HRESULT __RPC_STUB IEnumSTATDATA_Next_Stub( STATDATA *rgelt, ULONG *pceltFetched) { - FIXME(":stub\n"); - return E_NOTIMPL; + HRESULT hr; + TRACE("(%p)->(%d, %p, %p)\n", This, celt, rgelt, pceltFetched); + *pceltFetched = 0; + hr = IEnumSTATDATA_Next(This, celt, rgelt, pceltFetched); + if (hr == S_OK) *pceltFetched = celt; + return hr; } void CALLBACK IAdviseSink_OnDataChange_Proxy( @@ -2642,8 +2676,10 @@ HRESULT CALLBACK IEnumOLEVERB_Next_Proxy( LPOLEVERB rgelt, ULONG *pceltFetched) { - FIXME(":stub\n"); - return E_NOTIMPL; + ULONG fetched; + TRACE("(%p)->(%d, %p, %p)\n", This, celt, rgelt, pceltFetched); + if (!pceltFetched) pceltFetched = &fetched; + return IEnumOLEVERB_RemoteNext_Proxy(This, celt, rgelt, pceltFetched); } HRESULT __RPC_STUB IEnumOLEVERB_Next_Stub( @@ -2652,8 +2688,12 @@ HRESULT __RPC_STUB IEnumOLEVERB_Next_Stub( LPOLEVERB rgelt, ULONG *pceltFetched) { - FIXME(":stub\n"); - return E_NOTIMPL; + HRESULT hr; + TRACE("(%p)->(%d, %p, %p)\n", This, celt, rgelt, pceltFetched); + *pceltFetched = 0; + hr = IEnumOLEVERB_Next(This, celt, rgelt, pceltFetched); + if (hr == S_OK) *pceltFetched = celt; + return hr; } HRESULT CALLBACK IViewObject_Draw_Proxy( diff --git a/reactos/dll/win32/oleacc/oleacc.rbuild b/reactos/dll/win32/oleacc/oleacc.rbuild index 8773c36f2cf..79c8ec05b82 100644 --- a/reactos/dll/win32/oleacc/oleacc.rbuild +++ b/reactos/dll/win32/oleacc/oleacc.rbuild @@ -8,7 +8,6 @@ include/reactos/wine main.c - oleacc.spec wine kernel32 ntdll diff --git a/reactos/dll/win32/oleaut32/oleaut32.rbuild b/reactos/dll/win32/oleaut32/oleaut32.rbuild index 4dba811a42e..1cc9243f803 100644 --- a/reactos/dll/win32/oleaut32/oleaut32.rbuild +++ b/reactos/dll/win32/oleaut32/oleaut32.rbuild @@ -29,7 +29,6 @@ oleaut32.rc oleaut32_oaidl.idl . - oleaut32.spec oleaut32_proxy wine ole32 diff --git a/reactos/dll/win32/oledlg/oledlg.rbuild b/reactos/dll/win32/oledlg/oledlg.rbuild index 3fc06294075..ed0acac1f08 100644 --- a/reactos/dll/win32/oledlg/oledlg.rbuild +++ b/reactos/dll/win32/oledlg/oledlg.rbuild @@ -17,6 +17,5 @@ oledlg_main.c pastespl.c rsrc.rc - oledlg.spec diff --git a/reactos/dll/win32/olepro32/olepro32.rbuild b/reactos/dll/win32/olepro32/olepro32.rbuild index 46d046ef334..68ff9b537bc 100644 --- a/reactos/dll/win32/olepro32/olepro32.rbuild +++ b/reactos/dll/win32/olepro32/olepro32.rbuild @@ -12,5 +12,4 @@ ntdll olepro32stubs.c version.rc - olepro32.spec diff --git a/reactos/dll/win32/opengl32/opengl32.rbuild b/reactos/dll/win32/opengl32/opengl32.rbuild index 5471e4e9dab..5c01e9307f2 100644 --- a/reactos/dll/win32/opengl32/opengl32.rbuild +++ b/reactos/dll/win32/opengl32/opengl32.rbuild @@ -10,5 +10,4 @@ gl.c opengl32.c wgl.c - opengl32.spec diff --git a/reactos/dll/win32/pdh/pdh.rbuild b/reactos/dll/win32/pdh/pdh.rbuild index e5533d203f7..e79416c36c6 100644 --- a/reactos/dll/win32/pdh/pdh.rbuild +++ b/reactos/dll/win32/pdh/pdh.rbuild @@ -8,5 +8,4 @@ kernel32 ntdll pdh_main.c - pdh.spec diff --git a/reactos/dll/win32/powrprof/powrprof.rbuild b/reactos/dll/win32/powrprof/powrprof.rbuild index cb3a18ea202..5688f9f20ea 100644 --- a/reactos/dll/win32/powrprof/powrprof.rbuild +++ b/reactos/dll/win32/powrprof/powrprof.rbuild @@ -11,5 +11,4 @@ comctl32 powrprof.c powrprof.rc - powrprof.spec diff --git a/reactos/dll/win32/printui/printui.rbuild b/reactos/dll/win32/printui/printui.rbuild index fe9985e7e38..2c1be931331 100644 --- a/reactos/dll/win32/printui/printui.rbuild +++ b/reactos/dll/win32/printui/printui.rbuild @@ -9,5 +9,4 @@ ntdll printui.c printui.rc - printui.spec diff --git a/reactos/dll/win32/pstorec/pstorec.rbuild b/reactos/dll/win32/pstorec/pstorec.rbuild index 493a30f22df..3ed50e6ea91 100644 --- a/reactos/dll/win32/pstorec/pstorec.rbuild +++ b/reactos/dll/win32/pstorec/pstorec.rbuild @@ -5,5 +5,4 @@ kernel32 uuid pstorec.c - pstorec.spec diff --git a/reactos/dll/win32/rasapi32/rasapi32.rbuild b/reactos/dll/win32/rasapi32/rasapi32.rbuild index b932be1f356..b25947d0b2a 100644 --- a/reactos/dll/win32/rasapi32/rasapi32.rbuild +++ b/reactos/dll/win32/rasapi32/rasapi32.rbuild @@ -7,7 +7,6 @@ include/reactos/wine rasapi.c - rasapi32.spec wine kernel32 ntdll diff --git a/reactos/dll/win32/rasdlg/rasdlg.rbuild b/reactos/dll/win32/rasdlg/rasdlg.rbuild index 6f31a16681f..a903c55401f 100644 --- a/reactos/dll/win32/rasdlg/rasdlg.rbuild +++ b/reactos/dll/win32/rasdlg/rasdlg.rbuild @@ -8,5 +8,4 @@ uuid rasdlg.c rasdlg.rc - rasdlg.spec diff --git a/reactos/dll/win32/rasman/rasman.rbuild b/reactos/dll/win32/rasman/rasman.rbuild index 5df7820ec03..c2e6da74923 100644 --- a/reactos/dll/win32/rasman/rasman.rbuild +++ b/reactos/dll/win32/rasman/rasman.rbuild @@ -8,5 +8,4 @@ uuid rasman.c rasman.rc - rasman.spec diff --git a/reactos/dll/win32/riched20/riched20.rbuild b/reactos/dll/win32/riched20/riched20.rbuild index 06194cc800b..32c4edf2fe8 100644 --- a/reactos/dll/win32/riched20/riched20.rbuild +++ b/reactos/dll/win32/riched20/riched20.rbuild @@ -26,7 +26,6 @@ wrap.c writer.c version.rc - riched20.spec wine uuid ole32 diff --git a/reactos/dll/win32/riched32/riched32.rbuild b/reactos/dll/win32/riched32/riched32.rbuild index 95dab6eb1d8..590c1b3940c 100644 --- a/reactos/dll/win32/riched32/riched32.rbuild +++ b/reactos/dll/win32/riched32/riched32.rbuild @@ -8,7 +8,6 @@ richedit.c version.rc - riched32.spec wine riched20 user32 diff --git a/reactos/dll/win32/rpcrt4/cproxy.c b/reactos/dll/win32/rpcrt4/cproxy.c index 084285a5458..7979c0ecb31 100644 --- a/reactos/dll/win32/rpcrt4/cproxy.c +++ b/reactos/dll/win32/rpcrt4/cproxy.c @@ -1,7 +1,7 @@ /* * COM proxy implementation * - * Copyright 2001 Ove Kеven, TransGaming Technologies + * Copyright 2001 Ove KГҐven, TransGaming Technologies * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -58,10 +58,6 @@ static const IRpcProxyBufferVtbl StdProxy_Vtbl; #define ICOM_THIS_MULTI(impl,field,iface) impl* const This=(impl*)((char*)(iface) - offsetof(impl,field)) -/* How the Windows stubless proxy thunks work is explained at - * http://msdn.microsoft.com/library/en-us/dnmsj99/html/com0199.asp, - * but I'll use a slightly different method, to make life easier */ - #if defined(__i386__) #include "pshpack1.h" @@ -389,6 +385,8 @@ void WINAPI NdrProxySendReceive(void *This, } pStubMsg->dwStubPhase = PROXY_SENDRECEIVE; + /* avoid sending uninitialised parts of the buffer on the wire */ + pStubMsg->RpcMsg->BufferLength = pStubMsg->Buffer - (unsigned char *)pStubMsg->RpcMsg->Buffer; hr = IRpcChannelBuffer_SendReceive(pStubMsg->pRpcChannelBuffer, (RPCOLEMESSAGE*)pStubMsg->RpcMsg, &Status); diff --git a/reactos/dll/win32/rpcrt4/cpsf.c b/reactos/dll/win32/rpcrt4/cpsf.c index 373c97a75ea..94496956333 100644 --- a/reactos/dll/win32/rpcrt4/cpsf.c +++ b/reactos/dll/win32/rpcrt4/cpsf.c @@ -1,7 +1,7 @@ /* * COM proxy/stub factory (CStdPSFactory) implementation * - * Copyright 2001 Ove Kеven, TransGaming Technologies + * Copyright 2001 Ove KГҐven, TransGaming Technologies * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -174,7 +174,7 @@ HRESULT WINAPI NdrDllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv, if(max_delegating_vtbl_size > 0) create_delegating_vtbl(max_delegating_vtbl_size); } - if (IsEqualGUID(rclsid, pclsid)) + if (pclsid && IsEqualGUID(rclsid, pclsid)) return IPSFactoryBuffer_QueryInterface((LPPSFACTORYBUFFER)pPSFactoryBuffer, iid, ppv); else { const ProxyFileInfo *info; diff --git a/reactos/dll/win32/rpcrt4/cpsf.h b/reactos/dll/win32/rpcrt4/cpsf.h index 5ce8fe6575e..d8867d40e60 100644 --- a/reactos/dll/win32/rpcrt4/cpsf.h +++ b/reactos/dll/win32/rpcrt4/cpsf.h @@ -1,7 +1,7 @@ /* * COM proxy definitions * - * Copyright 2001 Ove Kеven, TransGaming Technologies + * Copyright 2001 Ove KГҐven, TransGaming Technologies * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/reactos/dll/win32/rpcrt4/cstub.c b/reactos/dll/win32/rpcrt4/cstub.c index d0b24c98dfb..85411cd81e9 100644 --- a/reactos/dll/win32/rpcrt4/cstub.c +++ b/reactos/dll/win32/rpcrt4/cstub.c @@ -1,7 +1,7 @@ /* * COM stub (CStdStubBuffer) implementation * - * Copyright 2001 Ove Kеven, TransGaming Technologies + * Copyright 2001 Ove KГҐven, TransGaming Technologies * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" +#include "wine/port.h" + #include #define COBJMACROS @@ -39,9 +42,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); #define STUB_HEADER(This) (((const CInterfaceStubHeader*)((This)->lpVtbl))[-1]) -static WINE_EXCEPTION_FILTER(stub_filter) +static LONG WINAPI stub_filter(EXCEPTION_POINTERS *eptr) { - if (GetExceptionInformation()->ExceptionRecord->ExceptionFlags & EXCEPTION_NONCONTINUABLE) + if (eptr->ExceptionRecord->ExceptionFlags & EXCEPTION_NONCONTINUABLE) return EXCEPTION_CONTINUE_SEARCH; return EXCEPTION_EXECUTE_HANDLER; } @@ -218,9 +221,7 @@ void create_delegating_vtbl(DWORD num_methods) if(current_vtbl.table && current_vtbl.table->ref == 0) { TRACE("freeing old table\n"); - VirtualFree(current_vtbl.table->methods, - (current_vtbl.table->size - 3) * sizeof(vtbl_method_t), - MEM_RELEASE); + VirtualFree(current_vtbl.table->methods, 0, MEM_RELEASE); HeapFree(GetProcessHeap(), 0, current_vtbl.table); } size = (num_methods - 3) * sizeof(vtbl_method_t); @@ -255,9 +256,7 @@ static void release_delegating_vtbl(IUnknownVtbl *vtbl) if(table->ref == 0 && table != current_vtbl.table) { TRACE("... and we're not current so free'ing\n"); - VirtualFree(current_vtbl.table->methods, - (current_vtbl.table->size - 3) * sizeof(vtbl_method_t), - MEM_RELEASE); + VirtualFree(current_vtbl.table->methods, 0, MEM_RELEASE); HeapFree(GetProcessHeap(), 0, table); } LeaveCriticalSection(&delegating_vtbl_section); diff --git a/reactos/dll/win32/rpcrt4/epm.idl b/reactos/dll/win32/rpcrt4/epm.idl new file mode 100644 index 00000000000..62f16f6774a --- /dev/null +++ b/reactos/dll/win32/rpcrt4/epm.idl @@ -0,0 +1,19 @@ +/* + * Copyright 2008 Robert Shearman + * + * 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 + */ + +#include "wine/epm.idl" diff --git a/reactos/dll/win32/rpcrt4/epm_towers.h b/reactos/dll/win32/rpcrt4/epm_towers.h index 7570cc2e846..1afd3eb3376 100644 --- a/reactos/dll/win32/rpcrt4/epm_towers.h +++ b/reactos/dll/win32/rpcrt4/epm_towers.h @@ -19,6 +19,8 @@ * */ +#include "epm_c.h" + #define EPM_PROTOCOL_DNET_NSP 0x04 #define EPM_PROTOCOL_OSI_TP4 0x05 #define EPM_PROTOCOL_OSI_CLNS 0x06 @@ -48,10 +50,6 @@ #include -typedef unsigned char u_int8; -typedef unsigned short u_int16; -typedef unsigned int u_int32; - typedef struct { u_int16 count_lhs; diff --git a/reactos/dll/win32/rpcrt4/ndr_clientserver.c b/reactos/dll/win32/rpcrt4/ndr_clientserver.c index 968ea61134f..a051489dab2 100644 --- a/reactos/dll/win32/rpcrt4/ndr_clientserver.c +++ b/reactos/dll/win32/rpcrt4/ndr_clientserver.c @@ -1,7 +1,7 @@ /* * MIDL proxy/stub stuff * - * Copyright 2002 Ove Kеven, TransGaming Technologies + * Copyright 2002 Ove KГҐven, TransGaming Technologies * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/reactos/dll/win32/rpcrt4/ndr_es.c b/reactos/dll/win32/rpcrt4/ndr_es.c index 3423d396cb8..b0bb7cc5f40 100644 --- a/reactos/dll/win32/rpcrt4/ndr_es.c +++ b/reactos/dll/win32/rpcrt4/ndr_es.c @@ -156,7 +156,18 @@ RPC_STATUS RPC_ENTRY MesEncodeFixedBufferHandleCreate( *pHandle = (handle_t)pEsMsg; - return RPC_S_OK;} + return RPC_S_OK; +} + +/*********************************************************************** + * MesEncodeDynBufferHandleCreate [RPCRT4.@] + */ +RPC_STATUS RPC_ENTRY MesEncodeDynBufferHandleCreate(char **ppBuffer, + ULONG *pEncodedSize, handle_t *pHandle) +{ + FIXME("%p %p %p stub\n", ppBuffer, pEncodedSize, pHandle); + return RPC_S_OK; +} /*********************************************************************** * MesDecodeBufferHandleCreate [RPCRT4.@] diff --git a/reactos/dll/win32/rpcrt4/ndr_marshall.c b/reactos/dll/win32/rpcrt4/ndr_marshall.c index bda04be31f4..3be736d1edc 100644 --- a/reactos/dll/win32/rpcrt4/ndr_marshall.c +++ b/reactos/dll/win32/rpcrt4/ndr_marshall.c @@ -361,10 +361,10 @@ typedef struct _NDR_MEMORY_LIST * If the function is unable to allocate memory an ERROR_OUTOFMEMORY * exception is raised. */ -void * WINAPI NdrAllocate(MIDL_STUB_MESSAGE *pStubMsg, size_t len) +void * WINAPI NdrAllocate(MIDL_STUB_MESSAGE *pStubMsg, SIZE_T len) { - size_t aligned_len; - size_t adjusted_len; + SIZE_T aligned_len; + SIZE_T adjusted_len; void *p; NDR_MEMORY_LIST *mem_list; @@ -373,7 +373,7 @@ void * WINAPI NdrAllocate(MIDL_STUB_MESSAGE *pStubMsg, size_t len) /* check for overflow */ if (adjusted_len < len) { - ERR("overflow of adjusted_len %d, len %d\n", adjusted_len, len); + ERR("overflow of adjusted_len %ld, len %ld\n", adjusted_len, len); RpcRaiseException(RPC_X_BAD_STUB_DATA); } @@ -861,7 +861,10 @@ static void PointerUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, if (pointer_id) pointer_needs_unmarshaling = 1; else + { + *pPointer = NULL; pointer_needs_unmarshaling = 0; + } break; case RPC_FC_FP: pointer_id = NDR_LOCAL_UINT32_READ(Buffer); diff --git a/reactos/dll/win32/rpcrt4/ndr_misc.h b/reactos/dll/win32/rpcrt4/ndr_misc.h index b6dfaffe768..c3beff4d725 100644 --- a/reactos/dll/win32/rpcrt4/ndr_misc.h +++ b/reactos/dll/win32/rpcrt4/ndr_misc.h @@ -1,7 +1,7 @@ /* * NDR definitions * - * Copyright 2001 Ove Kеven, TransGaming Technologies + * Copyright 2001 Ove KГҐven, TransGaming Technologies * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/reactos/dll/win32/rpcrt4/ndr_ole.c b/reactos/dll/win32/rpcrt4/ndr_ole.c index 9bfab956d0e..729ab0b9f1e 100644 --- a/reactos/dll/win32/rpcrt4/ndr_ole.c +++ b/reactos/dll/win32/rpcrt4/ndr_ole.c @@ -1,7 +1,7 @@ /* * OLE32 callouts, COM interface marshalling * - * Copyright 2001 Ove Kеven, TransGaming Technologies + * Copyright 2001 Ove KГҐven, TransGaming Technologies * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/reactos/dll/win32/rpcrt4/ndr_stubless.c b/reactos/dll/win32/rpcrt4/ndr_stubless.c index 275502a7e6d..0daf22e9364 100644 --- a/reactos/dll/win32/rpcrt4/ndr_stubless.c +++ b/reactos/dll/win32/rpcrt4/ndr_stubless.c @@ -1,7 +1,7 @@ /* * NDR -Oi,-Oif,-Oicf Interpreter * - * Copyright 2001 Ove Kеven, TransGaming Technologies + * Copyright 2001 Ove KГҐven, TransGaming Technologies * Copyright 2003-5 Robert Shearman (for CodeWeavers) * * This library is free software; you can redistribute it and/or diff --git a/reactos/dll/win32/rpcrt4/rpc_async.c b/reactos/dll/win32/rpcrt4/rpc_async.c index 4ff86a34a56..33fdc774304 100644 --- a/reactos/dll/win32/rpcrt4/rpc_async.c +++ b/reactos/dll/win32/rpcrt4/rpc_async.c @@ -64,7 +64,7 @@ RPC_STATUS WINAPI RpcAsyncInitializeHandle(PRPC_ASYNC_STATE pAsync, unsigned int pAsync->Flags = 0; pAsync->StubInfo = NULL; pAsync->RuntimeInfo = NULL; - memset(&pAsync->Reserved, 0, sizeof(*pAsync) - FIELD_OFFSET(RPC_ASYNC_STATE, Reserved)); + memset(pAsync->Reserved, 0, sizeof(*pAsync) - FIELD_OFFSET(RPC_ASYNC_STATE, Reserved)); return RPC_S_OK; } diff --git a/reactos/dll/win32/rpcrt4/rpc_binding.c b/reactos/dll/win32/rpcrt4/rpc_binding.c index 6a17a8c31ea..71d3c395ebc 100644 --- a/reactos/dll/win32/rpcrt4/rpc_binding.c +++ b/reactos/dll/win32/rpcrt4/rpc_binding.c @@ -1,7 +1,7 @@ /* * RPC binding API * - * Copyright 2001 Ove Kеven, TransGaming Technologies + * Copyright 2001 Ove KГҐven, TransGaming Technologies * Copyright 2003 Mike Hearn * Copyright 2004 Filip Navara * Copyright 2006 CodeWeavers @@ -435,7 +435,7 @@ static RPC_WSTR unescape_string_binding_componentW( { RPC_WSTR component, p; - if (len == -1) len = strlen((const char *)string_binding); + if (len == -1) len = strlenW(string_binding); component = HeapAlloc(GetProcessHeap(), 0, (len + 1) * sizeof(*component)); if (!component) return NULL; diff --git a/reactos/dll/win32/rpcrt4/rpc_binding.h b/reactos/dll/win32/rpcrt4/rpc_binding.h index 3251df210c7..25a21083ceb 100644 --- a/reactos/dll/win32/rpcrt4/rpc_binding.h +++ b/reactos/dll/win32/rpcrt4/rpc_binding.h @@ -1,7 +1,7 @@ /* * RPC binding API * - * Copyright 2001 Ove Kеven, TransGaming Technologies + * Copyright 2001 Ove KГҐven, TransGaming Technologies * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -21,7 +21,6 @@ #ifndef __WINE_RPC_BINDING_H #define __WINE_RPC_BINDING_H -#include "wine/rpcss_shared.h" #include "rpcndr.h" #include "security.h" #include "wine/list.h" @@ -150,9 +149,6 @@ RPC_STATUS RPCRT4_ReleaseBinding(RpcBinding* Binding); RPC_STATUS RPCRT4_OpenBinding(RpcBinding* Binding, RpcConnection** Connection, const RPC_SYNTAX_IDENTIFIER *TransferSyntax, const RPC_SYNTAX_IDENTIFIER *InterfaceId); RPC_STATUS RPCRT4_CloseBinding(RpcBinding* Binding, RpcConnection* Connection); -BOOL RPCRT4_RPCSSOnDemandCall(PRPCSS_NP_MESSAGE msg, char *vardata_payload, PRPCSS_NP_REPLY reply); -HANDLE RPCRT4_GetMasterMutex(void); -HANDLE RPCRT4_RpcssNPConnect(void); static inline const char *rpcrt4_conn_get_name(const RpcConnection *Connection) { diff --git a/reactos/dll/win32/rpcrt4/rpc_defs.h b/reactos/dll/win32/rpcrt4/rpc_defs.h index f552490ade7..cae77c4f356 100644 --- a/reactos/dll/win32/rpcrt4/rpc_defs.h +++ b/reactos/dll/win32/rpcrt4/rpc_defs.h @@ -1,7 +1,7 @@ /* * RPC definitions * - * Copyright 2001-2002 Ove Kеven, TransGaming Technologies + * Copyright 2001-2002 Ove KГҐven, TransGaming Technologies * Copyright 2004 Filip Navara * * This library is free software; you can redistribute it and/or diff --git a/reactos/dll/win32/rpcrt4/rpc_epmap.c b/reactos/dll/win32/rpcrt4/rpc_epmap.c index 46244ec36e0..1b279d43ed6 100644 --- a/reactos/dll/win32/rpcrt4/rpc_epmap.c +++ b/reactos/dll/win32/rpcrt4/rpc_epmap.c @@ -2,7 +2,8 @@ * RPC endpoint mapper * * Copyright 2002 Greg Turner - * Copyright 2001 Ove Kеven, TransGaming Technologies + * Copyright 2001 Ove KГҐven, TransGaming Technologies + * Copyright 2008 Robert Shearman (for CodeWeavers) * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -17,14 +18,9 @@ * 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 - * - * TODO: - * - actually do things right */ #include -#include -#include #include "windef.h" #include "winbase.h" @@ -33,8 +29,10 @@ #include "rpc.h" #include "wine/debug.h" +#include "wine/exception.h" #include "rpc_binding.h" +#include "epm_c.h" #include "epm_towers.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); @@ -43,8 +41,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); * * ncadg_ip_udp: 135 * ncacn_ip_tcp: 135 - * ncacn_np: \\pipe\epmapper (?) + * ncacn_np: \\pipe\epmapper * ncalrpc: epmapper + * ncacn_http: 593 * * If the user's machine ran a DCE RPC daemon, it would * probably be possible to connect to it, but there are many @@ -63,77 +62,222 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); * of running a fully functional DCOM server using Wine... */ +static const struct epm_endpoints +{ + const char *protseq; + const char *endpoint; +} epm_endpoints[] = +{ + { "ncacn_np", "\\pipe\\epmapper" }, + { "ncacn_ip_tcp", "135" }, + { "ncacn_ip_udp", "135" }, + { "ncalrpc", "epmapper" }, + { "ncacn_http", "593" }, +}; + +static BOOL start_rpcss(void) +{ + PROCESS_INFORMATION pi; + STARTUPINFOW si; + static WCHAR cmd[6]; + static const WCHAR rpcss[] = {'r','p','c','s','s',0}; + BOOL rslt; + + TRACE("\n"); + + ZeroMemory(&pi, sizeof(PROCESS_INFORMATION)); + ZeroMemory(&si, sizeof(STARTUPINFOA)); + si.cb = sizeof(STARTUPINFOA); + + memcpy(cmd, rpcss, sizeof(rpcss)); + + rslt = CreateProcessW( + NULL, /* executable */ + cmd, /* command line */ + NULL, /* process security attributes */ + NULL, /* primary thread security attributes */ + FALSE, /* inherit handles */ + 0, /* creation flags */ + NULL, /* use parent's environment */ + NULL, /* use parent's current directory */ + &si, /* STARTUPINFO pointer */ + &pi /* PROCESS_INFORMATION */ + ); + + if (rslt) + { + CloseHandle(pi.hProcess); + CloseHandle(pi.hThread); + Sleep(100); + } + + return rslt; +} + +static inline BOOL is_epm_destination_local(RPC_BINDING_HANDLE handle) +{ + RpcBinding *bind = (RpcBinding *)handle; + const char *protseq = bind->Protseq; + const char *network_addr = bind->NetworkAddr; + + return ((!strcmp(protseq, "ncalrpc") && !network_addr) || + (!strcmp(protseq, "ncacn_np") && + (!network_addr || !strcmp(network_addr, ".")))); +} + +static RPC_STATUS get_epm_handle_client(RPC_BINDING_HANDLE handle, RPC_BINDING_HANDLE *epm_handle) +{ + RpcBinding *bind = (RpcBinding *)handle; + const char * pszEndpoint = NULL; + RPC_STATUS status; + RpcBinding* epm_bind; + unsigned int i; + + if (bind->server) + return RPC_S_INVALID_BINDING; + + for (i = 0; i < sizeof(epm_endpoints)/sizeof(epm_endpoints[0]); i++) + if (!strcmp(bind->Protseq, epm_endpoints[i].protseq)) + pszEndpoint = epm_endpoints[i].endpoint; + + if (!pszEndpoint) + { + FIXME("no endpoint for the endpoint-mapper found for protseq %s\n", debugstr_a(bind->Protseq)); + return RPC_S_PROTSEQ_NOT_SUPPORTED; + } + + status = RpcBindingCopy(handle, epm_handle); + if (status != RPC_S_OK) return status; + + epm_bind = (RpcBinding*)*epm_handle; + if (epm_bind->AuthInfo) + { + /* don't bother with authenticating against the EPM by default + * (see EnableAuthEpResolution registry value) */ + RpcAuthInfo_Release(epm_bind->AuthInfo); + epm_bind->AuthInfo = NULL; + } + RPCRT4_ResolveBinding(epm_bind, pszEndpoint); + TRACE("RPC_S_OK\n"); + return RPC_S_OK; +} + +static RPC_STATUS get_epm_handle_server(RPC_BINDING_HANDLE *epm_handle) +{ + unsigned char string_binding[] = "ncacn_np:.[\\\\pipe\\\\epmapper]"; + + return RpcBindingFromStringBindingA(string_binding, epm_handle); +} + +static LONG WINAPI rpc_filter(EXCEPTION_POINTERS *__eptr) +{ + switch (GetExceptionCode()) + { + case EXCEPTION_ACCESS_VIOLATION: + case EXCEPTION_ILLEGAL_INSTRUCTION: + return EXCEPTION_CONTINUE_SEARCH; + default: + return EXCEPTION_EXECUTE_HANDLER; + } +} + /*********************************************************************** * RpcEpRegisterA (RPCRT4.@) */ RPC_STATUS WINAPI RpcEpRegisterA( RPC_IF_HANDLE IfSpec, RPC_BINDING_VECTOR *BindingVector, UUID_VECTOR *UuidVector, RPC_CSTR Annotation ) { - RPCSS_NP_MESSAGE msg; - RPCSS_NP_REPLY reply; - char *vardata_payload, *vp; PRPC_SERVER_INTERFACE If = (PRPC_SERVER_INTERFACE)IfSpec; - unsigned long c; - RPC_STATUS rslt = RPC_S_OK; + unsigned long i; + RPC_STATUS status = RPC_S_OK; + error_status_t status2; + ept_entry_t *entries; + handle_t handle; TRACE("(%p,%p,%p,%s)\n", IfSpec, BindingVector, UuidVector, debugstr_a((char*)Annotation)); TRACE(" ifid=%s\n", debugstr_guid(&If->InterfaceId.SyntaxGUID)); - for (c=0; cCount; c++) { - RpcBinding* bind = (RpcBinding*)(BindingVector->BindingH[c]); - TRACE(" protseq[%ld]=%s\n", c, debugstr_a(bind->Protseq)); - TRACE(" endpoint[%ld]=%s\n", c, debugstr_a(bind->Endpoint)); + for (i=0; iCount; i++) { + RpcBinding* bind = (RpcBinding*)(BindingVector->BindingH[i]); + TRACE(" protseq[%ld]=%s\n", i, debugstr_a(bind->Protseq)); + TRACE(" endpoint[%ld]=%s\n", i, debugstr_a(bind->Endpoint)); } if (UuidVector) { - for (c=0; cCount; c++) - TRACE(" obj[%ld]=%s\n", c, debugstr_guid(UuidVector->Uuid[c])); + for (i=0; iCount; i++) + TRACE(" obj[%ld]=%s\n", i, debugstr_guid(UuidVector->Uuid[i])); } - /* FIXME: Do something with annotation. */ + if (!BindingVector->Count) return RPC_S_OK; - /* construct the message to rpcss */ - msg.message_type = RPCSS_NP_MESSAGE_TYPEID_REGISTEREPMSG; - msg.message.registerepmsg.iface = If->InterfaceId; - msg.message.registerepmsg.no_replace = 0; + entries = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*entries) * BindingVector->Count * (UuidVector ? UuidVector->Count : 1)); + if (!entries) + return RPC_S_OUT_OF_MEMORY; - msg.message.registerepmsg.object_count = (UuidVector) ? UuidVector->Count : 0; - msg.message.registerepmsg.binding_count = BindingVector->Count; - - /* calculate vardata payload size */ - msg.vardata_payload_size = msg.message.registerepmsg.object_count * sizeof(UUID); - for (c=0; c < msg.message.registerepmsg.binding_count; c++) { - RpcBinding *bind = (RpcBinding *)(BindingVector->BindingH[c]); - msg.vardata_payload_size += strlen(bind->Protseq) + 1; - msg.vardata_payload_size += strlen(bind->Endpoint) + 1; + status = get_epm_handle_server(&handle); + if (status != RPC_S_OK) + { + HeapFree(GetProcessHeap(), 0, entries); + return status; } - /* allocate the payload buffer */ - vp = vardata_payload = LocalAlloc(LPTR, msg.vardata_payload_size); - if (!vardata_payload) - return RPC_S_OUT_OF_MEMORY; + for (i = 0; i < BindingVector->Count; i++) + { + unsigned j; + RpcBinding* bind = (RpcBinding*)(BindingVector->BindingH[i]); + for (j = 0; j < (UuidVector ? UuidVector->Count : 1); j++) + { + int len = strlen((char *)Annotation); + status = TowerConstruct(&If->InterfaceId, &If->TransferSyntax, + bind->Protseq, bind->Endpoint, + bind->NetworkAddr, + &entries[i*(UuidVector ? UuidVector->Count : 1) + j].tower); + if (status != RPC_S_OK) break; - /* populate the payload data */ - for (c=0; c < msg.message.registerepmsg.object_count; c++) { - CopyMemory(vp, UuidVector->Uuid[c], sizeof(UUID)); - vp += sizeof(UUID); + if (UuidVector) + memcpy(&entries[i * UuidVector->Count].object, &UuidVector->Uuid[j], sizeof(GUID)); + else + memset(&entries[i].object, 0, sizeof(entries[i].object)); + memcpy(entries[i].annotation, Annotation, min(len + 1, ept_max_annotation_size)); + } } - for (c=0; c < msg.message.registerepmsg.binding_count; c++) { - RpcBinding *bind = (RpcBinding*)(BindingVector->BindingH[c]); - unsigned long pslen = strlen(bind->Protseq) + 1, eplen = strlen(bind->Endpoint) + 1; - CopyMemory(vp, bind->Protseq, pslen); - vp += pslen; - CopyMemory(vp, bind->Endpoint, eplen); - vp += eplen; + if (status == RPC_S_OK) + { + while (TRUE) + { + __TRY + { + ept_insert(handle, BindingVector->Count * (UuidVector ? UuidVector->Count : 1), + entries, TRUE, &status2); + } + __EXCEPT(rpc_filter) + { + status2 = GetExceptionCode(); + } + __ENDTRY + if (status2 == RPC_S_SERVER_UNAVAILABLE && + is_epm_destination_local(handle)) + { + if (start_rpcss()) + continue; + } + if (status2 != RPC_S_OK) + ERR("ept_insert failed with error %d\n", status2); + status = status2; /* FIXME: convert status? */ + break; + } + } + RpcBindingFree(&handle); + + for (i = 0; i < BindingVector->Count; i++) + { + unsigned j; + for (j = 0; j < (UuidVector ? UuidVector->Count : 1); j++) + I_RpcFree(entries[i*(UuidVector ? UuidVector->Count : 1) + j].tower); } - /* send our request */ - if (!RPCRT4_RPCSSOnDemandCall(&msg, vardata_payload, &reply)) - rslt = RPC_S_OUT_OF_MEMORY; + HeapFree(GetProcessHeap(), 0, entries); - /* free the payload buffer */ - LocalFree(vardata_payload); - - return rslt; + return status; } /*********************************************************************** @@ -142,68 +286,85 @@ RPC_STATUS WINAPI RpcEpRegisterA( RPC_IF_HANDLE IfSpec, RPC_BINDING_VECTOR *Bind RPC_STATUS WINAPI RpcEpUnregister( RPC_IF_HANDLE IfSpec, RPC_BINDING_VECTOR *BindingVector, UUID_VECTOR *UuidVector ) { - RPCSS_NP_MESSAGE msg; - RPCSS_NP_REPLY reply; - char *vardata_payload, *vp; PRPC_SERVER_INTERFACE If = (PRPC_SERVER_INTERFACE)IfSpec; - unsigned long c; - RPC_STATUS rslt = RPC_S_OK; + unsigned long i; + RPC_STATUS status = RPC_S_OK; + error_status_t status2; + ept_entry_t *entries; + handle_t handle; TRACE("(%p,%p,%p)\n", IfSpec, BindingVector, UuidVector); TRACE(" ifid=%s\n", debugstr_guid(&If->InterfaceId.SyntaxGUID)); - for (c=0; cCount; c++) { - RpcBinding* bind = (RpcBinding*)(BindingVector->BindingH[c]); - TRACE(" protseq[%ld]=%s\n", c, debugstr_a(bind->Protseq)); - TRACE(" endpoint[%ld]=%s\n", c, debugstr_a(bind->Endpoint)); + for (i=0; iCount; i++) { + RpcBinding* bind = (RpcBinding*)(BindingVector->BindingH[i]); + TRACE(" protseq[%ld]=%s\n", i, debugstr_a(bind->Protseq)); + TRACE(" endpoint[%ld]=%s\n", i, debugstr_a(bind->Endpoint)); } if (UuidVector) { - for (c=0; cCount; c++) - TRACE(" obj[%ld]=%s\n", c, debugstr_guid(UuidVector->Uuid[c])); + for (i=0; iCount; i++) + TRACE(" obj[%ld]=%s\n", i, debugstr_guid(UuidVector->Uuid[i])); } - /* construct the message to rpcss */ - msg.message_type = RPCSS_NP_MESSAGE_TYPEID_UNREGISTEREPMSG; - msg.message.unregisterepmsg.iface = If->InterfaceId; + entries = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*entries) * BindingVector->Count * (UuidVector ? UuidVector->Count : 1)); + if (!entries) + return RPC_S_OUT_OF_MEMORY; - msg.message.unregisterepmsg.object_count = (UuidVector) ? UuidVector->Count : 0; - msg.message.unregisterepmsg.binding_count = BindingVector->Count; - - /* calculate vardata payload size */ - msg.vardata_payload_size = msg.message.unregisterepmsg.object_count * sizeof(UUID); - for (c=0; c < msg.message.unregisterepmsg.binding_count; c++) { - RpcBinding *bind = (RpcBinding *)(BindingVector->BindingH[c]); - msg.vardata_payload_size += strlen(bind->Protseq) + 1; - msg.vardata_payload_size += strlen(bind->Endpoint) + 1; + status = get_epm_handle_server(&handle); + if (status != RPC_S_OK) + { + HeapFree(GetProcessHeap(), 0, entries); + return status; } - /* allocate the payload buffer */ - vp = vardata_payload = LocalAlloc(LPTR, msg.vardata_payload_size); - if (!vardata_payload) - return RPC_S_OUT_OF_MEMORY; + for (i = 0; i < BindingVector->Count; i++) + { + unsigned j; + RpcBinding* bind = (RpcBinding*)(BindingVector->BindingH[i]); + for (j = 0; j < (UuidVector ? UuidVector->Count : 1); j++) + { + status = TowerConstruct(&If->InterfaceId, &If->TransferSyntax, + bind->Protseq, bind->Endpoint, + bind->NetworkAddr, + &entries[i*(UuidVector ? UuidVector->Count : 1) + j].tower); + if (status != RPC_S_OK) break; - /* populate the payload data */ - for (c=0; c < msg.message.unregisterepmsg.object_count; c++) { - CopyMemory(vp, UuidVector->Uuid[c], sizeof(UUID)); - vp += sizeof(UUID); + if (UuidVector) + memcpy(&entries[i * UuidVector->Count + j].object, &UuidVector->Uuid[j], sizeof(GUID)); + else + memset(&entries[i].object, 0, sizeof(entries[i].object)); + } } - for (c=0; c < msg.message.unregisterepmsg.binding_count; c++) { - RpcBinding *bind = (RpcBinding*)(BindingVector->BindingH[c]); - unsigned long pslen = strlen(bind->Protseq) + 1, eplen = strlen(bind->Endpoint) + 1; - CopyMemory(vp, bind->Protseq, pslen); - vp += pslen; - CopyMemory(vp, bind->Endpoint, eplen); - vp += eplen; + if (status == RPC_S_OK) + { + __TRY + { + ept_insert(handle, BindingVector->Count * (UuidVector ? UuidVector->Count : 1), + entries, TRUE, &status2); + } + __EXCEPT(rpc_filter) + { + status2 = GetExceptionCode(); + } + __ENDTRY + if (status2 == RPC_S_SERVER_UNAVAILABLE) + status2 = EPT_S_NOT_REGISTERED; + if (status2 != RPC_S_OK) + ERR("ept_insert failed with error %d\n", status2); + status = status2; /* FIXME: convert status? */ + } + RpcBindingFree(&handle); + + for (i = 0; i < BindingVector->Count; i++) + { + unsigned j; + for (j = 0; j < (UuidVector ? UuidVector->Count : 1); j++) + I_RpcFree(entries[i*(UuidVector ? UuidVector->Count : 1) + j].tower); } - /* send our request */ - if (!RPCRT4_RPCSSOnDemandCall(&msg, vardata_payload, &reply)) - rslt = RPC_S_OUT_OF_MEMORY; + HeapFree(GetProcessHeap(), 0, entries); - /* free the payload buffer */ - LocalFree(vardata_payload); - - return rslt; + return status; } /*********************************************************************** @@ -211,50 +372,96 @@ RPC_STATUS WINAPI RpcEpUnregister( RPC_IF_HANDLE IfSpec, RPC_BINDING_VECTOR *Bin */ RPC_STATUS WINAPI RpcEpResolveBinding( RPC_BINDING_HANDLE Binding, RPC_IF_HANDLE IfSpec ) { - RPCSS_NP_MESSAGE msg; - RPCSS_NP_REPLY reply; PRPC_CLIENT_INTERFACE If = (PRPC_CLIENT_INTERFACE)IfSpec; RpcBinding* bind = (RpcBinding*)Binding; + RPC_STATUS status; + error_status_t status2; + handle_t handle; + ept_lookup_handle_t entry_handle = NULL; + twr_t *tower; + twr_t *towers[4] = { NULL }; + unsigned32 num_towers, i; + GUID uuid = GUID_NULL; + char *resolved_endpoint = NULL; TRACE("(%p,%p)\n", Binding, IfSpec); TRACE(" protseq=%s\n", debugstr_a(bind->Protseq)); TRACE(" obj=%s\n", debugstr_guid(&bind->ObjectUuid)); + TRACE(" networkaddr=%s\n", debugstr_a(bind->NetworkAddr)); TRACE(" ifid=%s\n", debugstr_guid(&If->InterfaceId.SyntaxGUID)); - /* FIXME: totally untested */ - /* just return for fully bound handles */ if (bind->Endpoint && (bind->Endpoint[0] != '\0')) return RPC_S_OK; - /* construct the message to rpcss */ - msg.message_type = RPCSS_NP_MESSAGE_TYPEID_RESOLVEEPMSG; - msg.message.resolveepmsg.iface = If->InterfaceId; - msg.message.resolveepmsg.object = bind->ObjectUuid; - - msg.vardata_payload_size = strlen(bind->Protseq) + 1; - - /* send the message */ - if (!RPCRT4_RPCSSOnDemandCall(&msg, bind->Protseq, &reply)) - return RPC_S_OUT_OF_MEMORY; - - /* empty-string result means not registered */ - if (reply.as_string[0] == '\0') - return EPT_S_NOT_REGISTERED; + status = get_epm_handle_client(Binding, &handle); + if (status != RPC_S_OK) return status; - /* otherwise we fully bind the handle & return RPC_S_OK */ - return RPCRT4_ResolveBinding(Binding, reply.as_string); + status = TowerConstruct(&If->InterfaceId, &If->TransferSyntax, bind->Protseq, + ((RpcBinding *)handle)->Endpoint, + bind->NetworkAddr, &tower); + if (status != RPC_S_OK) + { + WARN("couldn't get tower\n"); + RpcBindingFree(&handle); + return status; + } + + while (TRUE) + { + __TRY + { + ept_map(handle, &uuid, tower, &entry_handle, sizeof(towers)/sizeof(towers[0]), &num_towers, towers, &status2); + /* FIXME: translate status2? */ + } + __EXCEPT(rpc_filter) + { + status2 = GetExceptionCode(); + } + __ENDTRY + if (status2 == RPC_S_SERVER_UNAVAILABLE && + is_epm_destination_local(handle)) + { + if (start_rpcss()) + continue; + } + break; + }; + + RpcBindingFree(&handle); + I_RpcFree(tower); + + if (status2 != RPC_S_OK) + { + ERR("ept_map failed for ifid %s, protseq %s, networkaddr %s\n", debugstr_guid(&If->TransferSyntax.SyntaxGUID), bind->Protseq, bind->NetworkAddr); + return status2; + } + + for (i = 0; i < num_towers; i++) + { + /* only parse the tower if we haven't already found a suitable + * endpoint, otherwise just free the tower */ + if (!resolved_endpoint) + { + status = TowerExplode(towers[i], NULL, NULL, NULL, &resolved_endpoint, NULL); + TRACE("status = %ld\n", status); + } + I_RpcFree(towers[i]); + } + + if (resolved_endpoint) + { + RPCRT4_ResolveBinding(Binding, resolved_endpoint); + I_RpcFree(resolved_endpoint); + return RPC_S_OK; + } + + WARN("couldn't find an endpoint\n"); + return EPT_S_NOT_REGISTERED; } -typedef unsigned int unsigned32; -typedef struct twr_t - { - unsigned32 tower_length; - /* [size_is] */ BYTE tower_octet_string[ 1 ]; - } twr_t; - -/*********************************************************************** - * TowerExplode (RPCRT4.@) +/***************************************************************************** + * TowerExplode (RPCRT4.@) */ RPC_STATUS WINAPI TowerExplode( const twr_t *tower, PRPC_SYNTAX_IDENTIFIER object, PRPC_SYNTAX_IDENTIFIER syntax, @@ -388,3 +595,13 @@ RPC_STATUS WINAPI TowerConstruct( } return RPC_S_OK; } + +void __RPC_FAR * __RPC_USER MIDL_user_allocate(size_t len) +{ + return HeapAlloc(GetProcessHeap(), 0, len); +} + +void __RPC_USER MIDL_user_free(void __RPC_FAR * ptr) +{ + HeapFree(GetProcessHeap(), 0, ptr); +} diff --git a/reactos/dll/win32/rpcrt4/rpc_message.c b/reactos/dll/win32/rpcrt4/rpc_message.c index 48c7df0d085..e59fc81d809 100644 --- a/reactos/dll/win32/rpcrt4/rpc_message.c +++ b/reactos/dll/win32/rpcrt4/rpc_message.c @@ -1,7 +1,7 @@ /* * RPC messages * - * Copyright 2001-2002 Ove Kеven, TransGaming Technologies + * Copyright 2001-2002 Ove KГҐven, TransGaming Technologies * Copyright 2004 Filip Navara * Copyright 2006 CodeWeavers * @@ -1005,7 +1005,10 @@ RPC_STATUS WINAPI I_RpcNegotiateTransferSyntax(PRPC_MESSAGE pMsg) TRACE("(%p)\n", pMsg); if (!bind || bind->server) + { + ERR("no binding\n"); return RPC_S_INVALID_BINDING; + } /* if we already have a connection, we don't need to negotiate again */ if (!pMsg->ReservedForRuntime) @@ -1065,7 +1068,10 @@ RPC_STATUS WINAPI I_RpcGetBuffer(PRPC_MESSAGE pMsg) TRACE("(%p): BufferLength=%d\n", pMsg, pMsg->BufferLength); if (!bind) + { + ERR("no binding\n"); return RPC_S_INVALID_BINDING; + } pMsg->Buffer = I_RpcAllocate(pMsg->BufferLength); TRACE("Buffer=%p\n", pMsg->Buffer); @@ -1118,7 +1124,11 @@ RPC_STATUS WINAPI I_RpcFreeBuffer(PRPC_MESSAGE pMsg) TRACE("(%p) Buffer=%p\n", pMsg, pMsg->Buffer); - if (!bind) return RPC_S_INVALID_BINDING; + if (!bind) + { + ERR("no binding\n"); + return RPC_S_INVALID_BINDING; + } if (pMsg->ReservedForRuntime) { diff --git a/reactos/dll/win32/rpcrt4/rpc_message.h b/reactos/dll/win32/rpcrt4/rpc_message.h index 95eb8076ab8..7e746cbb2c5 100644 --- a/reactos/dll/win32/rpcrt4/rpc_message.h +++ b/reactos/dll/win32/rpcrt4/rpc_message.h @@ -21,7 +21,6 @@ #ifndef __WINE_RPC_MESSAGE_H #define __WINE_RPC_MESSAGE_H -#include "wine/rpcss_shared.h" #include "rpc_defs.h" typedef unsigned int NCA_STATUS; diff --git a/reactos/dll/win32/rpcrt4/rpc_server.c b/reactos/dll/win32/rpcrt4/rpc_server.c index 953cccfa94d..6201166a750 100644 --- a/reactos/dll/win32/rpcrt4/rpc_server.c +++ b/reactos/dll/win32/rpcrt4/rpc_server.c @@ -1,7 +1,7 @@ /* * RPC server API * - * Copyright 2001 Ove Kеven, TransGaming Technologies + * Copyright 2001 Ove KГҐven, TransGaming Technologies * Copyright 2004 Filip Navara * Copyright 2006-2008 Robert Shearman (for CodeWeavers) * @@ -138,29 +138,24 @@ static RpcServerInterface* RPCRT4_find_interface(UUID* object, } LeaveCriticalSection(&server_cs); if (&cif->entry == &server_interfaces) cif = NULL; - TRACE("returning %p for %s\n", cif, debugstr_guid(object)); + TRACE("returning %p for object %s, if_id { %d.%d %s }\n", cif, + debugstr_guid(object), if_id->SyntaxVersion.MajorVersion, + if_id->SyntaxVersion.MinorVersion, debugstr_guid(&if_id->SyntaxGUID)); return cif; } static void RPCRT4_release_server_interface(RpcServerInterface *sif) { if (!InterlockedDecrement(&sif->CurrentCalls) && - sif->CallsCompletedEvent) { + sif->Delete) { /* sif must have been removed from server_interfaces before * CallsCompletedEvent is set */ - SetEvent(sif->CallsCompletedEvent); + if (sif->CallsCompletedEvent) + SetEvent(sif->CallsCompletedEvent); HeapFree(GetProcessHeap(), 0, sif); } } -static WINE_EXCEPTION_FILTER(rpc_filter) -{ - WARN("exception caught with code 0x%08x = %d\n", GetExceptionCode(), GetExceptionCode()); - TRACE("returning failure packet\n"); - /* catch every exception */ - return EXCEPTION_EXECUTE_HANDLER; -} - static RPC_STATUS process_bind_packet(RpcConnection *conn, RpcPktBindHdr *hdr, RPC_MESSAGE *msg) { RPC_STATUS status; @@ -294,7 +289,8 @@ static RPC_STATUS process_request_packet(RpcConnection *conn, RpcPktRequestHdr * RPCRT4_SetThreadCurrentCallHandle(msg->Handle); __TRY { if (func) func(msg); - } __EXCEPT(rpc_filter) { + } __EXCEPT_ALL { + WARN("exception caught with code 0x%08x = %d\n", GetExceptionCode(), GetExceptionCode()); exception = TRUE; if (GetExceptionCode() == STATUS_ACCESS_VIOLATION) status = ERROR_NOACCESS; @@ -356,7 +352,7 @@ static void RPCRT4_process_packet(RpcConnection* conn, RpcPktHdr* hdr, RPC_MESSA } /* clean up */ - I_RpcFreeBuffer(msg); + I_RpcFree(msg->Buffer); RPCRT4_FreeHeader(hdr); HeapFree(GetProcessHeap(), 0, msg); } @@ -392,6 +388,7 @@ static DWORD CALLBACK RPCRT4_io_thread(LPVOID the_arg) packet = HeapAlloc(GetProcessHeap(), 0, sizeof(RpcPacket)); if (!packet) { I_RpcFree(msg->Buffer); + RPCRT4_FreeHeader(hdr); HeapFree(GetProcessHeap(), 0, msg); break; } @@ -401,6 +398,7 @@ static DWORD CALLBACK RPCRT4_io_thread(LPVOID the_arg) if (!QueueUserWorkItem(RPCRT4_worker_thread, packet, WT_EXECUTELONGFUNCTION)) { ERR("couldn't queue work item for worker thread, error was %d\n", GetLastError()); I_RpcFree(msg->Buffer); + RPCRT4_FreeHeader(hdr); HeapFree(GetProcessHeap(), 0, msg); HeapFree(GetProcessHeap(), 0, packet); break; @@ -852,7 +850,7 @@ RPC_STATUS WINAPI RpcServerRegisterIf2( RPC_IF_HANDLE IfSpec, UUID* MgrTypeUuid, sif = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(RpcServerInterface)); sif->If = If; if (MgrTypeUuid) { - memcpy(&sif->MgrTypeUuid, MgrTypeUuid, sizeof(UUID)); + sif->MgrTypeUuid = *MgrTypeUuid; sif->MgrEpv = MgrEpv; } else { memset(&sif->MgrTypeUuid, 0, sizeof(UUID)); @@ -893,8 +891,10 @@ RPC_STATUS WINAPI RpcServerUnregisterIf( RPC_IF_HANDLE IfSpec, UUID* MgrTypeUuid if ((!IfSpec || !memcmp(&If->InterfaceId, &cif->If->InterfaceId, sizeof(RPC_SYNTAX_IDENTIFIER))) && UuidEqual(MgrTypeUuid, &cif->MgrTypeUuid, &status)) { list_remove(&cif->entry); + TRACE("unregistering cif %p\n", cif); if (cif->CurrentCalls) { completed = FALSE; + cif->Delete = TRUE; if (WaitForCallsToComplete) cif->CallsCompletedEvent = event = CreateEventW(NULL, FALSE, FALSE, NULL); } @@ -984,8 +984,8 @@ RPC_STATUS WINAPI RpcObjectSetType( UUID* ObjUuid, UUID* TypeUuid ) return RPC_S_ALREADY_REGISTERED; /* ... otherwise create a new one and add it in. */ map = HeapAlloc(GetProcessHeap(), 0, sizeof(RpcObjTypeMap)); - memcpy(&map->Object, ObjUuid, sizeof(UUID)); - memcpy(&map->Type, TypeUuid, sizeof(UUID)); + map->Object = *ObjUuid; + map->Type = *TypeUuid; map->next = NULL; if (prev) prev->next = map; /* prev is the last map in the linklist */ @@ -1050,13 +1050,11 @@ RPC_STATUS WINAPI RpcMgmtWaitServerListen( void ) LeaveCriticalSection(&listen_cs); return RPC_S_NOT_LISTENING; } - - do - { - LeaveCriticalSection(&listen_cs); + do { + LeaveCriticalSection(&listen_cs); LIST_FOR_EACH_ENTRY(cps, &protseqs, RpcServerProtseq, entry) - WaitForSingleObject(cps->server_ready_event, INFINITE); + WaitForSingleObject(cps->server_ready_event, INFINITE); EnterCriticalSection(&listen_cs); } while (!std_listen); @@ -1131,6 +1129,40 @@ RPC_STATUS WINAPI RpcMgmtInqIfIds(RPC_BINDING_HANDLE Binding, RPC_IF_ID_VECTOR * return RPC_S_INVALID_BINDING; } +/*********************************************************************** + * RpcMgmtInqStats (RPCRT4.@) + */ +RPC_STATUS WINAPI RpcMgmtInqStats(RPC_BINDING_HANDLE Binding, RPC_STATS_VECTOR **Statistics) +{ + RPC_STATS_VECTOR *stats; + + FIXME("(%p,%p)\n", Binding, Statistics); + + if ((stats = HeapAlloc(GetProcessHeap(), 0, sizeof(RPC_STATS_VECTOR)))) + { + stats->Count = 1; + stats->Stats[0] = 0; + *Statistics = stats; + return RPC_S_OK; + } + return RPC_S_OUT_OF_RESOURCES; +} + +/*********************************************************************** + * RpcMgmtStatsVectorFree (RPCRT4.@) + */ +RPC_STATUS WINAPI RpcMgmtStatsVectorFree(RPC_STATS_VECTOR **StatsVector) +{ + FIXME("(%p)\n", StatsVector); + + if (StatsVector) + { + HeapFree(GetProcessHeap(), 0, *StatsVector); + *StatsVector = NULL; + } + return RPC_S_OK; +} + /*********************************************************************** * RpcMgmtEpEltInqBegin (RPCRT4.@) */ diff --git a/reactos/dll/win32/rpcrt4/rpc_server.h b/reactos/dll/win32/rpcrt4/rpc_server.h index eb32be6afc9..ffd5b016e4b 100644 --- a/reactos/dll/win32/rpcrt4/rpc_server.h +++ b/reactos/dll/win32/rpcrt4/rpc_server.h @@ -1,7 +1,7 @@ /* * RPC server API * - * Copyright 2001 Ove Kеven, TransGaming Technologies + * Copyright 2001 Ove KГҐven, TransGaming Technologies * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -73,6 +73,7 @@ typedef struct _RpcServerInterface /* set when unregistering interface to let the caller of * RpcServerUnregisterIf* know that all calls have finished */ HANDLE CallsCompletedEvent; + BOOL Delete; /* delete when the last call finishes */ } RpcServerInterface; void RPCRT4_new_client(RpcConnection* conn); diff --git a/reactos/dll/win32/rpcrt4/rpc_transport.c b/reactos/dll/win32/rpcrt4/rpc_transport.c index 08261274b89..14aa908929e 100644 --- a/reactos/dll/win32/rpcrt4/rpc_transport.c +++ b/reactos/dll/win32/rpcrt4/rpc_transport.c @@ -1,7 +1,7 @@ /* * RPC transport layer * - * Copyright 2001 Ove Kеven, TransGaming Technologies + * Copyright 2001 Ove KГҐven, TransGaming Technologies * Copyright 2003 Mike Hearn * Copyright 2004 Filip Navara * Copyright 2006 Mike McCormack @@ -29,32 +29,43 @@ #include #include #include -#include - -#ifdef HAVE_UNISTD_H -# include -#endif -#include #include #include -#ifdef HAVE_SYS_SOCKET_H -# include -#endif -#ifdef HAVE_NETINET_IN_H -# include -#endif -#ifdef HAVE_NETINET_TCP_H -# include -#endif -#ifdef HAVE_ARPA_INET_H -# include -#endif -#ifdef HAVE_NETDB_H -#include -#endif -#ifdef HAVE_SYS_POLL_H -#include -#endif + +#if defined(__MINGW32__) || defined (_MSC_VER) +# include +# ifndef EADDRINUSE +# define EADDRINUSE WSAEADDRINUSE +# endif +# ifndef EAGAIN +# define EAGAIN WSAEWOULDBLOCK +# endif +#else +# include +# ifdef HAVE_UNISTD_H +# include +# endif +# include +# ifdef HAVE_SYS_SOCKET_H +# include +# endif +# ifdef HAVE_NETINET_IN_H +# include +# endif +# ifdef HAVE_NETINET_TCP_H +# include +# endif +# ifdef HAVE_ARPA_INET_H +# include +# endif +# ifdef HAVE_NETDB_H +# include +# endif +# ifdef HAVE_SYS_POLL_H +# include +# endif +# define closesocket close +#endif /* defined(__MINGW32__) || defined (_MSC_VER) */ #include #include @@ -112,20 +123,29 @@ static RPC_STATUS rpcrt4_conn_listen_pipe(RpcConnection_np *npc) return RPC_S_OK; npc->listening = TRUE; - if (ConnectNamedPipe(npc->pipe, &npc->ovl[0])) - return RPC_S_OK; + for (;;) + { + if (ConnectNamedPipe(npc->pipe, &npc->ovl[0])) + return RPC_S_OK; - if (GetLastError() == ERROR_PIPE_CONNECTED) { - SetEvent(npc->ovl[0].hEvent); - return RPC_S_OK; + switch(GetLastError()) + { + case ERROR_PIPE_CONNECTED: + SetEvent(npc->ovl[0].hEvent); + return RPC_S_OK; + case ERROR_IO_PENDING: + /* will be completed in rpcrt4_protseq_np_wait_for_new_connection */ + return RPC_S_OK; + case ERROR_NO_DATA_DETECTED: + /* client has disconnected, retry */ + DisconnectNamedPipe( npc->pipe ); + break; + default: + npc->listening = FALSE; + WARN("Couldn't ConnectNamedPipe (error was %d)\n", GetLastError()); + return RPC_S_OUT_OF_RESOURCES; + } } - if (GetLastError() == ERROR_IO_PENDING) { - /* will be completed in rpcrt4_protseq_np_wait_for_new_connection */ - return RPC_S_OK; - } - npc->listening = FALSE; - WARN("Couldn't ConnectNamedPipe (error was %d)\n", GetLastError()); - return RPC_S_OUT_OF_RESOURCES; } static RPC_STATUS rpcrt4_conn_create_pipe(RpcConnection *Connection, LPCSTR pname) @@ -196,9 +216,7 @@ static RPC_STATUS rpcrt4_conn_open_pipe(RpcConnection *Connection, LPCSTR pname, TRACE("connection failed, error=%x\n", err); return RPC_S_SERVER_TOO_BUSY; } - if (!wait) - return RPC_S_SERVER_UNAVAILABLE; - if (!WaitNamedPipeA(pname, NMPWAIT_WAIT_FOREVER)) { + if (!wait || !WaitNamedPipeA(pname, NMPWAIT_WAIT_FOREVER)) { err = GetLastError(); WARN("connection failed, error=%x\n", err); return RPC_S_SERVER_UNAVAILABLE; @@ -212,7 +230,6 @@ static RPC_STATUS rpcrt4_conn_open_pipe(RpcConnection *Connection, LPCSTR pname, SetNamedPipeHandleState(pipe, &dwMode, NULL, NULL); npc->ovl[0].hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); npc->ovl[1].hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); - npc->pipe = pipe; return RPC_S_OK; @@ -375,7 +392,7 @@ static int rpcrt4_conn_np_read(RpcConnection *Connection, break; ret = GetOverlappedResult(npc->pipe, &npc->ovl[0], &bytes_read, TRUE); - if (!ret && GetLastError() != ERROR_MORE_DATA) + if (!ret && (GetLastError() != ERROR_MORE_DATA)) break; bytes_left -= bytes_read; @@ -395,12 +412,12 @@ static int rpcrt4_conn_np_write(RpcConnection *Connection, while (bytes_left) { DWORD bytes_written; - ret = WriteFile(npc->pipe, buf, count, &bytes_written, &npc->ovl[1]); + ret = WriteFile(npc->pipe, buf, bytes_left, &bytes_written, &npc->ovl[1]); if ((!ret || !bytes_written) && (GetLastError() != ERROR_IO_PENDING)) break; ret = GetOverlappedResult(npc->pipe, &npc->ovl[1], &bytes_written, TRUE); - if (!ret && GetLastError() != ERROR_MORE_DATA) + if (!ret && (GetLastError() != ERROR_MORE_DATA)) break; bytes_left -= bytes_written; @@ -425,7 +442,6 @@ static int rpcrt4_conn_np_close(RpcConnection *Connection) CloseHandle(npc->ovl[1].hEvent); npc->ovl[1].hEvent = 0; } - return 0; } @@ -508,7 +524,8 @@ static RPC_STATUS rpcrt4_ncacn_np_parse_top_of_tower(const unsigned char *tower_ if ((smb_floor->count_lhs != sizeof(smb_floor->protid)) || (smb_floor->protid != EPM_PROTOCOL_SMB) || - (smb_floor->count_rhs > tower_size)) + (smb_floor->count_rhs > tower_size) || + (tower_data[smb_floor->count_rhs - 1] != '\0')) return EPT_S_NOT_REGISTERED; if (endpoint) @@ -531,7 +548,8 @@ static RPC_STATUS rpcrt4_ncacn_np_parse_top_of_tower(const unsigned char *tower_ if ((nb_floor->count_lhs != sizeof(nb_floor->protid)) || (nb_floor->protid != EPM_PROTOCOL_NETBIOS) || - (nb_floor->count_rhs > tower_size)) + (nb_floor->count_rhs > tower_size) || + (tower_data[nb_floor->count_rhs - 1] != '\0')) return EPT_S_NOT_REGISTERED; if (networkaddr) @@ -681,7 +699,7 @@ static size_t rpcrt4_ncalrpc_get_top_of_tower(unsigned char *tower_data, TRACE("(%p, %s, %s)\n", tower_data, networkaddr, endpoint); - endpoint_size = strlen(networkaddr) + 1; + endpoint_size = strlen(endpoint) + 1; size = sizeof(*pipe_floor) + endpoint_size; if (!tower_data) @@ -692,7 +710,7 @@ static size_t rpcrt4_ncalrpc_get_top_of_tower(unsigned char *tower_data, tower_data += sizeof(*pipe_floor); pipe_floor->count_lhs = sizeof(pipe_floor->protid); - pipe_floor->protid = EPM_PROTOCOL_SMB; + pipe_floor->protid = EPM_PROTOCOL_PIPE; pipe_floor->count_rhs = endpoint_size; memcpy(tower_data, endpoint, endpoint_size); @@ -710,9 +728,6 @@ static RPC_STATUS rpcrt4_ncalrpc_parse_top_of_tower(const unsigned char *tower_d TRACE("(%p, %d, %p, %p)\n", tower_data, (int)tower_size, networkaddr, endpoint); - *networkaddr = NULL; - *endpoint = NULL; - if (tower_size < sizeof(*pipe_floor)) return EPT_S_NOT_REGISTERED; @@ -720,10 +735,14 @@ static RPC_STATUS rpcrt4_ncalrpc_parse_top_of_tower(const unsigned char *tower_d tower_size -= sizeof(*pipe_floor); if ((pipe_floor->count_lhs != sizeof(pipe_floor->protid)) || - (pipe_floor->protid != EPM_PROTOCOL_SMB) || - (pipe_floor->count_rhs > tower_size)) + (pipe_floor->protid != EPM_PROTOCOL_PIPE) || + (pipe_floor->count_rhs > tower_size) || + (tower_data[pipe_floor->count_rhs - 1] != '\0')) return EPT_S_NOT_REGISTERED; + if (networkaddr) + *networkaddr = NULL; + if (endpoint) { *endpoint = I_RpcAllocate(pipe_floor->count_rhs); @@ -751,14 +770,12 @@ static RpcConnection *rpcrt4_conn_tcp_alloc(void) if (tcpc == NULL) return NULL; tcpc->sock = -1; -#ifndef __REACTOS__ if (socketpair(PF_UNIX, SOCK_STREAM, 0, tcpc->cancel_fds) < 0) { ERR("socketpair() failed: %s\n", strerror(errno)); HeapFree(GetProcessHeap(), 0, tcpc); return NULL; } -#endif return &tcpc->common; } @@ -817,13 +834,14 @@ static RPC_STATUS rpcrt4_ncacn_ip_tcp_open(RpcConnection* Connection) if (0>connect(sock, ai_cur->ai_addr, ai_cur->ai_addrlen)) { WARN("connect() failed: %s\n", strerror(errno)); - close(sock); + closesocket(sock); continue; } /* RPC depends on having minimal latency so disable the Nagle algorithm */ val = 1; - setsockopt(sock, SOL_TCP, TCP_NODELAY, (char *)&val, sizeof(val)); + setsockopt(sock, SOL_TCP, TCP_NODELAY, &val, sizeof(val)); + fcntl(sock, F_SETFL, O_NONBLOCK); /* make socket nonblocking */ tcpc->sock = sock; @@ -845,7 +863,6 @@ static RPC_STATUS rpcrt4_protseq_ncacn_ip_tcp_open_endpoint(RpcServerProtseq *pr struct addrinfo *ai; struct addrinfo *ai_cur; struct addrinfo hints; - u_long blocking; RpcConnection *first_connection = NULL; TRACE("(%p, %s)\n", protseq, endpoint); @@ -896,8 +913,8 @@ static RPC_STATUS rpcrt4_protseq_ncacn_ip_tcp_open_endpoint(RpcServerProtseq *pr if (ret < 0) { WARN("bind failed: %s\n", strerror(errno)); - close(sock); - if (errno == WSAEADDRINUSE) + closesocket(sock); + if (errno == EADDRINUSE) status = RPC_S_DUPLICATE_ENDPOINT; else status = RPC_S_CANT_CREATE_ENDPOINT; @@ -908,7 +925,7 @@ static RPC_STATUS rpcrt4_protseq_ncacn_ip_tcp_open_endpoint(RpcServerProtseq *pr endpoint, NULL, NULL, NULL); if (create_status != RPC_S_OK) { - close(sock); + closesocket(sock); status = create_status; continue; } @@ -926,8 +943,7 @@ static RPC_STATUS rpcrt4_protseq_ncacn_ip_tcp_open_endpoint(RpcServerProtseq *pr * race-condition (poll() says it is readable, connection drops, * and accept() blocks until the next connection comes...) */ - blocking = 1; - ret = ioctlsocket(sock, FIONBIO, &blocking); + ret = fcntl(sock, F_SETFL, O_NONBLOCK); if (ret < 0) { WARN("couldn't make socket non-blocking, error %d\n", ret); @@ -970,7 +986,6 @@ static RPC_STATUS rpcrt4_conn_tcp_handoff(RpcConnection *old_conn, RpcConnection int ret; struct sockaddr_in address; socklen_t addrsize; - u_long blocking; RpcConnection_tcp *server = (RpcConnection_tcp*) old_conn; RpcConnection_tcp *client = (RpcConnection_tcp*) new_conn; @@ -982,8 +997,7 @@ static RPC_STATUS rpcrt4_conn_tcp_handoff(RpcConnection *old_conn, RpcConnection return RPC_S_OUT_OF_RESOURCES; } /* reset to blocking behaviour */ - blocking = 0; - ret = ioctlsocket(ret, FIONBIO, &blocking); + fcntl(ret, F_SETFL, 0); client->sock = ret; TRACE("Accepted a new TCP connection\n"); return RPC_S_OK; @@ -1065,7 +1079,7 @@ static int rpcrt4_conn_tcp_close(RpcConnection *Connection) TRACE("%d\n", tcpc->sock); if (tcpc->sock != -1) - close(tcpc->sock); + closesocket(tcpc->sock); tcpc->sock = -1; close(tcpc->cancel_fds[0]); close(tcpc->cancel_fds[1]); @@ -1256,12 +1270,10 @@ static RpcServerProtseq *rpcrt4_protseq_sock_alloc(void) if (ps) { int fds[2]; - u_long blocking; if (!socketpair(PF_UNIX, SOCK_DGRAM, 0, fds)) { - blocking = 1; - ioctlsocket(fds[0], FIONBIO, &blocking); - ioctlsocket(fds[1], FIONBIO, &blocking); + fcntl(fds[0], F_SETFL, O_NONBLOCK); + fcntl(fds[1], F_SETFL, O_NONBLOCK); ps->mgr_event_rcv = fds[0]; ps->mgr_event_snd = fds[1]; } diff --git a/reactos/dll/win32/rpcrt4/rpcrt4.rbuild b/reactos/dll/win32/rpcrt4/rpcrt4.rbuild index 7fe08aa3ebc..73da7a23060 100644 --- a/reactos/dll/win32/rpcrt4/rpcrt4.rbuild +++ b/reactos/dll/win32/rpcrt4/rpcrt4.rbuild @@ -8,6 +8,7 @@ wine uuid + rpcrt4_epm_client kernel32 user32 advapi32 @@ -32,9 +33,12 @@ rpc_server.c rpc_transport.c rpcrt4_main.c - rpcss_np_client.c unix_func.c ndr_es.c rpcrt4.rc - rpcrt4.spec + epm.idl + . + + + epm.idl diff --git a/reactos/dll/win32/rpcrt4/rpcrt4.spec b/reactos/dll/win32/rpcrt4/rpcrt4.spec index 4c0d4eaa26a..2c86e68032f 100644 --- a/reactos/dll/win32/rpcrt4/rpcrt4.spec +++ b/reactos/dll/win32/rpcrt4/rpcrt4.spec @@ -99,7 +99,7 @@ @ stub MesBufferHandleReset @ stdcall MesDecodeBufferHandleCreate(ptr long ptr) @ stdcall MesDecodeIncrementalHandleCreate(ptr ptr ptr) -@ stub MesEncodeDynBufferHandleCreate +@ stdcall MesEncodeDynBufferHandleCreate(ptr ptr ptr) @ stdcall MesEncodeFixedBufferHandleCreate(ptr long ptr ptr) @ stdcall MesEncodeIncrementalHandleCreate(ptr ptr ptr ptr) @ stdcall MesHandleFree(ptr) @@ -363,7 +363,7 @@ @ stdcall RpcBindingVectorFree(ptr) @ stdcall RpcCancelAsyncCall(ptr long) RpcAsyncCancelCall @ stdcall RpcCancelThread(ptr) -@ stub RpcCancelThreadEx +@ stdcall RpcCancelThreadEx(ptr long) @ stub RpcCertGeneratePrincipalNameA @ stub RpcCertGeneratePrincipalNameW @ stdcall RpcCompleteAsyncCall(ptr ptr) RpcAsyncCompleteCall @@ -399,13 +399,13 @@ @ stdcall RpcMgmtInqIfIds(ptr ptr) @ stub RpcMgmtInqServerPrincNameA @ stub RpcMgmtInqServerPrincNameW -@ stub RpcMgmtInqStats +@ stdcall RpcMgmtInqStats(ptr ptr) @ stdcall RpcMgmtIsServerListening(ptr) @ stub RpcMgmtSetAuthorizationFn @ stdcall RpcMgmtSetCancelTimeout(long) @ stdcall RpcMgmtSetComTimeout(ptr long) @ stdcall RpcMgmtSetServerStackSize(long) -@ stub RpcMgmtStatsVectorFree +@ stdcall RpcMgmtStatsVectorFree(ptr) @ stdcall RpcMgmtStopServerListening(ptr) @ stdcall RpcMgmtWaitServerListen() @ stub RpcNetworkInqProtseqsA diff --git a/reactos/dll/win32/rpcrt4/rpcrt4_main.c b/reactos/dll/win32/rpcrt4/rpcrt4_main.c index f1b564d9540..1f0b1bbd615 100644 --- a/reactos/dll/win32/rpcrt4/rpcrt4_main.c +++ b/reactos/dll/win32/rpcrt4/rpcrt4_main.c @@ -53,19 +53,12 @@ #include "rpcproxy.h" #include "rpc_binding.h" -#include "rpcss_np_client.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(rpc); static UUID uuid_nil; -static HANDLE master_mutex; - -HANDLE RPCRT4_GetMasterMutex(void) -{ - return master_mutex; -} static CRITICAL_SECTION uuid_cs; static CRITICAL_SECTION_DEBUG critsect_debug = @@ -122,9 +115,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) switch (fdwReason) { case DLL_PROCESS_ATTACH: - master_mutex = CreateMutexA( NULL, FALSE, RPCSS_MASTER_MUTEX_NAME); - if (!master_mutex) - ERR("Failed to create master mutex\n"); break; case DLL_THREAD_DETACH: @@ -145,8 +135,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) break; case DLL_PROCESS_DETACH: - CloseHandle(master_mutex); - master_mutex = NULL; break; } @@ -265,7 +253,7 @@ int WINAPI UuidEqual(UUID *Uuid1, UUID *Uuid2, RPC_STATUS *Status) * * PARAMS * UUID *Uuid [I] Uuid to compare - * RPC_STATUS *Status [O] retuns RPC_S_OK + * RPC_STATUS *Status [O] returns RPC_S_OK * * RETURNS * TRUE/FALSE @@ -645,102 +633,6 @@ HRESULT WINAPI DllRegisterServer( void ) return S_OK; } -static BOOL RPCRT4_StartRPCSS(void) -{ - PROCESS_INFORMATION pi; - STARTUPINFOA si; - static char cmd[6]; - BOOL rslt; - - ZeroMemory(&pi, sizeof(PROCESS_INFORMATION)); - ZeroMemory(&si, sizeof(STARTUPINFOA)); - si.cb = sizeof(STARTUPINFOA); - - /* apparently it's not OK to use a constant string below */ - CopyMemory(cmd, "rpcss", 6); - - /* FIXME: will this do the right thing when run as a test? */ - rslt = CreateProcessA( - NULL, /* executable */ - cmd, /* command line */ - NULL, /* process security attributes */ - NULL, /* primary thread security attributes */ - FALSE, /* inherit handles */ - 0, /* creation flags */ - NULL, /* use parent's environment */ - NULL, /* use parent's current directory */ - &si, /* STARTUPINFO pointer */ - &pi /* PROCESS_INFORMATION */ - ); - - if (rslt) { - CloseHandle(pi.hProcess); - CloseHandle(pi.hThread); - } - - return rslt; -} - -/*********************************************************************** - * RPCRT4_RPCSSOnDemandCall (internal) - * - * Attempts to send a message to the RPCSS process - * on the local machine, invoking it if necessary. - * For remote RPCSS calls, use.... your imagination. - * - * PARAMS - * msg [I] pointer to the RPCSS message - * vardata_payload [I] pointer vardata portion of the RPCSS message - * reply [O] pointer to reply structure - * - * RETURNS - * TRUE if successful - * FALSE otherwise - */ -BOOL RPCRT4_RPCSSOnDemandCall(PRPCSS_NP_MESSAGE msg, char *vardata_payload, PRPCSS_NP_REPLY reply) -{ - HANDLE client_handle; - BOOL ret; - int i, j = 0; - - TRACE("(msg == %p, vardata_payload == %p, reply == %p)\n", msg, vardata_payload, reply); - - client_handle = RPCRT4_RpcssNPConnect(); - - while (INVALID_HANDLE_VALUE == client_handle) { - /* start the RPCSS process */ - if (!RPCRT4_StartRPCSS()) { - ERR("Unable to start RPCSS process.\n"); - return FALSE; - } - /* wait for a connection (w/ periodic polling) */ - for (i = 0; i < 60; i++) { - Sleep(200); - client_handle = RPCRT4_RpcssNPConnect(); - if (INVALID_HANDLE_VALUE != client_handle) break; - } - /* we are only willing to try twice */ - if (j++ >= 1) break; - } - - if (INVALID_HANDLE_VALUE == client_handle) { - /* no dice! */ - ERR("Unable to connect to RPCSS process!\n"); - SetLastError(RPC_E_SERVER_DIED_DNE); - return FALSE; - } - - /* great, we're connected. now send the message */ - ret = TRUE; - if (!RPCRT4_SendReceiveNPMsg(client_handle, msg, vardata_payload, reply)) { - ERR("Something is amiss: RPC_SendReceive failed.\n"); - ret = FALSE; - } - CloseHandle(client_handle); - - return ret; -} - #define MAX_RPC_ERROR_TEXT 256 /****************************************************************************** @@ -1076,20 +968,10 @@ NDR_SCONTEXT RPCRT4_PopThreadContextHandle(void) return context_handle; } -/****************************************************************************** - * RpcCancelThread (rpcrt4.@) - */ -RPC_STATUS RPC_ENTRY RpcCancelThread(void* ThreadHandle) +static RPC_STATUS rpc_cancel_thread(DWORD target_tid) { - DWORD target_tid; struct threaddata *tdata; - TRACE("(%p)\n", ThreadHandle); - - target_tid = GetThreadId(ThreadHandle); - if (!target_tid) - return RPC_S_INVALID_ARG; - EnterCriticalSection(&threaddata_cs); LIST_FOR_EACH_ENTRY(tdata, &threaddata_list, struct threaddata, entry) if (tdata->thread_id == target_tid) @@ -1103,3 +985,34 @@ RPC_STATUS RPC_ENTRY RpcCancelThread(void* ThreadHandle) return RPC_S_OK; } + +/****************************************************************************** + * RpcCancelThread (rpcrt4.@) + */ +RPC_STATUS RPC_ENTRY RpcCancelThread(void* ThreadHandle) +{ + TRACE("(%p)\n", ThreadHandle); + return RpcCancelThreadEx(ThreadHandle, 0); +} + +/****************************************************************************** + * RpcCancelThreadEx (rpcrt4.@) + */ +RPC_STATUS RPC_ENTRY RpcCancelThreadEx(void* ThreadHandle, LONG Timeout) +{ + DWORD target_tid; + + FIXME("(%p, %d)\n", ThreadHandle, Timeout); + + target_tid = GetThreadId(ThreadHandle); + if (!target_tid) + return RPC_S_INVALID_ARG; + + if (Timeout) + { + FIXME("(%p, %d)\n", ThreadHandle, Timeout); + return RPC_S_OK; + } + else + return rpc_cancel_thread(target_tid); +} diff --git a/reactos/dll/win32/rpcrt4/rpcrt4_ros.diff b/reactos/dll/win32/rpcrt4/rpcrt4_ros.diff index 31ffd1cb0be..548e18aacdb 100644 --- a/reactos/dll/win32/rpcrt4/rpcrt4_ros.diff +++ b/reactos/dll/win32/rpcrt4/rpcrt4_ros.diff @@ -1,8 +1,42 @@ +Index: epm_towers.h +=================================================================== +--- epm_towers.h (working copy) ++++ epm_towers.h (working copy) +@@ -17,11 +17,11 @@ + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +-#include "epm.h" ++#include "epm_c.h" + + #define EPM_PROTOCOL_DNET_NSP 0x04 + #define EPM_PROTOCOL_OSI_TP4 0x05 + #define EPM_PROTOCOL_OSI_CLNS 0x06 + #define EPM_PROTOCOL_TCP 0x07 +Index: rpc_epmap.c +=================================================================== +--- rpc_epmap.c (working copy) ++++ rpc_epmap.c (working copy) +@@ -30,11 +30,11 @@ + + #include "wine/debug.h" + #include "wine/exception.h" + + #include "rpc_binding.h" +-#include "epm.h" ++#include "epm_c.h" + #include "epm_towers.h" + + WINE_DEFAULT_DEBUG_CHANNEL(ole); + + /* The "real" RPC portmapper endpoints that I know of are: Index: rpc_server.c =================================================================== --- rpc_server.c (working copy) +++ rpc_server.c (working copy) -@@ -1017,22 +1017,30 @@ +@@ -1040,22 +1040,28 @@ /*********************************************************************** * RpcMgmtServerWaitListen (RPCRT4.@) */ @@ -18,14 +52,12 @@ Index: rpc_server.c return RPC_S_NOT_LISTENING; } -+ do -+ { ++ do { LeaveCriticalSection(&listen_cs); ++ LIST_FOR_EACH_ENTRY(cps, &protseqs, RpcServerProtseq, entry) ++ WaitForSingleObject(cps->server_ready_event, INFINITE); - FIXME("not waiting for server calls to finish\n"); -+ LIST_FOR_EACH_ENTRY(cps, &protseqs, RpcServerProtseq, entry) -+ WaitForSingleObject(cps->server_ready_event, INFINITE); -+ + EnterCriticalSection(&listen_cs); + } while (!std_listen); + @@ -39,11 +71,11 @@ Index: rpc_transport.c =================================================================== --- rpc_transport.c (working copy) +++ rpc_transport.c (working copy) -@@ -54,10 +54,13 @@ - #endif - #ifdef HAVE_SYS_POLL_H - #include - #endif +@@ -65,10 +65,13 @@ + # include + # endif + # define closesocket close + #endif /* defined(__MINGW32__) || defined (_MSC_VER) */ +#include +#include @@ -53,7 +85,7 @@ Index: rpc_transport.c #include "winnls.h" #include "winerror.h" #include "winternl.h" -@@ -71,10 +74,12 @@ +@@ -82,10 +85,12 @@ #include "rpc_binding.h" #include "rpc_message.h" #include "rpc_server.h" @@ -66,7 +98,7 @@ Index: rpc_transport.c #endif WINE_DEFAULT_DEBUG_CHANNEL(rpc); -@@ -83,11 +88,11 @@ +@@ -94,11 +99,11 @@ typedef struct _RpcConnection_np { @@ -79,25 +111,27 @@ Index: rpc_transport.c static RpcConnection *rpcrt4_conn_np_alloc(void) { -@@ -105,15 +110,15 @@ - { - if (npc->listening) +@@ -118,17 +123,17 @@ return RPC_S_OK; npc->listening = TRUE; -- if (ConnectNamedPipe(npc->pipe, &npc->ovl)) -+ if (ConnectNamedPipe(npc->pipe, &npc->ovl[0])) - return RPC_S_OK; + for (;;) + { +- if (ConnectNamedPipe(npc->pipe, &npc->ovl)) ++ if (ConnectNamedPipe(npc->pipe, &npc->ovl[0])) + return RPC_S_OK; - if (GetLastError() == ERROR_PIPE_CONNECTED) { -- SetEvent(npc->ovl.hEvent); -+ SetEvent(npc->ovl[0].hEvent); - return RPC_S_OK; - } - if (GetLastError() == ERROR_IO_PENDING) { - /* will be completed in rpcrt4_protseq_np_wait_for_new_connection */ - return RPC_S_OK; -@@ -126,11 +131,11 @@ + switch(GetLastError()) + { + case ERROR_PIPE_CONNECTED: +- SetEvent(npc->ovl.hEvent); ++ SetEvent(npc->ovl[0].hEvent); + return RPC_S_OK; + case ERROR_IO_PENDING: + /* will be completed in rpcrt4_protseq_np_wait_for_new_connection */ + return RPC_S_OK; + case ERROR_NO_DATA_DETECTED: +@@ -146,11 +151,11 @@ static RPC_STATUS rpcrt4_conn_create_pipe(RpcConnection *Connection, LPCSTR pname) { RpcConnection_np *npc = (RpcConnection_np *) Connection; @@ -110,7 +144,7 @@ Index: rpc_transport.c RPC_MAX_PACKET_SIZE, RPC_MAX_PACKET_SIZE, 5000, NULL); if (npc->pipe == INVALID_HANDLE_VALUE) { WARN("CreateNamedPipe failed with error %d\n", GetLastError()); -@@ -139,11 +144,12 @@ +@@ -159,11 +164,12 @@ else return RPC_S_CANT_CREATE_ENDPOINT; } @@ -124,7 +158,7 @@ Index: rpc_transport.c * server thread as the thread must be alertable */ return RPC_S_OK; } -@@ -202,11 +208,13 @@ +@@ -220,11 +226,12 @@ /* success */ memset(&npc->ovl, 0, sizeof(npc->ovl)); /* pipe is connected; change to message-read mode. */ @@ -133,13 +167,12 @@ Index: rpc_transport.c - npc->ovl.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); + npc->ovl[0].hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); + npc->ovl[1].hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); -+ npc->pipe = pipe; return RPC_S_OK; } -@@ -308,11 +316,12 @@ +@@ -326,11 +333,12 @@ { /* because of the way named pipes work, we'll transfer the connected pipe * to the child, then reopen the server binding to continue listening */ @@ -153,7 +186,7 @@ Index: rpc_transport.c old_npc->listening = FALSE; } -@@ -359,13 +368,18 @@ +@@ -377,13 +385,18 @@ unsigned int bytes_left = count; while (bytes_left) @@ -163,39 +196,39 @@ Index: rpc_transport.c - if (!ret || !bytes_read) + ret = ReadFile(npc->pipe, buf, bytes_left, &bytes_read, &npc->ovl[0]); + if ((!ret || !bytes_read) && (GetLastError() != ERROR_IO_PENDING)) - break; ++ break; + + ret = GetOverlappedResult(npc->pipe, &npc->ovl[0], &bytes_read, TRUE); -+ if (!ret && GetLastError() != ERROR_MORE_DATA) -+ break; ++ if (!ret && (GetLastError() != ERROR_MORE_DATA)) + break; + bytes_left -= bytes_read; buf += bytes_read; } return ret ? count : -1; } -@@ -379,13 +393,18 @@ +@@ -397,13 +410,18 @@ unsigned int bytes_left = count; while (bytes_left) { DWORD bytes_written; -- ret = WriteFile(npc->pipe, buf, count, &bytes_written, NULL); +- ret = WriteFile(npc->pipe, buf, bytes_left, &bytes_written, NULL); - if (!ret || !bytes_written) -+ ret = WriteFile(npc->pipe, buf, count, &bytes_written, &npc->ovl[1]); ++ ret = WriteFile(npc->pipe, buf, bytes_left, &bytes_written, &npc->ovl[1]); + if ((!ret || !bytes_written) && (GetLastError() != ERROR_IO_PENDING)) - break; ++ break; + + ret = GetOverlappedResult(npc->pipe, &npc->ovl[1], &bytes_written, TRUE); -+ if (!ret && GetLastError() != ERROR_MORE_DATA) -+ break; ++ if (!ret && (GetLastError() != ERROR_MORE_DATA)) + break; + bytes_left -= bytes_written; buf += bytes_written; } return ret ? count : -1; } -@@ -396,14 +415,19 @@ +@@ -414,13 +432,17 @@ if (npc->pipe) { FlushFileBuffers(npc->pipe); CloseHandle(npc->pipe); @@ -212,13 +245,11 @@ Index: rpc_transport.c + CloseHandle(npc->ovl[1].hEvent); + npc->ovl[1].hEvent = 0; } -+ return 0; } static void rpcrt4_conn_np_cancel_call(RpcConnection *Connection) - { -@@ -547,11 +571,11 @@ +@@ -579,11 +601,11 @@ /* open and count connections */ *count = 1; conn = CONTAINING_RECORD(protseq->conn, RpcConnection_np, common); @@ -231,7 +262,7 @@ Index: rpc_transport.c } /* make array of connections */ -@@ -568,11 +592,11 @@ +@@ -600,11 +622,11 @@ objs[0] = npps->mgr_event; *count = 1; @@ -244,7 +275,7 @@ Index: rpc_transport.c } LeaveCriticalSection(&protseq->cs); return objs; -@@ -615,11 +639,11 @@ +@@ -647,11 +669,11 @@ b_handle = objs[res - WAIT_OBJECT_0]; /* find which connection got a RPC */ EnterCriticalSection(&protseq->cs); @@ -257,120 +288,3 @@ Index: rpc_transport.c cconn = NULL; if (conn) RPCRT4_SpawnConnection(&cconn, &conn->common); -@@ -713,16 +737,18 @@ - RpcConnection_tcp *tcpc; - tcpc = HeapAlloc(GetProcessHeap(), 0, sizeof(RpcConnection_tcp)); - if (tcpc == NULL) - return NULL; - tcpc->sock = -1; -+#ifndef __REACTOS__ - if (socketpair(PF_UNIX, SOCK_STREAM, 0, tcpc->cancel_fds) < 0) - { - ERR("socketpair() failed: %s\n", strerror(errno)); - HeapFree(GetProcessHeap(), 0, tcpc); - return NULL; - } -+#endif - return &tcpc->common; - } - - static RPC_STATUS rpcrt4_ncacn_ip_tcp_open(RpcConnection* Connection) - { -@@ -783,12 +809,11 @@ - continue; - } - - /* RPC depends on having minimal latency so disable the Nagle algorithm */ - val = 1; -- setsockopt(sock, SOL_TCP, TCP_NODELAY, &val, sizeof(val)); -- fcntl(sock, F_SETFL, O_NONBLOCK); /* make socket nonblocking */ -+ setsockopt(sock, SOL_TCP, TCP_NODELAY, (char *)&val, sizeof(val)); - - tcpc->sock = sock; - - freeaddrinfo(ai); - TRACE("connected\n"); -@@ -806,10 +831,11 @@ - int sock; - int ret; - struct addrinfo *ai; - struct addrinfo *ai_cur; - struct addrinfo hints; -+ u_long blocking; - RpcConnection *first_connection = NULL; - - TRACE("(%p, %s)\n", protseq, endpoint); - - hints.ai_flags = AI_PASSIVE /* for non-localhost addresses */; -@@ -857,11 +883,11 @@ - ret = bind(sock, ai_cur->ai_addr, ai_cur->ai_addrlen); - if (ret < 0) - { - WARN("bind failed: %s\n", strerror(errno)); - close(sock); -- if (errno == EADDRINUSE) -+ if (errno == WSAEADDRINUSE) - status = RPC_S_DUPLICATE_ENDPOINT; - else - status = RPC_S_CANT_CREATE_ENDPOINT; - continue; - } -@@ -886,11 +912,12 @@ - } - /* need a non-blocking socket, otherwise accept() has a potential - * race-condition (poll() says it is readable, connection drops, - * and accept() blocks until the next connection comes...) - */ -- ret = fcntl(sock, F_SETFL, O_NONBLOCK); -+ blocking = 1; -+ ret = ioctlsocket(sock, FIONBIO, &blocking); - if (ret < 0) - { - WARN("couldn't make socket non-blocking, error %d\n", ret); - RPCRT4_DestroyConnection(&tcpc->common); - status = RPC_S_OUT_OF_RESOURCES; -@@ -929,10 +956,11 @@ - static RPC_STATUS rpcrt4_conn_tcp_handoff(RpcConnection *old_conn, RpcConnection *new_conn) - { - int ret; - struct sockaddr_in address; - socklen_t addrsize; -+ u_long blocking; - RpcConnection_tcp *server = (RpcConnection_tcp*) old_conn; - RpcConnection_tcp *client = (RpcConnection_tcp*) new_conn; - - addrsize = sizeof(address); - ret = accept(server->sock, (struct sockaddr*) &address, &addrsize); -@@ -940,11 +968,12 @@ - { - ERR("Failed to accept a TCP connection: error %d\n", ret); - return RPC_S_OUT_OF_RESOURCES; - } - /* reset to blocking behaviour */ -- fcntl(ret, F_SETFL, 0); -+ blocking = 0; -+ ret = ioctlsocket(ret, FIONBIO, &blocking); - client->sock = ret; - TRACE("Accepted a new TCP connection\n"); - return RPC_S_OK; - } - -@@ -1187,14 +1216,16 @@ - { - RpcServerProtseq_sock *ps = HeapAlloc(GetProcessHeap(), 0, sizeof(*ps)); - if (ps) - { - int fds[2]; -+ u_long blocking; - if (!socketpair(PF_UNIX, SOCK_DGRAM, 0, fds)) - { -- fcntl(fds[0], F_SETFL, O_NONBLOCK); -- fcntl(fds[1], F_SETFL, O_NONBLOCK); -+ blocking = 1; -+ ioctlsocket(fds[0], FIONBIO, &blocking); -+ ioctlsocket(fds[1], FIONBIO, &blocking); - ps->mgr_event_rcv = fds[0]; - ps->mgr_event_snd = fds[1]; - } - else - { diff --git a/reactos/dll/win32/rpcrt4/rpcss_np_client.c b/reactos/dll/win32/rpcrt4/rpcss_np_client.c deleted file mode 100644 index 016f77f5f15..00000000000 --- a/reactos/dll/win32/rpcrt4/rpcss_np_client.c +++ /dev/null @@ -1,152 +0,0 @@ -/* - * RPCSS named pipe client implementation - * - * Copyright (C) 2002 Greg Turner - * - * 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 - */ - -#include -#include - -#include "windef.h" -#include "winbase.h" -#include "wine/rpcss_shared.h" -#include "wine/debug.h" - -#include "rpc_binding.h" - -WINE_DEFAULT_DEBUG_CHANNEL(ole); - -HANDLE RPCRT4_RpcssNPConnect(void) -{ - HANDLE the_pipe; - DWORD dwmode, wait_result; - HANDLE master_mutex = RPCRT4_GetMasterMutex(); - - TRACE("\n"); - - while (TRUE) { - - wait_result = WaitForSingleObject(master_mutex, MASTER_MUTEX_TIMEOUT); - switch (wait_result) { - case WAIT_ABANDONED: - case WAIT_OBJECT_0: - break; - case WAIT_FAILED: - case WAIT_TIMEOUT: - default: - ERR("This should never happen: couldn't enter mutex.\n"); - return NULL; - } - - /* try to open the client side of the named pipe. */ - the_pipe = CreateFileA( - NAME_RPCSS_NAMED_PIPE, /* pipe name */ - GENERIC_READ | GENERIC_WRITE, /* r/w access */ - 0, /* no sharing */ - NULL, /* no security attributes */ - OPEN_EXISTING, /* open an existing pipe */ - 0, /* default attributes */ - NULL /* no template file */ - ); - - if (the_pipe != INVALID_HANDLE_VALUE) - break; - - if (GetLastError() != ERROR_PIPE_BUSY) { - WARN("Unable to open named pipe %s (assuming unavailable).\n", - debugstr_a(NAME_RPCSS_NAMED_PIPE)); - break; - } - - WARN("Named pipe busy (will wait)\n"); - - if (!ReleaseMutex(master_mutex)) - ERR("Failed to release master mutex. Expect deadlock.\n"); - - /* wait for the named pipe. We are only willing to wait for 5 seconds. - It should be available /very/ soon. */ - if (! WaitNamedPipeA(NAME_RPCSS_NAMED_PIPE, MASTER_MUTEX_WAITNAMEDPIPE_TIMEOUT)) - { - ERR("Named pipe unavailable after waiting. Something is probably wrong.\n"); - break; - } - - } - - if (the_pipe != INVALID_HANDLE_VALUE) { - dwmode = PIPE_READMODE_MESSAGE; - /* SetNamedPipeHandleState not implemented ATM, but still seems to work somehow. */ - if (! SetNamedPipeHandleState(the_pipe, &dwmode, NULL, NULL)) - WARN("Failed to set pipe handle state\n"); - } - - if (!ReleaseMutex(master_mutex)) - ERR("Uh oh, failed to leave the RPC Master Mutex!\n"); - - return the_pipe; -} - -BOOL RPCRT4_SendReceiveNPMsg(HANDLE np, PRPCSS_NP_MESSAGE msg, char *vardata, PRPCSS_NP_REPLY reply) -{ - DWORD count; - UINT32 payload_offset; - RPCSS_NP_MESSAGE vardata_payload_msg; - - TRACE("(np == %p, msg == %p, vardata == %p, reply == %p)\n", - np, msg, vardata, reply); - - if (! WriteFile(np, msg, sizeof(RPCSS_NP_MESSAGE), &count, NULL)) { - ERR("write failed.\n"); - return FALSE; - } - - if (count != sizeof(RPCSS_NP_MESSAGE)) { - ERR("write count mismatch.\n"); - return FALSE; - } - - /* process the vardata payload if necessary */ - vardata_payload_msg.message_type = RPCSS_NP_MESSAGE_TYPEID_VARDATAPAYLOADMSG; - vardata_payload_msg.vardata_payload_size = 0; /* meaningless */ - for ( payload_offset = 0; payload_offset < msg->vardata_payload_size; - payload_offset += VARDATA_PAYLOAD_BYTES ) { - TRACE("sending vardata payload. vd=%p, po=%d, ps=%d\n", vardata, - payload_offset, msg->vardata_payload_size); - ZeroMemory(vardata_payload_msg.message.vardatapayloadmsg.payload, VARDATA_PAYLOAD_BYTES); - CopyMemory(vardata_payload_msg.message.vardatapayloadmsg.payload, - vardata, - min( VARDATA_PAYLOAD_BYTES, msg->vardata_payload_size - payload_offset )); - vardata += VARDATA_PAYLOAD_BYTES; - if (! WriteFile(np, &vardata_payload_msg, sizeof(RPCSS_NP_MESSAGE), &count, NULL)) { - ERR("vardata write failed at %u bytes.\n", payload_offset); - return FALSE; - } - } - - if (! ReadFile(np, reply, sizeof(RPCSS_NP_REPLY), &count, NULL)) { - ERR("read failed.\n"); - return FALSE; - } - - if (count != sizeof(RPCSS_NP_REPLY)) { - ERR("read count mismatch. got %d.\n", count); - return FALSE; - } - - /* message execution was successful */ - return TRUE; -} diff --git a/reactos/dll/win32/rpcrt4/unix_func.c b/reactos/dll/win32/rpcrt4/unix_func.c index 9e29098756e..ad4de8b1fbb 100644 --- a/reactos/dll/win32/rpcrt4/unix_func.c +++ b/reactos/dll/win32/rpcrt4/unix_func.c @@ -167,3 +167,11 @@ inet_ntop (int af, return 0; } + +int fcntl(int fd, + int cmd, + long arg) +{ + // Stub + return 0; +} diff --git a/reactos/dll/win32/rpcrt4/unix_func.h b/reactos/dll/win32/rpcrt4/unix_func.h index b4c04976458..c56427d2df1 100644 --- a/reactos/dll/win32/rpcrt4/unix_func.h +++ b/reactos/dll/win32/rpcrt4/unix_func.h @@ -14,6 +14,15 @@ struct pollfd short revents; /* returned events */ }; +#define F_SETFL 4 /* set file->f_flags */ + +#ifndef O_NONBLOCK +#define O_NONBLOCK 00004000 +#endif + +#define EINTR 4 /* Interrupted system call */ + int poll(struct pollfd *fds, unsigned long nfds, int timo); int socketpair (int af, int type, int protocol, SOCKET socket[2]); const char * inet_ntop (int af, const void *src, char *dst, size_t cnt); +int fcntl(int fd, int cmd, long arg); diff --git a/reactos/dll/win32/rsabase/rsabase.rbuild b/reactos/dll/win32/rsabase/rsabase.rbuild index 15976242c98..c86ac676398 100644 --- a/reactos/dll/win32/rsabase/rsabase.rbuild +++ b/reactos/dll/win32/rsabase/rsabase.rbuild @@ -12,6 +12,5 @@ kernel32 ntdll version.rc - rsabase.spec diff --git a/reactos/dll/win32/rsaenh/rsaenh.rbuild b/reactos/dll/win32/rsaenh/rsaenh.rbuild index 9aaad68f9d9..e68a6cf87e8 100644 --- a/reactos/dll/win32/rsaenh/rsaenh.rbuild +++ b/reactos/dll/win32/rsaenh/rsaenh.rbuild @@ -18,7 +18,6 @@ rsa.c rsaenh.c version.rc - rsaenh.spec wine crypt32 advapi32 diff --git a/reactos/dll/win32/samsrv/samsrv.rbuild b/reactos/dll/win32/samsrv/samsrv.rbuild index fb0e46298a3..805b97dbd71 100644 --- a/reactos/dll/win32/samsrv/samsrv.rbuild +++ b/reactos/dll/win32/samsrv/samsrv.rbuild @@ -7,5 +7,4 @@ kernel32 samsrv.c samsrv.rc - samsrv.spec diff --git a/reactos/dll/win32/schannel/schannel.rbuild b/reactos/dll/win32/schannel/schannel.rbuild index c11ea8cde36..266313cbc2e 100644 --- a/reactos/dll/win32/schannel/schannel.rbuild +++ b/reactos/dll/win32/schannel/schannel.rbuild @@ -13,5 +13,4 @@ schannel_main.c usermode.c version.rc - schannel.spec diff --git a/reactos/dll/win32/secur32/secur32.rbuild b/reactos/dll/win32/secur32/secur32.rbuild index 200c67a551f..18a31c42b7e 100644 --- a/reactos/dll/win32/secur32/secur32.rbuild +++ b/reactos/dll/win32/secur32/secur32.rbuild @@ -11,6 +11,5 @@ secext.c sspi.c secur32.rc - secur32.spec precomp.h diff --git a/reactos/dll/win32/sensapi/sensapi.rbuild b/reactos/dll/win32/sensapi/sensapi.rbuild index 6d766fb2f76..c4408d1e8ec 100644 --- a/reactos/dll/win32/sensapi/sensapi.rbuild +++ b/reactos/dll/win32/sensapi/sensapi.rbuild @@ -9,5 +9,4 @@ kernel32 ntdll sensapi.c - sensapi.spec diff --git a/reactos/dll/win32/serialui/serialui.rbuild b/reactos/dll/win32/serialui/serialui.rbuild index eb43bd52fea..af942fcfb3b 100644 --- a/reactos/dll/win32/serialui/serialui.rbuild +++ b/reactos/dll/win32/serialui/serialui.rbuild @@ -6,5 +6,4 @@ shlwapi serialui.c serialui.rc - serialui.spec diff --git a/reactos/dll/win32/setupapi/setupapi.rbuild b/reactos/dll/win32/setupapi/setupapi.rbuild index 53c5f1bb97c..92d723b4bc8 100644 --- a/reactos/dll/win32/setupapi/setupapi.rbuild +++ b/reactos/dll/win32/setupapi/setupapi.rbuild @@ -36,5 +36,4 @@ stubs.c rpc.c setupapi.rc - setupapi.spec diff --git a/reactos/dll/win32/sfc/sfc.rbuild b/reactos/dll/win32/sfc/sfc.rbuild index 263c55ca301..527c0f6f07d 100644 --- a/reactos/dll/win32/sfc/sfc.rbuild +++ b/reactos/dll/win32/sfc/sfc.rbuild @@ -3,6 +3,5 @@ . kernel32 sfc.c - sfc.spec precomp.h diff --git a/reactos/dll/win32/sfc_os/sfc_os.rbuild b/reactos/dll/win32/sfc_os/sfc_os.rbuild index 6cc89c87ae9..4209bfda2df 100644 --- a/reactos/dll/win32/sfc_os/sfc_os.rbuild +++ b/reactos/dll/win32/sfc_os/sfc_os.rbuild @@ -3,6 +3,5 @@ . kernel32 sfc_os.c - sfc_os.spec precomp.h diff --git a/reactos/dll/win32/shdocvw/shdocvw.rbuild b/reactos/dll/win32/shdocvw/shdocvw.rbuild index 34ec1935482..69258a12700 100644 --- a/reactos/dll/win32/shdocvw/shdocvw.rbuild +++ b/reactos/dll/win32/shdocvw/shdocvw.rbuild @@ -28,5 +28,4 @@ view.c webbrowser.c shdocvw.rc - shdocvw.spec diff --git a/reactos/dll/win32/shell32/dialogs.c b/reactos/dll/win32/shell32/dialogs.c index d2fcf062349..7641816c051 100644 --- a/reactos/dll/win32/shell32/dialogs.c +++ b/reactos/dll/win32/shell32/dialogs.c @@ -117,7 +117,7 @@ INT_PTR CALLBACK PickIconProc(HWND hwndDlg, pIconContext = (PPICK_ICON_CONTEXT)lParam; SetWindowLong(hwndDlg, DWLP_USER, (LONG)pIconContext); pIconContext->hDlgCtrl = GetDlgItem(hwndDlg, IDC_PICKICON_LIST); - EnumResourceNamesW(pIconContext->hLibrary, MAKEINTRESOURCEW(RT_ICON), EnumPickIconResourceProc, (LPARAM)pIconContext); + EnumResourceNamesW(pIconContext->hLibrary, RT_ICON, EnumPickIconResourceProc, (LPARAM)pIconContext); if (PathUnExpandEnvStringsW(pIconContext->szName, szText, MAX_PATH)) SendDlgItemMessageW(hwndDlg, IDC_EDIT_PATH, WM_SETTEXT, 0, (LPARAM)szText); else @@ -174,7 +174,7 @@ INT_PTR CALLBACK PickIconProc(HWND hwndDlg, FreeLibrary(pIconContext->hLibrary); pIconContext->hLibrary = hLibrary; wcscpy(pIconContext->szName, szText); - EnumResourceNamesW(pIconContext->hLibrary, MAKEINTRESOURCEW(RT_ICON), EnumPickIconResourceProc, (LPARAM)pIconContext); + EnumResourceNamesW(pIconContext->hLibrary, RT_ICON, EnumPickIconResourceProc, (LPARAM)pIconContext); if (PathUnExpandEnvStringsW(pIconContext->szName, szText, MAX_PATH)) SendDlgItemMessageW(hwndDlg, IDC_EDIT_PATH, WM_SETTEXT, 0, (LPARAM)szText); else diff --git a/reactos/dll/win32/shell32/drive.c b/reactos/dll/win32/shell32/drive.c index 63083b2f2bc..3b5146d88e2 100644 --- a/reactos/dll/win32/shell32/drive.c +++ b/reactos/dll/win32/shell32/drive.c @@ -296,6 +296,11 @@ GetFreeBytesShare(LARGE_INTEGER TotalNumberOfFreeBytes, LARGE_INTEGER TotalNumbe { LARGE_INTEGER Temp, Result, Remainder; + if (TotalNumberOfFreeBytes.QuadPart == 0LL) + { + return ConvertUlongToLargeInteger(0); + } + Temp = LargeIntegerDivide(TotalNumberOfBytes, ConvertUlongToLargeInteger(100), &Remainder); if (Temp.QuadPart >= TotalNumberOfFreeBytes.QuadPart) { @@ -388,7 +393,7 @@ InitializeGeneralDriveDialog(HWND hwndDlg, WCHAR * szDrive) } DriveType = GetDriveTypeW(szDrive); - if (DriveType == DRIVE_FIXED) + if (DriveType == DRIVE_FIXED || DriveType == DRIVE_CDROM) { if(GetDiskFreeSpaceExW(szDrive, &FreeBytesAvailable, (PULARGE_INTEGER)&TotalNumberOfBytes, (PULARGE_INTEGER)&TotalNumberOfFreeBytes)) diff --git a/reactos/dll/win32/shell32/lang/sk-SK.rc b/reactos/dll/win32/shell32/lang/sk-SK.rc index bc4b3fbee07..11f6fd4fe0e 100644 --- a/reactos/dll/win32/shell32/lang/sk-SK.rc +++ b/reactos/dll/win32/shell32/lang/sk-SK.rc @@ -1,7 +1,7 @@ /* TRANSLATOR : Mбrio Kaиmбr /Mario Kacmar/ aka Kario (kario@szm.sk) * NOTE : partially translated * TRANSLATED : 26-12-2007 - * LAST CHANGE: 18-09-2008 + * LAST CHANGE: 26-10-2008 */ /* @@ -421,15 +421,15 @@ STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Typy sъborov" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN -LTEXT "Registered file &types:", -1, 7, 10, 70, 10 +LTEXT "Registrovanй &typy sъborov:", -1, 7, 10, 70, 10 CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 -PUSHBUTTON "&New", 14001, 120, 110, 50, 14, WS_TABSTOP -PUSHBUTTON "&Delete", 14002, 180, 110, 50, 14, WS_TABSTOP -GROUPBOX "Details for '%s' extension", 14003, 7, 130, 249, 70 +PUSHBUTTON "&Novэ", 14001, 120, 110, 50, 14, WS_TABSTOP +PUSHBUTTON "O&dstrбniќ", 14002, 180, 110, 50, 14, WS_TABSTOP +GROUPBOX "Podrobnosti o prнpone '%s'", 14003, 7, 130, 249, 70 //Details for '%s' extension LTEXT "Opens with:", -1, 12, 140, 40, 10 //ICON LTEXT "Appname", 14005, 100, 140, 40, 10 -PUSHBUTTON "&Change...", 14006, 180, 140, 50, 14, WS_TABSTOP +PUSHBUTTON "&Zmeniќ...", 14006, 180, 140, 50, 14, WS_TABSTOP LTEXT "Files with extension '%s' are of type '%s'. To\nchange settings that affect all '%s' files, click\nAdvanced.", 14007, 12, 155, 160, 30 PUSHBUTTON "Ad&vanced", 14008, 180, 175, 50, 14, WS_TABSTOP END @@ -646,7 +646,7 @@ BEGIN IDS_RESTORE "&Obnoviќ" IDS_FORMATDRIVE "Formбtovaќ..." IDS_RENAME "Premenovaќ" - IDS_INSERT "Insert" + IDS_INSERT "Vloћiќ" IDS_CREATEFOLDER_DENIED "Nie je moћnй vytvoriќ novэ prieиinok: Prнstup zamietnutэ." IDS_CREATEFOLDER_CAPTION "Chyba poиas vytvбrania novйho prieиinka" @@ -725,12 +725,12 @@ BEGIN IDS_OPEN_WITH_FILTER "Spustiteѕnй sъbory\0*.exe\0" IDS_DIRECTORY "Prieиinok" IDS_VIRTUAL_DRIVER "Virtual Device Driver" - IDS_BAT_FILE "ReactOS Batch File" - IDS_CMD_FILE "ReactOS Command Script" + IDS_BAT_FILE "Dбvkovэ sъbor systйmu ReactOS" + IDS_CMD_FILE "Prнkazovэ skript systйmu ReactOS" IDS_COM_FILE "DOS aplikбcia" IDS_CPL_FILE "Poloћka ovlбdacieho panela" IDS_CUR_FILE "Kurzor" - IDS_DLL_FILE "Application Extension" + IDS_DLL_FILE "Rozљнrenie aplikбcie" IDS_DRV_FILE "Ovlбdaи zariadenia" IDS_EXE_FILE "Aplikбcia" IDS_FON_FILE "Sъbor pнsma" diff --git a/reactos/dll/win32/shell32/shell32.rbuild b/reactos/dll/win32/shell32/shell32.rbuild index d695726a54b..c9b1a32c6a2 100644 --- a/reactos/dll/win32/shell32/shell32.rbuild +++ b/reactos/dll/win32/shell32/shell32.rbuild @@ -70,7 +70,6 @@ shv_def_cmenu.c startmenu.c ros-systray.c - shell32.spec fprop.c drive.c she_ocmenu.c diff --git a/reactos/dll/win32/shell32/shfldr_cpanel.c b/reactos/dll/win32/shell32/shfldr_cpanel.c index 066c99bdc0e..2f100992443 100644 --- a/reactos/dll/win32/shell32/shfldr_cpanel.c +++ b/reactos/dll/win32/shell32/shfldr_cpanel.c @@ -1212,7 +1212,7 @@ static HRESULT WINAPI ICPanel_IContextMenu2_QueryContextMenu( if (LoadStringW(shell32_hInstance, IDS_OPEN, szBuffer, sizeof(szBuffer)/sizeof(WCHAR))) { szBuffer[(sizeof(szBuffer)/sizeof(WCHAR))-1] = L'\0'; - _InsertMenuItemW(hMenu, indexMenu++, TRUE, idCmdFirst + Count, MFT_STRING, szBuffer, MFS_DEFAULT); + _InsertMenuItemW(hMenu, indexMenu++, TRUE, IDS_OPEN, MFT_STRING, szBuffer, MFS_DEFAULT); //FIXME identifier Count++; } @@ -1224,7 +1224,7 @@ static HRESULT WINAPI ICPanel_IContextMenu2_QueryContextMenu( } szBuffer[(sizeof(szBuffer)/sizeof(WCHAR))-1] = L'\0'; - _InsertMenuItemW(hMenu, indexMenu++, TRUE, idCmdFirst + Count, MFT_STRING, szBuffer, MFS_ENABLED); + _InsertMenuItemW(hMenu, indexMenu++, TRUE, IDS_CREATELINK, MFT_STRING, szBuffer, MFS_ENABLED); //FIXME identifier Count++; } return MAKE_HRESULT(SEVERITY_SUCCESS, 0, Count); @@ -1251,7 +1251,7 @@ static HRESULT WINAPI ICPanel_IContextMenu2_InvokeCommand( TRACE("(%p)->(invcom=%p verb=%p wnd=%p)\n",This,lpcmi,lpcmi->lpVerb, lpcmi->hwnd); - if (lpcmi->lpVerb == MAKEINTRESOURCEA(1)) + if (lpcmi->lpVerb == MAKEINTRESOURCEA(IDS_OPEN)) //FIXME { ZeroMemory(&sei, sizeof(sei)); sei.cbSize = sizeof(sei); @@ -1264,7 +1264,7 @@ static HRESULT WINAPI ICPanel_IContextMenu2_InvokeCommand( if (sei.hInstApp <= (HINSTANCE)32) return E_FAIL; } - else if (lpcmi->lpVerb == MAKEINTRESOURCEA(2)) + else if (lpcmi->lpVerb == MAKEINTRESOURCEA(IDS_CREATELINK)) //FIXME { if (!SHGetSpecialFolderPathW(NULL, szPath, CSIDL_DESKTOPDIRECTORY, FALSE)) return E_FAIL; diff --git a/reactos/dll/win32/shell32/shlview.c b/reactos/dll/win32/shell32/shlview.c index 4dc6260672b..4de993a8f7c 100644 --- a/reactos/dll/win32/shell32/shlview.c +++ b/reactos/dll/win32/shell32/shlview.c @@ -887,10 +887,12 @@ static HRESULT ShellView_OpenSelectedItems(IShellViewImpl * This) ici.lpVerb = MAKEINTRESOURCEA( def ); ici.hwnd = This->hWnd; - IContextMenu_InvokeCommand(cm, (LPCMINVOKECOMMANDINFO) &ici ); - IContextMenu_Release(cm); - DestroyMenu( hmenu ); - return S_OK; + if (IContextMenu_InvokeCommand(cm, (LPCMINVOKECOMMANDINFO) &ici ) == S_OK) + { + IContextMenu_Release(cm); + DestroyMenu( hmenu ); + return S_OK; + } } } diff --git a/reactos/dll/win32/shfolder/shfolder.rbuild b/reactos/dll/win32/shfolder/shfolder.rbuild index 1a0e0eb0660..7ad1332f8db 100644 --- a/reactos/dll/win32/shfolder/shfolder.rbuild +++ b/reactos/dll/win32/shfolder/shfolder.rbuild @@ -7,7 +7,6 @@ include/reactos/wine version.rc - shfolder.spec wine shell32 kernel32 diff --git a/reactos/dll/win32/shimgvw/shimgvw.rbuild b/reactos/dll/win32/shimgvw/shimgvw.rbuild index 07ff24d7d27..8d42f9acdff 100644 --- a/reactos/dll/win32/shimgvw/shimgvw.rbuild +++ b/reactos/dll/win32/shimgvw/shimgvw.rbuild @@ -11,5 +11,4 @@ gdiplus shimgvw.c shimgvw.rc - shimgvw.spec diff --git a/reactos/dll/win32/shlwapi/shlwapi.rbuild b/reactos/dll/win32/shlwapi/shlwapi.rbuild index 297273f3524..018a26d248a 100644 --- a/reactos/dll/win32/shlwapi/shlwapi.rbuild +++ b/reactos/dll/win32/shlwapi/shlwapi.rbuild @@ -21,7 +21,6 @@ url.c wsprintf.c shlwapi.rc - shlwapi.spec wine uuid user32 diff --git a/reactos/dll/win32/snmpapi/snmpapi.rbuild b/reactos/dll/win32/snmpapi/snmpapi.rbuild index ad9960e078a..2066ff617d2 100644 --- a/reactos/dll/win32/snmpapi/snmpapi.rbuild +++ b/reactos/dll/win32/snmpapi/snmpapi.rbuild @@ -6,5 +6,4 @@ kernel32 snmpapi.c snmpapi.rc - snmpapi.spec diff --git a/reactos/dll/win32/stdole2.tlb/stdole2.rbuild b/reactos/dll/win32/stdole2.tlb/stdole2.rbuild index e238a4a6624..c9380ba5ecb 100644 --- a/reactos/dll/win32/stdole2.tlb/stdole2.rbuild +++ b/reactos/dll/win32/stdole2.tlb/stdole2.rbuild @@ -13,7 +13,6 @@ std_ole_v2 kernel32 - stdole2.tlb.spec rsrc.rc diff --git a/reactos/dll/win32/stdole32.tlb/stdole32.rbuild b/reactos/dll/win32/stdole32.tlb/stdole32.rbuild index 38f1a9fe884..edd4935c7ee 100644 --- a/reactos/dll/win32/stdole32.tlb/stdole32.rbuild +++ b/reactos/dll/win32/stdole32.tlb/stdole32.rbuild @@ -13,7 +13,6 @@ std_ole_v1 kernel32 - stdole32.tlb.spec rsrc.rc \ No newline at end of file diff --git a/reactos/dll/win32/sxs/sxs.rbuild b/reactos/dll/win32/sxs/sxs.rbuild index 5f551e5cb8e..b21ee66606d 100644 --- a/reactos/dll/win32/sxs/sxs.rbuild +++ b/reactos/dll/win32/sxs/sxs.rbuild @@ -7,7 +7,6 @@ include/reactos/wine sxs.c - sxs.spec wine kernel32 ntdll diff --git a/reactos/dll/win32/tapi32/tapi32.rbuild b/reactos/dll/win32/tapi32/tapi32.rbuild index dc4dc2341cf..04b4c67dca0 100644 --- a/reactos/dll/win32/tapi32/tapi32.rbuild +++ b/reactos/dll/win32/tapi32/tapi32.rbuild @@ -9,7 +9,6 @@ assisted.c line.c phone.c - tapi32.spec wine advapi32 kernel32 diff --git a/reactos/dll/win32/urlmon/urlmon.rbuild b/reactos/dll/win32/urlmon/urlmon.rbuild index f6257b35514..0699b9ab3a0 100644 --- a/reactos/dll/win32/urlmon/urlmon.rbuild +++ b/reactos/dll/win32/urlmon/urlmon.rbuild @@ -25,7 +25,6 @@ umstream.c urlmon_main.c rsrc.rc - urlmon.spec wine uuid ole32 diff --git a/reactos/dll/win32/user32/controls/combo.c b/reactos/dll/win32/user32/controls/combo.c index e8383d76426..14e358a1371 100644 --- a/reactos/dll/win32/user32/controls/combo.c +++ b/reactos/dll/win32/user32/controls/combo.c @@ -783,7 +783,7 @@ static void CBPaintText( clipRegion=NULL; } - if (!IsWindowEnabled(lphc->self) & WS_DISABLED) itemState |= ODS_DISABLED; + if (!(IsWindowEnabled(lphc->self) & WS_DISABLED)) itemState |= ODS_DISABLED; dis.CtlType = ODT_COMBOBOX; dis.CtlID = ctlid; diff --git a/reactos/dll/win32/user32/misc/ddeclient.c b/reactos/dll/win32/user32/misc/ddeclient.c index d9263dc01f8..9d8c989e84f 100644 --- a/reactos/dll/win32/user32/misc/ddeclient.c +++ b/reactos/dll/win32/user32/misc/ddeclient.c @@ -811,7 +811,7 @@ static WDML_QUEUE_STATE WDML_HandleTerminateReply(WDML_CONV* pConv, MSG* msg, WD FIXME("hmmm shouldn't happen\n"); return WDML_QS_PASS; } - if (!pConv->instance->CBFflags & CBF_SKIP_DISCONNECTS) + if (!(pConv->instance->CBFflags & CBF_SKIP_DISCONNECTS)) { WDML_InvokeCallback(pConv->instance, XTYP_DISCONNECT, 0, (HCONV)pConv, 0, 0, 0, 0, (pConv->wStatus & ST_ISSELF) ? 1 : 0); @@ -894,7 +894,7 @@ static WDML_QUEUE_STATE WDML_HandleIncomingTerminate(WDML_CONV* pConv, MSG* msg, return WDML_QS_PASS; pConv->wStatus |= ST_TERMINATED; - if (!pConv->instance->CBFflags & CBF_SKIP_DISCONNECTS) + if (!(pConv->instance->CBFflags & CBF_SKIP_DISCONNECTS)) { WDML_InvokeCallback(pConv->instance, XTYP_DISCONNECT, 0, (HCONV)pConv, 0, 0, 0, 0, (pConv->wStatus & ST_ISSELF) ? 1 : 0); diff --git a/reactos/dll/win32/user32/misc/stubs.c b/reactos/dll/win32/user32/misc/stubs.c index daa3b7734f3..49971f62690 100644 --- a/reactos/dll/win32/user32/misc/stubs.c +++ b/reactos/dll/win32/user32/misc/stubs.c @@ -62,15 +62,14 @@ GetMouseMovePointsEx( /* - * @unimplemented + * @implemented */ BOOL STDCALL LockWindowUpdate( HWND hWndLock) { - UNIMPLEMENTED; - return FALSE; + return NtUserLockWindowUpdate(hWndLock); } diff --git a/reactos/dll/win32/user32/user32.spec b/reactos/dll/win32/user32/user32.pspec similarity index 94% rename from reactos/dll/win32/user32/user32.spec rename to reactos/dll/win32/user32/user32.pspec index 4d136a1327d..422e3e2aef1 100644 --- a/reactos/dll/win32/user32/user32.spec +++ b/reactos/dll/win32/user32/user32.pspec @@ -19,9 +19,9 @@ @ stdcall BroadcastSystemMessageExA(long ptr long long long ptr) @ stdcall BroadcastSystemMessageExW(long ptr long long long ptr) @ stdcall BroadcastSystemMessageW(long ptr long long long) -# @ stub BuildReasonArray +; @ stub BuildReasonArray @ stdcall CalcChildScroll(long long) -# @ stub CalcMenuBar +; @ stub CalcMenuBar @ stdcall CallMsgFilter(ptr long) CallMsgFilterA @ stdcall CallMsgFilterA(ptr long) @ stdcall CallMsgFilterW(ptr long) @@ -43,11 +43,11 @@ @ stdcall CharLowerW(wstr) @ stdcall CharNextA(str) @ stdcall CharNextExA(long str long) -# @ stdcall CharNextExW(long wstr long) +; @ stdcall CharNextExW(long wstr long) @ stdcall CharNextW(wstr) @ stdcall CharPrevA(str str) @ stdcall CharPrevExA(long str str long) -# @ stdcall CharPrevExW(long wstr wstr long) +; @ stdcall CharPrevExW(long wstr wstr long) @ stdcall CharPrevW(wstr wstr) @ stdcall CharToOemA(str ptr) @ stdcall CharToOemBuffA(str ptr long) @@ -97,7 +97,7 @@ @ stdcall CreateMDIWindowW(ptr ptr long long long long long long long long) @ stdcall CreateMenu() @ stdcall CreatePopupMenu() -# @ stub CreateSystemThreads +; @ stub CreateSystemThreads @ stdcall CreateWindowExA(long str str long long long long long long long long ptr) @ stdcall CreateWindowExW(long wstr wstr long long long long long long long long ptr) @ stdcall CreateWindowStationA(str long long ptr) @@ -154,18 +154,18 @@ @ stdcall DestroyCursor(long) @ stdcall DestroyIcon(long) @ stdcall DestroyMenu(long) -# @ stub DestroyReasons +; @ stub DestroyReasons @ stdcall DestroyWindow(long) -# @ stub DeviceEventWorker +; @ stub DeviceEventWorker @ stdcall DialogBoxIndirectParamA(long ptr long ptr long) @ stdcall DialogBoxIndirectParamAorW(long ptr long ptr long long) @ stdcall DialogBoxIndirectParamW(long ptr long ptr long) @ stdcall DialogBoxParamA(long str long ptr long) @ stdcall DialogBoxParamW(long wstr long ptr long) -# @ stub DisableProcessWindowsGhosting +; @ stub DisableProcessWindowsGhosting @ stdcall DispatchMessageA(ptr) @ stdcall DispatchMessageW(ptr) -# @ stub DisplayExitWindowsWarnings +; @ stub DisplayExitWindowsWarnings @ stdcall DlgDirListA(long str long long long) @ stdcall DlgDirListComboBoxA(long ptr long long long) @ stdcall DlgDirListComboBoxW(long ptr long long long) @@ -204,14 +204,14 @@ @ stdcall EndMenu() @ stdcall EndPaint(long ptr) @ stub EndTask -# @ stub EnterReaderModeHelper +; @ stub EnterReaderModeHelper @ stdcall EnumChildWindows(long ptr long) @ stdcall EnumClipboardFormats(long) @ stdcall EnumDesktopWindows(long ptr ptr) @ stdcall EnumDesktopsA(ptr ptr long) @ stdcall EnumDesktopsW(ptr ptr long) -@ stub EnumDisplayDeviceModesA #(str long ptr long) -@ stub EnumDisplayDeviceModesW #(wstr long ptr long) +@ stub EnumDisplayDeviceModesA ;(str long ptr long) +@ stub EnumDisplayDeviceModesW ;(wstr long ptr long) @ stdcall EnumDisplayDevicesA(ptr long ptr long) @ stdcall EnumDisplayDevicesW(ptr long ptr long) @ stdcall EnumDisplayMonitors(long ptr ptr long) @@ -256,11 +256,10 @@ @ stdcall GetClassInfoW(long wstr ptr) @ stdcall GetClassLongA(long long) @ stdcall GetClassLongW(long long) - -; FIXME -- Only for Win64 +#ifdef _WIN64 @ stdcall GetClassLongPtrA(ptr long) @ stdcall GetClassLongPtrW(ptr long) - +#endif @ stdcall GetClassNameA(long ptr long) @ stdcall GetClassNameW(long ptr long) @ stdcall GetClassWord(long long) @@ -274,7 +273,7 @@ @ stdcall GetClipboardViewer() @ stdcall GetComboBoxInfo(long ptr) @ stdcall GetCursor() -# @ stub GetCursorFrameInfo +; @ stub GetCursorFrameInfo @ stdcall GetCursorInfo(ptr) @ stdcall GetCursorPos(ptr) @ stdcall GetDC(long) @@ -308,7 +307,7 @@ @ stdcall GetLastActivePopup(long) @ stdcall GetLastInputInfo(ptr) @ stdcall GetLayeredWindowAttributes(long ptr ptr ptr) NtUserGetLayeredWindowAttributes -# @ stub GetListBoxInfo +; @ stub GetListBoxInfo @ stdcall GetMenu(long) @ stdcall GetMenuBarInfo(long long long ptr) @ stdcall GetMenuCheckMarkDimensions() @@ -334,7 +333,7 @@ @ stdcall GetMouseMovePointsEx(long ptr ptr long long) @ stdcall GetNextDlgGroupItem(long long long) @ stdcall GetNextDlgTabItem(long long long) -# @ stub GetNextQueueWindow +; @ stub GetNextQueueWindow @ stdcall GetOpenClipboardWindow() @ stdcall GetParent(long) @ stdcall GetPriorityClipboardFormat(ptr long) @@ -349,7 +348,7 @@ @ stdcall GetRawInputDeviceInfoA(ptr long ptr ptr) @ stdcall GetRawInputDeviceInfoW(ptr long ptr ptr) @ stdcall GetRawInputDeviceList(ptr ptr long) -# @ stub GetReasonTitleFromReasonCode +; @ stub GetReasonTitleFromReasonCode @ stdcall GetRegisteredRawInputDevices(ptr ptr long) @ stdcall GetScrollBarInfo(long long ptr) @ stdcall GetScrollInfo(long long ptr) @@ -372,17 +371,16 @@ @ stdcall GetUserObjectInformationA (long long ptr long ptr) @ stdcall GetUserObjectInformationW (long long ptr long ptr) @ stdcall GetUserObjectSecurity (long ptr ptr long ptr) -# @ stub GetWinStationInfo +; @ stub GetWinStationInfo @ stdcall GetWindow(long long) @ stdcall GetWindowContextHelpId(long) @ stdcall GetWindowDC(long) @ stdcall GetWindowInfo(long ptr) @ stdcall GetWindowLongA(long long) - -; FIXME -- Only for Win64 +#ifdef _WIN64 @ stdcall GetWindowLongPtrA(ptr long) @ stdcall GetWindowLongPtrW(ptr long) - +#endif @ stdcall GetWindowLongW(long long) @ stdcall GetWindowModuleFileName(long ptr long) GetWindowModuleFileNameA @ stdcall GetWindowModuleFileNameA(long ptr long) @@ -399,7 +397,7 @@ @ stdcall GetWindowWord(long long) @ stdcall GrayStringA(long long ptr long long long long long long) @ stdcall GrayStringW(long long ptr long long long long long long) -# @ stub HasSystemSleepStarted +; @ stub HasSystemSleepStarted @ stdcall HideCaret(long) NtUserHideCaret @ stdcall HiliteMenuItem(long long long long) @ stdcall IMPGetIMEA(long ptr) @@ -412,10 +410,10 @@ @ stdcall InSendMessage() @ stdcall InSendMessageEx(ptr) @ stdcall InflateRect(ptr long long) -# @ stub InitSharedTable -# @ stub InitTask +; @ stub InitSharedTable +; @ stub InitTask @ stdcall InitializeLpkHooks(ptr) -# @ stub InitializeWin32EntryTable +; @ stub InitializeWin32EntryTable @ stdcall InsertMenuA(long long long long ptr) @ stdcall InsertMenuItemA(long long long ptr) @ stdcall InsertMenuItemW(long long long ptr) @@ -441,7 +439,7 @@ @ stdcall IsDlgButtonChecked(long long) @ stdcall IsGUIThread(long) @ stdcall IsHungAppWindow(long) -# @ stub IsHungThread +; @ stub IsHungThread @ stdcall IsIconic(long) @ stdcall IsMenu(long) @ stdcall IsRectEmpty(ptr) @@ -468,7 +466,7 @@ @ stdcall LoadImageA(long str long long long long) @ stdcall LoadImageW(long wstr long long long long) @ stdcall LoadKeyboardLayoutA(str long) -# @ stub LoadKeyboardLayoutEx +; @ stub LoadKeyboardLayoutEx @ stdcall LoadKeyboardLayoutW(wstr long) @ stdcall LoadLocalFonts() @ stdcall LoadMenuA(long str) @@ -501,10 +499,10 @@ @ stdcall MessageBoxExW(long wstr wstr long long) @ stdcall MessageBoxIndirectA(ptr) @ stdcall MessageBoxIndirectW(ptr) -# @ stub MessageBoxTimeoutA -# @ stub MessageBoxTimeoutW +; @ stub MessageBoxTimeoutA +; @ stub MessageBoxTimeoutW @ stdcall MessageBoxW(long wstr wstr long) -# @ stub ModifyAccess +; @ stub ModifyAccess @ stdcall ModifyMenuA(long long long long ptr) @ stdcall ModifyMenuW(long long long long ptr) @ stdcall MonitorFromPoint(double long) @@ -529,7 +527,7 @@ @ stdcall OpenWindowStationW(wstr long long) @ stdcall PackDDElParam(long long long) @ stdcall PaintDesktop(long) -# @ stub PaintMenuBar +; @ stub PaintMenuBar @ stdcall PeekMessageA(ptr long long long long) @ stdcall PeekMessageW(ptr long long long long) @ stub PlaySoundEvent @@ -538,23 +536,23 @@ @ stdcall PostQuitMessage(long) @ stdcall PostThreadMessageA(long long long long) @ stdcall PostThreadMessageW(long long long long) -# @ stub PrintWindow +; @ stub PrintWindow @ stdcall PrivateExtractIconExA(str long ptr ptr long) @ stdcall PrivateExtractIconExW(wstr long ptr ptr long) @ stdcall PrivateExtractIconsA (str long long long ptr ptr long long) @ stdcall PrivateExtractIconsW (wstr long long long ptr ptr long long) -# @ stub PrivateSetDbgTag -# @ stub PrivateSetRipFlags +; @ stub PrivateSetDbgTag +; @ stub PrivateSetRipFlags @ stdcall PtInRect(ptr double) @ stub QuerySendMessage -# @ stub QueryUserCounters +; @ stub QueryUserCounters @ stdcall RealChildWindowFromPoint(long double) @ stdcall RealGetWindowClass(long ptr long) RealGetWindowClassA @ stdcall RealGetWindowClassA(long ptr long) @ stdcall RealGetWindowClassW(long ptr long) -# @ stub ReasonCodeNeedsBugID -# @ stub ReasonCodeNeedsComment -# @ stub RecordShutdownReason +; @ stub ReasonCodeNeedsBugID +; @ stub ReasonCodeNeedsComment +; @ stub RecordShutdownReason @ stdcall RedrawWindow(long ptr long long) @ stdcall RegisterClassA(ptr) @ stdcall RegisterClassExA(ptr) @@ -566,14 +564,14 @@ @ stdcall RegisterDeviceNotificationW(long ptr long) @ stdcall RegisterHotKey(long long long long) @ stdcall RegisterLogonProcess(long long) -# @ stub RegisterMessagePumpHook +; @ stub RegisterMessagePumpHook @ stub RegisterNetworkCapabilities @ stdcall RegisterRawInputDevices(ptr long long) @ stdcall RegisterServicesProcess(long) @ stdcall RegisterShellHookWindow (long) @ stdcall RegisterSystemThread(long long) @ stdcall RegisterTasklist (long) -# @ stub RegisterUserApiHook +; @ stub RegisterUserApiHook @ stdcall RegisterWindowMessageA(str) @ stdcall RegisterWindowMessageW(wstr) @ stdcall ReleaseCapture() @@ -583,7 +581,7 @@ @ stdcall RemovePropW(long wstr) @ stdcall ReplyMessage(long) @ stub ResetDisplay -# @ stub ResolveDesktopForWOW +; @ stub ResolveDesktopForWOW @ stdcall ReuseDDElParam(long long long long long) @ stdcall ScreenToClient(long ptr) @ stdcall ScrollChildren(long long long long) @@ -609,22 +607,21 @@ @ stdcall SetCaretBlinkTime(long) @ stdcall SetCaretPos(long long) @ stdcall SetClassLongA(long long long) - -; FIXME -- Only for Win64 +#ifdef _WIN64 @ stdcall SetClassLongPtrA(ptr long ptr) @ stdcall SetClassLongPtrW(ptr long ptr) - +#endif @ stdcall SetClassLongW(long long long) @ stdcall SetClassWord(long long long) @ stdcall SetClipboardData(long long) @ stdcall SetClipboardViewer(long) -# @ stub SetConsoleReserveKeys +; @ stub SetConsoleReserveKeys @ stdcall SetCursor(long) @ stub SetCursorContents @ stdcall SetCursorPos(long long) @ stdcall SetDebugErrorLevel(long) @ stdcall SetDeskWallpaper(ptr) -# @ stub SetDesktopBitmap +; @ stub SetDesktopBitmap @ stdcall SetDlgItemInt(long long long long) @ stdcall SetDlgItemTextA(long long str) @ stdcall SetDlgItemTextW(long long wstr) @@ -674,11 +671,10 @@ @ stdcall SetWindowContextHelpId(long long) @ stub SetWindowFullScreenState @ stdcall SetWindowLongA(long long long) - -; FIXME -- Only for Win64 +#ifdef _WIN64 @ stdcall SetWindowLongPtrA(ptr long ptr) @ stdcall SetWindowLongPtrW(ptr long ptr) - +#endif @ stdcall SetWindowLongW(long long long) @ stdcall SetWindowPlacement(long ptr) @ stdcall SetWindowPos(long long long long long long long) @@ -699,12 +695,12 @@ @ stub ShowStartGlass @ stdcall ShowWindow(long long) @ stdcall ShowWindowAsync(long long) -# @ stub SoftModalMessageBox +; @ stub SoftModalMessageBox @ stdcall SubtractRect(ptr ptr ptr) @ stdcall SwapMouseButton(long) @ stdcall SwitchDesktop(long) @ stdcall SwitchToThisWindow(long long) -# @ stub SysErrorBox +; @ stub SysErrorBox @ stdcall SystemParametersInfoA(long long ptr long) @ stdcall SystemParametersInfoW(long long ptr long) @ stdcall TabbedTextOutA(long long long str long long ptr long) @@ -723,7 +719,7 @@ @ stdcall TranslateAcceleratorW(long long ptr) @ stdcall TranslateMDISysAccel(long ptr) @ stdcall TranslateMessage(ptr) -# @ stub TranslateMessageEx +; @ stub TranslateMessageEx @ stdcall UnhookWinEvent(long) NtUserUnhookWinEvent @ stdcall UnhookWindowsHook(long ptr) @ stdcall UnhookWindowsHookEx(long) NtUserUnhookWindowsHookEx @@ -735,23 +731,23 @@ @ stdcall UnregisterClassW(wstr long) @ stdcall UnregisterDeviceNotification(long) @ stdcall UnregisterHotKey(long long) NtUserUnregisterHotKey -# @ stub UnregisterMessagePumpHook -# @ stub UnregisterUserApiHook +; @ stub UnregisterMessagePumpHook +; @ stub UnregisterUserApiHook @ stdcall UpdateLayeredWindow(long long ptr ptr long ptr long ptr long) NtUserUpdateLayeredWindow @ stdcall UpdatePerUserSystemParameters(long long) @ stdcall UpdateWindow(long) @ stdcall User32InitializeImmEntryTable(ptr) @ stdcall UserClientDllInitialize(long long ptr) DllMain @ stub UserHandleGrantAccess -# @ stub UserIsSystemResumeAutomatic -# @ stub UserLpkPSMTextOut -# @ stub UserLpkTabbedTextOut +; @ stub UserIsSystemResumeAutomatic +; @ stub UserLpkPSMTextOut +; @ stub UserLpkTabbedTextOut @ stdcall UserRealizePalette(long) @ stub UserRegisterWowHandlers -# @ stub UserSetDeviceHoldState -# @ stdcall UserSignalProc(long long long long) -# @ stub VRipOutput -# @ stub VTagOutput +; @ stub UserSetDeviceHoldState +; @ stdcall UserSignalProc(long long long long) +; @ stub VRipOutput +; @ stub VTagOutput @ stdcall ValidateRect(long ptr) @ stdcall ValidateRgn(long long) @ stdcall VkKeyScanA(long) @@ -765,14 +761,14 @@ @ stub WNDPROC_CALLBACK @ stdcall WaitForInputIdle(long long) @ stdcall WaitMessage() -# @ stub Win32PoolAllocationStats +; @ stub Win32PoolAllocationStats @ stdcall WinHelpA(long str long long) @ stdcall WinHelpW(long wstr long long) -# @ stub WinOldAppHackoMatic +; @ stub WinOldAppHackoMatic @ stdcall WindowFromDC(long) @ stdcall WindowFromPoint(double) -# @ stub YieldTask -# @ stub _SetProcessDefaultLayout +; @ stub YieldTask +; @ stub _SetProcessDefaultLayout @ stdcall keybd_event(long long long long) @ stdcall mouse_event(long long long long long) @ varargs wsprintfA(str str) @@ -780,6 +776,7 @@ @ stdcall wvsprintfA(ptr str ptr) @ stdcall wvsprintfW(ptr wstr ptr) -# ROS specific exports +; ROS specific exports @ stdcall PrivateCsrssManualGuiCheck(long) @ stdcall PrivateCsrssInitialized() + diff --git a/reactos/dll/win32/user32/user32.rbuild b/reactos/dll/win32/user32/user32.rbuild index b4807927235..d8c535b9584 100644 --- a/reactos/dll/win32/user32/user32.rbuild +++ b/reactos/dll/win32/user32/user32.rbuild @@ -1,5 +1,5 @@ - + . include include/reactos/subsys @@ -73,5 +73,4 @@ winpos.c user32.rc - user32.spec diff --git a/reactos/dll/win32/user32/windows/font.c b/reactos/dll/win32/user32/windows/font.c index 941fdfba9d9..906325c15e1 100644 --- a/reactos/dll/win32/user32/windows/font.c +++ b/reactos/dll/win32/user32/windows/font.c @@ -34,7 +34,17 @@ /* FUNCTIONS *****************************************************************/ -void _assert(const char *msg, const char *file, int line) +#ifndef NDEBUG + +#ifdef assert +#undef assert +#endif + +#define assert(e) ((e) ? (void)0 : _font_assert(#e, __FILE__, __LINE__)) + +#endif + +void _font_assert(const char *msg, const char *file, int line) { /* Assertion failed at foo.c line 45: xsetup.c userenv.c userenv.rc - userenv.spec diff --git a/reactos/dll/win32/usp10/usp10.rbuild b/reactos/dll/win32/usp10/usp10.rbuild index c8b9ec1e94b..f385bf3ca6f 100644 --- a/reactos/dll/win32/usp10/usp10.rbuild +++ b/reactos/dll/win32/usp10/usp10.rbuild @@ -7,7 +7,6 @@ include/reactos/wine usp10.c - usp10.spec wine gdi32 kernel32 diff --git a/reactos/dll/win32/uxtheme/uxtheme.rbuild b/reactos/dll/win32/uxtheme/uxtheme.rbuild index befa57f355e..13b62128a7a 100644 --- a/reactos/dll/win32/uxtheme/uxtheme.rbuild +++ b/reactos/dll/win32/uxtheme/uxtheme.rbuild @@ -15,7 +15,6 @@ system.c uxini.c version.rc - uxtheme.spec wine user32 gdi32 diff --git a/reactos/dll/win32/vdmdbg/vdmdbg.rbuild b/reactos/dll/win32/vdmdbg/vdmdbg.rbuild index 8ccedce0b41..fb48d1b676a 100644 --- a/reactos/dll/win32/vdmdbg/vdmdbg.rbuild +++ b/reactos/dll/win32/vdmdbg/vdmdbg.rbuild @@ -4,6 +4,5 @@ ntdll kernel32 vdmdbg.c - vdmdbg.spec vdmdbg.h diff --git a/reactos/dll/win32/version/version.rbuild b/reactos/dll/win32/version/version.rbuild index d186317c5d4..d01932da1d1 100644 --- a/reactos/dll/win32/version/version.rbuild +++ b/reactos/dll/win32/version/version.rbuild @@ -10,7 +10,6 @@ install.c resource.c version.rc - version.spec wine lz32 kernel32 diff --git a/reactos/dll/win32/wdmaud.drv/wdmaud.rbuild b/reactos/dll/win32/wdmaud.drv/wdmaud.rbuild index dd285bf5cdf..b2a064081ac 100644 --- a/reactos/dll/win32/wdmaud.drv/wdmaud.rbuild +++ b/reactos/dll/win32/wdmaud.drv/wdmaud.rbuild @@ -9,5 +9,4 @@ winmm wdmaud.c wdmaud.rc - wdmaud.spec diff --git a/reactos/dll/win32/winhttp/winhttp.rbuild b/reactos/dll/win32/winhttp/winhttp.rbuild index c6948924146..687d7524a46 100644 --- a/reactos/dll/win32/winhttp/winhttp.rbuild +++ b/reactos/dll/win32/winhttp/winhttp.rbuild @@ -12,7 +12,6 @@ net.c request.c session.c - winhttp.spec wine wininet ws2_32 diff --git a/reactos/dll/win32/wininet/wininet.rbuild b/reactos/dll/win32/wininet/wininet.rbuild index 5ef18ef2aa8..434373e661c 100644 --- a/reactos/dll/win32/wininet/wininet.rbuild +++ b/reactos/dll/win32/wininet/wininet.rbuild @@ -30,6 +30,5 @@ wininet_main.c rsrc.rc version.rc - wininet.spec diff --git a/reactos/dll/win32/winmm/midimap/midimap.rbuild b/reactos/dll/win32/winmm/midimap/midimap.rbuild index dd1e0cb65b4..593399998f7 100644 --- a/reactos/dll/win32/winmm/midimap/midimap.rbuild +++ b/reactos/dll/win32/winmm/midimap/midimap.rbuild @@ -11,5 +11,4 @@ winmm midimap.c midimap.rc - midimap.spec diff --git a/reactos/dll/win32/winmm/wavemap/wavemap.rbuild b/reactos/dll/win32/winmm/wavemap/wavemap.rbuild index f251581aa40..ef2750297ac 100644 --- a/reactos/dll/win32/winmm/wavemap/wavemap.rbuild +++ b/reactos/dll/win32/winmm/wavemap/wavemap.rbuild @@ -12,5 +12,4 @@ winmm wavemap.c wavemap.rc - msacm.spec diff --git a/reactos/dll/win32/winmm/winmm.rbuild b/reactos/dll/win32/winmm/winmm.rbuild index e0ee10b3e63..fb8023f98a6 100644 --- a/reactos/dll/win32/winmm/winmm.rbuild +++ b/reactos/dll/win32/winmm/winmm.rbuild @@ -26,6 +26,5 @@ winmm.c registry.c winmm_res.rc - winmm.spec diff --git a/reactos/dll/win32/winspool/winspool.rbuild b/reactos/dll/win32/winspool/winspool.rbuild index 14eeced50da..05f7f59642c 100644 --- a/reactos/dll/win32/winspool/winspool.rbuild +++ b/reactos/dll/win32/winspool/winspool.rbuild @@ -9,5 +9,4 @@ info.c stubs.c winspool.rc - winspool.spec diff --git a/reactos/dll/win32/wintrust/wintrust.rbuild b/reactos/dll/win32/wintrust/wintrust.rbuild index dfede7f1e22..1cab0d0c545 100644 --- a/reactos/dll/win32/wintrust/wintrust.rbuild +++ b/reactos/dll/win32/wintrust/wintrust.rbuild @@ -17,5 +17,4 @@ asn.c softpub.c version.rc - wintrust.spec diff --git a/reactos/dll/win32/wldap32/wldap32.rbuild b/reactos/dll/win32/wldap32/wldap32.rbuild index d0376b83c14..ded7bb5e051 100644 --- a/reactos/dll/win32/wldap32/wldap32.rbuild +++ b/reactos/dll/win32/wldap32/wldap32.rbuild @@ -27,7 +27,6 @@ search.c value.c wldap32.rc - wldap32.spec wine user32 kernel32 diff --git a/reactos/dll/win32/ws2_32/include/ws2_32.h b/reactos/dll/win32/ws2_32/include/ws2_32.h index f495fa1ef07..169fcc0deb2 100644 --- a/reactos/dll/win32/ws2_32/include/ws2_32.h +++ b/reactos/dll/win32/ws2_32/include/ws2_32.h @@ -7,6 +7,8 @@ #ifndef __WS2_32_H #define __WS2_32_H +#include + #define WIN32_NO_STATUS #include #include @@ -21,10 +23,6 @@ #include #include // DNS_A_DATA -/* Exported by ntdll.dll, but where is the prototype? */ -unsigned long strtoul(const char *nptr, char **endptr, int base); - - #define EXPORT STDCALL extern HINSTANCE g_hInstDll; diff --git a/reactos/dll/win32/ws2_32/ws2_32.rbuild b/reactos/dll/win32/ws2_32/ws2_32.rbuild index ec2215d367e..38197cf3d07 100644 --- a/reactos/dll/win32/ws2_32/ws2_32.rbuild +++ b/reactos/dll/win32/ws2_32/ws2_32.rbuild @@ -26,6 +26,5 @@ async.c ws2_32.rc - ws2_32.spec diff --git a/reactos/dll/win32/wshtcpip/wshtcpip.rbuild b/reactos/dll/win32/wshtcpip/wshtcpip.rbuild index dd64752960a..84e3cae9a1d 100644 --- a/reactos/dll/win32/wshtcpip/wshtcpip.rbuild +++ b/reactos/dll/win32/wshtcpip/wshtcpip.rbuild @@ -8,5 +8,4 @@ ws2_32 wshtcpip.c wshtcpip.rc - wshtcpip.spec diff --git a/reactos/dll/win32/wtsapi32/wtsapi32.rbuild b/reactos/dll/win32/wtsapi32/wtsapi32.rbuild index d3157408290..247932f449a 100644 --- a/reactos/dll/win32/wtsapi32/wtsapi32.rbuild +++ b/reactos/dll/win32/wtsapi32/wtsapi32.rbuild @@ -7,7 +7,6 @@ include/reactos/wine wtsapi32.c - wtsapi32.spec wine kernel32 ntdll diff --git a/reactos/drivers/base/bootvid/bootvid.rbuild b/reactos/drivers/base/bootvid/bootvid.rbuild index bcf54dd0ff5..23b9cab0c9a 100644 --- a/reactos/drivers/base/bootvid/bootvid.rbuild +++ b/reactos/drivers/base/bootvid/bootvid.rbuild @@ -20,6 +20,5 @@ bootvid.rc - bootvid.spec precomp.h diff --git a/reactos/drivers/base/kdcom/kdcom.rbuild b/reactos/drivers/base/kdcom/kdcom.rbuild index 180fc07bfb3..4f4b9987c32 100644 --- a/reactos/drivers/base/kdcom/kdcom.rbuild +++ b/reactos/drivers/base/kdcom/kdcom.rbuild @@ -21,5 +21,4 @@ kdbg.c - kdcom.spec diff --git a/reactos/drivers/directx/dxapi/dxapi.rbuild b/reactos/drivers/directx/dxapi/dxapi.rbuild index 8d6d446640e..9282be29106 100644 --- a/reactos/drivers/directx/dxapi/dxapi.rbuild +++ b/reactos/drivers/directx/dxapi/dxapi.rbuild @@ -1,6 +1,6 @@ - . @@ -11,5 +11,4 @@ installbase="system32/drivers" installname="dxapi.sys"> videoprt main.c dxapi.rc - dxapi.spec diff --git a/reactos/drivers/directx/dxg/dxg.rbuild b/reactos/drivers/directx/dxg/dxg.rbuild index 42ae8a699d5..717dfcd2493 100644 --- a/reactos/drivers/directx/dxg/dxg.rbuild +++ b/reactos/drivers/directx/dxg/dxg.rbuild @@ -12,5 +12,4 @@ eng.c historic.c dxg.rc - dxg.spec diff --git a/reactos/drivers/directx/dxgthk/dxgthk.rbuild b/reactos/drivers/directx/dxgthk/dxgthk.rbuild index a7de8b79655..4fbb8c1918e 100644 --- a/reactos/drivers/directx/dxgthk/dxgthk.rbuild +++ b/reactos/drivers/directx/dxgthk/dxgthk.rbuild @@ -1,6 +1,6 @@ - . @@ -8,5 +8,4 @@ installbase="system32/drivers" installname="dxgthk.sys"> win32k main.c dxgthk.rc - dxgthk.spec diff --git a/reactos/drivers/ksfilter/ks/ks.rbuild b/reactos/drivers/ksfilter/ks/ks.rbuild index e89c090aa31..9c5bc8d8df2 100644 --- a/reactos/drivers/ksfilter/ks/ks.rbuild +++ b/reactos/drivers/ksfilter/ks/ks.rbuild @@ -21,5 +21,4 @@ topology.c worker.c kcom.c - ks.spec diff --git a/reactos/drivers/network/afd/afd/info.c b/reactos/drivers/network/afd/afd/info.c index f2833af7b0d..12c76aa3599 100644 --- a/reactos/drivers/network/afd/afd/info.c +++ b/reactos/drivers/network/afd/afd/info.c @@ -83,11 +83,6 @@ AfdGetSockOrPeerName( PDEVICE_OBJECT DeviceObject, PIRP Irp, if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp ); - if( FCB->AddressFile.Object == NULL) { - return UnlockAndMaybeComplete( FCB, STATUS_INVALID_PARAMETER, Irp, 0, - NULL ); - } - Mdl = IoAllocateMdl ( Irp->UserBuffer, IrpSp->Parameters.DeviceIoControl.OutputBufferLength, @@ -105,11 +100,21 @@ AfdGetSockOrPeerName( PDEVICE_OBJECT DeviceObject, PIRP Irp, if( NT_SUCCESS(Status) ) { if( Local ) { + if( FCB->AddressFile.Object == NULL ) { + return UnlockAndMaybeComplete( FCB, STATUS_INVALID_PARAMETER, Irp, 0, + NULL ); + } + Status = TdiQueryInformation ( FCB->AddressFile.Object, TDI_QUERY_ADDRESS_INFO, Mdl ); } else { + if( FCB->Connection.Object == NULL ) { + return UnlockAndMaybeComplete( FCB, STATUS_INVALID_PARAMETER, Irp, 0, + NULL ); + } + if( NT_SUCCESS ( Status = TdiBuildNullConnectionInfo ( &ConnInfo, diff --git a/reactos/drivers/network/afd/afd/lock.c b/reactos/drivers/network/afd/afd/lock.c index cea3d1470d8..136e9bb0d21 100644 --- a/reactos/drivers/network/afd/afd/lock.c +++ b/reactos/drivers/network/afd/afd/lock.c @@ -25,7 +25,7 @@ PVOID LockRequest( PIRP Irp, PIO_STACK_LOCATION IrpSp ) { NULL ); if( Irp->MdlAddress ) { _SEH_TRY { - MmProbeAndLockPages( Irp->MdlAddress, KernelMode, IoModifyAccess ); + MmProbeAndLockPages( Irp->MdlAddress, Irp->RequestorMode, IoModifyAccess ); } _SEH_HANDLE { LockFailed = TRUE; } _SEH_END; diff --git a/reactos/drivers/network/afd/afd/read.c b/reactos/drivers/network/afd/afd/read.c index 365eafcabe8..c5604b2e92f 100644 --- a/reactos/drivers/network/afd/afd/read.c +++ b/reactos/drivers/network/afd/afd/read.c @@ -425,7 +425,7 @@ SatisfyPacketRecvRequest( PAFD_FCB FCB, PIRP Irp, *TotalBytesCopied = BytesToCopy; - if (!RecvReq->TdiFlags & TDI_RECEIVE_PEEK) { + if (!(RecvReq->TdiFlags & TDI_RECEIVE_PEEK)) { FCB->Recv.BytesUsed = 0; } } diff --git a/reactos/drivers/network/afd/afd/tdi.c b/reactos/drivers/network/afd/afd/tdi.c index dbe74cee242..c910293bd73 100644 --- a/reactos/drivers/network/afd/afd/tdi.c +++ b/reactos/drivers/network/afd/afd/tdi.c @@ -74,7 +74,7 @@ static NTSTATUS TdiCall( KeWaitForSingleObject( Event, Executive, - UserMode, + KernelMode, FALSE, NULL); Status = Iosb->Status; @@ -853,7 +853,7 @@ NTSTATUS TdiSend BufferLength, /* Length of buffer */ FALSE, /* Not secondary */ FALSE, /* Don't charge quota */ - *Irp); /* use IRP */ + *Irp); /* Use IRP */ if (!Mdl) { AFD_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); IoFreeIrp(*Irp); @@ -862,7 +862,7 @@ NTSTATUS TdiSend } _SEH_TRY { - MmProbeAndLockPages(Mdl, KernelMode, IoModifyAccess); + MmProbeAndLockPages(Mdl, (*Irp)->RequestorMode, IoModifyAccess); } _SEH_HANDLE { AFD_DbgPrint(MIN_TRACE, ("MmProbeAndLockPages() failed.\n")); IoFreeMdl(Mdl); @@ -934,7 +934,7 @@ NTSTATUS TdiReceive( BufferLength, /* Length of buffer */ FALSE, /* Not secondary */ FALSE, /* Don't charge quota */ - *Irp); /* Don't use IRP */ + *Irp); /* Use IRP */ if (!Mdl) { AFD_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); IoFreeIrp(*Irp); @@ -944,7 +944,7 @@ NTSTATUS TdiReceive( _SEH_TRY { AFD_DbgPrint(MIN_TRACE, ("probe and lock\n")); - MmProbeAndLockPages(Mdl, KernelMode, IoModifyAccess); + MmProbeAndLockPages(Mdl, (*Irp)->RequestorMode, IoModifyAccess); AFD_DbgPrint(MIN_TRACE, ("probe and lock done\n")); } _SEH_HANDLE { AFD_DbgPrint(MIN_TRACE, ("MmProbeAndLockPages() failed.\n")); @@ -1034,7 +1034,7 @@ NTSTATUS TdiReceiveDatagram( BufferLength, /* Length of buffer */ FALSE, /* Not secondary */ FALSE, /* Don't charge quota */ - *Irp); /* Don't use IRP */ + *Irp); /* Use IRP */ if (!Mdl) { AFD_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); IoFreeIrp(*Irp); @@ -1043,7 +1043,7 @@ NTSTATUS TdiReceiveDatagram( } _SEH_TRY { - MmProbeAndLockPages(Mdl, KernelMode, IoModifyAccess); + MmProbeAndLockPages(Mdl, (*Irp)->RequestorMode, IoModifyAccess); } _SEH_HANDLE { AFD_DbgPrint(MIN_TRACE, ("MmProbeAndLockPages() failed.\n")); IoFreeMdl(Mdl); @@ -1132,7 +1132,7 @@ NTSTATUS TdiSendDatagram( BufferLength, /* Length of buffer */ FALSE, /* Not secondary */ FALSE, /* Don't charge quota */ - *Irp); /* Don't use IRP */ + *Irp); /* Use IRP */ if (!Mdl) { AFD_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); @@ -1142,7 +1142,7 @@ NTSTATUS TdiSendDatagram( } _SEH_TRY { - MmProbeAndLockPages(Mdl, KernelMode, IoModifyAccess); + MmProbeAndLockPages(Mdl, (*Irp)->RequestorMode, IoModifyAccess); } _SEH_HANDLE { AFD_DbgPrint(MIN_TRACE, ("MmProbeAndLockPages() failed.\n")); IoFreeMdl(Mdl); diff --git a/reactos/drivers/network/tcpip/tcpip.rbuild b/reactos/drivers/network/tcpip/tcpip.rbuild index 3919ba7a436..24fed09bace 100644 --- a/reactos/drivers/network/tcpip/tcpip.rbuild +++ b/reactos/drivers/network/tcpip/tcpip.rbuild @@ -39,5 +39,4 @@ wait.c tcpip.rc - tcpip.spec diff --git a/reactos/drivers/network/tcpip/tcpip/fileobjs.c b/reactos/drivers/network/tcpip/tcpip/fileobjs.c index da337e8d951..414cf5de705 100644 --- a/reactos/drivers/network/tcpip/tcpip/fileobjs.c +++ b/reactos/drivers/network/tcpip/tcpip/fileobjs.c @@ -220,7 +220,7 @@ VOID DeleteConnectionEndpoint( RemoveEntryList(&Connection->ListEntry); TcpipReleaseSpinLock(&ConnectionEndpointListLock, OldIrql); - ExFreePool(Connection); + TCPFreeConnectionEndpoint(Connection); TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); } @@ -387,8 +387,10 @@ NTSTATUS FileCloseAddress( switch (AddrFile->Protocol) { case IPPROTO_TCP: TCPFreePort( AddrFile->Port ); - if( AddrFile->Listener ) - TCPClose( AddrFile->Listener ); + if( AddrFile->Listener ) { + TCPClose( AddrFile->Listener ); + ExFreePool( AddrFile->Listener ); + } break; case IPPROTO_UDP: @@ -488,20 +490,18 @@ NTSTATUS FileCloseConnection( PTDI_REQUEST Request) { PCONNECTION_ENDPOINT Connection; - NTSTATUS Status = STATUS_SUCCESS; TI_DbgPrint(MID_TRACE, ("Called.\n")); Connection = Request->Handle.ConnectionContext; TcpipRecursiveMutexEnter( &TCPLock, TRUE ); - TCPClose(Connection); DeleteConnectionEndpoint(Connection); TcpipRecursiveMutexLeave( &TCPLock ); TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); - return Status; + return STATUS_SUCCESS; } diff --git a/reactos/drivers/storage/class/class2/class2.rbuild b/reactos/drivers/storage/class/class2/class2.rbuild index 48ea7b56920..17636571e0d 100644 --- a/reactos/drivers/storage/class/class2/class2.rbuild +++ b/reactos/drivers/storage/class/class2/class2.rbuild @@ -9,5 +9,4 @@ .. class2.c class2.rc - class2.spec diff --git a/reactos/drivers/storage/floppy/floppy.c b/reactos/drivers/storage/floppy/floppy.c index 75cff27fc18..124ed80cf79 100644 --- a/reactos/drivers/storage/floppy/floppy.c +++ b/reactos/drivers/storage/floppy/floppy.c @@ -686,16 +686,16 @@ static NTSTATUS NTAPI InitController(PCONTROLLER_INFO ControllerInfo) return STATUS_IO_DEVICE_ERROR; } -/* Check if floppy drive exists */ + /* Check if floppy drive exists */ if(HwSenseInterruptStatus(ControllerInfo) != STATUS_SUCCESS) - { - WARN_(FLOPPY, "Floppy drive not detected! Returning STATUS_IO_DEVICE_ERROR\n"); - return STATUS_IO_DEVICE_ERROR; - } + { + WARN_(FLOPPY, "Floppy drive not detected!\n"); + return STATUS_NO_SUCH_DEVICE; + } INFO_(FLOPPY, "InitController: resetting the controller after floppy detection\n"); - /* Reset the controller */ + /* Reset the controller again after drive detection */ if(HwReset(ControllerInfo) != STATUS_SUCCESS) { WARN_(FLOPPY, "InitController: unable to reset controller\n"); @@ -984,6 +984,9 @@ static BOOLEAN NTAPI AddControllers(PDRIVER_OBJECT DriverObject) /* 3i: Now that we're done, set the Initialized flag so we know to free this in Unload */ gControllerInfo[i].DriveInfo[j].Initialized = TRUE; + + /* 3j: Clear the DO_DEVICE_INITIALIZING flag */ + gControllerInfo[i].DriveInfo[j].DeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; } } diff --git a/reactos/drivers/storage/floppy/ioctl.c b/reactos/drivers/storage/floppy/ioctl.c index cb5d220f129..eac9c902c10 100644 --- a/reactos/drivers/storage/floppy/ioctl.c +++ b/reactos/drivers/storage/floppy/ioctl.c @@ -250,11 +250,13 @@ VOID NTAPI DeviceIoctlPassive(PDRIVE_INFO DriveInfo, case IOCTL_DISK_FORMAT_TRACKS: case IOCTL_DISK_FORMAT_TRACKS_EX: ERR_(FLOPPY, "Format called; not supported yet\n"); + Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; + Irp->IoStatus.Information = 0; break; case IOCTL_DISK_GET_PARTITION_INFO: - INFO_(FLOPPY, "IOCTL_DISK_GET_PARTITION_INFO Called; not supported\n"); - Irp->IoStatus.Status = STATUS_NOT_SUPPORTED; + INFO_(FLOPPY, "IOCTL_DISK_GET_PARTITION_INFO Called; not supported by a floppy driver\n"); + Irp->IoStatus.Status = STATUS_INVALID_DEVICE_REQUEST; Irp->IoStatus.Information = 0; break; diff --git a/reactos/drivers/storage/floppy/readwrite.c b/reactos/drivers/storage/floppy/readwrite.c index c2cd2236770..84378af23ee 100644 --- a/reactos/drivers/storage/floppy/readwrite.c +++ b/reactos/drivers/storage/floppy/readwrite.c @@ -705,7 +705,7 @@ VOID NTAPI ReadWritePassive(PDRIVE_INFO DriveInfo, IoMapTransfer(DriveInfo->ControllerInfo->AdapterObject, Irp->MdlAddress, DriveInfo->ControllerInfo->MapRegisterBase, - (PUCHAR)((ULONG_PTR)MmGetMdlVirtualAddress(Irp->MdlAddress) + TransferByteOffset), + (PVOID)((ULONG_PTR)MmGetMdlVirtualAddress(Irp->MdlAddress) + TransferByteOffset), &CurrentTransferBytes, WriteToDevice); /* @@ -758,7 +758,7 @@ VOID NTAPI ReadWritePassive(PDRIVE_INFO DriveInfo, INFO_(FLOPPY, "ReadWritePassive(): success; Completing with STATUS_SUCCESS\n"); Irp->IoStatus.Status = STATUS_SUCCESS; Irp->IoStatus.Information = Length; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + IoCompleteRequest(Irp, IO_DISK_INCREMENT); StopMotor(DriveInfo->ControllerInfo); } diff --git a/reactos/drivers/storage/ide/pciidex/pciidex.rbuild b/reactos/drivers/storage/ide/pciidex/pciidex.rbuild index 2941d0f52a3..9a4e01aff82 100644 --- a/reactos/drivers/storage/ide/pciidex/pciidex.rbuild +++ b/reactos/drivers/storage/ide/pciidex/pciidex.rbuild @@ -9,5 +9,4 @@ pciidex.c pdo.c pciidex.rc - pciidex.spec diff --git a/reactos/drivers/storage/port/diskdump/diskdump.rbuild b/reactos/drivers/storage/port/diskdump/diskdump.rbuild index df39c1636b0..89642965e68 100644 --- a/reactos/drivers/storage/port/diskdump/diskdump.rbuild +++ b/reactos/drivers/storage/port/diskdump/diskdump.rbuild @@ -11,5 +11,4 @@ diskdump.c diskdump_helper.S diskdump.rc - diskdump.spec diff --git a/reactos/drivers/storage/scsiport/scsiport.rbuild b/reactos/drivers/storage/scsiport/scsiport.rbuild index 6686e93c752..556d742680f 100644 --- a/reactos/drivers/storage/scsiport/scsiport.rbuild +++ b/reactos/drivers/storage/scsiport/scsiport.rbuild @@ -10,5 +10,4 @@ scsiport.c stubs.c scsiport.rc - scsiport.pspec diff --git a/reactos/drivers/usb/usbd/usbd.rbuild b/reactos/drivers/usb/usbd/usbd.rbuild index 1759f89e7a7..c5900b5ff35 100644 --- a/reactos/drivers/usb/usbd/usbd.rbuild +++ b/reactos/drivers/usb/usbd/usbd.rbuild @@ -6,5 +6,4 @@ hal usbd.c usbd.rc - usbd.spec diff --git a/reactos/drivers/video/displays/framebuf/framebuf.rbuild b/reactos/drivers/video/displays/framebuf/framebuf.rbuild index 8426b162842..5dcb2f06832 100644 --- a/reactos/drivers/video/displays/framebuf/framebuf.rbuild +++ b/reactos/drivers/video/displays/framebuf/framebuf.rbuild @@ -1,15 +1,13 @@ - + . win32k - libcntpr enable.c palette.c pointer.c screen.c surface.c framebuf.rc - framebuf.spec diff --git a/reactos/drivers/video/displays/framebufacc/framebufacc.rbuild b/reactos/drivers/video/displays/framebufacc/framebufacc.rbuild index bfc08f00751..df893367e08 100644 --- a/reactos/drivers/video/displays/framebufacc/framebufacc.rbuild +++ b/reactos/drivers/video/displays/framebufacc/framebufacc.rbuild @@ -1,15 +1,13 @@ - + . win32k - libcntpr enable.c palette.c pointer.c screen.c surface.c framebufacc.rc - framebufacc.spec diff --git a/reactos/drivers/video/displays/vga/vgaddi.rbuild b/reactos/drivers/video/displays/vga/vgaddi.rbuild index 4166883f01d..35479f8657e 100644 --- a/reactos/drivers/video/displays/vga/vgaddi.rbuild +++ b/reactos/drivers/video/displays/vga/vgaddi.rbuild @@ -1,9 +1,8 @@ - + . - libcntpr win32k enable.c @@ -22,5 +21,4 @@ vgavideo.c vgaddi.rc - vgaddi.spec diff --git a/reactos/drivers/video/videoprt/videoprt.rbuild b/reactos/drivers/video/videoprt/videoprt.rbuild index a2e1304098e..049896362c3 100644 --- a/reactos/drivers/video/videoprt/videoprt.rbuild +++ b/reactos/drivers/video/videoprt/videoprt.rbuild @@ -22,5 +22,4 @@ timer.c videoprt.c videoprt.rc - videoprt.spec diff --git a/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild b/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild index fb4d99c3d9d..45b93f06eb1 100644 --- a/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild +++ b/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild @@ -48,5 +48,4 @@ MiniportWavePci.cpp portcls.rc - portcls.spec diff --git a/reactos/drivers/wdm/audio/drm/drmk/drmk.rbuild b/reactos/drivers/wdm/audio/drm/drmk/drmk.rbuild index ec0bf226283..7e92d0bf01e 100644 --- a/reactos/drivers/wdm/audio/drm/drmk/drmk.rbuild +++ b/reactos/drivers/wdm/audio/drm/drmk/drmk.rbuild @@ -9,5 +9,4 @@ stubs.cpp drmk.rc - drmk.spec diff --git a/reactos/drivers/wmi/wmilib.rbuild b/reactos/drivers/wmi/wmilib.rbuild index edfaa729329..a74a4085e03 100644 --- a/reactos/drivers/wmi/wmilib.rbuild +++ b/reactos/drivers/wmi/wmilib.rbuild @@ -5,6 +5,5 @@ . ntoskrnl wmilib.c - wmilib.spec wmilib.rc diff --git a/reactos/hal/hal/hal.rbuild b/reactos/hal/hal/hal.rbuild index b78559a5a3c..3a651fa6158 100644 --- a/reactos/hal/hal/hal.rbuild +++ b/reactos/hal/hal/hal.rbuild @@ -9,7 +9,6 @@ hal.c hal.rc - hal.pspec @@ -20,7 +19,6 @@ hal.c hal.rc - hal.pspec diff --git a/reactos/hal/halx86/generic/dma.c b/reactos/hal/halx86/generic/dma.c index 293a2771bcf..f8f36b842b6 100644 --- a/reactos/hal/halx86/generic/dma.c +++ b/reactos/hal/halx86/generic/dma.c @@ -1606,9 +1606,9 @@ IoFlushAdapterBuffers( { if (SlaveDma && !AdapterObject->IgnoreCount) Length -= HalReadDmaCounter(AdapterObject); + } HalpCopyBufferMap(Mdl, RealMapRegisterBase, CurrentVa, Length, FALSE); } - } else { MdlPagesPtr = MmGetMdlPfnArray(Mdl); diff --git a/reactos/include/ddk/ntifs.h b/reactos/include/ddk/ntifs.h index a0318e6b940..603531358c7 100644 --- a/reactos/include/ddk/ntifs.h +++ b/reactos/include/ddk/ntifs.h @@ -1639,6 +1639,65 @@ typedef struct _RTL_GENERIC_TABLE PVOID TableContext; } RTL_GENERIC_TABLE, *PRTL_GENERIC_TABLE; +typedef struct _UNICODE_PREFIX_TABLE_ENTRY +{ + CSHORT NodeTypeCode; + CSHORT NameLength; + struct _UNICODE_PREFIX_TABLE_ENTRY *NextPrefixTree; + struct _UNICODE_PREFIX_TABLE_ENTRY *CaseMatch; + RTL_SPLAY_LINKS Links; + PUNICODE_STRING Prefix; +} UNICODE_PREFIX_TABLE_ENTRY, *PUNICODE_PREFIX_TABLE_ENTRY; + +typedef struct _UNICODE_PREFIX_TABLE +{ + CSHORT NodeTypeCode; + CSHORT NameLength; + PUNICODE_PREFIX_TABLE_ENTRY NextPrefixTree; + PUNICODE_PREFIX_TABLE_ENTRY LastNextEntry; +} UNICODE_PREFIX_TABLE, *PUNICODE_PREFIX_TABLE; + +NTSYSAPI +VOID +NTAPI +RtlInitializeUnicodePrefix ( + IN PUNICODE_PREFIX_TABLE PrefixTable +); + +NTSYSAPI +BOOLEAN +NTAPI +RtlInsertUnicodePrefix ( + IN PUNICODE_PREFIX_TABLE PrefixTable, + IN PUNICODE_STRING Prefix, + IN PUNICODE_PREFIX_TABLE_ENTRY PrefixTableEntry +); + +NTSYSAPI +VOID +NTAPI +RtlRemoveUnicodePrefix ( + IN PUNICODE_PREFIX_TABLE PrefixTable, + IN PUNICODE_PREFIX_TABLE_ENTRY PrefixTableEntry +); + +NTSYSAPI +PUNICODE_PREFIX_TABLE_ENTRY +NTAPI +RtlFindUnicodePrefix ( + IN PUNICODE_PREFIX_TABLE PrefixTable, + IN PUNICODE_STRING FullName, + IN ULONG CaseInsensitiveIndex +); + +NTSYSAPI +PUNICODE_PREFIX_TABLE_ENTRY +NTAPI +RtlNextUnicodePrefix ( + IN PUNICODE_PREFIX_TABLE PrefixTable, + IN BOOLEAN Restart +); + #undef PRTL_GENERIC_COMPARE_ROUTINE #undef PRTL_GENERIC_ALLOCATE_ROUTINE #undef PRTL_GENERIC_FREE_ROUTINE diff --git a/reactos/include/ndk/exfuncs.h b/reactos/include/ndk/exfuncs.h index b4f54fb8a3b..57d7b08cf62 100644 --- a/reactos/include/ndk/exfuncs.h +++ b/reactos/include/ndk/exfuncs.h @@ -113,6 +113,33 @@ ExEnumHandleTable( OUT PHANDLE Handle OPTIONAL ); +// +// Resource Functions +// +PVOID +NTAPI +ExEnterCriticalRegionAndAcquireResourceExclusive( + IN PERESOURCE Resource +); + +PVOID +NTAPI +ExEnterCriticalRegionAndAcquireResourceShared( + IN PERESOURCE Resource +); + +PVOID +NTAPI +ExEnterCriticalRegionAndAcquireSharedWaitForExclusive( + IN PERESOURCE Resource +); + +VOID +FASTCALL +ExReleaseResourceAndLeaveCriticalRegion( + IN PERESOURCE Resource +); + #endif // diff --git a/reactos/include/ndk/kefuncs.h b/reactos/include/ndk/kefuncs.h index 3b0fe4e139d..ee9f6779e3d 100644 --- a/reactos/include/ndk/kefuncs.h +++ b/reactos/include/ndk/kefuncs.h @@ -205,7 +205,7 @@ BOOLEAN NTAPI KiIpiServiceRoutine( IN PKTRAP_FRAME TrapFrame, - IN PVOID ExceptionFrame + IN PKEXCEPTION_FRAME ExceptionFrame ); // diff --git a/reactos/include/psdk/imnxport.idl b/reactos/include/psdk/imnxport.idl index 50f3e4e08ce..ef4f8ac4019 100644 --- a/reactos/include/psdk/imnxport.idl +++ b/reactos/include/psdk/imnxport.idl @@ -21,11 +21,13 @@ import "imnact.idl"; interface IInternetTransport; interface ISMTPTransport; interface IPOP3Transport; +interface IIMAPTransport; /* CLSIDs */ cpp_quote("DEFINE_GUID(CLSID_IInternetMessageUrl, 0xca30cc91, 0xb1b3, 0x11d0, 0x85, 0xd0, 0x00, 0xc0, 0x4f, 0xd8, 0x5a, 0xb4);") cpp_quote("DEFINE_GUID(CLSID_ISMTPTransport, 0xfd853ce6, 0x7f86, 0x11d0, 0x82, 0x52, 0x00, 0xc0, 0x4f, 0xd8, 0x5a, 0xb4);") +cpp_quote("DEFINE_GUID(CLSID_ISMTPTransport2, 0xdf2c7eC, 0x3435, 0x11d0, 0x81, 0xd0, 0x0, 0xc0, 0x4f, 0xd8, 0x5a, 0xb4);") cpp_quote("DEFINE_GUID(CLSID_IPOP3Transport, 0xfd853ce7, 0x7f86, 0x11d0, 0x82, 0x52, 0x00, 0xc0, 0x4f, 0xd8, 0x5a, 0xb4);") cpp_quote("DEFINE_GUID(CLSID_INNTPTransport, 0xfd853ce8, 0x7f86, 0x11d0, 0x82, 0x52, 0x00, 0xc0, 0x4f, 0xd8, 0x5a, 0xb4);") cpp_quote("DEFINE_GUID(CLSID_IRASTransport, 0xfd853ce9, 0x7f86, 0x11d0, 0x82, 0x52, 0x00, 0xc0, 0x4f, 0xd8, 0x5a, 0xb4);") @@ -433,7 +435,7 @@ interface ISMTPCallback : ITransportCallback { [case(SMTP_SEND_STREAM)] SMTPSTREAM rStreamInfo; [default]; - }; + } DUMMYUNIONNAME; } SMTPRESPONSE, *LPSMTPRESPONSE; HRESULT OnResponse( @@ -604,7 +606,7 @@ interface IPOP3Callback : ITransportCallback [case(POP3_RETR)] POP3RETR rRetrInfo; [case(POP3_TOP)] POP3TOP rTopInfo; [default]; - }; + } DUMMYUNIONNAME; } POP3RESPONSE, *LPPOP3RESPONSE; HRESULT OnResponse( @@ -684,16 +686,429 @@ interface IPOP3Transport : IInternetTransport /* FIXME: INNTPCallback, INNTPTransport */ -/* FIXME: IRangeList */ +[ + object, + uuid(8C438160-4EF6-11d0-874F-00AA00530EE9), + local, +] +interface IRangeList : IUnknown +{ + const ULONG RL_RANGE_ERROR = ((ULONG)-1); + const ULONG RL_LAST_MESSAGE = ((ULONG)-1); -/* FIXME: IIMAPCallback, IIMAPTransport */ + HRESULT Clear(); + + HRESULT IsInRange( + [in] const ULONG value); + + HRESULT Min( + [out] ULONG *pulMin); + + HRESULT Max( + [out] ULONG *pulMax); + + HRESULT Save( + [out] byte **ppbDestination, + [out] ULONG *pulSizeOfDestination); + + HRESULT Load( + [in, size_is(ulSizeOfSource)] byte *pbSource, + [in] const ULONG ulSizeOfSource); + + HRESULT AddRange( + [in] const ULONG low, + [in] const ULONG high); + + HRESULT AddSingleValue( + [in] const ULONG value); + + HRESULT AddRangeList( + [in] const IRangeList *prl); + + HRESULT DeleteRange( + [in] const ULONG low, + [in] const ULONG high); + + HRESULT DeleteSingleValue( + [in] const ULONG value); + + HRESULT DeleteRangeList( + [in] const IRangeList *prl); + + HRESULT MinOfRange( + [in] const ULONG value, + [out] ULONG *pulMinOfRange); + + HRESULT MaxOfRange( + [in] const ULONG value, + [out] ULONG *pulMaxOfRange); + + HRESULT RangeToIMAPString( + [out] LPSTR *ppszDestination, + [out] LPDWORD pdwLengthOfDestination); + + HRESULT Next( + [in] const ULONG current, + [out] ULONG *pulNext); + + HRESULT Prev( + [in] const ULONG current, + [out] ULONG *pulPrev); + + HRESULT Cardinality( + [out] ULONG *pulCardinality); + + HRESULT CardinalityFrom( + [in] const ULONG ulStartPoint, + [out] ULONG *pulCardinalityFrom); +} + +[ + object, + uuid(E9E9D8A3-4EDD-11d0-874F-00AA00530EE9), + local +] +interface IIMAPCallback : ITransportCallback +{ + typedef DWORD IMAP_MBOXFLAGS; + const IMAP_MBOXFLAGS IMAP_MBOX_NOFLAGS = 0x0; + const IMAP_MBOXFLAGS IMAP_MBOX_MARKED = 0x1; + const IMAP_MBOXFLAGS IMAP_MBOX_NOINFERIORS = 0x2; + const IMAP_MBOXFLAGS IMAP_MBOX_NOSELECT = 0x4; + const IMAP_MBOXFLAGS IMAP_MBOX_UNMARKED = 0x8; + const IMAP_MBOXFLAGS IMAP_MBOX_ALLFLAGS = 0xf; + + typedef enum tagIMAP_RESPONSE_TYPE + { + irtERROR_NOTIFICATION, + irtCOMMAND_COMPLETION, + irtSERVER_ALERT, + irtPARSE_ERROR, + irtMAILBOX_UPDATE, + irtDELETED_MSG, + irtFETCH_BODY, + irtUPDATE_MSG, + irtAPPLICABLE_FLAGS, + irtPERMANENT_FLAGS, + irtUIDVALIDITY, + irtREADWRITE_STATUS, + irtTRYCREATE, + irtSEARCH, + irtMAILBOX_LISTING, + irtMAILBOX_STATUS, + irtAPPEND_PROGRESS, + irtUPDATE_MSG_EX + } IMAP_RESPONSE_TYPE; + + typedef struct tagFETCH_BODY_PART + { + DWORD dwMsgSeqNum; + LPSTR pszBodyTag; + DWORD dwTotalBytes; + DWORD dwSizeOfData; + DWORD dwOffset; + BOOL fDone; + LPSTR pszData; + LPARAM lpFetchCookie1; + LPARAM lpFetchCookie2; + } FETCH_BODY_PART; + + typedef struct tagFETCH_CMD_RESULTS + { + DWORD dwMsgSeqNum; + BOOL bMsgFlags; + IMAP_MSGFLAGS mfMsgFlags; + BOOL bRFC822Size; + DWORD dwRFC822Size; + BOOL bUID; + DWORD dwUID; + BOOL bInternalDate; + FILETIME ftInternalDate; + LPARAM lpFetchCookie1; + LPARAM lpFetchCookie2; + } FETCH_CMD_RESULTS; + + typedef struct tagIMAPADDR + { + LPSTR pszName; + LPSTR pszADL; + LPSTR pszMailbox; + LPSTR pszHost; + struct tagIMAPADDR *pNext; + } IMAPADDR; + + typedef struct tagFETCH_CMD_RESULTS_EX + { + DWORD dwMsgSeqNum; + BOOL bMsgFlags; + IMAP_MSGFLAGS mfMsgFlags; + BOOL bRFC822Size; + DWORD dwRFC822Size; + BOOL bUID; + DWORD dwUID; + BOOL bInternalDate; + FILETIME ftInternalDate; + LPARAM lpFetchCookie1; + LPARAM lpFetchCookie2; + BOOL bEnvelope; + FILETIME ftENVDate; + LPSTR pszENVSubject; + IMAPADDR *piaENVFrom; + IMAPADDR *piaENVSender; + IMAPADDR *piaENVReplyTo; + IMAPADDR *piaENVTo; + IMAPADDR *piaENVCc; + IMAPADDR *piaENVBcc; + LPSTR pszENVInReplyTo; + LPSTR pszENVMessageID; + DWORD dwReserved1; + DWORD dwReserved2; + DWORD dwReserved3; + } FETCH_CMD_RESULTS_EX; + + typedef struct tagMBOX_MSGCOUNT + { + BOOL bGotExistsResponse; + DWORD dwExists; + BOOL bGotRecentResponse; + DWORD dwRecent; + BOOL bGotUnseenResponse; + DWORD dwUnseen; + } MBOX_MSGCOUNT; + + typedef struct tagIMAP_LISTLSUB_RESPONSE + { + LPSTR pszMailboxName; + IMAP_MBOXFLAGS imfMboxFlags; + char cHierarchyChar; + } IMAP_LISTLSUB_RESPONSE; + + typedef struct tagIMAP_STATUS_RESPONSE + { + LPSTR pszMailboxName; + BOOL fMessages; + DWORD dwMessages; + BOOL fRecent; + DWORD dwRecent; + BOOL fUIDNext; + DWORD dwUIDNext; + BOOL fUIDValidity; + DWORD dwUIDValidity; + BOOL fUnseen; + DWORD dwUnseen; + } IMAP_STATUS_RESPONSE; + + typedef struct tagAPPEND_PROGRESS + { + DWORD dwUploaded; + DWORD dwTotal; + } APPEND_PROGRESS; + + typedef [switch_type(IMAP_RESPONSE_TYPE)] union tagIMAP_RESPONSE_DATA + { + [case (irtMAILBOX_UPDATE)] MBOX_MSGCOUNT *pmcMsgCount; + [case (irtDELETED_MSG)] DWORD dwDeletedMsgSeqNum; + [case (irtFETCH_BODY)] FETCH_BODY_PART *pFetchBodyPart; + [case (irtUPDATE_MSG)] FETCH_CMD_RESULTS *pFetchResults; + [case (irtAPPLICABLE_FLAGS, irtPERMANENT_FLAGS)] IMAP_MSGFLAGS imfImapMessageFlags; + [case (irtUIDVALIDITY)] DWORD dwUIDValidity; + [case (irtREADWRITE_STATUS)] BOOL bReadWrite; + [case (irtSEARCH)] IRangeList *prlSearchResults; + [case (irtMAILBOX_LISTING)] IMAP_LISTLSUB_RESPONSE illrdMailboxListing; + [case (irtMAILBOX_STATUS)] IMAP_STATUS_RESPONSE *pisrStatusResponse; + [case (irtAPPEND_PROGRESS)] APPEND_PROGRESS *papAppendProgress; + [case (irtUPDATE_MSG_EX)] FETCH_CMD_RESULTS_EX *pFetchResultsEx; + } IMAP_RESPONSE_DATA; + + typedef struct tagIMAP_RESPONSE + { + WPARAM wParam; + LPARAM lParam; + HRESULT hrResult; + LPSTR lpszResponseText; + IMAP_RESPONSE_TYPE irtResponseType; + [switch_is(irtResponseType)] IMAP_RESPONSE_DATA irdResponseData; + } IMAP_RESPONSE; + + HRESULT OnResponse([in] const IMAP_RESPONSE *pirIMAPResponse); +} + +[ +object, +uuid(E9E9D8A8-4EDD-11d0-874F-00AA00530EE9), +local, +] +interface IIMAPTransport : IInternetTransport +{ + const DWORD IMAP_CAPABILITY_IMAP4 = 0x1; + const DWORD IMAP_CAPABILITY_IMAP4rev1 = 0x2; + const DWORD IMAP_CAPABILITY_IDLE = 0x4; + const DWORD IMAP_CAPABILITY_ALLFLAGS = 0x7; + + HRESULT InitNew( + [in] LPSTR pszLogFilePath, + [in] IIMAPCallback *pCBHandler); + + HRESULT NewIRangeList( + [out] IRangeList **pprlNewRangeList); + + HRESULT Capability( + [out] DWORD *pdwCapabilityFlags); + + HRESULT Select( + [in] WPARAM wParam, + [in] LPARAM lParam, + [in] IIMAPCallback *pCBHandler, + [in] LPSTR lpszMailboxName); + + HRESULT Examine( + [in] WPARAM wParam, + [in] LPARAM lParam, + [in] IIMAPCallback *pCBHandler, + [in] LPSTR lpszMailboxName); + + HRESULT Create( + [in] WPARAM wParam, + [in] LPARAM lParam, + [in] IIMAPCallback *pCBHandler, + [in] LPSTR lpszMailboxName); + + HRESULT Delete( + [in] WPARAM wParam, + [in] LPARAM lParam, + [in] IIMAPCallback *pCBHandler, + [in] LPSTR lpszMailboxName); + + HRESULT Rename( + [in] WPARAM wParam, + [in] LPARAM lParam, + [in] IIMAPCallback *pCBHandler, + [in] LPSTR lpszMailboxName, + [in] LPSTR lpszNewMailboxName); + + HRESULT Subscribe( + [in] WPARAM wParam, + [in] LPARAM lParam, + [in] IIMAPCallback *pCBHandler, + [in] LPSTR lpszMailboxName); + + HRESULT Unsubscribe( + [in] WPARAM wParam, + [in] LPARAM lParam, + [in] IIMAPCallback *pCBHandler, + [in] LPSTR lpszMailboxName); + + HRESULT List( + [in] WPARAM wParam, + [in] LPARAM lParam, + [in] IIMAPCallback *pCBHandler, + [in] LPSTR lpszMailboxNameReference, + [in] LPSTR lpszMailboxNamePattern); + + HRESULT Lsub( + [in] WPARAM wParam, + [in] LPARAM lParam, + [in] IIMAPCallback *pCBHandler, + [in] LPSTR lpszMailboxNameReference, + [in] LPSTR lpszMailboxNamePattern); + + HRESULT Append( + [in] WPARAM wParam, + [in] LPARAM lParam, + [in] IIMAPCallback *pCBHandler, + [in] LPSTR lpszMailboxName, + [in] LPSTR lpszMessageFlags, + [in] FILETIME ftMessageDateTime, + [in] LPSTREAM lpstmMessageToSave); + + HRESULT Close( + [in] WPARAM wParam, + [in] LPARAM lParam, + [in] IIMAPCallback *pCBHandler); + + HRESULT Expunge( + [in] WPARAM wParam, + [in] LPARAM lParam, + [in] IIMAPCallback *pCBHandler); + + HRESULT Search( + [in] WPARAM wParam, + [in] LPARAM lParam, + [in] IIMAPCallback *pCBHandler, + [in] LPSTR lpszSearchCriteria, + [in] boolean bReturnUIDs, + [in] IRangeList *pMsgRange, + [in] boolean bUIDRangeList); + + HRESULT Fetch( + [in] WPARAM wParam, + [in] LPARAM lParam, + [in] IIMAPCallback *pCBHandler, + [in] IRangeList *pMsgRange, + [in] boolean bUIDMsgRange, + [in] LPSTR lpszFetchArgs); + + HRESULT Store( + [in] WPARAM wParam, + [in] LPARAM lParam, + [in] IIMAPCallback *pCBHandler, + [in] IRangeList *pMsgRange, + [in] boolean bUIDRangeList, + [in] LPSTR lpszStoreArgs); + + HRESULT Copy( + [in] WPARAM wParam, + [in] LPARAM lParam, + [in] IIMAPCallback *pCBHandler, + [in] IRangeList *pMsgRange, + [in] boolean bUIDRangeList, + [in] LPSTR lpszMailboxName); + + HRESULT Noop( + [in] WPARAM wParam, + [in] LPARAM lParam, + [in] IIMAPCallback *pCBHandler); + + HRESULT ResizeMsgSeqNumTable( + [in] DWORD dwSizeOfMbox); + + HRESULT UpdateSeqNumToUID( + [in] DWORD dwMsgSeqNum, + [in] DWORD dwUID); + + HRESULT RemoveSequenceNum( + [in] DWORD dwDeletedMsgSeqNum); + + HRESULT MsgSeqNumToUID( + [in] DWORD dwMsgSeqNum, + [out] DWORD *pdwUID); + + HRESULT GetMsgSeqNumToUIDArray( + [out] DWORD **ppdwMsgSeqNumToUIDArray, + [out] DWORD *pdwNumberOfElements); + + HRESULT GetHighestMsgSeqNum( + [out] DWORD *pdwHighestMSN); + + HRESULT ResetMsgSeqNumToUID(); + + HRESULT SetDefaultCBHandler( + [in] IIMAPCallback *pCBHandler); + + HRESULT Status( + [in] WPARAM wParam, + [in] LPARAM lParam, + [in] IIMAPCallback *pCBHandler, + [in] LPSTR pszMailboxName, + [in] LPSTR pszStatusCmdArgs); +} #if 0 cpp_quote("HRESULT WINAPI CreateRASTransport(IRASTransport **ppTransport);") cpp_quote("HRESULT WINAPI CreateNNTPTransport(INNTPTransport **ppTransport);") -cpp_quote("HRESULT WINAPI CreateIMAPTransport(IIMAPTransport **ppTransport);") cpp_quote("HRESULT WINAPI CreateIMAPTransport2(IIMAPTransport2 **ppTransport);") -cpp_quote("HRESULT WINAPI CreateRangeList(IRangeList **ppRangeList);") #endif +cpp_quote("HRESULT WINAPI CreateRangeList(IRangeList **ppRangeList);") cpp_quote("HRESULT WINAPI CreateSMTPTransport(ISMTPTransport **ppTransport);") cpp_quote("HRESULT WINAPI CreatePOP3Transport(IPOP3Transport **ppTransport);") +cpp_quote("HRESULT WINAPI CreateIMAPTransport(IIMAPTransport **ppTransport);") diff --git a/reactos/include/psdk/mimeole.idl b/reactos/include/psdk/mimeole.idl index 9d4f45bc0cd..d74cdb591fa 100644 --- a/reactos/include/psdk/mimeole.idl +++ b/reactos/include/psdk/mimeole.idl @@ -32,6 +32,8 @@ interface IMimeEnumProperties; cpp_quote("DEFINE_GUID(CLSID_IMimeBody, 0xfd853cdb, 0x7f86, 0x11d0, 0x82, 0x52, 0x0, 0xc0, 0x4f, 0xd8, 0x5a, 0xb4);") cpp_quote("DEFINE_GUID(CLSID_IMimeAllocator, 0xfd853cdd, 0x7f86, 0x11d0, 0x82, 0x52, 0x0, 0xc0, 0x4f, 0xd8, 0x5a, 0xb4);") cpp_quote("DEFINE_GUID(CLSID_IMimeMessage, 0xfd853ce3, 0x7f86, 0x11d0, 0x82, 0x52, 0x0, 0xc0, 0x4f, 0xd8, 0x5a, 0xb4);") +cpp_quote("DEFINE_GUID(CLSID_IMimeSecurity, 0xfd853cde, 0x7f86, 0x11d0, 0x82, 0x52, 0x0, 0xc0, 0x4f, 0xd8, 0x5a, 0xb4);") +cpp_quote("DEFINE_GUID(CLSID_IVirtualStream, 0xfd853cdf, 0x7f86, 0x11d0, 0x82, 0x52, 0x0, 0xc0, 0x4f, 0xd8, 0x5a, 0xb4);") cpp_quote("#define MIME_E_REG_CREATE_KEY 0x800cce01") cpp_quote("#define MIME_E_REG_QUERY_INFO 0x800cce02") @@ -40,9 +42,19 @@ cpp_quote("#define MIME_E_BOUNDARY_MISMATCH 0x800cce04") cpp_quote("#define MIME_E_NOT_FOUND 0x800cce05") cpp_quote("#define MIME_E_NO_DATA 0x800cce05") cpp_quote("#define MIME_E_BUFFER_TOO_SMALL 0x800cce06") +cpp_quote("#define MIME_E_INVALID_ITEM_FLAGS 0x800cce07") +cpp_quote("#define MIME_E_ONE_LINE_ITEME 0x800cce08") +cpp_quote("#define MIME_E_INVALID_HANDLE 0x800cce09") +cpp_quote("#define MIME_E_CHARSET_TRANSLATE 0x800cce0a") +cpp_quote("#define MIME_E_NOT_INITIALIZED 0x800cce0b") + +cpp_quote("#define MIME_E_INVALID_CHARSET_TYPE 0x800cce31") cpp_quote("#define MIME_E_INVALID_TEXT_TYPE 0x800cce38") +cpp_quote("#define MIME_E_SECURITY_NOOP 0x800cceb1") +cpp_quote("#define MIME_S_SECURITY_NOOP 0x000cceb1") + cpp_quote("typedef enum tagMIMEPROPID {") cpp_quote(" PID_HDR_NEWSGROUP = 2,") cpp_quote(" PID_HDR_NEWSGROUPS = 3,") @@ -78,7 +90,14 @@ cpp_quote(" PID_HDR_SENDER = 61,") cpp_quote(" PID_HDR_INREPLYTO = 77,") cpp_quote("} MIMEPROPID;") +cpp_quote("#define TYPEDID_MASK ((ULONG)0xffff)") +cpp_quote("#define TYPEDID_TYPE(t) ((VARTYPE)((t) & TYPEDID_MASK))") + +cpp_quote("#define OID_HIDE_TNEF_ATTACHMENTS (0x000e0000 | VT_BOOL)") +cpp_quote("#define OID_SECURITY_TYPE (0x00180000 | VT_UI4)") +cpp_quote("#define OID_SECURITY_HWND_OWNER (0x00320000 | VT_UI4)") cpp_quote("#define OID_HEADER_RELOAD_TYPE (0x00370000 | VT_UI4)") +cpp_quote("#define OID_SHOW_MACBINARY (0x00390000 | VT_BOOL)") [ @@ -235,6 +254,9 @@ library MIMEOLE HRESULT GetCodePageInfo( [in] CODEPAGEID cpiCodePage, [in, out] LPCODEPAGEINFO pCodePageInfo); + HRESULT CanConvertCodePages( + [in] CODEPAGEID cpiSource, + [in] CODEPAGEID cpiDest); HRESULT DecodeHeader( [in] HCHARSET hCharset, [in] LPCSTR pszData, @@ -256,22 +278,22 @@ library MIMEOLE [in] CODEPAGEID cpiDest, [in] LPPROPVARIANT pIn, [in, out] LPPROPVARIANT pOut); - HRESULT MLANG_ConvertInetReset(); + HRESULT MLANG_ConvertInetReset(void); HRESULT MLANG_ConvertInetString( [in] CODEPAGEID cpiSource, [in] CODEPAGEID cpiDest, [in] LPCSTR pSource, [in] int *pnSizeOfSource, - [out] LPSTR pDestination, + [in,out,unique] LPSTR pDestination, [in] int *pnDstSize); HRESULT Rfc1522Decode( [in] LPCSTR pszValue, - [in] LPCSTR pszCharset, + [in,ref] LPSTR pszCharset, [in] ULONG cchmax, [out] LPSTR *ppszDecoded); HRESULT Rfc1522Encode( [in] LPCSTR pszValue, - [in] HCHARSET hCharset, + [in] HCHARSET hCharset, [out] LPSTR *ppszEncoded); } @@ -293,6 +315,19 @@ library MIMEOLE typedef BLOB THUMBBLOB; typedef void *HCAPICERTSTORE; + cpp_quote("#define MST_NONE 0x00000000") + cpp_quote("#define MST_THIS_SIGN 0x00000001") + cpp_quote("#define MST_THIS_ENCRYPT 0x00000002") + cpp_quote("#define MST_BLOB_FLAG 0x00000004") + cpp_quote("#define MST_THIS_BLOBSIGN (MST_BLOB_FLAG | MST_THIS_SIGN)") + cpp_quote("#define MST_CHILD_SIGN 0x00000100") + cpp_quote("#define MST_CHILD_ENCRYPT 0x00000200") + cpp_quote("#define MST_SUBMSG_SIGN 0x00001000") + cpp_quote("#define MST_SUBMSG_ENCRYPT 0x00002000") + cpp_quote("#define MST_RECEIPT_REQUEST 0x00010000") + cpp_quote("#define MST_CLASS_SMIME_V1 0x00000000") + cpp_quote("#define MST_CLASS_PGP 0x01000000") + typedef enum tagCERTSTATE { CERTIFICATE_OK, @@ -1041,6 +1076,8 @@ cpp_quote("#endif") ] interface IMimeEnumProperties : IUnknown { + typedef [unique] IMimeEnumProperties *LPMIMEENUMPROPERTIES; + typedef struct tagENUMPROPERTY { LPSTR pszName; @@ -1048,7 +1085,22 @@ cpp_quote("#endif") DWORD dwPropId; } ENUMPROPERTY, *LPENUMPROPERTY; - /* FIXME: fill this in */ + HRESULT Next( + [in] ULONG cFetch, + [in, out] LPENUMPROPERTY prgProp, + [out] ULONG *pcFetched); + + HRESULT Skip( + [in] ULONG cItems); + + HRESULT Reset(void); + + HRESULT Clone( + [out] IMimeEnumProperties **ppEnum); + + HRESULT Count( + [out] ULONG *pcItems); + } [ @@ -1164,6 +1216,31 @@ cpp_quote("#endif") { /* FIXME: fill this in */ } + + [ + uuid(ba715ae0-a740-11d2-8b22-0080c76b34c6), + local + ] + interface IMimeSecurityCallback : IUnknown + { + /* FIXME: fill this in */ + + cpp_quote("#define CMS_RECIPIENT_INFO_TYPE_UNKNOWN 0") + cpp_quote("#define CMS_RECIPIENT_INFO_TYPE_KEYTRANS 1") + cpp_quote("#define CMS_RECIPIENT_INFO_TYPE_KEYAGREE 2") + cpp_quote("#define CMS_RECIPIENT_INFO_TYPE_MAIL_LIST 3") + + cpp_quote("#define CMS_RECIPIENT_INFO_PUBKEY_CERTIFICATE 0") + cpp_quote("#define CMS_RECIPIENT_INFO_PUBKEY_KEYTRANS 1") + cpp_quote("#define CMS_RECIPIENT_INFO_PUBKEY_PROVIDER 2") + cpp_quote("#define CMS_RECIPIENT_INFO_PUBKEY_EPHEMERAL_KEYAGREE 3") + cpp_quote("#define CMS_RECIPIENT_INFO_PUBKEY_STATIC_KEYAGREE 4") + + cpp_quote("#define CMS_RECIPIENT_INFO_KEYID_CERTIFICATE 0") + cpp_quote("#define CMS_RECIPIENT_INFO_KEYID_ISSUERSERIAL 1") + cpp_quote("#define CMS_RECIPIENT_INFO_KEYID_KEY_ID 2") + + } } cpp_quote("#ifdef __cplusplus") diff --git a/reactos/include/psdk/rpcdce.h b/reactos/include/psdk/rpcdce.h index 8c10233d9bd..1fca11bff37 100644 --- a/reactos/include/psdk/rpcdce.h +++ b/reactos/include/psdk/rpcdce.h @@ -79,6 +79,12 @@ typedef struct RPC_IF_ID *IfId[1]; } RPC_IF_ID_VECTOR; +typedef struct +{ + unsigned int Count; + unsigned long Stats[1]; +} RPC_STATS_VECTOR; + typedef I_RPC_HANDLE *RPC_EP_INQ_HANDLE; #define RPC_C_EP_ALL_ELTS 0 diff --git a/reactos/include/psdk/rpcndr.h b/reactos/include/psdk/rpcndr.h index 9bf28407951..15f1cb2a21d 100644 --- a/reactos/include/psdk/rpcndr.h +++ b/reactos/include/psdk/rpcndr.h @@ -115,6 +115,12 @@ typedef unsigned char boolean; #define NdrFcLong(s) (unsigned char)(s & 0xff), (unsigned char)((s & 0x0000ff00) >> 8), \ (unsigned char)((s & 0x00ff0000) >> 16), (unsigned char)(s >> 24) +#define RPC_BAD_STUB_DATA_EXCEPTION_FILTER \ + ((RpcExceptionCode() == STATUS_ACCESS_VIOLATION) || \ + (RpcExceptionCode() == STATUS_DATATYPE_MISALIGNMENT) || \ + (RpcExceptionCode() == RPC_X_BAD_STUB_DATA) || \ + (RpcExceptionCode() == RPC_S_INVALID_BOUND)) + typedef struct { void *pad[2]; @@ -189,7 +195,7 @@ typedef struct _MIDL_STUB_MESSAGE ULONG_PTR MaxCount; ULONG Offset; ULONG ActualCount; - void * (__RPC_API *pfnAllocate)(size_t); + void * (__WINE_ALLOC_SIZE(1) __RPC_API *pfnAllocate)(size_t); void (__RPC_API *pfnFree)(void *); unsigned char *StackTop; unsigned char *pPresentedType; @@ -316,7 +322,7 @@ typedef struct _USER_MARSHAL_CB typedef struct _MALLOC_FREE_STRUCT { - void * (__RPC_USER *pfnAllocate)(size_t); + void * (__WINE_ALLOC_SIZE(1) __RPC_USER *pfnAllocate)(size_t); void (__RPC_USER *pfnFree)(void *); } MALLOC_FREE_STRUCT; @@ -329,7 +335,7 @@ typedef struct _COMM_FAULT_OFFSETS typedef struct _MIDL_STUB_DESC { void *RpcInterfaceInformation; - void * (__RPC_API *pfnAllocate)(size_t); + void * (__WINE_ALLOC_SIZE(1) __RPC_API *pfnAllocate)(size_t); void (__RPC_API *pfnFree)(void *); union { handle_t *pAutoHandle; @@ -468,7 +474,7 @@ typedef struct _NDR_USER_MARSHAL_INFO_LEVEL1 { void *Buffer; ULONG BufferSize; - void * (__RPC_API *pfnAllocate)(size_t); + void * (__WINE_ALLOC_SIZE(1) __RPC_API *pfnAllocate)(size_t); void (__RPC_API *pfnFree)(void *); struct IRpcChannelBuffer *pRpcChannelBuffer; ULONG_PTR Reserved[5]; @@ -652,7 +658,7 @@ RPCRTAPI LONG RPC_ENTRY NdrDcomAsyncStubCall( struct IRpcStubBuffer* pThis, struct IRpcChannelBuffer* pChannel, PRPC_MESSAGE pRpcMsg, DWORD * pdwStubPhase ); RPCRTAPI void* RPC_ENTRY - NdrAllocate( PMIDL_STUB_MESSAGE pStubMsg, size_t Len ); + NdrAllocate( PMIDL_STUB_MESSAGE pStubMsg, SIZE_T Len ) __WINE_ALLOC_SIZE(2); RPCRTAPI void RPC_ENTRY NdrClearOutParameters( PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat, void *ArgAddr ); @@ -662,7 +668,7 @@ RPCRTAPI RPC_STATUS RPC_ENTRY ULONG *pFaultStatus, RPC_STATUS Status_ ); RPCRTAPI void* RPC_ENTRY - NdrOleAllocate( size_t Size ); + NdrOleAllocate( size_t Size ) __WINE_ALLOC_SIZE(1); RPCRTAPI void RPC_ENTRY NdrOleFree( void* NodeToFree ); @@ -723,11 +729,11 @@ RPCRTAPI void RPC_ENTRY RPCRTAPI void RPC_ENTRY NdrRpcSmSetClientToOsf( PMIDL_STUB_MESSAGE pMessage ); RPCRTAPI void * RPC_ENTRY - NdrRpcSmClientAllocate( size_t Size ); + NdrRpcSmClientAllocate( size_t Size ) __WINE_ALLOC_SIZE(1); RPCRTAPI void RPC_ENTRY NdrRpcSmClientFree( void *NodeToFree ); RPCRTAPI void * RPC_ENTRY - NdrRpcSsDefaultAllocate( size_t Size ); + NdrRpcSsDefaultAllocate( size_t Size ) __WINE_ALLOC_SIZE(1); RPCRTAPI void RPC_ENTRY NdrRpcSsDefaultFree( void *NodeToFree ); diff --git a/reactos/include/psdk/wingdi.h b/reactos/include/psdk/wingdi.h index 49619b6e5d2..71311d117fc 100644 --- a/reactos/include/psdk/wingdi.h +++ b/reactos/include/psdk/wingdi.h @@ -503,6 +503,7 @@ extern "C" { #define FS_HEBREW 32 #define FS_ARABIC 64 #define FS_BALTIC 128 +#define FS_VIETNAMESE 256 #define FS_THAI 0x10000 #define FS_JISJAPAN 0x20000 #define FS_CHINESESIMP 0x40000 diff --git a/reactos/include/psdk/winnt.h b/reactos/include/psdk/winnt.h index 57ac419bfc8..6c5f50904d6 100644 --- a/reactos/include/psdk/winnt.h +++ b/reactos/include/psdk/winnt.h @@ -70,6 +70,12 @@ extern "C" { #endif #endif +#if defined(__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3))) +#define __WINE_ALLOC_SIZE(x) __attribute__((__alloc_size__(x))) +#else +#define __WINE_ALLOC_SIZE(x) +#endif + #ifndef FORCEINLINE #if (_MSC_VER >= 1200) #define FORCEINLINE __forceinline diff --git a/reactos/include/psdk/winternl.h b/reactos/include/psdk/winternl.h index f58fc899dc0..7868b035251 100644 --- a/reactos/include/psdk/winternl.h +++ b/reactos/include/psdk/winternl.h @@ -1662,9 +1662,6 @@ typedef enum _SYSDBG_COMMAND { * Function declarations */ -extern LPSTR _strlwr(LPSTR str); /* FIXME: Doesn't belong here */ -extern LPSTR _strupr(LPSTR str); /* FIXME: Doesn't belong here */ - #if defined(__i386__) && defined(__GNUC__) static inline void WINAPI DbgBreakPoint(void) { __asm__ __volatile__("int3"); } static inline void WINAPI DbgUserBreakPoint(void) { __asm__ __volatile__("int3"); } diff --git a/reactos/include/psdk/winuser.h b/reactos/include/psdk/winuser.h index 41a292a571c..b67c2959dd6 100644 --- a/reactos/include/psdk/winuser.h +++ b/reactos/include/psdk/winuser.h @@ -1988,6 +1988,7 @@ extern "C" { #define DCX_EXCLUDERGN 64 #define DCX_INTERSECTRGN 128 #define DCX_VALIDATE 0x200000 +#define DCX_USESTYLE 0x00010000 #define DCX_EXCLUDEUPDATE 0x100 #define GMDI_GOINTOPOPUPS 2 #define GMDI_USEDISABLED 1 @@ -3101,14 +3102,14 @@ typedef struct tagICONMETRICSA { int iVertSpacing; int iTitleWrap; LOGFONTA lfFont; -} ICONMETRICSA,*LPICONMETRICSA; +} ICONMETRICSA, *PICONMETRICSA, *LPICONMETRICSA; typedef struct tagICONMETRICSW { UINT cbSize; int iHorzSpacing; int iVertSpacing; int iTitleWrap; LOGFONTW lfFont; -} ICONMETRICSW,*LPICONMETRICSW; +} ICONMETRICSW, *PICONMETRICSW, *LPICONMETRICSW; #endif /* NOGDI */ typedef struct tagMINIMIZEDMETRICS { UINT cbSize; @@ -4475,8 +4476,8 @@ typedef MONITORINFOEXW MONITORINFOEX, *LPMONITORINFOEX; #define WinHelp WinHelpW #define wsprintf wsprintfW #define wvsprintf wvsprintfW -#ifndef NOGDI -typedef ICONMETRICSW ICONMETRICS,*LPICONMETRICS; +#if defined(_WINGDI_) && !defined(NOGDI) +typedef ICONMETRICSW ICONMETRICS; typedef NONCLIENTMETRICSW NONCLIENTMETRICS,*LPNONCLIENTMETRICS; #define ChangeDisplaySettings ChangeDisplaySettingsW #define ChangeDisplaySettingsEx ChangeDisplaySettingsExW @@ -4644,7 +4645,7 @@ typedef MONITORINFOEXA MONITORINFOEX, *LPMONITORINFOEX; #define wsprintf wsprintfA #define wvsprintf wvsprintfA #if defined(_WINGDI_) && !defined(NOGDI) -typedef ICONMETRICSA ICONMETRICS,*LPICONMETRICS; +typedef ICONMETRICSA ICONMETRICS; typedef NONCLIENTMETRICSA NONCLIENTMETRICS,*LPNONCLIENTMETRICS; #define ChangeDisplaySettings ChangeDisplaySettingsA #define ChangeDisplaySettingsEx ChangeDisplaySettingsExA diff --git a/reactos/include/reactos/idl/eventlogrpc.idl b/reactos/include/reactos/idl/eventlogrpc.idl index e1abda013ad..ae78f89a81e 100644 --- a/reactos/include/reactos/idl/eventlogrpc.idl +++ b/reactos/include/reactos/idl/eventlogrpc.idl @@ -17,10 +17,10 @@ typedef struct _RPC_STRING { [size_is(MaximumLength), length_is(Length)] LPSTR Buffer; } RPC_STRING, *PRPC_STRING; -typedef /*[context_handle]*/ unsigned long IELF_HANDLE; +typedef [context_handle] PVOID IELF_HANDLE; typedef IELF_HANDLE *PIELF_HANDLE; -typedef /*[handle, unique]*/ LPWSTR EVENTLOG_HANDLE_W; -typedef /*[handle, unique]*/ LPSTR EVENTLOG_HANDLE_A; +typedef [handle, unique] LPWSTR EVENTLOG_HANDLE_W; +typedef [handle, unique] LPSTR EVENTLOG_HANDLE_A; typedef struct _RPC_CLIENT_ID { DWORD UniqueProcess; @@ -40,65 +40,41 @@ interface eventlog { /* Function 0 */ NTSTATUS ElfrClearELFW( -#ifndef __midl - [in] handle_t BindingHandle, -#endif [in] IELF_HANDLE LogHandle, [in, unique] PRPC_UNICODE_STRING BackupFileName); /* Function 1 */ NTSTATUS ElfrBackupELFW( -#ifndef __midl - [in] handle_t BindingHandle, -#endif [in] IELF_HANDLE LogHandle, [in, unique] PRPC_UNICODE_STRING BackupFileName); /* Function 2 */ NTSTATUS ElfrCloseEL( -#ifndef __midl - [in] handle_t BindingHandle, -#endif [in, out] IELF_HANDLE *LogHandle); /* Function 3 */ NTSTATUS ElfrDeregisterEventSource( -#ifndef __midl - [in] handle_t BindingHandle, -#endif [in, out] IELF_HANDLE *LogHandle); /* Function 4 */ NTSTATUS ElfrNumberOfRecords( -#ifndef __midl - [in] handle_t BindingHandle, -#endif [in] IELF_HANDLE LogHandle, [out] DWORD *NumberOfRecords); /* Function 5 */ NTSTATUS ElfrOldestRecord( -#ifndef __midl - handle_t BindingHandle, -#endif [in] IELF_HANDLE LogHandle, [out] DWORD *OldestRecordNumber); /* Function 6 */ NTSTATUS ElfrChangeNotify( -#ifndef __midl - [in] handle_t BindingHandle, -#endif [in] IELF_HANDLE *LogHandle, [in] RPC_CLIENT_ID ClientId, [in] DWORD Event); /* Function 7 */ NTSTATUS ElfrOpenELW( -#ifndef __midl - [in] handle_t BindingHandle, -#endif - [in] EVENTLOG_HANDLE_W UNCServerName, + [in, unique] EVENTLOG_HANDLE_W UNCServerName, /* FIXME */ [in] PRPC_UNICODE_STRING ModuleName, [in] PRPC_UNICODE_STRING RegModuleName, [in] DWORD MajorVersion, @@ -107,10 +83,7 @@ interface eventlog /* Function 8 */ NTSTATUS ElfrRegisterEventSourceW( -#ifndef __midl - [in] handle_t BindingHandle, -#endif - [in] EVENTLOG_HANDLE_W UNCServerName, + [in, unique] EVENTLOG_HANDLE_W UNCServerName, /* FIXME */ [in] PRPC_UNICODE_STRING ModuleName, [in] PRPC_UNICODE_STRING RegModuleName, [in] DWORD MajorVersion, @@ -119,10 +92,7 @@ interface eventlog /* Function 9 */ NTSTATUS ElfrOpenBELW( -#ifndef __midl - [in] handle_t BindingHandle, -#endif - [in] EVENTLOG_HANDLE_W UNCServerName, + [in, unique] EVENTLOG_HANDLE_W UNCServerName, /* FIXME */ [in] PRPC_UNICODE_STRING BackupFileName, [in] DWORD MajorVersion, [in] DWORD MinorVersion, @@ -130,9 +100,6 @@ interface eventlog /* Function 10 */ NTSTATUS ElfrReadELW( -#ifndef __midl - [in] handle_t BindingHandle, -#endif [in] IELF_HANDLE LogHandle, [in] DWORD ReadFlags, [in] DWORD RecordOffset, @@ -143,9 +110,6 @@ interface eventlog /* Function 11 */ NTSTATUS ElfrReportEventW( -#ifndef __midl - [in] handle_t BindingHandle, -#endif [in] IELF_HANDLE LogHandle, [in] DWORD Time, [in] USHORT EventType, @@ -163,26 +127,17 @@ interface eventlog /* Function 12 */ NTSTATUS ElfrClearELFA( -#ifndef __midl - [in] handle_t BindingHandle, -#endif [in] IELF_HANDLE LogHandle, [in, unique] PRPC_STRING BackupFileName); /* Function 13 */ NTSTATUS ElfrBackupELFA( -#ifndef __midl - [in] handle_t BindingHandle, -#endif [in] IELF_HANDLE LogHandle, [in, unique] PRPC_STRING BackupFileName); /* Function 14 */ NTSTATUS ElfrOpenELA( -#ifndef __midl - [in] handle_t BindingHandle, -#endif - [in] EVENTLOG_HANDLE_A UNCServerName, + [in, unique] EVENTLOG_HANDLE_A UNCServerName, /* FIXME */ [in] PRPC_STRING ModuleName, [in] PRPC_STRING RegModuleName, [in] DWORD MajorVersion, @@ -191,10 +146,7 @@ interface eventlog /* Function 15 */ NTSTATUS ElfrRegisterEventSourceA( -#ifndef __midl - [in] handle_t BindingHandle, -#endif - [in] EVENTLOG_HANDLE_A UNCServerName, + [in, unique] EVENTLOG_HANDLE_A UNCServerName, /* FIXME */ [in] PRPC_STRING ModuleName, [in] PRPC_STRING RegModuleName, [in] DWORD MajorVersion, @@ -203,10 +155,7 @@ interface eventlog /* Function 16 */ NTSTATUS ElfrOpenBELA( -#ifndef __midl - [in] handle_t BindingHandle, -#endif - [in] EVENTLOG_HANDLE_A UNCServerName, + [in, unique] EVENTLOG_HANDLE_A UNCServerName, /* FIXME */ [in] PRPC_STRING BackupFileName, [in] DWORD MajorVersion, [in] DWORD MinorVersion, @@ -214,9 +163,6 @@ interface eventlog /* Function 17 */ NTSTATUS ElfrReadELA( -#ifndef __midl - [in] handle_t BindingHandle, -#endif [in] IELF_HANDLE LogHandle, [in] DWORD ReadFlags, [in] DWORD RecordOffset, @@ -227,9 +173,6 @@ interface eventlog /* Function 18 */ NTSTATUS ElfrReportEventA( -#ifndef __midl - [in] handle_t BindingHandle, -#endif [in] IELF_HANDLE LogHandle, [in] DWORD Time, [in] USHORT EventType, @@ -268,9 +211,6 @@ interface eventlog /* Function 22 */ NTSTATUS ElfrGetLogInformation( -#ifndef __midl - [in] handle_t BindingHandle, -#endif [in] IELF_HANDLE LogHandle, [in] DWORD InfoLevel, [out, size_is(cbBufSize)] BYTE *Buffer, @@ -279,16 +219,10 @@ interface eventlog /* Function 23 */ NTSTATUS ElfrFlushEL( -#ifndef __midl - [in] handle_t BindingHandle, -#endif [in] IELF_HANDLE LogHandle); /* Function 24 */ NTSTATUS ElfrReportEventAndSourceW( -#ifndef __midl - [in] handle_t BindingHandle, -#endif [in] IELF_HANDLE LogHandle, [in] DWORD Time, [in] USHORT EventType, diff --git a/reactos/include/reactos/win32k/ntgdihdl.h b/reactos/include/reactos/win32k/ntgdihdl.h index 259e67be5c8..e6fe3074c2a 100644 --- a/reactos/include/reactos/win32k/ntgdihdl.h +++ b/reactos/include/reactos/win32k/ntgdihdl.h @@ -42,7 +42,9 @@ #define GDI_ENTRY_UPPER_SHIFT 16 /* GDI Entry Flags */ -#define GDI_ENTRY_FLAG_NEED_UPDATE 4 +#define GDI_ENTRY_UNDELETABLE 1 +#define GDI_ENTRY_DELETING 2 +#define GDI_ENTRY_VALIDATE_VIS 4 /*! \defgroup GDI object types * @@ -230,7 +232,7 @@ typedef struct __GDI_SHARED_HANDLE_TABLE // Must match win32k/include/gdiobj.h FLONG flDeviceUniq; // Device settings uniqueness. PVOID pvLangPack; // Lanuage Pack. CFONT cfPublic[GDI_CFONT_MAX]; // Public Fonts. - DWORD dwCsbSupported1; // OEM code-page bitfield. + DWORD dwCFCount; } GDI_SHARED_HANDLE_TABLE, *PGDI_SHARED_HANDLE_TABLE; typedef struct _RGN_ATTR @@ -328,8 +330,8 @@ typedef struct _BRUSH_ATTR // Used with pen too. typedef struct _FONT_ATTR { - DWORD dwUnknown; - void *pCharWidthData; + BOOL bSlowWidths; + PCFONT pCharWidthData; } FONT_ATTR, *PFONT_ATTR; diff --git a/reactos/include/reactos/win32k/ntgdityp.h b/reactos/include/reactos/win32k/ntgdityp.h index 671d435aca0..73b6ad4ec8c 100644 --- a/reactos/include/reactos/win32k/ntgdityp.h +++ b/reactos/include/reactos/win32k/ntgdityp.h @@ -231,10 +231,15 @@ typedef struct _UNIVERSAL_FONT_ID ULONG Index; } UNIVERSAL_FONT_ID, *PUNIVERSAL_FONT_ID; -typedef struct _REALIZATION_INFO // Based on LOCALESIGNATURE +#define RI_TECH_BITMAP 1 +#define RI_TECH_FIXED 2 +#define RI_TECH_SCALABLE 3 + +typedef struct _REALIZATION_INFO { - DWORD dwCsbDefault[2]; - DWORD dwCsbSupported0; + DWORD iTechnology; + DWORD iUniq; + DWORD dwUnknown; } REALIZATION_INFO, *PREALIZATION_INFO; typedef struct _WIDTHDATA @@ -385,6 +390,8 @@ typedef union ULONG l; } gxf_long; +#define CFONT_REALIZATION 0x0080 + typedef struct _CFONT { struct _CFONT *pcfNext; @@ -402,7 +409,10 @@ typedef struct _CFONT USHORT sWidth[256]; // Widths in pels. ULONG ulAveWidth; // bogus average used by USER TMW_INTERNAL tmw; // cached metrics - LOCALESIGNATURE lsLocSig; // font signature information + DWORD iTechnology; + DWORD iUniq; + DWORD dwUnknown; + DWORD dwCFCount; } CFONT, *PCFONT; // diff --git a/reactos/include/reactos/win32k/ntuser.h b/reactos/include/reactos/win32k/ntuser.h index b30fbc31fec..7bfe3a4aaee 100644 --- a/reactos/include/reactos/win32k/ntuser.h +++ b/reactos/include/reactos/win32k/ntuser.h @@ -1724,12 +1724,12 @@ NtUserImpersonateDdeClientWindow( HWND hWndClient, HWND hWndServer); -DWORD +NTSTATUS NTAPI NtUserInitialize( - DWORD dwUnknown1, - DWORD dwUnknown2, - DWORD dwUnknown3); + DWORD dwWinVersion, + HANDLE hPowerRequestEvent, + HANDLE hMediaRequestEvent); NTSTATUS NTAPI @@ -1805,10 +1805,10 @@ NTAPI NtUserLockWindowStation( HWINSTA hWindowStation); -DWORD -NTAPI +BOOL +STDCALL NtUserLockWindowUpdate( - DWORD Unknown0); + HWND hWnd); BOOL NTAPI diff --git a/reactos/include/reactos/wine/config.h b/reactos/include/reactos/wine/config.h index cc9c0777c3b..e4f02e7c2dd 100644 --- a/reactos/include/reactos/wine/config.h +++ b/reactos/include/reactos/wine/config.h @@ -797,7 +797,7 @@ #define HAVE_VA_COPY 1 /* Define to 1 if you have the `vsnprintf' function. */ -//#define HAVE_VSNPRINTF 1 +#define HAVE_VSNPRINTF 1 /* Define to 1 if you have the `wait4' function. */ /* #undef HAVE_WAIT4 */ diff --git a/reactos/include/reactos/wine/dcetypes.idl b/reactos/include/reactos/wine/dcetypes.idl new file mode 100644 index 00000000000..9986fcd1fcd --- /dev/null +++ b/reactos/include/reactos/wine/dcetypes.idl @@ -0,0 +1,88 @@ +/* + * Common DCE Types + * + * Copyright 2006 Robert Shearman (for CodeWeavers) + * + * 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 + */ + +/* pull in GUID type */ +import "wtypes.idl"; + +typedef unsigned small unsigned8; +typedef unsigned short unsigned16; +typedef unsigned long unsigned32; +typedef small signed8; +typedef short signed16; +typedef long signed32; +typedef unsigned32 boolean32; +typedef unsigned hyper u_int64; +typedef unsigned long u_int32; +typedef unsigned short u_int16; +typedef unsigned small u_int8; + +typedef [ptr] GUID *uuid_p_t; + +typedef struct twr_t +{ + unsigned32 tower_length; + [size_is(tower_length)] byte tower_octet_string[]; +} twr_t; +typedef [ptr] twr_t *twr_p_t; + +typedef struct ndr_context_handle +{ + unsigned32 context_handle_attributes; + GUID context_handle_uuid; +} ndr_context_handle; + +const long ndr_c_int_big_endian = 0; +const long ndr_c_int_little_endian = 1; +const long ndr_c_float_ieee = 0; +const long ndr_c_float_vax = 1; +const long ndr_c_float_cray = 2; +const long ndr_c_float_ibm = 3; +const long ndr_c_char_ascii = 0; +const long ndr_c_char_ebcdic = 1; + +typedef struct +{ + unsigned8 int_rep; + unsigned8 char_rep; + unsigned8 float_rep; + byte reserved; +} ndr_format_t, *ndr_format_p_t; + +typedef struct +{ + GUID uuid; + unsigned16 vers_major; + unsigned16 vers_minor; +} rpc_if_id_t; +typedef [unique] rpc_if_id_t *rpc_if_id_p_t; + +typedef struct +{ + unsigned32 count; + [size_is(count)] + rpc_if_id_p_t if_id[*]; +} rpc_if_id_vector_t; +typedef [unique] rpc_if_id_vector_t *rpc_if_id_vector_p_t; + +typedef struct +{ + unsigned32 count; + unsigned32 stats[1]; /* length_is (count) */ +} rpc_stats_vector_t, *rpc_stats_vector_p_t; diff --git a/reactos/include/reactos/wine/epm.idl b/reactos/include/reactos/wine/epm.idl new file mode 100644 index 00000000000..6b92313d9cc --- /dev/null +++ b/reactos/include/reactos/wine/epm.idl @@ -0,0 +1,122 @@ +/* + * Endpoint Mapper + * + * Copyright 2006 Robert Shearman (for CodeWeavers) + * + * 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 + */ + +/* FIXME: should be import */ +#include "dcetypes.idl" + +cpp_quote("RPC_STATUS WINAPI TowerExplode(") +cpp_quote(" const twr_t *tower, PRPC_SYNTAX_IDENTIFIER object, PRPC_SYNTAX_IDENTIFIER syntax,") +cpp_quote(" char **protseq, char **endpoint, char **address);") +cpp_quote("RPC_STATUS WINAPI TowerConstruct(") +cpp_quote(" const RPC_SYNTAX_IDENTIFIER *object, const RPC_SYNTAX_IDENTIFIER *syntax,") +cpp_quote(" const char *protseq, const char *endpoint, const char *address,") +cpp_quote(" twr_t **tower);") + +[ + uuid(e1af8308-5d1f-11c9-91a4-08002b14a0fa), + version(3.0), + pointer_default(ref) +] +interface epm +{ + const long ept_max_annotation_size = 64; + + typedef struct + { + GUID object; + twr_t *tower; + [string] char annotation[ept_max_annotation_size]; + } ept_entry_t, *ept_entry_p_t; + + typedef [context_handle] void *ept_lookup_handle_t; + + /* Adds entries to an endpoint map */ + void ept_insert( + [in] handle_t h, + [in] unsigned32 num_ents, + [in, size_is(num_ents)] + ept_entry_t entries[], + [in] boolean32 replace, + [out] error_status_t *status + ); + + /* Removes entries from an endpoint map */ + void ept_delete( + [in] handle_t h, + [in] unsigned32 num_ents, + [in, size_is(num_ents)] + ept_entry_t entries[], + [out] error_status_t *status + ); + + /* Lookup entries in an endpoint map */ + [idempotent] + void ept_lookup( + [in] handle_t h, + [in] unsigned32 inquiry_type, + [in] uuid_p_t object, + [in] rpc_if_id_p_t interface_id, + [in] unsigned32 vers_option, + [in, out] ept_lookup_handle_t *entry_handle, + [in] unsigned32 max_ents, + [out] unsigned32 *num_ents, + [out, length_is(*num_ents), size_is(max_ents)] + ept_entry_t entries[], + [out] error_status_t *status + ); + + /* Lookup entries in an endpoint map using the given input pattern */ + [idempotent] + void ept_map( + [in] handle_t h, + [in] uuid_p_t object, + [in] twr_p_t map_tower, + [in, out] ept_lookup_handle_t *entry_handle, + [in] unsigned32 max_towers, + [out] unsigned32 *num_towers, + [out, length_is(*num_towers), size_is(max_towers)] + twr_p_t *towers, + [out] error_status_t *status + ); + + /* Free the context handle returned by ept_lookup or ept_map */ + void ept_lookup_handle_free( + [in] handle_t h, + [in, out] ept_lookup_handle_t *entry_handle, + [out] error_status_t *status + ); + + /* Inquires as to the endpoint map's object identifier */ + [idempotent] + void ept_inq_object( + [in] handle_t h, + [out] GUID *ept_object, + [out] error_status_t *status + ); + + /* Deletes matching entries in the endpoint map */ + void ept_mgmt_delete( + [in] handle_t h, + [in] boolean32 object_speced, + [in] uuid_p_t object, + [in] twr_p_t tower, + [out] error_status_t *status + ); +} diff --git a/reactos/include/reactos/wine/unicode.h b/reactos/include/reactos/wine/unicode.h index dea64cd477a..44f09885305 100644 --- a/reactos/include/reactos/wine/unicode.h +++ b/reactos/include/reactos/wine/unicode.h @@ -2,6 +2,8 @@ #define _WINE_UNICODE_H #include +#include +#include #include #include @@ -53,12 +55,6 @@ #endif #endif /* defined __VALIST */ -int __cdecl _wtoi (const wchar_t *); -long __cdecl _wtol (const wchar_t *); -int __cdecl swprintf (wchar_t*, const wchar_t*, ...); -int __cdecl _snwprintf (wchar_t*, size_t, const wchar_t*, ...); -int __cdecl _vsnwprintf (wchar_t*, size_t, const wchar_t*, __VALIST); - static __inline WCHAR *strpbrkW( const WCHAR *str, const WCHAR *accept ) { for ( ; *str; str++) if (strchrW( accept, *str )) return (WCHAR *)str; diff --git a/reactos/lib/3rdparty/adns/adns.rbuild b/reactos/lib/3rdparty/adns/adns.rbuild index 7a0ce2d4c14..700cf8ae1e1 100644 --- a/reactos/lib/3rdparty/adns/adns.rbuild +++ b/reactos/lib/3rdparty/adns/adns.rbuild @@ -1,6 +1,6 @@ - + src adns_win32 diff --git a/reactos/lib/3rdparty/bzip2/bzip2.rbuild b/reactos/lib/3rdparty/bzip2/bzip2.rbuild index e5e172cd2a6..6619537a2ad 100644 --- a/reactos/lib/3rdparty/bzip2/bzip2.rbuild +++ b/reactos/lib/3rdparty/bzip2/bzip2.rbuild @@ -1,7 +1,7 @@ - + ntoskrnl diff --git a/reactos/lib/3rdparty/bzip2/unbzip2.def b/reactos/lib/3rdparty/bzip2/unbzip2.def deleted file mode 100644 index 181a120518a..00000000000 --- a/reactos/lib/3rdparty/bzip2/unbzip2.def +++ /dev/null @@ -1,4 +0,0 @@ -LIBRARY unbzip2.dll - -EXPORTS -BZ2_bzBuffToBuffDecompress@24 diff --git a/reactos/lib/3rdparty/bzip2/unbzip2.spec b/reactos/lib/3rdparty/bzip2/unbzip2.spec new file mode 100644 index 00000000000..68d5d870a4b --- /dev/null +++ b/reactos/lib/3rdparty/bzip2/unbzip2.spec @@ -0,0 +1 @@ + @ stdcall BZ2_bzBuffToBuffDecompress(str ptr str long long long) diff --git a/reactos/lib/3rdparty/libxml2/libxml2.rbuild b/reactos/lib/3rdparty/libxml2/libxml2.rbuild index 327c3e6acc3..75649a6f306 100644 --- a/reactos/lib/3rdparty/libxml2/libxml2.rbuild +++ b/reactos/lib/3rdparty/libxml2/libxml2.rbuild @@ -1,6 +1,6 @@ - + diff --git a/reactos/lib/3rdparty/mingw/crtexe.c b/reactos/lib/3rdparty/mingw/crtexe.c index 6b56ff322b8..79eaf40c416 100644 --- a/reactos/lib/3rdparty/mingw/crtexe.c +++ b/reactos/lib/3rdparty/mingw/crtexe.c @@ -136,7 +136,7 @@ int WinMainCRTStartup (void) #endif { mingw_app_type = 1; - __security_init_cookie (); + //__security_init_cookie (); return __mingw_CRTStartup (); } @@ -147,7 +147,7 @@ int mainCRTStartup (void) #endif { mingw_app_type = 0; - __security_init_cookie (); + //__security_init_cookie (); return __mingw_CRTStartup (); } diff --git a/reactos/lib/3rdparty/mingw/gccmain.c b/reactos/lib/3rdparty/mingw/gccmain.c index d46e99de72a..a7c8df24d3c 100644 --- a/reactos/lib/3rdparty/mingw/gccmain.c +++ b/reactos/lib/3rdparty/mingw/gccmain.c @@ -6,7 +6,7 @@ typedef void (*func_ptr) (void); extern func_ptr __CTOR_LIST__[]; extern func_ptr __DTOR_LIST__[]; -static HMODULE hMsvcrt = NULL; +//static HMODULE hMsvcrt = NULL; typedef void __cdecl flongjmp(jmp_buf _Buf,int _Value); @@ -22,11 +22,11 @@ __do_global_dtors (void) (*(p)) (); p++; } - if (hMsvcrt) - { - FreeLibrary (hMsvcrt); - hMsvcrt = NULL; - } + //if (hMsvcrt) + // { + // FreeLibrary (hMsvcrt); + // hMsvcrt = NULL; + // } } void @@ -35,10 +35,10 @@ __do_global_ctors (void) unsigned long nptrs = (unsigned long) (ptrdiff_t) __CTOR_LIST__[0]; unsigned long i; - if (!hMsvcrt) { - hMsvcrt = LoadLibrary ("msvcrt.dll"); - fctMsvcrtLongJmp = (flongjmp *) GetProcAddress( hMsvcrt, "longjmp"); - } + //if (!hMsvcrt) { + // hMsvcrt = LoadLibrary ("msvcrt.dll"); + // fctMsvcrtLongJmp = (flongjmp *) GetProcAddress( hMsvcrt, "longjmp"); + //} if (nptrs == (unsigned long) -1) { diff --git a/reactos/lib/3rdparty/mingw/mingw.rbuild b/reactos/lib/3rdparty/mingw/mingw.rbuild index 1ae99126f67..ae38d109b96 100644 --- a/reactos/lib/3rdparty/mingw/mingw.rbuild +++ b/reactos/lib/3rdparty/mingw/mingw.rbuild @@ -1,7 +1,7 @@ - + include _newmode.c @@ -17,7 +17,7 @@ dllmain.c gccmain.c getopt.c - gs_support.c + merr.c mingw_helpers.c natstart.c @@ -29,19 +29,18 @@ xthdloc.c xtxtmode.c - + include crt0_c.c crtexe.c - + include crt0_w.c crtexe.c - - + include dllentry.c dllmain.c diff --git a/reactos/lib/drivers/chew/workqueue.c b/reactos/lib/drivers/chew/workqueue.c index e25ce324c51..c0d5870dc7c 100644 --- a/reactos/lib/drivers/chew/workqueue.c +++ b/reactos/lib/drivers/chew/workqueue.c @@ -101,6 +101,7 @@ BOOLEAN ChewCreate VOID ChewRemove( PVOID Item ) { PWORK_ITEM WorkItem = Item; + RemoveEntryList( &WorkItem->Entry ); IoFreeWorkItem( WorkItem->WorkItem ); ExFreePool( WorkItem ); } diff --git a/reactos/lib/drivers/ip/ip.rbuild b/reactos/lib/drivers/ip/ip.rbuild index ac51d806498..d6ee690692a 100644 --- a/reactos/lib/drivers/ip/ip.rbuild +++ b/reactos/lib/drivers/ip/ip.rbuild @@ -1,6 +1,6 @@ - + include include diff --git a/reactos/lib/drivers/ip/network/icmp.c b/reactos/lib/drivers/ip/network/icmp.c index 3eeb98cb0b1..eda6ccb6a93 100644 --- a/reactos/lib/drivers/ip/network/icmp.c +++ b/reactos/lib/drivers/ip/network/icmp.c @@ -181,6 +181,7 @@ VOID ICMPTransmit( */ { PNEIGHBOR_CACHE_ENTRY NCE; + NTSTATUS Status; TI_DbgPrint(DEBUG_ICMP, ("Called.\n")); @@ -191,7 +192,11 @@ VOID ICMPTransmit( /* Get a route to the destination address */ if ((NCE = RouteGetRouteToDestination(&IPPacket->DstAddr))) { /* Send the packet */ - IPSendDatagram(IPPacket, NCE, Complete, Context); + Status = IPSendDatagram(IPPacket, NCE, Complete, Context); + if (!NT_SUCCESS(Status)) + { + Complete(Context, IPPacket->NdisPacket, Status); + } } else { /* No route to destination (or no free resources) */ TI_DbgPrint(DEBUG_ICMP, ("No route to destination address 0x%X.\n", diff --git a/reactos/lib/drivers/ip/network/ip.c b/reactos/lib/drivers/ip/network/ip.c index d49f15da0a6..2ea6796becc 100644 --- a/reactos/lib/drivers/ip/network/ip.c +++ b/reactos/lib/drivers/ip/network/ip.c @@ -150,12 +150,17 @@ VOID IPDispatchProtocol( Protocol = 0; } - /* Call the appropriate protocol handler */ - (*ProtocolTable[Protocol])(Interface, IPPacket); - /* Special case for ICMP -- ICMP can be caught by a SOCK_RAW but also - * must be handled here. */ - if( Protocol == IPPROTO_ICMP ) - ICMPReceive( Interface, IPPacket ); + if (Protocol < IP_PROTOCOL_TABLE_SIZE && + Protocol >= 0) + { + /* Call the appropriate protocol handler */ + (*ProtocolTable[Protocol])(Interface, IPPacket); + + /* Special case for ICMP -- ICMP can be caught by a SOCK_RAW but also + * must be handled here. */ + if( Protocol == IPPROTO_ICMP ) + ICMPReceive( Interface, IPPacket ); + } } diff --git a/reactos/lib/drivers/ip/network/loopback.c b/reactos/lib/drivers/ip/network/loopback.c index cd142b12a74..acb227ddef5 100644 --- a/reactos/lib/drivers/ip/network/loopback.c +++ b/reactos/lib/drivers/ip/network/loopback.c @@ -196,6 +196,7 @@ NDIS_STATUS LoopRegisterAdapter( AddrInitIPv4(&Loopback->Unicast, LOOPBACK_ADDRESS_IPv4); AddrInitIPv4(&Loopback->Netmask, LOOPBACK_ADDRMASK_IPv4); + AddrInitIPv4(&Loopback->Broadcast, LOOPBACK_BCASTADDR_IPv4); IPRegisterInterface(Loopback); diff --git a/reactos/lib/drivers/ip/network/neighbor.c b/reactos/lib/drivers/ip/network/neighbor.c index e9f13ffc41f..3e87ee55698 100644 --- a/reactos/lib/drivers/ip/network/neighbor.c +++ b/reactos/lib/drivers/ip/network/neighbor.c @@ -28,13 +28,20 @@ VOID NBCompleteSend( PVOID Context, VOID NBSendPackets( PNEIGHBOR_CACHE_ENTRY NCE ) { PLIST_ENTRY PacketEntry; PNEIGHBOR_PACKET Packet; + UINT HashValue; if(!(NCE->State & NUD_CONNECTED)) return; + HashValue = *(PULONG)(&NCE->Address.Address); + HashValue ^= HashValue >> 16; + HashValue ^= HashValue >> 8; + HashValue ^= HashValue >> 4; + HashValue &= NB_HASHMASK; + /* Send any waiting packets */ PacketEntry = ExInterlockedRemoveHeadList(&NCE->PacketQueue, - &NCE->Table->Lock); + &NeighborCache[HashValue].Lock); if( PacketEntry != NULL ) { Packet = CONTAINING_RECORD( PacketEntry, NEIGHBOR_PACKET, Next ); @@ -333,15 +340,22 @@ VOID NBUpdateNeighbor( */ { KIRQL OldIrql; + UINT HashValue; TI_DbgPrint(DEBUG_NCACHE, ("Called. NCE (0x%X) LinkAddress (0x%X) State (0x%X).\n", NCE, LinkAddress, State)); - TcpipAcquireSpinLock(&NCE->Table->Lock, &OldIrql); + HashValue = *(PULONG)(&NCE->Address.Address); + HashValue ^= HashValue >> 16; + HashValue ^= HashValue >> 8; + HashValue ^= HashValue >> 4; + HashValue &= NB_HASHMASK; + + TcpipAcquireSpinLock(&NeighborCache[HashValue].Lock, &OldIrql); RtlCopyMemory(NCE->LinkAddress, LinkAddress, NCE->LinkAddressLength); NCE->State = State; - TcpipReleaseSpinLock(&NCE->Table->Lock, OldIrql); + TcpipReleaseSpinLock(&NeighborCache[HashValue].Lock, OldIrql); if( NCE->State & NUD_CONNECTED ) NBSendPackets( NCE ); @@ -444,9 +458,9 @@ BOOLEAN NBQueuePacket( * TRUE if the packet was successfully queued, FALSE if not */ { - PKSPIN_LOCK Lock; KIRQL OldIrql; PNEIGHBOR_PACKET Packet; + UINT HashValue; TI_DbgPrint (DEBUG_NCACHE, @@ -457,16 +471,20 @@ BOOLEAN NBQueuePacket( /* FIXME: Should we limit the number of queued packets? */ - Lock = &NCE->Table->Lock; + HashValue = *(PULONG)(&NCE->Address.Address); + HashValue ^= HashValue >> 16; + HashValue ^= HashValue >> 8; + HashValue ^= HashValue >> 4; + HashValue &= NB_HASHMASK; - TcpipAcquireSpinLock(Lock, &OldIrql); + TcpipAcquireSpinLock(&NeighborCache[HashValue].Lock, &OldIrql); Packet->Complete = PacketComplete; Packet->Context = PacketContext; Packet->Packet = NdisPacket; InsertTailList( &NCE->PacketQueue, &Packet->Next ); - TcpipReleaseSpinLock(Lock, OldIrql); + TcpipReleaseSpinLock(&NeighborCache[HashValue].Lock, OldIrql); if( NCE->State & NUD_CONNECTED ) NBSendPackets( NCE ); diff --git a/reactos/lib/drivers/ip/transport/tcp/accept.c b/reactos/lib/drivers/ip/transport/tcp/accept.c index 2132b17f6a1..b588b7db1df 100644 --- a/reactos/lib/drivers/ip/transport/tcp/accept.c +++ b/reactos/lib/drivers/ip/transport/tcp/accept.c @@ -112,13 +112,14 @@ VOID TCPAbortListenForSocket( PCONNECTION_ENDPOINT Listener, ListEntry = Listener->ListenRequest.Flink; while ( ListEntry != &Listener->ListenRequest ) { Bucket = CONTAINING_RECORD(ListEntry, TDI_BUCKET, Entry); - ListEntry = ListEntry->Flink; if( Bucket->AssociatedEndpoint == Connection ) { - RemoveEntryList( ListEntry->Blink ); + RemoveEntryList( &Bucket->Entry ); ExFreePool( Bucket ); break; } + + ListEntry = ListEntry->Flink; } TcpipRecursiveMutexLeave( &TCPLock ); diff --git a/reactos/lib/drivers/ip/transport/tcp/tcp.c b/reactos/lib/drivers/ip/transport/tcp/tcp.c index bdf7fd53a0a..5579813ba21 100644 --- a/reactos/lib/drivers/ip/transport/tcp/tcp.c +++ b/reactos/lib/drivers/ip/transport/tcp/tcp.c @@ -36,7 +36,6 @@ static VOID HandleSignalledConnection( PCONNECTION_ENDPOINT Connection, /* Things that can happen when we try the initial connection */ if( NewState & SEL_CONNECT ) { while( !IsListEmpty( &Connection->ConnectRequest ) ) { - Connection->State |= NewState; Entry = RemoveHeadList( &Connection->ConnectRequest ); TI_DbgPrint(DEBUG_TCP, ("Connect Event\n")); @@ -283,8 +282,7 @@ PCONNECTION_ENDPOINT TCPAllocateConnectionEndpoint( PVOID ClientContext ) { } VOID TCPFreeConnectionEndpoint( PCONNECTION_ENDPOINT Connection ) { - TI_DbgPrint(MAX_TRACE,("FIXME: Cancel all pending requests\n")); - /* XXX Cancel all pending requests */ + TCPClose( Connection ); ExFreePool( Connection ); } @@ -839,7 +837,7 @@ VOID TCPRemoveIRP( PCONNECTION_ENDPOINT Endpoint, PIRP Irp ) { TcpipAcquireSpinLock( &Endpoint->Lock, &OldIrql ); - for( i = 0; i < sizeof( ListHead ) / sizeof( ListHead[0] ); i++ ) { + for( i = 0; i < 4; i++ ) { for( Entry = ListHead[i]->Flink; Entry != ListHead[i]; Entry = Entry->Flink ) { diff --git a/reactos/lib/rtl/i386/except.c b/reactos/lib/rtl/i386/except.c index dc56aed3ec0..0b5d151929e 100644 --- a/reactos/lib/rtl/i386/except.c +++ b/reactos/lib/rtl/i386/except.c @@ -74,6 +74,17 @@ RtlDispatchException(IN PEXCEPTION_RECORD ExceptionRecord, ULONG_PTR StackLow, StackHigh; ULONG_PTR RegistrationFrameEnd; + /* Perform vectored exception handling if we are in user mode */ + if (RtlpGetMode() != KernelMode) + { + /* Call any registered vectored handlers */ + if (RtlCallVectoredExceptionHandlers(ExceptionRecord, Context)) + { + /* Exception handled, continue execution */ + return TRUE; + } + } + /* Get the current stack limits and registration frame */ RtlpGetStackLimits(&StackLow, &StackHigh); RegistrationFrame = RtlpGetExceptionList(); diff --git a/reactos/lib/rtl/nls.c b/reactos/lib/rtl/nls.c index 078745bc83e..6bed84863ee 100644 --- a/reactos/lib/rtl/nls.c +++ b/reactos/lib/rtl/nls.c @@ -366,7 +366,7 @@ RtlOemToUnicodeN (PWCHAR UnicodeString, for (i = 0; i < Size; i++) { - *UnicodeString = NlsOemToUnicodeTable[(INT)*OemString]; + *UnicodeString = NlsOemToUnicodeTable[(UCHAR)*OemString]; UnicodeString++; OemString++; } diff --git a/reactos/lib/rtl/rtlp.h b/reactos/lib/rtl/rtlp.h index 8ca48e890c3..36902564a3c 100644 --- a/reactos/lib/rtl/rtlp.h +++ b/reactos/lib/rtl/rtlp.h @@ -39,6 +39,13 @@ VOID NTAPI RtlpSetExceptionList(PEXCEPTION_REGISTRATION_RECORD NewExceptionList); +BOOLEAN +NTAPI +RtlCallVectoredExceptionHandlers( + IN PEXCEPTION_RECORD ExceptionRecord, + IN PCONTEXT Context +); + typedef struct _DISPATCHER_CONTEXT { PEXCEPTION_REGISTRATION_RECORD RegistrationPointer; diff --git a/reactos/lib/rtl/vectoreh.c b/reactos/lib/rtl/vectoreh.c index d1a39138622..52d6667cce6 100644 --- a/reactos/lib/rtl/vectoreh.c +++ b/reactos/lib/rtl/vectoreh.c @@ -28,9 +28,10 @@ typedef struct _RTL_VECTORED_EXCEPTION_HANDLER /* FUNCTIONS ***************************************************************/ -EXCEPTION_DISPOSITION NTAPI -RtlpExecuteVectoredExceptionHandlers(IN PEXCEPTION_RECORD ExceptionRecord, - IN PCONTEXT Context) +BOOLEAN +NTAPI +RtlCallVectoredExceptionHandlers(IN PEXCEPTION_RECORD ExceptionRecord, + IN PCONTEXT Context) { PLIST_ENTRY CurrentEntry; PRTL_VECTORED_EXCEPTION_HANDLER veh; @@ -55,7 +56,7 @@ RtlpExecuteVectoredExceptionHandlers(IN PEXCEPTION_RECORD ExceptionRecord, if(VectoredHandler(&ExceptionInfo) == EXCEPTION_CONTINUE_EXECUTION) { - return ExceptionContinueSearch; + return TRUE; } RtlEnterCriticalSection(&RtlpVectoredExceptionLock); @@ -63,7 +64,7 @@ RtlpExecuteVectoredExceptionHandlers(IN PEXCEPTION_RECORD ExceptionRecord, RtlLeaveCriticalSection(&RtlpVectoredExceptionLock); } - return ExceptionContinueExecution; + return FALSE; } VOID diff --git a/reactos/lib/sdk/crt/conio/cprintf.c b/reactos/lib/sdk/crt/conio/cprintf.c index b32485db7f6..5c6295c15a1 100644 --- a/reactos/lib/sdk/crt/conio/cprintf.c +++ b/reactos/lib/sdk/crt/conio/cprintf.c @@ -18,6 +18,8 @@ _cprintf(const char *fmt, ...) int written, resize = sizeof(buf), retval; va_list valist; + va_start( valist, fmt ); + while ((written = _vsnprintf( mem, resize, fmt, valist )) == -1 || written > resize) { @@ -26,9 +28,11 @@ _cprintf(const char *fmt, ...) free (mem); if (!(mem = (char *)malloc(resize))) return EOF; + + va_end ( valist ); va_start( valist, fmt ); } - va_end(valist); + va_end ( valist ); retval = _cputs( mem ); if (mem != buf) free (mem); diff --git a/reactos/lib/sdk/crt/include/internal/file.h b/reactos/lib/sdk/crt/include/internal/file.h index 9a5c2440f3f..86915b5f149 100644 --- a/reactos/lib/sdk/crt/include/internal/file.h +++ b/reactos/lib/sdk/crt/include/internal/file.h @@ -127,10 +127,10 @@ int access_dirW(const wchar_t *_path); #define MB_CUR_MAX __mb_cur_max -int _isnanl(long double x); -int _isinfl(long double x); -int _isnan(double x); -int _isinf(double x); +//int _isnanl(long double x); +//int _isinfl(long double x); +//int _isnan(double x); +//int _isinf(double x); /* Flags for the iobuf structure (for reference) */ #if 0 @@ -172,10 +172,9 @@ int _isinf(double x); wint_t _filwbuf(FILE *f); -#if __MINGW32_MAJOR_VERSION < 3 || __MINGW32_MINOR_VERSION < 2 - int __cdecl _filbuf (FILE*); - int __cdecl _flsbuf (int, FILE*); -#endif +//#if __MINGW32_MAJOR_VERSION < 3 || __MINGW32_MINOR_VERSION < 2 +// int __cdecl _filbuf (FILE*); +// int __cdecl _flsbuf (int, FILE*); +//#endif #endif /* __dj_include_libc_file_h__ */ - diff --git a/reactos/lib/sdk/crt/stdio/file.c b/reactos/lib/sdk/crt/stdio/file.c index 7367acb9627..4f3d036c70d 100644 --- a/reactos/lib/sdk/crt/stdio/file.c +++ b/reactos/lib/sdk/crt/stdio/file.c @@ -116,20 +116,20 @@ static CRITICAL_SECTION FILE_cs; #define LOCK_FILES() do { EnterCriticalSection(&FILE_cs); } while (0) #define UNLOCK_FILES() do { LeaveCriticalSection(&FILE_cs); } while (0) -void stat64_to_stati64(const struct __stat64 *buf64, struct _stati64 *buf) -{ - buf->st_dev = buf64->st_dev; - buf->st_ino = buf64->st_ino; - buf->st_mode = buf64->st_mode; - buf->st_nlink = buf64->st_nlink; - buf->st_uid = buf64->st_uid; - buf->st_gid = buf64->st_gid; - buf->st_rdev = buf64->st_rdev; - buf->st_size = buf64->st_size; - buf->st_atime = buf64->st_atime; - buf->st_mtime = buf64->st_mtime; - buf->st_ctime = buf64->st_ctime; -} +//void stat64_to_stati64(const struct __stat64 *buf64, struct _stati64 *buf) +//{ +// buf->st_dev = buf64->st_dev; +// buf->st_ino = buf64->st_ino; +// buf->st_mode = buf64->st_mode; +// buf->st_nlink = buf64->st_nlink; +// buf->st_uid = buf64->st_uid; +// buf->st_gid = buf64->st_gid; +// buf->st_rdev = buf64->st_rdev; +// buf->st_size = buf64->st_size; +// buf->st_atime = buf64->st_atime; +// buf->st_mtime = buf64->st_mtime; +// buf->st_ctime = buf64->st_ctime; +//} static inline BOOL is_valid_fd(int fd) { diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE index 9f2f26e04d3..5d8d89d338e 100644 --- a/reactos/media/doc/README.WINE +++ b/reactos/media/doc/README.WINE @@ -21,12 +21,12 @@ When porting a new DLL from Wine to ReactOS, please do the following steps The following build tools are shared with Wine. -reactos/tools/unicode # Synced to Wine-0_9_5 -reactos/tools/wpp # Synced to Wine-0_9_5 -reactos/tools/winebuild # Synced to Wine-20071217 -reactos/tools/wmc # Synced to Wine-20071201 -reactos/tools/wrc # Synced to Wine-0_9_53 -reactos/tools/widl # Synced to Wine-0_9_59 +reactos/tools/unicode # Synced to Wine-20081105 (~Wine-1.1.7) +reactos/tools/wpp # Synced to Wine-20081105 (~Wine-1.1.7) +reactos/tools/winebuild # Synced to Wine-20081105 (~Wine-1.1.7) +reactos/tools/wmc # Synced to Wine-20081105 (~Wine-1.1.7) +reactos/tools/wrc # Synced to Wine-20081105 (~Wine-1.1.7) +reactos/tools/widl # Synced to Wine-0_9_60 The following libraries are shared with Wine. diff --git a/reactos/media/graphics/dialog-question.svg b/reactos/media/graphics/dialog-question.svg new file mode 100644 index 00000000000..133dfe123cf --- /dev/null +++ b/reactos/media/graphics/dialog-question.svg @@ -0,0 +1,402 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Question mark icon + 2008-10-30 + + + Matthias Kupfer + + + + + question mark + dialog + icon + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/reactos/media/graphics/system-shutdown.svg b/reactos/media/graphics/system-shutdown.svg new file mode 100644 index 00000000000..5f5b7e0bfb3 --- /dev/null +++ b/reactos/media/graphics/system-shutdown.svg @@ -0,0 +1,335 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + Matthias Kupfer + + + + + Rodney Dawes, Jakub Steiner, Garrett LeSage + + + + Power button + 2008-10-30 + + + power + button + switch + icon + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/reactos/ntoskrnl/amd64stubs.c b/reactos/ntoskrnl/amd64stubs.c index b4a6d7de516..22e735d6fee 100644 --- a/reactos/ntoskrnl/amd64stubs.c +++ b/reactos/ntoskrnl/amd64stubs.c @@ -82,8 +82,6 @@ STUB(ExAcquireRundownProtectionCacheAware) STUB(ExAcquireRundownProtectionCacheAwareEx) STUB(ExAcquireRundownProtectionEx) STUB(ExAllocateFromPagedLookasideList) -STUB(ExEnterCriticalRegionAndAcquireResourceShared) -STUB(ExEnterCriticalRegionAndAcquireSharedWaitForExclusive) STUB(ExFreeToPagedLookasideList) STUB(ExInitializeRundownProtection) STUB(ExInterlockedAddLargeInteger) @@ -124,7 +122,6 @@ STUB(InitializeSListHead) STUB(IoFileObjectType) STUB(IoForwardAndCatchIrp) STUB(IoIs32bitProcess) -STUB(IoTranslateBusAddress) STUB(IoWMIDeviceObjectToProviderId) STUB(KdDebuggerEnabled) STUB(KdDebuggerNotPresent) @@ -167,11 +164,6 @@ STUB(PfxFindPrefix) STUB(PfxInitialize) STUB(PfxInsertPrefix) STUB(PfxRemovePrefix) -STUB(PoCancelDeviceNotify) -STUB(PoRegisterDeviceNotify) -STUB(PoRequestShutdownEvent) -STUB(PoSetHiberRange) -STUB(PoShutdownBugCheck) STUB(PsGetCurrentProcess) STUB(PsGetCurrentProcessWow64Process) STUB(PsGetCurrentThread) diff --git a/reactos/ntoskrnl/ex/resource.c b/reactos/ntoskrnl/ex/resource.c index fe054e56ec2..3f47ad0d7eb 100644 --- a/reactos/ntoskrnl/ex/resource.c +++ b/reactos/ntoskrnl/ex/resource.c @@ -2198,6 +2198,66 @@ ExEnterCriticalRegionAndAcquireResourceExclusive(IN PERESOURCE Resource) return KeGetCurrentThread()->Win32Thread; } +/*++ + * @name ExEnterCriticalRegionAndAcquireResourceShared + * @implemented NT5.2 + * + * The ExEnterCriticalRegionAndAcquireResourceShared routine + * enters a critical region and then acquires a resource shared. + * + * @param Resource + * Pointer to the resource to acquire. + * + * @return Pointer to the Win32K thread pointer of the current thread. + * + * @remarks See ExAcquireResourceSharedLite. + * + *--*/ +PVOID +NTAPI +ExEnterCriticalRegionAndAcquireResourceShared(IN PERESOURCE Resource) +{ + /* Enter critical region */ + KeEnterCriticalRegion(); + + /* Acquire the resource */ + ExAcquireResourceSharedLite(Resource, TRUE); + + /* Return the Win32 Thread */ + return KeGetCurrentThread()->Win32Thread; +} + +/*++ + * @name ExEnterCriticalRegionAndAcquireSharedWaitForExclusive + * @implemented NT5.2 + * + * The ExEnterCriticalRegionAndAcquireSharedWaitForExclusive routine + * enters a critical region and then acquires a resource shared if + * shared access can be granted and there are no exclusive waiters. + * It then acquires the resource exclusively. + * + * @param Resource + * Pointer to the resource to acquire. + * + * @return Pointer to the Win32K thread pointer of the current thread. + * + * @remarks See ExAcquireSharedWaitForExclusive. + * + *--*/ +PVOID +NTAPI +ExEnterCriticalRegionAndAcquireSharedWaitForExclusive(IN PERESOURCE Resource) +{ + /* Enter critical region */ + KeEnterCriticalRegion(); + + /* Acquire the resource */ + ExAcquireSharedWaitForExclusive(Resource, TRUE); + + /* Return the Win32 Thread */ + return KeGetCurrentThread()->Win32Thread; +} + /*++ * @name ExReleaseResourceAndLeaveCriticalRegion * @implemented NT5.1 @@ -2223,6 +2283,3 @@ ExReleaseResourceAndLeaveCriticalRegion(IN PERESOURCE Resource) /* Leave critical region */ KeLeaveCriticalRegion(); } - -/* EOF */ - diff --git a/reactos/ntoskrnl/ex/shutdown.c b/reactos/ntoskrnl/ex/shutdown.c index db8a92da48b..65dfed1039a 100644 --- a/reactos/ntoskrnl/ex/shutdown.c +++ b/reactos/ntoskrnl/ex/shutdown.c @@ -190,7 +190,7 @@ ShutdownThreadMain(PVOID Context) KeInitializeDpc(Dpc, KiHaltProcessorDpcRoutine, (PVOID)Dpc); KeSetTargetProcessorDpc(Dpc, i); KeInsertQueueDpc(Dpc, NULL, NULL); - KiIpiSendRequest(1 << i, IPI_DPC); + KiIpiSend(1 << i, IPI_DPC); } } KeLowerIrql(OldIrql); diff --git a/reactos/ntoskrnl/include/internal/io.h b/reactos/ntoskrnl/include/internal/io.h index 3f18138a968..a4d355d2cd0 100644 --- a/reactos/ntoskrnl/include/internal/io.h +++ b/reactos/ntoskrnl/include/internal/io.h @@ -80,12 +80,6 @@ // #define RD_SYMLINK_CREATE_FAILED 5 -// -// Packet Types when piggybacking on the IRP Overlay -// -#define IrpCompletionPacket 0x1 -#define IrpMiniCompletionPacket 0x2 - // // We can call the Ob Inlined API, it's the same thing // @@ -248,11 +242,21 @@ typedef enum _IOP_TRANSFER_TYPE IopOtherTransfer } IOP_TRANSFER_TYPE, *PIOP_TRANSFER_TYPE; +// +// Packet Types when piggybacking on the IRP Overlay +// +typedef enum _COMPLETION_PACKET_TYPE + { + IopCompletionPacketIrp, + IopCompletionPacketMini, + IopCompletionPacketQuota +} COMPLETION_PACKET_TYPE, *PCOMPLETION_PACKET_TYPE; + // // Special version of the IRP Overlay used to optimize I/O completion // by not using up a separate structure. // -typedef struct _IO_COMPLETION_PACKET +typedef struct _IOP_MINI_COMPLETION_PACKET { struct { @@ -263,10 +267,11 @@ typedef struct _IO_COMPLETION_PACKET ULONG PacketType; }; }; - PVOID Key; - PVOID Context; - IO_STATUS_BLOCK IoStatus; -} IO_COMPLETION_PACKET, *PIO_COMPLETION_PACKET; + PVOID KeyContext; + PVOID ApcContext; + NTSTATUS IoStatus; + ULONG_PTR IoStatusInformation; +} IOP_MINI_COMPLETION_PACKET, *PIOP_MINI_COMPLETION_PACKET; // // I/O Completion Context for IoSetIoCompletionRoutineEx @@ -1036,7 +1041,7 @@ IopStartRamdisk( extern POBJECT_TYPE IoCompletionType; extern PDEVICE_NODE IopRootDeviceNode; extern ULONG IopTraceLevel; -extern NPAGED_LOOKASIDE_LIST IopMdlLookasideList; +extern GENERAL_LOOKASIDE IopMdlLookasideList; extern GENERIC_MAPPING IopCompletionMapping; extern GENERIC_MAPPING IopFileMapping; extern POBJECT_TYPE _IoFileObjectType; diff --git a/reactos/ntoskrnl/include/internal/ke.h b/reactos/ntoskrnl/include/internal/ke.h index 642dcbf12a2..49f754b212d 100644 --- a/reactos/ntoskrnl/include/internal/ke.h +++ b/reactos/ntoskrnl/include/internal/ke.h @@ -286,6 +286,13 @@ KiInsertTimerTable( IN ULONG Hand ); +VOID +FASTCALL +KiTimerListExpire( + IN PLIST_ENTRY ExpiredListHead, + IN KIRQL OldIrql +); + BOOLEAN FASTCALL KiInsertTreeTimer( @@ -327,12 +334,35 @@ KeWaitForGate( /* ipi.c ********************************************************************/ VOID -NTAPI -KiIpiSendRequest( +FASTCALL +KiIpiSend( KAFFINITY TargetSet, ULONG IpiRequest ); +VOID +NTAPI +KiIpiSendPacket( + IN KAFFINITY TargetProcessors, + IN PKIPI_WORKER WorkerFunction, + IN PKIPI_BROADCAST_WORKER BroadcastFunction, + IN ULONG_PTR Context, + IN PULONG Count +); + +VOID +FASTCALL +KiIpiSignalPacketDone( + IN PKIPI_CONTEXT PacketContext +); + +VOID +FASTCALL +KiIpiSignalPacketDoneAndStall( + IN PKIPI_CONTEXT PacketContext, + IN volatile PULONG ReverseStall +); + /* next file ***************************************************************/ UCHAR diff --git a/reactos/ntoskrnl/include/internal/ke_x.h b/reactos/ntoskrnl/include/internal/ke_x.h index c28b1a795bc..a021c2d8d06 100644 --- a/reactos/ntoskrnl/include/internal/ke_x.h +++ b/reactos/ntoskrnl/include/internal/ke_x.h @@ -596,7 +596,7 @@ KiRescheduleThread(IN BOOLEAN NewThread, if ((NewThread) && !(KeGetPcr()->Number == Cpu)) { /* Send an IPI to request delivery */ - KiIpiSendRequest(AFFINITY_MASK(Cpu), IPI_DPC); + KiIpiSend(AFFINITY_MASK(Cpu), IPI_DPC); } } @@ -753,7 +753,7 @@ KiRequestApcInterrupt(IN BOOLEAN NeedApc, if (KeGetPcr()->Number != Processor) { /* Send an IPI to request delivery */ - KiIpiSendRequest(AFFINITY_MASK(Processor), IPI_APC); + KiIpiSend(AFFINITY_MASK(Processor), IPI_APC); } else { @@ -1101,6 +1101,37 @@ KiCheckAlertability(IN PKTHREAD Thread, return STATUS_WAIT_0; } +// +// Called from KiCompleteTimer, KiInsertTreeTimer, KeSetSystemTime +// to remove timer entries +// See Windows HPI blog for more information. +VOID +FORCEINLINE +KiRemoveEntryTimer(IN PKTIMER Timer) +{ + ULONG Hand; + PKTIMER_TABLE_ENTRY TableEntry; + + /* Remove the timer from the timer list and check if it's empty */ + Hand = Timer->Header.Hand; + if (RemoveEntryList(&Timer->TimerListEntry)) + { + /* Get the respective timer table entry */ + TableEntry = &KiTimerTableListHead[Hand]; + if (&TableEntry->Entry == TableEntry->Entry.Flink) + { + /* Set the entry to an infinite absolute time */ + TableEntry->Time.HighPart = 0xFFFFFFFF; + } + } + + /* Clear the list entries on dbg builds so we can tell the timer is gone */ +#if DBG + Timer->TimerListEntry.Flink = NULL; + Timer->TimerListEntry.Blink = NULL; +#endif +} + // // Called by Wait and Queue code to insert a timer for dispatching. // Also called by KeSetTimerEx to insert a timer from the caller. @@ -1129,6 +1160,57 @@ KxInsertTimer(IN PKTIMER Timer, } } +// +// Called by KeSetTimerEx and KiInsertTreeTimer to calculate Due Time +// See the Windows HPI Blog for more information +// +BOOLEAN +FORCEINLINE +KiComputeDueTime(IN PKTIMER Timer, + IN LARGE_INTEGER DueTime, + OUT PULONG Hand) +{ + LARGE_INTEGER InterruptTime, SystemTime, DifferenceTime; + + /* Convert to relative time if needed */ + Timer->Header.Absolute = FALSE; + if (DueTime.HighPart >= 0) + { + /* Get System Time */ + KeQuerySystemTime(&SystemTime); + + /* Do the conversion */ + DifferenceTime.QuadPart = SystemTime.QuadPart - DueTime.QuadPart; + + /* Make sure it hasn't already expired */ + Timer->Header.Absolute = TRUE; + if (DifferenceTime.HighPart >= 0) + { + /* Cancel everything */ + Timer->Header.SignalState = TRUE; + Timer->Header.Hand = 0; + Timer->DueTime.QuadPart = 0; + *Hand = 0; + return FALSE; + } + + /* Set the time as Absolute */ + DueTime = DifferenceTime; + } + + /* Get the Interrupt Time */ + InterruptTime.QuadPart = KeQueryInterruptTime(); + + /* Recalculate due time */ + Timer->DueTime.QuadPart = InterruptTime.QuadPart - DueTime.QuadPart; + + /* Get the handle */ + *Hand = KiComputeTimerTableIndex(Timer->DueTime.QuadPart); + Timer->Header.Hand = (UCHAR)*Hand; + Timer->Header.Inserted = TRUE; + return TRUE; +} + // // Called from Unlink and Queue Insert Code. // Also called by timer code when canceling an inserted timer. diff --git a/reactos/ntoskrnl/io/iomgr/iocomp.c b/reactos/ntoskrnl/io/iomgr/iocomp.c index e2cee39ee14..6c762a090b7 100644 --- a/reactos/ntoskrnl/io/iomgr/iocomp.c +++ b/reactos/ntoskrnl/io/iomgr/iocomp.c @@ -15,7 +15,7 @@ POBJECT_TYPE IoCompletionType; -NPAGED_LOOKASIDE_LIST IoCompletionPacketLookaside; +GENERAL_LOOKASIDE IoCompletionPacketLookaside; GENERIC_MAPPING IopCompletionMapping = { @@ -40,8 +40,7 @@ IopUnloadSafeCompletion(IN PDEVICE_OBJECT DeviceObject, IN PVOID Context) { NTSTATUS Status; - PIO_UNLOAD_SAFE_COMPLETION_CONTEXT UnsafeContext = - (PIO_UNLOAD_SAFE_COMPLETION_CONTEXT)Context; + PIO_UNLOAD_SAFE_COMPLETION_CONTEXT UnsafeContext = Context; /* Reference the device object */ ObReferenceObject(UnsafeContext->DeviceObject); @@ -61,7 +60,7 @@ IopUnloadSafeCompletion(IN PDEVICE_OBJECT DeviceObject, VOID NTAPI -IopFreeIoCompletionPacket(PIO_COMPLETION_PACKET Packet) +IopFreeMiniPacket(PIOP_MINI_COMPLETION_PACKET Packet) { PKPRCB Prcb = KeGetCurrentPrcb(); PNPAGED_LOOKASIDE_LIST List; @@ -104,7 +103,7 @@ IopDeleteIoCompletion(PVOID ObjectBody) PLIST_ENTRY FirstEntry; PLIST_ENTRY CurrentEntry; PIRP Irp; - PIO_COMPLETION_PACKET Packet; + PIOP_MINI_COMPLETION_PACKET Packet; /* Rundown the Queue */ FirstEntry = KeRundownQueue(Queue); @@ -116,14 +115,14 @@ IopDeleteIoCompletion(PVOID ObjectBody) { /* Get the Packet */ Packet = CONTAINING_RECORD(CurrentEntry, - IO_COMPLETION_PACKET, + IOP_MINI_COMPLETION_PACKET, ListEntry); /* Go to next Entry */ CurrentEntry = CurrentEntry->Flink; /* Check if it's part of an IRP, or a separate packet */ - if (Packet->PacketType == IrpCompletionPacket) + if (Packet->PacketType == IopCompletionPacketIrp) { /* Get the IRP and free it */ Irp = CONTAINING_RECORD(Packet, IRP, Tail.Overlay.ListEntry); @@ -132,7 +131,7 @@ IopDeleteIoCompletion(PVOID ObjectBody) else { /* Use common routine */ - IopFreeIoCompletionPacket(Packet); + IopFreeMiniPacket(Packet); } } while (FirstEntry != CurrentEntry); } @@ -155,7 +154,7 @@ IoSetIoCompletion(IN PVOID IoCompletion, PKQUEUE Queue = (PKQUEUE)IoCompletion; PNPAGED_LOOKASIDE_LIST List; PKPRCB Prcb = KeGetCurrentPrcb(); - PIO_COMPLETION_PACKET Packet; + PIOP_MINI_COMPLETION_PACKET Packet; /* Get the P List */ List = (PNPAGED_LOOKASIDE_LIST)Prcb-> @@ -194,11 +193,11 @@ IoSetIoCompletion(IN PVOID IoCompletion, if (Packet) { /* Set up the Packet */ - Packet->PacketType = IrpMiniCompletionPacket; - Packet->Key = KeyContext; - Packet->Context = ApcContext; - Packet->IoStatus.Status = IoStatus; - Packet->IoStatus.Information = IoStatusInformation; + Packet->PacketType = IopCompletionPacketMini; + Packet->KeyContext = KeyContext; + Packet->ApcContext = ApcContext; + Packet->IoStatus = IoStatus; + Packet->IoStatusInformation = IoStatusInformation; /* Insert the Queue */ KeInsertQueue(Queue, &Packet->ListEntry); @@ -424,9 +423,6 @@ NtQueryIoCompletion(IN HANDLE IoCompletionHandle, ((PIO_COMPLETION_BASIC_INFORMATION)IoCompletionInformation)-> Depth = KeReadStateQueue(Queue); - /* Dereference the queue */ - ObDereferenceObject(Queue); - /* Return Result Length if needed */ if (ResultLength) { @@ -439,6 +435,9 @@ NtQueryIoCompletion(IN HANDLE IoCompletionHandle, Status = _SEH_GetExceptionCode(); } _SEH_END; + + /* Dereference the queue */ + ObDereferenceObject(Queue); } /* Return Status */ @@ -455,7 +454,7 @@ NtRemoveIoCompletion(IN HANDLE IoCompletionHandle, { LARGE_INTEGER SafeTimeout; PKQUEUE Queue; - PIO_COMPLETION_PACKET Packet; + PIOP_MINI_COMPLETION_PACKET Packet; PLIST_ENTRY ListEntry; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); NTSTATUS Status = STATUS_SUCCESS; @@ -517,11 +516,11 @@ NtRemoveIoCompletion(IN HANDLE IoCompletionHandle, { /* Get the Packet Data */ Packet = CONTAINING_RECORD(ListEntry, - IO_COMPLETION_PACKET, + IOP_MINI_COMPLETION_PACKET, ListEntry); /* Check if this is piggybacked on an IRP */ - if (Packet->PacketType == IrpCompletionPacket) + if (Packet->PacketType == IopCompletionPacketIrp) { /* Get the IRP */ Irp = CONTAINING_RECORD(ListEntry, @@ -539,12 +538,13 @@ NtRemoveIoCompletion(IN HANDLE IoCompletionHandle, else { /* Save values */ - Key = Packet->Key; - Apc = Packet->Context; - IoStatus = Packet->IoStatus; + Key = Packet->KeyContext; + Apc = Packet->ApcContext; + IoStatus.Status = Packet->IoStatus; + IoStatus.Information = Packet->IoStatusInformation; /* Free the packet */ - IopFreeIoCompletionPacket(Packet); + IopFreeMiniPacket(Packet); } /* Enter SEH to write back the values */ diff --git a/reactos/ntoskrnl/io/iomgr/iofunc.c b/reactos/ntoskrnl/io/iomgr/iofunc.c index 6c2f1b5d147..5ec01d05bfd 100644 --- a/reactos/ntoskrnl/io/iomgr/iofunc.c +++ b/reactos/ntoskrnl/io/iomgr/iofunc.c @@ -2070,7 +2070,7 @@ NtReadFile(IN HANDLE FileHandle, /* Set the IRP */ Irp->Tail.Overlay.OriginalFileObject = FileObject; Irp->Tail.Overlay.Thread = PsGetCurrentThread(); - Irp->RequestorMode = KernelMode; + Irp->RequestorMode = PreviousMode; Irp->Overlay.AsynchronousParameters.UserApcRoutine = ApcRoutine; Irp->Overlay.AsynchronousParameters.UserApcContext = ApcContext; Irp->UserIosb = IoStatusBlock; @@ -2929,7 +2929,7 @@ NtWriteFile(IN HANDLE FileHandle, /* Set the IRP */ Irp->Tail.Overlay.OriginalFileObject = FileObject; Irp->Tail.Overlay.Thread = PsGetCurrentThread(); - Irp->RequestorMode = KernelMode; + Irp->RequestorMode = PreviousMode; Irp->Overlay.AsynchronousParameters.UserApcRoutine = ApcRoutine; Irp->Overlay.AsynchronousParameters.UserApcContext = ApcContext; Irp->UserIosb = IoStatusBlock; diff --git a/reactos/ntoskrnl/io/iomgr/iomgr.c b/reactos/ntoskrnl/io/iomgr/iomgr.c index 11c223b2a3a..0c481f5b569 100644 --- a/reactos/ntoskrnl/io/iomgr/iomgr.c +++ b/reactos/ntoskrnl/io/iomgr/iomgr.c @@ -49,7 +49,6 @@ GENERIC_MAPPING IopFileMapping = { extern LIST_ENTRY ShutdownListHead; extern LIST_ENTRY LastChanceShutdownListHead; extern KSPIN_LOCK ShutdownListLock; -extern NPAGED_LOOKASIDE_LIST IoCompletionPacketLookaside; extern POBJECT_TYPE IoAdapterObjectType; ERESOURCE IopDatabaseResource; extern ERESOURCE FileSystemListLock; @@ -76,9 +75,10 @@ extern KSPIN_LOCK IopTimerLock; extern PDEVICE_OBJECT IopErrorLogObject; -NPAGED_LOOKASIDE_LIST IoLargeIrpLookaside; -NPAGED_LOOKASIDE_LIST IoSmallIrpLookaside; -NPAGED_LOOKASIDE_LIST IopMdlLookasideList; +GENERAL_LOOKASIDE IoLargeIrpLookaside; +GENERAL_LOOKASIDE IoSmallIrpLookaside; +GENERAL_LOOKASIDE IopMdlLookasideList; +extern GENERAL_LOOKASIDE IoCompletionPacketLookaside; #if defined (ALLOC_PRAGMA) #pragma alloc_text(INIT, IoInitSystem) @@ -94,143 +94,142 @@ IopInitLookasideLists(VOID) ULONG LargeIrpSize, SmallIrpSize, MdlSize; LONG i; PKPRCB Prcb; - PNPAGED_LOOKASIDE_LIST CurrentList = NULL; + PGENERAL_LOOKASIDE CurrentList = NULL; /* Calculate the sizes */ LargeIrpSize = sizeof(IRP) + (8 * sizeof(IO_STACK_LOCATION)); SmallIrpSize = sizeof(IRP) + sizeof(IO_STACK_LOCATION); MdlSize = sizeof(MDL) + (23 * sizeof(PFN_NUMBER)); + /* Initialize the Lookaside List for I\O Completion */ + ExInitializeSystemLookasideList(&IoCompletionPacketLookaside, + NonPagedPool, + sizeof(IOP_MINI_COMPLETION_PACKET), + IOC_TAG1, + 32, + &ExSystemLookasideListHead); + /* Initialize the Lookaside List for Large IRPs */ - ExInitializeNPagedLookasideList(&IoLargeIrpLookaside, - NULL, - NULL, - 0, + ExInitializeSystemLookasideList(&IoLargeIrpLookaside, + NonPagedPool, LargeIrpSize, IO_LARGEIRP, - 64); + 64, + &ExSystemLookasideListHead); + /* Initialize the Lookaside List for Small IRPs */ - ExInitializeNPagedLookasideList(&IoSmallIrpLookaside, - NULL, - NULL, - 0, + ExInitializeSystemLookasideList(&IoSmallIrpLookaside, + NonPagedPool, SmallIrpSize, IO_SMALLIRP, - 32); - - /* Initialize the Lookaside List for I\O Completion */ - ExInitializeNPagedLookasideList(&IoCompletionPacketLookaside, - NULL, - NULL, - 0, - sizeof(IO_COMPLETION_PACKET), - IOC_TAG1, - 32); + 32, + &ExSystemLookasideListHead); /* Initialize the Lookaside List for MDLs */ - ExInitializeNPagedLookasideList(&IopMdlLookasideList, - NULL, - NULL, - 0, + ExInitializeSystemLookasideList(&IopMdlLookasideList, + NonPagedPool, MdlSize, TAG_MDL, - 128); + 128, + &ExSystemLookasideListHead); - /* Now allocate the per-processor lists */ + /* Allocate the global lookaside list buffer */ + CurrentList = ExAllocatePoolWithTag(NonPagedPool, + 4 * KeNumberProcessors * + sizeof(GENERAL_LOOKASIDE), + TAG_IO); + + /* Loop all processors */ for (i = 0; i < KeNumberProcessors; i++) { /* Get the PRCB for this CPU */ Prcb = KiProcessorBlock[i]; DPRINT("Setting up lookaside for CPU: %x, PRCB: %p\n", i, Prcb); - /* Set the Large IRP List */ - Prcb->PPLookasideList[LookasideLargeIrpList].L = &IoLargeIrpLookaside.L; - CurrentList = ExAllocatePoolWithTag(NonPagedPool, - sizeof(NPAGED_LOOKASIDE_LIST), - IO_LARGEIRP_CPU); + /* Write IRP credit limit */ + Prcb->LookasideIrpFloat = 512 / KeNumberProcessors; + + /* Set the I/O Completion List */ + Prcb->PPLookasideList[LookasideCompletionList].L = &IoCompletionPacketLookaside; if (CurrentList) { - /* Initialize the Lookaside List for Large IRPs */ - ExInitializeNPagedLookasideList(CurrentList, - NULL, - NULL, - 0, - LargeIrpSize, - IO_LARGEIRP_CPU, - 64); + /* Initialize the Lookaside List for mini-packets */ + ExInitializeSystemLookasideList(CurrentList, + NonPagedPool, + sizeof(IOP_MINI_COMPLETION_PACKET), + IO_SMALLIRP_CPU, + 32, + &ExSystemLookasideListHead); + Prcb->PPLookasideList[LookasideCompletionList].P = CurrentList; + CurrentList++; + } else { - CurrentList = &IoLargeIrpLookaside; + Prcb->PPLookasideList[LookasideCompletionList].P = &IoCompletionPacketLookaside; + } + + /* Set the Large IRP List */ + Prcb->PPLookasideList[LookasideLargeIrpList].L = &IoLargeIrpLookaside; + if (CurrentList) + { + /* Initialize the Lookaside List for Large IRPs */ + ExInitializeSystemLookasideList(CurrentList, + NonPagedPool, + LargeIrpSize, + IO_LARGEIRP_CPU, + 64, + &ExSystemLookasideListHead); + Prcb->PPLookasideList[LookasideLargeIrpList].P = CurrentList; + CurrentList++; + + } + else + { + Prcb->PPLookasideList[LookasideLargeIrpList].P = &IoLargeIrpLookaside; } - Prcb->PPLookasideList[LookasideLargeIrpList].P = &CurrentList->L; /* Set the Small IRP List */ - Prcb->PPLookasideList[LookasideSmallIrpList].L = &IoSmallIrpLookaside.L; - CurrentList = ExAllocatePoolWithTag(NonPagedPool, - sizeof(NPAGED_LOOKASIDE_LIST), - IO_SMALLIRP_CPU); + Prcb->PPLookasideList[LookasideSmallIrpList].L = &IoSmallIrpLookaside; if (CurrentList) { /* Initialize the Lookaside List for Small IRPs */ - ExInitializeNPagedLookasideList(CurrentList, - NULL, - NULL, - 0, + ExInitializeSystemLookasideList(CurrentList, + NonPagedPool, SmallIrpSize, IO_SMALLIRP_CPU, - 32); + 32, + &ExSystemLookasideListHead); + Prcb->PPLookasideList[LookasideSmallIrpList].P = CurrentList; + CurrentList++; + } else { - CurrentList = &IoSmallIrpLookaside; + Prcb->PPLookasideList[LookasideSmallIrpList].P = &IoSmallIrpLookaside; } - Prcb->PPLookasideList[LookasideSmallIrpList].P = &CurrentList->L; - - /* Set the I/O Completion List */ - Prcb->PPLookasideList[LookasideCompletionList].L = &IoCompletionPacketLookaside.L; - CurrentList = ExAllocatePoolWithTag(NonPagedPool, - sizeof(NPAGED_LOOKASIDE_LIST), - IO_SMALLIRP_CPU); - if (CurrentList) - { - /* Initialize the Lookaside List for Large IRPs */ - ExInitializeNPagedLookasideList(CurrentList, - NULL, - NULL, - 0, - sizeof(IO_COMPLETION_PACKET), - IO_SMALLIRP_CPU, - 32); - } - else - { - CurrentList = &IoCompletionPacketLookaside; - } - Prcb->PPLookasideList[LookasideCompletionList].P = &CurrentList->L; /* Set the MDL Completion List */ - Prcb->PPLookasideList[LookasideMdlList].L = &IopMdlLookasideList.L; - CurrentList = ExAllocatePoolWithTag(NonPagedPool, - sizeof(NPAGED_LOOKASIDE_LIST), - TAG_MDL); + Prcb->PPLookasideList[LookasideMdlList].L = &IopMdlLookasideList; if (CurrentList) { /* Initialize the Lookaside List for MDLs */ - ExInitializeNPagedLookasideList(CurrentList, - NULL, - NULL, - 0, + ExInitializeSystemLookasideList(CurrentList, + NonPagedPool, SmallIrpSize, TAG_MDL, - 128); + 128, + &ExSystemLookasideListHead); + + Prcb->PPLookasideList[LookasideMdlList].P = CurrentList; + CurrentList++; + } else { - CurrentList = &IopMdlLookasideList; + Prcb->PPLookasideList[LookasideMdlList].P = &IopMdlLookasideList; } - Prcb->PPLookasideList[LookasideMdlList].P = &CurrentList->L; } } diff --git a/reactos/ntoskrnl/io/iomgr/irp.c b/reactos/ntoskrnl/io/iomgr/irp.c index e8854befb61..146175f3a92 100644 --- a/reactos/ntoskrnl/io/iomgr/irp.c +++ b/reactos/ntoskrnl/io/iomgr/irp.c @@ -286,7 +286,7 @@ IopCompleteRequest(IN PKAPC Apc, if (Irp->Flags & IRP_DEALLOCATE_BUFFER) { /* Deallocate it */ - ExFreePoolWithTag(Irp->AssociatedIrp.SystemBuffer, TAG_SYS_BUF); + ExFreePool(Irp->AssociatedIrp.SystemBuffer); } } @@ -419,7 +419,7 @@ IopCompleteRequest(IN PKAPC Apc, { /* We have an I/O Completion setup... create the special Overlay */ Irp->Tail.CompletionKey = Key; - Irp->Tail.Overlay.PacketType = IrpCompletionPacket; + Irp->Tail.Overlay.PacketType = IopCompletionPacketIrp; KeInsertQueue(Port, &Irp->Tail.Overlay.ListEntry); } else @@ -976,7 +976,7 @@ IoCancelIrp(IN PIRP Irp) Irp->Cancel = TRUE; /* Clear the cancel routine and get the old one */ - CancelRoutine = IoSetCancelRoutine(Irp, NULL); + CancelRoutine = (PVOID)IoSetCancelRoutine(Irp, NULL); if (CancelRoutine) { /* We had a routine, make sure the IRP isn't completed */ diff --git a/reactos/ntoskrnl/io/pnpmgr/plugplay.c b/reactos/ntoskrnl/io/pnpmgr/plugplay.c index 15239bab02c..0d7dca9075f 100644 --- a/reactos/ntoskrnl/io/pnpmgr/plugplay.c +++ b/reactos/ntoskrnl/io/pnpmgr/plugplay.c @@ -529,10 +529,6 @@ IopGetDeviceDepth(PPLUGPLAY_CONTROL_DEPTH_DATA DepthData) DeviceNode = IopGetDeviceNode(DeviceObject); - DepthData->Depth = DeviceNode->Level; - - ObDereferenceObject(DeviceObject); - _SEH_TRY { DepthData->Depth = DeviceNode->Level; @@ -543,6 +539,8 @@ IopGetDeviceDepth(PPLUGPLAY_CONTROL_DEPTH_DATA DepthData) } _SEH_END; + ObDereferenceObject(DeviceObject); + return Status; } diff --git a/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c b/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c index c3ac77721d4..2d508c29fec 100644 --- a/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c +++ b/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c @@ -3489,3 +3489,18 @@ IoSynchronousInvalidateDeviceRelations( return STATUS_NOT_SUPPORTED; } } + +/* + * @unimplemented + */ +BOOLEAN +NTAPI +IoTranslateBusAddress(IN INTERFACE_TYPE InterfaceType, + IN ULONG BusNumber, + IN PHYSICAL_ADDRESS BusAddress, + IN OUT PULONG AddressSpace, + OUT PPHYSICAL_ADDRESS TranslatedAddress) +{ + UNIMPLEMENTED; + return FALSE; +} diff --git a/reactos/ntoskrnl/io/pnpmgr/pnpnotify.c b/reactos/ntoskrnl/io/pnpmgr/pnpnotify.c index 3c125e52ea7..91ffd138204 100644 --- a/reactos/ntoskrnl/io/pnpmgr/pnpnotify.c +++ b/reactos/ntoskrnl/io/pnpmgr/pnpnotify.c @@ -96,6 +96,7 @@ IopNotifyPlugPlayNotification( default: { DPRINT1("IopNotifyPlugPlayNotification(): unknown EventCategory 0x%x UNIMPLEMENTED\n", EventCategory); + KeReleaseGuardedMutex(&PnpNotifyListLock); return; } } diff --git a/reactos/ntoskrnl/io/pnpmgr/pnproot.c b/reactos/ntoskrnl/io/pnpmgr/pnproot.c index 01d003667dc..8951ed2371c 100644 --- a/reactos/ntoskrnl/io/pnpmgr/pnproot.c +++ b/reactos/ntoskrnl/io/pnpmgr/pnproot.c @@ -162,7 +162,7 @@ PnpRootCreateDevice( if (Status == STATUS_NO_SUCH_DEVICE) break; } - if (i > 9999) + if (i == 9999) { DPRINT1("Too much legacy devices reported for service '%wZ'\n", &LocalServiceName); Status = STATUS_INSUFFICIENT_RESOURCES; diff --git a/reactos/ntoskrnl/kdbg/kdb.c b/reactos/ntoskrnl/kdbg/kdb.c index fcfa954d50b..b7acafca4ec 100644 --- a/reactos/ntoskrnl/kdbg/kdb.c +++ b/reactos/ntoskrnl/kdbg/kdb.c @@ -51,6 +51,7 @@ PKDB_KTRAP_FRAME KdbCurrentTrapFrame = NULL; /* Pointer to the current trapframe STATIC KDB_KTRAP_FRAME KdbTrapFrame = { { 0 } }; /* The trapframe which was passed to KdbEnterDebuggerException */ STATIC KDB_KTRAP_FRAME KdbThreadTrapFrame = { { 0 } }; /* The trapframe of the current thread (KdbCurrentThread) */ STATIC KAPC_STATE KdbApcState; +extern BOOLEAN KdbpBugCheckRequested; /* Array of conditions when to enter KDB */ STATIC KDB_ENTER_CONDITION KdbEnterConditions[][2] = @@ -1603,6 +1604,13 @@ KdbEnterDebuggerException( /* Leave critical section */ Ke386RestoreFlags(OldEflags); + /* Check if user requested a bugcheck */ + if (KdbpBugCheckRequested) + { + /* Bugcheck the system */ + KeBugCheck(MANUALLY_INITIATED_CRASH); + } + continue_execution: /* Clear debug status */ if (ExceptionCode == STATUS_BREAKPOINT) /* FIXME: Why clear DR6 on INT3? */ diff --git a/reactos/ntoskrnl/kdbg/kdb_cli.c b/reactos/ntoskrnl/kdbg/kdb_cli.c index 9344839cd0f..dac9a135f4c 100644 --- a/reactos/ntoskrnl/kdbg/kdb_cli.c +++ b/reactos/ntoskrnl/kdbg/kdb_cli.c @@ -99,6 +99,7 @@ STATIC LONG KdbNumberOfRowsTerminal = -1; STATIC LONG KdbNumberOfColsTerminal = -1; PCHAR KdbInitFileBuffer = NULL; /* Buffer where KDBinit file is loaded into during initialization */ +BOOLEAN KdbpBugCheckRequested = FALSE; STATIC CONST struct { @@ -1689,8 +1690,9 @@ KdbpCmdTss(ULONG Argc, PCHAR Argv[]) STATIC BOOLEAN KdbpCmdBugCheck(ULONG Argc, PCHAR Argv[]) { - KeBugCheck(0xDEADDEAD); - return TRUE; + /* Set the flag and quit looping */ + KdbpBugCheckRequested = TRUE; + return FALSE; } /*!\brief Sets or displays a config variables value. diff --git a/reactos/ntoskrnl/ke/bug.c b/reactos/ntoskrnl/ke/bug.c index c1d6e2d90cc..a29261b5d87 100644 --- a/reactos/ntoskrnl/ke/bug.c +++ b/reactos/ntoskrnl/ke/bug.c @@ -1131,7 +1131,7 @@ KeBugCheckWithTf(IN ULONG BugCheckCode, if (i != (LONG)KeGetCurrentProcessorNumber()) { /* Send the IPI and give them one second to catch up */ - KiIpiSendRequest(1 << i, IPI_FREEZE); + KiIpiSend(1 << i, IPI_FREEZE); KeStallExecutionProcessor(1000000); } } diff --git a/reactos/ntoskrnl/ke/clock.c b/reactos/ntoskrnl/ke/clock.c index ce50d4c8293..4a72c978064 100644 --- a/reactos/ntoskrnl/ke/clock.c +++ b/reactos/ntoskrnl/ke/clock.c @@ -40,7 +40,6 @@ KeSetSystemTime(IN PLARGE_INTEGER NewTime, PKSPIN_LOCK_QUEUE LockQueue; LIST_ENTRY TempList, TempList2; ULONG Hand, i; - PKTIMER_TABLE_ENTRY TimerEntry; /* Sanity checks */ ASSERT((NewTime->HighPart & 0xF0000000) == 0); @@ -57,10 +56,10 @@ KeSetSystemTime(IN PLARGE_INTEGER NewTime, /* Query the system time now */ KeQuerySystemTime(OldTime); - /* Set the new system time */ + /* Set the new system time (ordering of these operations is critical) */ + SharedUserData->SystemTime.High2Time = NewTime->HighPart; SharedUserData->SystemTime.LowPart = NewTime->LowPart; SharedUserData->SystemTime.High1Time = NewTime->HighPart; - SharedUserData->SystemTime.High2Time = NewTime->HighPart; /* Check if this was for the HAL and set the RTC time */ if (HalTime) ExCmosClockIsSane = HalSetRealTimeClock(&TimeFields); @@ -98,16 +97,7 @@ KeSetSystemTime(IN PLARGE_INTEGER NewTime, if (Timer->Header.Absolute) { /* Remove it from the timer list */ - if (RemoveEntryList(&Timer->TimerListEntry)) - { - /* Get the entry and check if it's empty */ - TimerEntry = &KiTimerTableListHead[Timer->Header.Hand]; - if (IsListEmpty(&TimerEntry->Entry)) - { - /* Clear the time then */ - TimerEntry->Time.HighPart = 0xFFFFFFFF; - } - } + KiRemoveEntryTimer(Timer); /* Insert it into our temporary list */ InsertTailList(&TempList, &Timer->TimerListEntry); @@ -138,16 +128,7 @@ KeSetSystemTime(IN PLARGE_INTEGER NewTime, if (KiInsertTimerTable(Timer, Hand)) { /* Remove it from the timer list */ - if (RemoveEntryList(&Timer->TimerListEntry)) - { - /* Get the entry and check if it's empty */ - TimerEntry = &KiTimerTableListHead[Timer->Header.Hand]; - if (IsListEmpty(&TimerEntry->Entry)) - { - /* Clear the time then */ - TimerEntry->Time.HighPart = 0xFFFFFFFF; - } - } + KiRemoveEntryTimer(Timer); /* Insert it into our temporary list */ InsertTailList(&TempList2, &Timer->TimerListEntry); @@ -157,8 +138,8 @@ KeSetSystemTime(IN PLARGE_INTEGER NewTime, KiReleaseTimerLock(LockQueue); } - /* FIXME: Process expired timers! */ - KiReleaseDispatcherLock(OldIrql); + /* Process expired timers. This releases the dispatcher lock. */ + KiTimerListExpire(&TempList2, OldIrql); /* Revert affinity */ KeRevertToUserAffinityThread(); diff --git a/reactos/ntoskrnl/ke/dpc.c b/reactos/ntoskrnl/ke/dpc.c index 0646ffd4209..549c79d62ae 100644 --- a/reactos/ntoskrnl/ke/dpc.c +++ b/reactos/ntoskrnl/ke/dpc.c @@ -86,13 +86,15 @@ KiTimerExpiration(IN PKDPC Dpc, LONG Limit, Index, i; ULONG Timers, ActiveTimers, DpcCalls; PLIST_ENTRY ListHead, NextEntry; - PKTIMER_TABLE_ENTRY TimerEntry; KIRQL OldIrql; PKTIMER Timer; PKDPC TimerDpc; ULONG Period; DPC_QUEUE_ENTRY DpcEntry[MAX_TIMER_DPCS]; PKSPIN_LOCK_QUEUE LockQueue; +#ifdef CONFIG_SMP + PKPRCB Prcb = KeGetCurrentPrcb(); +#endif /* Disable interrupts */ _disable(); @@ -147,16 +149,7 @@ KiTimerExpiration(IN PKDPC Dpc, { /* It's expired, remove it */ ActiveTimers--; - if (RemoveEntryList(&Timer->TimerListEntry)) - { - /* Get the entry and check if it's empty */ - TimerEntry = &KiTimerTableListHead[Timer->Header.Hand]; - if (IsListEmpty(&TimerEntry->Entry)) - { - /* Clear the time then */ - TimerEntry->Time.HighPart = 0xFFFFFFFF; - } - } + KiRemoveEntryTimer(Timer); /* Make it non-inserted, unlock it, and signal it */ Timer->Header.Inserted = FALSE; @@ -194,11 +187,35 @@ KiTimerExpiration(IN PKDPC Dpc, /* Check if we have a DPC */ if (TimerDpc) { - /* Setup the DPC Entry */ - DpcEntry[DpcCalls].Dpc = TimerDpc; - DpcEntry[DpcCalls].Routine = TimerDpc->DeferredRoutine; - DpcEntry[DpcCalls].Context = TimerDpc->DeferredContext; - DpcCalls++; +#ifdef CONFIG_SMP + /* + * If the DPC is targeted to another processor, + * then insert it into that processor's DPC queue + * instead of delivering it now. + * If the DPC is a threaded DPC, and the current CPU + * has threaded DPCs enabled (KiExecuteDpc is actively parsing DPCs), + * then also insert it into the DPC queue for threaded delivery, + * instead of doing it here. + */ + if (((TimerDpc->Number >= MAXIMUM_PROCESSORS) && + ((TimerDpc->Number - MAXIMUM_PROCESSORS) != Prcb->Number)) || + ((TimerDpc->Type == ThreadedDpcObject) && (Prcb->ThreadDpcEnable))) + { + /* Queue it */ + KeInsertQueueDpc(TimerDpc, + UlongToPtr(SystemTime.LowPart), + UlongToPtr(SystemTime.HighPart)); + } + else +#endif + { + /* Setup the DPC Entry */ + DpcEntry[DpcCalls].Dpc = TimerDpc; + DpcEntry[DpcCalls].Routine = TimerDpc->DeferredRoutine; + DpcEntry[DpcCalls].Context = TimerDpc->DeferredContext; + DpcCalls++; + ASSERT(DpcCalls < MAX_TIMER_DPCS); + } } /* Check if we're done processing */ @@ -303,6 +320,130 @@ KiTimerExpiration(IN PKDPC Dpc, } } +VOID +FASTCALL +KiTimerListExpire(IN PLIST_ENTRY ExpiredListHead, + IN KIRQL OldIrql) +{ + ULARGE_INTEGER SystemTime; + LARGE_INTEGER Interval; + LONG i; + ULONG DpcCalls = 0; + PKTIMER Timer; + PKDPC TimerDpc; + ULONG Period; + DPC_QUEUE_ENTRY DpcEntry[MAX_TIMER_DPCS]; +#ifdef CONFIG_SMP + PKPRCB Prcb = KeGetCurrentPrcb(); +#endif + + /* Query system */ + KeQuerySystemTime((PLARGE_INTEGER)&SystemTime); + + /* Loop expired list */ + while (ExpiredListHead->Flink != ExpiredListHead) + { + /* Get the current timer */ + Timer = CONTAINING_RECORD(ExpiredListHead->Flink, KTIMER, TimerListEntry); + + /* Remove it */ + RemoveEntryList(&Timer->TimerListEntry); + + /* Not inserted */ + Timer->Header.Inserted = FALSE; + + /* Signal it */ + Timer->Header.SignalState = 1; + + /* Get the DPC and period */ + TimerDpc = Timer->Dpc; + Period = Timer->Period; + + /* Check if there's any waiters */ + if (!IsListEmpty(&Timer->Header.WaitListHead)) + { + /* Check the type of event */ + if (Timer->Header.Type == TimerNotificationObject) + { + /* Unwait the thread */ + KxUnwaitThread(&Timer->Header, IO_NO_INCREMENT); + } + else + { + /* Otherwise unwait the thread and signal the timer */ + KxUnwaitThreadForEvent((PKEVENT)Timer, IO_NO_INCREMENT); + } + } + + /* Check if we have a period */ + if (Period) + { + /* Calculate the interval and insert the timer */ + Interval.QuadPart = Int32x32To64(Period, -10000); + while (!KiInsertTreeTimer(Timer, Interval)); + } + + /* Check if we have a DPC */ + if (TimerDpc) + { +#ifdef CONFIG_SMP + /* + * If the DPC is targeted to another processor, + * then insert it into that processor's DPC queue + * instead of delivering it now. + * If the DPC is a threaded DPC, and the current CPU + * has threaded DPCs enabled (KiExecuteDpc is actively parsing DPCs), + * then also insert it into the DPC queue for threaded delivery, + * instead of doing it here. + */ + if (((TimerDpc->Number >= MAXIMUM_PROCESSORS) && + ((TimerDpc->Number - MAXIMUM_PROCESSORS) != Prcb->Number)) || + ((TimerDpc->Type == ThreadedDpcObject) && (Prcb->ThreadDpcEnable))) + { + /* Queue it */ + KeInsertQueueDpc(TimerDpc, + UlongToPtr(SystemTime.LowPart), + UlongToPtr(SystemTime.HighPart)); + } + else +#endif + { + /* Setup the DPC Entry */ + DpcEntry[DpcCalls].Dpc = TimerDpc; + DpcEntry[DpcCalls].Routine = TimerDpc->DeferredRoutine; + DpcEntry[DpcCalls].Context = TimerDpc->DeferredContext; + DpcCalls++; + ASSERT(DpcCalls < MAX_TIMER_DPCS); + } + } + } + + /* Check if we still have DPC entries */ + if (DpcCalls) + { + /* Release the dispatcher while doing DPCs */ + KiReleaseDispatcherLock(DISPATCH_LEVEL); + + /* Start looping all DPC Entries */ + for (i = 0; DpcCalls; DpcCalls--, i++) + { + /* Call the DPC */ + DpcEntry[i].Routine(DpcEntry[i].Dpc, + DpcEntry[i].Context, + UlongToPtr(SystemTime.LowPart), + UlongToPtr(SystemTime.HighPart)); + } + + /* Lower IRQL */ + KeLowerIrql(OldIrql); + } + else + { + /* Unlock the dispatcher */ + KiReleaseDispatcherLock(OldIrql); + } +} + VOID NTAPI KiQuantumEnd(VOID) @@ -683,7 +824,7 @@ KeInsertQueueDpc(IN PKDPC Dpc, if (Prcb != CurrentPrcb) { /* It was, request and IPI */ - KiIpiSendRequest(AFFINITY_MASK(Cpu), IPI_DPC); + KiIpiSend(AFFINITY_MASK(Cpu), IPI_DPC); } else { diff --git a/reactos/ntoskrnl/ke/i386/cpu.c b/reactos/ntoskrnl/ke/i386/cpu.c index 948e037ec81..674d12dd5e1 100644 --- a/reactos/ntoskrnl/ke/i386/cpu.c +++ b/reactos/ntoskrnl/ke/i386/cpu.c @@ -994,6 +994,20 @@ KeGetRecommendedSharedDataAlignment(VOID) return KeLargestCacheLine; } +VOID +NTAPI +KiFlushTargetEntireTb(IN PKIPI_CONTEXT PacketContext, + IN PVOID Ignored1, + IN PVOID Ignored2, + IN PVOID Ignored3) +{ + /* Signal this packet as done */ + KiIpiSignalPacketDone(PacketContext); + + /* Flush the TB for the Current CPU */ + KeFlushCurrentTb(); +} + /* * @implemented */ @@ -1003,19 +1017,50 @@ KeFlushEntireTb(IN BOOLEAN Invalid, IN BOOLEAN AllProcessors) { KIRQL OldIrql; +#ifdef CONFIG_SMP + KAFFINITY TargetAffinity; + PKPRCB Prcb = KeGetCurrentPrcb(); +#endif /* Raise the IRQL for the TB Flush */ OldIrql = KeRaiseIrqlToSynchLevel(); #ifdef CONFIG_SMP - /* FIXME: Support IPI Flush */ -#error Not yet implemented! + /* FIXME: Use KiTbFlushTimeStamp to synchronize TB flush */ + + /* Get the current processor affinity, and exclude ourselves */ + TargetAffinity = KeActiveProcessors; + TargetAffinity &= ~Prcb->SetMember; + + /* Make sure this is MP */ + if (TargetAffinity) + { + /* Send an IPI TB flush to the other processors */ + KiIpiSendPacket(TargetAffinity, + KiFlushTargetEntireTb, + NULL, + 0, + NULL); + } #endif - /* Flush the TB for the Current CPU */ + /* Flush the TB for the Current CPU, and update the flush stamp */ KeFlushCurrentTb(); - /* Return to Original IRQL */ +#ifdef CONFIG_SMP + /* If this is MP, wait for the other processors to finish */ + if (TargetAffinity) + { + /* Sanity check */ + ASSERT(Prcb == (volatile PKPRCB)KeGetCurrentPrcb()); + + /* FIXME: TODO */ + ASSERTMSG("Not yet implemented\n", FALSE); + } +#endif + + /* Update the flush stamp and return to original IRQL */ + InterlockedExchangeAdd(&KiTbFlushTimeStamp, 1); KeLowerIrql(OldIrql); } diff --git a/reactos/ntoskrnl/ke/i386/v86vdm.c b/reactos/ntoskrnl/ke/i386/v86vdm.c index 0a9a1da5e95..efb8a0c7721 100644 --- a/reactos/ntoskrnl/ke/i386/v86vdm.c +++ b/reactos/ntoskrnl/ke/i386/v86vdm.c @@ -120,4 +120,38 @@ Ke386CallBios(IN ULONG Int, return STATUS_SUCCESS; } -/* EOF */ +/* + * @unimplemented + */ +BOOLEAN +NTAPI +Ke386IoSetAccessProcess(IN PKPROCESS Process, + IN ULONG Flag) +{ + UNIMPLEMENTED; + return FALSE; +} + +/* + * @unimplemented + */ +BOOLEAN +NTAPI +Ke386SetIoAccessMap(IN ULONG Flag, + IN PVOID IopmBuffer) +{ + UNIMPLEMENTED; + return FALSE; +} + +/* + * @unimplemented + */ +BOOLEAN +NTAPI +Ke386QueryIoAccessMap(IN ULONG Flag, + IN PVOID IopmBuffer) +{ + UNIMPLEMENTED; + return FALSE; +} diff --git a/reactos/ntoskrnl/ke/ipi.c b/reactos/ntoskrnl/ke/ipi.c index 92308baeb8a..1b9bb0c8b69 100644 --- a/reactos/ntoskrnl/ke/ipi.c +++ b/reactos/ntoskrnl/ke/ipi.c @@ -14,10 +14,60 @@ /* GLOBALS *******************************************************************/ -KSPIN_LOCK KiIpiLock; +extern KSPIN_LOCK KiReverseStallIpiLock; /* PRIVATE FUNCTIONS *********************************************************/ +VOID +NTAPI +KiIpiGenericCallTarget(IN PKIPI_CONTEXT PacketContext, + IN PVOID BroadcastFunction, + IN PVOID Argument, + IN PVOID Count) +{ + /* FIXME: TODO */ + ASSERTMSG("Not yet implemented\n", FALSE); +} + +VOID +FASTCALL +KiIpiSend(IN KAFFINITY TargetProcessors, + IN ULONG IpiRequest) +{ + /* FIXME: TODO */ + ASSERTMSG("Not yet implemented\n", FALSE); +} + +VOID +NTAPI +KiIpiSendPacket(IN KAFFINITY TargetProcessors, + IN PKIPI_WORKER WorkerFunction, + IN PKIPI_BROADCAST_WORKER BroadcastFunction, + IN ULONG_PTR Context, + IN PULONG Count) +{ + /* FIXME: TODO */ + ASSERTMSG("Not yet implemented\n", FALSE); +} + +VOID +FASTCALL +KiIpiSignalPacketDone(IN PKIPI_CONTEXT PacketContext) +{ + /* FIXME: TODO */ + ASSERTMSG("Not yet implemented\n", FALSE); +} + +VOID +FASTCALL +KiIpiSignalPacketDoneAndStall(IN PKIPI_CONTEXT PacketContext, + IN volatile PULONG ReverseStall) +{ + /* FIXME: TODO */ + ASSERTMSG("Not yet implemented\n", FALSE); +} + +#if 0 VOID NTAPI KiIpiSendRequest(IN KAFFINITY TargetSet, @@ -86,6 +136,7 @@ KiIpiSendPacket(IN KAFFINITY TargetSet, } #endif } +#endif /* PUBLIC FUNCTIONS **********************************************************/ @@ -95,7 +146,7 @@ KiIpiSendPacket(IN KAFFINITY TargetSet, BOOLEAN NTAPI KiIpiServiceRoutine(IN PKTRAP_FRAME TrapFrame, - IN PVOID ExceptionFrame) + IN PKEXCEPTION_FRAME ExceptionFrame) { #ifdef CONFIG_SMP PKPRCB Prcb; @@ -141,32 +192,73 @@ NTAPI KeIpiGenericCall(IN PKIPI_BROADCAST_WORKER Function, IN ULONG_PTR Argument) { -#ifdef CONFIG_SMP -#error Not yet implemented! -#else ULONG_PTR Status; KIRQL OldIrql, OldIrql2; +#ifdef CONFIG_SMP + KAFFINITY Affinity; + ULONG Count; + PKPRCB Prcb = KeGetCurrentPrcb(); +#endif /* Raise to DPC level if required */ OldIrql = KeGetCurrentIrql(); if (OldIrql < DISPATCH_LEVEL) KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); +#ifdef CONFIG_SMP + /* Get current processor count and affinity */ + Count = KeNumberProcessors; + Affinity = KeActiveProcessors; + + /* Exclude ourselves */ + Affinity &= ~Prcb->SetMember; +#endif + /* Acquire the IPI lock */ - KeAcquireSpinLockAtDpcLevel(&KiIpiLock); + KeAcquireSpinLockAtDpcLevel(&KiReverseStallIpiLock); + +#ifdef CONFIG_SMP + /* Make sure this is MP */ + if (Affinity) + { + /* Send an IPI */ + KiIpiSendPacket(Affinity, + KiIpiGenericCallTarget, + Function, + Argument, + &Count); + + /* Spin until the other processors are ready */ + while ((volatile ULONG)Count != 1) YieldProcessor(); + } +#endif /* Raise to IPI level */ KeRaiseIrql(IPI_LEVEL, &OldIrql2); +#ifdef CONFIG_SMP + /* Let the other processors know it is time */ + Count = 0; +#endif + /* Call the function */ Status = Function(Argument); +#ifdef CONFIG_SMP + /* If this is MP, wait for the other processors to finish */ + if (Affinity) + { + /* Sanity check */ + ASSERT(Prcb == (volatile PKPRCB)KeGetCurrentPrcb()); + + /* FIXME: TODO */ + ASSERTMSG("Not yet implemented\n", FALSE); + } +#endif + /* Release the lock */ - KeReleaseSpinLockFromDpcLevel(&KiIpiLock); + KeReleaseSpinLockFromDpcLevel(&KiReverseStallIpiLock); /* Lower IRQL back */ KeLowerIrql(OldIrql); return Status; -#endif } - -/* EOF */ diff --git a/reactos/ntoskrnl/ke/queue.c b/reactos/ntoskrnl/ke/queue.c index 917b7ee0d61..49aa99c2941 100644 --- a/reactos/ntoskrnl/ke/queue.c +++ b/reactos/ntoskrnl/ke/queue.c @@ -436,8 +436,7 @@ PLIST_ENTRY NTAPI KeRundownQueue(IN PKQUEUE Queue) { - PLIST_ENTRY ListHead, NextEntry; - PLIST_ENTRY FirstEntry = NULL; + PLIST_ENTRY FirstEntry, NextEntry; PKTHREAD Thread; KIRQL OldIrql; ASSERT_QUEUE(Queue); @@ -446,34 +445,41 @@ KeRundownQueue(IN PKQUEUE Queue) /* Get the Dispatcher Lock */ OldIrql = KiAcquireDispatcherLock(); - - /* Make sure the list is not empty */ - if (!IsListEmpty(&Queue->EntryListHead)) + + /* Check if the list is empty */ + FirstEntry = Queue->EntryListHead.Flink; + if (FirstEntry == &Queue->EntryListHead) { - /* Remove it */ - FirstEntry = RemoveHeadList(&Queue->EntryListHead); + /* We won't return anything */ + FirstEntry = NULL; } - - /* Unlink threads and clear their Thread->Queue */ - ListHead = &Queue->ThreadListHead; - NextEntry = ListHead->Flink; - while (ListHead != NextEntry) + else { - /* Get the Entry's Thread */ + /* Remove this entry */ + RemoveEntryList(&Queue->EntryListHead); + } + + /* Loop the list */ + while (!IsListEmpty(&Queue->ThreadListHead)) + { + /* Get the next entry */ + NextEntry = Queue->ThreadListHead.Flink; + + /* Get the associated thread */ Thread = CONTAINING_RECORD(NextEntry, KTHREAD, QueueListEntry); - /* Kill its Queue */ + /* Clear its queue */ Thread->Queue = NULL; /* Remove this entry */ RemoveEntryList(NextEntry); - - /* Get the next entry */ - NextEntry = NextEntry->Flink; } - /* Release the lock and return */ - KiReleaseDispatcherLock(OldIrql); + /* Release the dispatcher lock */ + KiReleaseDispatcherLockFromDpcLevel(); + + /* Exit the dispatcher and return the first entry (if any) */ + KiExitDispatcher(OldIrql); return FirstEntry; } diff --git a/reactos/ntoskrnl/ke/thrdschd.c b/reactos/ntoskrnl/ke/thrdschd.c index d6a7b57f11d..d174a3cfa01 100644 --- a/reactos/ntoskrnl/ke/thrdschd.c +++ b/reactos/ntoskrnl/ke/thrdschd.c @@ -253,7 +253,7 @@ KiDeferredReadyThread(IN PKTHREAD Thread) if (KeGetCurrentProcessorNumber() != Thread->NextProcessor) { /* We are, send an IPI */ - KiIpiSendRequest(AFFINITY_MASK(Thread->NextProcessor), IPI_DPC); + KiIpiSend(AFFINITY_MASK(Thread->NextProcessor), IPI_DPC); } return; } @@ -612,7 +612,7 @@ KiSetPriorityThread(IN PKTHREAD Thread, if (KeGetCurrentProcessorNumber() != Processor) { /* We are, send an IPI */ - KiIpiSendRequest(AFFINITY_MASK(Processor), IPI_DPC); + KiIpiSend(AFFINITY_MASK(Processor), IPI_DPC); } } } diff --git a/reactos/ntoskrnl/ke/timerobj.c b/reactos/ntoskrnl/ke/timerobj.c index 5f6aeb94aa0..c599b3046b8 100644 --- a/reactos/ntoskrnl/ke/timerobj.c +++ b/reactos/ntoskrnl/ke/timerobj.c @@ -29,71 +29,29 @@ KiInsertTreeTimer(IN PKTIMER Timer, BOOLEAN Inserted = FALSE; ULONG Hand = 0; PKSPIN_LOCK_QUEUE LockQueue; - LONGLONG DueTime; - LARGE_INTEGER InterruptTime, SystemTime, DifferenceTime; - PKTIMER_TABLE_ENTRY TimerEntry; - DPRINT("KiInsertTreeTimer(): Timer %p, Interval: %I64d\n", Timer, Interval.QuadPart); - /* Convert to relative time if needed */ - Timer->Header.Absolute = FALSE; - if (Interval.HighPart >= 0) + /* Setup the timer's due time */ + if (KiComputeDueTime(Timer, Interval, &Hand)) { - /* Get System Time */ - KeQuerySystemTime(&SystemTime); + /* Acquire the lock */ + LockQueue = KiAcquireTimerLock(Hand); - /* Do the conversion */ - DifferenceTime.QuadPart = SystemTime.QuadPart - Interval.QuadPart; - - /* Make sure it hasn't already expired */ - Timer->Header.Absolute = TRUE; - if (DifferenceTime.HighPart >= 0) + /* Insert the timer */ + if (KiInsertTimerTable(Timer, Hand)) { - /* Cancel everything */ - Timer->Header.SignalState = TRUE; - Timer->Header.Hand = 0; - Timer->DueTime.QuadPart = 0; - return FALSE; + /* It was already there, remove it */ + KiRemoveEntryTimer(Timer); + Timer->Header.Inserted = FALSE; } - - /* Set the time as Absolute */ - Interval = DifferenceTime; - } - - /* Get the Interrupt Time */ - InterruptTime.QuadPart = KeQueryInterruptTime(); - - /* Recalculate due time */ - DueTime = InterruptTime.QuadPart - Interval.QuadPart; - Timer->DueTime.QuadPart = DueTime; - - /* Get the handle */ - Hand = KiComputeTimerTableIndex(DueTime); - Timer->Header.Hand = (UCHAR)Hand; - Timer->Header.Inserted = TRUE; - - /* Acquire the lock */ - LockQueue = KiAcquireTimerLock(Hand); - - /* Insert the timer */ - if (KiInsertTimerTable(Timer, Hand)) - { - /* It was already there, remove it */ - if (RemoveEntryList(&Timer->TimerListEntry)) + else { - /* Get the entry and check if it's empty */ - TimerEntry = &KiTimerTableListHead[Hand]; - if (IsListEmpty(&TimerEntry->Entry)) - { - /* Clear the time then */ - TimerEntry->Time.HighPart = 0xFFFFFFFF; - } + /* Otherwise, we're now inserted */ + Inserted = TRUE; } - } - else - { - /* Otherwise, we're now inserted */ - Inserted = TRUE; + + /* Release the lock */ + KiReleaseTimerLock(LockQueue); } /* Release the lock and return insert status */ @@ -110,7 +68,6 @@ KiInsertTimerTable(IN PKTIMER Timer, BOOLEAN Expired = FALSE; PLIST_ENTRY ListHead, NextEntry; PKTIMER CurrentTimer; - DPRINT("KiInsertTimerTable(): Timer %p, Hand: %d\n", Timer, Hand); /* Check if the period is zero */ @@ -160,7 +117,6 @@ KiSignalTimer(IN PKTIMER Timer) PKDPC Dpc = Timer->Dpc; ULONG Period = Timer->Period; LARGE_INTEGER Interval, SystemTime; - DPRINT("KiSignalTimer(): Timer %p\n", Timer); /* Set default values */ @@ -212,22 +168,11 @@ KiCompleteTimer(IN PKTIMER Timer, IN PKSPIN_LOCK_QUEUE LockQueue) { LIST_ENTRY ListHead; - PKTIMER_TABLE_ENTRY TimerEntry; BOOLEAN RequestInterrupt = FALSE; - DPRINT("KiCompleteTimer(): Timer %p, LockQueue: %p\n", Timer, LockQueue); /* Remove it from the timer list */ - if (RemoveEntryList(&Timer->TimerListEntry)) - { - /* Get the entry and check if it's empty */ - TimerEntry = &KiTimerTableListHead[Timer->Header.Hand]; - if (IsListEmpty(&TimerEntry->Entry)) - { - /* Clear the time then */ - TimerEntry->Time.HighPart = 0xFFFFFFFF; - } - } + KiRemoveEntryTimer(Timer); /* Link the timer list to our stack */ ListHead.Flink = &Timer->TimerListEntry; @@ -264,7 +209,6 @@ KeCancelTimer(IN OUT PKTIMER Timer) BOOLEAN Inserted; ASSERT_TIMER(Timer); ASSERT(KeGetCurrentIrql() <= DISPATCH_LEVEL); - DPRINT("KeCancelTimer(): Timer %p\n", Timer); /* Lock the Database and Raise IRQL */ @@ -301,7 +245,8 @@ KeInitializeTimerEx(OUT PKTIMER Timer, IN TIMER_TYPE Type) { DPRINT("KeInitializeTimerEx(): Timer %p, Type %s\n", - Timer, (Type == NotificationTimer) ? "NotificationTimer" : "SynchronizationTimer"); + Timer, (Type == NotificationTimer) ? + "NotificationTimer" : "SynchronizationTimer"); /* Initialize the Dispatch Header */ KeInitializeDispatcherHeader(&Timer->Header, @@ -352,13 +297,11 @@ KeSetTimerEx(IN OUT PKTIMER Timer, KIRQL OldIrql; BOOLEAN Inserted; ULONG Hand = 0; - LARGE_INTEGER InterruptTime, SystemTime, DifferenceTime; BOOLEAN RequestInterrupt = FALSE; ASSERT_TIMER(Timer); ASSERT(KeGetCurrentIrql() <= DISPATCH_LEVEL); - DPRINT("KeSetTimerEx(): Timer %p, DueTime %I64d, Period %d, Dpc %p\n", - Timer, DueTime.QuadPart, Period, Dpc); + Timer, DueTime.QuadPart, Period, Dpc); /* Lock the Database and Raise IRQL */ OldIrql = KiAcquireDispatcherLock(); @@ -370,59 +313,24 @@ KeSetTimerEx(IN OUT PKTIMER Timer, /* Set Default Timer Data */ Timer->Dpc = Dpc; Timer->Period = Period; - - /* Convert to relative time if needed */ - Timer->Header.Absolute = FALSE; - if (DueTime.HighPart >= 0) + if (!KiComputeDueTime(Timer, DueTime, &Hand)) { - /* Get System Time */ - KeQuerySystemTime(&SystemTime); - - /* Do the conversion */ - DifferenceTime.QuadPart = SystemTime.QuadPart - DueTime.QuadPart; - - /* Make sure it hasn't already expired */ - Timer->Header.Absolute = TRUE; - if (DifferenceTime.HighPart >= 0) - { - /* Cancel everything */ - Timer->Header.SignalState = TRUE; - Timer->Header.Hand = 0; - Timer->DueTime.QuadPart = 0; - - /* Signal the timer */ - RequestInterrupt = KiSignalTimer(Timer); - - /* Release the dispatcher lock */ - KiReleaseDispatcherLockFromDpcLevel(); - - /* Check if we need to do an interrupt */ - if (RequestInterrupt) HalRequestSoftwareInterrupt(DISPATCH_LEVEL); - - /* Exit the dispatcher and return the old state */ - KiExitDispatcher(OldIrql); - return Inserted; - } - - /* Set the time as Absolute */ - DueTime = DifferenceTime; + /* Signal the timer */ + RequestInterrupt = KiSignalTimer(Timer); + + /* Release the dispatcher lock */ + KiReleaseDispatcherLockFromDpcLevel(); + + /* Check if we need to do an interrupt */ + if (RequestInterrupt) HalRequestSoftwareInterrupt(DISPATCH_LEVEL); } - - /* Get the Interrupt Time */ - InterruptTime.QuadPart = KeQueryInterruptTime(); - - /* Recalculate due time */ - Timer->DueTime.QuadPart = InterruptTime.QuadPart - DueTime.QuadPart; - - /* Get the handle */ - Hand = KiComputeTimerTableIndex(Timer->DueTime.QuadPart); - Timer->Header.Hand = (UCHAR)Hand; - Timer->Header.Inserted = TRUE; - - /* Insert the timer */ - Timer->Header.SignalState = FALSE; - KxInsertTimer(Timer, Hand); - + else + { + /* Insert the timer */ + Timer->Header.SignalState = FALSE; + KxInsertTimer(Timer, Hand); + } + /* Exit the dispatcher */ KiExitDispatcher(OldIrql); diff --git a/reactos/ntoskrnl/mm/verifier.c b/reactos/ntoskrnl/mm/verifier.c index f2682991609..11d3ac2685d 100644 --- a/reactos/ntoskrnl/mm/verifier.c +++ b/reactos/ntoskrnl/mm/verifier.c @@ -146,7 +146,7 @@ Cleanup: KeLeaveCriticalRegion(); /* Free the table if we failed and return status */ - ExFreePool(ThunkTable); + if (ThunkTable) ExFreePool(ThunkTable); return Status; } diff --git a/reactos/ntoskrnl/ntoskrnl-amd64hack.rbuild b/reactos/ntoskrnl/ntoskrnl-amd64hack.rbuild index 1e39788ea0d..2d7d68eb73e 100644 --- a/reactos/ntoskrnl/ntoskrnl-amd64hack.rbuild +++ b/reactos/ntoskrnl/ntoskrnl-amd64hack.rbuild @@ -483,7 +483,6 @@ wmi.c ntoskrnl.rc - ntoskrnl.pspec ntoskrnl_$(ARCH).lnk diff --git a/reactos/ntoskrnl/ntoskrnl-generic.rbuild b/reactos/ntoskrnl/ntoskrnl-generic.rbuild index 99f6c8f8242..817e99a1aa8 100644 --- a/reactos/ntoskrnl/ntoskrnl-generic.rbuild +++ b/reactos/ntoskrnl/ntoskrnl-generic.rbuild @@ -466,6 +466,5 @@ wmi.c ntoskrnl.rc - ntoskrnl.pspec ntoskrnl_$(ARCH).lnk diff --git a/reactos/ntoskrnl/ntoskrnl.pspec b/reactos/ntoskrnl/ntoskrnl.pspec index 9fb2550a30c..d78174bf2f4 100644 --- a/reactos/ntoskrnl/ntoskrnl.pspec +++ b/reactos/ntoskrnl/ntoskrnl.pspec @@ -1,4 +1,4 @@ -#include "include/reactos/msvctarget.h" +#include @ stdcall CcCanIWrite(ptr long long long) @ stdcall CcCopyRead(ptr ptr long long ptr ptr) @@ -83,8 +83,8 @@ @ stdcall ExDisableResourceBoostLite(ptr) @ fastcall ExEnterCriticalRegionAndAcquireFastMutexUnsafe(ptr) @ stdcall ExEnterCriticalRegionAndAcquireResourceExclusive(ptr) -;ExEnterCriticalRegionAndAcquireResourceShared -;ExEnterCriticalRegionAndAcquireSharedWaitForExclusive +@ stdcall ExEnterCriticalRegionAndAcquireResourceShared(ptr) +@ stdcall ExEnterCriticalRegionAndAcquireSharedWaitForExclusive(ptr) @ stdcall ExEnumHandleTable(ptr ptr ptr ptr) @ extern ExEventObjectType _ExEventObjectType @ stdcall ExExtendZone(ptr ptr long) @@ -522,7 +522,7 @@ @ stdcall IoSynchronousInvalidateDeviceRelations(ptr long) @ stdcall IoSynchronousPageWrite(ptr ptr ptr ptr ptr) @ stdcall IoThreadToProcess(ptr) -;IoTranslateBusAddress +@ stdcall IoTranslateBusAddress(long long long long ptr ptr) @ stdcall IoUnregisterFileSystem(ptr) @ stdcall IoUnregisterFsRegistrationChange(ptr ptr) @ stdcall IoUnregisterPlugPlayNotification(ptr) @@ -566,9 +566,9 @@ @ stdcall KdSystemDebugControl(long ptr long ptr long ptr long) #ifdef _M_IX86 @ stdcall Ke386CallBios(long ptr) -;Ke386IoSetAccessProcess -;Ke386QueryIoAccessMap -;Ke386SetIoAccessMap +@ stdcall Ke386IoSetAccessProcess(ptr long) +@ stdcall Ke386QueryIoAccessMap(long ptr) +@ stdcall Ke386SetIoAccessMap(long ptr) #endif @ fastcall KeAcquireGuardedMutex(ptr) @ fastcall KeAcquireGuardedMutexUnsafe(ptr) @@ -745,6 +745,7 @@ @ fastcall KiAcquireSpinLock(ptr) @ extern KiBugCheckData @ stdcall KiCheckForKernelApcDelivery() +;KiCheckForSListAddress #ifdef _M_IX86 @ stdcall KiCoprocessorError() #endif @@ -955,17 +956,17 @@ ;PfxInsertPrefix ;PfxRemovePrefix @ stdcall PoCallDriver(ptr ptr) -;PoCancelDeviceNotify +@ stdcall PoCancelDeviceNotify(ptr) @ stdcall PoQueueShutdownWorkItem(ptr) @ stdcall PoRegisterDeviceForIdleDetection(ptr long long long) -;PoRegisterDeviceNotify +@ stdcall PoRegisterDeviceNotify(ptr long long long ptr ptr) @ stdcall PoRegisterSystemState(ptr long) @ stdcall PoRequestPowerIrp(ptr long long ptr ptr ptr) -;PoRequestShutdownEvent -;PoSetHiberRange +@ stdcall PoRequestShutdownEvent(ptr) +@ stdcall PoSetHiberRange(ptr long ptr long long) @ stdcall PoSetPowerState(ptr long long) @ stdcall PoSetSystemState(long) -;PoShutdownBugCheck +@ stdcall PoShutdownBugCheck(long long ptr ptr ptr ptr) @ stdcall PoStartNextPowerIrp(ptr) @ stdcall PoUnregisterSystemState(ptr) @ stdcall ProbeForRead(ptr long long) diff --git a/reactos/ntoskrnl/ob/obref.c b/reactos/ntoskrnl/ob/obref.c index eaa45237217..4f8cf4256ad 100644 --- a/reactos/ntoskrnl/ob/obref.c +++ b/reactos/ntoskrnl/ob/obref.c @@ -299,11 +299,7 @@ ObfDereferenceObject(IN PVOID Object) if (!OldCount) { /* Sanity check */ - if (Header->HandleCount) - { - DPRINT1("Misbehaving object: %wZ\n", &Header->Type->Name); - return Header->PointerCount; - } + ASSERT(Header->HandleCount == 0); /* Check if APCs are still active */ if (!KeAreAllApcsDisabled()) diff --git a/reactos/ntoskrnl/po/power.c b/reactos/ntoskrnl/po/power.c index 21fe70624b1..98768e34a52 100644 --- a/reactos/ntoskrnl/po/power.c +++ b/reactos/ntoskrnl/po/power.c @@ -216,6 +216,84 @@ PoInitializePrcb(IN PKPRCB Prcb) /* PUBLIC FUNCTIONS **********************************************************/ +/* + * @unimplemented + */ +NTSTATUS +NTAPI +PoCancelDeviceNotify(IN PVOID NotifyBlock) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* + * @unimplemented + */ +NTSTATUS +NTAPI +PoRegisterDeviceNotify(OUT PVOID Unknown0, + IN ULONG Unknown1, + IN ULONG Unknown2, + IN ULONG Unknown3, + IN PVOID Unknown4, + IN PVOID Unknown5) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* + * @unimplemented + */ +VOID +NTAPI +PoShutdownBugCheck(IN BOOLEAN LogError, + IN ULONG BugCheckCode, + IN ULONG_PTR BugCheckParameter1, + IN ULONG_PTR BugCheckParameter2, + IN ULONG_PTR BugCheckParameter3, + IN ULONG_PTR BugCheckParameter4) +{ + DPRINT1("PoShutdownBugCheck called\n"); + + /* FIXME: Log error if requested */ + /* FIXME: Initiate a shutdown */ + + /* Bugcheck the system */ + KeBugCheckEx(BugCheckCode, + BugCheckParameter1, + BugCheckParameter2, + BugCheckParameter3, + BugCheckParameter4); +} + +/* + * @unimplemented + */ +NTSTATUS +NTAPI +PoRequestShutdownEvent(OUT PVOID *Event) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* + * @unimplemented + */ +VOID +NTAPI +PoSetHiberRange(IN PVOID HiberContext, + IN ULONG Flags, + IN OUT PVOID StartPage, + IN ULONG Length, + IN ULONG PageTag) +{ + UNIMPLEMENTED; + return; +} + /* * @implemented */ diff --git a/reactos/subsystems/win32/csrss/win32csr/dllmain.c b/reactos/subsystems/win32/csrss/win32csr/dllmain.c index 554c7a75afb..1006de6141e 100644 --- a/reactos/subsystems/win32/csrss/win32csr/dllmain.c +++ b/reactos/subsystems/win32/csrss/win32csr/dllmain.c @@ -586,9 +586,12 @@ Win32CsrInitialization(PCSRSS_API_DEFINITION *ApiDefinitions, PCSRSS_EXPORTED_FUNCS Exports, HANDLE CsrssApiHeap) { + NTSTATUS Status; CsrExports = *Exports; Win32CsrApiHeap = CsrssApiHeap; + Status = NtUserInitialize(0 ,NULL, NULL); + PrivateCsrssManualGuiCheck(0); CsrInitConsoleSupport(); diff --git a/reactos/subsystems/win32/csrss/win32csr/w32csr.h b/reactos/subsystems/win32/csrss/win32csr/w32csr.h index f7b9aaada52..f6f0f4e649c 100644 --- a/reactos/subsystems/win32/csrss/win32csr/w32csr.h +++ b/reactos/subsystems/win32/csrss/win32csr/w32csr.h @@ -22,6 +22,11 @@ #include "tuiconsole.h" #include +/* Public Win32K Headers */ +#include +#include +#include + #include #include #include diff --git a/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild b/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild index 5fdc9a68f48..ba304e447d4 100644 --- a/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild +++ b/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild @@ -13,7 +13,7 @@ user32 gdi32 advapi32 - psapi + win32ksys psapi shell32 w32csr.h diff --git a/reactos/subsystems/win32/win32k/dib/dib.c b/reactos/subsystems/win32/win32k/dib/dib.c index fc02587c382..036dc764f5d 100644 --- a/reactos/subsystems/win32/win32k/dib/dib.c +++ b/reactos/subsystems/win32/win32k/dib/dib.c @@ -173,7 +173,7 @@ DIB_DoRop(ULONG Rop, ULONG Dest, ULONG Source, ULONG Pattern) case ROP3_TO_ROP4(PATINVERT): return(Dest ^ Pattern); case ROP3_TO_ROP4(SRCINVERT): return(Dest ^ Source); case ROP3_TO_ROP4(SRCAND): return(Dest & Source); - case ROP3_TO_ROP4(MERGEPAINT): return(Dest & (~Source)); + case ROP3_TO_ROP4(MERGEPAINT): return(Dest | (~Source)); case ROP3_TO_ROP4(SRCPAINT): return(Dest | Source); case ROP3_TO_ROP4(MERGECOPY): return(Source & Pattern); case ROP3_TO_ROP4(SRCCOPY): return(Source); diff --git a/reactos/subsystems/win32/win32k/dib/dib16bpp.c b/reactos/subsystems/win32/win32k/dib/dib16bpp.c index 0be2e3e0e3f..09329eb9a5a 100644 --- a/reactos/subsystems/win32/win32k/dib/dib16bpp.c +++ b/reactos/subsystems/win32/win32k/dib/dib16bpp.c @@ -788,12 +788,12 @@ BOOLEAN DIB_16BPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf, /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* This is a reference implementation, it hasn't been optimized for speed */ - for (DesY=0; DesYtop; DesYbottom; DesY++) { sx = SourceRect->left; sx_dec = 0; - for (DesX=0; DesXleft; DesXright; DesX++) { color = XLATEOBJ_iXlate(ColorTranslation, DIB_1BPP_GetPixel(SourceSurf, sx, sy)); @@ -823,12 +823,12 @@ BOOLEAN DIB_16BPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf, /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* This is a reference implementation, it hasn't been optimized for speed */ - for (DesY=0; DesYtop; DesYbottom; DesY++) { sx = SourceRect->left; sx_dec = 0; - for (DesX=0; DesXleft; DesXright; DesX++) { color = XLATEOBJ_iXlate(ColorTranslation, DIB_4BPP_GetPixel(SourceSurf, sx, sy)); @@ -858,12 +858,12 @@ BOOLEAN DIB_16BPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf, /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* This is a reference implementation, it hasn't been optimized for speed */ - for (DesY=0; DesYtop; DesYbottom; DesY++) { sx = SourceRect->left; sx_dec = 0; - for (DesX=0; DesXleft; DesXright; DesX++) { color = XLATEOBJ_iXlate(ColorTranslation, DIB_8BPP_GetPixel(SourceSurf, sx, sy)); @@ -894,12 +894,12 @@ BOOLEAN DIB_16BPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf, /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* This is a reference implementation, it hasn't been optimized for speed */ - for (DesY=0; DesYtop; DesYbottom; DesY++) { sx = SourceRect->left; sx_dec = 0; - for (DesX=0; DesXleft; DesXright; DesX++) { color = XLATEOBJ_iXlate(ColorTranslation, DIB_24BPP_GetPixel(SourceSurf, sx, sy)); @@ -929,12 +929,12 @@ BOOLEAN DIB_16BPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf, /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* This is a reference implementation, it hasn't been optimized for speed */ - for (DesY=0; DesYtop; DesYbottom; DesY++) { sx = SourceRect->left; sx_dec = 0; - for (DesX=0; DesXleft; DesXright; DesX++) { color = XLATEOBJ_iXlate(ColorTranslation, DIB_32BPP_GetPixel(SourceSurf, sx, sy)); diff --git a/reactos/subsystems/win32/win32k/dib/dib24bpp.c b/reactos/subsystems/win32/win32k/dib/dib24bpp.c index a079d75d6f0..acfc460946d 100644 --- a/reactos/subsystems/win32/win32k/dib/dib24bpp.c +++ b/reactos/subsystems/win32/win32k/dib/dib24bpp.c @@ -414,20 +414,50 @@ BOOLEAN DIB_24BPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf, LONG SrcSizeX; LONG DesSizeY; LONG DesSizeX; - LONG sx; - LONG sy; + LONG sx = 0; + LONG sy = 0; LONG DesX; LONG DesY; - LONG color; + + LONG SrcZoomXHight; + LONG SrcZoomXLow; + LONG SrcZoomYHight; + LONG SrcZoomYLow; + + LONG sy_dec = 0; + LONG sy_max; + + LONG sx_dec = 0; + LONG sx_max; + ULONG color; DPRINT("DIB_24BPP_StretchBlt: Source BPP: %u, srcRect: (%d,%d)-(%d,%d), dstRect: (%d,%d)-(%d,%d)\n", BitsPerFormat(SourceSurf->iBitmapFormat), SourceRect->left, SourceRect->top, SourceRect->right, SourceRect->bottom, DestRect->left, DestRect->top, DestRect->right, DestRect->bottom); - SrcSizeY = SourceRect->bottom - SourceRect->top; - SrcSizeX = SourceRect->right - SourceRect->left; + + /* Calc the Zoom height of Source */ + SrcSizeY = SourceRect->bottom - SourceRect->top; - DesSizeY = DestRect->bottom - DestRect->top; - DesSizeX = DestRect->right - DestRect->left; + /* Calc the Zoom Width of Source */ + SrcSizeX = SourceRect->right - SourceRect->left; + + /* Calc the Zoom height of Destinations */ + DesSizeY = DestRect->bottom - DestRect->top; + + /* Calc the Zoom width of Destinations */ + DesSizeX = DestRect->right - DestRect->left; + + /* Calc the zoom factor of source height */ + SrcZoomYHight = SrcSizeY / DesSizeY; + SrcZoomYLow = SrcSizeY - (SrcZoomYHight * DesSizeY); + + /* Calc the zoom factor of source width */ + SrcZoomXHight = SrcSizeX / DesSizeX; + SrcZoomXLow = SrcSizeX - (SrcZoomXHight * DesSizeX); + + sx_max = DesSizeX; + sy_max = DesSizeY; + sy = SourceRect->top; switch(SourceSurf->iBitmapFormat) { @@ -437,20 +467,31 @@ BOOLEAN DIB_24BPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf, for (DesY=DestRect->top; DesYbottom; DesY++) { - sy = (((DesY - DestRect->top) * SrcSizeY) / DesSizeY) + SourceRect->top; + sx = SourceRect->left; + sx_dec = 0; for (DesX=DestRect->left; DesXright; DesX++) { - sx = (((DesX - DestRect->left) * SrcSizeX) / DesSizeX) + SourceRect->left; + color = XLATEOBJ_iXlate(ColorTranslation, + DIB_1BPP_GetPixel(SourceSurf, sx, sy)); - if(DIB_1BPP_GetPixel(SourceSurf, sx, sy) == 0) - { - DIB_24BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, 0)); - } - else - { - DIB_24BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, 1)); - } + DIB_24BPP_PutPixel(DestSurf, DesX, DesY, color); + + sx += SrcZoomXHight; + sx_dec += SrcZoomXLow; + if (sx_dec >= sx_max) + { + sx++; + sx_dec -= sx_max; + } + } + + sy += SrcZoomYHight; + sy_dec += SrcZoomYLow; + if (sy_dec >= sy_max) + { + sy++; + sy_dec -= sy_max; } } @@ -462,13 +503,31 @@ BOOLEAN DIB_24BPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf, for (DesY=DestRect->top; DesYbottom; DesY++) { - sy = (((DesY - DestRect->top) * SrcSizeY) / DesSizeY) + SourceRect->top; + sx = SourceRect->left; + sx_dec = 0; for (DesX=DestRect->left; DesXright; DesX++) { - sx = (((DesX - DestRect->left) * SrcSizeX) / DesSizeX) + SourceRect->left; - color = DIB_4BPP_GetPixel(SourceSurf, sx, sy); - DIB_24BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + color = XLATEOBJ_iXlate(ColorTranslation, + DIB_4BPP_GetPixel(SourceSurf, sx, sy)); + + DIB_24BPP_PutPixel(DestSurf, DesX, DesY, color); + + sx += SrcZoomXHight; + sx_dec += SrcZoomXLow; + if (sx_dec >= sx_max) + { + sx++; + sx_dec -= sx_max; + } + } + + sy += SrcZoomYHight; + sy_dec += SrcZoomYLow; + if (sy_dec >= sy_max) + { + sy++; + sy_dec -= sy_max; } } break; @@ -479,13 +538,31 @@ BOOLEAN DIB_24BPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf, for (DesY=DestRect->top; DesYbottom; DesY++) { - sy = (((DesY - DestRect->top) * SrcSizeY) / DesSizeY) + SourceRect->top; + sx = SourceRect->left; + sx_dec = 0; for (DesX=DestRect->left; DesXright; DesX++) { - sx = (((DesX - DestRect->left) * SrcSizeX) / DesSizeX) + SourceRect->left; - color = DIB_8BPP_GetPixel(SourceSurf, sx, sy); - DIB_24BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + color = XLATEOBJ_iXlate(ColorTranslation, + DIB_8BPP_GetPixel(SourceSurf, sx, sy)); + + DIB_24BPP_PutPixel(DestSurf, DesX, DesY, color); + + sx += SrcZoomXHight; + sx_dec += SrcZoomXLow; + if (sx_dec >= sx_max) + { + sx++; + sx_dec -= sx_max; + } + } + + sy += SrcZoomYHight; + sy_dec += SrcZoomYLow; + if (sy_dec >= sy_max) + { + sy++; + sy_dec -= sy_max; } } break; @@ -496,13 +573,31 @@ BOOLEAN DIB_24BPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf, for (DesY=DestRect->top; DesYbottom; DesY++) { - sy = (((DesY - DestRect->top) * SrcSizeY) / DesSizeY) + SourceRect->top; + sx = SourceRect->left; + sx_dec = 0; for (DesX=DestRect->left; DesXright; DesX++) { - sx = (((DesX - DestRect->left) * SrcSizeX) / DesSizeX) + SourceRect->left; - color = DIB_16BPP_GetPixel(SourceSurf, sx, sy); - DIB_24BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + color = XLATEOBJ_iXlate(ColorTranslation, + DIB_16BPP_GetPixel(SourceSurf, sx, sy)); + + DIB_24BPP_PutPixel(DestSurf, DesX, DesY, color); + + sx += SrcZoomXHight; + sx_dec += SrcZoomXLow; + if (sx_dec >= sx_max) + { + sx++; + sx_dec -= sx_max; + } + } + + sy += SrcZoomYHight; + sy_dec += SrcZoomYLow; + if (sy_dec >= sy_max) + { + sy++; + sy_dec -= sy_max; } } break; @@ -513,13 +608,31 @@ BOOLEAN DIB_24BPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf, for (DesY=DestRect->top; DesYbottom; DesY++) { - sy = (((DesY - DestRect->top) * SrcSizeY) / DesSizeY) + SourceRect->top; + sx = SourceRect->left; + sx_dec = 0; for (DesX=DestRect->left; DesXright; DesX++) { - sx = (((DesX - DestRect->left) * SrcSizeX) / DesSizeX) + SourceRect->left; - color = DIB_24BPP_GetPixel(SourceSurf, sx, sy); - DIB_24BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + color = XLATEOBJ_iXlate(ColorTranslation, + DIB_24BPP_GetPixel(SourceSurf, sx, sy)); + + DIB_24BPP_PutPixel(DestSurf, DesX, DesY, color); + + sx += SrcZoomXHight; + sx_dec += SrcZoomXLow; + if (sx_dec >= sx_max) + { + sx++; + sx_dec -= sx_max; + } + } + + sy += SrcZoomYHight; + sy_dec += SrcZoomYLow; + if (sy_dec >= sy_max) + { + sy++; + sy_dec -= sy_max; } } break; @@ -530,13 +643,31 @@ BOOLEAN DIB_24BPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf, for (DesY=DestRect->top; DesYbottom; DesY++) { - sy = (((DesY - DestRect->top) * SrcSizeY) / DesSizeY) + SourceRect->top; + sx = SourceRect->left; + sx_dec = 0; for (DesX=DestRect->left; DesXright; DesX++) { - sx = (((DesX - DestRect->left) * SrcSizeX) / DesSizeX) + SourceRect->left; - color = DIB_32BPP_GetPixel(SourceSurf, sx, sy); - DIB_24BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + color = XLATEOBJ_iXlate(ColorTranslation, + DIB_32BPP_GetPixel(SourceSurf, sx, sy)); + + DIB_24BPP_PutPixel(DestSurf, DesX, DesY, color); + + sx += SrcZoomXHight; + sx_dec += SrcZoomXLow; + if (sx_dec >= sx_max) + { + sx++; + sx_dec -= sx_max; + } + } + + sy += SrcZoomYHight; + sy_dec += SrcZoomYLow; + if (sy_dec >= sy_max) + { + sy++; + sy_dec -= sy_max; } } break; @@ -559,9 +690,9 @@ DIB_24BPP_TransparentBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf, SourceY = SourcePoint->y; DestBits = (BYTE*)((PBYTE)DestSurf->pvScan0 + - (DestRect->left << 2) + + (DestRect->left * 3) + DestRect->top * DestSurf->lDelta); - wd = DestSurf->lDelta - ((DestRect->right - DestRect->left) << 2); + wd = DestSurf->lDelta - ((DestRect->right - DestRect->left) * 3); for(Y = DestRect->top; Y < DestRect->bottom; Y++) { diff --git a/reactos/subsystems/win32/win32k/dib/dib4bpp.c b/reactos/subsystems/win32/win32k/dib/dib4bpp.c index 6118eb6f821..0f5ac60fdc7 100644 --- a/reactos/subsystems/win32/win32k/dib/dib4bpp.c +++ b/reactos/subsystems/win32/win32k/dib/dib4bpp.c @@ -510,7 +510,7 @@ BOOLEAN DIB_4BPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf, break; default: - //DPRINT1("DIB_4BPP_StretchBlt: Unhandled Source BPP: %u\n", BitsPerFormat(SourceSurf->iBitmapFormat)); + DPRINT1("DIB_4BPP_StretchBlt: Unhandled Source BPP: %u\n", BitsPerFormat(SourceSurf->iBitmapFormat)); return FALSE; } diff --git a/reactos/subsystems/win32/win32k/dib/dib8bpp.c b/reactos/subsystems/win32/win32k/dib/dib8bpp.c index 0d71e2a949c..66ba47e26bf 100644 --- a/reactos/subsystems/win32/win32k/dib/dib8bpp.c +++ b/reactos/subsystems/win32/win32k/dib/dib8bpp.c @@ -522,11 +522,11 @@ BOOLEAN DIB_8BPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf, case BMF_1BPP: /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* This is a reference implementation, it hasn't been optimized for speed */ - for (DesY=0; DesYtop; DesYbottom; DesY++) { sx = SourceRect->left; sx_dec = 0; - for (DesX=0; DesXleft; DesXright; DesX++) { color = XLATEOBJ_iXlate(ColorTranslation, DIB_1BPP_GetPixel(SourceSurf, sx, sy)); @@ -555,11 +555,11 @@ BOOLEAN DIB_8BPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf, case BMF_4BPP: /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* This is a reference implementation, it hasn't been optimized for speed */ - for (DesY=0; DesYtop; DesYbottom; DesY++) { sx = SourceRect->left; sx_dec = 0; - for (DesX=0; DesXleft; DesXright; DesX++) { color = XLATEOBJ_iXlate(ColorTranslation, DIB_4BPP_GetPixel(SourceSurf, sx, sy)); @@ -593,11 +593,11 @@ BOOLEAN DIB_8BPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf, case BMF_16BPP: /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* This is a reference implementation, it hasn't been optimized for speed */ - for (DesY=0; DesYtop; DesYbottom; DesY++) { sx = SourceRect->left; sx_dec = 0; - for (DesX=0; DesXleft; DesXright; DesX++) { color = XLATEOBJ_iXlate(ColorTranslation, DIB_16BPP_GetPixel(SourceSurf, sx, sy)); @@ -624,11 +624,11 @@ BOOLEAN DIB_8BPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf, break; case BMF_24BPP: - for (DesY=0; DesYtop; DesYbottom; DesY++) { sx = SourceRect->left; sx_dec = 0; - for (DesX=0; DesXleft; DesXright; DesX++) { color = XLATEOBJ_iXlate(ColorTranslation, DIB_24BPP_GetPixel(SourceSurf, sx, sy)); @@ -657,11 +657,11 @@ BOOLEAN DIB_8BPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf, case BMF_32BPP: /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* This is a reference implementation, it hasn't been optimized for speed */ - for (DesY=0; DesYtop; DesYbottom; DesY++) { sx = SourceRect->left; sx_dec = 0; - for (DesX=0; DesXleft; DesXright; DesX++) { color = XLATEOBJ_iXlate(ColorTranslation, DIB_32BPP_GetPixel(SourceSurf, sx, sy)); diff --git a/reactos/subsystems/win32/win32k/eng/clip.c b/reactos/subsystems/win32/win32k/eng/clip.c index bd0cddedf7f..1fa7dac1ea0 100644 --- a/reactos/subsystems/win32/win32k/eng/clip.c +++ b/reactos/subsystems/win32/win32k/eng/clip.c @@ -425,7 +425,6 @@ ClipobjToSpans( (*Spans)[i].Width = Boundary->right - Boundary->left; } } - return TRUE; } @@ -447,7 +446,7 @@ ClipobjToSpans( { if (NULL != *Spans) { - ExFreePool(*Spans); + ExFreePoolWithTag(*Spans, TAG_CLIP); *Spans = NULL; } *Count = 0; @@ -461,7 +460,7 @@ ClipobjToSpans( { *dest++ = *src++; } - ExFreePool(*Spans); + ExFreePoolWithTag(*Spans, TAG_CLIP); } *Spans = NewSpans; } diff --git a/reactos/subsystems/win32/win32k/eng/event.c b/reactos/subsystems/win32/win32k/eng/event.c index 09e1450c3f3..73342da320f 100644 --- a/reactos/subsystems/win32/win32k/eng/event.c +++ b/reactos/subsystems/win32/win32k/eng/event.c @@ -30,7 +30,7 @@ BOOL STDCALL EngDeleteEvent ( IN PEVENT Event) { - ExFreePool(Event); + ExFreePoolWithTag(Event, TAG_DFSM); return TRUE; } @@ -56,7 +56,7 @@ EngMapEvent(IN HDEV Dev, NULL); if (!NT_SUCCESS(Status)) { - ExFreePool(Event); + ExFreePoolWithTag(Event, TAG_DFSM); return NULL; } else @@ -79,7 +79,7 @@ STDCALL EngUnmapEvent ( IN PEVENT Event ) { ObDereferenceObject((PVOID)Event); - ExFreePool(Event); + ExFreePoolWithTag(Event, TAG_DFSM); return TRUE; } @@ -97,7 +97,7 @@ EngWaitForSingleObject (IN PEVENT Event, KernelMode, FALSE, TimeOut); - if (Status != STATUS_SUCCESS) + if (!NT_SUCCESS(Status)) { return FALSE; } diff --git a/reactos/subsystems/win32/win32k/eng/float.c b/reactos/subsystems/win32/win32k/eng/float.c index aa080ab9896..a603e852bc5 100644 --- a/reactos/subsystems/win32/win32k/eng/float.c +++ b/reactos/subsystems/win32/win32k/eng/float.c @@ -41,7 +41,7 @@ EngRestoreFloatingPointState ( IN VOID *Buffer ) { NTSTATUS Status; Status = KeRestoreFloatingPointState((PKFLOATING_SAVE)Buffer); - if (Status != STATUS_SUCCESS) + if (!NT_SUCCESS(Status)) { return FALSE; } diff --git a/reactos/subsystems/win32/win32k/eng/objects.h b/reactos/subsystems/win32/win32k/eng/objects.h index 37fec8251c6..f2a93d9c0b2 100644 --- a/reactos/subsystems/win32/win32k/eng/objects.h +++ b/reactos/subsystems/win32/win32k/eng/objects.h @@ -67,12 +67,27 @@ typedef struct _FLOATGDI { ULONG Dummy; } FLOATGDI; -typedef struct _FONTGDI { - FONTOBJ FontObj; - LPWSTR Filename; - FT_Face face; +#define FDM_TYPE_TEXT_METRIC 0x80000000 + +typedef struct _FONTGDI { + FONTOBJ FontObj; + ULONG iUnique; + FLONG flType; + union{ + DHPDEV dhpdev; + FT_Face face; + }; + FLONG flRealizedType; + + LONG lMaxNegA; + LONG lMaxNegC; + LONG lMinWidthD; + TEXTMETRICW TextMetric; + LPWSTR Filename; + BYTE Underline; + BYTE StrikeOut; } FONTGDI, *PFONTGDI; typedef struct _PATHGDI { diff --git a/reactos/subsystems/win32/win32k/eng/semaphor.c b/reactos/subsystems/win32/win32k/eng/semaphor.c index 50d20841cd1..b16d86abf3b 100644 --- a/reactos/subsystems/win32/win32k/eng/semaphor.c +++ b/reactos/subsystems/win32/win32k/eng/semaphor.c @@ -16,7 +16,7 @@ EngCreateSemaphore ( VOID ) return NULL; if ( !NT_SUCCESS(ExInitializeResourceLite ( psem )) ) { - ExFreePool ( psem ); + ExFreePoolWithTag ( psem, TAG_GSEM ); return NULL; } return (HSEMAPHORE)psem; @@ -81,7 +81,7 @@ EngDeleteSemaphore ( IN HSEMAPHORE hsem ) ExDeleteResourceLite((PERESOURCE)hsem); - ExFreePool ( (PVOID)hsem ); + ExFreePoolWithTag( (PVOID)hsem, TAG_GSEM); } /* diff --git a/reactos/subsystems/win32/win32k/eng/xlate.c b/reactos/subsystems/win32/win32k/eng/xlate.c index 1b1265490c9..0095315b00c 100644 --- a/reactos/subsystems/win32/win32k/eng/xlate.c +++ b/reactos/subsystems/win32/win32k/eng/xlate.c @@ -518,6 +518,8 @@ EngDeleteXlate(XLATEOBJ *XlateObj) XlateGDI = ObjToGDI(XlateObj, XLATE); + if (!XlateGDI) return; + if ((XlateObj->flXlate & XO_TABLE) && XlateObj->pulXlate != NULL) { diff --git a/reactos/subsystems/win32/win32k/include/gdiobj.h b/reactos/subsystems/win32/win32k/include/gdiobj.h index a31df8f2cbe..5843aceee83 100644 --- a/reactos/subsystems/win32/win32k/include/gdiobj.h +++ b/reactos/subsystems/win32/win32k/include/gdiobj.h @@ -21,7 +21,7 @@ typedef struct _GDI_HANDLE_TABLE FLONG flDeviceUniq; // Device settings uniqueness. PVOID pvLangPack; // Language Pack. CFONT cfPublic[GDI_CFONT_MAX]; // Public Fonts. - DWORD dwCsbSupported1; // OEM code-page bitfield. + DWORD dwCFCount; ////////////////////////////////////////////////////////////////////////////// PPAGED_LOOKASIDE_LIST LookasideLists; diff --git a/reactos/subsystems/win32/win32k/include/misc.h b/reactos/subsystems/win32/win32k/include/misc.h index 39d00cbd069..2007e8b9b95 100644 --- a/reactos/subsystems/win32/win32k/include/misc.h +++ b/reactos/subsystems/win32/win32k/include/misc.h @@ -31,6 +31,9 @@ #define W32PF_CREATEDWINORDC (0x04000000) +extern SHORT gusLanguageID; + +SHORT FASTCALL IntGdiGetLanguageID(); ULONG FASTCALL IntSystemParametersInfo(UINT uiAction, UINT uiParam, PVOID pvParam, UINT fWinIni); DWORD STDCALL IntGetQueueStatus(BOOL ClearChanges); VOID FASTCALL IntUserManualGuiCheck(LONG Check); diff --git a/reactos/subsystems/win32/win32k/include/text.h b/reactos/subsystems/win32/win32k/include/text.h index 1c9e7759912..e940eb2fab4 100644 --- a/reactos/subsystems/win32/win32k/include/text.h +++ b/reactos/subsystems/win32/win32k/include/text.h @@ -54,16 +54,23 @@ typedef struct _STRGDI ULONG acFaceNameGlyphs[8]; } STRGDI, *PSTRGDI; +#define TEXTOBJECT_INIT 0x00010000 + /* GDI logical font object */ typedef struct { /* Header for all gdi objects in the handle table. Do not (re)move this. */ BASEOBJECT BaseObject; - - ENUMLOGFONTEXDVW logfont; //LOGFONTW logfont; - FONTOBJ *Font; - BOOLEAN Initialized; /* Don't reinitialize for each DC */ + LFTYPE lft; + FLONG fl; + FONTOBJ *Font; + WCHAR FullName[LF_FULLFACESIZE]; + WCHAR Style[LF_FACESIZE]; + WCHAR FaceName[LF_FACESIZE]; + DWORD dwOffsetEndArray; +// Fixed: + ENUMLOGFONTEXDVW logfont; } TEXTOBJ, *PTEXTOBJ; /* Internal interface */ @@ -75,7 +82,8 @@ typedef struct #define TEXTOBJ_LockText(hBMObj) ((PTEXTOBJ) GDIOBJ_LockObj ((HGDIOBJ) hBMObj, GDI_OBJECT_TYPE_FONT)) #define TEXTOBJ_UnlockText(pBMObj) GDIOBJ_UnlockObjByPtr ((POBJ)pBMObj) -NTSTATUS FASTCALL TextIntRealizeFont(HFONT FontHandle); +PTEXTOBJ FASTCALL RealizeFontInit(HFONT); +NTSTATUS FASTCALL TextIntRealizeFont(HFONT,PTEXTOBJ); NTSTATUS FASTCALL TextIntCreateFontIndirect(CONST LPLOGFONTW lf, HFONT *NewFont); BOOL FASTCALL InitFontSupport(VOID); BOOL FASTCALL IntIsFontRenderingEnabled(VOID); @@ -84,6 +92,18 @@ VOID FASTCALL IntEnableFontRendering(BOOL Enable); INT FASTCALL FontGetObject(PTEXTOBJ TextObj, INT Count, PVOID Buffer); VOID FASTCALL IntLoadSystemFonts(VOID); INT FASTCALL IntGdiAddFontResource(PUNICODE_STRING FileName, DWORD Characteristics); +ULONG FASTCALL ftGdiGetGlyphOutline(PDC,WCHAR,UINT,LPGLYPHMETRICS,ULONG,PVOID,LPMAT2,BOOL); +INT FASTCALL IntGetOutlineTextMetrics(PFONTGDI,UINT,OUTLINETEXTMETRICW *); +BOOL FASTCALL ftGdiGetRasterizerCaps(LPRASTERIZER_STATUS); +BOOL FASTCALL TextIntGetTextExtentPoint(PDC,PTEXTOBJ,LPCWSTR,int,int,LPINT,LPINT,LPSIZE); +BOOL FASTCALL ftGdiGetTextMetricsW(HDC,PTMW_INTERNAL); +DWORD FASTCALL IntGetFontLanguageInfo(PDC); +INT FASTCALL ftGdiGetTextCharsetInfo(PDC,PFONTSIGNATURE,DWORD); +DWORD FASTCALL ftGetFontUnicodeRanges(PFONTGDI, PGLYPHSET); +DWORD FASTCALL ftGdiGetFontData(PFONTGDI,DWORD,DWORD,PVOID,DWORD); +BOOL FASTCALL IntGdiGetFontResourceInfo(PUNICODE_STRING,PVOID,DWORD*,DWORD); +BOOL FASTCALL ftGdiRealizationInfo(PFONTGDI,PREALIZATION_INFO); +DWORD FASTCALL ftGdiGetKerningPairs(PFONTGDI,DWORD,LPKERNINGPAIR); #define IntLockProcessPrivateFonts(W32Process) \ ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&W32Process->PrivateFontListLock) diff --git a/reactos/subsystems/win32/win32k/main/dllmain.c b/reactos/subsystems/win32/win32k/main/dllmain.c index 2a907a85ef7..3dcbdd7e7d0 100644 --- a/reactos/subsystems/win32/win32k/main/dllmain.c +++ b/reactos/subsystems/win32/win32k/main/dllmain.c @@ -42,6 +42,8 @@ PSERVERINFO gpsi = NULL; // Global User Server Information. HSEMAPHORE hsemDriverMgmt = NULL; +SHORT gusLanguageID; + extern ULONG_PTR Win32kSSDT[]; extern UCHAR Win32kSSPT[]; extern ULONG Win32kNumberOfSysCalls; @@ -420,6 +422,13 @@ DriverEntry ( if(!hsemDriverMgmt) hsemDriverMgmt = EngCreateSemaphore(); + GdiHandleTable = GDIOBJ_iAllocHandleTable(&GdiTableSection); + if (GdiHandleTable == NULL) + { + DPRINT1("Failed to initialize the GDI handle table.\n"); + return STATUS_UNSUCCESSFUL; + } + Status = InitUserImpl(); if (!NT_SUCCESS(Status)) { @@ -511,13 +520,6 @@ DriverEntry ( return(Status); } - GdiHandleTable = GDIOBJ_iAllocHandleTable(&GdiTableSection); - if (GdiHandleTable == NULL) - { - DPRINT1("Failed to initialize the GDI handle table.\n"); - return STATUS_UNSUCCESSFUL; - } - Status = InitDcImpl(); if (!NT_SUCCESS(Status)) { @@ -537,6 +539,8 @@ DriverEntry ( CreateStockObjects(); CreateSysColorObjects(); + gusLanguageID = IntGdiGetLanguageID(); + return STATUS_SUCCESS; } diff --git a/reactos/subsystems/win32/win32k/misc/driver.c b/reactos/subsystems/win32/win32k/misc/driver.c index 197142ab565..01c9c680301 100644 --- a/reactos/subsystems/win32/win32k/misc/driver.c +++ b/reactos/subsystems/win32/win32k/misc/driver.c @@ -41,12 +41,19 @@ typedef struct _GRAPHICS_DRIVER } GRAPHICS_DRIVER, *PGRAPHICS_DRIVER; static PGRAPHICS_DRIVER DriverList; -static PGRAPHICS_DRIVER GenericDriver = 0; +static PGRAPHICS_DRIVER GenericDriver = NULL; BOOL DRIVER_RegisterDriver(LPCWSTR Name, PGD_ENABLEDRIVER EnableDriver) { - PGRAPHICS_DRIVER Driver = ExAllocatePoolWithTag(PagedPool, sizeof(*Driver), TAG_DRIVER); + PGRAPHICS_DRIVER Driver; + DPRINT( "DRIVER_RegisterDriver( Name: %S )\n", Name ); + + if (GenericDriver != NULL) + { + return FALSE; + } + Driver = ExAllocatePoolWithTag(PagedPool, sizeof(*Driver), TAG_DRIVER); if (!Driver) return FALSE; Driver->ReferenceCount = 0; Driver->EnableDriver = EnableDriver; @@ -58,7 +65,7 @@ BOOL DRIVER_RegisterDriver(LPCWSTR Name, PGD_ENABLEDRIVER EnableDriver) if (Driver->Name == NULL) { DPRINT1("Out of memory\n"); - ExFreePool(Driver); + ExFreePoolWithTag(Driver, TAG_DRIVER); return FALSE; } @@ -68,12 +75,6 @@ BOOL DRIVER_RegisterDriver(LPCWSTR Name, PGD_ENABLEDRIVER EnableDriver) return TRUE; } - if (GenericDriver != NULL) - { - ExFreePool(Driver); - return FALSE; - } - GenericDriver = Driver; return TRUE; } @@ -156,7 +157,7 @@ PGD_ENABLEDRIVER DRIVER_FindDDIDriver(LPCWSTR Name) ExistingDriver = DRIVER_FindExistingDDIDriver(FullName); if (ExistingDriver) { - ExFreePool(FullName); + ExFreePoolWithTag(FullName, TAG_DRIVER); return ExistingDriver; } @@ -172,7 +173,7 @@ PGD_ENABLEDRIVER DRIVER_FindDDIDriver(LPCWSTR Name) DRIVER_RegisterDriver( L"DISPLAY", GdiDriverInfo.EntryPoint); DRIVER_RegisterDriver( FullName, GdiDriverInfo.EntryPoint); - ExFreePool(FullName); + ExFreePoolWithTag(FullName, TAG_DRIVER); return (PGD_ENABLEDRIVER)GdiDriverInfo.EntryPoint; } diff --git a/reactos/subsystems/win32/win32k/ntddraw/d3d.c b/reactos/subsystems/win32/win32k/ntddraw/d3d.c index 5ac35bc190e..769478d3a1a 100644 --- a/reactos/subsystems/win32/win32k/ntddraw/d3d.c +++ b/reactos/subsystems/win32/win32k/ntddraw/d3d.c @@ -123,11 +123,11 @@ NtGdiD3dContextCreate(HANDLE hDirectDrawLocal, if (pfnD3dContextCreate == NULL) { - DPRINT1("Warring no pfnD3dContextCreate"); + DPRINT1("Warning: no pfnD3dContextCreate"); return FALSE; } - DPRINT1("Calling on dxg.sys D3dContextCreate"); + DPRINT1("Calling dxg.sys D3dContextCreate"); return pfnD3dContextCreate(hDirectDrawLocal, hSurfColor, hSurfZ, pdcci); } @@ -158,11 +158,11 @@ NtGdiD3dContextDestroy(LPD3DNTHAL_CONTEXTDESTROYDATA pContextDestroyData) if ( pfnD3dContextDestroy == NULL) { - DPRINT1("Warring no pfnD3dContextDestroy"); + DPRINT1("Warning: no pfnD3dContextDestroy"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling on dxg.sys D3dContextDestroy"); + DPRINT1("Calling dxg.sys D3dContextDestroy"); return pfnD3dContextDestroy(pContextDestroyData); } @@ -196,11 +196,11 @@ NtGdiD3dContextDestroyAll(LPD3DNTHAL_CONTEXTDESTROYALLDATA pdcad) if (pfnD3dContextDestroyAll == NULL) { - DPRINT1("Warring no pfnD3dContextDestroyAll"); + DPRINT1("Warning: no pfnD3dContextDestroyAll"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling on dxg.sys D3dContextDestroyAll"); + DPRINT1("Calling dxg.sys D3dContextDestroyAll"); return pfnD3dContextDestroyAll(pdcad); } @@ -271,11 +271,11 @@ NtGdiDdCreateD3DBuffer(HANDLE hDirectDraw, if (pfnDdCreateD3DBuffer == NULL) { - DPRINT1("Warring no pfnDdCreateD3DBuffer"); + DPRINT1("Warning no pfnDdCreateD3DBuffer"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling on dxg.sys DdCreateD3DBuffer"); + DPRINT1("Calling dxg.sys DdCreateD3DBuffer"); return pfnDdCreateD3DBuffer(hDirectDraw, hSurface, puSurfaceDescription, puSurfaceGlobalData, puSurfaceLocalData, puSurfaceMoreData, @@ -293,11 +293,11 @@ NtGdiDdDestroyD3DBuffer(HANDLE hSurface) if (pfnDdDestroyD3DBuffer == NULL) { - DPRINT1("Warring no pfnDdDestroyD3DBuffer"); + DPRINT1("Warning no pfnDdDestroyD3DBuffer"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling on dxg.sys pfnDdDestroyD3DBuffer"); + DPRINT1("Calling dxg.sys pfnDdDestroyD3DBuffer"); return pfnDdDestroyD3DBuffer(hSurface); } @@ -318,11 +318,11 @@ NtGdiD3dDrawPrimitives2(HANDLE hCmdBuf, if (pfnD3dDrawPrimitives2 == NULL) { - DPRINT1("Warring no pfnD3dDrawPrimitives2"); + DPRINT1("Warning: no pfnD3dDrawPrimitives2"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling on dxg.sys D3dDrawPrimitives2"); + DPRINT1("Calling dxg.sys D3dDrawPrimitives2"); return pfnD3dDrawPrimitives2(hCmdBuf,hVBuf,pded,pfpVidMemCmd,pdwSizeCmd,pfpVidMemVtx,pdwSizeVtx); } @@ -339,11 +339,11 @@ NtGdiDdLockD3D(HANDLE hSurface, if (pfnDdLockD3D == NULL) { - DPRINT1("Warring no pfnDdLockD3D"); + DPRINT1("Warning: no pfnDdLockD3D"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling on dxg.sys pfnDdLockD3D"); + DPRINT1("Calling dxg.sys pfnDdLockD3D"); return pfnDdLockD3D(hSurface, puLockData); } @@ -358,11 +358,11 @@ NtGdiD3dValidateTextureStageState(LPD3DNTHAL_VALIDATETEXTURESTAGESTATEDATA pData if (pfnD3dValidateTextureStageState == NULL) { - DPRINT1("Warring no pfnD3dValidateTextureStageState"); + DPRINT1("Warning: no pfnD3dValidateTextureStageState"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling on dxg.sys D3dValidateTextureStageState"); + DPRINT1("Calling dxg.sys D3dValidateTextureStageState"); return pfnD3dValidateTextureStageState(pData); } @@ -378,11 +378,11 @@ NtGdiDdUnlockD3D(HANDLE hSurface, if (pfnDdUnlockD3D == NULL) { - DPRINT1("Warring no pfnDdUnlockD3D"); + DPRINT1("Warning: no pfnDdUnlockD3D"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling on dxg.sys pfnDdUnlockD3D"); + DPRINT1("Calling dxg.sys pfnDdUnlockD3D"); return pfnDdUnlockD3D(hSurface, puUnlockData); } diff --git a/reactos/subsystems/win32/win32k/ntddraw/dd.c b/reactos/subsystems/win32/win32k/ntddraw/dd.c index 2b6df794d0f..03940af895e 100644 --- a/reactos/subsystems/win32/win32k/ntddraw/dd.c +++ b/reactos/subsystems/win32/win32k/ntddraw/dd.c @@ -29,11 +29,11 @@ NtGdiDdCreateSurface(HANDLE hDirectDrawLocal, if (pfnDdCreateSurface == NULL) { - DPRINT1("Warring no pfnDdCreateSurface\n"); + DPRINT1("Warning: no pfnDdCreateSurface\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling on dxg.sys pfnDdCreateSurface\n"); + DPRINT1("Calling dxg.sys pfnDdCreateSurface\n"); return pfnDdCreateSurface(hDirectDrawLocal,hSurface,puSurfaceDescription,puSurfaceGlobalData, puSurfaceLocalData,puSurfaceMoreData,puCreateSurfaceData,puhSurface); } @@ -50,11 +50,11 @@ NtGdiDdWaitForVerticalBlank(HANDLE hDirectDraw, if (pfnDdWaitForVerticalBlank == NULL) { - DPRINT1("Warring no pfnDdWaitForVerticalBlank\n"); + DPRINT1("Warning: no pfnDdWaitForVerticalBlank\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling on dxg.sys pfnDdWaitForVerticalBlank\n"); + DPRINT1("Calling dxg.sys pfnDdWaitForVerticalBlank\n"); return pfnDdWaitForVerticalBlank(hDirectDraw, puWaitForVerticalBlankData); } @@ -70,11 +70,11 @@ NtGdiDdCanCreateSurface(HANDLE hDirectDrawLocal, if (pfnDdCanCreateSurface == NULL) { - DPRINT1("Warring no pfnDdCanCreateSurface\n"); + DPRINT1("Warning: no pfnDdCanCreateSurface\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling on dxg.sys DdCanCreateSurface\n"); + DPRINT1("Calling dxg.sys DdCanCreateSurface\n"); return pfnDdCanCreateSurface(hDirectDrawLocal,puCanCreateSurfaceData); } @@ -91,11 +91,11 @@ NtGdiDdGetScanLine(HANDLE hDirectDrawLocal, if (pfnDdGetScanLine == NULL) { - DPRINT1("Warring no pfnDdGetScanLine\n"); + DPRINT1("Warning: no pfnDdGetScanLine\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling on dxg.sys pfnDdGetScanLine\n"); + DPRINT1("Calling dxg.sys pfnDdGetScanLine\n"); return pfnDdGetScanLine(hDirectDrawLocal,puGetScanLineData); } @@ -119,11 +119,11 @@ NtGdiDdCreateSurfaceEx(HANDLE hDirectDraw, if (pfnDdCreateSurfaceEx == NULL) { - DPRINT1("Warring no pfnDdCreateSurfaceEx\n"); + DPRINT1("Warning: no pfnDdCreateSurfaceEx\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling on dxg.sys pfnDdCreateSurfaceEx\n"); + DPRINT1("Calling dxg.sys pfnDdCreateSurfaceEx\n"); return pfnDdCreateSurfaceEx(hDirectDraw,hSurface,dwSurfaceHandle); } diff --git a/reactos/subsystems/win32/win32k/ntddraw/ddraw.c b/reactos/subsystems/win32/win32k/ntddraw/ddraw.c index 69f14ee0c2b..788cbcb695d 100644 --- a/reactos/subsystems/win32/win32k/ntddraw/ddraw.c +++ b/reactos/subsystems/win32/win32k/ntddraw/ddraw.c @@ -94,7 +94,7 @@ intEnableReactXDriver(HDC hdc) } else { - DPRINT1(" The dxg.sys and graphic card driver interface is enable \n "); + DPRINT1(" The dxg.sys and graphic card driver interface is enabled \n "); success = TRUE; } } diff --git a/reactos/subsystems/win32/win32k/ntddraw/dvp.c b/reactos/subsystems/win32/win32k/ntddraw/dvp.c index 701423d3907..7d0e6c00784 100644 --- a/reactos/subsystems/win32/win32k/ntddraw/dvp.c +++ b/reactos/subsystems/win32/win32k/ntddraw/dvp.c @@ -24,11 +24,11 @@ NtGdiDvpCanCreateVideoPort(HANDLE hDirectDraw, if (pfnDvpCanCreateVideoPort == NULL) { - DPRINT1("Warring no pfnDvpCanCreateVideoPort"); + DPRINT1("Warning: no pfnDvpCanCreateVideoPort"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling on dxg.sys pfnDvpCanCreateVideoPort"); + DPRINT1("Calling dxg.sys pfnDvpCanCreateVideoPort"); return pfnDvpCanCreateVideoPort(hDirectDraw, puCanCreateVPortData); } @@ -44,11 +44,11 @@ NtGdiDvpColorControl(HANDLE hVideoPort, if (pfnDvpColorControl == NULL) { - DPRINT1("Warring no pfnDvpColorControl"); + DPRINT1("Warning: no pfnDvpColorControl"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling on dxg.sys pfnDvpColorControl"); + DPRINT1("Calling dxg.sys pfnDvpColorControl"); return pfnDvpColorControl(hVideoPort, puVPortColorData); } @@ -64,11 +64,11 @@ NtGdiDvpCreateVideoPort(HANDLE hDirectDraw, if (pfnDvpCreateVideoPort == NULL) { - DPRINT1("Warring no pfnDvpCreateVideoPort"); + DPRINT1("Warning: no pfnDvpCreateVideoPort"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling on dxg.sys pfnDvpCreateVideoPort"); + DPRINT1("Calling dxg.sys pfnDvpCreateVideoPort"); return pfnDvpCreateVideoPort(hDirectDraw, puCreateVPortData); } @@ -84,11 +84,11 @@ NtGdiDvpDestroyVideoPort(HANDLE hVideoPort, if (pfnDvpDestroyVideoPort == NULL) { - DPRINT1("Warring no pfnDvpDestroyVideoPort"); + DPRINT1("Warning: no pfnDvpDestroyVideoPort"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling on dxg.sys pfnDvpDestroyVideoPort"); + DPRINT1("Calling dxg.sys pfnDvpDestroyVideoPort"); return pfnDvpDestroyVideoPort(hVideoPort, puDestroyVPortData); } @@ -106,11 +106,11 @@ NtGdiDvpFlipVideoPort(HANDLE hVideoPort, if (pfnDvpFlipVideoPort == NULL) { - DPRINT1("Warring no pfnDvpFlipVideoPort"); + DPRINT1("Warning: no pfnDvpFlipVideoPort"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling on dxg.sys pfnDvpFlipVideoPort"); + DPRINT1("Calling dxg.sys pfnDvpFlipVideoPort"); return pfnDvpFlipVideoPort(hVideoPort, hDDSurfaceCurrent, hDDSurfaceTarget, puFlipVPortData); } @@ -127,11 +127,11 @@ NtGdiDvpGetVideoPortBandwidth(HANDLE hVideoPort, if (pfnDvpGetVideoPortBandwidth == NULL) { - DPRINT1("Warring no pfnDvpGetVideoPortBandwidth"); + DPRINT1("Warning: no pfnDvpGetVideoPortBandwidth"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling on dxg.sys pfnDvpGetVideoPortBandwidth"); + DPRINT1("Calling dxg.sys pfnDvpGetVideoPortBandwidth"); return pfnDvpGetVideoPortBandwidth(hVideoPort, puGetVPortBandwidthData); } @@ -148,11 +148,11 @@ NtGdiDvpGetVideoPortFlipStatus(HANDLE hDirectDraw, if (pfnDvpGetVideoPortFlipStatus == NULL) { - DPRINT1("Warring no pfnDvpGetVideoPortFlipStatus"); + DPRINT1("Warning: no pfnDvpGetVideoPortFlipStatus"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling on dxg.sys pfnDvpGetVideoPortFlipStatus"); + DPRINT1("Calling dxg.sys pfnDvpGetVideoPortFlipStatus"); return pfnDvpGetVideoPortFlipStatus(hDirectDraw, puGetVPortFlipStatusData); } @@ -169,11 +169,11 @@ NtGdiDvpGetVideoPortInputFormats(HANDLE hVideoPort, if (pfnDvpGetVideoPortInputFormats == NULL) { - DPRINT1("Warring no pfnDvpGetVideoPortInputFormats"); + DPRINT1("Warning: no pfnDvpGetVideoPortInputFormats"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling on dxg.sys pfnDvpGetVideoPortInputFormats"); + DPRINT1("Calling dxg.sys pfnDvpGetVideoPortInputFormats"); return pfnDvpGetVideoPortInputFormats(hVideoPort, puGetVPortInputFormatData); } @@ -190,11 +190,11 @@ NtGdiDvpGetVideoPortLine(HANDLE hVideoPort, if (pfnDvpGetVideoPortLine == NULL) { - DPRINT1("Warring no pfnDvpGetVideoPortLine"); + DPRINT1("Warning: no pfnDvpGetVideoPortLine"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling on dxg.sys pfnDvpGetVideoPortLine"); + DPRINT1("Calling dxg.sys pfnDvpGetVideoPortLine"); return pfnDvpGetVideoPortLine(hVideoPort, puGetVPortLineData); } @@ -211,11 +211,11 @@ NtGdiDvpGetVideoPortOutputFormats(HANDLE hVideoPort, if (pfnDvpGetVideoPortOutputFormats == NULL) { - DPRINT1("Warring no pfnDvpGetVideoPortOutputFormats"); + DPRINT1("Warning: no pfnDvpGetVideoPortOutputFormats"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling on dxg.sys pfnDvpGetVideoPortOutputFormats"); + DPRINT1("Calling dxg.sys pfnDvpGetVideoPortOutputFormats"); return pfnDvpGetVideoPortOutputFormats(hVideoPort, puGetVPortOutputFormatData); } @@ -233,11 +233,11 @@ NtGdiDvpGetVideoPortConnectInfo(HANDLE hDirectDraw, if (pfnDvpGetVideoPortConnectInfo == NULL) { - DPRINT1("Warring no pfnDvpGetVideoPortConnectInfo"); + DPRINT1("Warning: no pfnDvpGetVideoPortConnectInfo"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling on dxg.sys pfnDvpGetVideoPortConnectInfo"); + DPRINT1("Calling dxg.sys pfnDvpGetVideoPortConnectInfo"); return pfnDvpGetVideoPortConnectInfo(hDirectDraw, puGetVPortConnectData); } @@ -254,11 +254,11 @@ NtGdiDvpGetVideoSignalStatus(HANDLE hVideoPort, if (pfnDvpGetVideoSignalStatus == NULL) { - DPRINT1("Warring no pfnDvpGetVideoSignalStatus"); + DPRINT1("Warning: no pfnDvpGetVideoSignalStatus"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling on dxg.sys pfnDvpGetVideoSignalStatus"); + DPRINT1("Calling dxg.sys pfnDvpGetVideoSignalStatus"); return pfnDvpGetVideoSignalStatus(hVideoPort, puGetVPortSignalData); } @@ -278,11 +278,11 @@ NtGdiDvpUpdateVideoPort(HANDLE hVideoPort, if (pfnDvpUpdateVideoPort == NULL) { - DPRINT1("Warring no pfnDvpUpdateVideoPort"); + DPRINT1("Warning: no pfnDvpUpdateVideoPort"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling on dxg.sys pfnDvpUpdateVideoPort"); + DPRINT1("Calling dxg.sys pfnDvpUpdateVideoPort"); return pfnDvpUpdateVideoPort(hVideoPort, phSurfaceVideo, phSurfaceVbi, puUpdateVPortData); } @@ -300,11 +300,11 @@ NtGdiDvpWaitForVideoPortSync(HANDLE hVideoPort, if (pfnDvpWaitForVideoPortSync == NULL) { - DPRINT1("Warring no pfnDvpWaitForVideoPortSync"); + DPRINT1("Warning: no pfnDvpWaitForVideoPortSync"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling on dxg.sys pfnDvpWaitForVideoPortSync"); + DPRINT1("Calling dxg.sys pfnDvpWaitForVideoPortSync"); return pfnDvpWaitForVideoPortSync(hVideoPort, puWaitForVPortSyncData); } @@ -322,11 +322,11 @@ NtGdiDvpAcquireNotification(HANDLE hVideoPort, if (pfnDvpAcquireNotification == NULL) { - DPRINT1("Warring no pfnDvpAcquireNotification"); + DPRINT1("Warning: no pfnDvpAcquireNotification"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling on dxg.sys pfnDvpAcquireNotification"); + DPRINT1("Calling dxg.sys pfnDvpAcquireNotification"); return pfnDvpAcquireNotification(hVideoPort, hEvent, pNotify); } @@ -343,11 +343,11 @@ NtGdiDvpReleaseNotification(HANDLE hVideoPort, if (pfnDvpReleaseNotification == NULL) { - DPRINT1("Warring no pfnDvpReleaseNotification"); + DPRINT1("Warning: no pfnDvpReleaseNotification"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling on dxg.sys pfnDvpReleaseNotification"); + DPRINT1("Calling dxg.sys pfnDvpReleaseNotification"); return pfnDvpReleaseNotification(hVideoPort, hEvent); } @@ -365,11 +365,11 @@ NtGdiDvpGetVideoPortField(HANDLE hVideoPort, if (pfnDvpGetVideoPortField == NULL) { - DPRINT1("Warring no pfnDvpGetVideoPortField"); + DPRINT1("Warning: no pfnDvpGetVideoPortField"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling on dxg.sys pfnDvpGetVideoPortField"); + DPRINT1("Calling dxg.sys pfnDvpGetVideoPortField"); return pfnDvpGetVideoPortField(hVideoPort, puGetVPortFieldData); } diff --git a/reactos/subsystems/win32/win32k/ntddraw/mocomp.c b/reactos/subsystems/win32/win32k/ntddraw/mocomp.c index 92fe0d46d28..156ef8574b6 100644 --- a/reactos/subsystems/win32/win32k/ntddraw/mocomp.c +++ b/reactos/subsystems/win32/win32k/ntddraw/mocomp.c @@ -24,11 +24,11 @@ NtGdiDdBeginMoCompFrame(HANDLE hMoComp, if (pfnDdBeginMoCompFrame == NULL) { - DPRINT1("Warring no pfnDdBeginMoCompFrame"); + DPRINT1("Warning: no pfnDdBeginMoCompFrame"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling on dxg.sys DdBeginMoCompFrame"); + DPRINT1("Calling dxg.sys DdBeginMoCompFrame"); return pfnDdBeginMoCompFrame(hMoComp,puBeginFrameData); } @@ -43,11 +43,11 @@ NtGdiDdCreateMoComp(HANDLE hDirectDraw, PDD_CREATEMOCOMPDATA puCreateMoCompData) if (pfnDdCreateMoComp == NULL) { - DPRINT1("Warring no pfnDdCreateMoComp"); + DPRINT1("Warning: no pfnDdCreateMoComp"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling on dxg.sys DdCreateMoComp"); + DPRINT1("Calling dxg.sys DdCreateMoComp"); return pfnDdCreateMoComp(hDirectDraw, puCreateMoCompData); } @@ -63,11 +63,11 @@ NtGdiDdDestroyMoComp(HANDLE hMoComp, if (pfnDxDdDestroyMoComp == NULL) { - DPRINT1("Warring no pfnDxDdDestroyMoComp"); + DPRINT1("Warning: no pfnDxDdDestroyMoComp"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling on dxg.sys DxDdDestroyMoComp"); + DPRINT1("Calling dxg.sys DxDdDestroyMoComp"); return pfnDxDdDestroyMoComp(hMoComp, puBeginFrameData); } @@ -83,11 +83,11 @@ NtGdiDdEndMoCompFrame(HANDLE hMoComp, if (pfnDdEndMoCompFrame == NULL) { - DPRINT1("Warring no pfnDdEndMoCompFrame"); + DPRINT1("Warning: no pfnDdEndMoCompFrame"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling on dxg.sys pfnDdEndMoCompFrame"); + DPRINT1("Calling dxg.sys pfnDdEndMoCompFrame"); return pfnDdEndMoCompFrame(hMoComp, puEndFrameData); } @@ -103,11 +103,11 @@ NtGdiDdGetInternalMoCompInfo(HANDLE hDirectDraw, if (pfnDdGetInternalMoCompInfo == NULL) { - DPRINT1("Warring no pfnDdGetInternalMoCompInfo"); + DPRINT1("Warning: no pfnDdGetInternalMoCompInfo"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling on dxg.sys pfnDdGetInternalMoCompInfo"); + DPRINT1("Calling dxg.sys pfnDdGetInternalMoCompInfo"); return pfnDdGetInternalMoCompInfo(hDirectDraw, puGetInternalData); } @@ -124,11 +124,11 @@ NtGdiDdGetMoCompBuffInfo(HANDLE hDirectDraw, if (pfnDdGetMoCompBuffInfo == NULL) { - DPRINT1("Warring no pfnDdGetMoCompBuffInfo"); + DPRINT1("Warning: no pfnDdGetMoCompBuffInfo"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling on dxg.sys pfnDdGetMoCompBuffInfo"); + DPRINT1("Calling dxg.sys pfnDdGetMoCompBuffInfo"); return pfnDdGetMoCompBuffInfo(hDirectDraw, puGetBuffData); } @@ -144,11 +144,11 @@ NtGdiDdGetMoCompFormats(HANDLE hDirectDraw, if (pfnDdGetMoCompFormats == NULL) { - DPRINT1("Warring no pfnDdGetMoCompFormats"); + DPRINT1("Warning: no pfnDdGetMoCompFormats"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling on dxg.sys pfnDdGetMoCompFormats"); + DPRINT1("Calling dxg.sys pfnDdGetMoCompFormats"); return pfnDdGetMoCompFormats(hDirectDraw, puGetMoCompFormatsData); } @@ -165,11 +165,11 @@ NtGdiDdGetMoCompGuids(HANDLE hDirectDraw, if (pfnDdGetMoCompGuids == NULL) { - DPRINT1("Warring no pfnDdGetMoCompGuids"); + DPRINT1("Warning: no pfnDdGetMoCompGuids"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling on dxg.sys pfnDdGetMoCompGuids"); + DPRINT1("Calling dxg.sys pfnDdGetMoCompGuids"); return pfnDdGetMoCompGuids(hDirectDraw, puGetMoCompGuidsData); } @@ -187,11 +187,11 @@ NtGdiDdQueryMoCompStatus(HANDLE hMoComp, if (pfnDdQueryMoCompStatus == NULL) { - DPRINT1("Warring no pfnDdQueryMoCompStatus"); + DPRINT1("Warning: no pfnDdQueryMoCompStatus"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling on dxg.sys pfnDdQueryMoCompStatus"); + DPRINT1("Calling dxg.sys pfnDdQueryMoCompStatus"); return pfnDdQueryMoCompStatus(hMoComp, puQueryMoCompStatusData); } @@ -208,11 +208,11 @@ NtGdiDdRenderMoComp(HANDLE hMoComp, if (pfnDdRenderMoComp == NULL) { - DPRINT1("Warring no pfnDdRenderMoComp"); + DPRINT1("Warning: no pfnDdRenderMoComp"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling on dxg.sys pfnDdRenderMoComp"); + DPRINT1("Calling dxg.sys pfnDdRenderMoComp"); return pfnDdRenderMoComp(hMoComp, puRenderMoCompData); } diff --git a/reactos/subsystems/win32/win32k/ntuser/accelerator.c b/reactos/subsystems/win32/win32k/ntuser/accelerator.c index 9fcb1ac7fda..dd1b99d0443 100644 --- a/reactos/subsystems/win32/win32k/ntuser/accelerator.c +++ b/reactos/subsystems/win32/win32k/ntuser/accelerator.c @@ -371,7 +371,7 @@ NtUserCreateAcceleratorTable( Status = MmCopyFromCaller(Accel->Table, Entries, EntriesCount * sizeof(ACCEL)); if (!NT_SUCCESS(Status)) { - ExFreePool(Accel->Table); + ExFreePoolWithTag(Accel->Table, TAG_ACCEL); UserDereferenceObject(Accel); UserDeleteObject(hAccel, otAccel); SetLastNtError(Status); diff --git a/reactos/subsystems/win32/win32k/ntuser/callback.c b/reactos/subsystems/win32/win32k/ntuser/callback.c index b47599cb18a..39051c3d0f7 100644 --- a/reactos/subsystems/win32/win32k/ntuser/callback.c +++ b/reactos/subsystems/win32/win32k/ntuser/callback.c @@ -86,7 +86,7 @@ IntCbFreeMemory(PVOID Data) RemoveEntryList(&Mem->ListEntry); /* free memory */ - ExFreePool(Mem); + ExFreePoolWithTag(Mem, TAG_CALLBACK); } VOID FASTCALL diff --git a/reactos/subsystems/win32/win32k/ntuser/caret.c b/reactos/subsystems/win32/win32k/ntuser/caret.c index 23eb04f85c7..05aa0e88b0d 100644 --- a/reactos/subsystems/win32/win32k/ntuser/caret.c +++ b/reactos/subsystems/win32/win32k/ntuser/caret.c @@ -123,7 +123,7 @@ IntQueryCaretBlinkRate(VOID) if(!NT_SUCCESS(Status) || (KeyValuePartialInfo->Type != REG_SZ)) { NtClose(KeyHandle); - ExFreePool(KeyValuePartialInfo); + ExFreePoolWithTag(KeyValuePartialInfo, TAG_STRING); return 0; } @@ -137,7 +137,7 @@ IntQueryCaretBlinkRate(VOID) Val = 0; } - ExFreePool(KeyValuePartialInfo); + ExFreePoolWithTag(KeyValuePartialInfo, TAG_STRING); NtClose(KeyHandle); return (UINT)Val; diff --git a/reactos/subsystems/win32/win32k/ntuser/event.c b/reactos/subsystems/win32/win32k/ntuser/event.c index 20a9b975f48..bfad44ebf26 100644 --- a/reactos/subsystems/win32/win32k/ntuser/event.c +++ b/reactos/subsystems/win32/win32k/ntuser/event.c @@ -263,6 +263,11 @@ NtUserSetWinEventHook( if ( !GlobalEvents ) { GlobalEvents = ExAllocatePoolWithTag(PagedPool, sizeof(EVENTTABLE), TAG_HOOK); + if (GlobalEvents == NULL) + { + SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); + goto SetEventExit; + } GlobalEvents->Counts = 0; InitializeListHead(&GlobalEvents->Events); } @@ -348,7 +353,7 @@ NtUserSetWinEventHook( if (! NT_SUCCESS(Status)) { - ExFreePool(pEH->ModuleName.Buffer); + ExFreePoolWithTag(pEH->ModuleName.Buffer, TAG_HOOK); UserDereferenceObject(pEH); IntRemoveEvent(pEH); SetLastNtError(Status); diff --git a/reactos/subsystems/win32/win32k/ntuser/hook.c b/reactos/subsystems/win32/win32k/ntuser/hook.c index 9a7c6070446..e0631620a95 100644 --- a/reactos/subsystems/win32/win32k/ntuser/hook.c +++ b/reactos/subsystems/win32/win32k/ntuser/hook.c @@ -553,7 +553,7 @@ IntCallDebugHook( if (HooklParam) Debug.lParam = (LPARAM)HooklParam; lResult = co_HOOK_CallHookNext(Hook, Code, wParam, (LPARAM)&Debug); - if (HooklParam) ExFreePool(HooklParam); + if (HooklParam) ExFreePoolWithTag(HooklParam, TAG_HOOK); return lResult; } @@ -1131,7 +1131,7 @@ NtUserSetWindowsHookEx( ModuleName.MaximumLength); if (! NT_SUCCESS(Status)) { - ExFreePool(Hook->ModuleName.Buffer); + ExFreePoolWithTag(Hook->ModuleName.Buffer, TAG_HOOK); UserDereferenceObject(Hook); IntRemoveHook(Hook, WinStaObj, FALSE); if (NULL != Thread) diff --git a/reactos/subsystems/win32/win32k/ntuser/input.c b/reactos/subsystems/win32/win32k/ntuser/input.c index 1d2163ca2b9..e13ddf4213c 100644 --- a/reactos/subsystems/win32/win32k/ntuser/input.c +++ b/reactos/subsystems/win32/win32k/ntuser/input.c @@ -366,7 +366,7 @@ IntKeyboardGetIndicatorTrans(HANDLE KeyboardDeviceHandle, if (Status != STATUS_BUFFER_TOO_SMALL) break; - ExFreePool(Ret); + ExFreePoolWithTag(Ret, TAG_KEYBOARD); Size += sizeof(KEYBOARD_INDICATOR_TRANSLATION); @@ -380,7 +380,7 @@ IntKeyboardGetIndicatorTrans(HANDLE KeyboardDeviceHandle, if (Status != STATUS_SUCCESS) { - ExFreePool(Ret); + ExFreePoolWithTag(Ret, TAG_KEYBOARD); return Status; } diff --git a/reactos/subsystems/win32/win32k/ntuser/keyboard.c b/reactos/subsystems/win32/win32k/ntuser/keyboard.c index 1e1bad40df1..66849968fff 100644 --- a/reactos/subsystems/win32/win32k/ntuser/keyboard.c +++ b/reactos/subsystems/win32/win32k/ntuser/keyboard.c @@ -737,7 +737,7 @@ NtUserToUnicodeEx( pti ? pti->KeyboardLayout->KBTables : 0 ); MmCopyToCaller(pwszBuff,OutPwszBuff,sizeof(WCHAR)*cchBuff); - ExFreePool(OutPwszBuff); + ExFreePoolWithTag(OutPwszBuff, TAG_STRING); } else ret = 0; diff --git a/reactos/subsystems/win32/win32k/ntuser/menu.c b/reactos/subsystems/win32/win32k/ntuser/menu.c index 6c902ef8a33..b10e5c6b170 100644 --- a/reactos/subsystems/win32/win32k/ntuser/menu.c +++ b/reactos/subsystems/win32/win32k/ntuser/menu.c @@ -387,7 +387,7 @@ IntCloneMenuItems(PMENU_OBJECT Destination, PMENU_OBJECT Source) NewMenuItem->Text.Buffer = (PWSTR)ExAllocatePoolWithTag(PagedPool, MenuItem->Text.MaximumLength, TAG_STRING); if(!NewMenuItem->Text.Buffer) { - ExFreePool(NewMenuItem); + ExFreePoolWithTag(NewMenuItem, TAG_MENUITEM); break; } RtlCopyUnicodeString(&NewMenuItem->Text, &MenuItem->Text); @@ -938,7 +938,7 @@ IntInsertMenuItem(PMENU_OBJECT MenuObject, UINT uItem, BOOL fByPosition, if(!IntSetMenuItemInfo(SubMenu, MenuItem, ItemInfo)) { - ExFreePool(MenuItem); + ExFreePoolWithTag(MenuItem, TAG_MENUITEM); return FALSE; } diff --git a/reactos/subsystems/win32/win32k/ntuser/message.c b/reactos/subsystems/win32/win32k/ntuser/message.c index befedc2e1a3..bcff2791512 100644 --- a/reactos/subsystems/win32/win32k/ntuser/message.c +++ b/reactos/subsystems/win32/win32k/ntuser/message.c @@ -1235,7 +1235,7 @@ CopyMsgToKernelMem(MSG *KernelModeMsg, MSG *UserModeMsg, PMSGMEMORY MsgMemoryEnt if (! NT_SUCCESS(Status)) { DPRINT1("Failed to copy message to kernel: invalid usermode buffer\n"); - ExFreePool(KernelMem); + ExFreePoolWithTag(KernelMem, TAG_MSG); return Status; } } diff --git a/reactos/subsystems/win32/win32k/ntuser/misc.c b/reactos/subsystems/win32/win32k/ntuser/misc.c index 6a6a833a969..107fb0e29c4 100644 --- a/reactos/subsystems/win32/win32k/ntuser/misc.c +++ b/reactos/subsystems/win32/win32k/ntuser/misc.c @@ -14,6 +14,52 @@ #include +SHORT +FASTCALL +IntGdiGetLanguageID() +{ + HANDLE KeyHandle; + ULONG Size = sizeof(WCHAR) * (MAX_PATH + 12); + OBJECT_ATTRIBUTES ObAttr; +// http://support.microsoft.com/kb/324097 + ULONG Ret = 0x409; // English + PVOID KeyInfo; + UNICODE_STRING Language; + + RtlInitUnicodeString( &Language, + L"\\Registry\\Machine\\System\\CurrentControlSet\\Control\\Nls\\Language"); + + InitializeObjectAttributes( &ObAttr, + &Language, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + if ( NT_SUCCESS(ZwOpenKey(&KeyHandle, KEY_READ, &ObAttr))) + { + KeyInfo = ExAllocatePoolWithTag(PagedPool, Size, TAG_STRING); + if ( KeyInfo ) + { + RtlInitUnicodeString(&Language, L"Default"); + + if ( NT_SUCCESS(ZwQueryValueKey( KeyHandle, + &Language, + KeyValuePartialInformation, + KeyInfo, + Size, + &Size)) ) + { + RtlInitUnicodeString(&Language, (PVOID)((char *)KeyInfo + 12)); + RtlUnicodeStringToInteger(&Language, 16, &Ret); + } + ExFreePoolWithTag(KeyInfo, TAG_STRING); + } + ZwClose(KeyHandle); + } + DPRINT1("Language ID = %x\n",Ret); + return (SHORT) Ret; +} + /* * @unimplemented */ @@ -298,7 +344,7 @@ IntSafeCopyUnicodeString(PUNICODE_STRING Dest, Status = MmCopyFromCaller(Dest->Buffer, Src, Dest->Length); if(!NT_SUCCESS(Status)) { - ExFreePool(Dest->Buffer); + ExFreePoolWithTag(Dest->Buffer, TAG_STRING); Dest->Buffer = NULL; return Status; } @@ -345,7 +391,7 @@ IntSafeCopyUnicodeStringTerminateNULL(PUNICODE_STRING Dest, Status = MmCopyFromCaller(Dest->Buffer, Src, Dest->Length); if(!NT_SUCCESS(Status)) { - ExFreePool(Dest->Buffer); + ExFreePoolWithTag(Dest->Buffer, TAG_STRING); Dest->Buffer = NULL; return Status; } diff --git a/reactos/subsystems/win32/win32k/ntuser/msgqueue.c b/reactos/subsystems/win32/win32k/ntuser/msgqueue.c index 1b3b5778a60..f79c19315fe 100644 --- a/reactos/subsystems/win32/win32k/ntuser/msgqueue.c +++ b/reactos/subsystems/win32/win32k/ntuser/msgqueue.c @@ -16,12 +16,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * PURPOSE: Message queues - * FILE: subsys/win32k/ntuser/msgqueue.c + * FILE: subsystems/win32/win32k/ntuser/msgqueue.c * PROGRAMER: Casper S. Hornstrup (chorns@users.sourceforge.net) * REVISION HISTORY: * 06-06-2001 CSH Created diff --git a/reactos/subsystems/win32/win32k/ntuser/ntstubs.c b/reactos/subsystems/win32/win32k/ntuser/ntstubs.c index 50d84e36e12..46186618473 100644 --- a/reactos/subsystems/win32/win32k/ntuser/ntstubs.c +++ b/reactos/subsystems/win32/win32k/ntuser/ntstubs.c @@ -805,15 +805,42 @@ NtUserHardErrorControl( return 0; } -DWORD +/* + Called from win32csr. + */ +NTSTATUS NTAPI NtUserInitialize( - DWORD dwUnknown1, - DWORD dwUnknown2, - DWORD dwUnknown3) + DWORD dwWinVersion, + HANDLE hPowerRequestEvent, + HANDLE hMediaRequestEvent) { + UserEnterExclusive(); UNIMPLEMENTED; - return 0; +// Check to see we have the right version. +// Initialize Power Request List. +// Initialize Media Change. +// Initialize CSRSS +// { +// Startup DxGraphics. +// calls ** IntGdiGetLanguageID() and sets it **. +// Enables Fonts drivers, Initialize Font table & Stock Fonts. +// } +// Set W32PF_Flags |= (W32PF_READSCREENACCESSGRANTED | W32PF_IOWINSTA) +// Create Object Directory,,, Looks like create workstation. "\\Windows\\WindowStations" +// Create Event for Diconnect Desktop. +// Initialize Video. +// { +// DrvInitConsole. +// DrvChangeDisplaySettings. +// Update Shared Device Caps. +// Initialize User Screen. +// } +// Create ThreadInfo for this Thread! +// Set Global SERVERINFO Error flags. +// Load Resources. + UserLeave(); + return STATUS_SUCCESS; } DWORD diff --git a/reactos/subsystems/win32/win32k/ntuser/sysparams.c b/reactos/subsystems/win32/win32k/ntuser/sysparams.c index cc32ad5e40f..f067761fc7f 100644 --- a/reactos/subsystems/win32/win32k/ntuser/sysparams.c +++ b/reactos/subsystems/win32/win32k/ntuser/sysparams.c @@ -383,7 +383,7 @@ IntSystemParametersInfo( if(!NT_SUCCESS(Status) || (KeyValuePartialInfo->Type != REG_SZ)) { ZwClose(KeyHandle); - ExFreePool(KeyValuePartialInfo); + ExFreePoolWithTag(KeyValuePartialInfo, TAG_STRING); return FALSE; } @@ -396,7 +396,7 @@ IntSystemParametersInfo( { TileNum = 0; } - ExFreePool(KeyValuePartialInfo); + ExFreePoolWithTag(KeyValuePartialInfo, TAG_STRING); /* start over again and look for the style*/ ResLength = 0; @@ -418,7 +418,7 @@ IntSystemParametersInfo( if(!NT_SUCCESS(Status) || (KeyValuePartialInfo->Type != REG_SZ)) { ZwClose(KeyHandle); - ExFreePool(KeyValuePartialInfo); + ExFreePoolWithTag(KeyValuePartialInfo, TAG_STRING); return FALSE; } @@ -431,7 +431,7 @@ IntSystemParametersInfo( { StyleNum = 0; } - ExFreePool(KeyValuePartialInfo); + ExFreePoolWithTag(KeyValuePartialInfo, TAG_STRING); /* Check the values we found in the registry */ if(TileNum && !StyleNum) diff --git a/reactos/subsystems/win32/win32k/ntuser/window.c b/reactos/subsystems/win32/win32k/ntuser/window.c index 2fc3504d2f3..e6cfadba72b 100644 --- a/reactos/subsystems/win32/win32k/ntuser/window.c +++ b/reactos/subsystems/win32/win32k/ntuser/window.c @@ -3882,8 +3882,8 @@ CLEANUP: /* * @unimplemented */ -DWORD STDCALL -NtUserLockWindowUpdate(DWORD Unknown0) +BOOL STDCALL +NtUserLockWindowUpdate(HWND hWnd) { UNIMPLEMENTED diff --git a/reactos/subsystems/win32/win32k/ntuser/winsta.c b/reactos/subsystems/win32/win32k/ntuser/winsta.c index 781c2e41fb1..816f4527907 100644 --- a/reactos/subsystems/win32/win32k/ntuser/winsta.c +++ b/reactos/subsystems/win32/win32k/ntuser/winsta.c @@ -1259,7 +1259,7 @@ BuildWindowStationNameList( FALSE, &Context, NULL)) { /* Something went wrong, maybe someone added a directory entry? Just give up. */ - ExFreePool(Buffer); + ExFreePoolWithTag(Buffer, TAG_WINSTA); ObDereferenceObject(DirectoryHandle); return NT_SUCCESS(Status) ? STATUS_INTERNAL_ERROR : Status; } @@ -1287,7 +1287,7 @@ BuildWindowStationNameList( { if (Buffer != InitialBuffer) { - ExFreePool(Buffer); + ExFreePoolWithTag(Buffer, TAG_WINSTA); } return STATUS_BUFFER_TOO_SMALL; } @@ -1300,7 +1300,7 @@ BuildWindowStationNameList( { if (Buffer != InitialBuffer) { - ExFreePool(Buffer); + ExFreePoolWithTag(Buffer, TAG_WINSTA); } return STATUS_BUFFER_TOO_SMALL; } diff --git a/reactos/subsystems/win32/win32k/objects/bitblt.c b/reactos/subsystems/win32/win32k/objects/bitblt.c index b57beb755b9..f0598e131bc 100644 --- a/reactos/subsystems/win32/win32k/objects/bitblt.c +++ b/reactos/subsystems/win32/win32k/objects/bitblt.c @@ -1143,7 +1143,7 @@ NtGdiPolyPatBlt( if (!NT_SUCCESS(Status)) { - ExFreePool(rb); + ExFreePoolWithTag(rb, TAG_PATBLT); SetLastNtError(Status); return FALSE; } @@ -1152,7 +1152,7 @@ NtGdiPolyPatBlt( Ret = IntGdiPolyPatBlt(hDC, dwRop, rb, cRects, Mode); if (cRects > 0) - ExFreePool(rb); + ExFreePoolWithTag(rb, TAG_PATBLT); return Ret; } diff --git a/reactos/subsystems/win32/win32k/objects/bitmaps.c b/reactos/subsystems/win32/win32k/objects/bitmaps.c index f7d9b2c2b33..7c676fe0830 100644 --- a/reactos/subsystems/win32/win32k/objects/bitmaps.c +++ b/reactos/subsystems/win32/win32k/objects/bitmaps.c @@ -704,7 +704,7 @@ BITMAPOBJ_CopyBitmap(HBITMAP hBitmap) } IntGetBitmapBits (Bitmap, bm.bmWidthBytes * abs(bm.bmHeight), buf); IntSetBitmapBits (resBitmap, bm.bmWidthBytes * abs(bm.bmHeight), buf); - ExFreePool (buf); + ExFreePoolWithTag (buf,TAG_BITMAP); resBitmap->flFlags = Bitmap->flFlags; GDIOBJ_UnlockObjByPtr((POBJ)resBitmap); } diff --git a/reactos/subsystems/win32/win32k/objects/brush.c b/reactos/subsystems/win32/win32k/objects/brush.c index 08e4a099908..8455a329c31 100644 --- a/reactos/subsystems/win32/win32k/objects/brush.c +++ b/reactos/subsystems/win32/win32k/objects/brush.c @@ -62,12 +62,12 @@ BRUSH_GetObject (PGDIBRUSHOBJ BrushObject, INT Count, LPLOGBRUSH Buffer) if (Count == 0) return 0; /* Set colour */ - Buffer->lbColor = BrushObject->BrushAttr.lbColor; + Buffer->lbColor = BrushObject->BrushAttr.lbColor; /* set Hatch */ if ((BrushObject->flAttrs & GDIBRUSH_IS_HATCH)!=0) { - /* FIXME : is this right value */ + /* FIXME : this is not the right value */ Buffer->lbHatch = (LONG)BrushObject->hbmPattern; } else @@ -153,7 +153,7 @@ IntGdiCreateBrushXlate(PDC Dc, GDIBRUSHOBJ *BrushObj, BOOLEAN *Failed) if (!Dc_Attr) Dc_Attr = &Dc->Dc_Attr; if (Dc->w.bitsPerPixel != 1) - Result = IntEngCreateSrcMonoXlate(hPalette, Dc_Attr->crForegroundClr, Dc_Attr->crBackgroundClr); + Result = IntEngCreateSrcMonoXlate(hPalette, BrushObj->BrushAttr.lbColor, Dc_Attr->crBackgroundClr); } else if (BrushObj->flAttrs & GDIBRUSH_IS_DIB) { diff --git a/reactos/subsystems/win32/win32k/objects/color.c b/reactos/subsystems/win32/win32k/objects/color.c index 680047985b2..7ab65c5844b 100644 --- a/reactos/subsystems/win32/win32k/objects/color.c +++ b/reactos/subsystems/win32/win32k/objects/color.c @@ -685,52 +685,27 @@ NtGdiSetSystemPaletteUse(HDC hDC, UINT Usage) return old; } -/* - Win 2k Graphics API, Black Book. by coriolis.com - Page 62, Note that Steps 3, 5, and 6 are not required for Windows NT(tm) - and Windows 2000(tm). - - Step 5. UnrealizeObject(hTrackBrush); - */ -BOOL STDCALL +BOOL +STDCALL NtGdiUnrealizeObject(HGDIOBJ hgdiobj) { - - POBJ pObject; - DWORD objectType; BOOL Ret = FALSE; + PPALGDI palGDI; - /* From Wine: UnrealizeObject does not SetLastError() on a null object */ - if(!hgdiobj) - return Ret; - - pObject = GDIOBJ_LockObj(hgdiobj, GDI_OBJECT_TYPE_DONTCARE); - if (pObject == NULL) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); + if ( !hgdiobj || + ((UINT)hgdiobj & GDI_HANDLE_STOCK_MASK) || + !GDI_HANDLE_IS_TYPE(hgdiobj, GDI_OBJECT_TYPE_PALETTE) ) return Ret; - } - objectType = GDIOBJ_GetObjectType(hgdiobj); - switch(objectType) - { -/* - msdn.microsoft.com, - "Windows 2000/XP: If hgdiobj is a brush, UnrealizeObject does nothing, - and the function returns TRUE. Use SetBrushOrgEx to set the origin of - a brush." - */ - case GDI_OBJECT_TYPE_BRUSH: - { - DPRINT("GDI_OBJECT_TYPE_BRUSH\n"); - Ret = TRUE; - break; - } - default: - DPRINT1("Magic 0x%08x not implemented\n", objectType); - break; - } - GDIOBJ_UnlockObjByPtr(pObject); + palGDI = PALETTE_LockPalette(hgdiobj); + if (!palGDI) return FALSE; + + // FIXME!! + // Need to do something!!! + // Zero out Current and Old Translated pointers? + // + Ret = TRUE; + PALETTE_UnlockPalette(palGDI); return Ret; } diff --git a/reactos/subsystems/win32/win32k/objects/coord.c b/reactos/subsystems/win32/win32k/objects/coord.c index cf7ed1e9e83..ce0b9360a9e 100644 --- a/reactos/subsystems/win32/win32k/objects/coord.c +++ b/reactos/subsystems/win32/win32k/objects/coord.c @@ -285,7 +285,7 @@ NtGdiTransformPoints( HDC hDC, if(!NT_SUCCESS(Status)) { DC_UnlockDc(dc); - ExFreePool(Points); + ExFreePoolWithTag(Points, TAG_COORD); SetLastNtError(Status); return FALSE; } @@ -302,7 +302,7 @@ NtGdiTransformPoints( HDC hDC, default: { DC_UnlockDc(dc); - ExFreePool(Points); + ExFreePoolWithTag(Points, TAG_COORD); SetLastWin32Error(ERROR_INVALID_PARAMETER); return FALSE; } @@ -324,7 +324,7 @@ NtGdiTransformPoints( HDC hDC, if(!NT_SUCCESS(Status)) { DC_UnlockDc(dc); - ExFreePool(Points); + ExFreePoolWithTag(Points, TAG_COORD); SetLastNtError(Status); return FALSE; } @@ -332,7 +332,7 @@ NtGdiTransformPoints( HDC hDC, // If we are getting called that means User XForms is a mess! // DC_UnlockDc(dc); - ExFreePool(Points); + ExFreePoolWithTag(Points, TAG_COORD); return TRUE; } diff --git a/reactos/subsystems/win32/win32k/objects/dc.c b/reactos/subsystems/win32/win32k/objects/dc.c index 81096bd59a3..c0ecbfb4161 100644 --- a/reactos/subsystems/win32/win32k/objects/dc.c +++ b/reactos/subsystems/win32/win32k/objects/dc.c @@ -144,6 +144,7 @@ NtGdiCreateCompatibleDC(HDC hDC) if (oDc_Attr->dwLayout & LAYOUT_ORIENTATIONMASK) Layout = oDc_Attr->dwLayout; NewDC->DcLevel.flPath = OrigDC->DcLevel.flPath; nDc_Attr->ulDirty_ = oDc_Attr->ulDirty_; + nDc_Attr->iCS_CP = oDc_Attr->iCS_CP; DC_UnlockDc(NewDC); DC_UnlockDc(OrigDC); @@ -848,6 +849,8 @@ IntGdiCreateDC(PUNICODE_STRING Driver, NewDC->erclWindow.bottom = ((PGDIDEVICE)NewDC->pPDev)->GDIInfo.ulVertRes; NewDC->DcLevel.flPath &= ~DCPATH_CLOCKWISE; // Default is CCW. + nDc_Attr->iCS_CP = ftGdiGetTextCharsetInfo(NewDC,NULL,0); + DC_UnlockDc( NewDC ); hVisRgn = NtGdiCreateRectRgn(0, 0, ((PGDIDEVICE)NewDC->pPDev)->GDIInfo.ulHorzRes, @@ -2216,7 +2219,7 @@ NtGdiSelectFont( if(!pDc_Attr) pDc_Attr = &pDC->Dc_Attr; /* FIXME: what if not successful? */ - if(NT_SUCCESS(TextIntRealizeFont((HFONT)hFont))) + if(NT_SUCCESS(TextIntRealizeFont((HFONT)hFont,NULL))) { hOrgFont = pDc_Attr->hlfntNew; pDc_Attr->hlfntNew = hFont; @@ -2411,6 +2414,7 @@ NtGdiGetDCDword( case GdiGetEMFRestorDc: break; case GdiGetFontLanguageInfo: + SafeResult = IntGetFontLanguageInfo(dc); break; case GdiGetIsMemDc: SafeResult = dc->DC_Type; @@ -2644,6 +2648,7 @@ DC_AllocDC(PUNICODE_STRING Driver) Dc_Attr->iMapMode = MM_TEXT; Dc_Attr->iGraphicsMode = GM_COMPATIBLE; + Dc_Attr->jFillMode = ALTERNATE; Dc_Attr->szlWindowExt.cx = 1; // Float to Int,,, WRONG! Dc_Attr->szlWindowExt.cy = 1; @@ -2667,7 +2672,7 @@ DC_AllocDC(PUNICODE_STRING Driver) Dc_Attr->hpen = NtGdiGetStockObject( BLACK_PEN ); //// Dc_Attr->hlfntNew = NtGdiGetStockObject(SYSTEM_FONT); - TextIntRealizeFont(Dc_Attr->hlfntNew); + TextIntRealizeFont(Dc_Attr->hlfntNew,NULL); NewDC->DcLevel.hpal = NtGdiGetStockObject(DEFAULT_PALETTE); NewDC->DcLevel.laPath.eMiterLimit = 10.0; diff --git a/reactos/subsystems/win32/win32k/objects/dibobj.c b/reactos/subsystems/win32/win32k/objects/dibobj.c index 6969ea71e19..ecee3c0e87e 100644 --- a/reactos/subsystems/win32/win32k/objects/dibobj.c +++ b/reactos/subsystems/win32/win32k/objects/dibobj.c @@ -860,7 +860,6 @@ NtGdiStretchDIBitsInternal( * if it negitve we getting to many scanline for scanline is UINT not * a INT, so we need make the negtive value to positve and that make the * count correct for negtive bitmap, TODO : we need testcase for this api */ - IntSetDIBits(pDC, hBitmap, 0, abs(BitsInfo->bmiHeader.biHeight), Bits, BitsInfo, Usage); @@ -1187,7 +1186,7 @@ DIB_CreateDIBSection( { if (lpRGB != bmi->bmiColors) { - ExFreePool(lpRGB); + ExFreePoolWithTag(lpRGB, TAG_COLORMAP); } SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES); return NULL; @@ -1197,7 +1196,7 @@ DIB_CreateDIBSection( { if (lpRGB != bmi->bmiColors) { - ExFreePool(lpRGB); + ExFreePoolWithTag(lpRGB, TAG_COLORMAP); } SetLastWin32Error(ERROR_INVALID_HANDLE); NtGdiDeleteObject(bmp); @@ -1238,14 +1237,14 @@ DIB_CreateDIBSection( VirtualFree(bm.bmBits, 0L, MEM_RELEASE), bm.bmBits = NULL; } */ - if (dib) { ExFreePool(dib); dib = NULL; } + if (dib) { ExFreePoolWithTag(dib, TAG_DIB); dib = NULL; } if (bmp) { bmp = NULL; } if (res) { BITMAPOBJ_FreeBitmapByHandle(res); res = 0; } } if (lpRGB != bmi->bmiColors) { - ExFreePool(lpRGB); + ExFreePoolWithTag(lpRGB, TAG_COLORMAP); } if (bmp) diff --git a/reactos/subsystems/win32/win32k/objects/fillshap.c b/reactos/subsystems/win32/win32k/objects/fillshap.c index 52ab9260410..6bf346339d1 100644 --- a/reactos/subsystems/win32/win32k/objects/fillshap.c +++ b/reactos/subsystems/win32/win32k/objects/fillshap.c @@ -425,7 +425,7 @@ NtGdiPolyPolyDraw( IN HDC hDC, if (!NT_SUCCESS(Status)) { - ExFreePool(pTemp); + ExFreePoolWithTag(pTemp, TAG_SHAPE); return FALSE; } @@ -434,7 +434,7 @@ NtGdiPolyPolyDraw( IN HDC hDC, { HRGN hRgn; hRgn = IntCreatePolyPolygonRgn(SafePoints, SafeCounts, Count, (INT_PTR)hDC); - ExFreePool(pTemp); + ExFreePoolWithTag(pTemp, TAG_SHAPE); return (ULONG_PTR)hRgn; } @@ -506,20 +506,23 @@ IntRectangle(PDC dc, Dc_Attr = dc->pDc_Attr; if(!Dc_Attr) Dc_Attr = &dc->Dc_Attr; - if ( PATH_IsPathOpen(dc->DcLevel) ) - { - return PATH_Rectangle ( dc, LeftRect, TopRect, RightRect, BottomRect ); - } - /* Do we rotate or shear? */ if (!(dc->DcLevel.mxWorldToDevice.flAccel & MX_SCALE)) { + POINTL DestCoords[4]; + ULONG PolyCounts = 4; DestCoords[0].x = DestCoords[3].x = LeftRect; DestCoords[0].y = DestCoords[1].y = TopRect; DestCoords[1].x = DestCoords[2].x = RightRect; DestCoords[2].y = DestCoords[3].y = BottomRect; - return IntGdiPolygon(dc, DestCoords, 4); + // Use IntGdiPolyPolygon so to support PATH. + return IntGdiPolyPolygon(dc, DestCoords, &PolyCounts, 1); + } + // Rectangle Path only. + if ( PATH_IsPathOpen(dc->DcLevel) ) + { + return PATH_Rectangle ( dc, LeftRect, TopRect, RightRect, BottomRect ); } DestRect.left = LeftRect; @@ -1001,7 +1004,7 @@ NtGdiGradientFill( if (!NT_SUCCESS(Status)) { DC_UnlockDc(dc); - ExFreePool(SafeVertex); + ExFreePoolWithTag(SafeVertex, TAG_SHAPE); SetLastNtError(Status); return FALSE; } diff --git a/reactos/subsystems/win32/win32k/objects/font.c b/reactos/subsystems/win32/win32k/objects/font.c index 1a838e8a51f..8ed89645af4 100644 --- a/reactos/subsystems/win32/win32k/objects/font.c +++ b/reactos/subsystems/win32/win32k/objects/font.c @@ -13,33 +13,304 @@ #define NDEBUG #include -// -// FIXME PLEASE!!!! -// Why are these here? Well there is a problem with drivers/directx. -// 1st: It does not belong there. -// 2nd: Due to being placed outside Win32k build environment, it creates -// compiling issues. -// Until svn mv drivers/directx subsystem/win32/win32k/drivers/directx, -// it will not get fixed. -// -ULONG -FASTCALL -ftGdiGetGlyphOutline( - IN PDC pdc, - IN WCHAR wch, - IN UINT iFormat, - OUT LPGLYPHMETRICS pgm, - IN ULONG cjBuf, - OUT OPTIONAL PVOID UnsafeBuf, - IN LPMAT2 pmat2, - IN BOOL bIgnoreRotation); +/** Internal ******************************************************************/ INT FASTCALL -IntGetOutlineTextMetrics(PFONTGDI FontGDI, UINT Size, OUTLINETEXTMETRICW *Otm); +FontGetObject(PTEXTOBJ TFont, INT Count, PVOID Buffer) +{ + if( Buffer == NULL ) return sizeof(LOGFONTW); + + switch (Count) + { + case sizeof(ENUMLOGFONTEXDVW): + RtlCopyMemory( (LPENUMLOGFONTEXDVW) Buffer, + &TFont->logfont, + sizeof(ENUMLOGFONTEXDVW)); + break; + case sizeof(ENUMLOGFONTEXW): + RtlCopyMemory( (LPENUMLOGFONTEXW) Buffer, + &TFont->logfont.elfEnumLogfontEx, + sizeof(ENUMLOGFONTEXW)); + break; + + case sizeof(EXTLOGFONTW): + case sizeof(ENUMLOGFONTW): + RtlCopyMemory((LPENUMLOGFONTW) Buffer, + &TFont->logfont.elfEnumLogfontEx.elfLogFont, + sizeof(ENUMLOGFONTW)); + break; + + case sizeof(LOGFONTW): + RtlCopyMemory((LPLOGFONTW) Buffer, + &TFont->logfont.elfEnumLogfontEx.elfLogFont, + sizeof(LOGFONTW)); + break; + + default: + SetLastWin32Error(ERROR_BUFFER_OVERFLOW); + return 0; + } + return Count; +} + +DWORD +FASTCALL +IntGetFontLanguageInfo(PDC Dc) +{ + PDC_ATTR Dc_Attr; + FONTSIGNATURE fontsig; + static const DWORD GCP_DBCS_MASK=0x003F0000, + GCP_DIACRITIC_MASK=0x00000000, + FLI_GLYPHS_MASK=0x00000000, + GCP_GLYPHSHAPE_MASK=0x00000040, + GCP_KASHIDA_MASK=0x00000000, + GCP_LIGATE_MASK=0x00000000, + GCP_USEKERNING_MASK=0x00000000, + GCP_REORDER_MASK=0x00000060; + + DWORD result=0; + + ftGdiGetTextCharsetInfo( Dc, &fontsig, 0 ); + + /* We detect each flag we return using a bitmask on the Codepage Bitfields */ + if( (fontsig.fsCsb[0]&GCP_DBCS_MASK)!=0 ) + result|=GCP_DBCS; + + if( (fontsig.fsCsb[0]&GCP_DIACRITIC_MASK)!=0 ) + result|=GCP_DIACRITIC; + + if( (fontsig.fsCsb[0]&FLI_GLYPHS_MASK)!=0 ) + result|=FLI_GLYPHS; + + if( (fontsig.fsCsb[0]&GCP_GLYPHSHAPE_MASK)!=0 ) + result|=GCP_GLYPHSHAPE; + + if( (fontsig.fsCsb[0]&GCP_KASHIDA_MASK)!=0 ) + result|=GCP_KASHIDA; + + if( (fontsig.fsCsb[0]&GCP_LIGATE_MASK)!=0 ) + result|=GCP_LIGATE; + + if( (fontsig.fsCsb[0]&GCP_USEKERNING_MASK)!=0 ) + result|=GCP_USEKERNING; + + Dc_Attr = Dc->pDc_Attr; + if(!Dc_Attr) Dc_Attr = &Dc->Dc_Attr; + + /* this might need a test for a HEBREW- or ARABIC_CHARSET as well */ + if ( Dc_Attr->lTextAlign & TA_RTLREADING ) + if( (fontsig.fsCsb[0]&GCP_REORDER_MASK)!=0 ) + result|=GCP_REORDER; + + return result; +} + +PTEXTOBJ +FASTCALL +RealizeFontInit(HFONT hFont) +{ + NTSTATUS Status = STATUS_SUCCESS; + PTEXTOBJ pTextObj; + + pTextObj = TEXTOBJ_LockText(hFont); + + if ( pTextObj && !(pTextObj->fl & TEXTOBJECT_INIT)) + { + Status = TextIntRealizeFont(hFont, pTextObj); + if (!NT_SUCCESS(Status)) + { + TEXTOBJ_UnlockText(pTextObj); + return NULL; + } + } + return pTextObj; +} /** Functions ******************************************************************/ +INT +APIENTRY +NtGdiAddFontResourceW( + IN WCHAR *pwszFiles, + IN ULONG cwc, + IN ULONG cFiles, + IN FLONG fl, + IN DWORD dwPidTid, + IN OPTIONAL DESIGNVECTOR *pdv) +{ + UNICODE_STRING SafeFileName; + PWSTR src; + NTSTATUS Status; + int Ret; + + /* FIXME - Protect with SEH? */ + RtlInitUnicodeString(&SafeFileName, pwszFiles); + + /* Reserve for prepending '\??\' */ + SafeFileName.Length += 4 * sizeof(WCHAR); + SafeFileName.MaximumLength += 4 * sizeof(WCHAR); + + src = SafeFileName.Buffer; + SafeFileName.Buffer = (PWSTR)ExAllocatePoolWithTag(PagedPool, SafeFileName.MaximumLength, TAG_STRING); + if(!SafeFileName.Buffer) + { + SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); + return 0; + } + + /* Prepend '\??\' */ + RtlCopyMemory(SafeFileName.Buffer, L"\\??\\", 4 * sizeof(WCHAR)); + + Status = MmCopyFromCaller(SafeFileName.Buffer + 4, src, SafeFileName.MaximumLength - (4 * sizeof(WCHAR))); + if(!NT_SUCCESS(Status)) + { + ExFreePoolWithTag(SafeFileName.Buffer, TAG_STRING); + SetLastNtError(Status); + return 0; + } + + Ret = IntGdiAddFontResource(&SafeFileName, (DWORD)fl); + + ExFreePoolWithTag(SafeFileName.Buffer, TAG_STRING); + return Ret; +} + +DWORD +STDCALL +NtGdiGetFontData( + HDC hDC, + DWORD Table, + DWORD Offset, + LPVOID Buffer, + DWORD Size) +{ + PDC Dc; + PDC_ATTR Dc_Attr; + HFONT hFont; + PTEXTOBJ TextObj; + PFONTGDI FontGdi; + DWORD Result = GDI_ERROR; + NTSTATUS Status = STATUS_SUCCESS; + + if (Buffer && Size) + { + _SEH_TRY + { + ProbeForRead(Buffer, Size, 1); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END + } + + if (!NT_SUCCESS(Status)) return Result; + + Dc = DC_LockDc(hDC); + if (Dc == NULL) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return GDI_ERROR; + } + Dc_Attr = Dc->pDc_Attr; + if(!Dc_Attr) Dc_Attr = &Dc->Dc_Attr; + + hFont = Dc_Attr->hlfntNew; + TextObj = RealizeFontInit(hFont); + DC_UnlockDc(Dc); + + if (TextObj == NULL) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return GDI_ERROR; + } + + FontGdi = ObjToGDI(TextObj->Font, FONT); + + Result = ftGdiGetFontData(FontGdi, Table, Offset, Buffer, Size); + + TEXTOBJ_UnlockText(TextObj); + + return Result; +} + + /* + * @implemented + */ +DWORD +APIENTRY +NtGdiGetFontUnicodeRanges( + IN HDC hdc, + OUT OPTIONAL LPGLYPHSET pgs) +{ + PDC pDc; + PDC_ATTR Dc_Attr; + HFONT hFont; + PTEXTOBJ TextObj; + PFONTGDI FontGdi; + DWORD Size = 0; + PGLYPHSET pgsSafe; + NTSTATUS Status = STATUS_SUCCESS; + + pDc = DC_LockDc(hdc); + if (!pDc) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return 0; + } + + Dc_Attr = pDc->pDc_Attr; + if(!Dc_Attr) Dc_Attr = &pDc->Dc_Attr; + + hFont = Dc_Attr->hlfntNew; + TextObj = RealizeFontInit(hFont); + + if ( TextObj == NULL) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + goto Exit; + } + FontGdi = ObjToGDI(TextObj->Font, FONT); + + Size = ftGetFontUnicodeRanges( FontGdi, NULL); + + if (Size && pgs) + { + pgsSafe = ExAllocatePoolWithTag(PagedPool, Size, TAG_GDITEXT); + if (!pgsSafe) + { + SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); + Size = 0; + goto Exit; + } + + Size = ftGetFontUnicodeRanges( FontGdi, pgsSafe); + + if (Size) + { + _SEH_TRY + { + ProbeForWrite(pgsSafe, Size, 1); + RtlCopyMemory(pgs, pgsSafe, Size); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END + + if (!NT_SUCCESS(Status)) Size = 0; + } + ExFreePoolWithTag(pgsSafe, TAG_GDITEXT); + } +Exit: + TEXTOBJ_UnlockText(TextObj); + DC_UnlockDc(pDc); + return Size; +} + ULONG APIENTRY NtGdiGetGlyphOutline( @@ -52,22 +323,75 @@ NtGdiGetGlyphOutline( IN LPMAT2 pmat2, IN BOOL bIgnoreRotation) { - ULONG Ret; + ULONG Ret = GDI_ERROR; PDC dc; + PVOID pvBuf = NULL; + GLYPHMETRICS gm; + NTSTATUS Status = STATUS_SUCCESS; + dc = DC_LockDc(hdc); if (!dc) { SetLastWin32Error(ERROR_INVALID_HANDLE); return GDI_ERROR; } + + if (UnsafeBuf && cjBuf) + { + pvBuf = ExAllocatePoolWithTag(PagedPool, cjBuf, TAG_GDITEXT); + if (!pvBuf) + { + SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); + goto Exit; + } + } + Ret = ftGdiGetGlyphOutline( dc, wch, iFormat, - pgm, + pgm ? &gm : NULL, cjBuf, - UnsafeBuf, + pvBuf, pmat2, bIgnoreRotation); + + if (pvBuf) + { + _SEH_TRY + { + ProbeForWrite(UnsafeBuf, cjBuf, 1); + RtlCopyMemory(UnsafeBuf, pvBuf, cjBuf); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END + + ExFreePoolWithTag(pvBuf, TAG_GDITEXT); + } + + if (pgm) + { + _SEH_TRY + { + ProbeForWrite(pgm, sizeof(GLYPHMETRICS), 1); + RtlCopyMemory(pgm, &gm, sizeof(GLYPHMETRICS)); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END + } + + if (! NT_SUCCESS(Status)) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + Ret = GDI_ERROR; + } + +Exit: DC_UnlockDc(dc); return Ret; } @@ -78,8 +402,69 @@ NtGdiGetKerningPairs(HDC hDC, ULONG NumPairs, LPKERNINGPAIR krnpair) { - UNIMPLEMENTED; - return 0; + PDC dc; + PDC_ATTR Dc_Attr; + PTEXTOBJ TextObj; + PFONTGDI FontGDI; + DWORD Count; + KERNINGPAIR *pKP; + NTSTATUS Status = STATUS_SUCCESS; + + dc = DC_LockDc(hDC); + if (!dc) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return 0; + } + + Dc_Attr = dc->pDc_Attr; + if(!Dc_Attr) Dc_Attr = &dc->Dc_Attr; + TextObj = RealizeFontInit(Dc_Attr->hlfntNew); + DC_UnlockDc(dc); + + if (!TextObj) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return 0; + } + + FontGDI = ObjToGDI(TextObj->Font, FONT); + TEXTOBJ_UnlockText(TextObj); + + Count = ftGdiGetKerningPairs(FontGDI,0,NULL); + + if ( Count && krnpair ) + { + if (Count > NumPairs) + { + SetLastWin32Error(ERROR_INSUFFICIENT_BUFFER); + return 0; + } + pKP = ExAllocatePoolWithTag(PagedPool, Count * sizeof(KERNINGPAIR), TAG_GDITEXT); + if (!pKP) + { + SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); + return 0; + } + ftGdiGetKerningPairs(FontGDI,Count,pKP); + _SEH_TRY + { + ProbeForWrite(krnpair, Count * sizeof(KERNINGPAIR), 1); + RtlCopyMemory(krnpair, pKP, Count * sizeof(KERNINGPAIR)); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END + if (!NT_SUCCESS(Status)) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + Count = 0; + } + ExFreePoolWithTag(pKP,TAG_GDITEXT); + } + return Count; } /* @@ -100,52 +485,292 @@ NtGdiGetOutlineTextMetricsInternalW (HDC hDC, HFONT hFont = 0; ULONG Size; OUTLINETEXTMETRICW *potm; - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; dc = DC_LockDc(hDC); - if (dc == NULL) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return 0; - } + if (!dc) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return 0; + } Dc_Attr = dc->pDc_Attr; if(!Dc_Attr) Dc_Attr = &dc->Dc_Attr; hFont = Dc_Attr->hlfntNew; - TextObj = TEXTOBJ_LockText(hFont); + TextObj = RealizeFontInit(hFont); DC_UnlockDc(dc); - if (TextObj == NULL) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return 0; - } + if (!TextObj) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return 0; + } FontGDI = ObjToGDI(TextObj->Font, FONT); TEXTOBJ_UnlockText(TextObj); Size = IntGetOutlineTextMetrics(FontGDI, 0, NULL); if (!otm) return Size; if (Size > Data) - { + { SetLastWin32Error(ERROR_INSUFFICIENT_BUFFER); return 0; - } + } potm = ExAllocatePoolWithTag(PagedPool, Size, TAG_GDITEXT); - if (NULL == potm) - { + if (!potm) + { SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); return 0; - } + } IntGetOutlineTextMetrics(FontGDI, Size, potm); if (otm) - { - Status = MmCopyToCaller(otm, potm, Size); - if (! NT_SUCCESS(Status)) - { - SetLastWin32Error(ERROR_INVALID_PARAMETER); - ExFreePool(potm); - return 0; - } - } - ExFreePool(potm); + { + _SEH_TRY + { + ProbeForWrite(otm, Size, 1); + RtlCopyMemory(otm, potm, Size); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END + + if (!NT_SUCCESS(Status)) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + Size = 0; + } + } + ExFreePoolWithTag(potm,TAG_GDITEXT); return Size; } +W32KAPI +BOOL +APIENTRY +NtGdiGetFontResourceInfoInternalW( + IN LPWSTR pwszFiles, + IN ULONG cwc, + IN ULONG cFiles, + IN UINT cjIn, + OUT LPDWORD pdwBytes, + OUT LPVOID pvBuf, + IN DWORD dwType) +{ + NTSTATUS Status = STATUS_SUCCESS; + DWORD dwBytes; + UNICODE_STRING SafeFileNames; + BOOL bRet = FALSE; + ULONG cbStringSize; + + union + { + LOGFONTW logfontw; + WCHAR FullName[LF_FULLFACESIZE]; + } Buffer; + + /* FIXME: handle cFiles > 0 */ + + /* Check for valid dwType values + dwType == 4 seems to be handled by gdi32 only */ + if (dwType == 4 || dwType > 5) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + return FALSE; + } + + /* Allocate a safe unicode string buffer */ + cbStringSize = cwc * sizeof(WCHAR); + SafeFileNames.MaximumLength = SafeFileNames.Length = cbStringSize - sizeof(WCHAR); + SafeFileNames.Buffer = ExAllocatePoolWithTag(PagedPool, + cbStringSize, + TAG('R','T','S','U')); + if (!SafeFileNames.Buffer) + { + SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + /* Check buffers and copy pwszFiles to safe unicode string */ + _SEH_TRY + { + ProbeForRead(pwszFiles, cbStringSize, 1); + ProbeForWrite(pdwBytes, sizeof(DWORD), 1); + ProbeForWrite(pvBuf, cjIn, 1); + + RtlCopyMemory(SafeFileNames.Buffer, pwszFiles, cbStringSize); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END + + if(!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + /* Free the string buffer for the safe filename */ + ExFreePoolWithTag(SafeFileNames.Buffer,TAG('R','T','S','U')); + return FALSE; + } + + /* Do the actual call */ + bRet = IntGdiGetFontResourceInfo(&SafeFileNames, &Buffer, &dwBytes, dwType); + + /* Check if succeeded and the buffer is big enough */ + if (bRet && cjIn >= dwBytes) + { + /* Copy the data back to caller */ + _SEH_TRY + { + /* Buffers are already probed */ + RtlCopyMemory(pvBuf, &Buffer, dwBytes); + *pdwBytes = dwBytes; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END + + if(!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + bRet = FALSE; + } + } + + /* Free the string for the safe filenames */ + ExFreePoolWithTag(SafeFileNames.Buffer,TAG('R','T','S','U')); + + return bRet; +} + + /* + * @unimplemented + */ +BOOL +APIENTRY +NtGdiGetRealizationInfo( + IN HDC hdc, + OUT PREALIZATION_INFO pri, + IN HFONT hf) +{ + PDC pDc; + PTEXTOBJ pTextObj; + PFONTGDI pFontGdi; + PDC_ATTR Dc_Attr; + BOOL Ret = FALSE; + INT i = 0; + REALIZATION_INFO ri; + + pDc = DC_LockDc(hdc); + if (!pDc) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return 0; + } + Dc_Attr = pDc->pDc_Attr; + if(!Dc_Attr) Dc_Attr = &pDc->Dc_Attr; + pTextObj = RealizeFontInit(Dc_Attr->hlfntNew); + pFontGdi = ObjToGDI(pTextObj->Font, FONT); + TEXTOBJ_UnlockText(pTextObj); + DC_UnlockDc(pDc); + + Ret = ftGdiRealizationInfo(pFontGdi, &ri); + if (Ret) + { + if (pri) + { + NTSTATUS Status = STATUS_SUCCESS; + _SEH_TRY + { + ProbeForWrite(pri, sizeof(REALIZATION_INFO), 1); + RtlCopyMemory(pri, &ri, sizeof(REALIZATION_INFO)); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END + + if(!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + return FALSE; + } + } + do + { + if (GdiHandleTable->cfPublic[i].hf == hf) + { + GdiHandleTable->cfPublic[i].iTechnology = ri.iTechnology; + GdiHandleTable->cfPublic[i].iUniq = ri.iUniq; + GdiHandleTable->cfPublic[i].dwUnknown = ri.dwUnknown; + GdiHandleTable->cfPublic[i].dwCFCount = GdiHandleTable->dwCFCount; + GdiHandleTable->cfPublic[i].fl |= CFONT_REALIZATION; + } + i++; + } + while ( i < GDI_CFONT_MAX ); + } + return Ret; +} + +HFONT +STDCALL +NtGdiHfontCreate( + IN PENUMLOGFONTEXDVW pelfw, + IN ULONG cjElfw, + IN LFTYPE lft, + IN FLONG fl, + IN PVOID pvCliData ) +{ + ENUMLOGFONTEXDVW SafeLogfont; + HFONT hNewFont; + PTEXTOBJ TextObj; + NTSTATUS Status = STATUS_SUCCESS; + + if (!pelfw) + { + return NULL; + } + + _SEH_TRY + { + ProbeForRead(pelfw, sizeof(ENUMLOGFONTEXDVW), 1); + RtlCopyMemory(&SafeLogfont, pelfw, sizeof(ENUMLOGFONTEXDVW)); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END + + if (!NT_SUCCESS(Status)) + { + return NULL; + } + + TextObj = TEXTOBJ_AllocTextWithHandle(); + if (!TextObj) + { + return NULL; + } + hNewFont = TextObj->BaseObject.hHmgr; + + TextObj->lft = lft; + TextObj->fl = fl; + RtlCopyMemory (&TextObj->logfont, &SafeLogfont, sizeof(ENUMLOGFONTEXDVW)); + + if (SafeLogfont.elfEnumLogfontEx.elfLogFont.lfEscapement != + SafeLogfont.elfEnumLogfontEx.elfLogFont.lfOrientation) + { + /* this should really depend on whether GM_ADVANCED is set */ + TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfOrientation = + TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfEscapement; + } + TEXTOBJ_UnlockText(TextObj); + + return hNewFont; +} + + /* EOF */ diff --git a/reactos/subsystems/win32/win32k/objects/freetype.c b/reactos/subsystems/win32/win32k/objects/freetype.c index f3861691013..cb8686c89c2 100644 --- a/reactos/subsystems/win32/win32k/objects/freetype.c +++ b/reactos/subsystems/win32/win32k/objects/freetype.c @@ -1,3 +1,30 @@ +/* + * FreeType font engine interface + * + * Copyright 2001 Huw D M Davies for CodeWeavers. + * Copyright 2006 Dmitry Timoshkov for CodeWeavers. + * + * This file contains the WineEng* functions. + * + * 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 + */ +/* + * + * Addaped for the use in ReactOS. + * + */ /* * PROJECT: ReactOS win32 kernel mode subsystem * LICENSE: GPL - See COPYING in the top level directory @@ -13,6 +40,7 @@ #include #include FT_FREETYPE_H #include FT_GLYPH_H +#include FT_TYPE1_TABLES_H #include #include #include @@ -22,6 +50,11 @@ #define NDEBUG #include +#ifndef FT_MAKE_TAG +#define FT_MAKE_TAG( ch0, ch1, ch2, ch3 ) \ + ( ((DWORD)(BYTE)(ch0) << 24) | ((DWORD)(BYTE)(ch1) << 16) | \ + ((DWORD)(BYTE)(ch2) << 8) | (DWORD)(BYTE)(ch3) ) +#endif FT_Library library; @@ -44,8 +77,6 @@ static BOOL RenderingEnabled = TRUE; UINT Hits; UINT Misses; -SHORT ftLanguageID = 0; - typedef struct _FONT_CACHE_ENTRY { LIST_ENTRY ListEntry; int GlyphIndex; @@ -79,48 +110,48 @@ static PWCHAR ElfScripts[32] = { /* these are in the order of the fsCsb[0] bits }; /* - * For NtGdiTranslateCharsetInfo + * For TranslateCharsetInfo */ -#define FS(x) {{0,0,0,0},{0x1<<(x),0}} +#define CP_SYMBOL 42 #define MAXTCIINDEX 32 -static CHARSETINFO FontTci[MAXTCIINDEX] = { +static const CHARSETINFO FontTci[MAXTCIINDEX] = { /* ANSI */ - { ANSI_CHARSET, 1252, FS(0)}, - { EASTEUROPE_CHARSET, 1250, FS(1)}, - { RUSSIAN_CHARSET, 1251, FS(2)}, - { GREEK_CHARSET, 1253, FS(3)}, - { TURKISH_CHARSET, 1254, FS(4)}, - { HEBREW_CHARSET, 1255, FS(5)}, - { ARABIC_CHARSET, 1256, FS(6)}, - { BALTIC_CHARSET, 1257, FS(7)}, - { VIETNAMESE_CHARSET, 1258, FS(8)}, + { ANSI_CHARSET, 1252, {{0,0,0,0},{FS_LATIN1,0}} }, + { EASTEUROPE_CHARSET, 1250, {{0,0,0,0},{FS_LATIN2,0}} }, + { RUSSIAN_CHARSET, 1251, {{0,0,0,0},{FS_CYRILLIC,0}} }, + { GREEK_CHARSET, 1253, {{0,0,0,0},{FS_GREEK,0}} }, + { TURKISH_CHARSET, 1254, {{0,0,0,0},{FS_TURKISH,0}} }, + { HEBREW_CHARSET, 1255, {{0,0,0,0},{FS_HEBREW,0}} }, + { ARABIC_CHARSET, 1256, {{0,0,0,0},{FS_ARABIC,0}} }, + { BALTIC_CHARSET, 1257, {{0,0,0,0},{FS_BALTIC,0}} }, + { VIETNAMESE_CHARSET, 1258, {{0,0,0,0},{FS_VIETNAMESE,0}} }, /* reserved by ANSI */ - { DEFAULT_CHARSET, 0, FS(0)}, - { DEFAULT_CHARSET, 0, FS(0)}, - { DEFAULT_CHARSET, 0, FS(0)}, - { DEFAULT_CHARSET, 0, FS(0)}, - { DEFAULT_CHARSET, 0, FS(0)}, - { DEFAULT_CHARSET, 0, FS(0)}, - { DEFAULT_CHARSET, 0, FS(0)}, + { DEFAULT_CHARSET, 0, {{0,0,0,0},{FS_LATIN1,0}} }, + { DEFAULT_CHARSET, 0, {{0,0,0,0},{FS_LATIN1,0}} }, + { DEFAULT_CHARSET, 0, {{0,0,0,0},{FS_LATIN1,0}} }, + { DEFAULT_CHARSET, 0, {{0,0,0,0},{FS_LATIN1,0}} }, + { DEFAULT_CHARSET, 0, {{0,0,0,0},{FS_LATIN1,0}} }, + { DEFAULT_CHARSET, 0, {{0,0,0,0},{FS_LATIN1,0}} }, + { DEFAULT_CHARSET, 0, {{0,0,0,0},{FS_LATIN1,0}} }, /* ANSI and OEM */ - { THAI_CHARSET, 874, FS(16)}, - { SHIFTJIS_CHARSET, 932, FS(17)}, - { GB2312_CHARSET, 936, FS(18)}, - { HANGEUL_CHARSET, 949, FS(19)}, - { CHINESEBIG5_CHARSET, 950, FS(20)}, - { JOHAB_CHARSET, 1361, FS(21)}, + { THAI_CHARSET, 874, {{0,0,0,0},{FS_THAI,0}} }, + { SHIFTJIS_CHARSET, 932, {{0,0,0,0},{FS_JISJAPAN,0}} }, + { GB2312_CHARSET, 936, {{0,0,0,0},{FS_CHINESESIMP,0}} }, + { HANGEUL_CHARSET, 949, {{0,0,0,0},{FS_WANSUNG,0}} }, + { CHINESEBIG5_CHARSET, 950, {{0,0,0,0},{FS_CHINESETRAD,0}} }, + { JOHAB_CHARSET, 1361, {{0,0,0,0},{FS_JOHAB,0}} }, /* reserved for alternate ANSI and OEM */ - { DEFAULT_CHARSET, 0, FS(0)}, - { DEFAULT_CHARSET, 0, FS(0)}, - { DEFAULT_CHARSET, 0, FS(0)}, - { DEFAULT_CHARSET, 0, FS(0)}, - { DEFAULT_CHARSET, 0, FS(0)}, - { DEFAULT_CHARSET, 0, FS(0)}, - { DEFAULT_CHARSET, 0, FS(0)}, - { DEFAULT_CHARSET, 0, FS(0)}, + { DEFAULT_CHARSET, 0, {{0,0,0,0},{FS_LATIN1,0}} }, + { DEFAULT_CHARSET, 0, {{0,0,0,0},{FS_LATIN1,0}} }, + { DEFAULT_CHARSET, 0, {{0,0,0,0},{FS_LATIN1,0}} }, + { DEFAULT_CHARSET, 0, {{0,0,0,0},{FS_LATIN1,0}} }, + { DEFAULT_CHARSET, 0, {{0,0,0,0},{FS_LATIN1,0}} }, + { DEFAULT_CHARSET, 0, {{0,0,0,0},{FS_LATIN1,0}} }, + { DEFAULT_CHARSET, 0, {{0,0,0,0},{FS_LATIN1,0}} }, + { DEFAULT_CHARSET, 0, {{0,0,0,0},{FS_LATIN1,0}} }, /* reserved for system */ - { DEFAULT_CHARSET, 0, FS(0)}, - { SYMBOL_CHARSET, 42 /* CP_SYMBOL */, FS(31)}, + { DEFAULT_CHARSET, 0, {{0,0,0,0},{FS_LATIN1,0}} }, + { SYMBOL_CHARSET, CP_SYMBOL, {{0,0,0,0},{FS_SYMBOL,0}} } }; BOOL FASTCALL @@ -244,6 +275,7 @@ IntLoadSystemFonts(VOID) } } + /* * IntGdiAddFontResource * @@ -339,7 +371,7 @@ IntGdiAddFontResource(PUNICODE_STRING FileName, DWORD Characteristics) { FT_Done_Face(Face); ObDereferenceObject(SectionObject); - ExFreePool(Entry); + ExFreePoolWithTag(Entry, TAG_FONT); SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); return 0; } @@ -350,11 +382,11 @@ IntGdiAddFontResource(PUNICODE_STRING FileName, DWORD Characteristics) EngFreeMem(FontGDI); FT_Done_Face(Face); ObDereferenceObject(SectionObject); - ExFreePool(Entry); + ExFreePoolWithTag(Entry, TAG_FONT); SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); return 0; } - memcpy(FontGDI->Filename, FileName->Buffer, FileName->Length); + RtlCopyMemory(FontGDI->Filename, FileName->Buffer, FileName->Length); FontGDI->Filename[FileName->Length / sizeof(WCHAR)] = L'\0'; FontGDI->face = Face; @@ -446,52 +478,6 @@ IntGetFontRenderMode(LOGFONTW *logfont) return FT_RENDER_MODE_NORMAL; } -INT -APIENTRY -NtGdiAddFontResourceW( - IN WCHAR *pwszFiles, - IN ULONG cwc, - IN ULONG cFiles, - IN FLONG fl, - IN DWORD dwPidTid, - IN OPTIONAL DESIGNVECTOR *pdv) -{ - UNICODE_STRING SafeFileName; - PWSTR src; - NTSTATUS Status; - int Ret; - - /* FIXME - Protect with SEH? */ - RtlInitUnicodeString(&SafeFileName, pwszFiles); - - /* Reserve for prepending '\??\' */ - SafeFileName.Length += 4 * sizeof(WCHAR); - SafeFileName.MaximumLength += 4 * sizeof(WCHAR); - - src = SafeFileName.Buffer; - SafeFileName.Buffer = (PWSTR)ExAllocatePoolWithTag(PagedPool, SafeFileName.MaximumLength, TAG_STRING); - if(!SafeFileName.Buffer) - { - SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); - return 0; - } - - /* Prepend '\??\' */ - RtlCopyMemory(SafeFileName.Buffer, L"\\??\\", 4 * sizeof(WCHAR)); - - Status = MmCopyFromCaller(SafeFileName.Buffer + 4, src, SafeFileName.MaximumLength - (4 * sizeof(WCHAR))); - if(!NT_SUCCESS(Status)) - { - ExFreePool(SafeFileName.Buffer); - SetLastNtError(Status); - return 0; - } - - Ret = IntGdiAddFontResource(&SafeFileName, (DWORD)fl); - - ExFreePool(SafeFileName.Buffer); - return Ret; -} NTSTATUS FASTCALL TextIntCreateFontIndirect(CONST LPLOGFONTW lf, HFONT *NewFont) @@ -505,7 +491,7 @@ TextIntCreateFontIndirect(CONST LPLOGFONTW lf, HFONT *NewFont) } *NewFont = TextObj->BaseObject.hHmgr; - memcpy(&TextObj->logfont.elfEnumLogfontEx.elfLogFont, lf, sizeof(LOGFONTW)); + RtlCopyMemory(&TextObj->logfont.elfEnumLogfontEx.elfLogFont, lf, sizeof(LOGFONTW)); if (lf->lfEscapement != lf->lfOrientation) { /* this should really depend on whether GM_ADVANCED is set */ @@ -517,63 +503,6 @@ TextIntCreateFontIndirect(CONST LPLOGFONTW lf, HFONT *NewFont) return STATUS_SUCCESS; } -HFONT -STDCALL -NtGdiHfontCreate( - IN PENUMLOGFONTEXDVW pelfw, - IN ULONG cjElfw, - IN LFTYPE lft, - IN FLONG fl, - IN PVOID pvCliData ) -{ - ENUMLOGFONTEXDVW SafeLogfont; - HFONT hNewFont; - PTEXTOBJ TextObj; - NTSTATUS Status = STATUS_SUCCESS; - - if (!pelfw) - { - return NULL; - } - - _SEH_TRY - { - ProbeForRead(pelfw, sizeof(ENUMLOGFONTEXDVW), 1); - RtlCopyMemory(&SafeLogfont, pelfw, sizeof(ENUMLOGFONTEXDVW)); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END - - if (!NT_SUCCESS(Status)) - { - return NULL; - } - - TextObj = TEXTOBJ_AllocTextWithHandle(); - if (!TextObj) - { - return NULL; - } - hNewFont = TextObj->BaseObject.hHmgr; - - RtlCopyMemory (&TextObj->logfont, &SafeLogfont, sizeof(ENUMLOGFONTEXDVW)); - - if (SafeLogfont.elfEnumLogfontEx.elfLogFont.lfEscapement != - SafeLogfont.elfEnumLogfontEx.elfLogFont.lfOrientation) - { - /* this should really depend on whether GM_ADVANCED is set */ - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfOrientation = - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfEscapement; - } - TEXTOBJ_UnlockText(TextObj); - - return hNewFont; - -} - /************************************************************************* * TranslateCharsetInfo * @@ -608,13 +537,13 @@ IntTranslateCharsetInfo(PDWORD Src, /* [in] } break; case TCI_SRCCODEPAGE: - while ((UINT) (Src) != FontTci[Index].ciACP && Index < MAXTCIINDEX) + while ( *Src != FontTci[Index].ciACP && Index < MAXTCIINDEX) { Index++; } break; case TCI_SRCCHARSET: - while ((UINT) (Src) != FontTci[Index].ciCharset && Index < MAXTCIINDEX) + while ( *Src != FontTci[Index].ciCharset && Index < MAXTCIINDEX) { Index++; } @@ -623,27 +552,53 @@ IntTranslateCharsetInfo(PDWORD Src, /* [in] return FALSE; } - if (MAXTCIINDEX <= Index || DEFAULT_CHARSET == FontTci[Index].ciCharset) - { - return FALSE; - } + if (Index >= MAXTCIINDEX || DEFAULT_CHARSET == FontTci[Index].ciCharset) + { + return FALSE; + } - memcpy(Cs, &FontTci[Index], sizeof(CHARSETINFO)); + RtlCopyMemory(Cs, &FontTci[Index], sizeof(CHARSETINFO)); return TRUE; } static void FASTCALL -FillTM(TEXTMETRICW *TM, FT_Face Face, TT_OS2 *pOS2, TT_HoriHeader *pHori) +FillTM(TEXTMETRICW *TM, PFONTGDI FontGDI, TT_OS2 *pOS2, TT_HoriHeader *pHori, FT_WinFNT_HeaderRec *pWin) { FT_Fixed XScale, YScale; int Ascent, Descent; + FT_Face Face = FontGDI->face; XScale = Face->size->metrics.x_scale; YScale = Face->size->metrics.y_scale; - if (0 == pOS2->usWinAscent + pOS2->usWinDescent) + if (pWin) + { + TM->tmHeight = pWin->pixel_height; + TM->tmAscent = pWin->ascent; + TM->tmDescent = TM->tmHeight - TM->tmAscent; + TM->tmInternalLeading = pWin->internal_leading; + TM->tmExternalLeading = pWin->external_leading; + TM->tmAveCharWidth = pWin->avg_width; + TM->tmMaxCharWidth = pWin->max_width; + TM->tmWeight = pWin->weight; + TM->tmOverhang = 0; + TM->tmDigitizedAspectX = pWin->horizontal_resolution; + TM->tmDigitizedAspectY = pWin->vertical_resolution; + TM->tmFirstChar = pWin->first_char; + TM->tmLastChar = pWin->last_char; + TM->tmDefaultChar = pWin->default_char + pWin->first_char; + TM->tmBreakChar = pWin->break_char + pWin->first_char; + TM->tmItalic = pWin->italic; + TM->tmUnderlined = FontGDI->Underline; + TM->tmStruckOut = FontGDI->StrikeOut; + TM->tmPitchAndFamily = pWin->pitch_and_family; + TM->tmCharSet = pWin->charset; + return; + } + + if (0 == pOS2->usWinAscent + pOS2->usWinDescent) { Ascent = pHori->Ascender; Descent = -pHori->Descender; @@ -691,8 +646,8 @@ FillTM(TEXTMETRICW *TM, FT_Face Face, TT_OS2 *pOS2, TT_HoriHeader *pHori) TM->tmDefaultChar = pOS2->usDefaultChar; TM->tmBreakChar = L'\0' != pOS2->usBreakChar ? pOS2->usBreakChar : ' '; TM->tmItalic = (Face->style_flags & FT_STYLE_FLAG_ITALIC) ? 255 : 0; - TM->tmUnderlined = 0; /* entry in OS2 table */ - TM->tmStruckOut = 0; /* entry in OS2 table */ + TM->tmUnderlined = FontGDI->Underline; + TM->tmStruckOut = FontGDI->StrikeOut; /* Yes TPMF_FIXED_PITCH is correct; braindead api */ if (! FT_IS_FIXED_WIDTH(Face)) @@ -754,7 +709,8 @@ FillTM(TEXTMETRICW *TM, FT_Face Face, TT_OS2 *pOS2, TT_HoriHeader *pHori) * */ INT FASTCALL -IntGetOutlineTextMetrics(PFONTGDI FontGDI, UINT Size, +IntGetOutlineTextMetrics(PFONTGDI FontGDI, + UINT Size, OUTLINETEXTMETRICW *Otm) { unsigned Needed; @@ -764,6 +720,8 @@ IntGetOutlineTextMetrics(PFONTGDI FontGDI, UINT Size, FT_Fixed XScale, YScale; ANSI_STRING FamilyNameA, StyleNameA; UNICODE_STRING FamilyNameW, StyleNameW, Regular; + FT_WinFNT_HeaderRec Win; + FT_Error Error; char *Cp; Needed = sizeof(OUTLINETEXTMETRICW); @@ -829,12 +787,21 @@ IntGetOutlineTextMetrics(PFONTGDI FontGDI, UINT Size, pPost = FT_Get_Sfnt_Table(FontGDI->face, ft_sfnt_post); /* we can live with this failing */ + Error = FT_Get_WinFNT_Header(FontGDI->face , &Win); + Otm->otmSize = Needed; - FillTM(&Otm->otmTextMetrics, FontGDI->face, pOS2, pHori); +// FillTM(&Otm->otmTextMetrics, FontGDI, pOS2, pHori, !Error ? &Win : 0); + if (!(FontGDI->flRealizedType & FDM_TYPE_TEXT_METRIC)) + { + FillTM(&FontGDI->TextMetric, FontGDI, pOS2, pHori, !Error ? &Win : 0); + FontGDI->flRealizedType |= FDM_TYPE_TEXT_METRIC; + } + + RtlCopyMemory(&Otm->otmTextMetrics, &FontGDI->TextMetric, sizeof(TEXTMETRICW)); Otm->otmFiller = 0; - memcpy(&Otm->otmPanoseNumber, pOS2->panose, PANOSE_COUNT); + RtlCopyMemory(&Otm->otmPanoseNumber, pOS2->panose, PANOSE_COUNT); Otm->otmfsSelection = pOS2->fsSelection; Otm->otmfsType = pOS2->fsType; Otm->otmsCharSlopeRise = pHori->caret_Slope_Rise; @@ -977,21 +944,21 @@ FontFamilyFillInfo(PFONTFAMILYINFO Info, PCWSTR FaceName, PFONTGDI FontGDI) UNICODE_STRING StyleW; TT_OS2 *pOS2; FONTSIGNATURE fs; - DWORD fs_fsCsb0; CHARSETINFO CharSetInfo; unsigned i, Size; OUTLINETEXTMETRICW *Otm; LOGFONTW *Lf; TEXTMETRICW *TM; NEWTEXTMETRICW *Ntm; + DWORD fs0; RtlZeroMemory(Info, sizeof(FONTFAMILYINFO)); Size = IntGetOutlineTextMetrics(FontGDI, 0, NULL); Otm = ExAllocatePoolWithTag(PagedPool, Size, TAG_GDITEXT); - if (NULL == Otm) - { - return; - } + if (!Otm) + { + return; + } IntGetOutlineTextMetrics(FontGDI, Size, Otm); Lf = &Info->EnumLogFontEx.elfLogFont; @@ -1029,14 +996,10 @@ FontFamilyFillInfo(PFONTFAMILYINFO Info, PCWSTR FaceName, PFONTGDI FontGDI) Ntm->tmPitchAndFamily = TM->tmPitchAndFamily; Ntm->tmCharSet = TM->tmCharSet; Ntm->ntmFlags = TM->tmItalic ? NTM_ITALIC : 0; - if (550 < TM->tmWeight) - { - Ntm->ntmFlags |= NTM_BOLD; - } - if (0 == Ntm->ntmFlags) - { - Ntm->ntmFlags = NTM_REGULAR; - } + + if (550 < TM->tmWeight) Ntm->ntmFlags |= NTM_BOLD; + + if (0 == Ntm->ntmFlags) Ntm->ntmFlags = NTM_REGULAR; Ntm->ntmSizeEM = Otm->otmEMSquare; Ntm->ntmCellHeight = 0; @@ -1044,12 +1007,11 @@ FontFamilyFillInfo(PFONTFAMILYINFO Info, PCWSTR FaceName, PFONTGDI FontGDI) Info->FontType = (0 != (TM->tmPitchAndFamily & TMPF_TRUETYPE) ? TRUETYPE_FONTTYPE : 0); - if (0 == (TM->tmPitchAndFamily & TMPF_VECTOR)) - { - Info->FontType |= RASTER_FONTTYPE; - } - ExFreePool(Otm); + if (0 == (TM->tmPitchAndFamily & TMPF_VECTOR)) + Info->FontType |= RASTER_FONTTYPE; + + ExFreePoolWithTag(Otm, TAG_GDITEXT); wcsncpy(Info->EnumLogFontEx.elfLogFont.lfFaceName, FaceName, LF_FACESIZE); wcsncpy(Info->EnumLogFontEx.elfFullName, FaceName, LF_FULLFACESIZE); @@ -1064,76 +1026,64 @@ FontFamilyFillInfo(PFONTFAMILYINFO Info, PCWSTR FaceName, PFONTGDI FontGDI) pOS2 = FT_Get_Sfnt_Table(FontGDI->face, ft_sfnt_os2); IntUnLockFreeType; if (NULL != pOS2) - { - Info->NewTextMetricEx.ntmFontSig.fsCsb[0] = pOS2->ulCodePageRange1; - Info->NewTextMetricEx.ntmFontSig.fsCsb[1] = pOS2->ulCodePageRange2; - Info->NewTextMetricEx.ntmFontSig.fsUsb[0] = pOS2->ulUnicodeRange1; - Info->NewTextMetricEx.ntmFontSig.fsUsb[1] = pOS2->ulUnicodeRange2; - Info->NewTextMetricEx.ntmFontSig.fsUsb[2] = pOS2->ulUnicodeRange3; - Info->NewTextMetricEx.ntmFontSig.fsUsb[3] = pOS2->ulUnicodeRange4; + { + fs.fsCsb[0] = pOS2->ulCodePageRange1; + fs.fsCsb[1] = pOS2->ulCodePageRange2; + fs.fsUsb[0] = pOS2->ulUnicodeRange1; + fs.fsUsb[1] = pOS2->ulUnicodeRange2; + fs.fsUsb[2] = pOS2->ulUnicodeRange3; + fs.fsUsb[3] = pOS2->ulUnicodeRange4; - fs_fsCsb0 = pOS2->ulCodePageRange1; - if (0 == pOS2->version) + if (0 == pOS2->version) + { + FT_UInt Dummy; + + if (FT_Get_First_Char(FontGDI->face, &Dummy) < 0x100) + fs.fsCsb[0] |= FS_LATIN1; + else + fs.fsCsb[0] |= FS_SYMBOL; + } + if (fs.fsCsb[0] == 0) + { /* let's see if we can find any interesting cmaps */ + for (i = 0; i < FontGDI->face->num_charmaps; i++) { - FT_UInt Dummy; - - if (FT_Get_First_Char(FontGDI->face, &Dummy) < 0x100) - { - fs_fsCsb0 |= 1; - } - else - { - fs_fsCsb0 |= 1L << 31; - } + switch (FontGDI->face->charmaps[i]->encoding) + { + case FT_ENCODING_UNICODE: + case FT_ENCODING_APPLE_ROMAN: + fs.fsCsb[0] |= FS_LATIN1; + break; + case FT_ENCODING_MS_SYMBOL: + fs.fsCsb[0] |= FS_SYMBOL; + break; + default: + break; + } } - if (0 == fs_fsCsb0) - { /* let's see if we can find any interesting cmaps */ - for (i = 0; i < FontGDI->face->num_charmaps; i++) - { - switch (FontGDI->face->charmaps[i]->encoding) - { - case ft_encoding_unicode: - case ft_encoding_apple_roman: - fs_fsCsb0 |= 1; - break; - case ft_encoding_symbol: - fs_fsCsb0 |= 1L << 31; - break; - default: - break; - } - } - } - - for(i = 0; i < 32; i++) + } + for (i = 0; i < MAXTCIINDEX; i++) + { + fs0 = 1L << i; + if (fs.fsCsb[0] & fs0) { - if (0 != (fs_fsCsb0 & (1L << i))) - { - fs.fsCsb[0] = 1L << i; - fs.fsCsb[1] = 0; - if (! IntTranslateCharsetInfo(fs.fsCsb, &CharSetInfo, TCI_SRCFONTSIG)) - { - CharSetInfo.ciCharset = DEFAULT_CHARSET; - } - if (31 == i) - { - CharSetInfo.ciCharset = SYMBOL_CHARSET; - } - if (DEFAULT_CHARSET != CharSetInfo.ciCharset) - { - Info->EnumLogFontEx.elfLogFont.lfCharSet = CharSetInfo.ciCharset; - if (NULL != ElfScripts[i]) - { - wcscpy(Info->EnumLogFontEx.elfScript, ElfScripts[i]); - } - else - { - DPRINT1("Unknown elfscript for bit %d\n", i); - } - } - } + if (!IntTranslateCharsetInfo(&fs0, &CharSetInfo, TCI_SRCFONTSIG)) + { + CharSetInfo.ciCharset = DEFAULT_CHARSET; + } + if (DEFAULT_CHARSET != CharSetInfo.ciCharset) + { + Info->EnumLogFontEx.elfLogFont.lfCharSet = CharSetInfo.ciCharset; + if (NULL != ElfScripts[i]) + wcscpy(Info->EnumLogFontEx.elfScript, ElfScripts[i]); + else + { + DPRINT1("Unknown elfscript for bit %d\n", i); + } + } } - } + } + Info->NewTextMetricEx.ntmFontSig = fs; + } } static int FASTCALL @@ -1329,13 +1279,1720 @@ ftGdiGetRasterizerCaps(LPRASTERIZER_STATUS lprs) { lprs->nSize = sizeof(RASTERIZER_STATUS); lprs->wFlags = TT_AVAILABLE | TT_ENABLED; - lprs->nLanguageID = ftLanguageID; + lprs->nLanguageID = gusLanguageID; return TRUE; } SetLastWin32Error(ERROR_INVALID_PARAMETER); return FALSE; } + +FT_Glyph STDCALL +ftGdiGlyphCacheGet( + FT_Face Face, + INT GlyphIndex, + INT Height) +{ + PLIST_ENTRY CurrentEntry; + PFONT_CACHE_ENTRY FontEntry; + +// DbgPrint("CacheGet\n"); + + CurrentEntry = FontCacheListHead.Flink; + while (CurrentEntry != &FontCacheListHead) + { + FontEntry = (PFONT_CACHE_ENTRY)CurrentEntry; + if (FontEntry->Face == Face && + FontEntry->GlyphIndex == GlyphIndex && + FontEntry->Height == Height) + break; + CurrentEntry = CurrentEntry->Flink; + } + + if (CurrentEntry == &FontCacheListHead) { +// DbgPrint("Miss! %x\n", FontEntry->Glyph); +/* + Misses++; + if (Misses>100) { + DbgPrint ("Hits: %d Misses: %d\n", Hits, Misses); + Hits = Misses = 0; + } +*/ + return NULL; + } + + RemoveEntryList(CurrentEntry); + InsertHeadList(&FontCacheListHead, CurrentEntry); + +// DbgPrint("Hit! %x\n", FontEntry->Glyph); +/* + Hits++; + + if (Hits>100) { + DbgPrint ("Hits: %d Misses: %d\n", Hits, Misses); + Hits = Misses = 0; + } +*/ + return FontEntry->Glyph; +} + +FT_Glyph STDCALL +ftGdiGlyphCacheSet( + FT_Face Face, + INT GlyphIndex, + INT Height, + FT_GlyphSlot GlyphSlot, + FT_Render_Mode RenderMode) +{ + FT_Glyph GlyphCopy; + INT error; + PFONT_CACHE_ENTRY NewEntry; + +// DbgPrint("CacheSet.\n"); + + error = FT_Get_Glyph(GlyphSlot, &GlyphCopy); + if (error) + { + DbgPrint("Failure caching glyph.\n"); + return NULL; + }; + error = FT_Glyph_To_Bitmap(&GlyphCopy, RenderMode, 0, 1); + if (error) + { + DbgPrint("Failure rendering glyph.\n"); + return NULL; + }; + + NewEntry = ExAllocatePoolWithTag(PagedPool, sizeof(FONT_CACHE_ENTRY), TAG_FONT); + if (!NewEntry) + { + DbgPrint("Alloc failure caching glyph.\n"); + FT_Done_Glyph(GlyphCopy); + return NULL; + } + + NewEntry->GlyphIndex = GlyphIndex; + NewEntry->Face = Face; + NewEntry->Glyph = GlyphCopy; + NewEntry->Height = Height; + + InsertHeadList(&FontCacheListHead, &NewEntry->ListEntry); + if (FontCacheNumEntries++ > MAX_FONT_CACHE) { + NewEntry = (PFONT_CACHE_ENTRY)FontCacheListHead.Blink; + FT_Done_Glyph(NewEntry->Glyph); + RemoveTailList(&FontCacheListHead); + ExFreePool(NewEntry); + FontCacheNumEntries--; + } + +// DbgPrint("Returning the glyphcopy: %x\n", GlyphCopy); + + return GlyphCopy; +} + + +static +void +FTVectorToPOINTFX(FT_Vector *vec, POINTFX *pt) +{ + pt->x.value = vec->x >> 6; + pt->x.fract = (vec->x & 0x3f) << 10; + pt->x.fract |= ((pt->x.fract >> 6) | (pt->x.fract >> 12)); + pt->y.value = vec->y >> 6; + pt->y.fract = (vec->y & 0x3f) << 10; + pt->y.fract |= ((pt->y.fract >> 6) | (pt->y.fract >> 12)); + return; +} + +/* + This function builds an FT_Fixed from a float. It puts the integer part + in the highest 16 bits and the decimal part in the lowest 16 bits of the FT_Fixed. + It fails if the integer part of the float number is greater than SHORT_MAX. +*/ +static __inline FT_Fixed FT_FixedFromFloat(float f) +{ + short value = f; + unsigned short fract = (f - value) * 0xFFFF; + return (FT_Fixed)((long)value << 16 | (unsigned long)fract); +} + +/* + This function builds an FT_Fixed from a FIXED. It simply put f.value + in the highest 16 bits and f.fract in the lowest 16 bits of the FT_Fixed. +*/ +static __inline FT_Fixed FT_FixedFromFIXED(FIXED f) +{ + return (FT_Fixed)((long)f.value << 16 | (unsigned long)f.fract); +} + +/* + * Based on WineEngGetGlyphOutline + * + */ +ULONG +FASTCALL +ftGdiGetGlyphOutline( + PDC dc, + WCHAR wch, + UINT iFormat, + LPGLYPHMETRICS pgm, + ULONG cjBuf, + PVOID pvBuf, + LPMAT2 pmat2, + BOOL bIgnoreRotation) +{ + static const FT_Matrix identityMat = {(1 << 16), 0, 0, (1 << 16)}; + PDC_ATTR Dc_Attr; + PTEXTOBJ TextObj; + PFONTGDI FontGDI; + HFONT hFont = 0; + GLYPHMETRICS gm; + ULONG Size; + FT_Face ft_face; + FT_UInt glyph_index; + DWORD width, height, pitch, needed = 0; + FT_Bitmap ft_bitmap; + FT_Error error; + INT left, right, top = 0, bottom = 0; + FT_Angle angle = 0; + FT_Int load_flags = FT_LOAD_DEFAULT | FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH; + FLOAT eM11, widthRatio = 1.0; + FT_Matrix transMat = identityMat; + BOOL needsTransform = FALSE; + INT orientation; + LONG aveWidth; + INT adv, lsb, bbx; /* These three hold to widths of the unrotated chars */ + OUTLINETEXTMETRICW *potm; + int n = 0; + FT_CharMap found = 0, charmap; + XFORM xForm; + + DPRINT("%d, %08x, %p, %08lx, %p, %p\n", wch, iFormat, pgm, + cjBuf, pvBuf, pmat2); + + Dc_Attr = dc->pDc_Attr; + if(!Dc_Attr) Dc_Attr = &dc->Dc_Attr; + + MatrixS2XForm(&xForm, &dc->DcLevel.mxWorldToDevice); + eM11 = xForm.eM11; + + hFont = Dc_Attr->hlfntNew; + TextObj = RealizeFontInit(hFont); + + if (!TextObj) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return GDI_ERROR; + } + FontGDI = ObjToGDI(TextObj->Font, FONT); + ft_face = FontGDI->face; + + aveWidth = FT_IS_SCALABLE(ft_face) ? TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfWidth: 0; + orientation = FT_IS_SCALABLE(ft_face) ? TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfOrientation: 0; + + Size = IntGetOutlineTextMetrics(FontGDI, 0, NULL); + potm = ExAllocatePoolWithTag(PagedPool, Size, TAG_GDITEXT); + if (!potm) + { + SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); + TEXTOBJ_UnlockText(TextObj); + return GDI_ERROR; + } + IntGetOutlineTextMetrics(FontGDI, Size, potm); + + IntLockFreeType; + + /* During testing, I never saw this used. In here just incase.*/ + if (ft_face->charmap == NULL) + { + DPRINT("WARNING: No charmap selected!\n"); + DPRINT("This font face has %d charmaps\n", ft_face->num_charmaps); + + for (n = 0; n < ft_face->num_charmaps; n++) + { + charmap = ft_face->charmaps[n]; + DPRINT("found charmap encoding: %u\n", charmap->encoding); + if (charmap->encoding != 0) + { + found = charmap; + break; + } + } + if (!found) + { + DPRINT1("WARNING: Could not find desired charmap!\n"); + } + error = FT_Set_Charmap(ft_face, found); + if (error) + { + DPRINT1("WARNING: Could not set the charmap!\n"); + } + } + +// FT_Set_Pixel_Sizes(ft_face, +// TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfWidth, + /* FIXME should set character height if neg */ +// (TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight < 0 ? - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight : +// TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight == 0 ? 11 : TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight)); + + TEXTOBJ_UnlockText(TextObj); + + if (iFormat & GGO_GLYPH_INDEX) + { + glyph_index = wch; + iFormat &= ~GGO_GLYPH_INDEX; + } + else glyph_index = FT_Get_Char_Index(ft_face, wch); + + if (orientation || (iFormat != GGO_METRICS && iFormat != GGO_BITMAP) || aveWidth || pmat2) + load_flags |= FT_LOAD_NO_BITMAP; + + if (iFormat & GGO_UNHINTED) + { + load_flags |= FT_LOAD_NO_HINTING; + iFormat &= ~GGO_UNHINTED; + } + + error = FT_Load_Glyph(ft_face, glyph_index, load_flags); + if (error) + { + DPRINT1("WARNING: Failed to load and render glyph! [index: %u]\n", glyph_index); + IntUnLockFreeType; + if (potm) ExFreePoolWithTag(potm, TAG_GDITEXT); + return GDI_ERROR; + } + IntUnLockFreeType; + + if (aveWidth && potm) + { + widthRatio = (FLOAT)aveWidth * eM11 / + (FLOAT) potm->otmTextMetrics.tmAveCharWidth; + } + + left = (INT)(ft_face->glyph->metrics.horiBearingX * widthRatio) & -64; + right = (INT)((ft_face->glyph->metrics.horiBearingX + + ft_face->glyph->metrics.width) * widthRatio + 63) & -64; + + adv = (INT)((ft_face->glyph->metrics.horiAdvance * widthRatio) + 63) >> 6; + lsb = left >> 6; + bbx = (right - left) >> 6; + + DPRINT("Advance = %d, lsb = %d, bbx = %d\n",adv, lsb, bbx); + + IntLockFreeType; + + /* Scaling transform */ + if (aveWidth) + { + FT_Matrix scaleMat; + DPRINT("Scaling Trans!\n"); + scaleMat.xx = FT_FixedFromFloat(widthRatio); + scaleMat.xy = 0; + scaleMat.yx = 0; + scaleMat.yy = (1 << 16); + FT_Matrix_Multiply(&scaleMat, &transMat); + needsTransform = TRUE; + } + + /* Slant transform */ + if (potm->otmTextMetrics.tmItalic) + { + FT_Matrix slantMat; + DPRINT("Slant Trans!\n"); + slantMat.xx = (1 << 16); + slantMat.xy = ((1 << 16) >> 2); + slantMat.yx = 0; + slantMat.yy = (1 << 16); + FT_Matrix_Multiply(&slantMat, &transMat); + needsTransform = TRUE; + } + + /* Rotation transform */ + if (orientation) + { + FT_Matrix rotationMat; + FT_Vector vecAngle; + DPRINT("Rotation Trans!\n"); + angle = FT_FixedFromFloat((float)orientation / 10.0); + FT_Vector_Unit(&vecAngle, angle); + rotationMat.xx = vecAngle.x; + rotationMat.xy = -vecAngle.y; + rotationMat.yx = -rotationMat.xy; + rotationMat.yy = rotationMat.xx; + FT_Matrix_Multiply(&rotationMat, &transMat); + needsTransform = TRUE; + } + + /* Extra transformation specified by caller */ + if (pmat2) + { + FT_Matrix extraMat; + DPRINT("MAT2 Matrix Trans!\n"); + extraMat.xx = FT_FixedFromFIXED(pmat2->eM11); + extraMat.xy = FT_FixedFromFIXED(pmat2->eM21); + extraMat.yx = FT_FixedFromFIXED(pmat2->eM12); + extraMat.yy = FT_FixedFromFIXED(pmat2->eM22); + FT_Matrix_Multiply(&extraMat, &transMat); + needsTransform = TRUE; + } + + if (potm) ExFreePoolWithTag(potm, TAG_GDITEXT); /* It looks like we are finished with potm ATM.*/ + + if (!needsTransform) + { + DPRINT("No Need to be Transformed!\n"); + top = (ft_face->glyph->metrics.horiBearingY + 63) & -64; + bottom = (ft_face->glyph->metrics.horiBearingY - + ft_face->glyph->metrics.height) & -64; + gm.gmCellIncX = adv; + gm.gmCellIncY = 0; + } + else + { + INT xc, yc; + FT_Vector vec; + for(xc = 0; xc < 2; xc++) + { + for(yc = 0; yc < 2; yc++) + { + vec.x = (ft_face->glyph->metrics.horiBearingX + + xc * ft_face->glyph->metrics.width); + vec.y = ft_face->glyph->metrics.horiBearingY - + yc * ft_face->glyph->metrics.height; + DPRINT("Vec %ld,%ld\n", vec.x, vec.y); + FT_Vector_Transform(&vec, &transMat); + if(xc == 0 && yc == 0) + { + left = right = vec.x; + top = bottom = vec.y; + } + else + { + if(vec.x < left) left = vec.x; + else if(vec.x > right) right = vec.x; + if(vec.y < bottom) bottom = vec.y; + else if(vec.y > top) top = vec.y; + } + } + } + left = left & -64; + right = (right + 63) & -64; + bottom = bottom & -64; + top = (top + 63) & -64; + + DPRINT("transformed box: (%d,%d - %d,%d)\n", left, top, right, bottom); + vec.x = ft_face->glyph->metrics.horiAdvance; + vec.y = 0; + FT_Vector_Transform(&vec, &transMat); + gm.gmCellIncX = (vec.x+63) >> 6; + gm.gmCellIncY = -((vec.y+63) >> 6); + } + gm.gmBlackBoxX = (right - left) >> 6; + gm.gmBlackBoxY = (top - bottom) >> 6; + gm.gmptGlyphOrigin.x = left >> 6; + gm.gmptGlyphOrigin.y = top >> 6; + + DPRINT("CX %d CY %d BBX %d BBY %d GOX %d GOY %d\n", + gm.gmCellIncX, gm.gmCellIncY, + gm.gmBlackBoxX, gm.gmBlackBoxY, + gm.gmptGlyphOrigin.x, gm.gmptGlyphOrigin.y); + + IntUnLockFreeType; + + if (pgm) RtlCopyMemory(pgm, &gm, sizeof(GLYPHMETRICS)); + + if (iFormat == GGO_METRICS) + { + DPRINT("GGO_METRICS Exit!\n"); + return 1; /* FIXME */ + } + + if (ft_face->glyph->format != ft_glyph_format_outline && iFormat != GGO_BITMAP) + { + DPRINT1("loaded a bitmap\n"); + return GDI_ERROR; + } + + switch(iFormat) + { + case GGO_BITMAP: + width = gm.gmBlackBoxX; + height = gm.gmBlackBoxY; + pitch = ((width + 31) >> 5) << 2; + needed = pitch * height; + + if(!pvBuf || !cjBuf) break; + + switch(ft_face->glyph->format) + { + case ft_glyph_format_bitmap: + { + BYTE *src = ft_face->glyph->bitmap.buffer, *dst = pvBuf; + INT w = (ft_face->glyph->bitmap.width + 7) >> 3; + INT h = ft_face->glyph->bitmap.rows; + while(h--) + { + RtlCopyMemory(dst, src, w); + src += ft_face->glyph->bitmap.pitch; + dst += pitch; + } + break; + } + + case ft_glyph_format_outline: + ft_bitmap.width = width; + ft_bitmap.rows = height; + ft_bitmap.pitch = pitch; + ft_bitmap.pixel_mode = ft_pixel_mode_mono; + ft_bitmap.buffer = pvBuf; + + IntLockFreeType; + if(needsTransform) + { + FT_Outline_Transform(&ft_face->glyph->outline, &transMat); + } + FT_Outline_Translate(&ft_face->glyph->outline, -left, -bottom ); + /* Note: FreeType will only set 'black' bits for us. */ + RtlZeroMemory(pvBuf, needed); + FT_Outline_Get_Bitmap(library, &ft_face->glyph->outline, &ft_bitmap); + IntUnLockFreeType; + break; + + default: + DPRINT1("loaded glyph format %x\n", ft_face->glyph->format); + return GDI_ERROR; + } + break; + + case GGO_GRAY2_BITMAP: + case GGO_GRAY4_BITMAP: + case GGO_GRAY8_BITMAP: + { + unsigned int mult, row, col; + BYTE *start, *ptr; + + width = gm.gmBlackBoxX; + height = gm.gmBlackBoxY; + pitch = (width + 3) / 4 * 4; + needed = pitch * height; + + if(!pvBuf || !cjBuf) break; + + switch(ft_face->glyph->format) + { + case ft_glyph_format_bitmap: + { + BYTE *src = ft_face->glyph->bitmap.buffer, *dst = pvBuf; + INT h = ft_face->glyph->bitmap.rows; + INT x; + while(h--) + { + for(x = 0; x < pitch; x++) + { + if(x < ft_face->glyph->bitmap.width) + dst[x] = (src[x / 8] & (1 << ( (7 - (x % 8))))) ? 0xff : 0; + else + dst[x] = 0; + } + src += ft_face->glyph->bitmap.pitch; + dst += pitch; + } + return needed; + } + case ft_glyph_format_outline: + { + ft_bitmap.width = width; + ft_bitmap.rows = height; + ft_bitmap.pitch = pitch; + ft_bitmap.pixel_mode = ft_pixel_mode_grays; + ft_bitmap.buffer = pvBuf; + + IntLockFreeType; + if (needsTransform) + { + FT_Outline_Transform(&ft_face->glyph->outline, &transMat); + } + FT_Outline_Translate(&ft_face->glyph->outline, -left, -bottom ); + RtlZeroMemory(ft_bitmap.buffer, cjBuf); + FT_Outline_Get_Bitmap(library, &ft_face->glyph->outline, &ft_bitmap); + IntUnLockFreeType; + + if (iFormat == GGO_GRAY2_BITMAP) + mult = 4; + else if (iFormat == GGO_GRAY4_BITMAP) + mult = 16; + else if (iFormat == GGO_GRAY8_BITMAP) + mult = 64; + else + { + return GDI_ERROR; + } + } + default: + DPRINT1("loaded glyph format %x\n", ft_face->glyph->format); + return GDI_ERROR; + } + start = pvBuf; + for(row = 0; row < height; row++) + { + ptr = start; + for(col = 0; col < width; col++, ptr++) + { + *ptr = (((int)*ptr) * mult + 128) / 256; + } + start += pitch; + } + break; + } + + case GGO_NATIVE: + { + int contour, point = 0, first_pt; + FT_Outline *outline = &ft_face->glyph->outline; + TTPOLYGONHEADER *pph; + TTPOLYCURVE *ppc; + DWORD pph_start, cpfx, type; + + if(cjBuf == 0) pvBuf = NULL; /* This is okay, need cjBuf to allocate. */ + + IntLockFreeType; + if (needsTransform && pvBuf) FT_Outline_Transform(outline, &transMat); + + for(contour = 0; contour < outline->n_contours; contour++) + { + pph_start = needed; + pph = (TTPOLYGONHEADER *)((char *)pvBuf + needed); + first_pt = point; + if(pvBuf) + { + pph->dwType = TT_POLYGON_TYPE; + FTVectorToPOINTFX(&outline->points[point], &pph->pfxStart); + } + needed += sizeof(*pph); + point++; + while(point <= outline->contours[contour]) + { + ppc = (TTPOLYCURVE *)((char *)pvBuf + needed); + type = (outline->tags[point] & FT_Curve_Tag_On) ? + TT_PRIM_LINE : TT_PRIM_QSPLINE; + cpfx = 0; + do + { + if(pvBuf) + FTVectorToPOINTFX(&outline->points[point], &ppc->apfx[cpfx]); + cpfx++; + point++; + } while(point <= outline->contours[contour] && + (outline->tags[point] & FT_Curve_Tag_On) == + (outline->tags[point-1] & FT_Curve_Tag_On)); + + /* At the end of a contour Windows adds the start point, but + only for Beziers */ + if(point > outline->contours[contour] && + !(outline->tags[point-1] & FT_Curve_Tag_On)) + { + if(pvBuf) + FTVectorToPOINTFX(&outline->points[first_pt], &ppc->apfx[cpfx]); + cpfx++; + } + else if(point <= outline->contours[contour] && + outline->tags[point] & FT_Curve_Tag_On) + { + /* add closing pt for bezier */ + if(pvBuf) + FTVectorToPOINTFX(&outline->points[point], &ppc->apfx[cpfx]); + cpfx++; + point++; + } + if(pvBuf) + { + ppc->wType = type; + ppc->cpfx = cpfx; + } + needed += sizeof(*ppc) + (cpfx - 1) * sizeof(POINTFX); + } + if(pvBuf) pph->cb = needed - pph_start; + } + IntUnLockFreeType; + break; + } + case GGO_BEZIER: + { + /* Convert the quadratic Beziers to cubic Beziers. + The parametric eqn for a cubic Bezier is, from PLRM: + r(t) = at^3 + bt^2 + ct + r0 + with the control points: + r1 = r0 + c/3 + r2 = r1 + (c + b)/3 + r3 = r0 + c + b + a + + A quadratic Beizer has the form: + p(t) = (1-t)^2 p0 + 2(1-t)t p1 + t^2 p2 + + So equating powers of t leads to: + r1 = 2/3 p1 + 1/3 p0 + r2 = 2/3 p1 + 1/3 p2 + and of course r0 = p0, r3 = p2 + */ + + int contour, point = 0, first_pt; + FT_Outline *outline = &ft_face->glyph->outline; + TTPOLYGONHEADER *pph; + TTPOLYCURVE *ppc; + DWORD pph_start, cpfx, type; + FT_Vector cubic_control[4]; + if(cjBuf == 0) pvBuf = NULL; + + if (needsTransform && pvBuf) + { + IntLockFreeType; + FT_Outline_Transform(outline, &transMat); + IntUnLockFreeType; + } + + for(contour = 0; contour < outline->n_contours; contour++) + { + pph_start = needed; + pph = (TTPOLYGONHEADER *)((char *)pvBuf + needed); + first_pt = point; + if(pvBuf) + { + pph->dwType = TT_POLYGON_TYPE; + FTVectorToPOINTFX(&outline->points[point], &pph->pfxStart); + } + needed += sizeof(*pph); + point++; + while(point <= outline->contours[contour]) + { + ppc = (TTPOLYCURVE *)((char *)pvBuf + needed); + type = (outline->tags[point] & FT_Curve_Tag_On) ? + TT_PRIM_LINE : TT_PRIM_CSPLINE; + cpfx = 0; + do + { + if(type == TT_PRIM_LINE) + { + if(pvBuf) + FTVectorToPOINTFX(&outline->points[point], &ppc->apfx[cpfx]); + cpfx++; + point++; + } + else + { + /* Unlike QSPLINEs, CSPLINEs always have their endpoint + so cpfx = 3n */ + + /* FIXME: Possible optimization in endpoint calculation + if there are two consecutive curves */ + cubic_control[0] = outline->points[point-1]; + if(!(outline->tags[point-1] & FT_Curve_Tag_On)) + { + cubic_control[0].x += outline->points[point].x + 1; + cubic_control[0].y += outline->points[point].y + 1; + cubic_control[0].x >>= 1; + cubic_control[0].y >>= 1; + } + if(point+1 > outline->contours[contour]) + cubic_control[3] = outline->points[first_pt]; + else + { + cubic_control[3] = outline->points[point+1]; + if(!(outline->tags[point+1] & FT_Curve_Tag_On)) + { + cubic_control[3].x += outline->points[point].x + 1; + cubic_control[3].y += outline->points[point].y + 1; + cubic_control[3].x >>= 1; + cubic_control[3].y >>= 1; + } + } + /* r1 = 1/3 p0 + 2/3 p1 + r2 = 1/3 p2 + 2/3 p1 */ + cubic_control[1].x = (2 * outline->points[point].x + 1) / 3; + cubic_control[1].y = (2 * outline->points[point].y + 1) / 3; + cubic_control[2] = cubic_control[1]; + cubic_control[1].x += (cubic_control[0].x + 1) / 3; + cubic_control[1].y += (cubic_control[0].y + 1) / 3; + cubic_control[2].x += (cubic_control[3].x + 1) / 3; + cubic_control[2].y += (cubic_control[3].y + 1) / 3; + if(pvBuf) + { + FTVectorToPOINTFX(&cubic_control[1], &ppc->apfx[cpfx]); + FTVectorToPOINTFX(&cubic_control[2], &ppc->apfx[cpfx+1]); + FTVectorToPOINTFX(&cubic_control[3], &ppc->apfx[cpfx+2]); + } + cpfx += 3; + point++; + } + } + while(point <= outline->contours[contour] && + (outline->tags[point] & FT_Curve_Tag_On) == + (outline->tags[point-1] & FT_Curve_Tag_On)); + /* At the end of a contour Windows adds the start point, + but only for Beziers and we've already done that. + */ + if(point <= outline->contours[contour] && + outline->tags[point] & FT_Curve_Tag_On) + { + /* This is the closing pt of a bezier, but we've already + added it, so just inc point and carry on */ + point++; + } + if(pvBuf) + { + ppc->wType = type; + ppc->cpfx = cpfx; + } + needed += sizeof(*ppc) + (cpfx - 1) * sizeof(POINTFX); + } + if(pvBuf) pph->cb = needed - pph_start; + } + break; + } + + default: + DPRINT1("Unsupported format %d\n", iFormat); + return GDI_ERROR; + } + + DPRINT("ftGdiGetGlyphOutline END and needed %d\n", needed); + return needed; +} + +BOOL +FASTCALL +TextIntGetTextExtentPoint(PDC dc, + PTEXTOBJ TextObj, + LPCWSTR String, + int Count, + int MaxExtent, + LPINT Fit, + LPINT Dx, + LPSIZE Size) +{ + PFONTGDI FontGDI; + FT_Face face; + FT_GlyphSlot glyph; + FT_Glyph realglyph; + INT error, n, glyph_index, i, previous; + ULONGLONG TotalWidth = 0; + FT_CharMap charmap, found = NULL; + BOOL use_kerning; + FT_Render_Mode RenderMode; + BOOLEAN Render; + + FontGDI = ObjToGDI(TextObj->Font, FONT); + + face = FontGDI->face; + if (NULL != Fit) + { + *Fit = 0; + } + + IntLockFreeType; + if (face->charmap == NULL) + { + DPRINT("WARNING: No charmap selected!\n"); + DPRINT("This font face has %d charmaps\n", face->num_charmaps); + + for (n = 0; n < face->num_charmaps; n++) + { + charmap = face->charmaps[n]; + DPRINT("found charmap encoding: %u\n", charmap->encoding); + if (charmap->encoding != 0) + { + found = charmap; + break; + } + } + + if (! found) + { + DPRINT1("WARNING: Could not find desired charmap!\n"); + } + + error = FT_Set_Charmap(face, found); + if (error) + { + DPRINT1("WARNING: Could not set the charmap!\n"); + } + } + + Render = IntIsFontRenderingEnabled(); + if (Render) + RenderMode = IntGetFontRenderMode(&TextObj->logfont.elfEnumLogfontEx.elfLogFont); + else + RenderMode = FT_RENDER_MODE_MONO; + + error = FT_Set_Pixel_Sizes(face, + TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfWidth, + /* FIXME should set character height if neg */ + (TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight < 0 ? + - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight : + TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight == 0 ? 11 : TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight)); + if (error) + { + DPRINT1("Error in setting pixel sizes: %u\n", error); + } + + use_kerning = FT_HAS_KERNING(face); + previous = 0; + + for (i = 0; i < Count; i++) + { + glyph_index = FT_Get_Char_Index(face, *String); + if (!(realglyph = ftGdiGlyphCacheGet(face, glyph_index, + TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight))) + { + error = FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT); + if (error) + { + DPRINT1("WARNING: Failed to load and render glyph! [index: %u]\n", glyph_index); + break; + } + + glyph = face->glyph; + realglyph = ftGdiGlyphCacheSet(face, glyph_index, + TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight, glyph, RenderMode); + if (!realglyph) + { + DPRINT1("Failed to render glyph! [index: %u]\n", glyph_index); + break; + } + } + + /* retrieve kerning distance */ + if (use_kerning && previous && glyph_index) + { + FT_Vector delta; + FT_Get_Kerning(face, previous, glyph_index, 0, &delta); + TotalWidth += delta.x; + } + + TotalWidth += realglyph->advance.x >> 10; + + if (((TotalWidth + 32) >> 6) <= MaxExtent && NULL != Fit) + { + *Fit = i + 1; + } + if (NULL != Dx) + { + Dx[i] = (TotalWidth + 32) >> 6; + } + + previous = glyph_index; + String++; + } + IntUnLockFreeType; + + Size->cx = (TotalWidth + 32) >> 6; + Size->cy = (TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight < 0 ? - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight : TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight); + Size->cy = EngMulDiv(Size->cy, IntGdiGetDeviceCaps(dc, LOGPIXELSY), 72); + + return TRUE; +} + + +INT +FASTCALL +ftGdiGetTextCharsetInfo( + PDC Dc, + LPFONTSIGNATURE lpSig, + DWORD dwFlags) +{ + PDC_ATTR Dc_Attr; + UINT Ret = DEFAULT_CHARSET, i; + HFONT hFont; + PTEXTOBJ TextObj; + PFONTGDI FontGdi; + FONTSIGNATURE fs; + TT_OS2 *pOS2; + FT_Face Face; + CHARSETINFO csi; + DWORD cp, fs0; + USHORT usACP, usOEM; + + Dc_Attr = Dc->pDc_Attr; + if(!Dc_Attr) Dc_Attr = &Dc->Dc_Attr; + hFont = Dc_Attr->hlfntNew; + TextObj = RealizeFontInit(hFont); + + if (!TextObj) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return Ret; + } + FontGdi = ObjToGDI(TextObj->Font, FONT); + Face = FontGdi->face; + TEXTOBJ_UnlockText(TextObj); + + IntLockFreeType; + pOS2 = FT_Get_Sfnt_Table(Face, ft_sfnt_os2); + IntUnLockFreeType; + memset(&fs, 0, sizeof(FONTSIGNATURE)); + if (NULL != pOS2) + { + fs.fsCsb[0] = pOS2->ulCodePageRange1; + fs.fsCsb[1] = pOS2->ulCodePageRange2; + fs.fsUsb[0] = pOS2->ulUnicodeRange1; + fs.fsUsb[1] = pOS2->ulUnicodeRange2; + fs.fsUsb[2] = pOS2->ulUnicodeRange3; + fs.fsUsb[3] = pOS2->ulUnicodeRange4; + if (pOS2->version == 0) + { + FT_UInt dummy; + + if(FT_Get_First_Char( Face, &dummy ) < 0x100) + fs.fsCsb[0] |= FS_LATIN1; + else + fs.fsCsb[0] |= FS_SYMBOL; + } + } + DPRINT("Csb 1=%x 0=%x\n", fs.fsCsb[1],fs.fsCsb[0]); + if (fs.fsCsb[0] == 0) + { /* let's see if we can find any interesting cmaps */ + for (i = 0; i < Face->num_charmaps; i++) + { + switch (Face->charmaps[i]->encoding) + { + case FT_ENCODING_UNICODE: + case FT_ENCODING_APPLE_ROMAN: + fs.fsCsb[0] |= FS_LATIN1; + break; + case FT_ENCODING_MS_SYMBOL: + fs.fsCsb[0] |= FS_SYMBOL; + break; + default: + break; + } + } + } + if (lpSig) + { + RtlCopyMemory(lpSig, &fs, sizeof(FONTSIGNATURE)); + } + + RtlGetDefaultCodePage(&usACP, &usOEM); + cp = usACP; + + if (IntTranslateCharsetInfo(&cp, &csi, TCI_SRCCODEPAGE)) + if (csi.fs.fsCsb[0] & fs.fsCsb[0]) + { + DPRINT("Hit 1\n"); + Ret = csi.ciCharset; + goto Exit; + } + + for (i = 0; i < MAXTCIINDEX; i++) + { + fs0 = 1L << i; + if (fs.fsCsb[0] & fs0) + { + if (IntTranslateCharsetInfo(&fs0, &csi, TCI_SRCFONTSIG)) + { + //*cp = csi.ciACP; + DPRINT("Hit 2\n"); + Ret = csi.ciCharset; + goto Exit; + } + else + DPRINT1("TCI failing on %x\n", fs0); + } + } +Exit: + DPRINT("CharSet %d CodePage %d\n",csi.ciCharset, csi.ciACP); + return (MAKELONG(csi.ciACP, csi.ciCharset)); +} + + +DWORD +FASTCALL +ftGetFontUnicodeRanges(PFONTGDI Font, PGLYPHSET glyphset) +{ + DWORD size = 0; + DWORD num_ranges = 0; + FT_Face face = Font->face; + + if (face->charmap->encoding == FT_ENCODING_UNICODE) + { + FT_UInt glyph_code = 0; + FT_ULong char_code, char_code_prev; + + char_code_prev = char_code = FT_Get_First_Char(face, &glyph_code); + + DPRINT("face encoding FT_ENCODING_UNICODE, number of glyphs %ld, first glyph %u, first char %04lx\n", + face->num_glyphs, glyph_code, char_code); + + if (!glyph_code) return 0; + + if (glyphset) + { + glyphset->ranges[0].wcLow = (USHORT)char_code; + glyphset->ranges[0].cGlyphs = 0; + glyphset->cGlyphsSupported = 0; + } + + num_ranges = 1; + while (glyph_code) + { + if (char_code < char_code_prev) + { + DPRINT1("expected increasing char code from FT_Get_Next_Char\n"); + return 0; + } + if (char_code - char_code_prev > 1) + { + num_ranges++; + if (glyphset) + { + glyphset->ranges[num_ranges - 1].wcLow = (USHORT)char_code; + glyphset->ranges[num_ranges - 1].cGlyphs = 1; + glyphset->cGlyphsSupported++; + } + } + else if (glyphset) + { + glyphset->ranges[num_ranges - 1].cGlyphs++; + glyphset->cGlyphsSupported++; + } + char_code_prev = char_code; + char_code = FT_Get_Next_Char(face, char_code, &glyph_code); + } + } + else + DPRINT1("encoding %u not supported\n", face->charmap->encoding); + + size = sizeof(GLYPHSET) + sizeof(WCRANGE) * (num_ranges - 1); + if (glyphset) + { + glyphset->cbThis = size; + glyphset->cRanges = num_ranges; + } + return size; +} + + +BOOL +FASTCALL +ftGdiGetTextMetricsW( + HDC hDC, + PTMW_INTERNAL ptmwi) +{ + PDC dc; + PDC_ATTR Dc_Attr; + PTEXTOBJ TextObj; + PFONTGDI FontGDI; + FT_Face Face; + TT_OS2 *pOS2; + TT_HoriHeader *pHori; + FT_WinFNT_HeaderRec Win; + ULONG Error; + NTSTATUS Status = STATUS_SUCCESS; + + if (!ptmwi) + { + SetLastWin32Error(STATUS_INVALID_PARAMETER); + return FALSE; + } + + if(!(dc = DC_LockDc(hDC))) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return FALSE; + } + Dc_Attr = dc->pDc_Attr; + if(!Dc_Attr) Dc_Attr = &dc->Dc_Attr; + TextObj = RealizeFontInit(Dc_Attr->hlfntNew); + if (NULL != TextObj) + { + FontGDI = ObjToGDI(TextObj->Font, FONT); + + Face = FontGDI->face; + IntLockFreeType; + Error = FT_Set_Pixel_Sizes(Face, + TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfWidth, + /* FIXME should set character height if neg */ + (TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight < 0 ? + - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight : + TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight == 0 ? 11 : TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight)); + IntUnLockFreeType; + if (0 != Error) + { + DPRINT1("Error in setting pixel sizes: %u\n", Error); + Status = STATUS_UNSUCCESSFUL; + } + else + { + Status = STATUS_SUCCESS; + + IntLockFreeType; + pOS2 = FT_Get_Sfnt_Table(FontGDI->face, ft_sfnt_os2); + if (NULL == pOS2) + { + DPRINT1("Can't find OS/2 table - not TT font?\n"); + Status = STATUS_INTERNAL_ERROR; + } + + pHori = FT_Get_Sfnt_Table(FontGDI->face, ft_sfnt_hhea); + if (NULL == pHori) + { + DPRINT1("Can't find HHEA table - not TT font?\n"); + Status = STATUS_INTERNAL_ERROR; + } + + Error = FT_Get_WinFNT_Header(FontGDI->face , &Win); + + IntUnLockFreeType; + + if (NT_SUCCESS(Status)) + { + if (!(FontGDI->flRealizedType & FDM_TYPE_TEXT_METRIC)) + { + FillTM(&FontGDI->TextMetric, FontGDI, pOS2, pHori, !Error ? &Win : 0); + FontGDI->flRealizedType |= FDM_TYPE_TEXT_METRIC; + } + + RtlCopyMemory(&ptmwi->TextMetric, &FontGDI->TextMetric, sizeof(TEXTMETRICW)); + /* FIXME: Fill Diff member */ + RtlZeroMemory(&ptmwi->Diff, sizeof(ptmwi->Diff)); + } + } + TEXTOBJ_UnlockText(TextObj); + } + else + { + Status = STATUS_INVALID_HANDLE; + } + DC_UnlockDc(dc); + + if (!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + return FALSE; + } + return TRUE; +} + + +DWORD +FASTCALL +ftGdiGetFontData( + PFONTGDI FontGdi, + DWORD Table, + DWORD Offset, + PVOID Buffer, + DWORD Size) +{ + DWORD Result = GDI_ERROR; + + IntLockFreeType; + + if (FT_IS_SFNT(FontGdi->face)) + { + if (Table) + Table = Table >> 24 | Table << 24 | (Table >> 8 & 0xFF00) | + (Table << 8 & 0xFF0000); + + if (!Buffer) Size = 0; + + if (Buffer && Size) + { + FT_Error Error; + FT_ULong Needed = 0; + + Error = FT_Load_Sfnt_Table(FontGdi->face, Table, Offset, NULL, &Needed); + + if( !Error && Needed < Size) Size = Needed; + } + if (!FT_Load_Sfnt_Table(FontGdi->face, Table, Offset, Buffer, &Size)) + Result = Size; + } + + IntUnLockFreeType; + + return Result; +} + +static UINT FASTCALL +GetFontScore(LOGFONTW *LogFont, PUNICODE_STRING FaceName, PFONTGDI FontGDI) +{ + ANSI_STRING EntryFaceNameA; + UNICODE_STRING EntryFaceNameW; + unsigned Size; + OUTLINETEXTMETRICW *Otm; + LONG WeightDiff; + NTSTATUS Status; + UINT Score = 1; + + RtlInitAnsiString(&EntryFaceNameA, FontGDI->face->family_name); + Status = RtlAnsiStringToUnicodeString(&EntryFaceNameW, &EntryFaceNameA, TRUE); + if (NT_SUCCESS(Status)) + { + if ((LF_FACESIZE - 1) * sizeof(WCHAR) < EntryFaceNameW.Length) + { + EntryFaceNameW.Length = (LF_FACESIZE - 1) * sizeof(WCHAR); + EntryFaceNameW.Buffer[LF_FACESIZE - 1] = L'\0'; + } + if (0 == RtlCompareUnicodeString(FaceName, &EntryFaceNameW, TRUE)) + { + Score += 49; + } + RtlFreeUnicodeString(&EntryFaceNameW); + } + + Size = IntGetOutlineTextMetrics(FontGDI, 0, NULL); + Otm = ExAllocatePoolWithTag(PagedPool, Size, TAG_GDITEXT); + if (NULL == Otm) + { + return Score; + } + IntGetOutlineTextMetrics(FontGDI, Size, Otm); + + if ((0 != LogFont->lfItalic && 0 != Otm->otmTextMetrics.tmItalic) || + (0 == LogFont->lfItalic && 0 == Otm->otmTextMetrics.tmItalic)) + { + Score += 25; + } + if (LogFont->lfWeight != FW_DONTCARE) + { + if (LogFont->lfWeight < Otm->otmTextMetrics.tmWeight) + { + WeightDiff = Otm->otmTextMetrics.tmWeight - LogFont->lfWeight; + } + else + { + WeightDiff = LogFont->lfWeight - Otm->otmTextMetrics.tmWeight; + } + Score += (1000 - WeightDiff) / (1000 / 25); + } + else + { + Score += 25; + } + + ExFreePool(Otm); + + return Score; +} + +static __inline VOID +FindBestFontFromList(FONTOBJ **FontObj, UINT *MatchScore, LOGFONTW *LogFont, + PUNICODE_STRING FaceName, PLIST_ENTRY Head) +{ + PLIST_ENTRY Entry; + PFONT_ENTRY CurrentEntry; + FONTGDI *FontGDI; + UINT Score; + + Entry = Head->Flink; + while (Entry != Head) + { + CurrentEntry = (PFONT_ENTRY) CONTAINING_RECORD(Entry, FONT_ENTRY, ListEntry); + + FontGDI = CurrentEntry->Font; + ASSERT(FontGDI); + + Score = GetFontScore(LogFont, FaceName, FontGDI); + if (*MatchScore == 0 || *MatchScore < Score) + { + *FontObj = GDIToObj(FontGDI, FONT); + *MatchScore = Score; + } + Entry = Entry->Flink; + } +} + +static __inline BOOLEAN +SubstituteFontFamilyKey(PUNICODE_STRING FaceName, + LPCWSTR Key) +{ + RTL_QUERY_REGISTRY_TABLE QueryTable[2] = {{0}}; + NTSTATUS Status; + UNICODE_STRING Value; + + RtlInitUnicodeString(&Value, NULL); + + QueryTable[0].QueryRoutine = NULL; + QueryTable[0].Flags = RTL_QUERY_REGISTRY_DIRECT | RTL_QUERY_REGISTRY_NOEXPAND | + RTL_QUERY_REGISTRY_REQUIRED; + QueryTable[0].Name = FaceName->Buffer; + QueryTable[0].EntryContext = &Value; + QueryTable[0].DefaultType = REG_NONE; + QueryTable[0].DefaultData = NULL; + QueryTable[0].DefaultLength = 0; + + QueryTable[1].QueryRoutine = NULL; + QueryTable[1].Name = NULL; + + Status = RtlQueryRegistryValues(RTL_REGISTRY_WINDOWS_NT, + Key, + QueryTable, + NULL, + NULL); + if (NT_SUCCESS(Status)) + { + RtlFreeUnicodeString(FaceName); + *FaceName = Value; + } + + return NT_SUCCESS(Status); +} + +static __inline void +SubstituteFontFamily(PUNICODE_STRING FaceName, UINT Level) +{ + if (10 < Level) /* Enough is enough */ + { + return; + } + + if (SubstituteFontFamilyKey(FaceName, L"SysFontSubstitutes") || + SubstituteFontFamilyKey(FaceName, L"FontSubstitutes")) + { + SubstituteFontFamily(FaceName, Level + 1); + } +} + +static +VOID +FASTCALL +IntFontType(PFONTGDI Font) +{ + PS_FontInfoRec psfInfo; + FT_ULong tmp_size = 0; + + if (FT_HAS_MULTIPLE_MASTERS(Font->face)) + Font->FontObj.flFontType |= FO_MULTIPLEMASTER; + if (FT_HAS_VERTICAL( Font->face )) + Font->FontObj.flFontType |= FO_VERT_FACE; + if (FT_IS_SCALABLE( Font->face )) + Font->FontObj.flFontType |= FO_TYPE_RASTER; + if (FT_IS_SFNT(Font->face)) + { + Font->FontObj.flFontType |= FO_TYPE_TRUETYPE; + if (FT_Get_Sfnt_Table(Font->face, ft_sfnt_post)) + Font->FontObj.flFontType |= FO_POSTSCRIPT; + } + if (!FT_Get_PS_Font_Info(Font->face, &psfInfo )) + { + Font->FontObj.flFontType |= FO_POSTSCRIPT; + } + /* check for the presence of the 'CFF ' table to check if the font is Type1 */ + if (!FT_Load_Sfnt_Table(Font->face, FT_MAKE_TAG('C','F','F',' '), 0, NULL, &tmp_size)) + { + Font->FontObj.flFontType |= (FO_CFF|FO_POSTSCRIPT); + } +} + +NTSTATUS +FASTCALL +TextIntRealizeFont(HFONT FontHandle, PTEXTOBJ pTextObj) +{ + NTSTATUS Status = STATUS_SUCCESS; + PTEXTOBJ TextObj; + UNICODE_STRING FaceName; + PW32PROCESS Win32Process; + UINT MatchScore; + + if (!pTextObj) + { + TextObj = TEXTOBJ_LockText(FontHandle); + if (NULL == TextObj) + { + return STATUS_INVALID_HANDLE; + } + + if (TextObj->fl & TEXTOBJECT_INIT) + { + TEXTOBJ_UnlockText(TextObj); + return STATUS_SUCCESS; + } + } + else + TextObj = pTextObj; + + if (! RtlCreateUnicodeString(&FaceName, TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfFaceName)) + { + if (!pTextObj) TEXTOBJ_UnlockText(TextObj); + return STATUS_NO_MEMORY; + } + SubstituteFontFamily(&FaceName, 0); + MatchScore = 0; + TextObj->Font = NULL; + + /* First search private fonts */ + Win32Process = PsGetCurrentProcessWin32Process(); + IntLockProcessPrivateFonts(Win32Process); + FindBestFontFromList(&TextObj->Font, &MatchScore, + &TextObj->logfont.elfEnumLogfontEx.elfLogFont, &FaceName, + &Win32Process->PrivateFontListHead); + IntUnLockProcessPrivateFonts(Win32Process); + + /* Search system fonts */ + IntLockGlobalFonts; + FindBestFontFromList(&TextObj->Font, &MatchScore, + &TextObj->logfont.elfEnumLogfontEx.elfLogFont, &FaceName, + &FontListHead); + IntUnLockGlobalFonts; + if (NULL == TextObj->Font) + { + DPRINT1("Requested font %S not found, no fonts loaded at all\n", + TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfFaceName); + Status = STATUS_NOT_FOUND; + } + else + { + PFONTGDI FontGdi = ObjToGDI(TextObj->Font, FONT); + // Need hdev, when freetype is loaded need to create DEVOBJ for + // Consumer and Producer. + TextObj->Font->iUniq = 1; // Now it can be cached. + IntFontType(FontGdi); + FontGdi->flType = TextObj->Font->flFontType; + FontGdi->flRealizedType = 0; + FontGdi->Underline = TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfUnderline ? 0xff : 0; + FontGdi->StrikeOut = TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfStrikeOut ? 0xff : 0; + TextObj->fl |= TEXTOBJECT_INIT; + Status = STATUS_SUCCESS; + } + + RtlFreeUnicodeString(&FaceName); + if (!pTextObj) TEXTOBJ_UnlockText(TextObj); + + ASSERT((NT_SUCCESS(Status) ^ (NULL == TextObj->Font)) != 0); + + return Status; +} + + +static +BOOL +FASTCALL +IntGetFullFileName( + POBJECT_NAME_INFORMATION NameInfo, + ULONG Size, + PUNICODE_STRING FileName) +{ + NTSTATUS Status; + OBJECT_ATTRIBUTES ObjectAttributes; + HANDLE hFile; + IO_STATUS_BLOCK IoStatusBlock; + ULONG Desired; + + InitializeObjectAttributes(&ObjectAttributes, + FileName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + Status = ZwOpenFile( + &hFile, + 0, //FILE_READ_ATTRIBUTES, + &ObjectAttributes, + &IoStatusBlock, + FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + 0); + + if (!NT_SUCCESS(Status)) + { + DPRINT("ZwOpenFile() failed (Status = 0x%lx)\n", Status); + return FALSE; + } + + Status = ZwQueryObject(hFile, ObjectNameInformation, NameInfo, Size, &Desired); + ZwClose(hFile); + if (!NT_SUCCESS(Status)) + { + DPRINT("ZwQueryObject() failed (Status = %lx)\n", Status); + return FALSE; + } + + return TRUE; +} + +BOOL +FASTCALL +IntGdiGetFontResourceInfo( + PUNICODE_STRING FileName, + PVOID pBuffer, + DWORD *pdwBytes, + DWORD dwType) +{ + UNICODE_STRING EntryFileName; + POBJECT_NAME_INFORMATION NameInfo1, NameInfo2; + PLIST_ENTRY ListEntry; + PFONT_ENTRY FontEntry; + FONTFAMILYINFO Info; + ULONG Size; + BOOL bFound = FALSE; + + /* Create buffer for full path name */ + Size = sizeof(OBJECT_NAME_INFORMATION) + MAX_PATH * sizeof(WCHAR); + NameInfo1 = ExAllocatePoolWithTag(PagedPool, Size, TAG_FINF); + if (!NameInfo1) + { + SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + /* Get the full path name */ + if (!IntGetFullFileName(NameInfo1, Size, FileName)) + { + ExFreePool(NameInfo1); + return FALSE; + } + + /* Create a buffer for the entries' names */ + NameInfo2 = ExAllocatePoolWithTag(PagedPool, Size, TAG_FINF); + if (!NameInfo2) + { + ExFreePool(NameInfo1); + SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + /* Try to find the pathname in the global font list */ + IntLockGlobalFonts; + for (ListEntry = FontListHead.Flink; + ListEntry != &FontListHead; + ListEntry = ListEntry->Flink) + { + FontEntry = CONTAINING_RECORD(ListEntry, FONT_ENTRY, ListEntry); + if (FontEntry->Font->Filename != NULL) + { + RtlInitUnicodeString(&EntryFileName , FontEntry->Font->Filename); + if (IntGetFullFileName(NameInfo2, Size, &EntryFileName)) + { + if (RtlEqualUnicodeString(&NameInfo1->Name, &NameInfo2->Name, FALSE)) + { + /* found */ + FontFamilyFillInfo(&Info, FontEntry->FaceName.Buffer, FontEntry->Font); + bFound = TRUE; + break; + } + } + } + } + IntUnLockGlobalFonts; + + /* Free the buffers */ + ExFreePool(NameInfo1); + ExFreePool(NameInfo2); + + if (!bFound && dwType != 5) + { + /* Font could not be found in system table + dwType == 5 will still handle this */ + return FALSE; + } + + switch(dwType) + { + case 0: /* FIXME: returns 1 or 2, don't know what this is atm */ + *(DWORD*)pBuffer = 1; + *pdwBytes = sizeof(DWORD); + break; + + case 1: /* Copy the full font name */ + Size = wcslen(Info.EnumLogFontEx.elfFullName) + 1; + Size = min(Size , LF_FULLFACESIZE) * sizeof(WCHAR); + RtlCopyMemory(pBuffer, Info.EnumLogFontEx.elfFullName, Size); + // FIXME: Do we have to zeroterminate? + *pdwBytes = Size; + break; + + case 2: /* Copy a LOGFONTW structure */ + Info.EnumLogFontEx.elfLogFont.lfWidth = 0; + RtlCopyMemory(pBuffer, &Info.EnumLogFontEx.elfLogFont, sizeof(LOGFONTW)); + *pdwBytes = sizeof(LOGFONTW); + break; + + case 3: /* FIXME: What exactly is copied here? */ + *(DWORD*)pBuffer = 1; + *pdwBytes = sizeof(DWORD*); + break; + + case 5: /* Looks like a BOOL that is copied, TRUE, if the font was not found */ + *(BOOL*)pBuffer = !bFound; + *pdwBytes = sizeof(BOOL); + break; + + default: + return FALSE; + } + + return TRUE; +} + + +BOOL +FASTCALL +ftGdiRealizationInfo(PFONTGDI Font, PREALIZATION_INFO Info) +{ + if (FT_HAS_FIXED_SIZES(Font->face)) + Info->iTechnology = RI_TECH_BITMAP; + else + { + if (FT_IS_SCALABLE(Font->face)) + Info->iTechnology = RI_TECH_SCALABLE; + else + Info->iTechnology = RI_TECH_FIXED; + } + Info->iUniq = Font->FontObj.iUniq; + Info->dwUnknown = -1; + return TRUE; +} + + +DWORD +FASTCALL +ftGdiGetKerningPairs( PFONTGDI Font, + DWORD cPairs, + LPKERNINGPAIR pKerningPair) +{ + DWORD Count = 0; + INT i = 0; + FT_Face face = Font->face; + + if (FT_HAS_KERNING(face) && face->charmap->encoding == FT_ENCODING_UNICODE) + { + FT_UInt previous_index = 0, glyph_index = 0; + FT_ULong char_code, char_previous; + FT_Vector delta; + + char_previous = char_code = FT_Get_First_Char(face, &glyph_index); + + IntUnLockFreeType; + + while (glyph_index) + { + if (previous_index && glyph_index) + { + FT_Get_Kerning(face, previous_index, glyph_index, FT_KERNING_DEFAULT, &delta); + + if (pKerningPair && cPairs) + { + pKerningPair[i].wFirst = char_previous; + pKerningPair[i].wSecond = char_code; + pKerningPair[i].iKernAmount = delta.x; + i++; + if (i == cPairs) break; + } + Count++; + } + previous_index = glyph_index; + char_previous = char_code; + char_code = FT_Get_Next_Char(face, char_code, &glyph_index); + } + IntUnLockFreeType; + } + return Count; +} + + +////////////////// +// +// Functions needing sorting. +// +/////////////// int STDCALL NtGdiGetFontFamilyInfo(HDC Dc, LPLOGFONTW UnsafeLogFont, @@ -1412,109 +3069,6 @@ NtGdiGetFontFamilyInfo(HDC Dc, return Count; } -FT_Glyph STDCALL -NtGdiGlyphCacheGet( - FT_Face Face, - INT GlyphIndex, - INT Height) -{ - PLIST_ENTRY CurrentEntry; - PFONT_CACHE_ENTRY FontEntry; - -// DbgPrint("CacheGet\n"); - - CurrentEntry = FontCacheListHead.Flink; - while (CurrentEntry != &FontCacheListHead) - { - FontEntry = (PFONT_CACHE_ENTRY)CurrentEntry; - if (FontEntry->Face == Face && - FontEntry->GlyphIndex == GlyphIndex && - FontEntry->Height == Height) - break; - CurrentEntry = CurrentEntry->Flink; - } - - if (CurrentEntry == &FontCacheListHead) { -// DbgPrint("Miss! %x\n", FontEntry->Glyph); -/* - Misses++; - if (Misses>100) { - DbgPrint ("Hits: %d Misses: %d\n", Hits, Misses); - Hits = Misses = 0; - } -*/ - return NULL; - } - - RemoveEntryList(CurrentEntry); - InsertHeadList(&FontCacheListHead, CurrentEntry); - -// DbgPrint("Hit! %x\n", FontEntry->Glyph); -/* - Hits++; - - if (Hits>100) { - DbgPrint ("Hits: %d Misses: %d\n", Hits, Misses); - Hits = Misses = 0; - } -*/ - return FontEntry->Glyph; -} - -FT_Glyph STDCALL -NtGdiGlyphCacheSet( - FT_Face Face, - INT GlyphIndex, - INT Height, - FT_GlyphSlot GlyphSlot, - FT_Render_Mode RenderMode) -{ - FT_Glyph GlyphCopy; - INT error; - PFONT_CACHE_ENTRY NewEntry; - -// DbgPrint("CacheSet.\n"); - - error = FT_Get_Glyph(GlyphSlot, &GlyphCopy); - if (error) - { - DbgPrint("Failure caching glyph.\n"); - return NULL; - }; - error = FT_Glyph_To_Bitmap(&GlyphCopy, RenderMode, 0, 1); - if (error) - { - DbgPrint("Failure rendering glyph.\n"); - return NULL; - }; - - NewEntry = ExAllocatePoolWithTag(PagedPool, sizeof(FONT_CACHE_ENTRY), TAG_FONT); - if (!NewEntry) - { - DbgPrint("Alloc failure caching glyph.\n"); - FT_Done_Glyph(GlyphCopy); - return NULL; - } - - NewEntry->GlyphIndex = GlyphIndex; - NewEntry->Face = Face; - NewEntry->Glyph = GlyphCopy; - NewEntry->Height = Height; - - InsertHeadList(&FontCacheListHead, &NewEntry->ListEntry); - if (FontCacheNumEntries++ > MAX_FONT_CACHE) { - NewEntry = (PFONT_CACHE_ENTRY)FontCacheListHead.Blink; - FT_Done_Glyph(NewEntry->Glyph); - RemoveTailList(&FontCacheListHead); - ExFreePool(NewEntry); - FontCacheNumEntries--; - } - -// DbgPrint("Returning the glyphcopy: %x\n", GlyphCopy); - - return GlyphCopy; -} - BOOL APIENTRY NtGdiExtTextOutW( @@ -1737,7 +3291,7 @@ NtGdiExtTextOutW( } } - TextObj = TEXTOBJ_LockText(Dc_Attr->hlfntNew); + TextObj = RealizeFontInit(Dc_Attr->hlfntNew); if(TextObj == NULL) { goto fail; @@ -1842,7 +3396,7 @@ NtGdiExtTextOutW( else glyph_index = FT_Get_Char_Index(face, *TempText); - if (!(realglyph = NtGdiGlyphCacheGet(face, glyph_index, + if (!(realglyph = ftGdiGlyphCacheGet(face, glyph_index, TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight))) { error = FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT); @@ -1852,7 +3406,7 @@ NtGdiExtTextOutW( } glyph = face->glyph; - realglyph = NtGdiGlyphCacheSet(face, glyph_index, + realglyph = ftGdiGlyphCacheSet(face, glyph_index, TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight, glyph, RenderMode); if (!realglyph) { @@ -1903,7 +3457,7 @@ NtGdiExtTextOutW( else glyph_index = FT_Get_Char_Index(face, *String); - if (!(realglyph = NtGdiGlyphCacheGet(face, glyph_index, + if (!(realglyph = ftGdiGlyphCacheGet(face, glyph_index, TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight))) { error = FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT); @@ -1914,7 +3468,7 @@ NtGdiExtTextOutW( goto fail; } glyph = face->glyph; - realglyph = NtGdiGlyphCacheSet(face, + realglyph = ftGdiGlyphCacheSet(face, glyph_index, TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight, glyph, @@ -2190,7 +3744,7 @@ NtGdiGetCharABCWidthsW( Dc_Attr = dc->pDc_Attr; if(!Dc_Attr) Dc_Attr = &dc->Dc_Attr; hFont = Dc_Attr->hlfntNew; - TextObj = TEXTOBJ_LockText(hFont); + TextObj = RealizeFontInit(hFont); DC_UnlockDc(dc); if (TextObj == NULL) @@ -2358,7 +3912,7 @@ NtGdiGetCharWidthW( Dc_Attr = dc->pDc_Attr; if(!Dc_Attr) Dc_Attr = &dc->Dc_Attr; hFont = Dc_Attr->hlfntNew; - TextObj = TEXTOBJ_LockText(hFont); + TextObj = RealizeFontInit(hFont); DC_UnlockDc(dc); if (TextObj == NULL) @@ -2455,7 +4009,7 @@ NtGdiGetGlyphIndicesW( OUTLINETEXTMETRICW *potm; INT i; FT_Face face; - WCHAR DefChar = 0; + WCHAR DefChar = 0xffff; PWSTR Buffer = NULL; ULONG Size; @@ -2470,7 +4024,7 @@ NtGdiGetGlyphIndicesW( Dc_Attr = dc->pDc_Attr; if(!Dc_Attr) Dc_Attr = &dc->Dc_Attr; hFont = Dc_Attr->hlfntNew; - TextObj = TEXTOBJ_LockText(hFont); + TextObj = RealizeFontInit(hFont); DC_UnlockDc(dc); if (!TextObj) { @@ -2522,8 +4076,16 @@ NtGdiGetGlyphIndicesW( for (i = 0; i < cwc; i++) { - Buffer[i] = FT_Get_Char_Index(face, UnSafepwc[i]); - if (Buffer[i] == 0) Buffer[i] = DefChar; + Buffer[i] = FT_Get_Char_Index(face, UnSafepwc[i]); + if (Buffer[i] == 0) + { + if (DefChar == 0xffff && FT_IS_SFNT(face)) + { + TT_OS2 *pOS2 = FT_Get_Sfnt_Table(face, ft_sfnt_os2); + DefChar = (pOS2->usDefaultChar ? FT_Get_Char_Index(face, pOS2->usDefaultChar) : 0); + } + Buffer[i] = DefChar; + } } IntUnLockFreeType; @@ -2544,1647 +4106,11 @@ NtGdiGetGlyphIndicesW( _SEH_END; ErrorRet: - ExFreePool(Buffer); + ExFreePoolWithTag(Buffer, TAG_GDITEXT); if (NT_SUCCESS(Status)) return cwc; SetLastWin32Error(Status); return GDI_ERROR; } -static -void -FTVectorToPOINTFX(FT_Vector *vec, POINTFX *pt) -{ - pt->x.value = vec->x >> 6; - pt->x.fract = (vec->x & 0x3f) << 10; - pt->x.fract |= ((pt->x.fract >> 6) | (pt->x.fract >> 12)); - pt->y.value = vec->y >> 6; - pt->y.fract = (vec->y & 0x3f) << 10; - pt->y.fract |= ((pt->y.fract >> 6) | (pt->y.fract >> 12)); - return; -} - -/* - This function builds an FT_Fixed from a float. It puts the integer part - in the highest 16 bits and the decimal part in the lowest 16 bits of the FT_Fixed. - It fails if the integer part of the float number is greater than SHORT_MAX. -*/ -static __inline FT_Fixed FT_FixedFromFloat(float f) -{ - short value = f; - unsigned short fract = (f - value) * 0xFFFF; - return (FT_Fixed)((long)value << 16 | (unsigned long)fract); -} - -/* - This function builds an FT_Fixed from a FIXED. It simply put f.value - in the highest 16 bits and f.fract in the lowest 16 bits of the FT_Fixed. -*/ -static __inline FT_Fixed FT_FixedFromFIXED(FIXED f) -{ - return (FT_Fixed)((long)f.value << 16 | (unsigned long)f.fract); -} - -/* - * Based on WineEngGetGlyphOutline - * - */ -ULONG -FASTCALL -ftGdiGetGlyphOutline( - IN PDC dc, - IN WCHAR wch, - IN UINT iFormat, - OUT LPGLYPHMETRICS pgm, - IN ULONG cjBuf, - OUT OPTIONAL PVOID UnsafeBuf, - IN LPMAT2 pmat2, - IN BOOL bIgnoreRotation) -{ - static const FT_Matrix identityMat = {(1 << 16), 0, 0, (1 << 16)}; - PDC_ATTR Dc_Attr; - PTEXTOBJ TextObj; - PFONTGDI FontGDI; - HFONT hFont = 0; - NTSTATUS Status; - GLYPHMETRICS gm; - ULONG Size; - FT_Face ft_face; - FT_UInt glyph_index; - DWORD width, height, pitch, needed = 0; - FT_Bitmap ft_bitmap; - FT_Error error; - INT left, right, top = 0, bottom = 0; - FT_Angle angle = 0; - FT_Int load_flags = FT_LOAD_DEFAULT | FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH; - FLOAT eM11, widthRatio = 1.0; - FT_Matrix transMat = identityMat; - BOOL needsTransform = FALSE; - INT orientation; - LONG aveWidth; - INT adv, lsb, bbx; /* These three hold to widths of the unrotated chars */ - OUTLINETEXTMETRICW *potm; - PVOID pvBuf = NULL; - int n = 0; - FT_CharMap found = 0, charmap; - XFORM xForm; - - DPRINT("%d, %08x, %p, %08lx, %p, %p\n", wch, iFormat, pgm, - cjBuf, UnsafeBuf, pmat2); - - Dc_Attr = dc->pDc_Attr; - if(!Dc_Attr) Dc_Attr = &dc->Dc_Attr; - - MatrixS2XForm(&xForm, &dc->DcLevel.mxWorldToDevice); - eM11 = xForm.eM11; - - hFont = Dc_Attr->hlfntNew; - TextObj = TEXTOBJ_LockText(hFont); -// DC_UnlockDc(dc); - if (!TextObj) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return GDI_ERROR; - } - FontGDI = ObjToGDI(TextObj->Font, FONT); - ft_face = FontGDI->face; - - aveWidth = FT_IS_SCALABLE(ft_face) ? TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfWidth: 0; - orientation = FT_IS_SCALABLE(ft_face) ? TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfOrientation: 0; - - Size = IntGetOutlineTextMetrics(FontGDI, 0, NULL); - potm = ExAllocatePoolWithTag(PagedPool, Size, TAG_GDITEXT); - if (!potm) - { - SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); - TEXTOBJ_UnlockText(TextObj); - return GDI_ERROR; - } - IntGetOutlineTextMetrics(FontGDI, Size, potm); - - IntLockFreeType; - - /* During testing, I never saw this used. In here just incase.*/ - if (ft_face->charmap == NULL) - { - DPRINT("WARNING: No charmap selected!\n"); - DPRINT("This font face has %d charmaps\n", ft_face->num_charmaps); - - - - for (n = 0; n < ft_face->num_charmaps; n++) - { - charmap = ft_face->charmaps[n]; - DPRINT("found charmap encoding: %u\n", charmap->encoding); - if (charmap->encoding != 0) - { - found = charmap; - break; - } - } - if (!found) - { - DPRINT1("WARNING: Could not find desired charmap!\n"); - } - error = FT_Set_Charmap(ft_face, found); - if (error) - { - DPRINT1("WARNING: Could not set the charmap!\n"); - } - } - -// FT_Set_Pixel_Sizes(ft_face, -// TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfWidth, - /* FIXME should set character height if neg */ -// (TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight < 0 ? - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight : -// TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight == 0 ? 11 : TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight)); - - TEXTOBJ_UnlockText(TextObj); - - if (iFormat & GGO_GLYPH_INDEX) - { - glyph_index = wch; - iFormat &= ~GGO_GLYPH_INDEX; - } - else glyph_index = FT_Get_Char_Index(ft_face, wch); - - if (orientation || (iFormat != GGO_METRICS && iFormat != GGO_BITMAP) || aveWidth || pmat2) - load_flags |= FT_LOAD_NO_BITMAP; - - if (iFormat & GGO_UNHINTED) - { - load_flags |= FT_LOAD_NO_HINTING; - iFormat &= ~GGO_UNHINTED; - } - - error = FT_Load_Glyph(ft_face, glyph_index, load_flags); - if (error) - { - DPRINT1("WARNING: Failed to load and render glyph! [index: %u]\n", glyph_index); - IntUnLockFreeType; - if (potm) ExFreePool(potm); - return GDI_ERROR; - } - IntUnLockFreeType; - - if (aveWidth && potm) - { - widthRatio = (FLOAT)aveWidth * eM11 / - (FLOAT) potm->otmTextMetrics.tmAveCharWidth; - } - - left = (INT)(ft_face->glyph->metrics.horiBearingX * widthRatio) & -64; - right = (INT)((ft_face->glyph->metrics.horiBearingX + - ft_face->glyph->metrics.width) * widthRatio + 63) & -64; - - adv = (INT)((ft_face->glyph->metrics.horiAdvance * widthRatio) + 63) >> 6; - lsb = left >> 6; - bbx = (right - left) >> 6; - - DPRINT("Advance = %d, lsb = %d, bbx = %d\n",adv, lsb, bbx); - - IntLockFreeType; - - /* Scaling transform */ - if (aveWidth) - { - FT_Matrix scaleMat; - DPRINT("Scaling Trans!\n"); - scaleMat.xx = FT_FixedFromFloat(widthRatio); - scaleMat.xy = 0; - scaleMat.yx = 0; - scaleMat.yy = (1 << 16); - FT_Matrix_Multiply(&scaleMat, &transMat); - needsTransform = TRUE; - } - - /* Slant transform */ - if (potm->otmTextMetrics.tmItalic) - { - FT_Matrix slantMat; - DPRINT("Slant Trans!\n"); - slantMat.xx = (1 << 16); - slantMat.xy = ((1 << 16) >> 2); - slantMat.yx = 0; - slantMat.yy = (1 << 16); - FT_Matrix_Multiply(&slantMat, &transMat); - needsTransform = TRUE; - } - - /* Rotation transform */ - if (orientation) - { - FT_Matrix rotationMat; - FT_Vector vecAngle; - DPRINT("Rotation Trans!\n"); - angle = FT_FixedFromFloat((float)orientation / 10.0); - FT_Vector_Unit(&vecAngle, angle); - rotationMat.xx = vecAngle.x; - rotationMat.xy = -vecAngle.y; - rotationMat.yx = -rotationMat.xy; - rotationMat.yy = rotationMat.xx; - FT_Matrix_Multiply(&rotationMat, &transMat); - needsTransform = TRUE; - } - - /* Extra transformation specified by caller */ - if (pmat2) - { - FT_Matrix extraMat; - DPRINT("MAT2 Matrix Trans!\n"); - extraMat.xx = FT_FixedFromFIXED(pmat2->eM11); - extraMat.xy = FT_FixedFromFIXED(pmat2->eM21); - extraMat.yx = FT_FixedFromFIXED(pmat2->eM12); - extraMat.yy = FT_FixedFromFIXED(pmat2->eM22); - FT_Matrix_Multiply(&extraMat, &transMat); - needsTransform = TRUE; - } - - if (potm) ExFreePool(potm); /* It looks like we are finished with potm ATM.*/ - - if (!needsTransform) - { - DPRINT("No Need to be Transformed!\n"); - top = (ft_face->glyph->metrics.horiBearingY + 63) & -64; - bottom = (ft_face->glyph->metrics.horiBearingY - - ft_face->glyph->metrics.height) & -64; - gm.gmCellIncX = adv; - gm.gmCellIncY = 0; - } - else - { - INT xc, yc; - FT_Vector vec; - for(xc = 0; xc < 2; xc++) - { - for(yc = 0; yc < 2; yc++) - { - vec.x = (ft_face->glyph->metrics.horiBearingX + - xc * ft_face->glyph->metrics.width); - vec.y = ft_face->glyph->metrics.horiBearingY - - yc * ft_face->glyph->metrics.height; - DPRINT("Vec %ld,%ld\n", vec.x, vec.y); - FT_Vector_Transform(&vec, &transMat); - if(xc == 0 && yc == 0) - { - left = right = vec.x; - top = bottom = vec.y; - } - else - { - if(vec.x < left) left = vec.x; - else if(vec.x > right) right = vec.x; - if(vec.y < bottom) bottom = vec.y; - else if(vec.y > top) top = vec.y; - } - } - } - left = left & -64; - right = (right + 63) & -64; - bottom = bottom & -64; - top = (top + 63) & -64; - - DPRINT("transformed box: (%d,%d - %d,%d)\n", left, top, right, bottom); - vec.x = ft_face->glyph->metrics.horiAdvance; - vec.y = 0; - FT_Vector_Transform(&vec, &transMat); - gm.gmCellIncX = (vec.x+63) >> 6; - gm.gmCellIncY = -((vec.y+63) >> 6); - } - gm.gmBlackBoxX = (right - left) >> 6; - gm.gmBlackBoxY = (top - bottom) >> 6; - gm.gmptGlyphOrigin.x = left >> 6; - gm.gmptGlyphOrigin.y = top >> 6; - - DPRINT("CX %d CY %d BBX %d BBY %d GOX %d GOY %d\n", - gm.gmCellIncX, gm.gmCellIncY, - gm.gmBlackBoxX, gm.gmBlackBoxY, - gm.gmptGlyphOrigin.x, gm.gmptGlyphOrigin.y); - - IntUnLockFreeType; - - if (pgm) - { - Status = MmCopyToCaller(pgm, &gm, sizeof(GLYPHMETRICS)); - if (! NT_SUCCESS(Status)) - { - SetLastWin32Error(ERROR_INVALID_PARAMETER); - return GDI_ERROR; - } - DPRINT("Copied GLYPHMETRICS to User!\n"); - } - - if (iFormat == GGO_METRICS) - { - DPRINT("GGO_METRICS Exit!\n"); - return 1; /* FIXME */ - } - - if (ft_face->glyph->format != ft_glyph_format_outline && iFormat != GGO_BITMAP) - { - DPRINT1("loaded a bitmap\n"); - return GDI_ERROR; - } - - if (UnsafeBuf && cjBuf) - { - pvBuf = ExAllocatePoolWithTag(PagedPool, cjBuf, TAG_GDITEXT); - if (pvBuf == NULL) - { - SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); - return GDI_ERROR; - } - RtlZeroMemory(pvBuf, cjBuf); - } - - - switch(iFormat) - { - case GGO_BITMAP: - width = gm.gmBlackBoxX; - height = gm.gmBlackBoxY; - pitch = ((width + 31) >> 5) << 2; - needed = pitch * height; - - if(!pvBuf || !cjBuf) break; - - switch(ft_face->glyph->format) - { - case ft_glyph_format_bitmap: - { - BYTE *src = ft_face->glyph->bitmap.buffer, *dst = pvBuf; - INT w = (ft_face->glyph->bitmap.width + 7) >> 3; - INT h = ft_face->glyph->bitmap.rows; - while(h--) - { - RtlCopyMemory(dst, src, w); - src += ft_face->glyph->bitmap.pitch; - dst += pitch; - } - break; - } - - case ft_glyph_format_outline: - ft_bitmap.width = width; - ft_bitmap.rows = height; - ft_bitmap.pitch = pitch; - ft_bitmap.pixel_mode = ft_pixel_mode_mono; - ft_bitmap.buffer = pvBuf; - - IntLockFreeType; - if(needsTransform) - { - FT_Outline_Transform(&ft_face->glyph->outline, &transMat); - } - FT_Outline_Translate(&ft_face->glyph->outline, -left, -bottom ); - /* Note: FreeType will only set 'black' bits for us. */ - RtlZeroMemory(pvBuf, needed); - FT_Outline_Get_Bitmap(library, &ft_face->glyph->outline, &ft_bitmap); - IntUnLockFreeType; - break; - - default: - DPRINT1("loaded glyph format %x\n", ft_face->glyph->format); - if(pvBuf) ExFreePool(pvBuf); - return GDI_ERROR; - } - break; - - case GGO_GRAY2_BITMAP: - case GGO_GRAY4_BITMAP: - case GGO_GRAY8_BITMAP: - { - unsigned int mult, row, col; - BYTE *start, *ptr; - - width = gm.gmBlackBoxX; - height = gm.gmBlackBoxY; - pitch = (width + 3) / 4 * 4; - needed = pitch * height; - - if(!pvBuf || !cjBuf) break; - - ft_bitmap.width = width; - ft_bitmap.rows = height; - ft_bitmap.pitch = pitch; - ft_bitmap.pixel_mode = ft_pixel_mode_grays; - ft_bitmap.buffer = pvBuf; - - IntLockFreeType; - if(needsTransform) - { - FT_Outline_Transform(&ft_face->glyph->outline, &transMat); - } - FT_Outline_Translate(&ft_face->glyph->outline, -left, -bottom ); - RtlZeroMemory(ft_bitmap.buffer, cjBuf); - FT_Outline_Get_Bitmap(library, &ft_face->glyph->outline, &ft_bitmap); - IntUnLockFreeType; - - if(iFormat == GGO_GRAY2_BITMAP) - mult = 4; - else if(iFormat == GGO_GRAY4_BITMAP) - mult = 16; - else if(iFormat == GGO_GRAY8_BITMAP) - mult = 64; - else - { - ASSERT(0); - break; - } - - start = pvBuf; - for(row = 0; row < height; row++) - { - ptr = start; - for(col = 0; col < width; col++, ptr++) - { - *ptr = (((int)*ptr) * mult + 128) / 256; - } - start += pitch; - } - break; - } - - case GGO_NATIVE: - { - int contour, point = 0, first_pt; - FT_Outline *outline = &ft_face->glyph->outline; - TTPOLYGONHEADER *pph; - TTPOLYCURVE *ppc; - DWORD pph_start, cpfx, type; - - if(cjBuf == 0) pvBuf = NULL; /* This is okay, need cjBuf to allocate. */ - - IntLockFreeType; - if (needsTransform && pvBuf) FT_Outline_Transform(outline, &transMat); - - for(contour = 0; contour < outline->n_contours; contour++) - { - pph_start = needed; - pph = (TTPOLYGONHEADER *)((char *)pvBuf + needed); - first_pt = point; - if(pvBuf) - { - pph->dwType = TT_POLYGON_TYPE; - FTVectorToPOINTFX(&outline->points[point], &pph->pfxStart); - } - needed += sizeof(*pph); - point++; - while(point <= outline->contours[contour]) - { - ppc = (TTPOLYCURVE *)((char *)pvBuf + needed); - type = (outline->tags[point] & FT_Curve_Tag_On) ? - TT_PRIM_LINE : TT_PRIM_QSPLINE; - cpfx = 0; - do - { - if(pvBuf) - FTVectorToPOINTFX(&outline->points[point], &ppc->apfx[cpfx]); - cpfx++; - point++; - } while(point <= outline->contours[contour] && - (outline->tags[point] & FT_Curve_Tag_On) == - (outline->tags[point-1] & FT_Curve_Tag_On)); - - /* At the end of a contour Windows adds the start point, but - only for Beziers */ - if(point > outline->contours[contour] && - !(outline->tags[point-1] & FT_Curve_Tag_On)) - { - if(pvBuf) - FTVectorToPOINTFX(&outline->points[first_pt], &ppc->apfx[cpfx]); - cpfx++; - } - else if(point <= outline->contours[contour] && - outline->tags[point] & FT_Curve_Tag_On) - { - /* add closing pt for bezier */ - if(pvBuf) - FTVectorToPOINTFX(&outline->points[point], &ppc->apfx[cpfx]); - cpfx++; - point++; - } - if(pvBuf) - { - ppc->wType = type; - ppc->cpfx = cpfx; - } - needed += sizeof(*ppc) + (cpfx - 1) * sizeof(POINTFX); - } - if(pvBuf) pph->cb = needed - pph_start; - } - IntUnLockFreeType; - break; - } - case GGO_BEZIER: - { - /* Convert the quadratic Beziers to cubic Beziers. - The parametric eqn for a cubic Bezier is, from PLRM: - r(t) = at^3 + bt^2 + ct + r0 - with the control points: - r1 = r0 + c/3 - r2 = r1 + (c + b)/3 - r3 = r0 + c + b + a - - A quadratic Beizer has the form: - p(t) = (1-t)^2 p0 + 2(1-t)t p1 + t^2 p2 - - So equating powers of t leads to: - r1 = 2/3 p1 + 1/3 p0 - r2 = 2/3 p1 + 1/3 p2 - and of course r0 = p0, r3 = p2 - */ - - int contour, point = 0, first_pt; - FT_Outline *outline = &ft_face->glyph->outline; - TTPOLYGONHEADER *pph; - TTPOLYCURVE *ppc; - DWORD pph_start, cpfx, type; - FT_Vector cubic_control[4]; - if(cjBuf == 0) pvBuf = NULL; - - if (needsTransform && pvBuf) - { - IntLockFreeType; - FT_Outline_Transform(outline, &transMat); - IntUnLockFreeType; - } - - for(contour = 0; contour < outline->n_contours; contour++) - { - pph_start = needed; - pph = (TTPOLYGONHEADER *)((char *)pvBuf + needed); - first_pt = point; - if(pvBuf) - { - pph->dwType = TT_POLYGON_TYPE; - FTVectorToPOINTFX(&outline->points[point], &pph->pfxStart); - } - needed += sizeof(*pph); - point++; - while(point <= outline->contours[contour]) - { - ppc = (TTPOLYCURVE *)((char *)pvBuf + needed); - type = (outline->tags[point] & FT_Curve_Tag_On) ? - TT_PRIM_LINE : TT_PRIM_CSPLINE; - cpfx = 0; - do - { - if(type == TT_PRIM_LINE) - { - if(pvBuf) - FTVectorToPOINTFX(&outline->points[point], &ppc->apfx[cpfx]); - cpfx++; - point++; - } - else - { - /* Unlike QSPLINEs, CSPLINEs always have their endpoint - so cpfx = 3n */ - - /* FIXME: Possible optimization in endpoint calculation - if there are two consecutive curves */ - cubic_control[0] = outline->points[point-1]; - if(!(outline->tags[point-1] & FT_Curve_Tag_On)) - { - cubic_control[0].x += outline->points[point].x + 1; - cubic_control[0].y += outline->points[point].y + 1; - cubic_control[0].x >>= 1; - cubic_control[0].y >>= 1; - } - if(point+1 > outline->contours[contour]) - cubic_control[3] = outline->points[first_pt]; - else - { - cubic_control[3] = outline->points[point+1]; - if(!(outline->tags[point+1] & FT_Curve_Tag_On)) - { - cubic_control[3].x += outline->points[point].x + 1; - cubic_control[3].y += outline->points[point].y + 1; - cubic_control[3].x >>= 1; - cubic_control[3].y >>= 1; - } - } - /* r1 = 1/3 p0 + 2/3 p1 - r2 = 1/3 p2 + 2/3 p1 */ - cubic_control[1].x = (2 * outline->points[point].x + 1) / 3; - cubic_control[1].y = (2 * outline->points[point].y + 1) / 3; - cubic_control[2] = cubic_control[1]; - cubic_control[1].x += (cubic_control[0].x + 1) / 3; - cubic_control[1].y += (cubic_control[0].y + 1) / 3; - cubic_control[2].x += (cubic_control[3].x + 1) / 3; - cubic_control[2].y += (cubic_control[3].y + 1) / 3; - if(pvBuf) - { - FTVectorToPOINTFX(&cubic_control[1], &ppc->apfx[cpfx]); - FTVectorToPOINTFX(&cubic_control[2], &ppc->apfx[cpfx+1]); - FTVectorToPOINTFX(&cubic_control[3], &ppc->apfx[cpfx+2]); - } - cpfx += 3; - point++; - } - } - while(point <= outline->contours[contour] && - (outline->tags[point] & FT_Curve_Tag_On) == - (outline->tags[point-1] & FT_Curve_Tag_On)); - /* At the end of a contour Windows adds the start point, - but only for Beziers and we've already done that. - */ - if(point <= outline->contours[contour] && - outline->tags[point] & FT_Curve_Tag_On) - { - /* This is the closing pt of a bezier, but we've already - added it, so just inc point and carry on */ - point++; - } - if(pvBuf) - { - ppc->wType = type; - ppc->cpfx = cpfx; - } - needed += sizeof(*ppc) + (cpfx - 1) * sizeof(POINTFX); - } - if(pvBuf) pph->cb = needed - pph_start; - } - break; - } - - default: - DPRINT1("Unsupported format %d\n", iFormat); - if(pvBuf) ExFreePool(pvBuf); - return GDI_ERROR; - } - - if (pvBuf) - { - Status = MmCopyToCaller(UnsafeBuf, pvBuf, cjBuf); - if (! NT_SUCCESS(Status)) - { - SetLastWin32Error(ERROR_INVALID_PARAMETER); - ExFreePool(pvBuf); - return GDI_ERROR; - } - DPRINT("NtGdiGetGlyphOutline K -> U worked!\n"); - ExFreePool(pvBuf); - } - - DPRINT("NtGdiGetGlyphOutline END and needed %d\n", needed); - return needed; -} - -BOOL -FASTCALL -TextIntGetTextExtentPoint(PDC dc, - PTEXTOBJ TextObj, - LPCWSTR String, - int Count, - int MaxExtent, - LPINT Fit, - LPINT Dx, - LPSIZE Size) -{ - PFONTGDI FontGDI; - FT_Face face; - FT_GlyphSlot glyph; - FT_Glyph realglyph; - INT error, n, glyph_index, i, previous; - ULONGLONG TotalWidth = 0; - FT_CharMap charmap, found = NULL; - BOOL use_kerning; - FT_Render_Mode RenderMode; - BOOLEAN Render; - - FontGDI = ObjToGDI(TextObj->Font, FONT); - - face = FontGDI->face; - if (NULL != Fit) - { - *Fit = 0; - } - - IntLockFreeType; - if (face->charmap == NULL) - { - DPRINT("WARNING: No charmap selected!\n"); - DPRINT("This font face has %d charmaps\n", face->num_charmaps); - - for (n = 0; n < face->num_charmaps; n++) - { - charmap = face->charmaps[n]; - DPRINT("found charmap encoding: %u\n", charmap->encoding); - if (charmap->encoding != 0) - { - found = charmap; - break; - } - } - - if (! found) - { - DPRINT1("WARNING: Could not find desired charmap!\n"); - } - - error = FT_Set_Charmap(face, found); - if (error) - { - DPRINT1("WARNING: Could not set the charmap!\n"); - } - } - - Render = IntIsFontRenderingEnabled(); - if (Render) - RenderMode = IntGetFontRenderMode(&TextObj->logfont.elfEnumLogfontEx.elfLogFont); - else - RenderMode = FT_RENDER_MODE_MONO; - - error = FT_Set_Pixel_Sizes(face, - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfWidth, - /* FIXME should set character height if neg */ - (TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight < 0 ? - - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight : - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight == 0 ? 11 : TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight)); - if (error) - { - DPRINT1("Error in setting pixel sizes: %u\n", error); - } - - use_kerning = FT_HAS_KERNING(face); - previous = 0; - - for (i = 0; i < Count; i++) - { - glyph_index = FT_Get_Char_Index(face, *String); - if (!(realglyph = NtGdiGlyphCacheGet(face, glyph_index, - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight))) - { - error = FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT); - if (error) - { - DPRINT1("WARNING: Failed to load and render glyph! [index: %u]\n", glyph_index); - break; - } - - glyph = face->glyph; - realglyph = NtGdiGlyphCacheSet(face, glyph_index, - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight, glyph, RenderMode); - if (!realglyph) - { - DPRINT1("Failed to render glyph! [index: %u]\n", glyph_index); - break; - } - } - - /* retrieve kerning distance */ - if (use_kerning && previous && glyph_index) - { - FT_Vector delta; - FT_Get_Kerning(face, previous, glyph_index, 0, &delta); - TotalWidth += delta.x; - } - - TotalWidth += realglyph->advance.x >> 10; - - if (((TotalWidth + 32) >> 6) <= MaxExtent && NULL != Fit) - { - *Fit = i + 1; - } - if (NULL != Dx) - { - Dx[i] = (TotalWidth + 32) >> 6; - } - - previous = glyph_index; - String++; - } - IntUnLockFreeType; - - Size->cx = (TotalWidth + 32) >> 6; - Size->cy = (TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight < 0 ? - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight : TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight); - Size->cy = EngMulDiv(Size->cy, IntGdiGetDeviceCaps(dc, LOGPIXELSY), 72); - - return TRUE; -} - - -DWORD -FASTCALL -IntGdiGetCharSet(HDC hDC) -{ - UINT cp = 0; - CHARSETINFO csi; - DWORD charset = NtGdiGetTextCharsetInfo(hDC,NULL,0); - if (IntTranslateCharsetInfo(&charset, &csi, TCI_SRCCHARSET)) - cp = csi.ciACP; - else - { - switch(charset) - { - case OEM_CHARSET: - cp = 1; - break; - case DEFAULT_CHARSET: - cp = 0; - break; - default: - DPRINT1("Can't find codepage for charset %d\n", charset); - break; - } - } - DPRINT("charset %d => cp %d\n", charset, LOWORD(cp)); - return (MAKELONG(cp, charset)); -} - - -DWORD -APIENTRY -NtGdiGetCharSet(HDC hDC) -{ - PDC Dc; - PDC_ATTR Dc_Attr; - DWORD cscp = IntGdiGetCharSet(hDC); - // If here, update everything! - Dc = DC_LockDc(hDC); - if (!Dc) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return 0; - } - Dc_Attr = Dc->pDc_Attr; - if (!Dc_Attr) Dc_Attr = &Dc->Dc_Attr; - Dc_Attr->iCS_CP = cscp; - Dc_Attr->ulDirty_ &= ~DIRTY_CHARSET; - DC_UnlockDc( Dc ); - return cscp; -} - - -INT -APIENTRY -NtGdiGetTextCharsetInfo( - IN HDC hdc, - OUT OPTIONAL LPFONTSIGNATURE lpSig, - IN DWORD dwFlags) -{ - PDC Dc; - PDC_ATTR Dc_Attr; - UINT Ret = DEFAULT_CHARSET, i = 0, fs_fsCsb0 = 0; - HFONT hFont; - PTEXTOBJ TextObj; - PFONTGDI FontGdi; - FONTSIGNATURE fs; - TT_OS2 *pOS2; - FT_Face Face; - NTSTATUS Status; - - Dc = DC_LockDc(hdc); - if (!Dc) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return Ret; - } - Dc_Attr = Dc->pDc_Attr; - if(!Dc_Attr) Dc_Attr = &Dc->Dc_Attr; - hFont = Dc_Attr->hlfntNew; - TextObj = TEXTOBJ_LockText(hFont); - DC_UnlockDc( Dc ); - if ( TextObj == NULL) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return Ret; - } - FontGdi = ObjToGDI(TextObj->Font, FONT); - Face = FontGdi->face; - TEXTOBJ_UnlockText(TextObj); - IntLockFreeType; - pOS2 = FT_Get_Sfnt_Table(Face, ft_sfnt_os2); - IntUnLockFreeType; - memset(&fs, 0, sizeof(FONTSIGNATURE)); - if (NULL != pOS2) - { - fs.fsCsb[0] = pOS2->ulCodePageRange1; - fs.fsCsb[1] = pOS2->ulCodePageRange2; - fs.fsUsb[0] = pOS2->ulUnicodeRange1; - fs.fsUsb[1] = pOS2->ulUnicodeRange2; - fs.fsUsb[2] = pOS2->ulUnicodeRange3; - fs.fsUsb[3] = pOS2->ulUnicodeRange4; - fs_fsCsb0 = pOS2->ulCodePageRange1; - if (pOS2->version == 0) - { - FT_UInt dummy; - - if(FT_Get_First_Char( Face, &dummy ) < 0x100) - fs_fsCsb0 |= 1; - else - fs_fsCsb0 |= 1L << 31; - } - } - DPRINT("Csb 1=%x 0=%x\n", fs.fsCsb[1],fs.fsCsb[0]); - if (lpSig) - { - Status = MmCopyToCaller(lpSig, &fs, sizeof(FONTSIGNATURE)); - if (! NT_SUCCESS(Status)) - { - SetLastWin32Error(ERROR_INVALID_PARAMETER); - return Ret; - } - } - if (0 == fs_fsCsb0) - { /* let's see if we can find any interesting cmaps */ - for (i = 0; i < Face->num_charmaps; i++) - { - switch (Face->charmaps[i]->encoding) - { - case ft_encoding_unicode: - case ft_encoding_apple_roman: - fs_fsCsb0 |= 1; - break; - case ft_encoding_symbol: - fs_fsCsb0 |= 1L << 31; - break; - default: - break; - } - } - } - while (0 == (fs_fsCsb0 >> i & 0x0001) && i < MAXTCIINDEX) - { - i++; - } - Ret = FontTci[i].ciCharset; - DPRINT("CharSet %d\n",Ret); - return Ret; -} - -W32KAPI -BOOL -APIENTRY -NtGdiGetTextMetricsW( - IN HDC hDC, - OUT TMW_INTERNAL * pUnsafeTmwi, - IN ULONG cj -) -{ - PDC dc; - PDC_ATTR Dc_Attr; - PTEXTOBJ TextObj; - PFONTGDI FontGDI; - NTSTATUS Status = STATUS_SUCCESS; - TMW_INTERNAL tmwi; - FT_Face Face; - TT_OS2 *pOS2; - TT_HoriHeader *pHori; - ULONG Error; - - if (NULL == pUnsafeTmwi) - { - SetLastWin32Error(STATUS_INVALID_PARAMETER); - return FALSE; - } - - /* FIXME: check cj ? */ - - if(!(dc = DC_LockDc(hDC))) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return FALSE; - } - Dc_Attr = dc->pDc_Attr; - if(!Dc_Attr) Dc_Attr = &dc->Dc_Attr; - TextObj = TEXTOBJ_LockText(Dc_Attr->hlfntNew); - if (NULL != TextObj) - { - FontGDI = ObjToGDI(TextObj->Font, FONT); - - Face = FontGDI->face; - IntLockFreeType; - Error = FT_Set_Pixel_Sizes(Face, - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfWidth, - /* FIXME should set character height if neg */ - (TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight < 0 ? - - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight : - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight == 0 ? 11 : TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight)); - IntUnLockFreeType; - if (0 != Error) - { - DPRINT1("Error in setting pixel sizes: %u\n", Error); - Status = STATUS_UNSUCCESSFUL; - } - else - { - memcpy(&tmwi.TextMetric, &FontGDI->TextMetric, sizeof(TEXTMETRICW)); - /* FIXME: Fill Diff member */ - RtlZeroMemory(&tmwi.Diff, sizeof(tmwi.Diff)); - - Status = STATUS_SUCCESS; - IntLockFreeType; - pOS2 = FT_Get_Sfnt_Table(FontGDI->face, ft_sfnt_os2); - if (NULL == pOS2) - { - DPRINT1("Can't find OS/2 table - not TT font?\n"); - Status = STATUS_INTERNAL_ERROR; - } - - pHori = FT_Get_Sfnt_Table(FontGDI->face, ft_sfnt_hhea); - if (NULL == pHori) - { - DPRINT1("Can't find HHEA table - not TT font?\n"); - Status = STATUS_INTERNAL_ERROR; - } - - IntUnLockFreeType; - - if (NT_SUCCESS(Status)) - { - FillTM(&tmwi.TextMetric, FontGDI->face, pOS2, pHori); - - if (cj > sizeof(TMW_INTERNAL)) - cj = sizeof(TMW_INTERNAL); - - Status = STATUS_SUCCESS; - _SEH_TRY - { - ProbeForWrite(pUnsafeTmwi, cj, 1); - RtlCopyMemory(pUnsafeTmwi,&tmwi,cj); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END - } - } - TEXTOBJ_UnlockText(TextObj); - } - else - { - Status = STATUS_INVALID_HANDLE; - } - DC_UnlockDc(dc); - - if(!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - return FALSE; - } - - return TRUE; -} - - -DWORD STDCALL -NtGdiGetFontData( - HDC hDC, - DWORD Table, - DWORD Offset, - LPVOID Buffer, - DWORD Size) -{ - PDC Dc; - PDC_ATTR Dc_Attr; - HFONT hFont; - PTEXTOBJ TextObj; - PFONTGDI FontGdi; - DWORD Result = GDI_ERROR; - - Dc = DC_LockDc(hDC); - if (Dc == NULL) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return GDI_ERROR; - } - Dc_Attr = Dc->pDc_Attr; - if(!Dc_Attr) Dc_Attr = &Dc->Dc_Attr; - hFont = Dc_Attr->hlfntNew; - TextObj = TEXTOBJ_LockText(hFont); - DC_UnlockDc(Dc); - - if (TextObj == NULL) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return GDI_ERROR; - } - - FontGdi = ObjToGDI(TextObj->Font, FONT); - - IntLockFreeType; - - if (FT_IS_SFNT(FontGdi->face)) - { - if (Table) - Table = Table >> 24 | Table << 24 | (Table >> 8 & 0xFF00) | - (Table << 8 & 0xFF0000); - - if (Buffer == NULL) - Size = 0; - - if (!FT_Load_Sfnt_Table(FontGdi->face, Table, Offset, Buffer, &Size)) - Result = Size; - } - - IntUnLockFreeType; - - TEXTOBJ_UnlockText(TextObj); - - return Result; -} - -static UINT FASTCALL -GetFontScore(LOGFONTW *LogFont, PUNICODE_STRING FaceName, PFONTGDI FontGDI) -{ - ANSI_STRING EntryFaceNameA; - UNICODE_STRING EntryFaceNameW; - unsigned Size; - OUTLINETEXTMETRICW *Otm; - LONG WeightDiff; - NTSTATUS Status; - UINT Score = 1; - - RtlInitAnsiString(&EntryFaceNameA, FontGDI->face->family_name); - Status = RtlAnsiStringToUnicodeString(&EntryFaceNameW, &EntryFaceNameA, TRUE); - if (NT_SUCCESS(Status)) - { - if ((LF_FACESIZE - 1) * sizeof(WCHAR) < EntryFaceNameW.Length) - { - EntryFaceNameW.Length = (LF_FACESIZE - 1) * sizeof(WCHAR); - EntryFaceNameW.Buffer[LF_FACESIZE - 1] = L'\0'; - } - if (0 == RtlCompareUnicodeString(FaceName, &EntryFaceNameW, TRUE)) - { - Score += 49; - } - RtlFreeUnicodeString(&EntryFaceNameW); - } - - Size = IntGetOutlineTextMetrics(FontGDI, 0, NULL); - Otm = ExAllocatePoolWithTag(PagedPool, Size, TAG_GDITEXT); - if (NULL == Otm) - { - return Score; - } - IntGetOutlineTextMetrics(FontGDI, Size, Otm); - - if ((0 != LogFont->lfItalic && 0 != Otm->otmTextMetrics.tmItalic) || - (0 == LogFont->lfItalic && 0 == Otm->otmTextMetrics.tmItalic)) - { - Score += 25; - } - if (LogFont->lfWeight != FW_DONTCARE) - { - if (LogFont->lfWeight < Otm->otmTextMetrics.tmWeight) - { - WeightDiff = Otm->otmTextMetrics.tmWeight - LogFont->lfWeight; - } - else - { - WeightDiff = LogFont->lfWeight - Otm->otmTextMetrics.tmWeight; - } - Score += (1000 - WeightDiff) / (1000 / 25); - } - else - { - Score += 25; - } - - ExFreePool(Otm); - - return Score; -} - -static __inline VOID -FindBestFontFromList(FONTOBJ **FontObj, UINT *MatchScore, LOGFONTW *LogFont, - PUNICODE_STRING FaceName, PLIST_ENTRY Head) -{ - PLIST_ENTRY Entry; - PFONT_ENTRY CurrentEntry; - FONTGDI *FontGDI; - UINT Score; - - Entry = Head->Flink; - while (Entry != Head) - { - CurrentEntry = (PFONT_ENTRY) CONTAINING_RECORD(Entry, FONT_ENTRY, ListEntry); - - FontGDI = CurrentEntry->Font; - ASSERT(FontGDI); - - Score = GetFontScore(LogFont, FaceName, FontGDI); - if (*MatchScore == 0 || *MatchScore < Score) - { - *FontObj = GDIToObj(FontGDI, FONT); - *MatchScore = Score; - } - Entry = Entry->Flink; - } -} - -static __inline BOOLEAN -SubstituteFontFamilyKey(PUNICODE_STRING FaceName, - LPCWSTR Key) -{ - RTL_QUERY_REGISTRY_TABLE QueryTable[2] = {{0}}; - NTSTATUS Status; - UNICODE_STRING Value; - - RtlInitUnicodeString(&Value, NULL); - - QueryTable[0].QueryRoutine = NULL; - QueryTable[0].Flags = RTL_QUERY_REGISTRY_DIRECT | RTL_QUERY_REGISTRY_NOEXPAND | - RTL_QUERY_REGISTRY_REQUIRED; - QueryTable[0].Name = FaceName->Buffer; - QueryTable[0].EntryContext = &Value; - QueryTable[0].DefaultType = REG_NONE; - QueryTable[0].DefaultData = NULL; - QueryTable[0].DefaultLength = 0; - - QueryTable[1].QueryRoutine = NULL; - QueryTable[1].Name = NULL; - - Status = RtlQueryRegistryValues(RTL_REGISTRY_WINDOWS_NT, - Key, - QueryTable, - NULL, - NULL); - if (NT_SUCCESS(Status)) - { - RtlFreeUnicodeString(FaceName); - *FaceName = Value; - } - - return NT_SUCCESS(Status); -} - -static __inline void -SubstituteFontFamily(PUNICODE_STRING FaceName, UINT Level) -{ - if (10 < Level) /* Enough is enough */ - { - return; - } - - if (SubstituteFontFamilyKey(FaceName, L"SysFontSubstitutes") || - SubstituteFontFamilyKey(FaceName, L"FontSubstitutes")) - { - SubstituteFontFamily(FaceName, Level + 1); - } -} - -NTSTATUS FASTCALL -TextIntRealizeFont(HFONT FontHandle) -{ - NTSTATUS Status = STATUS_SUCCESS; - PTEXTOBJ TextObj; - UNICODE_STRING FaceName; - PW32PROCESS Win32Process; - UINT MatchScore; - - TextObj = TEXTOBJ_LockText(FontHandle); - if (NULL == TextObj) - { - return STATUS_INVALID_HANDLE; - } - - if (TextObj->Initialized) - { - TEXTOBJ_UnlockText(TextObj); - return STATUS_SUCCESS; - } - - if (! RtlCreateUnicodeString(&FaceName, TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfFaceName)) - { - TEXTOBJ_UnlockText(TextObj); - return STATUS_NO_MEMORY; - } - SubstituteFontFamily(&FaceName, 0); - MatchScore = 0; - TextObj->Font = NULL; - - /* First search private fonts */ - Win32Process = PsGetCurrentProcessWin32Process(); - IntLockProcessPrivateFonts(Win32Process); - FindBestFontFromList(&TextObj->Font, &MatchScore, - &TextObj->logfont.elfEnumLogfontEx.elfLogFont, &FaceName, - &Win32Process->PrivateFontListHead); - IntUnLockProcessPrivateFonts(Win32Process); - - /* Search system fonts */ - IntLockGlobalFonts; - FindBestFontFromList(&TextObj->Font, &MatchScore, - &TextObj->logfont.elfEnumLogfontEx.elfLogFont, &FaceName, - &FontListHead); - IntUnLockGlobalFonts; - - if (NULL == TextObj->Font) - { - DPRINT1("Requested font %S not found, no fonts loaded at all\n", - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfFaceName); - Status = STATUS_NOT_FOUND; - } - else - { - TextObj->Initialized = TRUE; - Status = STATUS_SUCCESS; - } - - RtlFreeUnicodeString(&FaceName); - TEXTOBJ_UnlockText(TextObj); - - ASSERT((NT_SUCCESS(Status) ^ (NULL == TextObj->Font)) != 0); - - return Status; -} - -INT FASTCALL -FontGetObject(PTEXTOBJ TFont, INT Count, PVOID Buffer) -{ - if( Buffer == NULL ) return sizeof(LOGFONTW); - - switch (Count) - { - - case sizeof(ENUMLOGFONTEXDVW): - RtlCopyMemory( (LPENUMLOGFONTEXDVW) Buffer, - &TFont->logfont, - sizeof(ENUMLOGFONTEXDVW)); - break; - case sizeof(ENUMLOGFONTEXW): - RtlCopyMemory( (LPENUMLOGFONTEXW) Buffer, - &TFont->logfont.elfEnumLogfontEx, - sizeof(ENUMLOGFONTEXW)); - break; - - case sizeof(EXTLOGFONTW): - case sizeof(ENUMLOGFONTW): - RtlCopyMemory((LPENUMLOGFONTW) Buffer, - &TFont->logfont.elfEnumLogfontEx.elfLogFont, - sizeof(ENUMLOGFONTW)); - break; - - case sizeof(LOGFONTW): - RtlCopyMemory((LPLOGFONTW) Buffer, - &TFont->logfont.elfEnumLogfontEx.elfLogFont, - sizeof(LOGFONTW)); - break; - - default: - SetLastWin32Error(ERROR_BUFFER_OVERFLOW); - return 0; - } - return Count; -} - - -static BOOL FASTCALL -IntGetFullFileName( - POBJECT_NAME_INFORMATION NameInfo, - ULONG Size, - PUNICODE_STRING FileName) -{ - NTSTATUS Status; - OBJECT_ATTRIBUTES ObjectAttributes; - HANDLE hFile; - IO_STATUS_BLOCK IoStatusBlock; - ULONG Desired; - - InitializeObjectAttributes(&ObjectAttributes, - FileName, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - - Status = ZwOpenFile( - &hFile, - 0, //FILE_READ_ATTRIBUTES, - &ObjectAttributes, - &IoStatusBlock, - FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, - 0); - - if (!NT_SUCCESS(Status)) - { - DPRINT("ZwOpenFile() failed (Status = 0x%lx)\n", Status); - return FALSE; - } - - Status = ZwQueryObject(hFile, ObjectNameInformation, NameInfo, Size, &Desired); - ZwClose(hFile); - if (!NT_SUCCESS(Status)) - { - DPRINT("ZwQueryObject() failed (Status = %lx)\n", Status); - return FALSE; - } - - return TRUE; -} - -static BOOL FASTCALL -IntGdiGetFontResourceInfo( - IN PUNICODE_STRING FileName, - OUT void *pBuffer, - OUT DWORD *pdwBytes, - IN DWORD dwType) -{ - UNICODE_STRING EntryFileName; - POBJECT_NAME_INFORMATION NameInfo1, NameInfo2; - PLIST_ENTRY ListEntry; - PFONT_ENTRY FontEntry; - FONTFAMILYINFO Info; - ULONG Size; - BOOL bFound = FALSE; - - /* Create buffer for full path name */ - Size = sizeof(OBJECT_NAME_INFORMATION) + MAX_PATH * sizeof(WCHAR); - NameInfo1 = ExAllocatePoolWithTag(PagedPool, Size, TAG_FINF); - if (!NameInfo1) - { - SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - - /* Get the full path name */ - if (!IntGetFullFileName(NameInfo1, Size, FileName)) - { - ExFreePool(NameInfo1); - return FALSE; - } - - /* Create a buffer for the entries' names */ - NameInfo2 = ExAllocatePoolWithTag(PagedPool, Size, TAG_FINF); - if (!NameInfo2) - { - ExFreePool(NameInfo1); - SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - - /* Try to find the pathname in the global font list */ - IntLockGlobalFonts; - for (ListEntry = FontListHead.Flink; - ListEntry != &FontListHead; - ListEntry = ListEntry->Flink) - { - FontEntry = CONTAINING_RECORD(ListEntry, FONT_ENTRY, ListEntry); - if (FontEntry->Font->Filename != NULL) - { - RtlInitUnicodeString(&EntryFileName , FontEntry->Font->Filename); - if (IntGetFullFileName(NameInfo2, Size, &EntryFileName)) - { - if (RtlEqualUnicodeString(&NameInfo1->Name, &NameInfo2->Name, FALSE)) - { - /* found */ - FontFamilyFillInfo(&Info, FontEntry->FaceName.Buffer, FontEntry->Font); - bFound = TRUE; - break; - } - } - } - } - IntUnLockGlobalFonts; - - /* Free the buffers */ - ExFreePool(NameInfo1); - ExFreePool(NameInfo2); - - if (!bFound && dwType != 5) - { - /* Font could not be found in system table - dwType == 5 will still handle this */ - return FALSE; - } - - switch(dwType) - { - case 0: /* FIXME: returns 1 or 2, don't know what this is atm */ - *(DWORD*)pBuffer = 1; - *pdwBytes = sizeof(DWORD); - break; - - case 1: /* Copy the full font name */ - Size = wcslen(Info.EnumLogFontEx.elfFullName) + 1; - Size = min(Size , LF_FULLFACESIZE) * sizeof(WCHAR); - memcpy(pBuffer, Info.EnumLogFontEx.elfFullName, Size); - // FIXME: Do we have to zeroterminate? - *pdwBytes = Size; - break; - - case 2: /* Copy a LOGFONTW structure */ - Info.EnumLogFontEx.elfLogFont.lfWidth = 0; - memcpy(pBuffer, &Info.EnumLogFontEx.elfLogFont, sizeof(LOGFONTW)); - *pdwBytes = sizeof(LOGFONTW); - break; - - case 3: /* FIXME: What exactly is copied here? */ - *(DWORD*)pBuffer = 1; - *pdwBytes = sizeof(DWORD*); - break; - - case 5: /* Looks like a BOOL that is copied, TRUE, if the font was not found */ - *(BOOL*)pBuffer = !bFound; - *pdwBytes = sizeof(BOOL); - break; - - default: - return FALSE; - } - - return TRUE; -} - -W32KAPI BOOL APIENTRY -NtGdiGetFontResourceInfoInternalW( - IN LPWSTR pwszFiles, - IN ULONG cwc, - IN ULONG cFiles, - IN UINT cjIn, - OUT LPDWORD pdwBytes, - OUT LPVOID pvBuf, - IN DWORD dwType) -{ - NTSTATUS Status = STATUS_SUCCESS; - DWORD dwBytes; - UNICODE_STRING SafeFileNames; - BOOL bRet = FALSE; - ULONG cbStringSize; - - union - { - LOGFONTW logfontw; - WCHAR FullName[LF_FULLFACESIZE]; - } Buffer; - - /* FIXME: handle cFiles > 0 */ - - /* Check for valid dwType values - dwType == 4 seems to be handled by gdi32 only */ - if (dwType == 4 || dwType > 5) - { - SetLastWin32Error(ERROR_INVALID_PARAMETER); - return FALSE; - } - - /* Allocate a safe unicode string buffer */ - cbStringSize = cwc * sizeof(WCHAR); - SafeFileNames.MaximumLength = SafeFileNames.Length = cbStringSize - sizeof(WCHAR); - SafeFileNames.Buffer = ExAllocatePoolWithTag(PagedPool, - cbStringSize, - TAG('R','T','S','U')); - if (!SafeFileNames.Buffer) - { - SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - - /* Check buffers and copy pwszFiles to safe unicode string */ - _SEH_TRY - { - ProbeForRead(pwszFiles, cbStringSize, 1); - ProbeForWrite(pdwBytes, sizeof(DWORD), 1); - ProbeForWrite(pvBuf, cjIn, 1); - - RtlCopyMemory(SafeFileNames.Buffer, pwszFiles, cbStringSize); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END - - if(!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - /* Free the string buffer for the safe filename */ - ExFreePool(SafeFileNames.Buffer); - return FALSE; - } - - /* Do the actual call */ - bRet = IntGdiGetFontResourceInfo(&SafeFileNames, &Buffer, &dwBytes, dwType); - - /* Check if succeeded and the buffer is big enough */ - if (bRet && cjIn >= dwBytes) - { - /* Copy the data back to caller */ - _SEH_TRY - { - /* Buffers are already probed */ - RtlCopyMemory(pvBuf, &Buffer, dwBytes); - *pdwBytes = dwBytes; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END - - if(!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - bRet = FALSE; - } - } - - /* Free the string for the safe filenames */ - ExFreePool(SafeFileNames.Buffer); - - return bRet; -} /* EOF */ diff --git a/reactos/subsystems/win32/win32k/objects/gdibatch.c b/reactos/subsystems/win32/win32k/objects/gdibatch.c index 68c758475ae..84744334c42 100644 --- a/reactos/subsystems/win32/win32k/objects/gdibatch.c +++ b/reactos/subsystems/win32/win32k/objects/gdibatch.c @@ -64,6 +64,7 @@ FASTCALL GdiFlushUserBatch(PDC dc, PGDIBATCHHDR pHdr) { PDC_ATTR Dc_Attr = NULL; + if (dc) { Dc_Attr = dc->pDc_Attr; @@ -95,8 +96,8 @@ GdiFlushUserBatch(PDC dc, PGDIBATCHHDR pHdr) PGDIBSOBJECT pgO; if(!dc) break; pgO = (PGDIBSOBJECT) pHdr; - if(NT_SUCCESS(TextIntRealizeFont((HFONT) pgO->hgdiobj))) - Dc_Attr->hlfntNew = (HFONT) pgO->hgdiobj; + TextIntRealizeFont((HFONT) pgO->hgdiobj, NULL); + Dc_Attr->ulDirty_ &= ~(DIRTY_CHARSET); } case GdiBCDelObj: case GdiBCDelRgn: diff --git a/reactos/subsystems/win32/win32k/objects/line.c b/reactos/subsystems/win32/win32k/objects/line.c index aac2748f2f3..acb098caf48 100644 --- a/reactos/subsystems/win32/win32k/objects/line.c +++ b/reactos/subsystems/win32/win32k/objects/line.c @@ -198,7 +198,7 @@ IntGdiPolyBezier(DC *dc, if ( Pts ) { ret = IntGdiPolyline(dc, Pts, nOut); - ExFreePool(Pts); + ExFreePoolWithTag(Pts, TAG_BEZIER); } } @@ -228,7 +228,7 @@ IntGdiPolyBezierTo(DC *dc, npt[0].y = Dc_Attr->ptlCurrent.y; memcpy(npt + 1, pt, sizeof(POINT) * Count); ret = IntGdiPolyBezier(dc, npt, Count+1); - ExFreePool(npt); + ExFreePoolWithTag(npt, TAG_BEZIER); } } if ( ret ) @@ -331,7 +331,7 @@ IntGdiPolylineTo(DC *dc, pts[0].y = Dc_Attr->ptlCurrent.y; memcpy( pts + 1, pt, sizeof(POINT) * Count); ret = IntGdiPolyline(dc, pts, Count + 1); - ExFreePool(pts); + ExFreePoolWithTag(pts, TAG_SHAPE); } } if ( ret ) diff --git a/reactos/subsystems/win32/win32k/objects/palobj.c b/reactos/subsystems/win32/win32k/objects/palobj.c index 2220f7d803d..13171f267e5 100644 --- a/reactos/subsystems/win32/win32k/objects/palobj.c +++ b/reactos/subsystems/win32/win32k/objects/palobj.c @@ -170,7 +170,7 @@ HPALETTE FASTCALL PALETTE_Init(VOID) } hpalette = NtGdiCreatePaletteInternal(palPtr,NB_RESERVED_COLORS); - ExFreePool(palPtr); + ExFreePoolWithTag(palPtr, TAG_PALETTE); #ifndef NO_MAPPING palObj = (PALOBJ*)PALETTE_LockPalette(hpalette); diff --git a/reactos/subsystems/win32/win32k/objects/path.c b/reactos/subsystems/win32/win32k/objects/path.c index 7c9ac01ab36..8337f92c31f 100644 --- a/reactos/subsystems/win32/win32k/objects/path.c +++ b/reactos/subsystems/win32/win32k/objects/path.c @@ -140,7 +140,7 @@ PATH_FillPath( PDC dc, PPATH pPath ) /* Restore the old mapping mode */ // IntGdiSetMapMode( dc, mapMode ); // Dc_Attr->szlViewportExt = ptViewportExt; -// Dc_Attr->ptlViewportOrg = ptViewportOrg; +// Dc_Attr->ptlViewportOrg = ptViewportOrg; // Dc_Attr->szlWindowExt = ptWindowExt; // Dc_Attr->ptlWindowOrg = ptWindowOrg; @@ -181,8 +181,8 @@ PATH_DestroyGdiPath ( PPATH pPath ) { ASSERT(pPath!=NULL); - if (pPath->pPoints) ExFreePool(pPath->pPoints); - if (pPath->pFlags) ExFreePool(pPath->pFlags); + if (pPath->pPoints) ExFreePoolWithTag(pPath->pPoints, TAG_PATH); + if (pPath->pFlags) ExFreePoolWithTag(pPath->pFlags, TAG_PATH); } /* PATH_AssignGdiPath @@ -991,7 +991,7 @@ PATH_AddFlatBezier ( PPATH pPath, POINT *pt, BOOL closed ) for(i = 1; i < no; i++) PATH_AddEntry(pPath, &pts[i], (i == no-1 && closed) ? PT_LINETO | PT_CLOSEFIGURE : PT_LINETO); - ExFreePool(pts); + ExFreePoolWithTag(pts, TAG_BEZIER); return TRUE; } @@ -1092,7 +1092,7 @@ PATH_PathToRegion ( PPATH pPath, INT nPolyFillMode, HRGN *pHrgn ) } /* Free memory for number-of-points-in-stroke array */ - ExFreePool(pNumPointsInStroke); + ExFreePoolWithTag(pNumPointsInStroke, TAG_PATH); /* Success! */ *pHrgn=hrgn; @@ -1189,7 +1189,7 @@ PATH_ReserveEntries ( PPATH pPath, INT numEntries ) pFlagsNew=(BYTE *)ExAllocatePoolWithTag(PagedPool, numEntriesToAllocate * sizeof(BYTE), TAG_PATH); if(!pFlagsNew) { - ExFreePool(pPointsNew); + ExFreePoolWithTag(pPointsNew, TAG_PATH); return FALSE; } @@ -1201,8 +1201,8 @@ PATH_ReserveEntries ( PPATH pPath, INT numEntries ) memcpy(pPointsNew, pPath->pPoints, sizeof(POINT)*pPath->numEntriesUsed); memcpy(pFlagsNew, pPath->pFlags, sizeof(BYTE)*pPath->numEntriesUsed); - ExFreePool(pPath->pPoints); - ExFreePool(pPath->pFlags); + ExFreePoolWithTag(pPath->pPoints, TAG_PATH); + ExFreePoolWithTag(pPath->pFlags, TAG_PATH); } pPath->pPoints=pPointsNew; pPath->pFlags=pFlagsNew; @@ -1424,12 +1424,12 @@ BOOL FASTCALL PATH_StrokePath(DC *dc, PPATH pPath) } memcpy(Realloc, pLinePts, nLinePts*sizeof(POINT)); - ExFreePool(pLinePts); + ExFreePoolWithTag(pLinePts, TAG_PATH); pLinePts = Realloc; } memcpy(&pLinePts[nLinePts], &pBzrPts[1], (nBzrPts - 1) * sizeof(POINT)); nLinePts += nBzrPts - 1; - ExFreePool(pBzrPts); + ExFreePoolWithTag(pBzrPts, TAG_BEZIER); i += 2; } break; @@ -1449,7 +1449,7 @@ BOOL FASTCALL PATH_StrokePath(DC *dc, PPATH pPath) ret = TRUE; end: - if(pLinePts)ExFreePool(pLinePts); + if(pLinePts) ExFreePoolWithTag(pLinePts, TAG_PATH); /* Restore the old mapping mode */ Dc_Attr->iMapMode = mapMode; @@ -1490,9 +1490,9 @@ BOOL FASTCALL PATH_WidenPath(DC *dc) { - INT i, j, numStrokes, penWidth, penWidthIn, penWidthOut, size, penStyle; + INT i, j, numStrokes, numOldStrokes, penWidth, penWidthIn, penWidthOut, size, penStyle; BOOL ret = FALSE; - PPATH pPath, pNewPath, *pStrokes, pUpPath, pDownPath; + PPATH pPath, pNewPath, *pStrokes, *pOldStrokes, pUpPath, pDownPath; EXTLOGPEN *elp; DWORD obj_type, joint, endcap, penType; PDC_ATTR Dc_Attr = dc->pDc_Attr; @@ -1534,13 +1534,13 @@ PATH_WidenPath(DC *dc) else { SetLastWin32Error(ERROR_CAN_NOT_COMPLETE); - ExFreePool(elp); + ExFreePoolWithTag(elp, TAG_PATH); PATH_UnlockPath( pPath ); return FALSE; } penWidth = elp->elpWidth; - ExFreePool(elp); + ExFreePoolWithTag(elp, TAG_PATH); endcap = (PS_ENDCAP_MASK & penStyle); joint = (PS_JOIN_MASK & penStyle); @@ -1560,6 +1560,7 @@ PATH_WidenPath(DC *dc) penWidthOut++; numStrokes = 0; + numOldStrokes = 1; pStrokes = ExAllocatePoolWithTag(PagedPool, sizeof(PPATH), TAG_PATH); pStrokes[0] = ExAllocatePoolWithTag(PagedPool, sizeof(PATH), TAG_PATH); @@ -1588,8 +1589,11 @@ PATH_WidenPath(DC *dc) } numStrokes++; j = 0; - ExFreePool(pStrokes); + pOldStrokes = pStrokes; // Save old pointer. pStrokes = ExAllocatePoolWithTag(PagedPool, numStrokes * sizeof(PPATH), TAG_PATH); + RtlCopyMemory(pStrokes, pOldStrokes, numOldStrokes * sizeof(PPATH)); + numOldStrokes = numStrokes; // Save orig count. + ExFreePoolWithTag(pOldStrokes, TAG_PATH); // Free old pointer. pStrokes[numStrokes - 1] = ExAllocatePoolWithTag(PagedPool, sizeof(PATH), TAG_PATH); PATH_InitGdiPath(pStrokes[numStrokes - 1]); @@ -1834,19 +1838,19 @@ PATH_WidenPath(DC *dc) } PATH_DestroyGdiPath(pStrokes[i]); - ExFreePool(pStrokes[i]); + ExFreePoolWithTag(pStrokes[i], TAG_PATH); PATH_DestroyGdiPath(pUpPath); - ExFreePool(pUpPath); + ExFreePoolWithTag(pUpPath, TAG_PATH); PATH_DestroyGdiPath(pDownPath); - ExFreePool(pDownPath); + ExFreePoolWithTag(pDownPath, TAG_PATH); } - ExFreePool(pStrokes); + ExFreePoolWithTag(pStrokes, TAG_PATH); pNewPath->state = PATH_Closed; if (!(ret = PATH_AssignGdiPath(pPath, pNewPath))) DPRINT1("Assign path failed\n"); PATH_DestroyGdiPath(pNewPath); - ExFreePool(pNewPath); + ExFreePoolWithTag(pNewPath, TAG_PATH); return ret; } diff --git a/reactos/subsystems/win32/win32k/objects/pen.c b/reactos/subsystems/win32/win32k/objects/pen.c index b380331a44d..1346de17fb1 100644 --- a/reactos/subsystems/win32/win32k/objects/pen.c +++ b/reactos/subsystems/win32/win32k/objects/pen.c @@ -323,7 +323,7 @@ NtGdiExtCreatePen( if(!NT_SUCCESS(Status)) { SetLastNtError(Status); - ExFreePool(pSafeStyle); + ExFreePoolWithTag(pSafeStyle, TAG_PENSTYLES); return 0; } } @@ -341,7 +341,7 @@ NtGdiExtCreatePen( hBrush); if (!hPen && pSafeStyle) { - ExFreePool(pSafeStyle); + ExFreePoolWithTag(pSafeStyle, TAG_PENSTYLES); } return hPen; } diff --git a/reactos/subsystems/win32/win32k/objects/print.c b/reactos/subsystems/win32/win32k/objects/print.c index e40042e818d..85e0c3a516e 100644 --- a/reactos/subsystems/win32/win32k/objects/print.c +++ b/reactos/subsystems/win32/win32k/objects/print.c @@ -223,7 +223,7 @@ NtGdiExtEscape( if ( !NT_SUCCESS(Status) ) { - ExFreePool ( SafeInData ); + ExFreePoolWithTag ( SafeInData, TAG_PRINT ); DC_UnlockDc(pDC); SetLastNtError(Status); return -1; @@ -256,7 +256,7 @@ NtGdiExtEscape( SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); freeout: if ( SafeInData ) - ExFreePool ( SafeInData ); + ExFreePoolWithTag ( SafeInData, TAG_PRINT ); DC_UnlockDc(pDC); return -1; } @@ -267,7 +267,7 @@ freeout: DC_UnlockDc(pDC); if ( SafeInData ) - ExFreePool ( SafeInData ); + ExFreePoolWithTag ( SafeInData ,TAG_PRINT ); if ( SafeOutData ) { @@ -284,7 +284,7 @@ freeout: } _SEH_END; - ExFreePool ( SafeOutData ); + ExFreePoolWithTag ( SafeOutData, TAG_PRINT ); if ( !NT_SUCCESS(Status) ) { SetLastNtError(Status); diff --git a/reactos/subsystems/win32/win32k/objects/region.c b/reactos/subsystems/win32/win32k/objects/region.c index 80864b56fcf..16c0481689f 100644 --- a/reactos/subsystems/win32/win32k/objects/region.c +++ b/reactos/subsystems/win32/win32k/objects/region.c @@ -420,7 +420,7 @@ static __inline int xmemcheck(ROSRGNDATA *reg, PRECT *rect, PRECT *firstrect) } temp = ExAllocatePoolWithTag(PagedPool, NewSize, TAG_REGION); - if (temp == 0) + if (temp == NULL) { return 0; } @@ -431,7 +431,7 @@ static __inline int xmemcheck(ROSRGNDATA *reg, PRECT *rect, PRECT *firstrect) reg->rdh.nRgnSize = NewSize; if (*firstrect != ®->rdh.rcBound) { - ExFreePool(*firstrect); + ExFreePoolWithTag(*firstrect, TAG_REGION); } *firstrect = temp; *rect = (*firstrect)+reg->rdh.nCount; @@ -520,7 +520,7 @@ REGION_CopyRegion( return FALSE; if (dst->Buffer && dst->Buffer != &dst->rdh.rcBound) - ExFreePool(dst->Buffer); //free the old buffer + ExFreePoolWithTag(dst->Buffer, TAG_REGION); //free the old buffer dst->Buffer = temp; dst->rdh.nRgnSize = src->rdh.nCount * sizeof(RECT); //size of region buffer } @@ -608,7 +608,7 @@ REGION_CropAndOffsetRegion( { xrect = ExAllocatePoolWithTag(PagedPool, rgnSrc->rdh.nCount * sizeof(RECT), TAG_REGION); if (rgnDst->Buffer && rgnDst->Buffer != &rgnDst->rdh.rcBound) - ExFreePool(rgnDst->Buffer); //free the old buffer. will be assigned to xrect below. + ExFreePoolWithTag(rgnDst->Buffer, TAG_REGION); //free the old buffer. will be assigned to xrect below. } if (xrect) @@ -676,7 +676,7 @@ REGION_CropAndOffsetRegion( return FALSE; if (rgnDst->Buffer && rgnDst->Buffer != &rgnDst->rdh.rcBound) - ExFreePool(rgnDst->Buffer); //free the old buffer + ExFreePoolWithTag(rgnDst->Buffer, TAG_REGION); //free the old buffer rgnDst->Buffer = temp; rgnDst->rdh.nCount = i; rgnDst->rdh.nRgnSize = i * sizeof(RECT); @@ -1169,7 +1169,7 @@ REGION_RegionOp( newReg->rdh.nRgnSize = newReg->rdh.nCount*sizeof(RECT); COPY_RECTS(newReg->Buffer, prev_rects, newReg->rdh.nCount); if (prev_rects != &newReg->rdh.rcBound) - ExFreePool(prev_rects); + ExFreePoolWithTag(prev_rects, TAG_REGION); } } else @@ -1180,7 +1180,7 @@ REGION_RegionOp( */ newReg->rdh.nRgnSize = sizeof(RECT); if (newReg->Buffer != &newReg->rdh.rcBound) - ExFreePool(newReg->Buffer); + ExFreePoolWithTag(newReg->Buffer, TAG_REGION); newReg->Buffer = ExAllocatePoolWithTag(PagedPool, sizeof(RECT), TAG_REGION); ASSERT(newReg->Buffer); } @@ -1188,7 +1188,7 @@ REGION_RegionOp( newReg->rdh.iType = RDH_RECTANGLES; if (oldRects != &newReg->rdh.rcBound) - ExFreePool(oldRects); + ExFreePoolWithTag(oldRects, TAG_REGION); return; } @@ -2092,7 +2092,7 @@ IntGdiReleaseRaoRgn(PDC pDC) INT Index = GDI_HANDLE_GET_INDEX(pDC->BaseObject.hHmgr); PGDI_TABLE_ENTRY Entry = &GdiHandleTable->Entries[Index]; pDC->DC_Flags |= DC_FLAG_DIRTY_RAO; - Entry->Flags |= GDI_ENTRY_FLAG_NEED_UPDATE; + Entry->Flags |= GDI_ENTRY_VALIDATE_VIS; IntGdiSetEmptyRect((PRECT)&pDC->erclClip); } @@ -2103,7 +2103,7 @@ IntGdiReleaseVisRgn(PDC pDC) INT Index = GDI_HANDLE_GET_INDEX(pDC->BaseObject.hHmgr); PGDI_TABLE_ENTRY Entry = &GdiHandleTable->Entries[Index]; pDC->DC_Flags |= DC_FLAG_DIRTY_RAO; - Entry->Flags |= GDI_ENTRY_FLAG_NEED_UPDATE; + Entry->Flags |= GDI_ENTRY_VALIDATE_VIS; IntGdiSetEmptyRect((PRECT)&pDC->erclClip); REGION_Delete(pDC->prgnVis); pDC->prgnVis = prgnDefault; @@ -2117,7 +2117,7 @@ IntUpdateVisRectRgn(PDC pDC, PROSRGNDATA pRgn) PDC_ATTR pDc_Attr; RECTL rcl; - if (Entry->Flags & GDI_ENTRY_FLAG_NEED_UPDATE) + if (Entry->Flags & GDI_ENTRY_VALIDATE_VIS) { pDc_Attr = pDC->pDc_Attr; if ( !pDc_Attr ) pDc_Attr = &pDC->Dc_Attr; @@ -2141,7 +2141,7 @@ IntUpdateVisRectRgn(PDC pDC, PROSRGNDATA pRgn) pDc_Attr->VisRectRegion.Rect = rcl; - Entry->Flags &= ~GDI_ENTRY_FLAG_NEED_UPDATE; + Entry->Flags &= ~GDI_ENTRY_VALIDATE_VIS; } } @@ -2501,6 +2501,7 @@ NtGdiExtCreateRegion( NTSTATUS Status = STATUS_SUCCESS; MATRIX matrix; + DPRINT("NtGdiExtCreateRegion\n"); _SEH_TRY { ProbeForRead(RgnData, Count, 1); @@ -3475,7 +3476,7 @@ REGION_PtsToRegion( { COPY_RECTS(temp, reg->Buffer, reg->rdh.nCount); if (reg->Buffer != ®->rdh.rcBound) - ExFreePool(reg->Buffer); + ExFreePoolWithTag(reg->Buffer, TAG_REGION); } reg->Buffer = temp; @@ -3754,7 +3755,7 @@ IntCreatePolyPolygonRgn( if (!tmpPtBlock) { DPRINT1("Can't alloc tPB\n"); - ExFreePool(pETEs); + ExFreePoolWithTag(pETEs, TAG_REGION); return 0; } curPtBlock->next = tmpPtBlock; @@ -3813,7 +3814,7 @@ IntCreatePolyPolygonRgn( if (!tmpPtBlock) { DPRINT1("Can't alloc tPB\n"); - ExFreePool(pETEs); + ExFreePoolWithTag(pETEs, TAG_REGION); NtGdiDeleteObject(hrgn); return 0; } @@ -3845,10 +3846,10 @@ IntCreatePolyPolygonRgn( for (curPtBlock = FirstPtBlock.next; --numFullPtBlocks >= 0;) { tmpPtBlock = curPtBlock->next; - ExFreePool(curPtBlock); + ExFreePoolWithTag(curPtBlock, TAG_REGION); curPtBlock = tmpPtBlock; } - ExFreePool(pETEs); + ExFreePoolWithTag(pETEs, TAG_REGION); REGION_UnlockRgn(region); return hrgn; } diff --git a/reactos/subsystems/win32/win32k/objects/text.c b/reactos/subsystems/win32/win32k/objects/text.c index e1c729b1229..0e2f28e41dc 100644 --- a/reactos/subsystems/win32/win32k/objects/text.c +++ b/reactos/subsystems/win32/win32k/objects/text.c @@ -13,24 +13,31 @@ #define NDEBUG #include -BOOL -FASTCALL -ftGdiGetRasterizerCaps(LPRASTERIZER_STATUS lprs); - -BOOL -FASTCALL -TextIntGetTextExtentPoint(PDC dc, - PTEXTOBJ TextObj, - LPCWSTR String, - int Count, - int MaxExtent, - LPINT Fit, - LPINT Dx, - LPSIZE Size); - - /** Functions ******************************************************************/ +DWORD +APIENTRY +NtGdiGetCharSet(HDC hDC) +{ + PDC Dc; + PDC_ATTR Dc_Attr; + DWORD cscp; + // If here, update everything! + Dc = DC_LockDc(hDC); + if (!Dc) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return 0; + } + cscp = ftGdiGetTextCharsetInfo(Dc,NULL,0); + Dc_Attr = Dc->pDc_Attr; + if (!Dc_Attr) Dc_Attr = &Dc->Dc_Attr; + Dc_Attr->iCS_CP = cscp; + Dc_Attr->ulDirty_ &= ~DIRTY_CHARSET; + DC_UnlockDc( Dc ); + return cscp; +} + BOOL APIENTRY NtGdiGetRasterizerCaps( @@ -68,6 +75,58 @@ NtGdiGetRasterizerCaps( return FALSE; } +INT +APIENTRY +NtGdiGetTextCharsetInfo( + IN HDC hdc, + OUT OPTIONAL LPFONTSIGNATURE lpSig, + IN DWORD dwFlags) +{ + PDC Dc; + INT Ret; + FONTSIGNATURE fsSafe; + PFONTSIGNATURE pfsSafe = &fsSafe; + NTSTATUS Status = STATUS_SUCCESS; + + Dc = DC_LockDc(hdc); + if (!Dc) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return DEFAULT_CHARSET; + } + + if (!lpSig) pfsSafe = NULL; + + Ret = HIWORD(ftGdiGetTextCharsetInfo( Dc, pfsSafe, dwFlags)); + + if (lpSig) + { + if (Ret == DEFAULT_CHARSET) + RtlZeroMemory(pfsSafe, sizeof(FONTSIGNATURE)); + + _SEH_TRY + { + ProbeForWrite( lpSig, + sizeof(FONTSIGNATURE), + 1); + RtlCopyMemory(lpSig, pfsSafe, sizeof(FONTSIGNATURE)); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if (!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + return DEFAULT_CHARSET; + } + } + DC_UnlockDc(Dc); + return Ret; +} + W32KAPI BOOL APIENTRY @@ -119,7 +178,7 @@ NtGdiGetTextExtentExW( Dx = ExAllocatePoolWithTag(PagedPool, Count * sizeof(INT), TAG_GDITEXT); if (NULL == Dx) { - ExFreePool(String); + ExFreePoolWithTag(String, TAG_GDITEXT); SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); return FALSE; } @@ -134,9 +193,9 @@ NtGdiGetTextExtentExW( { if (NULL != Dx) { - ExFreePool(Dx); + ExFreePoolWithTag(Dx, TAG_GDITEXT); } - ExFreePool(String); + ExFreePoolWithTag(String, TAG_GDITEXT); SetLastNtError(Status); return FALSE; } @@ -146,15 +205,15 @@ NtGdiGetTextExtentExW( { if (NULL != Dx) { - ExFreePool(Dx); + ExFreePoolWithTag(Dx, TAG_GDITEXT); } - ExFreePool(String); + ExFreePoolWithTag(String, TAG_GDITEXT); SetLastWin32Error(ERROR_INVALID_HANDLE); return FALSE; } Dc_Attr = dc->pDc_Attr; if(!Dc_Attr) Dc_Attr = &dc->Dc_Attr; - TextObj = TEXTOBJ_LockText(Dc_Attr->hlfntNew); + TextObj = RealizeFontInit(Dc_Attr->hlfntNew); if ( TextObj ) { Result = TextIntGetTextExtentPoint(dc, TextObj, String, Count, MaxExtent, @@ -165,12 +224,12 @@ NtGdiGetTextExtentExW( Result = FALSE; DC_UnlockDc(dc); - ExFreePool(String); + ExFreePoolWithTag(String, TAG_GDITEXT); if (! Result) { if (NULL != Dx) { - ExFreePool(Dx); + ExFreePoolWithTag(Dx, TAG_GDITEXT); } return FALSE; } @@ -182,7 +241,7 @@ NtGdiGetTextExtentExW( { if (NULL != Dx) { - ExFreePool(Dx); + ExFreePoolWithTag(Dx, TAG_GDITEXT); } SetLastNtError(Status); return FALSE; @@ -196,7 +255,7 @@ NtGdiGetTextExtentExW( { if (NULL != Dx) { - ExFreePool(Dx); + ExFreePoolWithTag(Dx, TAG_GDITEXT); } SetLastNtError(Status); return FALSE; @@ -204,7 +263,7 @@ NtGdiGetTextExtentExW( } if (NULL != Dx) { - ExFreePool(Dx); + ExFreePoolWithTag(Dx,TAG_GDITEXT); } Status = MmCopyToCaller(UnsafeSize, &Size, sizeof(SIZE)); @@ -284,7 +343,7 @@ NtGdiGetTextFaceW( hFont = Dc_Attr->hlfntNew; DC_UnlockDc(Dc); - TextObj = TEXTOBJ_LockText(hFont); + TextObj = RealizeFontInit(hFont); ASSERT(TextObj != NULL); Count = min(Count, wcslen(TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfFaceName)); Status = MmCopyToCaller(FaceName, TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfFaceName, Count * sizeof(WCHAR)); @@ -298,4 +357,42 @@ NtGdiGetTextFaceW( return Count; } +W32KAPI +BOOL +APIENTRY +NtGdiGetTextMetricsW( + IN HDC hDC, + OUT TMW_INTERNAL * pUnsafeTmwi, + IN ULONG cj +) +{ + TMW_INTERNAL Tmwi; + NTSTATUS Status = STATUS_SUCCESS; + + if ( cj <= sizeof(TMW_INTERNAL) ) + { + if (ftGdiGetTextMetricsW(hDC,&Tmwi)) + { + _SEH_TRY + { + ProbeForWrite(pUnsafeTmwi, cj, 1); + RtlCopyMemory(pUnsafeTmwi,&Tmwi,cj); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END + + if (!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + return FALSE; + } + return TRUE; + } + } + return FALSE; +} + /* EOF */ diff --git a/reactos/subsystems/win32/win32k/stubs/stubs.c b/reactos/subsystems/win32/win32k/stubs/stubs.c index 439b4765e53..eac95d7563e 100644 --- a/reactos/subsystems/win32/win32k/stubs/stubs.c +++ b/reactos/subsystems/win32/win32k/stubs/stubs.c @@ -750,21 +750,34 @@ EngDitherColor( } /* - * @unimplemented + * @implemented */ BOOL APIENTRY EngQuerySystemAttribute( IN ENG_SYSTEM_ATTRIBUTE CapNum, OUT PDWORD pCapability) { + SYSTEM_BASIC_INFORMATION sbi; + SYSTEM_PROCESSOR_INFORMATION spi; + switch (CapNum) { case EngNumberOfProcessors: - *pCapability = 1; + NtQuerySystemInformation( + SystemBasicInformation, + &sbi, + sizeof(SYSTEM_BASIC_INFORMATION), + NULL); + *pCapability = sbi.NumberOfProcessors; return TRUE; case EngProcessorFeature: - *pCapability = 0; + NtQuerySystemInformation( + SystemProcessorInformation, + &spi, + sizeof(SYSTEM_PROCESSOR_INFORMATION), + NULL); + *pCapability = spi.ProcessorFeatureBits; return TRUE; default: @@ -2112,20 +2125,6 @@ NtGdiGetMonitorID( */ BOOL APIENTRY -NtGdiGetRealizationInfo( - IN HDC hdc, - OUT PREALIZATION_INFO pri, - IN HFONT hf) -{ - UNIMPLEMENTED; - return FALSE; -} - - /* - * @unimplemented - */ -BOOL -APIENTRY NtGdiDrawStream( IN HDC hdcDst, IN ULONG cjIn, @@ -2227,19 +2226,6 @@ NtGdiQueryFontAssocInfo( return 0; } - /* - * @unimplemented - */ -DWORD -APIENTRY -NtGdiGetFontUnicodeRanges( - IN HDC hdc, - OUT OPTIONAL LPGLYPHSET pgs) -{ - UNIMPLEMENTED; - return 0; -} - /* * @unimplemented */ diff --git a/reactos/subsystems/win32/win32k/win32k.rbuild b/reactos/subsystems/win32/win32k/win32k.rbuild index 5dd14c6504e..0173e4701fa 100644 --- a/reactos/subsystems/win32/win32k/win32k.rbuild +++ b/reactos/subsystems/win32/win32k/win32k.rbuild @@ -184,12 +184,11 @@ stubs.c - + win32k_base pseh ntoskrnl - libcntpr hal freetype dxguid diff --git a/reactos/tools/gendib/gendib.c b/reactos/tools/gendib/gendib.c index 488b634385d..5fd50ec77d6 100644 --- a/reactos/tools/gendib/gendib.c +++ b/reactos/tools/gendib/gendib.c @@ -147,7 +147,7 @@ FindRopInfo(unsigned RopCode) { ROPCODE_SRCINVERT, "SRCINVERT", "D ^ S", 1, 1, 0 }, { ROPCODE_SRCAND, "SRCAND", "D & S", 1, 1, 0 }, { ROPCODE_NOOP, "NOOP", "D", 1, 0, 0 }, - { ROPCODE_MERGEPAINT, "MERGEPAINT", "D & (~S)", 1, 1, 0 }, + { ROPCODE_MERGEPAINT, "MERGEPAINT", "D | (~S)", 1, 1, 0 }, { ROPCODE_MERGECOPY, "MERGECOPY", "S & P", 0, 1, 1 }, { ROPCODE_SRCCOPY, "SRCCOPY", "S", 0, 1, 0 }, { ROPCODE_SRCPAINT, "SRCPAINT", "D | S", 1, 1, 0 }, @@ -542,7 +542,7 @@ CreateBitCase(FILE *Out, unsigned Bpp, PROPINFO RopInfo, int Flags, if (ROPCODE_SRCCOPY == RopInfo->RopCode && 0 != (Flags & FLAG_TRIVIALXLATE) && Bpp == SourceBpp) { - Output(Out, "CenterCount = 2 * (BltInfo->DestRect.right -\n"); + Output(Out, "CenterCount = %u * (BltInfo->DestRect.right -\n", Bpp >> 3); Output(Out, " BltInfo->DestRect.left);\n"); } if (RopInfo->UsesPattern && 0 != (Flags & FLAG_PATTERNSURFACE)) diff --git a/reactos/tools/nci/nci.mak b/reactos/tools/nci/nci.mak index fb08ebe79d4..d2480c0409f 100644 --- a/reactos/tools/nci/nci.mak +++ b/reactos/tools/nci/nci.mak @@ -56,13 +56,15 @@ KERNEL_SVC_DB = ntoskrnl$(SEP)sysfuncs.lst KERNEL_SERVICE_TABLE = $(INTERMEDIATE_)ntoskrnl$(SEP)include$(SEP)internal$(SEP)napi.h NTDLL_STUBS = $(INTERMEDIATE_)lib$(SEP)ntdllsys$(SEP)ntdll.S KERNEL_STUBS = $(INTERMEDIATE_)ntoskrnl$(SEP)ex$(SEP)zw.S +NT_SPEC = $(INTERMEDIATE_)dll$(SEP)ntdll$(SEP)def$(SEP)ntsys.pspec NCI_SERVICE_FILES = \ $(KERNEL_SERVICE_TABLE) \ $(WIN32K_SERVICE_TABLE) \ $(NTDLL_STUBS) \ $(KERNEL_STUBS) \ - $(WIN32K_STUBS) + $(WIN32K_STUBS) \ + $(NT_SPEC) $(NCI_SERVICE_FILES): $(NCI_TARGET) $(KERNEL_SVC_DB) $(WIN32K_SVC_DB) $(ECHO_NCI) @@ -71,6 +73,7 @@ $(NCI_SERVICE_FILES): $(NCI_TARGET) $(KERNEL_SVC_DB) $(WIN32K_SVC_DB) ${mkdir} $(INTERMEDIATE_)ntoskrnl$(SEP)ex$(SEP) 2>$(NUL) ${mkdir} $(INTERMEDIATE_)subsystems$(SEP)win32$(SEP)win32k$(SEP)include 2>$(NUL) ${mkdir} $(INTERMEDIATE_)lib$(SEP)win32ksys 2>$(NUL) + ${mkdir} $(INTERMEDIATE_)dll$(SEP)ntdll$(SEP)def 2>$(NUL) $(Q)$(NCI_TARGET) -arch $(ARCH) \ $(KERNEL_SVC_DB) \ @@ -79,7 +82,8 @@ $(NCI_SERVICE_FILES): $(NCI_TARGET) $(KERNEL_SVC_DB) $(WIN32K_SVC_DB) $(WIN32K_SERVICE_TABLE) \ $(NTDLL_STUBS) \ $(KERNEL_STUBS) \ - $(WIN32K_STUBS) + $(WIN32K_STUBS) \ + $(NT_SPEC) .PHONY: nci_service_files_clean nci_service_files_clean: diff --git a/reactos/tools/nci/ncitool.c b/reactos/tools/nci/ncitool.c index 4490e7f4b44..d002a18c157 100644 --- a/reactos/tools/nci/ncitool.c +++ b/reactos/tools/nci/ncitool.c @@ -21,26 +21,29 @@ /* DEFINES ****************************************************************/ #define INPUT_BUFFER_SIZE 255 -#define Arguments 7 +#define Arguments 8 /******* Table Indexes ************/ #define MAIN_INDEX 0x0 #define WIN32K_INDEX 0x1000 /******* Argument List ************/ -/* First, define the Databases */ +/* Databases */ #define NativeSystemDb 0 #define NativeGuiDb 1 -/* Now the Service Tables */ +/* Service Tables */ #define NtosServiceTable 2 #define Win32kServiceTable 3 -/* And finally, the stub files. */ +/* Stub Files */ #define NtosUserStubs 4 #define NtosKernelStubs 5 #define Win32kStubs 6 +/* Spec Files */ +#define NtSpec 7 + /********** Stub Code ************/ /* @@ -128,26 +131,26 @@ /***** Arch Dependent Stuff ******/ struct ncitool_data_t { - const char *arch; - int args_to_bytes; - const char *km_stub; - const char *um_stub; - const char *global_header; - const char *declaration; + const char *arch; + int args_to_bytes; + const char *km_stub; + const char *um_stub; + const char *global_header; + const char *declaration; }; struct ncitool_data_t ncitool_data[] = { - { "i386", 4, KernelModeStub_x86, UserModeStub_x86, - ".global _%s@%d\n", "_%s@%d:\n" }, - { "amd64", 4, KernelModeStub_amd64, UserModeStub_amd64, - ".global _%s\n", "_%s:\n" }, - { "powerpc", 4, KernelModeStub_ppc, UserModeStub_ppc, - "\t.globl %s\n", "%s:\n" }, - { "mips", 4, KernelModeStub_mips, UserModeStub_mips, - "\t.globl %s\n", "%s:\n" }, - { "arm", 4, KernelModeStub_arm, UserModeStub_arm, + { "i386", 4, KernelModeStub_x86, UserModeStub_x86, + ".global _%s@%d\n", "_%s@%d:\n" }, + { "amd64", 4, KernelModeStub_amd64, UserModeStub_amd64, + ".global _%s\n", "_%s:\n" }, + { "powerpc", 4, KernelModeStub_ppc, UserModeStub_ppc, + "\t.globl %s\n", "%s:\n" }, + { "mips", 4, KernelModeStub_mips, UserModeStub_mips, + "\t.globl %s\n", "%s:\n" }, + { "arm", 4, KernelModeStub_arm, UserModeStub_arm, "\t.globl %s\n", "%s:\n" }, - { 0, } + { 0, } }; int arch_sel = 0; #define ARGS_TO_BYTES(x) (x)*(ncitool_data[arch_sel].args_to_bytes) @@ -545,6 +548,108 @@ CreateSystemServiceTable(FILE *SyscallDb, fprintf(SyscallTable, "ULONG %sNumberOfSysCalls = %d;\n", Name, SyscallId); } +/*++ + * WriteSpec + * + * Prints out the Spec Entry for a System Call. + * + * Params: + * SpecFile - Spec File to which to write the header. + * + * SyscallName - Name of System Call for which to add the stub. + * + * CountArguments - Number of arguments to the System Call. + * + * Returns: + * None. + * + * Remarks: + * None. + * + *--*/ +void +WriteSpec(FILE* StubFile, + char* SyscallName, + unsigned CountArguments) +{ + unsigned i; + + fprintf(StubFile, "@ stdcall %s", SyscallName); + + fputc ('(', StubFile); + + for (i = 0; i < CountArguments; ++ i) + fputs ("ptr ", StubFile); + + fputc (')', StubFile); + fputc ('\n', StubFile); +} + +/*++ + * CreateSpec + * + * Parses a System Call Database and creates a spec file for all the entries. + * + * Params: + * SyscallDb - System Call Database to parse. + * + * Files - Array of Spec Files to which to write. + * + * CountFiles - Number of Spec Files to create + * + * UseZw - Use Zw prefix? + * + * Returns: + * None. + * + * Remarks: + * None. + * + *--*/ +void +CreateSpec(FILE * SyscallDb, + FILE * Files[], + unsigned CountFiles, + unsigned UseZw) +{ + char Line[INPUT_BUFFER_SIZE]; + char *NtSyscallName; + char *SyscallArguments; + unsigned CountArguments; + + /* We loop until the end of the file */ + while ((!feof(SyscallDb)) && (fgets(Line, sizeof(Line), SyscallDb) != NULL)) { + + /* Extract the Name and Arguments */ + GetNameAndArgumentsFromDb(Line, &NtSyscallName, &SyscallArguments); + CountArguments = strtoul(SyscallArguments, NULL, 0); + + /* Make sure we really extracted something */ + if (NtSyscallName) { + + int i; + for (i= 0; i < CountFiles; i++) { + + if (!UseZw) { + WriteSpec(Files[i], + NtSyscallName, + CountArguments); + } + + if (UseZw && NtSyscallName[0] == 'N' && NtSyscallName[1] == 't') { + + NtSyscallName[0] = 'Z'; + NtSyscallName[1] = 'w'; + WriteSpec(Files[i], + NtSyscallName, + CountArguments); + } + + } + } + } +} + void usage(char * argv0) { printf("Usage: %s [-arch ] sysfuncs.lst w32ksvc.db napi.h ssdt.h napi.S zw.S win32k.S win32k.S\n" @@ -556,6 +661,7 @@ void usage(char * argv0) " zw.S NTOSKRNL Zw stubs\n" " win32k.S GDI32 stubs\n" " win32k.S USER32 stubs\n" + " nt.pspec NTDLL exports\n" " -arch is optional, default is %s\n", argv0, ncitool_data[0].arch @@ -630,21 +736,32 @@ int main(int argc, char* argv[]) 1, 0); - /* Rewind the databases */ - rewind(Files[NativeSystemDb]); - rewind(Files[NativeGuiDb]); - /* Create the Service Tables */ + rewind(Files[NativeSystemDb]); CreateSystemServiceTable(Files[NativeSystemDb], Files[NtosServiceTable], "Main", argv[NtosServiceTable + ArgOffset]); + rewind(Files[NativeGuiDb]); CreateSystemServiceTable(Files[NativeGuiDb], Files[Win32kServiceTable], "Win32k", argv[Win32kServiceTable + ArgOffset]); + /* Create the Spec Files */ + rewind(Files[NativeSystemDb]); + CreateSpec(Files[NativeSystemDb], + &Files[NtSpec], + 1, + 0); + + rewind(Files[NativeSystemDb]); + CreateSpec(Files[NativeSystemDb], + &Files[NtSpec], + 1, + 1); + /* Close all files */ for (FileNumber = 0; FileNumber < Arguments-ArgOffset; FileNumber++) { diff --git a/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp b/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp index 73502e8fdb5..9648bc421e8 100644 --- a/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp +++ b/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp @@ -211,7 +211,7 @@ std::string CBBackend::CbpFileName ( const Module& module ) const { return DosSeparator( - ReplaceExtension ( module.output->relative_path + "\\" + module.output->name, "_auto.cbp" ) + ReplaceExtension ( module.output->relative_path + sSep + module.output->name, "_auto.cbp" ) ); } @@ -219,7 +219,7 @@ std::string CBBackend::LayoutFileName ( const Module& module ) const { return DosSeparator( - ReplaceExtension ( module.output->relative_path + "\\" + module.output->name, "_auto.layout" ) + ReplaceExtension ( module.output->relative_path + sSep + module.output->name, "_auto.layout" ) ); } @@ -227,7 +227,7 @@ std::string CBBackend::DependFileName ( const Module& module ) const { return DosSeparator( - ReplaceExtension ( module.output->relative_path + "\\" + module.output->name, "_auto.depend" ) + ReplaceExtension ( module.output->relative_path + sSep + module.output->name, "_auto.depend" ) ); } @@ -236,8 +236,8 @@ CBBackend::_get_object_files ( const Module& module, vector& out) const { string basepath = module.output->relative_path; size_t i; - string intenv = Environment::GetIntermediatePath () + "\\" + basepath + "\\"; - string outenv = Environment::GetOutputPath () + "\\" + basepath + "\\"; + string intenv = Environment::GetIntermediatePath () + sSep + basepath + sSep; + string outenv = Environment::GetOutputPath () + sSep + basepath + sSep; vector cfgs; @@ -265,7 +265,7 @@ CBBackend::_get_object_files ( const Module& module, vector& out) const for ( i = 0; i < files.size (); i++ ) { string file = files[i]->file.relative_path + sSep + files[i]->file.name; - string::size_type pos = file.find_last_of ("\\"); + string::size_type pos = file.find_last_of (sSep); if ( pos != string::npos ) file.erase ( 0, pos+1 ); if ( !stricmp ( Right(file,3).c_str(), ".rc" ) ) @@ -273,7 +273,7 @@ CBBackend::_get_object_files ( const Module& module, vector& out) const else file = ReplaceExtension ( file, ".obj" ); for ( size_t j = 0; j < cfgs.size () / 2; j++ ) - out.push_back ( cfgs[j] + "\\" + file ); + out.push_back ( cfgs[j] + sSep + file ); } } @@ -334,7 +334,7 @@ CBBackend::_generate_workspace ( FILE* OUT ) ifs_list.pop_back(); const vector& libs = data.libraries; for ( size_t j = 0; j < libs.size(); j++ ) - fprintf ( OUT, "\t\t\t\r\n", libs[j]->importedModule->output->relative_path.c_str(), libs[j]->name.c_str() ); + fprintf ( OUT, "\t\t\t\r\n", libs[j]->importedModule->output->relative_path.c_str(), sSep.c_str(), libs[j]->name.c_str() ); } fprintf ( OUT, "\t\t\r\n" ); } @@ -447,7 +447,7 @@ CBBackend::_generate_cbproj ( const Module& module ) const vector& libs = data.libraries; for ( i = 0; i < libs.size(); i++ ) { - string libpath = intdir + "\\" + libs[i]->importedModule->output->relative_path; + string libpath = intdir + sSep + libs[i]->importedModule->output->relative_path; libraries.push_back ( libs[i]->name ); libpaths.push_back ( libpath ); } @@ -516,18 +516,18 @@ CBBackend::_generate_cbproj ( const Module& module ) if ( configuration.UseConfigurationInPath ) { if ( IsStaticLibrary ( module ) ||module.type == ObjectLibrary ) - fprintf ( OUT, "\t\t\t\t