Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gvg] 19586: Sync to Wine-0_9_2:
by gvg＠svn.reactos.com 25 Nov '05

25 Nov '05

Sync to Wine-0_9_2: Juan Lang <juan_lang(a)yahoo.com> - Fix some memory leaks. Modified: trunk/reactos/lib/crypt32/cert.c Modified: trunk/reactos/lib/crypt32/encode.c _____ Modified: trunk/reactos/lib/crypt32/cert.c --- trunk/reactos/lib/crypt32/cert.c 2005-11-25 23:05:28 UTC (rev 19585) +++ trunk/reactos/lib/crypt32/cert.c 2005-11-25 23:08:16 UTC (rev 19586) @@ -347,6 +347,7 @@ memcpy(&ref->cert, context, sizeof(ref->cert)); ref->context = context; InterlockedIncrement(&context->ref); + TRACE("%p's ref count is %ld\n", context, context->ref); ref->cert.hCertStore = store; } @@ -356,6 +357,7 @@ PWINE_CERT_CONTEXT_REF pCertRef = CryptMemAlloc( sizeof(WINE_CERT_CONTEXT_REF)); + TRACE("(%p, %p)\n", context, store); if (pCertRef) CRYPT_InitCertRef(pCertRef, context, store); return pCertRef; @@ -461,6 +463,7 @@ } else ret = FALSE; + TRACE("returning %d\n", ret); return ret; } @@ -483,9 +486,12 @@ if (listNext) { ret = CryptMemAlloc(sizeof(WINE_CERT_LIST_ENTRY)); - memcpy(ret, LIST_ENTRY(listNext, WINE_CERT_LIST_ENTRY, entry), - sizeof(WINE_CERT_LIST_ENTRY)); - InterlockedIncrement(&ret->cert.context->ref); + if (ret) + { + memcpy(ret, LIST_ENTRY(listNext, WINE_CERT_LIST_ENTRY, entry), + sizeof(WINE_CERT_LIST_ENTRY)); + InterlockedIncrement(&ret->cert.context->ref); + } } else { @@ -498,13 +504,15 @@ return (PWINE_CERT_CONTEXT_REF)ret; } +static void CRYPT_UnrefCertificateContext(PWINE_CERT_CONTEXT_REF ref); + static BOOL WINAPI CRYPT_MemDeleteCert(HCERTSTORE hCertStore, PCCERT_CONTEXT pCertContext, DWORD dwFlags) { WINE_MEMSTORE *store = (WINE_MEMSTORE *)hCertStore; WINE_CERT_CONTEXT_REF *ref = (WINE_CERT_CONTEXT_REF *)pCertContext; PWINE_CERT_LIST_ENTRY cert, next; - BOOL ret; + BOOL ret = TRUE; /* Find the entry associated with the passed-in context, since the * passed-in context may not be a list entry itself (e.g. if it came from @@ -522,11 +530,16 @@ * protected. */ list_remove(&cert->entry); + /* FIXME: generally I should do the following, otherwise there is + * a memory leak. But doing so when called by + * CertDeleteCertificateFromStore results in a double free, so + * leaving commented for now. + ret = CertFreeCertificateContext((PCCERT_CONTEXT)cert); + */ cert->entry.prev = cert->entry.next = &store->certs; break; } } - ret = TRUE; LeaveCriticalSection(&store->cs); return ret; } @@ -662,73 +675,41 @@ { PWINE_COLLECTION_CERT_CONTEXT ret; PWINE_CERT_CONTEXT_REF child; + struct list *storeNext = list_next(&store->stores, &storeEntry->entry); TRACE("(%p, %p, %p)\n", store, storeEntry, pPrev); + child = storeEntry->store->enumCert((HCERTSTORE)storeEntry->store, + pPrev ? pPrev->childContext : NULL); if (pPrev) { - child = storeEntry->store->enumCert((HCERTSTORE)storeEntry->store, - pPrev->childContext); - if (child) + pPrev->childContext = NULL; + CertFreeCertificateContext((PCCERT_CONTEXT)pPrev); + pPrev = NULL; + } + if (child) + { + ret = (PWINE_COLLECTION_CERT_CONTEXT)CRYPT_CollectionCreateCertRef( + child->context, store); + if (ret) { - ret = pPrev; - memcpy(&ret->cert, child, sizeof(WINE_CERT_CONTEXT_REF)); - ret->cert.cert.hCertStore = (HCERTSTORE)store; - InterlockedIncrement(&ret->cert.context->ref); + ret->entry = storeEntry; ret->childContext = child; } else - { - struct list *storeNext = list_next(&store->stores, - &storeEntry->entry); - - pPrev->childContext = NULL; - CertFreeCertificateContext((PCCERT_CONTEXT)pPrev); - if (storeNext) - { - storeEntry = LIST_ENTRY(storeNext, WINE_STORE_LIST_ENTRY, - entry); - ret = CRYPT_CollectionAdvanceEnum(store, storeEntry, NULL); - } - else - { - SetLastError(CRYPT_E_NOT_FOUND); - ret = NULL; - } - } + CertFreeCertificateContext((PCCERT_CONTEXT)child); } else { - child = storeEntry->store->enumCert((HCERTSTORE)storeEntry->store, - NULL); - if (child) + if (storeNext) { - ret = (PWINE_COLLECTION_CERT_CONTEXT)CRYPT_CollectionCreateCertRef( - child->context, store); - if (ret) - { - ret->entry = storeEntry; - ret->childContext = child; - } - else - CertFreeCertificateContext((PCCERT_CONTEXT)child); + storeEntry = LIST_ENTRY(storeNext, WINE_STORE_LIST_ENTRY, entry); + ret = CRYPT_CollectionAdvanceEnum(store, storeEntry, NULL); } else { - struct list *storeNext = list_next(&store->stores, - &storeEntry->entry); - - if (storeNext) - { - storeEntry = LIST_ENTRY(storeNext, WINE_STORE_LIST_ENTRY, - entry); - ret = CRYPT_CollectionAdvanceEnum(store, storeEntry, NULL); - } - else - { - SetLastError(CRYPT_E_NOT_FOUND); - ret = NULL; - } + SetLastError(CRYPT_E_NOT_FOUND); + ret = NULL; } } TRACE("returning %p\n", ret); @@ -923,11 +904,9 @@ CERT_STORE_ADD_REPLACE_EXISTING, NULL); } else - { TRACE("hash doesn't match, ignoring\n"); - contextInterface->free(context); - } } + contextInterface->free(context); } } } @@ -1139,8 +1118,7 @@ static PWINE_CERT_CONTEXT_REF CRYPT_RegCreateCertRef( PWINE_CERT_CONTEXT context, HCERTSTORE store) { - PWINE_REG_CERT_CONTEXT ret = CryptMemAlloc( - sizeof(WINE_REG_CERT_CONTEXT)); + PWINE_REG_CERT_CONTEXT ret = CryptMemAlloc(sizeof(WINE_REG_CERT_CONTEXT)); if (ret) { @@ -1159,33 +1137,22 @@ TRACE("(%p, %p)\n", store, pPrev); - if (pPrev) + child = rs->memStore->enumCert(rs->memStore, prev ? prev->childContext + : NULL); + if (prev) { - child = rs->memStore->enumCert(rs->memStore, prev->childContext); - if (child) - { - ret = (PWINE_REG_CERT_CONTEXT)pPrev; - memcpy(&ret->cert, child, sizeof(WINE_CERT_CONTEXT_REF)); - ret->cert.cert.hCertStore = (HCERTSTORE)store; - ret->childContext = child; - } + prev->childContext = NULL; + CertFreeCertificateContext((PCCERT_CONTEXT)prev); + prev = NULL; } - else + if (child) { - child = rs->memStore->enumCert(rs->memStore, NULL); - if (child) - { - ret = CryptMemAlloc(sizeof(WINE_REG_CERT_CONTEXT)); - - if (ret) - { - memcpy(&ret->cert, child, sizeof(WINE_CERT_CONTEXT_REF)); - ret->cert.cert.hCertStore = (HCERTSTORE)store; - ret->childContext = child; - } - else - CertFreeCertificateContext((PCCERT_CONTEXT)child); - } + ret = (PWINE_REG_CERT_CONTEXT)CRYPT_RegCreateCertRef(child->context, + store); + if (ret) + ret->childContext = child; + else + CertFreeCertificateContext((PCCERT_CONTEXT)child); } return (PWINE_CERT_CONTEXT_REF)ret; } @@ -2349,7 +2316,8 @@ else { ret = hcs->deleteCert(hcs, pCertContext, 0); - CertFreeCertificateContext(pCertContext); + if (ret) + CertFreeCertificateContext(pCertContext); } } return ret; @@ -2884,6 +2852,17 @@ return ret; } +static void CRYPT_UnrefCertificateContext(PWINE_CERT_CONTEXT_REF ref) +{ + if (InterlockedDecrement(&ref->context->ref) == 0) + { + TRACE("%p's ref count is 0, freeing\n", ref->context); + CRYPT_FreeCert(ref->context); + } + else + TRACE("%p's ref count is %ld\n", ref->context, ref->context->ref); +} + BOOL WINAPI CertFreeCertificateContext(PCCERT_CONTEXT pCertContext) { TRACE("(%p)\n", pCertContext); @@ -2893,16 +2872,11 @@ PWINE_CERT_CONTEXT_REF ref = (PWINE_CERT_CONTEXT_REF)pCertContext; PWINECRYPT_CERTSTORE store = (PWINECRYPT_CERTSTORE)ref->cert.hCertStore; - if (InterlockedDecrement(&ref->context->ref) == 0) - { - TRACE("%p's ref count is 0, freeing\n", ref->context); - CRYPT_FreeCert(ref->context); - } - else - TRACE("%p's ref count is %ld\n", ref->context, ref->context->ref); + CRYPT_UnrefCertificateContext(ref); if (store && store->dwMagic == WINE_CRYPTCERTSTORE_MAGIC && store->freeCert) store->freeCert(ref); + TRACE("freeing %p\n", ref); CryptMemFree(ref); } return TRUE; _____ Modified: trunk/reactos/lib/crypt32/encode.c --- trunk/reactos/lib/crypt32/encode.c 2005-11-25 23:05:28 UTC (rev 19585) +++ trunk/reactos/lib/crypt32/encode.c 2005-11-25 23:08:16 UTC (rev 19586) @@ -46,6 +46,7 @@ #include "snmp.h" #include "wine/debug.h" #include "wine/exception.h" +#include "crypt32_private.h" /* This is a bit arbitrary, but to set some limit: */ #define MAX_ENCODED_LEN 0x02000000 @@ -1392,7 +1393,7 @@ __EXCEPT(page_fault) { SetLastError(STATUS_ACCESS_VIOLATION); - return FALSE; + ret = FALSE; } __ENDTRY CryptMemFree(blobs);

1 0

[gvg] 19585: Sync to Wine-0_9_2:
by gvg＠svn.reactos.com 25 Nov '05

25 Nov '05

Sync to Wine-0_9_2: Vitaliy Margolen <wine-patch(a)kievinfo.com> - Return false if index is out of bounds in GetItemT. Francois Gouget <fgouget(a)free.fr> - Remove spaces before '\n' in traces. - Assorted spelling and case fixes. Thomas Weidenmueller <wine-patches(a)reactsoft.com> - Improved word wrapping and tab key handling. Raphael Junqueira <fenix(a)club-internet.fr> - Implement implement header callback support (HDN_GETDISPINFO notification): - better factorisation - unicode fixes YunSong Hwang <hys545(a)dreamwiz.com> - Update Korean translations. Markus Amsler <markus.amsler(a)oribi.org> - Reformat "see" section, to match c2man requirements. Modified: trunk/reactos/lib/comctl32/comctl_Ko.rc Modified: trunk/reactos/lib/comctl32/header.c Modified: trunk/reactos/lib/comctl32/rebar.c Modified: trunk/reactos/lib/comctl32/syslink.c Modified: trunk/reactos/lib/comctl32/tooltips.c _____ Modified: trunk/reactos/lib/comctl32/comctl_Ko.rc --- trunk/reactos/lib/comctl32/comctl_Ko.rc 2005-11-25 23:01:01 UTC (rev 19584) +++ trunk/reactos/lib/comctl32/comctl_Ko.rc 2005-11-25 23:05:28 UTC (rev 19585) @@ -1,5 +1,6 @@ /* * Copyright 2002 Won-kyu Park <wkpark(a)kldp.org> + * Copyright 2005 YunSong Hwang * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -20,20 +21,20 @@ IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Properties for " +CAPTION "?Ë??" FONT 9, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "?«??", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP PUSHBUTTON "?Ù?Ê", IDCANCEL,58,122,50,14 PUSHBUTTON "?¹?Ù(&A)", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED PUSHBUTTON "ÁÁ??©?", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP - CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS _MULTILINE,4,4,212,114 + CONTROL "?Ã", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS _MULTILINE,4,4,212,114 END IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Wizard" +CAPTION "©Â?²?þ" FONT 9, "MS Shell Dlg" BEGIN PUSHBUTTON "< ???³(&B)", IDC_BACK_BUTTON,71,138,50,14 @@ -42,26 +43,26 @@ PUSHBUTTON "?Ù?Ê", IDCANCEL,178,138,50,14 PUSHBUTTON "ÁÁ??©?", IDHELP,235,138,50,14,WS_GROUP LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN - CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5 + CONTROL "?Ã", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5 LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE END IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Customize Toolbar" +CAPTION "ÁÁ?©?? ?þ?Ù?? ?ñ?Ã" FONT 9, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "?¦?Ô(&C)", IDCANCEL,308,6,44,14 PUSHBUTTON "??¢?(&e)", IDC_RESET_BTN,308,23,44,14 PUSHBUTTON "ÁÁ??©?(&H)", IDC_HELP_BTN,308,40,44,14 - PUSHBUTTON "Move &Up", IDC_MOVEUP_BTN,308,74,44,14 - PUSHBUTTON "Move &Down", IDC_MOVEDN_BTN,308,91,44,14 - LTEXT "A&vailable buttons:", -1,4,5,84,10 + PUSHBUTTON "?ºÀ? ??Á?(&U)", IDC_MOVEUP_BTN,308,74,44,14 + PUSHBUTTON "¥ãÀíÀ? ??Á?(&D)", IDC_MOVEDN_BTN,308,91,44,14 + LTEXT "?í??ÃÐ ?÷ã?(&v)", -1,4,5,84,10 LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP - PUSHBUTTON "&Add ->", IDOK, 131, 42, 44, 14 - PUSHBUTTON "<- &Remove", IDC_REMOVE_BTN,131,62,44,14 - LTEXT "&Toolbar buttons:", -1,182,5,78,10 + PUSHBUTTON "?§Ã¤?Ô(&A) ->", IDOK, 131, 42, 44, 14 + PUSHBUTTON "<- ?ª??Ã¤?Ô(&R)", IDC_REMOVE_BTN,131,62,44,14 + LTEXT "ÁÁ?©?? ?÷ã?(&T):", -1,182,5,78,10 LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP END @@ -73,10 +74,10 @@ STRINGTABLE DISCARDABLE { IDM_TODAY "????:" - IDM_GOTODAY "Go to today" + IDM_GOTODAY "????À? ?í?Ô" } STRINGTABLE DISCARDABLE { - IDS_SEPARATOR "Separator" + IDS_SEPARATOR "?ð©«??" } _____ Modified: trunk/reactos/lib/comctl32/header.c --- trunk/reactos/lib/comctl32/header.c 2005-11-25 23:01:01 UTC (rev 19584) +++ trunk/reactos/lib/comctl32/header.c 2005-11-25 23:05:28 UTC (rev 19585) @@ -813,12 +813,11 @@ if (phdi->mask == 0) return TRUE; - if ((nItem < 0) || (nItem >= (INT)infoPtr->uNumItem)) - lpItem = NULL; - else - lpItem = &infoPtr->items[nItem]; + return FALSE; + lpItem = &infoPtr->items[nItem]; + if (phdi->mask & HDI_BITMAP) phdi->hbm = (lpItem != NULL) ? lpItem->hbm : 0; _____ Modified: trunk/reactos/lib/comctl32/rebar.c --- trunk/reactos/lib/comctl32/rebar.c 2005-11-25 23:01:01 UTC (rev 19584) +++ trunk/reactos/lib/comctl32/rebar.c 2005-11-25 23:05:28 UTC (rev 19585) @@ -2131,9 +2131,9 @@ lpBand->hwndChild = lprbbi->hwndChild; lpBand->hwndPrevParent = SetParent (lpBand->hwndChild, hwnd); - /* below in trace fro WinRAR */ + /* below in trace from WinRAR */ ShowWindow(lpBand->hwndChild, SW_SHOWNOACTIVATE | SW_SHOWNORMAL); - /* above in trace fro WinRAR */ + /* above in trace from WinRAR */ } else { TRACE("child: %p prev parent: %p\n", _____ Modified: trunk/reactos/lib/comctl32/syslink.c --- trunk/reactos/lib/comctl32/syslink.c 2005-11-25 23:01:01 UTC (rev 19584) +++ trunk/reactos/lib/comctl32/syslink.c 2005-11-25 23:05:28 UTC (rev 19585) @@ -1,7 +1,7 @@ /* * SysLink control * - * Copyright 2004 Thomas Weidenmueller <w3seek(a)reactos.com> + * Copyright 2004, 2005 Thomas Weidenmueller <w3seek(a)reactos.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -25,12 +25,6 @@ * Unless otherwise noted, we believe this code to be complete, as per * the specification mentioned above. * If you discover missing features, or bugs, please note them below. - * - * TODO: - * - Fix SHIFT+TAB and TAB issue (wrong link is selected when control gets the focus) - * - Better string parsing - * - Improve word wrapping - * */ #include <stdarg.h> @@ -52,6 +46,7 @@ typedef struct { int nChars; + int nSkip; RECT rc; } DOC_TEXTBLOCK, *PDOC_TEXTBLOCK; @@ -78,7 +73,6 @@ UINT state; /* Link state */ WCHAR *szID; /* Link ID string */ WCHAR *szUrl; /* Link URL string */ - HRGN hRgn; /* Region of the link */ } Link; struct { @@ -100,6 +94,7 @@ COLORREF TextColor; /* Color of the text */ COLORREF LinkColor; /* Color of links */ COLORREF VisitedColor; /* Color of visited links */ + WCHAR BreakChar; /* Break Character for the current font */ } SYSLINK_INFO; static const WCHAR SL_LINKOPEN[] = { '<','a', 0 }; @@ -126,11 +121,6 @@ Free(DocItem->u.Link.szUrl); } - if(DocItem->Type == slLink && DocItem->u.Link.hRgn != NULL) - { - DeleteObject(DocItem->u.Link.hRgn); - } - /* we don't free Text because it's just a pointer to a character in the entire window text string */ @@ -215,9 +205,8 @@ { BOOL ValidParam = FALSE, ValidLink = FALSE; - switch (*(current + 2)) + if(*(current + 2) == '>') { - case '>': /* we just have to deal with a <a> tag */ taglen = 3; ValidLink = TRUE; @@ -226,8 +215,8 @@ linklen = 0; lpID = NULL; lpUrl = NULL; - break; - case ' ': + } + else if(*(current + 2) == infoPtr->BreakChar) { /* we expect parameters, parse them */ LPCWSTR *CurrentParameter = NULL, tmp; @@ -285,28 +274,23 @@ * 1. another parameter is coming, so expect a ' ' (space) character * 2. the tag is being closed, so expect a '<' character */ - switch(*tmp) + if(*tmp == infoPtr->BreakChar) { - case ' ': /* we expect another parameter, do the whole thing again */ taglen++; tmp++; goto CheckParameter; - - case '>': + } + else if(*tmp == '>') + { /* the tag is being closed, we're done */ ValidLink = TRUE; taglen++; - break; - default: + } + else tmp++; - break; - } } - - break; } - } if(ValidLink && ValidParam) { @@ -495,16 +479,26 @@ */ static VOID SYSLINK_RepaintLink (SYSLINK_INFO *infoPtr, PDOC_ITEM DocItem) { + PDOC_TEXTBLOCK bl; + int n; + if(DocItem->Type != slLink) { ERR("DocItem not a link!\n"); return; } - if(DocItem->u.Link.hRgn != NULL) + bl = DocItem->Blocks; + if (bl != NULL) { - /* repaint the region */ - RedrawWindow(infoPtr->Self, NULL, DocItem->u.Link.hRgn, RDW_INVALIDATE | RDW_UPDATENOW); + n = DocItem->nText; + + while(n > 0) + { + InvalidateRect(infoPtr->Self, &bl->rc, TRUE); + n -= bl->nChars + bl->nSkip; + bl++; + } } } @@ -615,7 +609,8 @@ * SYSLINK_WrapLine * Tries to wrap a line. */ -static BOOL SYSLINK_WrapLine (HDC hdc, LPWSTR Text, WCHAR BreakChar, int *LineLen, int nFit, LPSIZE Extent, int Width) +static BOOL SYSLINK_WrapLine (HDC hdc, LPWSTR Text, WCHAR BreakChar, int *LineLen, + int nFit, LPSIZE Extent, int Width) { WCHAR *Current; @@ -659,7 +654,6 @@ PDOC_ITEM Current; HGDIOBJ hOldFont; int x, y, LineHeight; - TEXTMETRICW tm; GetClientRect(infoPtr->Self, &rc); rc.right -= SL_RIGHTMARGIN; @@ -668,7 +662,6 @@ if(rc.right - SL_LEFTMARGIN < 0 || rc.bottom - SL_TOPMARGIN < 0) return; hOldFont = SelectObject(hdc, infoPtr->Font); - GetTextMetricsW(hdc, &tm); x = SL_LEFTMARGIN; y = SL_TOPMARGIN; @@ -684,13 +677,18 @@ if(Current->nText == 0) { - ERR("DOC_ITEM with no text?!\n"); continue; } tx = Current->Text; n = Current->nText; - bl = Current->Blocks; + + if (Current->Blocks != NULL) + { + Free(Current->Blocks); + Current->Blocks = NULL; + } + bl = NULL; nBlocks = 0; if(Current->Type == slText) @@ -704,41 +702,80 @@ while(n > 0) { - if(GetTextExtentExPointW(hdc, tx, n, rc.right - x, &nFit, NULL, &szDim)) + int SkipChars = 0; + + /* skip break characters unless they're the first of the doc item */ + if(tx != Current->Text || x == SL_LEFTMARGIN) { + while(n > 0 && (*tx) == infoPtr->BreakChar) + { + tx++; + SkipChars++; + n--; + } + } + + if((n == 0 && SkipChars != 0) || + GetTextExtentExPointW(hdc, tx, n, rc.right - x, &nFit, NULL, &szDim)) + { int LineLen = n; - BOOL Wrap = SYSLINK_WrapLine(hdc, tx, tm.tmBreakChar, &LineLen, nFit, &szDim, rc.right - x); + BOOL Wrap = FALSE; - if(LineLen == 0) + if(n != 0) { - if(x > SL_LEFTMARGIN) + Wrap = SYSLINK_WrapLine(hdc, tx, infoPtr->BreakChar, &LineLen, nFit, &szDim, rc.right - x); + + if(LineLen == 0) { - /* move one line down, the word didn't fit into the line */ - x = SL_LEFTMARGIN; - y += LineHeight; - LineHeight = 0; - continue; + if(x > SL_LEFTMARGIN) + { + /* move one line down, the word didn't fit into the line */ + x = SL_LEFTMARGIN; + y += LineHeight; + LineHeight = 0; + continue; + } + else + { + /* the word starts at the beginning of the line and doesn't + fit into the line, so break it at the last character that fits */ + LineLen = max(nFit, 1); + } } - else + + if(LineLen != n) { - /* the word starts at the beginning of the line and doesn't - fit into the line, so break it at the last character that fits */ - LineLen = max(nFit, 1); + if(!GetTextExtentExPointW(hdc, tx, LineLen, rc.right - x, NULL, NULL, &szDim)) + { + if(bl != NULL) + { + Free(bl); + bl = NULL; + } + break; + } } } - if(LineLen != n) - { - GetTextExtentExPointW(hdc, tx, LineLen, rc.right - x, NULL, NULL, &szDim); - } - if(bl != NULL) { - bl = ReAlloc(bl, ++nBlocks * sizeof(DOC_TEXTBLOCK)); + PDOC_TEXTBLOCK nbl = ReAlloc(bl, (nBlocks + 1) * sizeof(DOC_TEXTBLOCK)); + if (nbl != NULL) + { + bl = nbl; + nBlocks++; + } + else + { + Free(bl); + bl = NULL; + } } else { - bl = Alloc(++nBlocks * sizeof(DOC_TEXTBLOCK)); + bl = Alloc((nBlocks + 1) * sizeof(DOC_TEXTBLOCK)); + if (bl != NULL) + nBlocks++; } if(bl != NULL) @@ -746,42 +783,24 @@ cbl = bl + nBlocks - 1; cbl->nChars = LineLen; + cbl->nSkip = SkipChars; cbl->rc.left = x; cbl->rc.top = y; cbl->rc.right = x + szDim.cx; cbl->rc.bottom = y + szDim.cy; - x += szDim.cx; - LineHeight = max(LineHeight, szDim.cy); - - /* (re)calculate the link's region */ - if(Current->Type == slLink) + if(LineLen != 0) { - if(nBlocks <= 1) + x += szDim.cx; + LineHeight = max(LineHeight, szDim.cy); + + if(Wrap) { - if(Current->u.Link.hRgn != NULL) - { - DeleteObject(Current->u.Link.hRgn); - } - /* initialize the link's hRgn */ - Current->u.Link.hRgn = CreateRectRgnIndirect(&cbl->rc); + x = SL_LEFTMARGIN; + y += LineHeight; + LineHeight = 0; } - else if(Current->u.Link.hRgn != NULL) - { - HRGN hrgn; - hrgn = CreateRectRgnIndirect(&cbl->rc); - /* add the rectangle */ - CombineRgn(Current->u.Link.hRgn, Current->u.Link.hRgn, hrgn, RGN_OR); - DeleteObject(hrgn); - } } - - if(Wrap) - { - x = SL_LEFTMARGIN; - y += LineHeight; - LineHeight = 0; - } } else { @@ -793,11 +812,16 @@ } else { - ERR("GetTextExtentExPoint() failed?!\n"); n--; } } - Current->Blocks = bl; + + if(nBlocks != 0) + { + Current->Blocks = bl; + } + else + Current->Blocks = NULL; } SelectObject(hdc, hOldFont); @@ -849,6 +873,7 @@ while(n > 0) { + tx += bl->nSkip; ExtTextOutW(hdc, bl->rc.left, bl->rc.top, ETO_OPAQUE | ETO_CLIPPED, &bl->rc, tx, bl->nChars, NULL); if((Current->Type == slLink) && (Current->u.Link.state & LIS_FOCUSED) && infoPtr->HasFocus) { @@ -858,7 +883,7 @@ SetBkColor(hdc, PrevColor); } tx += bl->nChars; - n -= bl->nChars; + n -= bl->nChars + bl->nSkip; bl++; } } @@ -896,6 +921,7 @@ { HDC hdc; LOGFONTW lf; + TEXTMETRICW tm; HFONT hOldFont = infoPtr->Font; infoPtr->Font = hFont; @@ -911,10 +937,12 @@ if(hdc != NULL) { /* create a new underline font */ - if(GetObjectW(infoPtr->Font, sizeof(LOGFONTW), &lf)) + if(GetTextMetricsW(hdc, &tm) && + GetObjectW(infoPtr->Font, sizeof(LOGFONTW), &lf)) { lf.lfUnderline = TRUE; infoPtr->LinkFont = CreateFontIndirectW(&lf); + infoPtr->BreakChar = tm.tmBreakChar; } else { @@ -1133,6 +1161,34 @@ } /*********************************************************************** + * SYSLINK_PtInDocItem + * Determines if a point is in the region of a document item + */ +static BOOL SYSLINK_PtInDocItem (PDOC_ITEM DocItem, POINT pt) +{ + PDOC_TEXTBLOCK bl; + int n; + + bl = DocItem->Blocks; + if (bl != NULL) + { + n = DocItem->nText; + + while(n > 0) + { + if (PtInRect(&bl->rc, pt)) + { + return TRUE; + } + n -= bl->nChars + bl->nSkip; + bl++; + } + } + + return FALSE; +} + +/********************************************************************** * * SYSLINK_HitTest * Determines the link the user clicked on. */ @@ -1145,8 +1201,7 @@ { if(Current->Type == slLink) { - if((Current->u.Link.hRgn != NULL) && - PtInRegion(Current->u.Link.hRgn, HitTest->pt.x, HitTest->pt.y)) + if(SYSLINK_PtInDocItem(Current, HitTest->pt)) { HitTest->item.mask = 0; HitTest->item.iLink = id; @@ -1252,25 +1307,13 @@ infoPtr->HasFocus = TRUE; -#if 1 - /* FIXME - How to detect whether SHIFT+TAB or just TAB has been pressed? - * The problem is we could get this message without keyboard input, too - */ - Focus = SYSLINK_GetFocusLink(infoPtr, NULL); - - if(Focus == NULL && (Focus = SYSLINK_GetNextLink(infoPtr, NULL))) - { - SYSLINK_SetFocusLink(infoPtr, Focus); - } -#else - /* This is a temporary hack since I'm not really sure how to detect which link to select. - See message above! */ + /* We always select the first link, even if we activated the control using + SHIFT+TAB. This is the default behavior */ Focus = SYSLINK_GetNextLink(infoPtr, NULL); if(Focus != NULL) { SYSLINK_SetFocusLink(infoPtr, Focus); } -#endif SYSLINK_RepaintLink(infoPtr, Focus); @@ -1307,8 +1350,7 @@ for(Current = infoPtr->Items; Current != NULL; Current = Current->Next) { - if((Current->Type == slLink) && (Current->u.Link.hRgn != NULL) && - PtInRegion(Current->u.Link.hRgn, pt->x, pt->y) && + if((Current->Type == slLink) && SYSLINK_PtInDocItem(Current, *pt) && (!MustBeEnabled || (MustBeEnabled && (Current->u.Link.state & LIS_ENABLED)))) { if(LinkId != NULL) @@ -1335,6 +1377,8 @@ Current = SYSLINK_LinkAtPt(infoPtr, pt, &id, TRUE); if(Current != NULL) { + SetFocus(infoPtr->Self); + Old = SYSLINK_SetFocusLink(infoPtr, Current); if(Old != NULL && Old != Current) { @@ -1342,7 +1386,6 @@ } infoPtr->MouseDownID = id; SYSLINK_RepaintLink(infoPtr, Current); - SetFocus(infoPtr->Self); } return 0; @@ -1460,7 +1503,7 @@ infoPtr = (SYSLINK_INFO *)GetWindowLongPtrW(hwnd, 0); if (!infoPtr && message != WM_CREATE) - return DefWindowProcW( hwnd, message, wParam, lParam ); + goto HandleDefaultMessage; switch(message) { case WM_PRINTCLIENT: @@ -1482,8 +1525,7 @@ return TRUE; } /* let the default window proc handle this message */ - return DefWindowProcW(hwnd, message, wParam, lParam); - + goto HandleDefaultMessage; } case WM_SIZE: @@ -1505,7 +1547,7 @@ case WM_SETTEXT: SYSLINK_SetText(infoPtr, (LPWSTR)lParam); - return DefWindowProcW(hwnd, message, wParam, lParam); + goto HandleDefaultMessage; case WM_LBUTTONDOWN: { @@ -1536,7 +1578,7 @@ return 0; } } - return DefWindowProcW(hwnd, message, wParam, lParam); + goto HandleDefaultMessage; } case WM_GETDLGCODE: @@ -1638,6 +1680,7 @@ infoPtr->TextColor = GetSysColor(COLOR_WINDOWTEXT); infoPtr->LinkColor = GetSysColor(COLOR_HIGHLIGHT); infoPtr->VisitedColor = GetSysColor(COLOR_HIGHLIGHT); + infoPtr->BreakChar = ' '; TRACE("SysLink Ctrl creation, hwnd=%p\n", hwnd); SYSLINK_SetText(infoPtr, ((LPCREATESTRUCTW)lParam)->lpszName); return 0; @@ -1652,8 +1695,11 @@ return 0; default: +HandleDefaultMessage: if ((message >= WM_USER) && (message < WM_APP)) - ERR("unknown msg %04x wp=%04x lp=%08lx\n", message, wParam, lParam ); + { + ERR("unknown msg %04x wp=%04x lp=%08lx\n", message, wParam, lParam ); + } return DefWindowProcW(hwnd, message, wParam, lParam); } } _____ Modified: trunk/reactos/lib/comctl32/tooltips.c --- trunk/reactos/lib/comctl32/tooltips.c 2005-11-25 23:01:01 UTC (rev 19584) +++ trunk/reactos/lib/comctl32/tooltips.c 2005-11-25 23:05:28 UTC (rev 19585) @@ -1507,7 +1507,7 @@ /* NB this API is broken, there is no way for the app to determine what size buffer it requires nor a way to specify how long the - one it supplies is. We'll assume it's upto INFOTIPSIZE */ + one it supplies is. We'll assume it's up to INFOTIPSIZE */ WideCharToMultiByte(CP_ACP, 0, infoPtr->tools[nTool].lpszText, -1, lpToolInfo->lpszText, INFOTIPSIZE, NULL, NULL);

1 0

[gvg] 19584: Sync to Wine-0_9_2:
by gvg＠svn.reactos.com 25 Nov '05

25 Nov '05

Sync to Wine-0_9_2: YunSong Hwang <hys545(a)dreamwiz.com> - Update Korean translations. - Add Korean translations. Added: trunk/reactos/lib/avifil32/avifile_Ko.rc Modified: trunk/reactos/lib/avifil32/rsrc.rc _____ Copied: trunk/reactos/lib/avifil32/avifile_Ko.rc (from rev 19583, vendor/wine/dlls/avifil32/current/avifile_Ko.rc) Property changes on: trunk/reactos/lib/avifil32/avifile_Ko.rc ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/avifil32/rsrc.rc --- trunk/reactos/lib/avifil32/rsrc.rc 2005-11-25 22:59:48 UTC (rev 19583) +++ trunk/reactos/lib/avifil32/rsrc.rc 2005-11-25 23:01:01 UTC (rev 19584) @@ -45,6 +45,7 @@ #include "avifile_Fr.rc" #include "avifile_It.rc" #include "avifile_Ja.rc" +#include "avifile_Ko.rc" #include "avifile_Nl.rc" #include "avifile_No.rc" #include "avifile_Pl.rc"

1 0

[gvg] 19583: Sync to Wine-0_9_2:
by gvg＠svn.reactos.com 25 Nov '05

25 Nov '05

Sync to Wine-0_9_2: Francois Gouget <fgouget(a)free.fr> - Assorted spelling fixes. Modified: trunk/reactos/tools/wrc/translation.c _____ Modified: trunk/reactos/tools/wrc/translation.c --- trunk/reactos/tools/wrc/translation.c 2005-11-25 22:55:40 UTC (rev 19582) +++ trunk/reactos/tools/wrc/translation.c 2005-11-25 22:59:48 UTC (rev 19583) @@ -205,7 +205,7 @@ PRETTYPRINTLANG(CORNISH) PRETTYPRINTLANG(WELSH) PRETTYPRINTLANG(BRETON) - return "Unkown language"; + return "Unknown language"; } #endif @@ -981,7 +981,7 @@ add_resource(next); break; default: - fprintf(stderr, "Report this: unkown resource type parsed %08x\n", next->type); + fprintf(stderr, "Report this: unknown resource type parsed %08x\n", next->type); } next = next->next; }

1 0

[sgasiorek] 19582: polish resources by Emil Kaczmarek (bug 1044)
by sgasiorek＠svn.reactos.com 25 Nov '05

25 Nov '05

polish resources by Emil Kaczmarek (bug 1044) with little fixes by me Added: trunk/reactos/lib/cpl/access/Pl.rc Modified: trunk/reactos/lib/cpl/access/access.rc Added: trunk/reactos/lib/cpl/appwiz/Pl.rc Modified: trunk/reactos/lib/cpl/appwiz/appwiz.rc _____ Added: trunk/reactos/lib/cpl/access/Pl.rc --- trunk/reactos/lib/cpl/access/Pl.rc 2005-11-25 22:55:30 UTC (rev 19581) +++ trunk/reactos/lib/cpl/access/Pl.rc 2005-11-25 22:55:40 UTC (rev 19582) @@ -0,0 +1,110 @@ +//Polish translation Emil Kaczmarek 2005 + +LANGUAGE LANG_POLISH, SUBLANG_NEUTRAL + +IDI_CPLACCESS ICON "resources/applet.ico" + + +IDD_PROPPAGEKEYBOARD DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Klawiatura" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Klawisze Trwa?e",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH- (2*PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING + LTEXT "U?yj funkcji Klawisze trwa?e je£li chcesz u?ywaµ Shifta, Ctrl-a albo Alta naciskaj?c je tylko raz.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-(6*PR OPSHEETPADDING)-ICONSIZE,LABELLINE(3) + CHECKBOX "&U?yj Klawiszy Trwa?ych",IDC_STICKY_BOX,(4*PROPSHEETPADDING),LABELLINE(5) +2,(15*PROPSHEETPADDING),14 + PUSHBUTTON "U&stawienia",IDC_STICKY_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LAB ELLINE(5)+2,(15*PROPSHEETPADDING),14 + GROUPBOX "Klawisze Filtra",-1,PROPSHEETPADDING,LABELLINE(8)+5,PROPSHEETWIDTH-(2*PROPSHEETPA DDING),LABELLINE(7)+2 + LTEXT "U?yj funkcji Klawisze Filtra, je£li chcesz, ?eby ReactOS ignorowa? kr¾tkie albo powtarzaj?ce siÛ wci£niÛcia klawiszy albo zmniejsza? czÛsto£µ powtarzania.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(10)-3,PROPSHEET WIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) + CHECKBOX "Klawisze &Filtra",IDC_FILTER_BOX,(4*PROPSHEETPADDING),LABELLINE(13)+2,(15*PROPSHE ETPADDING),14 + PUSHBUTTON "Us&tawienia",IDC_FILTER_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LAB ELLINE(13)+2,(15*PROPSHEETPADDING),14 + GROUPBOX "Klawisze Prze??czaj?ce",-1,PROPSHEETPADDING,LABELLINE(16) +3,PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING + LTEXT "U?yj funkcji &Klawisze Prze??czaj?ce, je£li chcesz s?yszeµ dfwiÛk przy naciskaniu klawiszy Caps Lock, Num Lock albo Scroll Lock.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(18)-3,PROPSHEETWIDTH-( 6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2) + CHECKBOX "U?yj Klawiszy Prze? ?czaj?cych",IDC_TOGGLE_BOX,(4*PROPSHEETPADDING),LABELLINE(20) +2,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2) + PUSHBUTTON "Ustawie&nia",IDC_TOGGLE_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LAB ELLINE(20)+2,(15*PROPSHEETPADDING),14 +// CHECKBOX "Sho&w extra keyboard help in programs",IDC_KEYBOARD_EXTRA +END + + +IDD_PROPPAGESOUND DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "DfwiÛk" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Wartownik DfwiÛku",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEETPAD DING),LABELLINE(6)+PROPSHEETPADDING + LTEXT "U?yj funkcji Wartownik DfwiÛku je£li chcesz, ?eby ReactOS pokazywa? wizualne ostrze?enia w chwili generacji dfwiÛku.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-( 6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) + CHECKBOX "U?yj funkcji &Wartownik DfwiÛku",IDC_SENTRY_BOX,(4*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEE TPADDING),14 + PUSHBUTTON "&Ustawienia",IDC_SENTRY_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LAB ELLINE(5)+2,(15*PROPSHEETPADDING),14 + + GROUPBOX "Poka? DfwiÛki",-1,PROPSHEETPADDING,LABELLINE(8)+5,PROPSHEETWIDTH-(2*PROPSHEETP ADDING),LABELLINE(7)+2 + LTEXT "U?yj funkcji Poka? DfwiÛki, aby nakazaµ swoim programom wy£wietlanie napis¾w w chwili generacji dfwiÛku lub mowy.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-( 6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) + CHECKBOX "U?yj funkcji &Pokaf DfwiÛki",IDC_SSHOW_BOX,(4*PROPSHEETPADDING),LABELLINE(12)+2,PROPSHEETWID TH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) +END + + +IDD_PROPPAGEDISPLAY DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Ekran" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Wysoki Kontrast",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEETPA DDING),LABELLINE(6)+PROPSHEETPADDING + LTEXT "U?yj tej funkcji, je£li chcesz, ?eby Reactos u?ywa? kolor¾w i czcionek zaprojektowanych do ?atwego czytania",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-( 6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) + CHECKBOX "&U?yj funkcji Wysoki Kontrast",IDC_CONTRAST_BOX,(4*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPS HEETPADDING),14 + PUSHBUTTON "U&stawienia",IDC_CONTRAST_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),L ABELLINE(5)+2,(15*PROPSHEETPADDING),14 +END + + + +IDD_PROPPAGEMOUSE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Mysz" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Klawisze Myszy",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEETPADDI NG),LABELLINE(6)+PROPSHEETPADDING + LTEXT "U?yj tej opcji, je£li chcesz kontrolowaµ wskafnik myszy przy pomocy klawiatury numerycznej.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWID TH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) + CHECKBOX "U?yj funkcji Klawisze &Myszy",IDC_MOUSE_BOX,(4*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETP ADDING),14 + PUSHBUTTON "U&stawienia",IDC_MOUSE_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABE LLINE(5)+2,(15*PROPSHEETPADDING),14 +END + + +IDD_PROPPAGEGENERAL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Og¾lne" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Automatyczny reset",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEETPADDI NG),LABELLINE(5) + CHECKBOX "&Wy??cz funkcje u?atwiaj?ce dostÛp kiedy komputer nie jest u?ywany przez:",IDC_RESET_BOX,(2*PROPSHEETPADDING),LABELLINE(2)-2,PROPSHEETWIDTH -(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2) + + //POPUP IDC_RESET_POPUP, GRAYED + //{ + // MENUITEM "5 minut", IDC_RESET_5 + // MENUITEM "10 minus", IDC_RESET_10 + // MENUITEM "15 minut", IDC_RESET_15 + // MENUITEM "20 minut", IDC_RESET_20 + // MENUITEM "25 minut", IDC_RESET_25 + // MENUITEM "30 minut", IDC_RESET_30 + //} + + GROUPBOX "Powiadomienia",-1,PROPSHEETPADDING,LABELLINE(7)-2,PROPSHEETWIDTH-(2*PRO PSHEETPADDING),LABELLINE(5) + CHECKBOX "Ostrzegaj kiedy funkcja jest w? ?czana",IDC_NOTIFICATION_MESSAGE,(2*PROPSHEETPADDING),LABELLINE(8) -2,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2) + CHECKBOX "Odgrywaj dfwiÛk, kiedy funkcja jest w??czana albo wy? ?czana",IDC_NOTIFICATION_SOUND,(2*PROPSHEETPADDING),LABELLINE(10) -2,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(1) + + GROUPBOX "Urz?dzenia klawiszy szeregowych",-1,PROPSHEETPADDING,LABELLINE(13)-4,PROPSHEETWIDTH-(2*PROPS HEETPADDING),LABELLINE(5) + LTEXT "Urz?dzenia klawiszy szeregowych zapewniaj? alternatywny dostÛp do funkcji klawiatury lub myszy.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(14)-4,PROPSHEETWIDTH- (6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2) + CHECKBOX "Wspieraj urz?dzenia klawi&szy szeregowych",IDC_SERIAL_BOX,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(16)- 4,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(1) + + PUSHBUTTON "&Ustawienia",IDC_SERIAL_BUTTON,180,LABELLINE(16)-4,50,LABELLINE(1) + + GROUPBOX "Opcje zarz?dzania",-1,PROPSHEETPADDING,LABELLINE(19) -4,PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(5) + + CHECKBOX "Zastosuj wszystkie ustawienia do pu&lpitu logowania",IDC_ADMIN_LOGON_BOX,(PROPSHEETPADDING*2),LABELLINE(20)-4,PROP SHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2) + CHECKBOX "Zastosuj wszystkie ustawienia do &domy£lnego profilu dla nowych u?ytkownik¾w",IDC_ADMIN_USERS_BOX,(2*PROPSHEETPADDING),LABELLINE(22) -4,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(1) +END + + +STRINGTABLE +BEGIN + IDS_CPLSYSTEMNAME "U?atwienia dostÛpu" + IDS_CPLSYSTEMDESCRIPTION "Personalizuje funkcje u?atwie± dostÛpu na twoim komputerze." +END + _____ Modified: trunk/reactos/lib/cpl/access/access.rc --- trunk/reactos/lib/cpl/access/access.rc 2005-11-25 22:55:30 UTC (rev 19581) +++ trunk/reactos/lib/cpl/access/access.rc 2005-11-25 22:55:40 UTC (rev 19582) @@ -10,3 +10,4 @@ #include "En.rc" #include "Ja.rc" #include "Nl.rc" +#include "Pl.rc" _____ Added: trunk/reactos/lib/cpl/appwiz/Pl.rc --- trunk/reactos/lib/cpl/appwiz/Pl.rc 2005-11-25 22:55:30 UTC (rev 19581) +++ trunk/reactos/lib/cpl/appwiz/Pl.rc 2005-11-25 22:55:40 UTC (rev 19582) @@ -0,0 +1,52 @@ +//Polish translation Emil Kaczmarek 2005 + +LANGUAGE LANG_POLISH, SUBLANG_NEUTRAL + +IDD_PROPPAGEINSTALL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Zainstaluj/Odinstaluj" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON IDI_CPLSYSTEM,-1,PROPSHEETPADDING,18,16,16 + LTEXT "»eby zainstalowaµ nowy program, kliknij Instaluj",-1,36,18,PROPSHEETWIDTH-48,8 + PUSHBUTTON "&Instaluj...", IDC_INSTALL, PROPSHEETWIDTH-(72), 36, 60, 14 + LTEXT "", -1, PROPSHEETPADDING, 63, PROPSHEETWIDTH-12, 1, NOT WS_GROUP | SS_SUNKEN + + ICON IDI_CPLSYSTEM,-1,PROPSHEETPADDING,76,16,16 + LTEXT "NastÛpuj?ce oprogramowanie mo?e byµ automatycznie usuniÛte. »eby usun?c program, albo zmodyfikowaµ zainstalowane komponenty, wybierz program z listy i kliknij Dodaj/Usu±.",-1,36,72,PROPSHEETWIDTH-48,32 + LISTBOX IDC_SOFTWARELIST, PROPSHEETPADDING, 105, PROPSHEETWIDTH-12, 88, LBS_STANDARD | WS_TABSTOP + PUSHBUTTON "Dodaj/&Usu±", IDC_ADDREMOVE, PROPSHEETWIDTH-72, 198, 60, 14 +END + +IDD_PROPPAGEROSSETUP DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Instalator ReactOS" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + +END + +IDD_FIRSTPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Stw¾rz odno£nik" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Tekst1", -1, 115, 15, 160, 24 + LTEXT "Tekst2", -1, 115, 35, 160, 17 +END + +IDD_SUBMIT_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Stw¾rz odno£nik" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Tekst1",-1,10,0,225,40 + LTEXT "Tekst2",-1,10,40,120,20 + LTEXT "Tekst3",-1,10,55,120,20 +END + +STRINGTABLE +BEGIN + IDS_CPLSYSTEMNAME "Dodaj/Usu± programy" + IDS_CPLSYSTEMDESCRIPTION "Ustawia nowe programy i tworzy skr¾ty." +END _____ Modified: trunk/reactos/lib/cpl/appwiz/appwiz.rc --- trunk/reactos/lib/cpl/appwiz/appwiz.rc 2005-11-25 22:55:30 UTC (rev 19581) +++ trunk/reactos/lib/cpl/appwiz/appwiz.rc 2005-11-25 22:55:40 UTC (rev 19582) @@ -29,3 +29,4 @@ #include "Gr.rc" #include "Nl.rc" #include "Ru.rc" +#include "Pl.rc"

1 0

[gvg] 19581: Sync to Wine-0_9_2:
by gvg＠svn.reactos.com 25 Nov '05

25 Nov '05

Sync to Wine-0_9_2: Alexandre Julliard <julliard(a)winehq.org> - Preserve 16-byte stack alignment in the various assembly functions. Needed for MacOSX. Modified: trunk/reactos/tools/winebuild/import.c _____ Modified: trunk/reactos/tools/winebuild/import.c --- trunk/reactos/tools/winebuild/import.c 2005-11-25 22:41:31 UTC (rev 19580) +++ trunk/reactos/tools/winebuild/import.c 2005-11-25 22:55:30 UTC (rev 19581) @@ -1190,6 +1190,7 @@ fprintf( outfile, "\t.align %d\n", get_alignment(4) ); fprintf( outfile, "\t%s\n", func_declaration(name) ); fprintf( outfile, "%s:\n", asm_name(name) ); + fprintf( outfile, "\tsubl $4,%%esp\n" ); if (UsePIC) {

1 0

[royce] 19580: catch all source-file transitions so rsym data has the correct file name
by royce＠svn.reactos.com 25 Nov '05

25 Nov '05

catch all source-file transitions so rsym data has the correct file name Modified: trunk/reactos/tools/rsym.c _____ Modified: trunk/reactos/tools/rsym.c --- trunk/reactos/tools/rsym.c 2005-11-25 22:30:38 UTC (rev 19579) +++ trunk/reactos/tools/rsym.c 2005-11-25 22:41:31 UTC (rev 19580) @@ -41,7 +41,7 @@ } return 0; -} +} static int GetStabInfo(void *FileData, PIMAGE_FILE_HEADER PEFileHeader, @@ -169,6 +169,8 @@ switch (StabEntry[i].n_type) { case N_SO: + case N_SOL: + case N_BINCL: Name = (char *) StabStringsBase + StabEntry[i].n_strx; if (StabStringsLength < StabEntry[i].n_strx ||'\0' == *Name || '/' == Name[strlen(Name) - 1]

1 0

[gvg] 19579: Sync to Wine-0_9_2:
by gvg＠svn.reactos.com 25 Nov '05

25 Nov '05

Sync to Wine-0_9_2: Robert Shearman <rob(a)codeweavers.com> - Remove some incompatibilities in the wctype table by updating the space, blank and cntrl exceptions and fixing the type given to characters in the "Zl" and "Zp" classes. Alexandre Julliard <julliard(a)winehq.org> - Only update modified files. - Updated codepage tables to Unicode version 4.1. Modified: trunk/reactos/tools/unicode/c_037.c Modified: trunk/reactos/tools/unicode/c_10000.c Modified: trunk/reactos/tools/unicode/c_10006.c Modified: trunk/reactos/tools/unicode/c_10007.c Modified: trunk/reactos/tools/unicode/c_10029.c Modified: trunk/reactos/tools/unicode/c_1006.c Modified: trunk/reactos/tools/unicode/c_10079.c Modified: trunk/reactos/tools/unicode/c_10081.c Modified: trunk/reactos/tools/unicode/c_1026.c Modified: trunk/reactos/tools/unicode/c_1250.c Modified: trunk/reactos/tools/unicode/c_1251.c Modified: trunk/reactos/tools/unicode/c_1252.c Modified: trunk/reactos/tools/unicode/c_1253.c Modified: trunk/reactos/tools/unicode/c_1254.c Modified: trunk/reactos/tools/unicode/c_1255.c Modified: trunk/reactos/tools/unicode/c_1256.c Modified: trunk/reactos/tools/unicode/c_1257.c Modified: trunk/reactos/tools/unicode/c_1258.c Modified: trunk/reactos/tools/unicode/c_20866.c Modified: trunk/reactos/tools/unicode/c_20932.c Modified: trunk/reactos/tools/unicode/c_21866.c Modified: trunk/reactos/tools/unicode/c_28591.c Modified: trunk/reactos/tools/unicode/c_28592.c Modified: trunk/reactos/tools/unicode/c_28593.c Modified: trunk/reactos/tools/unicode/c_28594.c Modified: trunk/reactos/tools/unicode/c_28595.c Modified: trunk/reactos/tools/unicode/c_28596.c Modified: trunk/reactos/tools/unicode/c_28597.c Modified: trunk/reactos/tools/unicode/c_28598.c Modified: trunk/reactos/tools/unicode/c_28599.c Modified: trunk/reactos/tools/unicode/c_28600.c Modified: trunk/reactos/tools/unicode/c_28603.c Modified: trunk/reactos/tools/unicode/c_28604.c Modified: trunk/reactos/tools/unicode/c_28605.c Modified: trunk/reactos/tools/unicode/c_28606.c Modified: trunk/reactos/tools/unicode/c_424.c Modified: trunk/reactos/tools/unicode/c_437.c Modified: trunk/reactos/tools/unicode/c_500.c Modified: trunk/reactos/tools/unicode/c_737.c Modified: trunk/reactos/tools/unicode/c_775.c Modified: trunk/reactos/tools/unicode/c_850.c Modified: trunk/reactos/tools/unicode/c_852.c Modified: trunk/reactos/tools/unicode/c_855.c Modified: trunk/reactos/tools/unicode/c_856.c Modified: trunk/reactos/tools/unicode/c_857.c Modified: trunk/reactos/tools/unicode/c_860.c Modified: trunk/reactos/tools/unicode/c_861.c Modified: trunk/reactos/tools/unicode/c_862.c Modified: trunk/reactos/tools/unicode/c_863.c Modified: trunk/reactos/tools/unicode/c_864.c Modified: trunk/reactos/tools/unicode/c_865.c Modified: trunk/reactos/tools/unicode/c_866.c Modified: trunk/reactos/tools/unicode/c_869.c Modified: trunk/reactos/tools/unicode/c_874.c Modified: trunk/reactos/tools/unicode/c_875.c Modified: trunk/reactos/tools/unicode/c_878.c Modified: trunk/reactos/tools/unicode/c_932.c Modified: trunk/reactos/tools/unicode/c_936.c Modified: trunk/reactos/tools/unicode/c_949.c Modified: trunk/reactos/tools/unicode/c_950.c Modified: trunk/reactos/tools/unicode/casemap.c Modified: trunk/reactos/tools/unicode/cpmap.pl Modified: trunk/reactos/tools/unicode/wctype.c _____ Modified: trunk/reactos/tools/unicode/c_037.c --- trunk/reactos/tools/unicode/c_037.c 2005-11-25 22:27:50 UTC (rev 19578) +++ trunk/reactos/tools/unicode/c_037.c 2005-11-25 22:30:38 UTC (rev 19579) @@ -194,7 +194,11 @@ 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, + 0x3f, 0x3f, 0x3f, 0x3f, 0x83, 0x3f, 0x8c, 0x3f, + 0x86, 0x3f, 0x87, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, + 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xa3, 0x3f, 0x3f, + 0x3f, 0x3f, 0x3f, 0xa9, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, @@ -203,10 +207,6 @@ 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, /* 0x1e00 .. 0x1eff */ 0xc1, 0x81, 0xc2, 0x82, 0xc2, 0x82, 0xc2, 0x82, 0x68, 0x48, 0xc4, 0x84, 0xc4, 0x84, 0xc4, 0x84, @@ -292,8 +292,8 @@ 0xf8, 0xf9, 0x4e, 0x60, 0x7e, 0x4d, 0x5d, 0x95, 0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 0x4e, 0x60, 0x7e, 0x4d, 0x5d, 0x3f, + 0x81, 0x85, 0x96, 0xa7, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x4a, 0x3f, 0x3f, 0xb1, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, _____ Modified: trunk/reactos/tools/unicode/c_10000.c --- trunk/reactos/tools/unicode/c_10000.c 2005-11-25 22:27:50 UTC (rev 19578) +++ trunk/reactos/tools/unicode/c_10000.c 2005-11-25 22:30:38 UTC (rev 19579) @@ -194,7 +194,11 @@ 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, + 0x3f, 0x3f, 0x3f, 0x3f, 0x63, 0x3f, 0x64, 0x3f, + 0x66, 0x3f, 0x67, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, + 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x74, 0x3f, 0x3f, + 0x3f, 0x3f, 0x3f, 0x7a, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, @@ -203,10 +207,6 @@ 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, /* 0x1e00 .. 0x1eff */ 0x41, 0x61, 0x42, 0x62, 0x42, 0x62, 0x42, 0x62, 0x82, 0x8d, 0x44, 0x64, 0x44, 0x64, 0x44, 0x64, @@ -292,8 +292,8 @@ 0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x6e, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x3f, + 0x61, 0x65, 0x6f, 0x78, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xa2, 0x3f, 0x3f, 0xa3, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, @@ -314,7 +314,7 @@ 0x3f, 0x3f, 0xaa, 0x3f, 0x5a, 0x3f, 0xbd, 0x3f, 0x5a, 0x3f, 0x4b, 0x81, 0x42, 0x43, 0x65, 0x65, 0x45, 0x46, 0x3f, 0x4d, 0x6f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x69, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, + 0x3f, 0x69, 0x3f, 0x3f, 0xb9, 0x3f, 0x3f, 0x3f, 0xb7, 0x3f, 0x3f, 0x3f, 0x3f, 0x44, 0x64, 0x65, 0x69, 0x6a, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, _____ Modified: trunk/reactos/tools/unicode/c_10006.c --- trunk/reactos/tools/unicode/c_10006.c 2005-11-25 22:27:50 UTC (rev 19578) +++ trunk/reactos/tools/unicode/c_10006.c 2005-11-25 22:30:38 UTC (rev 19579) @@ -194,7 +194,11 @@ 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, + 0x3f, 0x3f, 0x3f, 0x3f, 0x63, 0x3f, 0x64, 0x3f, + 0x66, 0x3f, 0x67, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, + 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x74, 0x3f, 0x3f, + 0x3f, 0x3f, 0x3f, 0x7a, 0x3f, 0x3f, 0x3f, 0xf5, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, @@ -203,10 +207,6 @@ 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, /* 0x1e00 .. 0x1eff */ 0x41, 0x61, 0x42, 0x62, 0x42, 0x62, 0x42, 0x62, 0x43, 0x8d, 0x44, 0x64, 0x44, 0x64, 0x44, 0x64, @@ -292,8 +292,8 @@ 0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x6e, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x3f, + 0x61, 0x65, 0x6f, 0x78, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x63, 0x3f, 0x3f, 0x92, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, @@ -314,7 +314,7 @@ 0x3f, 0x3f, 0x93, 0x3f, 0x5a, 0x3f, 0xbf, 0x3f, 0x5a, 0x3f, 0x4b, 0x41, 0x42, 0x43, 0x65, 0x65, 0x45, 0x46, 0x3f, 0x4d, 0x6f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x69, 0x3f, 0x3f, 0x3f, 0xe7, 0xa1, 0xa6, + 0x3f, 0x69, 0x3f, 0x3f, 0xf0, 0xe7, 0xa1, 0xa6, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x44, 0x64, 0x65, 0x69, 0x6a, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, _____ Modified: trunk/reactos/tools/unicode/c_10007.c --- trunk/reactos/tools/unicode/c_10007.c 2005-11-25 22:27:50 UTC (rev 19578) +++ trunk/reactos/tools/unicode/c_10007.c 2005-11-25 22:30:38 UTC (rev 19579) @@ -223,10 +223,15 @@ 0x3f, 0x3f, 0x69, 0x72, 0x75, 0x76, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, + 0xed, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, + 0x3f, 0x3f, 0x3f, 0x3f, 0x63, 0x3f, 0x64, 0x3f, + 0x66, 0x3f, 0x67, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, + 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x74, 0x3f, 0x3f, + 0x3f, 0x3f, 0x3f, 0x7a, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, @@ -235,11 +240,6 @@ 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, /* 0x1e00 .. 0x1eff */ 0x41, 0x61, 0x42, 0x62, 0x42, 0x62, 0x42, 0x62, 0x43, 0x63, 0x44, 0x64, 0x44, 0x64, 0x44, 0x64, @@ -325,8 +325,8 @@ 0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x6e, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x3f, + 0x61, 0x65, 0x6f, 0x78, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xa2, 0x3f, 0x3f, 0xa3, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, _____ Modified: trunk/reactos/tools/unicode/c_10029.c --- trunk/reactos/tools/unicode/c_10029.c 2005-11-25 22:27:50 UTC (rev 19578) +++ trunk/reactos/tools/unicode/c_10029.c 2005-11-25 22:30:38 UTC (rev 19579) @@ -194,7 +194,11 @@ 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, + 0x3f, 0x3f, 0x3f, 0x3f, 0x63, 0x3f, 0x64, 0x3f, + 0x66, 0x3f, 0x67, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, + 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x74, 0x3f, 0x3f, + 0x3f, 0x3f, 0x3f, 0x7a, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, @@ -203,10 +207,6 @@ 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, /* 0x1e00 .. 0x1eff */ 0x41, 0x61, 0x42, 0x62, 0x42, 0x62, 0x42, 0x62, 0x43, 0x63, 0x44, 0x64, 0x44, 0x64, 0x44, 0x64, @@ -292,8 +292,8 @@ 0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x6e, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x3f, + 0x61, 0x65, 0x6f, 0x78, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x63, 0x3f, 0x3f, 0xa3, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, _____ Modified: trunk/reactos/tools/unicode/c_1006.c --- trunk/reactos/tools/unicode/c_1006.c 2005-11-25 22:27:50 UTC (rev 19578) +++ trunk/reactos/tools/unicode/c_1006.c 2005-11-25 22:30:38 UTC (rev 19579) @@ -227,7 +227,11 @@ 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, + 0x3f, 0x3f, 0x3f, 0x3f, 0x63, 0x3f, 0x64, 0x3f, + 0x66, 0x3f, 0x67, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, + 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x74, 0x3f, 0x3f, + 0x3f, 0x3f, 0x3f, 0x7a, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, @@ -236,10 +240,6 @@ 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, /* 0x1e00 .. 0x1eff */ 0x41, 0x61, 0x42, 0x62, 0x42, 0x62, 0x42, 0x62, 0x43, 0x63, 0x44, 0x64, 0x44, 0x64, 0x44, 0x64, @@ -325,8 +325,8 @@ 0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x6e, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x3f, + 0x61, 0x65, 0x6f, 0x78, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x63, 0x3f, 0x3f, 0x4c, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, _____ Modified: trunk/reactos/tools/unicode/c_10079.c --- trunk/reactos/tools/unicode/c_10079.c 2005-11-25 22:27:50 UTC (rev 19578) +++ trunk/reactos/tools/unicode/c_10079.c 2005-11-25 22:30:38 UTC (rev 19579) @@ -194,7 +194,11 @@ 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, + 0x3f, 0x3f, 0x3f, 0x3f, 0x63, 0x3f, 0xdd, 0x3f, + 0x66, 0x3f, 0x67, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, + 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x74, 0x3f, 0x3f, + 0x3f, 0x3f, 0x3f, 0x7a, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, @@ -203,10 +207,6 @@ 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, /* 0x1e00 .. 0x1eff */ 0x41, 0x61, 0x42, 0x62, 0x42, 0x62, 0x42, 0x62, 0x82, 0x8d, 0x44, 0x64, 0x44, 0x64, 0x44, 0x64, @@ -292,8 +292,8 @@ 0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x6e, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x3f, + 0x61, 0x65, 0x6f, 0x78, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xa2, 0x3f, 0x3f, 0xa3, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, @@ -314,7 +314,7 @@ 0x3f, 0x3f, 0xaa, 0x3f, 0x5a, 0x3f, 0xbd, 0x3f, 0x5a, 0x3f, 0x4b, 0x81, 0x42, 0x43, 0x65, 0x65, 0x45, 0x46, 0x3f, 0x4d, 0x6f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x69, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, + 0x3f, 0x69, 0x3f, 0x3f, 0xb9, 0x3f, 0x3f, 0x3f, 0xb7, 0x3f, 0x3f, 0x3f, 0x3f, 0x44, 0x64, 0x65, 0x69, 0x6a, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, _____ Modified: trunk/reactos/tools/unicode/c_10081.c --- trunk/reactos/tools/unicode/c_10081.c 2005-11-25 22:27:50 UTC (rev 19578) +++ trunk/reactos/tools/unicode/c_10081.c 2005-11-25 22:30:38 UTC (rev 19579) @@ -194,7 +194,11 @@ 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, + 0x3f, 0x3f, 0x3f, 0x3f, 0x63, 0x3f, 0x64, 0x3f, + 0x66, 0x3f, 0x67, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, + 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x74, 0x3f, 0x3f, + 0x3f, 0x3f, 0x3f, 0x7a, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, @@ -203,10 +207,6 @@ 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, /* 0x1e00 .. 0x1eff */ 0x41, 0x61, 0x42, 0x62, 0x42, 0x62, 0x42, 0x62, 0x82, 0x8d, 0x44, 0x64, 0x44, 0x64, 0x44, 0x64, @@ -292,8 +292,8 @@ 0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x6e, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x3f, + 0x61, 0x65, 0x6f, 0x78, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xa2, 0x3f, 0x3f, 0xa3, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, @@ -314,7 +314,7 @@ 0x3f, 0x3f, 0xaa, 0x3f, 0x5a, 0x3f, 0xbd, 0x3f, 0x5a, 0x3f, 0x4b, 0x81, 0x42, 0x43, 0x65, 0x65, 0x45, 0x46, 0x3f, 0x4d, 0x6f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x69, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, + 0x3f, 0x69, 0x3f, 0x3f, 0xb9, 0x3f, 0x3f, 0x3f, 0xb7, 0x3f, 0x3f, 0x3f, 0x3f, 0x44, 0x64, 0x65, 0x69, 0x6a, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, _____ Modified: trunk/reactos/tools/unicode/c_1026.c --- trunk/reactos/tools/unicode/c_1026.c 2005-11-25 22:27:50 UTC (rev 19578) +++ trunk/reactos/tools/unicode/c_1026.c 2005-11-25 22:30:38 UTC (rev 19579) @@ -194,7 +194,11 @@ 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, + 0x3f, 0x3f, 0x3f, 0x3f, 0x83, 0x3f, 0x84, 0x3f, + 0x86, 0x3f, 0x87, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, + 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xa3, 0x3f, 0x3f, + 0x3f, 0x3f, 0x3f, 0xa9, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, @@ -203,10 +207,6 @@ 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, /* 0x1e00 .. 0x1eff */ 0xc1, 0x81, 0xc2, 0x82, 0xc2, 0x82, 0xc2, 0x82, 0x4a, 0xc0, 0xc4, 0x84, 0xc4, 0x84, 0xc4, 0x84, @@ -292,8 +292,8 @@ 0xf8, 0xf9, 0x4e, 0x60, 0x7e, 0x4d, 0x5d, 0x95, 0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 0x4e, 0x60, 0x7e, 0x4d, 0x5d, 0x3f, + 0x81, 0x85, 0x96, 0xa7, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xb0, 0x3f, 0x3f, 0xb1, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, _____ Modified: trunk/reactos/tools/unicode/c_1250.c --- trunk/reactos/tools/unicode/c_1250.c 2005-11-25 22:27:50 UTC (rev 19578) +++ trunk/reactos/tools/unicode/c_1250.c 2005-11-25 22:30:38 UTC (rev 19579) @@ -194,7 +194,11 @@ 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, + 0x3f, 0x3f, 0x3f, 0x3f, 0x63, 0x3f, 0x64, 0x3f, + 0x66, 0x3f, 0x67, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, + 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x74, 0x3f, 0x3f, + 0x3f, 0x3f, 0x3f, 0x7a, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, @@ -203,10 +207,6 @@ 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, /* 0x1e00 .. 0x1eff */ 0x41, 0x61, 0x42, 0x62, 0x42, 0x62, 0x42, 0x62, 0xc7, 0xe7, 0x44, 0x64, 0x44, 0x64, 0x44, 0x64, @@ -292,8 +292,8 @@ 0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x6e, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x3f, + 0x61, 0x65, 0x6f, 0x78, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x63, 0x3f, 0x3f, 0x4c, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x80, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, _____ Modified: trunk/reactos/tools/unicode/c_1251.c --- trunk/reactos/tools/unicode/c_1251.c 2005-11-25 22:27:50 UTC (rev 19578) +++ trunk/reactos/tools/unicode/c_1251.c 2005-11-25 22:30:38 UTC (rev 19579) @@ -223,10 +223,15 @@ 0x3f, 0x3f, 0x69, 0x72, 0x75, 0x76, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, + 0xed, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, + 0x3f, 0x3f, 0x3f, 0x3f, 0x63, 0x3f, 0x64, 0x3f, + 0x66, 0x3f, 0x67, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, + 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x74, 0x3f, 0x3f, + 0x3f, 0x3f, 0x3f, 0x7a, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, @@ -235,11 +240,6 @@ 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, /* 0x1e00 .. 0x1eff */ 0x41, 0x61, 0x42, 0x62, 0x42, 0x62, 0x42, 0x62, 0x43, 0x63, 0x44, 0x64, 0x44, 0x64, 0x44, 0x64, @@ -325,8 +325,8 @@ 0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x6e, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x3f, + 0x61, 0x65, 0x6f, 0x78, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x63, 0x3f, 0x3f, 0x4c, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x88, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, _____ Modified: trunk/reactos/tools/unicode/c_1252.c --- trunk/reactos/tools/unicode/c_1252.c 2005-11-25 22:27:50 UTC (rev 19578) +++ trunk/reactos/tools/unicode/c_1252.c 2005-11-25 22:30:38 UTC (rev 19579) @@ -194,7 +194,11 @@ 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, + 0x3f, 0x3f, 0x3f, 0x3f, 0x63, 0x3f, 0xf0, 0x3f, + 0x66, 0x3f, 0x67, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, + 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x74, 0x3f, 0x3f, + 0x3f, 0x3f, 0x3f, 0x7a, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, @@ -203,10 +207,6 @@ 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, /* 0x1e00 .. 0x1eff */ 0x41, 0x61, 0x42, 0x62, 0x42, 0x62, 0x42, 0x62, 0xc7, 0xe7, 0x44, 0x64, 0x44, 0x64, 0x44, 0x64, @@ -292,8 +292,8 @@ 0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x6e, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x3f, + 0x61, 0x65, 0x6f, 0x78, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xa2, 0x3f, 0x3f, 0xa3, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x80, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, _____ Modified: trunk/reactos/tools/unicode/c_1253.c --- trunk/reactos/tools/unicode/c_1253.c 2005-11-25 22:27:50 UTC (rev 19578) +++ trunk/reactos/tools/unicode/c_1253.c 2005-11-25 22:30:38 UTC (rev 19579) @@ -194,7 +194,11 @@ 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, + 0x3f, 0x3f, 0x3f, 0x3f, 0x63, 0x3f, 0x64, 0x3f, + 0x66, 0x3f, 0x67, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, + 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x74, 0x3f, 0x3f, + 0x3f, 0x3f, 0x3f, 0x7a, 0x3f, 0x3f, 0x3f, 0xe8, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, @@ -203,10 +207,6 @@ 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, /* 0x1e00 .. 0x1eff */ 0x41, 0x61, 0x42, 0x62, 0x42, 0x62, 0x42, 0x62, 0x43, 0x63, 0x44, 0x64, 0x44, 0x64, 0x44, 0x64, @@ -292,8 +292,8 @@ 0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x6e, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x3f, + 0x61, 0x65, 0x6f, 0x78, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x63, 0x3f, 0x3f, 0xa3, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x80, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, @@ -314,7 +314,7 @@ 0x3f, 0x3f, 0x99, 0x3f, 0x5a, 0x3f, 0xd9, 0x3f, 0x5a, 0x3f, 0x4b, 0x41, 0x42, 0x43, 0x65, 0x65, 0x45, 0x46, 0x3f, 0x4d, 0x6f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x69, 0x3f, 0x3f, 0x3f, 0xe3, 0xc3, 0xd0, + 0x3f, 0x69, 0x3f, 0x3f, 0xf0, 0xe3, 0xc3, 0xd0, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x44, 0x64, 0x65, 0x69, 0x6a, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, _____ Modified: trunk/reactos/tools/unicode/c_1254.c --- trunk/reactos/tools/unicode/c_1254.c 2005-11-25 22:27:50 UTC (rev 19578) +++ trunk/reactos/tools/unicode/c_1254.c 2005-11-25 22:30:38 UTC (rev 19579) @@ -194,7 +194,11 @@ 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, + 0x3f, 0x3f, 0x3f, 0x3f, 0x63, 0x3f, 0x64, 0x3f, + 0x66, 0x3f, 0x67, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, + 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x74, 0x3f, 0x3f, + 0x3f, 0x3f, 0x3f, 0x7a, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, @@ -203,10 +207,6 @@ 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, /* 0x1e00 .. 0x1eff */ 0x41, 0x61, 0x42, 0x62, 0x42, 0x62, 0x42, 0x62, 0xc7, 0xe7, 0x44, 0x64, 0x44, 0x64, 0x44, 0x64, @@ -292,8 +292,8 @@ 0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x6e, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x3f, + 0x61, 0x65, 0x6f, 0x78, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xa2, 0x3f, 0x3f, 0xa3, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x80, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, _____ Modified: trunk/reactos/tools/unicode/c_1255.c --- trunk/reactos/tools/unicode/c_1255.c 2005-11-25 22:27:50 UTC (rev 19578) +++ trunk/reactos/tools/unicode/c_1255.c 2005-11-25 22:30:38 UTC (rev 19579) @@ -227,7 +227,11 @@ 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, + 0x3f, 0x3f, 0x3f, 0x3f, 0x63, 0x3f, 0x64, 0x3f, + 0x66, 0x3f, 0x67, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, + 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x74, 0x3f, 0x3f, + 0x3f, 0x3f, 0x3f, 0x7a, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, @@ -236,10 +240,6 @@ 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, /* 0x1e00 .. 0x1eff */ 0x41, 0x61, 0x42, 0x62, 0x42, 0x62, 0x42, 0x62, 0x43, 0x63, 0x44, 0x64, 0x44, 0x64, 0x44, 0x64, @@ -325,8 +325,8 @@ 0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x6e, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x3f, + 0x61, 0x65, 0x6f, 0x78, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xa2, 0x3f, 0x3f, 0xa3, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xa4, 0x3f, 0x80, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, _____ Modified: trunk/reactos/tools/unicode/c_1256.c --- trunk/reactos/tools/unicode/c_1256.c 2005-11-25 22:27:50 UTC (rev 19578) +++ trunk/reactos/tools/unicode/c_1256.c 2005-11-25 22:30:38 UTC (rev 19579) @@ -227,7 +227,11 @@ 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, + 0x3f, 0x3f, 0x3f, 0x3f, 0x63, 0x3f, 0x64, 0x3f, + 0x66, 0x3f, 0x67, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, + 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x74, 0x3f, 0x3f, + 0x3f, 0x3f, 0x3f, 0x7a, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, @@ -236,10 +240,6 @@ 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, /* 0x1e00 .. 0x1eff */ 0x41, 0x61, 0x42, 0x62, 0x42, 0x62, 0x42, 0x62, 0x43, 0xe7, 0x44, 0x64, 0x44, 0x64, 0x44, 0x64, @@ -325,8 +325,8 @@ 0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x6e, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x3f, + 0x61, 0x65, 0x6f, 0x78, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xa2, 0x3f, 0x3f, 0xa3, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x80, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, _____ Modified: trunk/reactos/tools/unicode/c_1257.c --- trunk/reactos/tools/unicode/c_1257.c 2005-11-25 22:27:50 UTC (rev 19578) +++ trunk/reactos/tools/unicode/c_1257.c 2005-11-25 22:30:38 UTC (rev 19579) @@ -194,7 +194,11 @@ 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, + 0x3f, 0x3f, 0x3f, 0x3f, 0x63, 0x3f, 0x64, 0x3f, + 0x66, 0x3f, 0x67, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, + 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x74, 0x3f, 0x3f, + 0x3f, 0x3f, 0x3f, 0x7a, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, @@ -203,10 +207,6 @@ 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, /* 0x1e00 .. 0x1eff */ 0x41, 0x61, 0x42, 0x62, 0x42, 0x62, 0x42, 0x62, 0x43, 0x63, 0x44, 0x64, 0x44, 0x64, 0x44, 0x64, @@ -292,8 +292,8 @@ 0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x6e, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x3f, + 0x61, 0x65, 0x6f, 0x78, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xa2, 0x3f, 0x3f, 0xa3, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x80, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, _____ Modified: trunk/reactos/tools/unicode/c_1258.c --- trunk/reactos/tools/unicode/c_1258.c 2005-11-25 22:27:50 UTC (rev 19578) +++ trunk/reactos/tools/unicode/c_1258.c 2005-11-25 22:30:38 UTC (rev 19579) @@ -194,7 +194,11 @@ 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, + 0x3f, 0x3f, 0x3f, 0x3f, 0x63, 0x3f, 0x64, 0x3f, + 0x66, 0x3f, 0x67, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, + 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x74, 0x3f, 0x3f, + 0x3f, 0x3f, 0x3f, 0x7a, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, @@ -203,10 +207,6 @@ 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, /* 0x1e00 .. 0x1eff */ 0x41, 0x61, 0x42, 0x62, 0x42, 0x62, 0x42, 0x62, 0xc7, 0xe7, 0x44, 0x64, 0x44, 0x64, 0x44, 0x64, @@ -292,8 +292,8 @@ 0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x6e, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x3f, + 0x61, 0x65, 0x6f, 0x78, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xa2, 0x3f, 0x3f, 0xa3, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xfe, 0x80, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, _____ Modified: trunk/reactos/tools/unicode/c_20866.c --- trunk/reactos/tools/unicode/c_20866.c 2005-11-25 22:27:50 UTC (rev 19578) +++ trunk/reactos/tools/unicode/c_20866.c 2005-11-25 22:30:38 UTC (rev 19579) @@ -223,10 +223,15 @@ 0x3f, 0x3f, 0x69, 0x72, 0x75, 0x76, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, + 0xce, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, + 0x3f, 0x3f, 0x3f, 0x3f, 0x63, 0x3f, 0x64, 0x3f, + 0x66, 0x3f, 0x67, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, + 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x74, 0x3f, 0x3f, + 0x3f, 0x3f, 0x3f, 0x7a, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, @@ -235,11 +240,6 @@ 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, /* 0x1e00 .. 0x1eff */ 0x41, 0x61, 0x42, 0x62, 0x42, 0x62, 0x42, 0x62, 0x43, 0x63, 0x44, 0x64, 0x44, 0x64, 0x44, 0x64, @@ -325,8 +325,8 @@ 0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x6e, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x3f, + 0x61, 0x65, 0x6f, 0x78, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x63, 0x3f, 0x3f, 0x4c, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, _____ Modified: trunk/reactos/tools/unicode/c_20932.c --- trunk/reactos/tools/unicode/c_20932.c 2005-11-25 22:27:50 UTC (rev 19578) +++ trunk/reactos/tools/unicode/c_20932.c 2005-11-25 22:30:38 UTC (rev 19579) @@ -2866,10 +2866,15 @@ 0xa6d5, 0xa6d6, 0x0069, 0x0072, 0x0075, 0x0076, 0xa6c2, 0xa6c3, 0xa6d1, 0xa6d5, 0xa6d6, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, + 0xa7df, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, + 0x003f, 0x003f, 0x003f, 0x003f, 0x0063, 0x003f, 0x0064, 0x003f, + 0x0066, 0x003f, 0x0067, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, + 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x0074, 0x003f, 0x003f, + 0x003f, 0x003f, 0x003f, 0x007a, 0x003f, 0x003f, 0x003f, 0xa6c8, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, @@ -2878,11 +2883,6 @@ 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, - 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, - 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, - 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, - 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, - 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, /* 0x1e00 .. 0x1eff */ 0x0041, 0x0061, 0x0042, 0x0062, 0x0042, 0x0062, 0x0042, 0x0062, 0x0043, 0x0063, 0x0044, 0x0064, 0x0044, 0x0064, 0x0044, 0x0064, @@ -2968,8 +2968,8 @@ 0x0038, 0x0039, 0x002b, 0xa1dd, 0x003d, 0x0028, 0x0029, 0x006e, 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x002b, 0xa1dd, 0x003d, 0x0028, 0x0029, 0x003f, + 0x0061, 0x0065, 0x006f, 0x0078, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, - 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0xa1f1, 0x003f, 0x003f, 0xa1f2, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, @@ -2990,7 +2990,7 @@ 0x003f, 0x003f, 0x003f, 0x003f, 0x005a, 0x003f, 0xa6b8, 0x003f, 0x005a, 0x003f, 0x004b, 0xa2f2, 0x0042, 0x0043, 0x0065, 0x0065, 0x0045, 0x0046, 0x003f, 0x004d, 0x006f, 0x003f, 0x003f, 0x003f, - 0x003f, 0x0069, 0x003f, 0x003f, 0x003f, 0xa6c3, 0xa6a3, 0xa6b0, + 0x003f, 0x0069, 0x003f, 0x003f, 0xa6d0, 0xa6c3, 0xa6a3, 0xa6b0, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x0044, 0x0064, 0x0065, 0x0069, 0x006a, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, @@ -6099,24 +6099,24 @@ 0xe5d6, 0xc8cb, 0xbdf0, 0xbcd4, 0xbdad, 0x003f, 0x003f, 0xc3f8, 0xb3ec, 0xbbeb, 0xb1da, 0xb6e0, 0xc9d0, 0xc2a3, 0x003f, 0xb0ef, 0xc6f1, 0xb6c1, 0xc9d1, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, + 0xcac2, 0xd1d7, 0xc1b4, 0x003f, 0xbdbc, 0xd1c3, 0xcda6, 0xbcdb, + 0xb3e5, 0x003f, 0xd3bc, 0x003f, 0xc4cd, 0xcaaf, 0xb1e2, 0xcbdb, + 0xd5b9, 0x003f, 0x003f, 0x003f, 0xbacc, 0xd7d4, 0xd8b1, 0xbfb5, + 0xccfc, 0xc1fe, 0x003f, 0xc4a8, 0xc2d7, 0xd9e9, 0xd9d3, 0x003f, + 0xdac4, 0xc0b2, 0xcfaf, 0xcbbe, 0xbef3, 0xddc6, 0xbba6, 0xceae, + 0x003f, 0xbca2, 0xb4c1, 0xc6d4, 0xbcd1, 0x003f, 0xbcdf, 0xc8c8, + 0xc3f6, 0x003f, 0x003f, 0xb2e8, 0x003f, 0xe1e9, 0xb1d7, 0xc0b9, + 0xc4be, 0x003f, 0xc3e5, 0x003f, 0x003f, 0xc0e1, 0x003f, 0xe5b6, + 0xcefd, 0x003f, 0xbcd4, 0xb9d3, 0xb2da, 0x003f, 0xeaf6, 0xcaa4, + 0xbbeb, 0xc4b4, 0xbdf4, 0xc0c1, 0xb1da, 0xc2fa, 0xcda1, 0xb6e0, + 0xdace, 0xc2a3, 0xcda2, 0xeeaf, 0x003f, 0x003f, 0x003f, 0xc6f1, + 0xccf7, 0x003f, 0xb6c1, 0x003f, 0xc9d1, 0x003f, 0xf3fd, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, - 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, - 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, - 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, - 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, - 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, - 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, - 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, - 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, - 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, - 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, - 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, - 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, /* 0xfb00 .. 0xfbff */ 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, 0x003f, _____ Modified: trunk/reactos/tools/unicode/c_21866.c --- trunk/reactos/tools/unicode/c_21866.c 2005-11-25 22:27:50 UTC (rev 19578) +++ trunk/reactos/tools/unicode/c_21866.c 2005-11-25 22:30:38 UTC (rev 19579) @@ -223,10 +223,15 @@ 0x3f, 0x3f, 0x69, 0x72, 0x75, 0x76, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, + 0xce, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, + 0x3f, 0x3f, 0x3f, 0x3f, 0x63, 0x3f, 0x64, 0x3f, + 0x66, 0x3f, 0x67, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, + 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x74, 0x3f, 0x3f, + 0x3f, 0x3f, 0x3f, 0x7a, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, @@ -235,11 +240,6 @@ 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, /* 0x1e00 .. 0x1eff */ 0x41, 0x61, 0x42, 0x62, 0x42, 0x62, 0x42, 0x62, 0x43, 0x63, 0x44, 0x64, 0x44, 0x64, 0x44, 0x64, @@ -325,8 +325,8 @@ 0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x6e, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x3f, + 0x61, 0x65, 0x6f, 0x78, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x63, 0x3f, 0x3f, 0x4c, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, _____ Modified: trunk/reactos/tools/unicode/c_28591.c --- trunk/reactos/tools/unicode/c_28591.c 2005-11-25 22:27:50 UTC (rev 19578) +++ trunk/reactos/tools/unicode/c_28591.c 2005-11-25 22:30:38 UTC (rev 19579) @@ -194,7 +194,11 @@ 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, + 0x3f, 0x3f, 0x3f, 0x3f, 0x63, 0x3f, 0xf0, 0x3f, + 0x66, 0x3f, 0x67, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, + 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x74, 0x3f, 0x3f, + 0x3f, 0x3f, 0x3f, 0x7a, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, @@ -203,10 +207,6 @@ 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, /* 0x1e00 .. 0x1eff */ 0x41, 0x61, 0x42, 0x62, 0x42, 0x62, 0x42, 0x62, 0xc7, 0xe7, 0x44, 0x64, 0x44, 0x64, 0x44, 0x64, @@ -292,8 +292,8 @@ 0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x6e, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x3f, + 0x61, 0x65, 0x6f, 0x78, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xa2, 0x3f, 0x3f, 0xa3, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, _____ Modified: trunk/reactos/tools/unicode/c_28592.c --- trunk/reactos/tools/unicode/c_28592.c 2005-11-25 22:27:50 UTC (rev 19578) +++ trunk/reactos/tools/unicode/c_28592.c 2005-11-25 22:30:38 UTC (rev 19579) @@ -194,7 +194,11 @@ 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, + 0x3f, 0x3f, 0x3f, 0x3f, 0x63, 0x3f, 0x64, 0x3f, + 0x66, 0x3f, 0x67, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, + 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x74, 0x3f, 0x3f, + 0x3f, 0x3f, 0x3f, 0x7a, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, @@ -203,10 +207,6 @@ 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, /* 0x1e00 .. 0x1eff */ 0x41, 0x61, 0x42, 0x62, 0x42, 0x62, 0x42, 0x62, 0xc7, 0xe7, 0x44, 0x64, 0x44, 0x64, 0x44, 0x64, @@ -292,8 +292,8 @@ 0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x6e, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x3f, + 0x61, 0x65, 0x6f, 0x78, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x63, 0x3f, 0x3f, 0x4c, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, _____ Modified: trunk/reactos/tools/unicode/c_28593.c --- trunk/reactos/tools/unicode/c_28593.c 2005-11-25 22:27:50 UTC (rev 19578) +++ trunk/reactos/tools/unicode/c_28593.c 2005-11-25 22:30:38 UTC (rev 19579) @@ -194,7 +194,11 @@ 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, + 0x3f, 0x3f, 0x3f, 0x3f, 0x63, 0x3f, 0x64, 0x3f, + 0x66, 0x3f, 0x67, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, + 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x74, 0x3f, 0x3f, + 0x3f, 0x3f, 0x3f, 0x7a, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, @@ -203,10 +207,6 @@ 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, /* 0x1e00 .. 0x1eff */ 0x41, 0x61, 0x42, 0x62, 0x42, 0x62, 0x42, 0x62, 0xc7, 0xe7, 0x44, 0x64, 0x44, 0x64, 0x44, 0x64, @@ -292,8 +292,8 @@ 0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x6e, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x3f, + 0x61, 0x65, 0x6f, 0x78, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, [truncated at 1000 lines; 3282 more skipped]

1 0

[sgasiorek] 19578: changed icon number
by sgasiorek＠svn.reactos.com 25 Nov '05

25 Nov '05

changed icon number Modified: trunk/reactos/lib/cpl/main/keyboard.c _____ Modified: trunk/reactos/lib/cpl/main/keyboard.c --- trunk/reactos/lib/cpl/main/keyboard.c 2005-11-25 22:19:05 UTC (rev 19577) +++ trunk/reactos/lib/cpl/main/keyboard.c 2005-11-25 22:27:50 UTC (rev 19578) @@ -93,7 +93,7 @@ psh.dwFlags = PSH_PROPSHEETPAGE | PSH_PROPTITLE; psh.hwndParent = NULL; psh.hInstance = hApplet; - psh.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDC_CPLICON_1)); + psh.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDC_CPLICON_2)); psh.pszCaption = Caption; psh.nPages = sizeof(psp) / sizeof(PROPSHEETPAGE); psh.nStartPage = 0;

1 0

[royce] 19577: utility to dump stab info out of an executable
by royce＠svn.reactos.com 25 Nov '05

25 Nov '05

utility to dump stab info out of an executable Added: trunk/reactos/tools/dumpstab.c Modified: trunk/reactos/tools/rsym.h _____ Added: trunk/reactos/tools/dumpstab.c --- trunk/reactos/tools/dumpstab.c 2005-11-25 22:14:48 UTC (rev 19576) +++ trunk/reactos/tools/dumpstab.c 2005-11-25 22:19:05 UTC (rev 19577) @@ -0,0 +1,210 @@ +/* + * Usage: dumpstab input-file + * + * There are two sources of information: the .stab/.stabstr + * sections of the executable and the COFF symbol table. Most + * of the information is in the .stab/.stabstr sections. + * However, most of our asm files don't contain .stab directives, + * so routines implemented in assembler won't show up in the + * .stab section. They are present in the COFF symbol table. + * So, we mostly use the .stab/.stabstr sections, but we augment + * the info there with info from the COFF symbol table when + * possible. + * + * This is a tool and is compiled using the host compiler, + * i.e. on Linux gcc and not mingw-gcc (cross-compiler). + * Therefore we can't include SDK headers and we have to + * duplicate some definitions here. + * Also note that the internal functions are "old C-style", + * returning an int, where a return of 0 means success and + * non-zero is failure. + */ + +#include <stdio.h> +#include <string.h> +#include <stdlib.h> +#include <assert.h> + +#include "rsym.h" + +const char* +stab_type_name ( int stab_type ) +{ + static char buf[32]; + switch ( stab_type ) + { +#define X(n) case n: return #n; + X(N_GYSM) + X(N_FNAME) + X(N_FUN) + X(N_STSYM) + X(N_LCSYM) + X(N_MAIN) + X(N_PC) + X(N_NSYMS) + X(N_NOMAP) + X(N_RSYM) + X(N_M2C) + X(N_SLINE) + X(N_DSLINE) + X(N_BSLINE) + //X(N_BROWS) + X(N_DEFD) + X(N_EHDECL) + //X(N_MOD2) + X(N_CATCH) + X(N_SSYM) + X(N_SO) + X(N_LSYM) + X(N_BINCL) + X(N_SOL) + X(N_PSYM) + X(N_EINCL) + X(N_ENTRY) + X(N_LBRAC) + X(N_EXCL) + X(N_SCOPE) + X(N_RBRAC) + X(N_BCOMM) + X(N_ECOMM) + X(N_ECOML) + X(N_LENG) + } + sprintf ( buf, "%lu", stab_type ); + return buf; +} + +static int +GetStabInfo(void *FileData, PIMAGE_FILE_HEADER PEFileHeader, + PIMAGE_SECTION_HEADER PESectionHeaders, + ULONG *StabSymbolsLength, void **StabSymbolsBase, + ULONG *StabStringsLength, void **StabStringsBase) +{ + ULONG Idx; + + /* Load .stab and .stabstr sections if available */ + *StabSymbolsBase = NULL; + *StabSymbolsLength = 0; + *StabStringsBase = NULL; + *StabStringsLength = 0; + + for (Idx = 0; Idx < PEFileHeader->NumberOfSections; Idx++) + { + /* printf("section: '%.08s'\n", PESectionHeaders[Idx].Name); */ + if ((strncmp((char*)PESectionHeaders[Idx].Name, ".stab", 5) == 0) + && (PESectionHeaders[Idx].Name[5] == 0)) + { + /* printf(".stab section found. Size %d\n", + PESectionHeaders[Idx].SizeOfRawData); */ + + *StabSymbolsLength = PESectionHeaders[Idx].SizeOfRawData; + *StabSymbolsBase = (void *)((char *) FileData + PESectionHeaders[Idx].PointerToRawData); + } + + if (strncmp((char*)PESectionHeaders[Idx].Name, ".stabstr", 8) == 0) + { + /* printf(".stabstr section found. Size %d\n", + PESectionHeaders[Idx].SizeOfRawData); */ + + *StabStringsLength = PESectionHeaders[Idx].SizeOfRawData; + *StabStringsBase = (void *)((char *) FileData + PESectionHeaders[Idx].PointerToRawData); + } + } + + return 0; +} + +static void +IterateStabs(ULONG StabSymbolsLength, void *StabSymbolsBase, + ULONG StabStringsLength, void *StabStringsBase, + ULONG_PTR ImageBase, PIMAGE_FILE_HEADER PEFileHeader, + PIMAGE_SECTION_HEADER PESectionHeaders) +{ + PSTAB_ENTRY e; + ULONG Count, i; + + e = StabSymbolsBase; + Count = StabSymbolsLength / sizeof(STAB_ENTRY); + if (Count == 0) /* No symbol info */ + return; + + printf ( "type,other,desc,value,str\n" ); + for (i = 0; i < Count; i++) + { + printf ( "%s,%lu(0x%x),%lu(0x%x),%lu(0x%x),%s\n", + stab_type_name(e[i].n_type), + e[i].n_other, + e[i].n_other, + e[i].n_desc, + e[i].n_desc, + e[i].n_value, + e[i].n_value, + (char *) StabStringsBase + e[i].n_strx ); + } +} + +int main(int argc, char* argv[]) +{ + PIMAGE_DOS_HEADER PEDosHeader; + PIMAGE_FILE_HEADER PEFileHeader; + PIMAGE_OPTIONAL_HEADER PEOptHeader; + PIMAGE_SECTION_HEADER PESectionHeaders; + ULONG ImageBase; + void *StabBase; + ULONG StabsLength; + void *StabStringBase; + ULONG StabStringsLength; + char* path1; + size_t FileSize; + void *FileData; + + if (2 != argc) + { + fprintf(stderr, "Usage: dumpstabs <exefile>\n"); + exit(1); + } + + path1 = convert_path(argv[1]); + + FileData = load_file ( path1, &FileSize ); + if ( !FileData ) + { + fprintf ( stderr, "An error occured loading '%s'\n", path1 ); + exit(1); + } + + /* Check if MZ header exists */ + PEDosHeader = (PIMAGE_DOS_HEADER) FileData; + if (PEDosHeader->e_magic != IMAGE_DOS_MAGIC || PEDosHeader->e_lfanew == 0L) + { + perror("Input file is not a PE image.\n"); + free(FileData); + exit(1); + } + + /* Locate PE file header */ + /* sizeof(ULONG) = sizeof(MAGIC) */ + PEFileHeader = (PIMAGE_FILE_HEADER)((char *) FileData + PEDosHeader->e_lfanew + sizeof(ULONG)); + + /* Locate optional header */ + assert(sizeof(ULONG) == 4); + PEOptHeader = (PIMAGE_OPTIONAL_HEADER)(PEFileHeader + 1); + ImageBase = PEOptHeader->ImageBase; + + /* Locate PE section headers */ + PESectionHeaders = (PIMAGE_SECTION_HEADER)((char *) PEOptHeader + PEFileHeader->SizeOfOptionalHeader); + + if (GetStabInfo(FileData, PEFileHeader, PESectionHeaders, &StabsLength, &StabBase, + &StabStringsLength, &StabStringBase)) + { + free(FileData); + exit(1); + } + + IterateStabs( StabsLength, StabBase, StabStringsLength, StabStringBase, + ImageBase, PEFileHeader, PESectionHeaders); + + free(FileData); + + return 0; +} Property changes on: trunk/reactos/tools/dumpstab.c ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Modified: trunk/reactos/tools/rsym.h --- trunk/reactos/tools/rsym.h 2005-11-25 22:14:48 UTC (rev 19576) +++ trunk/reactos/tools/rsym.h 2005-11-25 22:19:05 UTC (rev 19577) @@ -179,9 +179,42 @@ ULONG n_value; /* value of symbol */ } STAB_ENTRY, *PSTAB_ENTRY; -#define N_FUN 0x24 -#define N_SLINE 0x44 -#define N_SO 0x64 +/* http://www.math.utah.edu/docs/info/stabs_12.html */ +#define N_GYSM 0x20 +#define N_FNAME 0x22 +#define N_FUN 0x24 +#define N_STSYM 0x26 +#define N_LCSYM 0x28 +#define N_MAIN 0x2A +#define N_PC 0x30 +#define N_NSYMS 0x32 +#define N_NOMAP 0x34 +#define N_RSYM 0x40 +#define N_M2C 0x42 +#define N_SLINE 0x44 +#define N_DSLINE 0x46 +#define N_BSLINE 0x48 +#define N_BROWS 0x48 +#define N_DEFD 0x4A +#define N_EHDECL 0x50 +#define N_MOD2 0x50 +#define N_CATCH 0x54 +#define N_SSYM 0x60 +#define N_SO 0x64 +#define N_LSYM 0x80 +#define N_BINCL 0x82 +#define N_SOL 0x84 +#define N_PSYM 0xA0 +#define N_EINCL 0xA2 +#define N_ENTRY 0xA4 +#define N_LBRAC 0xC0 +#define N_EXCL 0xC2 +#define N_SCOPE 0xC4 +#define N_RBRAC 0xE0 +#define N_BCOMM 0xE2 +#define N_ECOMM 0xE4 +#define N_ECOML 0xE8 +#define N_LENG 0xFE /* COFF symbol table */

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs