Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gadamopoulos] 74443: [COMCTL32] Fix use of uninitialized variable.
by gadamopoulos＠svn.reactos.org 01 May '17

01 May '17

Author: gadamopoulos Date: Mon May 1 18:56:03 2017 New Revision: 74443 URL: http://svn.reactos.org/svn/reactos?rev=74443&view=rev Log: [COMCTL32] Fix use of uninitialized variable. Modified: trunk/reactos/dll/win32/comctl32/imagelist.c Modified: trunk/reactos/dll/win32/comctl32/imagelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/imageli… ============================================================================== --- trunk/reactos/dll/win32/comctl32/imagelist.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/imagelist.c [iso-8859-1] Mon May 1 18:56:03 2017 @@ -1445,7 +1445,7 @@ POINT pt; BOOL has_alpha; #ifdef __REACTOS__ - HDC hdcSaturated; + HDC hdcSaturated = NULL; #endif if (!pimldp || !(himl = pimldp->himl)) return FALSE;

1 0

[ekohl] 74442: [INTL] Added initialization of IDC_CURRENCYGRPNUM. Patch by Katayama Hirofumi MZ. CORE-10170
by ekohl＠svn.reactos.org 01 May '17

01 May '17

Author: ekohl Date: Mon May 1 17:05:31 2017 New Revision: 74442 URL: http://svn.reactos.org/svn/reactos?rev=74442&view=rev Log: [INTL] Added initialization of IDC_CURRENCYGRPNUM. Patch by Katayama Hirofumi MZ. CORE-10170 Modified: trunk/reactos/dll/cpl/intl/currency.c Modified: trunk/reactos/dll/cpl/intl/currency.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/currency.c?re… ============================================================================== --- trunk/reactos/dll/cpl/intl/currency.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/currency.c [iso-8859-1] Mon May 1 17:05:31 2017 @@ -252,6 +252,11 @@ -1, (LPARAM)szBuffer); } + + SendDlgItemMessageW(hwndDlg, IDC_CURRENCYGRPNUM, + CB_SETCURSEL, + pGlobalData->nCurrGrouping, + 0); }

1 0

[gadamopoulos] 74441: [BROWSEUI] Don't leak the image lists created by CAddressBand and CToolsBand.
by gadamopoulos＠svn.reactos.org 01 May '17

01 May '17

Author: gadamopoulos Date: Mon May 1 13:43:22 2017 New Revision: 74441 URL: http://svn.reactos.org/svn/reactos?rev=74441&view=rev Log: [BROWSEUI] Don't leak the image lists created by CAddressBand and CToolsBand. Modified: trunk/reactos/dll/win32/browseui/addressband.cpp trunk/reactos/dll/win32/browseui/addressband.h trunk/reactos/dll/win32/browseui/toolsband.cpp Modified: trunk/reactos/dll/win32/browseui/addressband.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/address… ============================================================================== --- trunk/reactos/dll/win32/browseui/addressband.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/addressband.cpp [iso-8859-1] Mon May 1 13:43:22 2017 @@ -205,6 +205,12 @@ if (fAddressEditBox) fAddressEditBox.Release(); if (fSite) fSite.Release(); + if (m_himlNormal) + ImageList_Destroy(m_himlNormal); + + if (m_himlHot) + ImageList_Destroy(m_himlHot); + return S_OK; } @@ -521,15 +527,12 @@ void CAddressBand::CreateGoButton() { const TBBUTTON buttonInfo [] = { { 0, 1, TBSTATE_ENABLED, 0 } }; - HIMAGELIST normalImagelist; - HIMAGELIST hotImageList; HINSTANCE shellInstance; - shellInstance = GetModuleHandle(_T("shell32.dll")); - normalImagelist = ImageList_LoadImageW(shellInstance, MAKEINTRESOURCE(IDB_GOBUTTON_NORMAL), + m_himlNormal = ImageList_LoadImageW(shellInstance, MAKEINTRESOURCE(IDB_GOBUTTON_NORMAL), 20, 0, RGB(255, 0, 255), IMAGE_BITMAP, LR_CREATEDIBSECTION); - hotImageList = ImageList_LoadImageW(shellInstance, MAKEINTRESOURCE(IDB_GOBUTTON_HOT), + m_himlHot = ImageList_LoadImageW(shellInstance, MAKEINTRESOURCE(IDB_GOBUTTON_HOT), 20, 0, RGB(255, 0, 255), IMAGE_BITMAP, LR_CREATEDIBSECTION); fGoButton = CreateWindowEx(WS_EX_TOOLWINDOW, TOOLBARCLASSNAMEW, 0, WS_CHILD | WS_CLIPSIBLINGS | @@ -538,10 +541,10 @@ 0, 0, 0, 0, m_hWnd, NULL, _AtlBaseModule.GetModuleInstance(), NULL); SendMessage(fGoButton, TB_BUTTONSTRUCTSIZE, sizeof(TBBUTTON), 0); SendMessage(fGoButton, TB_SETMAXTEXTROWS, 1, 0); - if (normalImagelist) - SendMessage(fGoButton, TB_SETIMAGELIST, 0, reinterpret_cast<LPARAM>(normalImagelist)); - if (hotImageList) - SendMessage(fGoButton, TB_SETHOTIMAGELIST, 0, reinterpret_cast<LPARAM>(hotImageList)); + if (m_himlNormal) + SendMessage(fGoButton, TB_SETIMAGELIST, 0, reinterpret_cast<LPARAM>(m_himlNormal)); + if (m_himlHot) + SendMessage(fGoButton, TB_SETHOTIMAGELIST, 0, reinterpret_cast<LPARAM>(m_himlHot)); SendMessage(fGoButton, TB_ADDSTRINGW, reinterpret_cast<WPARAM>(_AtlBaseModule.GetResourceInstance()), IDS_GOBUTTONLABEL); SendMessage(fGoButton, TB_ADDBUTTONSW, 1, (LPARAM) &buttonInfo); Modified: trunk/reactos/dll/win32/browseui/addressband.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/address… ============================================================================== --- trunk/reactos/dll/win32/browseui/addressband.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/addressband.h [iso-8859-1] Mon May 1 13:43:22 2017 @@ -41,6 +41,9 @@ HWND fGoButton; HWND fComboBox; bool fGoButtonShown; + HIMAGELIST m_himlNormal; + HIMAGELIST m_himlHot; + public: CAddressBand(); virtual ~CAddressBand(); Modified: trunk/reactos/dll/win32/browseui/toolsband.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/toolsba… ============================================================================== --- trunk/reactos/dll/win32/browseui/toolsband.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/toolsband.cpp [iso-8859-1] Mon May 1 13:43:22 2017 @@ -40,6 +40,8 @@ CComPtr<IDockingWindowSite> fDockSite; GUID fExecCommandCategory; CComPtr<IOleCommandTarget> fExecCommandTarget; + HIMAGELIST m_himlNormal; + HIMAGELIST m_himlHot; public: CToolsBand(); virtual ~CToolsBand(); @@ -294,36 +296,16 @@ SendMessage(TB_SETEXTENDEDSTYLE, 0, TBSTYLE_EX_HIDECLIPPEDBUTTONS | TBSTYLE_EX_MIXEDBUTTONS | TBSTYLE_EX_DRAWDDARROWS); HINSTANCE shell32Instance = GetModuleHandle(_T("shell32.dll")); - HBITMAP imgNormal = reinterpret_cast<HBITMAP>( - LoadImage(shell32Instance, MAKEINTRESOURCE(214), - IMAGE_BITMAP, 0, 0, LR_DEFAULTSIZE | LR_CREATEDIBSECTION)); - - HBITMAP imgHot = reinterpret_cast<HBITMAP>( - LoadImage(shell32Instance, MAKEINTRESOURCE(215), - IMAGE_BITMAP, 0, 0, LR_DEFAULTSIZE | LR_CREATEDIBSECTION)); - - if (imgNormal && imgHot) - { - BITMAP bitmapInfo; - GetObjectW(imgNormal, sizeof(bitmapInfo), &bitmapInfo); - HIMAGELIST himlNormal = ImageList_Create(bitmapInfo.bmHeight, bitmapInfo.bmHeight, ILC_COLOR32, 4, 4); - ImageList_Add(himlNormal, imgNormal, NULL); - - GetObjectW(imgHot, sizeof(bitmapInfo), &bitmapInfo); - HIMAGELIST himlHot = ImageList_Create(bitmapInfo.bmHeight, bitmapInfo.bmHeight, ILC_COLOR32, 4, 4); - ImageList_Add(himlHot, imgHot, NULL); - - SendMessage(TB_SETIMAGELIST, 0, (LPARAM) himlNormal); - SendMessage(TB_SETHOTIMAGELIST, 0, (LPARAM) himlHot); - } - + m_himlNormal = ImageList_LoadImageW(shell32Instance, MAKEINTRESOURCE(214), + 0, 0, RGB(255, 0, 255), IMAGE_BITMAP, LR_DEFAULTSIZE | LR_CREATEDIBSECTION); + + m_himlHot = ImageList_LoadImageW(shell32Instance, MAKEINTRESOURCE(215), + 0, 0, RGB(255, 0, 255), IMAGE_BITMAP, LR_DEFAULTSIZE | LR_CREATEDIBSECTION); + + SendMessage(TB_SETIMAGELIST, 0, (LPARAM) m_himlNormal); + SendMessage(TB_SETHOTIMAGELIST, 0, (LPARAM) m_himlHot); SendMessage(TB_ADDBUTTONSW, numShownButtons, (LPARAM)&tbButtonsAdd); - if (imgNormal) - DeleteObject(imgNormal); - if (imgHot) - DeleteObject(imgHot); - return hResult; } @@ -344,7 +326,6 @@ HRESULT STDMETHODCALLTYPE CToolsBand::ContextSensitiveHelp(BOOL fEnterMode) { - return E_NOTIMPL; } @@ -357,7 +338,14 @@ m_hWnd = NULL; - if (fDockSite) fDockSite.Release(); + if (fDockSite) + fDockSite.Release(); + + if (m_himlNormal) + ImageList_Destroy(m_himlNormal); + + if (m_himlHot) + ImageList_Destroy(m_himlHot); return S_OK; }

1 0

[gadamopoulos] 74440: [COMCTL32] -ImageList: Don't leak the DC returned by saturate_image.
by gadamopoulos＠svn.reactos.org 01 May '17

01 May '17

Author: gadamopoulos Date: Mon May 1 13:40:57 2017 New Revision: 74440 URL: http://svn.reactos.org/svn/reactos?rev=74440&view=rev Log: [COMCTL32] -ImageList: Don't leak the DC returned by saturate_image. Modified: trunk/reactos/dll/win32/comctl32/imagelist.c Modified: trunk/reactos/dll/win32/comctl32/imagelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/imageli… ============================================================================== --- trunk/reactos/dll/win32/comctl32/imagelist.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/imagelist.c [iso-8859-1] Mon May 1 13:40:57 2017 @@ -1444,6 +1444,9 @@ HBRUSH hOldBrush; POINT pt; BOOL has_alpha; +#ifdef __REACTOS__ + HDC hdcSaturated; +#endif if (!pimldp || !(himl = pimldp->himl)) return FALSE; if (!is_valid(himl)) return FALSE; @@ -1500,9 +1503,10 @@ */ if (fState & ILS_SATURATE) { - hImageListDC = saturate_image(himl, pimldp->hdcDst, pimldp->x, pimldp->y, + hdcSaturated = saturate_image(himl, pimldp->hdcDst, pimldp->x, pimldp->y, pt.x, pt.y, cx, cy, pimldp->rgbFg); + hImageListDC = hdcSaturated; /* shitty way of getting subroutines to blit at the right place (top left corner), as our modified imagelist only contains a single image for performance reasons */ pt.x = 0; @@ -1672,6 +1676,10 @@ SetTextColor(hImageDC, oldImageFg); SelectObject(hImageDC, hOldImageBmp); cleanup: +#ifdef __REACTOS__ + if (hdcSaturated) + DeleteDC(hdcSaturated); +#endif DeleteObject(hBlendMaskBmp); DeleteObject(hImageBmp); DeleteDC(hImageDC);

1 0

[ekohl] 74439: [TRANSLATION] Japanese NLS info. Patch by Katayama Hirofumi MZ. CORE-13164
by ekohl＠svn.reactos.org 01 May '17

01 May '17

Author: ekohl Date: Mon May 1 13:09:31 2017 New Revision: 74439 URL: http://svn.reactos.org/svn/reactos?rev=74439&view=rev Log: [TRANSLATION] Japanese NLS info. Patch by Katayama Hirofumi MZ. CORE-13164 Added: trunk/reactos/dll/win32/kernel32/winnls/lang/ja-JP.rc (with props) Modified: trunk/reactos/dll/win32/kernel32/kernel32.rc Modified: trunk/reactos/dll/win32/kernel32/kernel32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.rc [iso-8859-1] Mon May 1 13:09:31 2017 @@ -32,6 +32,9 @@ #ifdef LANGUAGE_IT_IT #include "winnls/lang/it-IT.rc" #endif +#ifdef LANGUAGE_JA_JP + #include "winnls/lang/ja-JP.rc" +#endif #ifdef LANGUAGE_RO_RO #include "winnls/lang/ro-RO.rc" #endif Added: trunk/reactos/dll/win32/kernel32/winnls/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/winnls/lang/ja-JP.rc (added) +++ trunk/reactos/dll/win32/kernel32/winnls/lang/ja-JP.rc [iso-8859-1] Mon May 1 13:09:31 2017 @@ -0,0 +1,440 @@ +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + /* Names of code pages */ + 1250 "1250 (ANSI - ä¸å¤®ã¨ã¼ããã)" + 1251 "1251 (ANSI - ããªã«è¨èª)" + 1252 "1252 (ANSI - ã©ãã³ I)" + 1253 "1253 (ANSI - ã®ãªã·ã£èª)" + 1254 "1254 (ANSI - ãã«ã³èª)" + 1255 "1255 (ANSI - ããã©ã¤èª)" + 1256 "1256 (ANSI - ã¢ã©ãã¢èª)" + 1257 "1257 (ANSI - ãã«ãè¨èª)" + 1258 "1258 (ANSI/OEM - ãããã èª)" + 874 "874 (ANSI/OEM - ã¿ã¤èª)" + 932 "932 (ANSI/OEM - æ¥æ¬èª Shift-JIS)" + 936 "936 (ANSI/OEM - ç°¡ä½åä¸å½èª GBK)" + 949 "949 (ANSI/OEM - éå½èª)" + 950 "950 (ANSI/OEM - ç¹ä½åä¸å½èª Big5)" + + 437 "437 (OEM - ç±³å½)" + 737 "737 (OEM - ã®ãªã·ã£èª 437G)" + 775 "775 (OEM - ãã«ãè¨èª)" + 850 "850 (OEM - å¤è¨èªã©ãã³ I)" + 852 "852 (OEM - ã©ãã³ II)" + 855 "855 (OEM - ããªã«è¨èª)" + 856 "856 (OEM - ããã©ã¤èª PC)" + 857 "857 (OEM - ãã«ã³èª)" + 858 "858 (OEM - å¤è¨èªã©ãã³ I + ã¨ã¼ãããè¨èª)" + 860 "860 (OEM - ãã«ãã¬ã«èª)" + 861 "861 (OEM - ã¢ã¤ã¹ã©ã³ãèª)" + 862 "862 (OEM - ããã©ã¤èª)" + 863 "863 (OEM - ã«ãã ãã©ã³ã¹èª)" + 864 "864 (OEM - ã¢ã©ãã¢èª)" + 865 "865 (OEM - åæ¬§)" + 866 "866 (OEM - ãã·ã¢èª)" + 869 "869 (OEM - ç¾ä»£ã®ãªã·ã£èª)" + + 10000 "10000 (MAC - ãã¼ãã³)" + 10001 "10001 (MAC - æ¥æ¬èª)" + 10002 "10002 (MAC - ç°¡ä½åä¸å½èª Big5)" + 10003 "10003 (MAC - éå½èª)" + 10004 "10004 (MAC - ã¢ã©ãã¢èª)" + 10005 "10005 (MAC - ããã©ã¤èª)" + 10006 "10006 (MAC - ã®ãªã·ã£èª I)" + 10007 "10007 (MAC - ããªã«è¨èª)" + 10008 "10008 (MAC - ç°¡ä½åä¸å½èª GB 2312)" + 10010 "10010 (MAC - ã«ã¼ããã¢èª)" + 10017 "10017 (MAC - ã¦ã¯ã©ã¤ãèª)" + 10021 "10021 (MAC - ã¿ã¤èª)" + 10029 "10029 (MAC - ã©ãã³ II)" + 10079 "10079 (MAC - ã¢ã¤ã¹ã©ã³ãèª)" + 10081 "10081 (MAC - ãã«ã³èª)" + 10082 "10082 (MAC - ã¯ãã¢ãã¢èª)" + + 65000 "65000 (UTF-7)" + 65001 "65001 (UTF-8)" + + 3700 "37 (IBM EBCDIC - ç±³å½/ã«ãã)" /* FIXME */ +// 424 "424 (IBM EBCDIC - Hebrew)" // On Windows, this is CP 20424 + 1026 "1026 (IBM EBCDIC - ãã«ã³èª (ã©ãã³-5))" + 1047 "1047 (IBM EBCDIC - ã©ãã³-1/Open System)" + 1140 "1140 (IBM EBCDIC - ç±³å½/ã«ãã (37 + ã¦ã¼ã))" + 1141 "1141 (IBM EBCDIC - ãã¤ã (20273 + ã¦ã¼ã))" + 1142 "1142 (IBM EBCDIC - ãã³ãã¼ã¯/ãã«ã¦ã§ã¼ (20277 + ã¦ã¼ã))" + 1143 "1143 (IBM EBCDIC - ãã£ã³ã©ã³ã/ã¹ã¦ã§ã¼ãã³ (20278 + ã¦ã¼ã))" + 1144 "1144 (IBM EBCDIC - ã¤ã¿ãªã¢ (20280 + ã¦ã¼ã))" + 1145 "1145 (IBM EBCDIC - ã©ãã³ ã¢ã¡ãªã«è¨èª/ã¹ãã¤ã³ (20284 + ã¦ã¼ã))" + 1146 "1146 (IBM EBCDIC - è±å½ (20285 + ã¦ã¼ã))" + 1147 "1147 (IBM EBCDIC - ãã©ã³ã¹ (20297 + ã¦ã¼ã))" + 1148 "1148 (IBM EBCDIC - ã¤ã³ã¿ã¼ãã·ã§ãã« (500 + ã¦ã¼ã))" + 1149 "1149 (IBM EBCDIC - ã¢ã¤ã¹ã©ã³ãèª (20871 + ã¦ã¼ã))" + 20273 "20273 (IBM EBCDIC - ãã¤ã)" + 20277 "20277 (IBM EBCDIC - ãã³ãã¼ã¯/ãã«ã¦ã§ã¼)" + 20278 "20278 (IBM EBCDIC - ãã£ã³ã©ã³ã/ã¹ã¦ã§ã¼ãã³)" + 20280 "20280 (IBM EBCDIC - ã¤ã¿ãªã¢)" + 20284 "20284 (IBM EBCDIC - ã©ãã³ ã¢ã¡ãªã«è¨èª/ã¹ãã¤ã³)" + 20285 "20285 (IBM EBCDIC - è±å½)" + 20290 "20290 (IBM EBCDIC - æ¥æ¬èª ã«ã¿ã«ãæ¡å¼µ)" + 20297 "20297 (IBM EBCDIC - ãã©ã³ã¹)" + 20420 "20420 (IBM EBCDIC - ã¢ã©ãã¢èª)" + 20423 "20423 (IBM EBCDIC - ã®ãªã·ã£èª)" + 20424 "20424 (IBM EBCDIC - ããã©ã¤èª)" + 20833 "20833 (IBM EBCDIC - éå½èªæ¡å¼µ)" + 20838 "20838 (IBM EBCDIC - ã¿ã¤èª)" + 20871 "20871 (IBM EBCDIC - ã¢ã¤ã¹ã©ã³ãèª)" + 20880 "20880 (IBM EBCDIC - ããªã«æå (ãã·ã¢èª))" + 20905 "20905 (IBM EBCDIC - ãã«ã³èª)" + 20924 "20924 (IBM EBCDIC - ã©ãã³-1/Open System (1047 + ã¦ã¼ã))" + 21025 "21025 (IBM EBCDIC - ããªã«æå (ã»ã«ãã¢èª, ãã«ã¬ãªã¢èª))" + 500 "500 (IBM EBCDIC - ã¤ã³ã¿ã¼ãã·ã§ãã«)" + 870 "870 (IBM EBCDIC - ãã«ããªã³ã¬ã«/ROECE (ã©ãã³-2))" + 875 "875 (IBM EBCDIC - ã¢ãã³ã®ãªã·ã£èª)" + + 20269 "20269 (ISO 6937 Non-Spacing Accent)" + 28591 "28591 (ISO 8859-1 ã©ãã³ I)" + 28592 "28592 (ISO 8859-2 ä¸å¤®ã¨ã¼ããã)" + 28593 "28593 (ISO 8859-3 ã©ãã³ 3)" + 28594 "28594 (ISO 8859-4 ãã«ãè¨èª)" + 28595 "28595 (ISO 8859-5 ããªã«è¨èª)" + 28596 "28596 (ISO 8859-6 ã¢ã©ãã¢èª)" + 28597 "28597 (ISO 8859-7 ã®ãªã·ã£èª)" + 28598 "28598 (ISO 8859-8 ããã©ã¤èª: è¦è¦é )" + 28599 "28599 (ISO 8859-9 ã©ãã³ 5)" + 28600 "28600 (ISO 8859-10 ã©ãã³ 6)" + 28603 "28603 (ISO 8859-13 ã©ãã³ 7)" + 28604 "28604 (ISO 8859-14 ã©ãã³ 8)" + 28605 "28605 (ISO 8859-15 ã©ãã³ 9)" + 28606 "28606 (ISO 8859-16 ã©ãã³ 10)" + 38598 "38598 (ISO 8859-8 ããã©ã¤èª: è«çé )" + + 20105 "20105 (IA5 IRV ã¤ã³ã¿ã¼ãã·ã§ãã« ã¢ã«ãã¡ããã No.5)" + 20106 "20106 (IA5 ãã¤ãèª)" + 20107 "20107 (IA5 ã¹ã¦ã§ã¼ãã³èª)" + 20108 "20108 (IA5 ãã«ã¦ã§ã¼èª)" + + 1361 "1361 (éå½èª - Johab)" + 20000 "20000 (CNS - å°æ¹¾)" + 20001 "20001 (TCA - å°æ¹¾)" + 20002 "20002 (Eten - å°æ¹¾)" + 20003 "20003 (IBM5550 - å°æ¹¾)" + 20004 "20004 (TeleText - å°æ¹¾)" + 20005 "20005 (Wang - å°æ¹¾)" + 20127 "20127 (US-ASCII)" + 20261 "20261 (T.61)" +// 878 "878 (ãã·ã¢èª - KOI8)" // On Windows, this is CP 20866 + 20866 "20866 (ãã·ã¢èª - KOI8)" + 21027 "21027 (Ext Alpha Lowercase)" + 21866 "21866 (ã¦ã¯ã©ã¤ãèª - KOI8-U)" + 708 "708 (ã¢ã©ãã¢èª - ASMO)" + 720 "720 (ã¢ã©ãã¢èª - Transparent ASMO)" + 20932 "20932 (JIS X 0208-1990 & 0212-1990)" + 20936 "20936 (ç°¡ä½åä¸å½èª GB2312)" + 20949 "20949 (éå½èª Wansung)" + + 57002 "57002 (ISCII ãããã¬ãªèª)" + 57003 "57003 (ISCII ãã³ã°ã©èª)" + 57004 "57004 (ISCII ã¿ãã¼ã«èª)" + 57005 "57005 (ISCII ãã«ã°èª)" + 57006 "57006 (ISCII ã¢ããµã èª)" + 57007 "57007 (ISCII ãªãã£ã¢èª (ãªãªã¤ã¼èª))" + 57008 "57008 (ISCII ã«ãã©èª)" + 57009 "57009 (ISCII ãã©ã¤ã©ã èª)" + 57010 "57010 (ISCII ã°ã¸ã£ã©ã¼ãèª)" + 57011 "57011 (ISCII ãã³ã¸ã£ãèª (ããããã¼ãã))" + + 50930 "50930 (IBM EBCDIC - æ¥æ¬èª (ã«ã¿ã«ã) æ¡å¼µã¨æ¥æ¬èª)" + 50931 "50931 (IBM EBCDIC - ç±³å½/ã«ããã¨æ¥æ¬èª)" + 50933 "50933 (IBM EBCDIC - éå½èªæ¡å¼µã¨éå½èª)" + 50935 "50935 (IBM EBCDIC - ç°¡ä½åä¸å½èª)" + 50937 "50937 (IBM EBCDIC - ç±³å½/ã«ããã¨ç¹ä½åä¸å½èª)" + 50939 "50939 (IBM EBCDIC - æ¥æ¬èª (ã©ãã³) æ¡å¼µã¨æ¥æ¬èª)" + + 50220 "50220 (ISO-2022 æ¥æ¬èªãåè§ã«ã¿ã«ããªã)" + 50221 "50221 (ISO-2022 æ¥æ¬èªãåè§ã«ã¿ã«ã)" + 50222 "50222 (ISO-2022 æ¥æ¬èª JIS X 0201-1989)" + 50225 "50225 (ISO-2022 éå½èª)" + 50227 "50227 (ISO-2022 ç°¡ä½åä¸å½èª)" + 50229 "50229 (ISO-2022 ç¹ä½åä¸å½èª)" + + 51932 "51932 (EUC-æ¥æ¬èª)" + 51936 "51936 (EUC-ç°¡ä½åä¸å½èª)" + 51949 "51949 (EUC-éå½èª)" + 51950 "51950 (EUC-ç¹ä½åä¸å½èª)" + + 52936 "52936 (HZ-GB2312 ç°¡ä½åä¸å½èª)" + 54936 "54936 (GB18030 ç°¡ä½åä¸å½èª)" + +/* Locations */ + 2+NLSRC_OFFSET "ã¢ã³ãã£ã°ã¢ã»ãã¼ãã¼ã" + 3+NLSRC_OFFSET "ã¢ãã¬ãã¹ã¿ã³" + 4+NLSRC_OFFSET "ã¢ã«ã¸ã§ãªã¢" + 5+NLSRC_OFFSET "ã¢ã¼ã«ãã¤ã¸ã£ã³" + 6+NLSRC_OFFSET "ã¢ã«ããã¢" + 7+NLSRC_OFFSET "ã¢ã«ã¡ãã¢" + 8+NLSRC_OFFSET "ã¢ã³ãã©" + 9+NLSRC_OFFSET "ã¢ã³ã´ã©" + 10+NLSRC_OFFSET "ç±³é ãµã¢ã¢" + 11+NLSRC_OFFSET "ã¢ã«ã¼ã³ãã³" + 12+NLSRC_OFFSET "ãªã¼ã¹ãã©ãªã¢" + 14+NLSRC_OFFSET "ãªã¼ã¹ããªã¢" + 17+NLSRC_OFFSET "ãã¼ã¬ã¼ã³" + 18+NLSRC_OFFSET "ãã«ããã¹" + 19+NLSRC_OFFSET "ããã¯ã" + 20+NLSRC_OFFSET "ããã¥ã¼ãè«¸å³¶" + 21+NLSRC_OFFSET "ãã«ã®ã¼" + 22+NLSRC_OFFSET "ããã" + 23+NLSRC_OFFSET "ãã³ã°ã©ãã·ã¥" + 24+NLSRC_OFFSET "ããªã¼ãº" + 25+NLSRC_OFFSET "ãã¹ãã¢ã»ãã«ãã§ã´ãã" + 26+NLSRC_OFFSET "ããªãã¢" + 27+NLSRC_OFFSET "ãã£ã³ãã¼" + 28+NLSRC_OFFSET "ããã³" + 29+NLSRC_OFFSET "ãã©ã«ã¼ã·" + 30+NLSRC_OFFSET "ã½ãã¢ã³è«¸å³¶" + 32+NLSRC_OFFSET "ãã©ã¸ã«" + 34+NLSRC_OFFSET "ãã¼ã¿ã³" + 35+NLSRC_OFFSET "ãã«ã¬ãªã¢" + 37+NLSRC_OFFSET "ãã«ãã¤" + 38+NLSRC_OFFSET "ãã«ã³ã¸" + 39+NLSRC_OFFSET "ã«ãã" + 40+NLSRC_OFFSET "ã«ã³ãã¸ã¢" + 41+NLSRC_OFFSET "ãã£ã" + 42+NLSRC_OFFSET "ã¹ãªã©ã³ã«" + 43+NLSRC_OFFSET "ã³ã³ã´å±åå½" + 44+NLSRC_OFFSET "ã³ã³ã´æ°ä¸»å±åå½" + 45+NLSRC_OFFSET "ä¸å½" + 46+NLSRC_OFFSET "ããª" + 49+NLSRC_OFFSET "ã«ã¡ã«ã¼ã³" + 50+NLSRC_OFFSET "ã³ã¢ã" + 51+NLSRC_OFFSET "ã³ãã³ãã¢" + 54+NLSRC_OFFSET "ã³ã¹ã¿ãªã«" + 55+NLSRC_OFFSET "ä¸å¤®ã¢ããªã«å±åå½" + 56+NLSRC_OFFSET "ãã¥ã¼ã" + 57+NLSRC_OFFSET "ã«ã¼ããã«ã" + 59+NLSRC_OFFSET "ãããã¹" + 61+NLSRC_OFFSET "ãã³ãã¼ã¯" + 62+NLSRC_OFFSET "ã¸ãã" + 63+NLSRC_OFFSET "ãããã«å½" + 65+NLSRC_OFFSET "ãããã«å±åå½" + 66+NLSRC_OFFSET "ã¨ã¯ã¢ãã«" + 67+NLSRC_OFFSET "ã¨ã¸ãã" + 68+NLSRC_OFFSET "ã¢ã¤ã«ã©ã³ã" + 69+NLSRC_OFFSET "èµ¤éã®ãã¢" + 70+NLSRC_OFFSET "ã¨ã¹ããã¢" + 71+NLSRC_OFFSET "ã¨ãªããªã¢" + 72+NLSRC_OFFSET "ã¨ã«ãµã«ããã«" + 73+NLSRC_OFFSET "ã¨ããªãã¢" + 75+NLSRC_OFFSET "ãã§ã³å±åå½" + 77+NLSRC_OFFSET "ãã£ã³ã©ã³ã" + 78+NLSRC_OFFSET "ãã£ã¸ã¼" + 80+NLSRC_OFFSET "ãã¯ããã·ã¢" + 81+NLSRC_OFFSET "ãã§ãã¼è«¸å³¶" + 84+NLSRC_OFFSET "ãã©ã³ã¹" + 86+NLSRC_OFFSET "ã¬ã³ãã¢" + 87+NLSRC_OFFSET "ã¬ãã³" + 88+NLSRC_OFFSET "ã¸ã§ã¼ã¸ã¢" + 89+NLSRC_OFFSET "ã¬ã¼ã" + 90+NLSRC_OFFSET "ã¸ãã©ã«ã¿ã«" + 91+NLSRC_OFFSET "ã°ã¬ãã" + 93+NLSRC_OFFSET "ã°ãªã¼ã³ã©ã³ã" + 94+NLSRC_OFFSET "ãã¤ã" + 98+NLSRC_OFFSET "ã®ãªã·ã£" + 99+NLSRC_OFFSET "ã°ã¢ããã©" + 100+NLSRC_OFFSET "ã®ãã¢" + 101+NLSRC_OFFSET "ã¬ã¤ã¢ã" + 103+NLSRC_OFFSET "ãã¤ã" + 104+NLSRC_OFFSET "é¦æ¸¯ç¹å¥è¡æ¿åº" + 106+NLSRC_OFFSET "ãã³ã¸ã¥ã©ã¹" + 108+NLSRC_OFFSET "ã¯ãã¢ãã¢" + 109+NLSRC_OFFSET "ãã³ã¬ãªã¼" + 110+NLSRC_OFFSET "ã¢ã¤ã¹ã©ã³ã" + 111+NLSRC_OFFSET "ã¤ã³ããã·ã¢" + 113+NLSRC_OFFSET "ã¤ã³ã" + 114+NLSRC_OFFSET "è±é ã¤ã³ãæ´å°å" + 116+NLSRC_OFFSET "ã¤ã©ã³" + 117+NLSRC_OFFSET "ã¤ã¹ã©ã¨ã«" + 118+NLSRC_OFFSET "ã¤ã¿ãªã¢" + 119+NLSRC_OFFSET "ã³ã¼ãã¸ãã¯ã¼ã«" + 121+NLSRC_OFFSET "ã¤ã©ã¯" + 122+NLSRC_OFFSET "æ¥æ¬" + 124+NLSRC_OFFSET "ã¸ã£ãã¤ã«" + 125+NLSRC_OFFSET "ã¤ã³ãã¤ã¨ã³å³¶" + 126+NLSRC_OFFSET "ã¨ã«ãã³" + 127+NLSRC_OFFSET "ã¸ã§ã³ã¹ãã³ç°ç¤" + 129+NLSRC_OFFSET "ã±ãã¢" + 130+NLSRC_OFFSET "ãã«ã®ã¹ã¿ã³" + 131+NLSRC_OFFSET "åæé®®" + 133+NLSRC_OFFSET "ããªãã¹" + 134+NLSRC_OFFSET "éå½" + 136+NLSRC_OFFSET "ã¯ã¦ã§ã¼ã" + 137+NLSRC_OFFSET "ã«ã¶ãã¹ã¿ã³" + 138+NLSRC_OFFSET "ã©ãªã¹" + 139+NLSRC_OFFSET "ã¬ããã³" + 140+NLSRC_OFFSET "ã©ããã¢" + 141+NLSRC_OFFSET "ãªãã¢ãã¢" + 142+NLSRC_OFFSET "ãªããªã¢" + 143+NLSRC_OFFSET "ã¹ãããã¢" + 145+NLSRC_OFFSET "ãªããã³ã·ã¥ã¿ã¤ã³" + 146+NLSRC_OFFSET "ã¬ã½ã" + 147+NLSRC_OFFSET "ã«ã¯ã»ã³ãã«ã¯" + 148+NLSRC_OFFSET "ãªãã¢" + 149+NLSRC_OFFSET "ããã¬ã¹ã«ã«" + 151+NLSRC_OFFSET "ãã«ãª" + 152+NLSRC_OFFSET "ã¢ã«ãã" + 154+NLSRC_OFFSET "ã¢ã³ã´ã«å½" + 156+NLSRC_OFFSET "ãã©ã¦ã¤" + 157+NLSRC_OFFSET "ããª" + 158+NLSRC_OFFSET "ã¢ãã³" + 159+NLSRC_OFFSET "ã¢ããã³" + 160+NLSRC_OFFSET "ã¢ã¼ãªã·ã£ã¹" + 162+NLSRC_OFFSET "ã¢ã¼ãªã¿ãã¢" + 163+NLSRC_OFFSET "ãã«ã¿" + 164+NLSRC_OFFSET "ãªãã¼ã³" + 165+NLSRC_OFFSET "ã¢ã«ãã£ã" + 166+NLSRC_OFFSET "ã¡ãã·ã³" + 167+NLSRC_OFFSET "ãã¬ã¼ã·ã¢" + 168+NLSRC_OFFSET "ã¢ã¶ã³ãã¼ã¯" + 173+NLSRC_OFFSET "ãã¸ã§ã¼ã«" + 174+NLSRC_OFFSET "ããã¢ã" + 175+NLSRC_OFFSET "ãã¤ã¸ã§ãªã¢" + 176+NLSRC_OFFSET "ãªã©ã³ã" + 177+NLSRC_OFFSET "ãã«ã¦ã§ã¼" + 178+NLSRC_OFFSET "ããã¼ã«" + 180+NLSRC_OFFSET "ãã¦ã«" + 181+NLSRC_OFFSET "ã¹ãªãã " + 182+NLSRC_OFFSET "ãã«ã©ã°ã¢" + 183+NLSRC_OFFSET "ãã¥ã¼ã¸ã¼ã©ã³ã" + 184+NLSRC_OFFSET "ãã¬ã¹ããèªæ²»æ¿åº" + 185+NLSRC_OFFSET "ãã©ã°ã¢ã¤" + 187+NLSRC_OFFSET "ãã«ã¼" + 190+NLSRC_OFFSET "ããã¹ã¿ã³" + 191+NLSRC_OFFSET "ãã¼ã©ã³ã" + 192+NLSRC_OFFSET "ããã" + 193+NLSRC_OFFSET "ãã«ãã¬ã«" + 194+NLSRC_OFFSET "ããã¢ãã¥ã¼ã®ãã¢" + 195+NLSRC_OFFSET "ãã©ãª" + 196+NLSRC_OFFSET "ã®ãã¢ããµã¦" + 197+NLSRC_OFFSET "ã«ã¿ã¼ã«" + 198+NLSRC_OFFSET "ã¬ã¦ããªã³" + 199+NLSRC_OFFSET "ãã¼ã·ã£ã«è«¸å³¶" + 200+NLSRC_OFFSET "ã«ã¼ããã¢" + 201+NLSRC_OFFSET "ãã£ãªãã³" + 202+NLSRC_OFFSET "ãã¨ã«ããªã³" + 203+NLSRC_OFFSET "ãã·ã¢" + 204+NLSRC_OFFSET "ã«ã¯ã³ã" + 205+NLSRC_OFFSET "ãµã¦ã¸ã¢ã©ãã¢" + 206+NLSRC_OFFSET "ãµã³ãã¨ã¼ã«ã»ãã¯ãã³" + 207+NLSRC_OFFSET "ã»ã³ãã¯ãªã¹ããã¡ã¼ã»ãã¤ãã¹" + 208+NLSRC_OFFSET "ã»ã¼ã·ã§ã«" + 209+NLSRC_OFFSET "åã¢ããªã«" + 210+NLSRC_OFFSET "ã»ãã¬ã«" + 212+NLSRC_OFFSET "ã¹ãããã¢" + 213+NLSRC_OFFSET "ã·ã¨ã©ã¬ãªã" + 214+NLSRC_OFFSET "ãµã³ããªã" + 215+NLSRC_OFFSET "ã·ã³ã¬ãã¼ã«" + 216+NLSRC_OFFSET "ã½ããªã¢" + 217+NLSRC_OFFSET "ã¹ãã¤ã³" + 218+NLSRC_OFFSET "ã»ã³ãã«ã·ã¢" + 219+NLSRC_OFFSET "ã¹ã¼ãã³" + 220+NLSRC_OFFSET "ã¹ãã¼ã«ãã«è«¸å³¶" + 221+NLSRC_OFFSET "ã¹ã¦ã§ã¼ãã³" + 222+NLSRC_OFFSET "ã·ãªã¢" + 223+NLSRC_OFFSET "ã¹ã¤ã¹" + 224+NLSRC_OFFSET "ã¢ã©ãé¦é·å½é£é¦" + 225+NLSRC_OFFSET "ããªããã¼ãã»ããã´" + 227+NLSRC_OFFSET "ã¿ã¤" + 228+NLSRC_OFFSET "ã¿ã¸ãã¹ã¿ã³" + 231+NLSRC_OFFSET "ãã³ã¬" + 232+NLSRC_OFFSET "ãã¼ã´" + 233+NLSRC_OFFSET "ãµã³ãã¡ã»ããªã³ã·ã" + 234+NLSRC_OFFSET "ãã¥ãã¸ã¢" + 235+NLSRC_OFFSET "ãã«ã³" + 236+NLSRC_OFFSET "ããã«" + 237+NLSRC_OFFSET "å°æ¹¾" + 238+NLSRC_OFFSET "ãã«ã¯ã¡ãã¹ã¿ã³" + 239+NLSRC_OFFSET "ã¿ã³ã¶ãã¢" + 240+NLSRC_OFFSET "ã¦ã¬ã³ã" + 241+NLSRC_OFFSET "ã¦ã¯ã©ã¤ã" + 242+NLSRC_OFFSET "è±å½" + 244+NLSRC_OFFSET "ç±³å½" + 245+NLSRC_OFFSET "ãã«ãããã¡ã½" + 246+NLSRC_OFFSET "ã¦ã«ã°ã¢ã¤" + 247+NLSRC_OFFSET "ã¦ãºããã¹ã¿ã³" + 248+NLSRC_OFFSET "ã»ã³ããã³ã»ã³ãããã³ã°ã¬ããã£ã¼ã³è«¸å³¶" + 249+NLSRC_OFFSET "ãããºã¨ã©" + 251+NLSRC_OFFSET "ãããã " + 252+NLSRC_OFFSET "ç±³é ãã¼ã¸ã³è«¸å³¶" + 253+NLSRC_OFFSET "ããã«ã³" + 254+NLSRC_OFFSET "ãããã¢" + 257+NLSRC_OFFSET "è¥¿ãµãã© (ç´äº)" + 258+NLSRC_OFFSET "ã¦ã§ã¼ã¯å³¶" + 259+NLSRC_OFFSET "ãµã¢ã¢" + 260+NLSRC_OFFSET "ã¹ã¯ã¸ã©ã³ã" + 261+NLSRC_OFFSET "ã¤ã¨ã¡ã³" + 263+NLSRC_OFFSET "ã¶ã³ãã¢" + 264+NLSRC_OFFSET "ã¸ã³ããã¨" + 269+NLSRC_OFFSET "ã»ã«ãã¢ããã³ã¢ã³ããã°ã (æ§)" + 270+NLSRC_OFFSET "ã¢ã³ããã°ã" + 271+NLSRC_OFFSET "ã»ã«ãã¢" + 273+NLSRC_OFFSET "ãã¥ã©ã½ã¼å³¶" + 276+NLSRC_OFFSET "åã¹ã¼ãã³" + 300+NLSRC_OFFSET "ã¢ã³ã®ã©" + 301+NLSRC_OFFSET "åæ¥µ" + 302+NLSRC_OFFSET "ã¢ã«ã" + 303+NLSRC_OFFSET "ã¢ã»ã³ã·ã§ã³å³¶" + 304+NLSRC_OFFSET "ã¢ã·ã¥ã¢ã¢ã»ã«ã«ãã£ã¨è«¸å³¶" + 305+NLSRC_OFFSET "ãã¼ã«ã¼å³¶" + 306+NLSRC_OFFSET "ãã¼ãå³¶" + 307+NLSRC_OFFSET "ã±ã¤ãã³è«¸å³¶" + 308+NLSRC_OFFSET "ãã£ã³ãã«è«¸å³¶" + 309+NLSRC_OFFSET "ã¯ãªã¹ãã¹å³¶" + 310+NLSRC_OFFSET "ã¯ãªããã¼ãã³å³¶" + 311+NLSRC_OFFSET "ã³ã³ã¹è«¸å³¶" + 312+NLSRC_OFFSET "ã¯ãã¯è«¸å³¶" + 313+NLSRC_OFFSET "ã³ã¼ã©ã«ã»ã·ã¼è«¸å³¶" + 314+NLSRC_OFFSET "ãã£ã¨ã´ã¬ã«ã·ã¢å³¶" + 315+NLSRC_OFFSET "ãã©ã¼ã¯ã©ã³ãè«¸å³¶" + 317+NLSRC_OFFSET "ãã©ã³ã¹é ã®ã¢ã" + 318+NLSRC_OFFSET "ãã©ã³ã¹é ããªãã·ã¢" + 319+NLSRC_OFFSET "ãã©ã³ã¹é åæ¥µå°æ¹" + 321+NLSRC_OFFSET "ã°ã¢ãã«ã¼ãå³¶" + 322+NLSRC_OFFSET "ã°ã¢ã " + 323+NLSRC_OFFSET "ã°ã¢ã³ã¿ãã¢æ¹¾" + 324+NLSRC_OFFSET "ã¬ã¼ã³ã¸ã¼å³¶" + 325+NLSRC_OFFSET "ãã¼ãã»ãã¯ããã«ãè«¸å³¶" + 326+NLSRC_OFFSET "ãã¦ã©ã³ãå³¶" + 327+NLSRC_OFFSET "ã¸ã£ã¼ã´ã£ã¹å³¶" + 328+NLSRC_OFFSET "ã¸ã£ã¼ã¸ã¼å³¶" + 329+NLSRC_OFFSET "ãã³ã°ãã³ã»ãªã¼ã" + 330+NLSRC_OFFSET "ãã«ããã¼ã¯å³¶" + 331+NLSRC_OFFSET "ãã¤ã¨ããå³¶" + 332+NLSRC_OFFSET "ã¢ã³ã»ã©ãã" + 333+NLSRC_OFFSET "ãªã©ã³ãé ã¢ã³ãã£ã« (æ§)" + 334+NLSRC_OFFSET "ãã¥ã¼ã«ã¬ããã¢" + 335+NLSRC_OFFSET "ãã¦ã¨" + 336+NLSRC_OFFSET "ãã¼ãã©ã¼ã¯å³¶" + 337+NLSRC_OFFSET "åããªã¢ãè«¸å³¶" + 338+NLSRC_OFFSET "ãã«ãã©ç°ç¤" + 339+NLSRC_OFFSET "ããã±ã¢ã³å³¶" + 340+NLSRC_OFFSET "ãã¿å³¶" + 341+NLSRC_OFFSET "ãµã¤ãã³å³¶" + 342+NLSRC_OFFSET "ãµã¦ã¹ã¸ã§ã¼ã¸ã¢ã»ãµã¦ã¹ãµã³ãã¦ã£ããè«¸å³¶" + 343+NLSRC_OFFSET "ã»ã³ããã¬ããã¢ã»ã³ã·ã§ã³ããã³ããªã¹ã¿ã³ãã¯ã¼ãã£" + 346+NLSRC_OFFSET "ããã¢ã³å³¶" + 347+NLSRC_OFFSET "ãã±ã©ã¦è«¸å³¶" + 348+NLSRC_OFFSET "ããªã¹ã¿ã³ãã¯ã¼ãã£" + 349+NLSRC_OFFSET "ã¿ã¼ã¯ã¹ã»ã«ã¤ã³ã¹è«¸å³¶" + 351+NLSRC_OFFSET "è±é ãã¼ã¸ã³è«¸å³¶" + 352+NLSRC_OFFSET "ã¯ãªã¹ã»ããã¥ãè«¸å³¶" + 15126+NLSRC_OFFSET "ãã³å³¶" + 19618+NLSRC_OFFSET "ãã±ããã¢èªãFYRO" + 21242+NLSRC_OFFSET "ãããã¦ã§ã¼å³¶" + 30967+NLSRC_OFFSET "ã·ã³ãã»ãã¼ã«ãã³å³¶" + 31706+NLSRC_OFFSET "ãµã³ãã«ã¿ã³å³¶" + (7299303+NLSRC_OFFSET)&0xffff "ãã£ã¢ã¼ã«ã»ã¬ã¹ã" + (10028789+NLSRC_OFFSET)&0xffff "ãªã¼ã©ã³ãè«¸å³¶" + (161832015+NLSRC_OFFSET)&0xffff "ãµã³ã»ãã«ãã«ãã¼" + (161832256+NLSRC_OFFSET)&0xffff "ãã®ä»ã®ç±³é è«¸å³¶" +END Propchange: trunk/reactos/dll/win32/kernel32/winnls/lang/ja-JP.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[gadamopoulos] 74438: [COMCTL32] -Rebar: Fix a region handle leak when themes are enabled.
by gadamopoulos＠svn.reactos.org 01 May '17

01 May '17

Author: gadamopoulos Date: Mon May 1 12:44:24 2017 New Revision: 74438 URL: http://svn.reactos.org/svn/reactos?rev=74438&view=rev Log: [COMCTL32] -Rebar: Fix a region handle leak when themes are enabled. Modified: trunk/reactos/dll/win32/comctl32/rebar.c Modified: trunk/reactos/dll/win32/comctl32/rebar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/rebar.c… ============================================================================== --- trunk/reactos/dll/win32/comctl32/rebar.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/rebar.c [iso-8859-1] Mon May 1 12:44:24 2017 @@ -1974,8 +1974,8 @@ HBRUSH hbrush = CreateSolidBrush(new); FillRgn(hdc, hrgn, hbrush); DeleteObject(hbrush); - DeleteObject(hrgn); - } + } + DeleteObject(hrgn); #endif return TRUE; }

1 0

[gadamopoulos] 74437: [EXPLORER] CTrayClockWnd: Fix a leak of font handles. CORE-13155
by gadamopoulos＠svn.reactos.org 01 May '17

01 May '17

Author: gadamopoulos Date: Mon May 1 09:35:03 2017 New Revision: 74437 URL: http://svn.reactos.org/svn/reactos?rev=74437&view=rev Log: [EXPLORER] CTrayClockWnd: Fix a leak of font handles. CORE-13155 Modified: trunk/reactos/base/shell/explorer/trayntfy.cpp Modified: trunk/reactos/base/shell/explorer/trayntfy.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/traynt… ============================================================================== --- trunk/reactos/base/shell/explorer/trayntfy.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/trayntfy.cpp [iso-8859-1] Mon May 1 09:35:03 2017 @@ -714,19 +714,18 @@ 0, TMT_TEXTCOLOR, &textColor); + + if (this->hFont != NULL) + DeleteObject(this->hFont); + + SetFont(hFont, FALSE); } else { - NONCLIENTMETRICS ncm = { 0 }; - ncm.cbSize = sizeof(ncm); - SystemParametersInfoW(SPI_GETNONCLIENTMETRICS, sizeof(ncm), &ncm, FALSE); - - hFont = CreateFontIndirectW(&ncm.lfMessageFont); - + /* We don't need to set a font here, our parent will use + * WM_SETFONT to set the right one when themes are not enabled. */ textColor = RGB(0, 0, 0); } - - SetFont(hFont, FALSE); CloseThemeData(clockTheme);

1 0

[tfaber] 74436: [NTOS:IO] - Fix some extremely broken casts
by tfaber＠svn.reactos.org 30 Apr '17

30 Apr '17

Author: tfaber Date: Sun Apr 30 19:24:53 2017 New Revision: 74436 URL: http://svn.reactos.org/svn/reactos?rev=74436&view=rev Log: [NTOS:IO] - Fix some extremely broken casts Modified: trunk/reactos/ntoskrnl/io/iomgr/error.c Modified: trunk/reactos/ntoskrnl/io/iomgr/error.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/error.c?… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/error.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/error.c [iso-8859-1] Sun Apr 30 19:24:53 2017 @@ -486,11 +486,7 @@ VOID NTAPI -IopFreeApc(IN PKAPC Apc, - IN PKNORMAL_ROUTINE *NormalRoutine, - IN PVOID *NormalContext, - IN PVOID *SystemArgument1, - IN PVOID *SystemArgument2) +IopFreeApc(IN PKAPC Apc) { /* Free the APC */ ExFreePool(Apc); @@ -498,15 +494,13 @@ VOID NTAPI -IopRaiseHardError(IN PKAPC Apc, - IN PKNORMAL_ROUTINE *NormalRoutine, - IN PVOID *NormalContext, - IN PVOID *SystemArgument1, - IN PVOID *SystemArgument2) -{ - PIRP Irp = (PIRP)NormalContext; - //PVPB Vpb = (PVPB)SystemArgument1; - //PDEVICE_OBJECT DeviceObject = (PDEVICE_OBJECT)SystemArgument2; +IopRaiseHardError(IN PVOID NormalContext, + IN PVOID SystemArgument1, + IN PVOID SystemArgument2) +{ + PIRP Irp = NormalContext; + //PVPB Vpb = SystemArgument1; + //PDEVICE_OBJECT DeviceObject = SystemArgument2; UNIMPLEMENTED; @@ -683,8 +677,8 @@ &Thread->Tcb, Irp->ApcEnvironment, NULL, - (PKRUNDOWN_ROUTINE)IopFreeApc, - (PKNORMAL_ROUTINE)IopRaiseHardError, + IopFreeApc, + IopRaiseHardError, KernelMode, Irp);

1 0

[tfaber] 74435: [WIN32K] - Check for null members when cleaning up DCs and brushes. Fixes crashes in some failure cases when running out of GDI handles. CORE-13155
by tfaber＠svn.reactos.org 30 Apr '17

30 Apr '17

Author: tfaber Date: Sun Apr 30 18:41:56 2017 New Revision: 74435 URL: http://svn.reactos.org/svn/reactos?rev=74435&view=rev Log: [WIN32K] - Check for null members when cleaning up DCs and brushes. Fixes crashes in some failure cases when running out of GDI handles. CORE-13155 Modified: trunk/reactos/win32ss/gdi/eng/engbrush.c trunk/reactos/win32ss/gdi/ntgdi/dclife.c Modified: trunk/reactos/win32ss/gdi/eng/engbrush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/engbrush.c… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/engbrush.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/engbrush.c [iso-8859-1] Sun Apr 30 18:41:56 2017 @@ -175,9 +175,18 @@ } /* Dereference the palettes */ - PALETTE_ShareUnlockPalette(pebo->ppalSurf); - PALETTE_ShareUnlockPalette(pebo->ppalDC); - if (pebo->ppalDIB) PALETTE_ShareUnlockPalette(pebo->ppalDIB); + if (pebo->ppalSurf) + { + PALETTE_ShareUnlockPalette(pebo->ppalSurf); + } + if (pebo->ppalDC) + { + PALETTE_ShareUnlockPalette(pebo->ppalDC); + } + if (pebo->ppalDIB) + { + PALETTE_ShareUnlockPalette(pebo->ppalDIB); + } } VOID Modified: trunk/reactos/win32ss/gdi/ntgdi/dclife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dclife.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dclife.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dclife.c [iso-8859-1] Sun Apr 30 18:41:56 2017 @@ -91,7 +91,6 @@ /* Insert the object */ if (!GDIOBJ_hInsertObject(&pdc->BaseObject, GDI_OBJ_HMGR_POWNED)) { - /// FIXME: this is broken, since the DC is not initialized yet... DPRINT1("Could not insert DC into handle table.\n"); GDIOBJ_vFreeObject(&pdc->BaseObject); return NULL; @@ -370,7 +369,8 @@ EBRUSHOBJ_vCleanup(&pdc->eboBackground); /* Release font */ - LFONT_ShareUnlockFont(pdc->dclevel.plfnt); + if (pdc->dclevel.plfnt) + LFONT_ShareUnlockFont(pdc->dclevel.plfnt); /* Free regions */ if (pdc->dclevel.prgnClip) @@ -394,10 +394,11 @@ pdc->dclevel.hPath = 0; pdc->dclevel.flPath = 0; } - if(pdc->dclevel.pSurface) + if (pdc->dclevel.pSurface) SURFACE_ShareUnlockSurface(pdc->dclevel.pSurface); - PDEVOBJ_vRelease(pdc->ppdev); + if (pdc->ppdev) + PDEVOBJ_vRelease(pdc->ppdev); } VOID

1 0

[ekohl] 74434: [INTL] - Get rid of alloca, malloc and free. - Always check the return values of HeapAlloc. - Rename fUserLocaleChanged to bUserLocaleChanged and fGeoIdChanged to bGeoIdChanged. - Us...
by ekohl＠svn.reactos.org 30 Apr '17

30 Apr '17

Author: ekohl Date: Sun Apr 30 15:39:41 2017 New Revision: 74434 URL: http://svn.reactos.org/svn/reactos?rev=74434&view=rev Log: [INTL] - Get rid of alloca, malloc and free. - Always check the return values of HeapAlloc. - Rename fUserLocaleChanged to bUserLocaleChanged and fGeoIdChanged to bGeoIdChanged. - Use WCHAR instead of TCHAR. - Fix indentation and coding style. - Remove setupreg.c because it is an unused copy of misc.c. Removed: trunk/reactos/dll/cpl/intl/setupreg.c Modified: trunk/reactos/dll/cpl/intl/advanced.c trunk/reactos/dll/cpl/intl/currency.c trunk/reactos/dll/cpl/intl/date.c trunk/reactos/dll/cpl/intl/generalp.c trunk/reactos/dll/cpl/intl/intl.c trunk/reactos/dll/cpl/intl/intl.h trunk/reactos/dll/cpl/intl/misc.c trunk/reactos/dll/cpl/intl/numbers.c trunk/reactos/dll/cpl/intl/sort.c trunk/reactos/dll/cpl/intl/time.c Modified: trunk/reactos/dll/cpl/intl/advanced.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/advanced.c?re… ============================================================================== --- trunk/reactos/dll/cpl/intl/advanced.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/advanced.c [iso-8859-1] Sun Apr 30 15:39:41 2017 @@ -188,15 +188,15 @@ if (bNoShow == FALSE) { - index = SendMessageW(hLangList, - CB_ADDSTRING, - 0, - (LPARAM)lang); - - SendMessageW(hLangList, - CB_SETITEMDATA, - index, - (LPARAM)lcid); + index = SendMessageW(hLangList, + CB_ADDSTRING, + 0, + (LPARAM)lang); + + SendMessageW(hLangList, + CB_SETITEMDATA, + index, + (LPARAM)lcid); } return TRUE; @@ -245,7 +245,10 @@ return; } } - else wsprintf(szDPI, L"%d", dwDPI); + else + { + wsprintf(szDPI, L"%d", dwDPI); + } RegCloseKey(hKey); } @@ -266,7 +269,6 @@ wsprintf(szSection, L"Font.CP%s.%s", szDefCP, szDPI); hFontInf = SetupOpenInfFileW(L"font.inf", NULL, INF_STYLE_WIN4, NULL); - if (hFontInf == INVALID_HANDLE_VALUE) return; @@ -277,12 +279,15 @@ } Count = (UINT) SetupGetLineCount(hFontInf, szSection); - if (Count <= 0) return; + if (Count <= 0) + return; if (!SetupInstallFromInfSectionW(hwnd, hFontInf, szSection, SPINST_REGISTRY & ~SPINST_FILES, NULL, NULL, 0, NULL, NULL, NULL, NULL)) + { MessageBoxW(hwnd, L"Unable to install a new language for programs don't support unicode!", NULL, MB_ICONERROR | MB_OK); + } SetupCloseInfFile(hFontInf); } @@ -421,10 +426,7 @@ break; case WM_NOTIFY: - { - LPNMHDR lpnm = (LPNMHDR)lParam; - - if (lpnm->code == (UINT)PSN_APPLY) + if (((LPNMHDR)lParam)->code == (UINT)PSN_APPLY) { PropSheet_UnChanged(GetParent(hwndDlg), hwndDlg); @@ -432,8 +434,7 @@ SaveFontSubstitutionSettings(hwndDlg, pGlobalData); SaveFontLinkingSettings(hwndDlg, pGlobalData); } - } - break; + break; } return FALSE; Modified: trunk/reactos/dll/cpl/intl/currency.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/currency.c?re… ============================================================================== --- trunk/reactos/dll/cpl/intl/currency.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/currency.c [iso-8859-1] Sun Apr 30 15:39:41 2017 @@ -439,7 +439,7 @@ if (!SetCurrencyFieldSep(hwndDlg, pGlobalData)) break; - pGlobalData->fUserLocaleChanged = TRUE; + pGlobalData->bUserLocaleChanged = TRUE; UpdateExamples(hwndDlg, pGlobalData); } Modified: trunk/reactos/dll/cpl/intl/date.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/date.c?rev=74… ============================================================================== --- trunk/reactos/dll/cpl/intl/date.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/date.c [iso-8859-1] Sun Apr 30 15:39:41 2017 @@ -55,9 +55,8 @@ UINT nDateCompCount=0; UINT nDateSepCount=0; - pszFoundSep = (LPWSTR)malloc(MAX_SAMPLES_STR_SIZE * sizeof(WCHAR)); - - if(!pszFoundSep) + pszFoundSep = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, MAX_SAMPLES_STR_SIZE * sizeof(WCHAR)); + if (pszFoundSep == NULL) return NULL; wcscpy(pszFoundSep,STD_DATE_SEP); @@ -171,15 +170,19 @@ } pszFoundSep = FindDateSep(szShortDateFmt); - - /* Substring replacement of separator */ - wcscpy(szFoundDateSep, pszFoundSep); - pszResultStr = ReplaceSubStr(szShortDateFmt, szShortDateSep, szFoundDateSep); - wcscpy(szShortDateFmt, pszResultStr); - free(pszResultStr); - - if (pszFoundSep) - free(pszFoundSep); + if (pszFoundSep != NULL) + { + /* Substring replacement of separator */ + wcscpy(szFoundDateSep, pszFoundSep); + pszResultStr = ReplaceSubStr(szShortDateFmt, szShortDateSep, szFoundDateSep); + if (pszResultStr != NULL) + { + wcscpy(szShortDateFmt, pszResultStr); + HeapFree(GetProcessHeap(), 0, pszResultStr); + } + + HeapFree(GetProcessHeap(), 0, pszFoundSep); + } /* Save short date format */ wcscpy(pGlobalData->szShortDateFormat, szShortDateFmt); @@ -393,19 +396,19 @@ hWndYearSpin = GetDlgItem(hwndDlg, IDC_SCR_MAX_YEAR); /* Get spin value */ - nSpinVal=LOWORD(SendMessageW(hWndYearSpin, - UDM_GETPOS, - 0, - 0)); + nSpinVal = LOWORD(SendMessageW(hWndYearSpin, + UDM_GETPOS, + 0, + 0)); /* convert to wide char */ _itow(nSpinVal, szMaxDateVal, DECIMAL_RADIX); /* Save max date value */ SetCalendarInfoW(lcid, - CAL_GREGORIAN, - 48 , /* CAL_ITWODIGITYEARMAX */ - (PCWSTR)szMaxDateVal); + CAL_GREGORIAN, + 48 , /* CAL_ITWODIGITYEARMAX */ + (PCWSTR)szMaxDateVal); } /* Get max date value from registry set */ @@ -457,13 +460,13 @@ /* Limit text lengths */ SendDlgItemMessageW(hwndDlg, IDC_FIRSTYEAR_EDIT, - EM_LIMITTEXT, - MAX_YEAR_EDIT, - 0); + EM_LIMITTEXT, + MAX_YEAR_EDIT, + 0); SendDlgItemMessageW(hwndDlg, IDC_SECONDYEAR_EDIT, - EM_LIMITTEXT, - MAX_YEAR_EDIT, - 0); + EM_LIMITTEXT, + MAX_YEAR_EDIT, + 0); hWndYearSpin = GetDlgItem(hwndDlg, IDC_SCR_MAX_YEAR); @@ -584,7 +587,7 @@ if (!SetShortDateSep(hwndDlg, pGlobalData)) break; - pGlobalData->fUserLocaleChanged = TRUE; + pGlobalData->bUserLocaleChanged = TRUE; SetMaxDate(hwndDlg, pGlobalData->UserLCID); InitShortDateCB(hwndDlg, pGlobalData); Modified: trunk/reactos/dll/cpl/intl/generalp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/generalp.c?re… ============================================================================== --- trunk/reactos/dll/cpl/intl/generalp.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/generalp.c [iso-8859-1] Sun Apr 30 15:39:41 2017 @@ -1429,7 +1429,7 @@ SetNewLocale(pGlobalData, NewLcid); UpdateLocaleSample(hwndDlg, pGlobalData); - pGlobalData->fUserLocaleChanged = TRUE; + pGlobalData->bUserLocaleChanged = TRUE; PropSheet_Changed(GetParent(hwndDlg), hwndDlg); } @@ -1456,7 +1456,7 @@ break; pGlobalData->geoid = NewGeoID; - pGlobalData->fGeoIdChanged = TRUE; + pGlobalData->bGeoIdChanged = TRUE; PropSheet_Changed(GetParent(hwndDlg), hwndDlg); } @@ -1466,7 +1466,7 @@ if (CustomizeLocalePropertySheet(GetParent(hwndDlg), pGlobalData) > 0) { UpdateLocaleSample(hwndDlg, pGlobalData); - pGlobalData->fUserLocaleChanged = TRUE; + pGlobalData->bUserLocaleChanged = TRUE; PropSheet_Changed(GetParent(hwndDlg), hwndDlg); } break; @@ -1474,30 +1474,26 @@ break; case WM_NOTIFY: + if (((LPNMHDR)lParam)->code == (UINT)PSN_APPLY) { - LPNMHDR lpnm = (LPNMHDR)lParam; - - if (lpnm->code == (UINT)PSN_APPLY) + /* Apply changes */ + PropSheet_UnChanged(GetParent(hwndDlg), hwndDlg); + + /* Set new locale */ + if (pGlobalData->bUserLocaleChanged == TRUE) { - /* Apply changes */ - PropSheet_UnChanged(GetParent(hwndDlg), hwndDlg); - - /* Set new locale */ - if (pGlobalData->fUserLocaleChanged == TRUE) - { - SaveCurrentLocale(pGlobalData); - pGlobalData->fUserLocaleChanged = FALSE; - } - - /* Set new GEO ID */ - if (pGlobalData->fGeoIdChanged == TRUE) - { - SaveGeoID(pGlobalData); - pGlobalData->fGeoIdChanged = FALSE; - } - - AddNewKbLayoutsByLcid(pGlobalData->UserLCID); + SaveCurrentLocale(pGlobalData); + pGlobalData->bUserLocaleChanged = FALSE; } + + /* Set new GEO ID */ + if (pGlobalData->bGeoIdChanged == TRUE) + { + SaveGeoID(pGlobalData); + pGlobalData->bGeoIdChanged = FALSE; + } + + AddNewKbLayoutsByLcid(pGlobalData->UserLCID); } break; } Modified: trunk/reactos/dll/cpl/intl/intl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/intl.c?rev=74… ============================================================================== --- trunk/reactos/dll/cpl/intl/intl.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/intl.c [iso-8859-1] Sun Apr 30 15:39:41 2017 @@ -51,16 +51,16 @@ VOID PrintErrorMsgBox(UINT msg) { - TCHAR szErrorText[BUFFERSIZE]; - TCHAR szErrorCaption[BUFFERSIZE]; - - LoadString(hApplet, msg, szErrorText, sizeof(szErrorText)/sizeof(TCHAR)); - LoadString(hApplet, IDS_ERROR, szErrorCaption, sizeof(szErrorCaption)/sizeof(TCHAR)); - - MessageBox(NULL, szErrorText, szErrorCaption, MB_OK | MB_ICONERROR); -} - -VOID + WCHAR szErrorText[BUFFERSIZE]; + WCHAR szErrorCaption[BUFFERSIZE]; + + LoadStringW(hApplet, msg, szErrorText, sizeof(szErrorText) / sizeof(WCHAR)); + LoadStringW(hApplet, IDS_ERROR, szErrorCaption, sizeof(szErrorCaption) / sizeof(WCHAR)); + + MessageBoxW(NULL, szErrorText, szErrorCaption, MB_OK | MB_ICONERROR); +} + +INT ResourceMessageBox( HWND hwnd, UINT uType, @@ -73,7 +73,7 @@ LoadStringW(hApplet, uMessageId, szErrorText, sizeof(szErrorText) / sizeof(WCHAR)); LoadStringW(hApplet, uCaptionId, szErrorCaption, sizeof(szErrorCaption) / sizeof(WCHAR)); - MessageBoxW(hwnd, szErrorText, szErrorCaption, uType); + return MessageBoxW(hwnd, szErrorText, szErrorCaption, uType); } static VOID Modified: trunk/reactos/dll/cpl/intl/intl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/intl.h?rev=74… ============================================================================== --- trunk/reactos/dll/cpl/intl/intl.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/intl.h [iso-8859-1] Sun Apr 30 15:39:41 2017 @@ -12,7 +12,6 @@ #include <winuser.h> #include <cpl.h> #include <setupapi.h> -#include <malloc.h> #include <ndk/exfuncs.h> #include "resource.h" @@ -110,11 +109,11 @@ LCID UserLCID; LCID SystemLCID; - BOOL fUserLocaleChanged; + BOOL bUserLocaleChanged; BOOL bApplyToDefaultUser; GEOID geoid; - BOOL fGeoIdChanged; + BOOL bGeoIdChanged; /* Misc */ BOOL bIsUserAdmin; @@ -134,7 +133,7 @@ /* intl.c */ VOID PrintErrorMsgBox(UINT msg); -VOID +INT ResourceMessageBox( HWND hwnd, UINT uType, Modified: trunk/reactos/dll/cpl/intl/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/misc.c?rev=74… ============================================================================== --- trunk/reactos/dll/cpl/intl/misc.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/misc.c [iso-8859-1] Sun Apr 30 15:39:41 2017 @@ -9,7 +9,9 @@ INT nStrCnt; INT nStrSize; - pszDestStr = (PWSTR)malloc(MAX_SAMPLES_STR_SIZE * sizeof(WCHAR)); + pszDestStr = (PWSTR)HeapAlloc(GetProcessHeap(), 0, MAX_SAMPLES_STR_SIZE * sizeof(WCHAR)); + if (pszDestStr == NULL) + return NULL; wcscpy(pszDestStr, szInsStr); @@ -45,7 +47,9 @@ INT nSpaceOffset = 0; BOOL wasNul=FALSE; - pszDestStr = (PWSTR)malloc(255 * sizeof(WCHAR)); + pszDestStr = (PWSTR)HeapAlloc(GetProcessHeap(), 0, 255 * sizeof(WCHAR)); + if (pszDestStr == NULL) + return NULL; wcscpy(pszDestStr, szSourceStr); @@ -80,7 +84,7 @@ /* Insert space to finded position plus all pos before */ pszTempStr = InsSpacePos(pszDestStr, nSpaceOffset); wcscpy(pszDestStr,pszTempStr); - free(pszTempStr); + HeapFree(GetProcessHeap(), 0, pszTempStr); /* Num of spaces total increment */ if (!wasNul) @@ -102,7 +106,7 @@ { pszTempStr = InsSpacePos(pszDestStr, nFmtCount); wcscpy(pszDestStr, pszTempStr); - free(pszTempStr); + HeapFree(GetProcessHeap(), 0, pszTempStr); } } @@ -121,7 +125,9 @@ UINT nDestStrCnt; UINT nFirstCharCnt; - szDestStr = (PWSTR)malloc(MAX_SAMPLES_STR_SIZE * sizeof(WCHAR)); + szDestStr = (PWSTR)HeapAlloc(GetProcessHeap(), 0, MAX_SAMPLES_STR_SIZE * sizeof(WCHAR)); + if (szDestStr == NULL) + return NULL; nDestStrCnt = 0; nFirstCharCnt = 0; Modified: trunk/reactos/dll/cpl/intl/numbers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/numbers.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/intl/numbers.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/numbers.c [iso-8859-1] Sun Apr 30 15:39:41 2017 @@ -198,11 +198,14 @@ for (nCBIndex = 0; nCBIndex < MAX_FIELD_DIG_SAMPLES; nCBIndex++) { pszFieldDigNumSmpl = InsSpacesFmt(SAMPLE_NUMBER, lpFieldDigNumSamples[nCBIndex]); - SendDlgItemMessageW(hwndDlg, IDC_NUMBERSDGROUPING, - CB_ADDSTRING, - 0, - (LPARAM)pszFieldDigNumSmpl); - free(pszFieldDigNumSmpl); + if (pszFieldDigNumSmpl != NULL) + { + SendDlgItemMessageW(hwndDlg, IDC_NUMBERSDGROUPING, + CB_ADDSTRING, + 0, + (LPARAM)pszFieldDigNumSmpl); + HeapFree(GetProcessHeap(), 0, pszFieldDigNumSmpl); + } } SendDlgItemMessageW(hwndDlg, IDC_NUMBERSDGROUPING, @@ -280,18 +283,24 @@ pszResultStr = ReplaceSubStr(lpNegNumFmtSamples[nCBIndex], pGlobalData->szNumDecimalSep, L","); - wcscpy(szNewSample, pszResultStr); - free(pszResultStr); + if (pszResultStr != NULL) + { + wcscpy(szNewSample, pszResultStr); + HeapFree(GetProcessHeap(), 0, pszResultStr); + } /* Replace standard negative sign to setted */ pszResultStr = ReplaceSubStr(szNewSample, pGlobalData->szNumNegativeSign, L"-"); - SendDlgItemMessageW(hwndDlg, IDC_NUMBERSNNUMFORMAT, - CB_ADDSTRING, - 0, - (LPARAM)pszResultStr); - free(pszResultStr); + if (pszResultStr != NULL) + { + SendDlgItemMessageW(hwndDlg, IDC_NUMBERSNNUMFORMAT, + CB_ADDSTRING, + 0, + (LPARAM)pszResultStr); + HeapFree(GetProcessHeap(), 0, pszResultStr); + } } /* Set current item to value from registry */ @@ -320,11 +329,14 @@ pszResultStr = ReplaceSubStr(lpLeadNumFmtSamples[nCBIndex], pGlobalData->szNumDecimalSep, L","); - SendDlgItemMessage(hwndDlg, IDC_NUMBERSDISPLEADZER, - CB_ADDSTRING, - 0, - (LPARAM)pszResultStr); - free(pszResultStr); + if (pszResultStr != NULL) + { + SendDlgItemMessage(hwndDlg, IDC_NUMBERSDISPLEADZER, + CB_ADDSTRING, + 0, + (LPARAM)pszResultStr); + HeapFree(GetProcessHeap(), 0, pszResultStr); + } } /* Set current item to value from registry */ @@ -692,7 +704,7 @@ if (!SetNumUnitsSys(hwndDlg, pGlobalData)) break; - pGlobalData->fUserLocaleChanged = TRUE; + pGlobalData->bUserLocaleChanged = TRUE; UpdateNumSamples(hwndDlg, pGlobalData); } Removed: trunk/reactos/dll/cpl/intl/setupreg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/setupreg.c?re… ============================================================================== --- trunk/reactos/dll/cpl/intl/setupreg.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/setupreg.c (removed) @@ -1,231 +0,0 @@ -/* - * PROJECT: ReactOS International Control Panel - * LICENSE: GPL - See COPYING in the top level directory - * FILE: dll/cpl/intl/setupreg.c - * PURPOSE: ReactOS International Control Panel - * PROGRAMMERS: Alexey Zavyalov (gen_x(a)mail.ru) -*/ - -/* INCLUDES *****************************************************************/ - -#include "intl.h" - -/* GLOBALS ******************************************************************/ - -#define NUM_SHEETS 4 - -/* FUNCTIONS ****************************************************************/ - -/* Insert the space */ -TCHAR* -InsSpacePos(const TCHAR *szInsStr, const int nPos) -{ - LPTSTR pszDestStr; - int nDestStrCnt=0; - int nStrCnt; - int nStrSize; - - pszDestStr = (LPTSTR)malloc(MAX_SAMPLES_STR_SIZE * sizeof(TCHAR)); - - _tcscpy(pszDestStr, szInsStr); - - nStrSize = _tcslen(szInsStr); - - for (nStrCnt = 0; nStrCnt < nStrSize; nStrCnt++) - { - if (nStrCnt == nStrSize - nPos) - { - pszDestStr[nDestStrCnt] = _T(' '); - nDestStrCnt++; - } - - pszDestStr[nDestStrCnt] = szInsStr[nStrCnt]; - nDestStrCnt++; - } - - pszDestStr[nDestStrCnt] = _T('\0'); - - return pszDestStr; -} - -/* Insert the spaces by format string separated by ';' */ -LPTSTR -InsSpacesFmt(const TCHAR *szSourceStr, const TCHAR *szFmtStr) -{ - LPTSTR pszDestStr; - LPTSTR pszTempStr; - TCHAR szFmtVal[255]; - int nFmtCount=0; - int nValCount=0; - int nLastVal=0; - int nSpaceOffset=0; - BOOL wasNul=FALSE; - - pszDestStr = (LPTSTR) malloc(255 * sizeof(TCHAR)); - - _tcscpy(pszDestStr, szSourceStr); - - /* If format is clean return source string */ - if (!*szFmtStr) - return pszDestStr; - - /* Search for all format values */ - for (nFmtCount = 0; nFmtCount <= (int)_tcslen(szFmtStr); nFmtCount++) - { - if (szFmtStr[nFmtCount] == _T(';') || szFmtStr[nFmtCount] == _T('\0')) - { - if (_ttoi(szFmtVal) == 0 && !wasNul) - { - wasNul = TRUE; - break; - } - - /* If was 0, repeat spaces */ - if (wasNul) - { - nSpaceOffset += nLastVal; - } - else - { - nSpaceOffset += _ttoi(szFmtVal); - } - - szFmtVal[nValCount] = _T('\0'); - nValCount=0; - - /* Insert space to finded position plus all pos before */ - pszTempStr = InsSpacePos(pszDestStr, nSpaceOffset); - _tcscpy(pszDestStr, pszTempStr); - free(pszTempStr); - - /* Num of spaces total increment */ - if (!wasNul) - { - nSpaceOffset++; - nLastVal = _ttoi(szFmtVal); - } - } - else - { - szFmtVal[nValCount++] = szFmtStr[nFmtCount]; - } - } - - /* Create spaces for rest part of string */ - if (wasNul && nLastVal!=0) - { - for (nFmtCount = nSpaceOffset + nLastVal; nFmtCount < _tcslen(pszDestStr); nFmtCount += nLastVal + 1) - { - pszTempStr = InsSpacePos(pszDestStr, nFmtCount); - _tcscpy(pszDestStr,pszTempStr); - free(pszTempStr); - } - } - - return pszDestStr; -} - -/* Replace given template in source string with string to replace and return received string */ -TCHAR* -ReplaceSubStr(const TCHAR *szSourceStr, - const TCHAR *szStrToReplace, - const TCHAR *szTempl) -{ - int nCharCnt; - int nSubStrCnt; - int nDestStrCnt; - int nFirstCharCnt; - LPTSTR szDestStr; - - szDestStr = (LPTSTR)malloc(MAX_SAMPLES_STR_SIZE * sizeof(TCHAR)); - nDestStrCnt = 0; - nFirstCharCnt = 0; - - _tcscpy(szDestStr, _T(L"")); - - while (nFirstCharCnt < (int)_tcslen(szSourceStr)) - { - if (szSourceStr[nFirstCharCnt] == szTempl[0]) - { - nSubStrCnt=0; - for (nCharCnt = nFirstCharCnt; nCharCnt < nFirstCharCnt + (int)_tcslen(szTempl); nCharCnt++) - { - if (szSourceStr[nCharCnt] == szTempl[nSubStrCnt]) - { - nSubStrCnt++; - } - else - { - break; - } - - if ((int)_tcslen(szTempl) == nSubStrCnt) - { - _tcscat(szDestStr, szStrToReplace); - nDestStrCnt = (int)_tcslen(szDestStr); - nFirstCharCnt += (int)_tcslen(szTempl) - 1; - break; - } - } - } - else - { - szDestStr[nDestStrCnt++] = wszSourceStr[nFirstCharCnt]; - szDestStr[nDestStrCnt] = _T('\0'); - } - - nFirstCharCnt++; - } - - return szDestStr; -} - -static -VOID -InitPropSheetPage(PROPSHEETPAGE *PsPage, WORD IdDlg, DLGPROC DlgProc) -{ - ZeroMemory(PsPage, sizeof(PROPSHEETPAGE)); - PsPage->dwSize = sizeof(PROPSHEETPAGE); - PsPage->dwFlags = PSP_DEFAULT; - PsPage->hInstance = hApplet; - PsPage->pszTemplate = MAKEINTRESOURCE(IdDlg); - PsPage->pfnDlgProc = DlgProc; -} - -/* Create applets */ -LONG -APIENTRY -SetupApplet(HWND hwnd, UINT uMsg, LONG wParam, LONG lParam) -{ - - PROPSHEETPAGE PsPage[NUM_SHEETS]; - PROPSHEETHEADER psh; - TCHAR Caption[MAX_STR_SIZE]; - - UNREFERENCED_PARAMETER(lParam); - UNREFERENCED_PARAMETER(wParam); - UNREFERENCED_PARAMETER(uMsg); - UNREFERENCED_PARAMETER(hwnd); - - LoadString(hApplet, IDS_CPLNAME, Caption, sizeof(Caption) / sizeof(TCHAR)); - - ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); - psh.dwSize = sizeof(PROPSHEETHEADER); - psh.dwFlags = PSH_PROPSHEETPAGE | PSH_USECALLBACK | PSH_PROPTITLE; - psh.hwndParent = NULL; - psh.hInstance = hApplet; - psh.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDC_CPLICON)); - psh.pszCaption = Caption; - psh.nPages = sizeof(PsPage) / sizeof(PROPSHEETPAGE); - psh.nStartPage = 0; - psh.ppsp = PsPage; - - InitPropSheetPage(&PsPage[0], IDD_NUMSOPTSSETUP, NumsOptsSetProc); - InitPropSheetPage(&PsPage[1], IDD_CURRENCYOPTSSETUP, CurrencyOptsSetProc); - InitPropSheetPage(&PsPage[2], IDD_TIMEOPTSSETUP, TimeOptsSetProc); - InitPropSheetPage(&PsPage[3], IDD_DATEOPTSSETUP, DateOptsSetProc); - - return (LONG)(PropertySheet(&psh) != -1); -} - -/* EOF */ Modified: trunk/reactos/dll/cpl/intl/sort.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/sort.c?rev=74… ============================================================================== --- trunk/reactos/dll/cpl/intl/sort.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/sort.c [iso-8859-1] Sun Apr 30 15:39:41 2017 @@ -198,7 +198,7 @@ /* Save the new LCID */ pGlobalData->UserLCID = NewLcid; - pGlobalData->fUserLocaleChanged = TRUE; + pGlobalData->bUserLocaleChanged = TRUE; } break; } Modified: trunk/reactos/dll/cpl/intl/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/time.c?rev=74… ============================================================================== --- trunk/reactos/dll/cpl/intl/time.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/time.c [iso-8859-1] Sun Apr 30 15:39:41 2017 @@ -53,30 +53,40 @@ static VOID GetSelectedComboEntry(HWND hwndDlg, DWORD dwIdc, WCHAR *Buffer, UINT uSize) { - int nIndex; HWND hChildWnd; + PWSTR tmp; + INT nIndex; + UINT uReqSize; /* Get handle to time format control */ hChildWnd = GetDlgItem(hwndDlg, dwIdc); + /* Get index to selected time format */ nIndex = SendMessageW(hChildWnd, CB_GETCURSEL, 0, 0); if (nIndex == CB_ERR) + { /* No selection? Get content of the edit control */ SendMessageW(hChildWnd, WM_GETTEXT, uSize, (LPARAM)Buffer); - else { - PWSTR tmp; - UINT uReqSize; - + } + else + { /* Get requested size, including the null terminator; * it shouldn't be required because the previous CB_LIMITTEXT, * but it would be better to check it anyways */ uReqSize = SendMessageW(hChildWnd, CB_GETLBTEXTLEN, (WPARAM)nIndex, 0) + 1; + /* Allocate enough space to be more safe */ - tmp = (PWSTR)_alloca(uReqSize*sizeof(WCHAR)); - /* Get selected time format text */ - SendMessageW(hChildWnd, CB_GETLBTEXT, (WPARAM)nIndex, (LPARAM)tmp); - /* Finally, copy the result into the output */ - wcsncpy(Buffer, tmp, uSize); + tmp = (PWSTR)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, uReqSize * sizeof(WCHAR)); + if (tmp != NULL) + { + /* Get selected time format text */ + SendMessageW(hChildWnd, CB_GETLBTEXT, (WPARAM)nIndex, (LPARAM)tmp); + + /* Finally, copy the result into the output */ + wcsncpy(Buffer, tmp, uSize); + + HeapFree(GetProcessHeap(), 0, tmp); + } } } @@ -239,7 +249,7 @@ { /* Get selected/typed time format text */ GetSelectedComboEntry(hwndDlg, IDC_TIMEFORMAT, - pGlobalData->szTimeFormat, + pGlobalData->szTimeFormat, MAX_TIMEFORMAT); /* Get selected/typed time separator text */ @@ -257,7 +267,7 @@ pGlobalData->szTimePM, MAX_TIMEPMSYMBOL); - pGlobalData->fUserLocaleChanged = TRUE; + pGlobalData->bUserLocaleChanged = TRUE; /* Update the time format sample */ UpdateTimeSample(hwndDlg, pGlobalData);

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