Ros-diffs October 2016

ros-diffs@reactos.org

20 participants
222 discussions

[akhaldi] 72872: [MSTSC] Japanese translation improvements by Katayama Hirofumi MZ. CORE-12067

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Oct 1 08:38:01 2016 New Revision: 72872 URL: http://svn.reactos.org/svn/reactos?rev=72872&view=rev Log: [MSTSC] Japanese translation improvements by Katayama Hirofumi MZ. CORE-12067 Modified: trunk/reactos/base/applications/mstsc/lang/ja-JP.rc Modified: trunk/reactos/base/applications/mstsc/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/lang/ja-JP.rc [iso-8859-1] Sat Oct 1 08:38:01 2016 @@ -7,16 +7,16 @@ GROUPBOX "ãã°ãªã³è¨å®", IDC_STATIC, 7, 7, 228, 89 GROUPBOX "æ¥ç¶è¨å®", IDC_STATIC, 7, 103, 228, 65 ICON "", IDC_LOGONICON, 15, 19, 20, 20 - LTEXT "ãµã¼ãã®ã¢ãã¬ã¹ãå¥åãã¦ãã ãã", IDC_STATIC, 47, 24, 81, 8 - LTEXT "ãµã¼ã:", IDC_STATIC, 47, 41, 25, 8 - LTEXT "ã¦ã¼ã¶ã¼å:", IDC_STATIC, 47, 58, 38, 8 + LTEXT "ãµã¼ãã®ã¢ãã¬ã¹ãå¥åãã¦ä¸ããã", IDC_STATIC, 47, 23, 107, 12 + LTEXT "ãµã¼ã:", IDC_STATIC, 47, 41, 25, 12 + LTEXT "ã¦ã¼ã¶ã¼å:", IDC_STATIC, 47, 58, 38, 12 COMBOBOX IDC_SERVERCOMBO, 79, 39, 141, 13, CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP EDITTEXT IDC_NAMEEDIT, 79, 55, 141, 14, WS_TABSTOP | ES_AUTOHSCROLL - PUSHBUTTON "ä¿å", IDC_SAVE, 67, 139, 50, 14 - PUSHBUTTON "ååãä»ãã¦ä¿å...", IDC_SAVEAS, 123, 139, 50, 14 - PUSHBUTTON "éã...", IDC_OPEN, 177, 139, 50, 14 + PUSHBUTTON "ä¿å", IDC_SAVE, 60, 139, 35, 14 + PUSHBUTTON "ååãä»ãã¦ä¿å...", IDC_SAVEAS, 100, 139, 75, 14 + PUSHBUTTON "éã...", IDC_OPEN, 180, 139, 45, 14 ICON "", IDC_CONNICON, 16, 114, 20, 20 - LTEXT "ç¾å¨ã®æ¥ç¶è¨å®ãä¿åããããã¾ãã¯ä¿åãããæ¥ç¶ãéãã¦ãã ãã", IDC_STATIC, 50, 115, 172, 20 + LTEXT "ç¾å¨ã®æ¥ç¶è¨å®ãä¿åããããã¾ãã¯ä¿åãããæ¥ç¶ãéãã¦ä¸ããã", IDC_STATIC, 50, 115, 172, 20 END IDD_DISPLAY DIALOGEX 0, 0, 242, 175 @@ -27,14 +27,14 @@ GROUPBOX "è²", IDC_STATIC, 7, 83, 228, 85 ICON "", IDC_REMICON, 15, 19, 20, 20 ICON "", IDC_COLORSICON, 15, 98, 20, 20 - LTEXT "ãªã¢ã¼ã ãã¹ã¯ãããã®ç»é¢ãµã¤ãºãè¨å®ãã¦ãã ãããã¹ã©ã¤ãã®ã¤ã¾ã¿ãå³ç«¯ã«åããã¨ãå¨ç»é¢è¡¨ç¤ºã«ãªãã¾ã", IDC_STATIC, 53, 22, 175, 21 + LTEXT "ãªã¢ã¼ã ãã¹ã¯ãããã®ç»é¢ãµã¤ãºãè¨å®ãã¦ä¸ãããã¹ã©ã¤ãã®ã¤ã¾ã¿ãå³ç«¯ã«åããã¨ãå¨ç»é¢è¡¨ç¤ºã«ãªãã¾ãã", IDC_STATIC, 53, 22, 175, 21 CONTROL "", IDC_GEOSLIDER, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 56, 42, 124, 17 COMBOBOX IDC_BPPCOMBO, 56, 102, 128, 80, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP CONTROL "", IDC_COLORIMAGE, "Static", SS_OWNERDRAW | SS_SUNKEN, 56, 121, 127, 10 LTEXT "æ³¨æ: ãã®è¨å®ã¯ãªã¢ã¼ã ã³ã³ãã¥ã¼ã¿ã®è¨å®ã§ä¸æ¸ããããå¯è½æ§ãããã¾ãã", IDC_STATIC, 56, 143, 165, 18 - LTEXT "å°", IDC_STATIC, 35, 42, 15, 8 - LTEXT "å¤§", IDC_STATIC, 189, 42, 17, 8 - LTEXT "", IDC_SETTINGS_RESOLUTION_TEXT, 56, 62, 120, 10, SS_CENTER + LTEXT "å°", IDC_STATIC, 42, 44, 15, 12, SS_RIGHT + LTEXT "å¤§", IDC_STATIC, 182, 44, 17, 12 + LTEXT "", IDC_SETTINGS_RESOLUTION_TEXT, 56, 62, 120, 12, SS_CENTER END IDD_CONNECTDIALOG DIALOGEX 0, 0, 260, 262 @@ -55,7 +55,7 @@ IDS_HIGHCOLOR15 "32,768 è² (15 ããã)" IDS_HIGHCOLOR16 "65,536 è² (16 ããã)" IDS_HIGHCOLOR24 "16,777,216 è² (24 ããã)" - IDS_HIGHCOLOR32 "Highest Quality (32 bit)" + IDS_HIGHCOLOR32 "æé«ã®åè³ª (32 ããã)" IDS_PIXEL "%lu x %lu ãã¯ã»ã«" IDS_FULLSCREEN "å¨ç»é¢è¡¨ç¤º" IDS_BROWSESERVER "<åç§...>"

8 years, 2 months

[tfaber] 72871: [WIN32K:NTGDI] - Handle arbitrary-length DEVMODEW structures in NtGdiOpenDCW. Patch by Katayama Hirofumi MZ with small changes by me. CORE-12068 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat Oct 1 08:25:35 2016 New Revision: 72871 URL: http://svn.reactos.org/svn/reactos?rev=72871&view=rev Log: [WIN32K:NTGDI] - Handle arbitrary-length DEVMODEW structures in NtGdiOpenDCW. Patch by Katayama Hirofumi MZ with small changes by me. CORE-12068 #resolve Modified: trunk/reactos/win32ss/gdi/ntgdi/dclife.c 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] Sat Oct 1 08:25:35 2016 @@ -692,9 +692,11 @@ { UNICODE_STRING ustrDevice; WCHAR awcDevice[CCHDEVICENAME]; - DEVMODEW dmInit; PVOID dhpdev; HDC hdc; + WORD dmSize, dmDriverExtra; + DWORD Size; + DEVMODEW * _SEH2_VOLATILE pdmAllocated = NULL; /* Only if a devicename is given, we need any data */ if (pustrDevice) @@ -711,13 +713,22 @@ /* Copy the string */ RtlCopyUnicodeString(&ustrDevice, pustrDevice); + /* Allocate and store pdmAllocated if pdmInit is not NULL */ if (pdmInit) { - /* FIXME: could be larger */ - /* According to a comment in Windows SDK the size of the buffer for - pdm is (pdm->dmSize + pdm->dmDriverExtra) */ ProbeForRead(pdmInit, sizeof(DEVMODEW), 1); - RtlCopyMemory(&dmInit, pdmInit, sizeof(DEVMODEW)); + + dmSize = pdmInit->dmSize; + dmDriverExtra = pdmInit->dmDriverExtra; + Size = dmSize + dmDriverExtra; + ProbeForRead(pdmInit, Size, 1); + + pdmAllocated = ExAllocatePoolWithTag(PagedPool | POOL_RAISE_IF_ALLOCATION_FAILURE, + Size, + TAG_DC); + RtlCopyMemory(pdmAllocated, pdmInit, Size); + pdmAllocated->dmSize = dmSize; + pdmAllocated->dmDriverExtra = dmDriverExtra; } if (pUMdhpdev) @@ -727,6 +738,10 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { + if (pdmAllocated) + { + ExFreePoolWithTag(pdmAllocated, TAG_DC); + } SetLastNtError(_SEH2_GetExceptionCode()); _SEH2_YIELD(return NULL); } @@ -750,7 +765,7 @@ /* Call the internal function */ hdc = GreOpenDCW(pustrDevice ? &ustrDevice : NULL, - pdmInit ? &dmInit : NULL, + pdmAllocated, NULL, // FIXME: pwszLogAddress iType, bDisplay, @@ -773,6 +788,12 @@ (void)0; } _SEH2_END + } + + /* Free the allocated */ + if (pdmAllocated) + { + ExFreePoolWithTag(pdmAllocated, TAG_DC); } return hdc;

8 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2016