Ros-diffs

ros-diffs@reactos.org

81390 discussions

[aandrejevic] 72452: [TRANSLATIONS] Japanese translations for the following libraries: browseui, credui, ieframe, iernonce, msports, msvfw32, mycomput, oleacc, samsrv, serialui, shimgvw, and wldap3...
by aandrejevic＠svn.reactos.org 25 Aug '16

25 Aug '16

Author: aandrejevic Date: Thu Aug 25 03:44:29 2016 New Revision: 72452 URL: http://svn.reactos.org/svn/reactos?rev=72452&view=rev Log: [TRANSLATIONS] Japanese translations for the following libraries: browseui, credui, ieframe, iernonce, msports, msvfw32, mycomput, oleacc, samsrv, serialui, shimgvw, and wldap32. Patch by Katayama Hirofumi MZ. Thanks! CORE-11884 #resolve #comment Committed in revision r72452. Added: trunk/reactos/dll/win32/browseui/lang/ja-JP.rc (with props) trunk/reactos/dll/win32/credui/lang/credui_Ja.rc (with props) trunk/reactos/dll/win32/ieframe/lang/ja-JP.rc (with props) trunk/reactos/dll/win32/iernonce/lang/ja-JP.rc (with props) trunk/reactos/dll/win32/msports/lang/ja-JP.rc (with props) trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Ja.rc (with props) trunk/reactos/dll/win32/mycomput/lang/ja-JP.rc (with props) trunk/reactos/dll/win32/oleacc/lang/oleacc_Ja.rc (with props) trunk/reactos/dll/win32/samsrv/lang/ja-JP.rc (with props) trunk/reactos/dll/win32/serialui/lang/ja-JP.rc (with props) trunk/reactos/dll/win32/shimgvw/lang/ja-JP.rc (with props) trunk/reactos/dll/win32/wldap32/lang/wldap32_Ja.rc (with props) Modified: trunk/reactos/dll/win32/browseui/browseui.rc trunk/reactos/dll/win32/credui/credui.rc trunk/reactos/dll/win32/ieframe/ieframe.rc trunk/reactos/dll/win32/iernonce/iernonce.rc trunk/reactos/dll/win32/msports/msports.rc trunk/reactos/dll/win32/msvfw32/rsrc.rc trunk/reactos/dll/win32/mycomput/mycomput.rc trunk/reactos/dll/win32/oleacc/oleacc.rc trunk/reactos/dll/win32/samsrv/samsrv.rc trunk/reactos/dll/win32/serialui/serialui.rc trunk/reactos/dll/win32/shimgvw/shimgvw.rc trunk/reactos/dll/win32/wldap32/wldap32.rc Modified: trunk/reactos/dll/win32/browseui/browseui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/browseu… ============================================================================== --- trunk/reactos/dll/win32/browseui/browseui.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/browseui.rc [iso-8859-1] Thu Aug 25 03:44:29 2016 @@ -77,6 +77,9 @@ #ifdef LANGUAGE_IT_IT #include "lang/it-IT.rc" #endif +#ifdef LANGUAGE_JA_JP + #include "lang/ja-JP.rc" +#endif #ifdef LANGUAGE_PL_PL #include "lang/pl-PL.rc" #endif Added: trunk/reactos/dll/win32/browseui/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/ja… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/ja-JP.rc (added) +++ trunk/reactos/dll/win32/browseui/lang/ja-JP.rc [iso-8859-1] Thu Aug 25 03:44:29 2016 @@ -0,0 +1,300 @@ +/* + * Copyright 2016 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +/* Menus */ + +IDM_CABINET_CONTEXTMENU MENUEX +BEGIN + POPUP "", 264,MFT_STRING,MFS_ENABLED + BEGIN + MENUITEM "æ¨æºã®ãã¿ã³(&S)", IDM_TOOLBARS_STANDARDBUTTONS, MFT_STRING, MFS_ENABLED + MENUITEM "ã¢ãã¬ã¹ ãã¼(&A)", IDM_TOOLBARS_ADDRESSBAR, MFT_STRING, MFS_ENABLED + MENUITEM "ãªã³ã¯(&L)", IDM_TOOLBARS_LINKSBAR, MFT_STRING, MFS_ENABLED + MENUITEM "", -1, MFT_SEPARATOR + MENUITEM "ãã¼ã«ãã¼ãåºå®ãã(&B)", IDM_TOOLBARS_LOCKTOOLBARS, MFT_STRING, MFS_ENABLED + MENUITEM "ã«ã¹ã¿ãã¤ãº(&C)...", IDM_TOOLBARS_CUSTOMIZE, MFT_STRING, MFS_ENABLED + MENUITEM "ããã¹ã ã©ãã«(&T)", IDM_TOOLBARS_TEXTLABELS, MFT_STRING, MFS_ENABLED + MENUITEM "ç§»åãã¿ã³(&G)", IDM_TOOLBARS_GOBUTTON, MFT_STRING, MFS_ENABLED + END +END + +IDM_CABINET_MAINMENU MENUEX +BEGIN + POPUP "ãã¡ã¤ã«(&F)", FCIDM_MENU_FILE + BEGIN + MENUITEM "", -1, MFT_SEPARATOR + MENUITEM "éãã(&C)", IDM_FILE_CLOSE + END + POPUP "ç·¨é(&E)", FCIDM_MENU_EDIT + BEGIN + MENUITEM "", -1, MFT_SEPARATOR + END + POPUP "è¡¨ç¤º(&V)", FCIDM_MENU_VIEW + BEGIN + POPUP "ãã¼ã«ãã¼(&T)", IDM_VIEW_TOOLBARS + BEGIN + MENUITEM "", -1, MFT_SEPARATOR + END + MENUITEM "ã¹ãã¼ã¿ã¹ ãã¼(&B)", IDM_VIEW_STATUSBAR + POPUP "ã¨ã¯ã¹ããã¼ã©ã¼ ãã¼(&E)", IDM_VIEW_EXPLORERBAR + BEGIN + MENUITEM "æ¤ç´¢(&S)\tCtrl+E", IDM_EXPLORERBAR_SEARCH + MENUITEM "ãæ°ã«å¥ã(&F)\tCtrl+I", IDM_EXPLORERBAR_FAVORITES + MENUITEM "ã¡ãã£ã¢(&M)", IDM_EXPLORERBAR_MEDIA + MENUITEM "å±¥æ´(&H)\tCtrl+H", IDM_EXPLORERBAR_HISTORY + MENUITEM "ãã©ã«ãã¼(&O)", IDM_EXPLORERBAR_FOLDERS + MENUITEM "", IDM_EXPLORERBAR_SEPARATOR + END + MENUITEM "", FCIDM_MENU_VIEW_SEP_OPTIONS, MFT_SEPARATOR + POPUP "ç§»å(&O)", FCIDM_MENU_EXPLORE + BEGIN + MENUITEM "æ»ã(&B)\tAlt+Left Arrow", IDM_GOTO_BACK + MENUITEM "æ¬¡ã¸(&F)\tAlt+Right Arrow", IDM_GOTO_FORWARD + MENUITEM "ä¸ã¤ä¸ã®ã¬ãã«ã¸(&U)", IDM_GOTO_UPONELEVEL + MENUITEM "", -1, MFT_SEPARATOR + MENUITEM "ãã¼ã ãã¼ã¸(&H)\tAlt+Home", IDM_GOTO_HOMEPAGE + END + MENUITEM "ææ°ã®æå ±ã«æ´æ°(&R)", IDM_VIEW_REFRESH + END + POPUP "ãæ°ã«å¥ã(&A)", FCIDM_MENU_FAVORITES + BEGIN + MENUITEM "ãæ°ã«å¥ãã«è¿½å (&A)...", IDM_FAVORITES_ADDTOFAVORITES + MENUITEM "ãæ°ã«å¥ãã®ç·¨é(&O)...", IDM_FAVORITES_ORGANIZEFAVORITES + MENUITEM "", -1, MFT_SEPARATOR + MENUITEM "(ç©º)", IDM_FAVORITES_EMPTY + END + POPUP "ãã¼ã«(&T)", FCIDM_MENU_TOOLS + BEGIN + MENUITEM "ãããã¯ã¼ã¯ ãã©ã¤ãã®å²ãå½ã¦(&N)...", IDM_TOOLS_MAPNETWORKDRIVE + MENUITEM "ãããã¯ã¼ã¯ ãã©ã¤ãã®æ¥ç¶ãåæ(&D)...", IDM_TOOLS_DISCONNECTNETWORKDRIVE + MENUITEM "åæãã(&S)...", IDM_TOOLS_SYNCHRONIZE + MENUITEM "", -1, MFT_SEPARATOR + MENUITEM "ãã©ã«ãã¼ ãªãã·ã§ã³(&O)...", IDM_TOOLS_FOLDEROPTIONS + END + POPUP "ãã«ã(&H)", FCIDM_MENU_HELP + BEGIN + MENUITEM "ãã®ã³ãã¼ã¯ãé©æ³ãªReactOSã(&L)ï¼", IDM_HELP_ISTHISCOPYLEGAL + MENUITEM "ReactOSã«ã¤ãã¦(&A)", IDM_HELP_ABOUT + END +END + +IDM_TASKBAR_TOOLBARS MENUEX +BEGIN + POPUP "ãã¼ã« ãã¼(&T)", -1, MFT_STRING, MFS_ENABLED, 0 + BEGIN + MENUITEM "ãã¹ã¯ããã(&D)", IDM_TASKBAR_TOOLBARS_DESKTOP, MFT_STRING, MFS_GRAYED + MENUITEM "ã¯ã¤ãã¯èµ·å(&Q)", IDM_TASKBAR_TOOLBARS_QUICKLAUNCH, MFT_STRING, MFS_GRAYED + MENUITEM "", -1, MFT_SEPARATOR, MFS_ENABLED + MENUITEM "æ°ãããã¼ã« ãã¼(&N)...", IDM_TASKBAR_TOOLBARS_NEW, MFT_STRING, MFS_GRAYED + END +END + +/* Dialogs */ + +IDD_PROGRESS_DLG DIALOGEX 0, 0, 260, 85 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU +CAPTION "" +FONT 9, "MS UI Gothic" +{ + CONTROL "", IDC_ANIMATION, ANIMATE_CLASSA, 0, 12, 10, 236, 30 /* TODO: style */ + LTEXT "", IDC_TEXT_LINE, 7, 45, 250, 10, SS_LEFT|SS_NOPREFIX + LTEXT "", IDC_TEXT_LINE + 1, 7, 55, 250, 10, SS_LEFT|SS_NOPREFIX + LTEXT "", IDC_TEXT_LINE + 2, 7, 75, 190, 10, SS_LEFT|SS_NOPREFIX + CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER, 7, 65, 190, 8 + PUSHBUTTON "ãã£ã³ã»ã«", IDCANCEL, 205, 65, 50, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE +} + +IDD_CUSTOMIZETOOLBAREX DIALOGEX 0, 0, 357, 33 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CAPTION +FONT 9, "MS UI Gothic", 0, 0, 0x1 +BEGIN + LTEXT "ããã¹ã ãªãã·ã§ã³(&X):", -1, 4, 2, 73, 15 + COMBOBOX IDC_TEXTOPTIONS, 75, 0, 123, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "ã¢ã¤ã³ã³ ãªãã·ã§ã³(&N):", -1, 4, 20, 73, 15 + COMBOBOX IDC_ICONOPTIONS, 75, 18, 123, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP +END + +/* Accelerators */ + +IDR_ACCELERATORS ACCELERATORS +BEGIN + VK_F5, IDM_VIEW_REFRESH, VIRTKEY, NOINVERT + VK_F5, IDM_VIEW_REFRESH, VIRTKEY, CONTROL, NOINVERT + "R", IDM_VIEW_REFRESH, VIRTKEY, CONTROL, NOINVERT + VK_HOME, IDM_GOTO_HOMEPAGE, VIRTKEY, ALT, NOINVERT + "D", IDM_FAVORITES_ADDTOFAVORITES, VIRTKEY, CONTROL, NOINVERT + "B", IDM_FAVORITES_ORGANIZEFAVORITES, VIRTKEY, CONTROL, NOINVERT + VK_LEFT, IDM_GOTO_BACK, VIRTKEY, ALT + VK_RIGHT, IDM_GOTO_FORWARD, VIRTKEY, ALT + VK_UP, IDM_GOTO_UPONELEVEL, VIRTKEY, ALT + VK_BACK, 41010, NOINVERT, VIRTKEY + "W", IDM_FILE_CLOSE, VIRTKEY, CONTROL, NOINVERT + "E", IDM_EXPLORERBAR_SEARCH, VIRTKEY, CONTROL, NOINVERT + "I", IDM_EXPLORERBAR_FAVORITES, VIRTKEY, CONTROL, NOINVERT + "H", IDM_EXPLORERBAR_HISTORY, VIRTKEY, CONTROL, NOINVERT +END + +/* Strings */ + +STRINGTABLE +BEGIN + IDS_CANCELLING "ãã£ã³ã»ã«ä¸..." + IDS_REMAINING "æ®ã£ã¦ãã¾ã" +END + +STRINGTABLE +BEGIN + 800 "é¸ææ¸ã¿ã®é ç®ãæä½ããããã®ã³ãã³ããå«ã¿ã¾ãã" +END + +STRINGTABLE +BEGIN + 864 "ç·¨éã³ãã³ããå«ã¿ã¾ãã" +END + +STRINGTABLE +BEGIN + 928 "è¡¨ç¤ºãæä½ããããã®ã³ãã³ããå«ã¿ã¾ãã" +END + +STRINGTABLE +BEGIN + 992 "ãã¼ã« ã³ãã³ããå«ã¿ã¾ãã" +END + +STRINGTABLE +BEGIN + 1056 "ãã«ããè¡¨ç¤ºããããã®ã³ãã³ããå«ã¿ã¾ãã" +END + +STRINGTABLE +BEGIN + 9025 "ã¦ã£ã³ãã¦ãéãã¾ãã" + 9026 "ä¸ã¤ä¸ã®ã¬ãã«ã¸ç§»åãã¾ãã" +END + +STRINGTABLE +BEGIN + 9121 "ãããã¯ã¼ã¯ ãã©ã¤ãã¸æ¥ç¶ãã¾ãã" + 9122 "ãããã¯ã¼ã¯ ãã©ã¤ãã®æ¥ç¶ãåæãã¾ãã" +END + +STRINGTABLE +BEGIN + 9250 "ããã°ã©ã æå ±ããã¼ã¸ã§ã³çªå·ãèä½æ¨©ãè¡¨ç¤ºãã¾ãã" + 9252 "ãããã°æå ±ãè¡¨ç¤ºãã¾ãã" +END + +STRINGTABLE +BEGIN + 9281 "åã®ãã¼ã¸ã¸æ»ãã¾ãã" + 9282 "æ¬¡ã®ãã¼ã¸ã¸ç§»åãã¾ãã" + 9283 "è¨å®ã®å¤æ´ãå¯è½ã«ãã¾ãã" + 9285 "ãã¼ã ãã¼ã¸ã¸ç§»åãã¾ãã" +END + +STRINGTABLE +BEGIN + 9362 "ãæ°ã«å¥ããã©ã«ãã¼ãéãã¾ãã" + 9363 "ãæ°ã«å¥ããªã¹ãã«ç¾å¨ã®ãã¼ã¸ãè¿½å ãã¾ãã" +END + +STRINGTABLE +BEGIN + 9505 "ãã¼ã« ãã¼ãè¡¨ç¤ºã¾ãã¯éè¡¨ç¤ºã«ãã¾ãã" + 9506 "ã¹ãã¼ã¿ã¹ ãã¼ãè¡¨ç¤ºã¾ãã¯éè¡¨ç¤ºã«ãã¾ãã" + 9508 "æ¨æºã®ãã¿ã³ ãã¼ã«ãã¼ãè¡¨ç¤ºãã¾ãã" + 9509 "ã¢ãã¬ã¹ ãã¼ãè¡¨ç¤ºãã¾ãã" + 9510 "ã¯ã¤ãã¯èµ·åãã¼ãè¡¨ç¤ºãã¾ãã" + 9516 "ãã¼ã« ãã¼ã®ãµã¤ãºã¨ä½ç½®ãåºå®ãã¾ãã" +END + +STRINGTABLE +BEGIN + 9533 "ãã¼ã« ãã¼ãã«ã¹ã¿ãã¤ãºãã¾ãã" +END + +STRINGTABLE +BEGIN + 9552 "ã¨ã¯ã¹ããã¼ã©ã¼ ãã¼ãè¡¨ç¤ºã¾ãã¯éè¡¨ç¤ºã«ãã¾ãã" + 9553 "æ¤ç´¢ãã¼ãè¡¨ç¤ºãã¾ãã" + 9554 "ãæ°ã«å¥ããã¼ãè¡¨ç¤ºãã¾ãã" + 9555 "å±¥æ´ãã¼ãè¡¨ç¤ºãã¾ãã" + 9557 "ãã©ã«ãã¼ ãã¼ãè¡¨ç¤ºãã¾ãã" + 9559 "ã¡ãã£ã¢ ãã¼ãè¡¨ç¤ºãã¾ãã" +END + +STRINGTABLE +BEGIN + IDS_SMALLICONS "å°ããã¢ã¤ã³ã³" + IDS_LARGEICONS "å¤§ããã¢ã¤ã³ã³" + IDS_SHOWTEXTLABELS "ããã¹ã ã©ãã«ãè¡¨ç¤ºãã" +END + +STRINGTABLE +BEGIN + IDS_NOTEXTLABELS "ããã¹ã ã©ãã«ãªã" + IDS_SELECTIVETEXTONRIGHT "å³ã«é¸æå¯è½ãªããã¹ã" +END + +STRINGTABLE +BEGIN + IDS_GOBUTTONLABEL "|ç§»å||" + IDS_GOBUTTONTIPTEMPLATE """%s"" ã¸ç§»å" +END + +STRINGTABLE +BEGIN + IDS_SEARCHLABEL "æ¤ç´¢" + IDS_ADDRESSBANDLABEL "ã¢ãã¬ã¹(&D)" +END + +STRINGTABLE +BEGIN + IDS_FOLDERSLABEL "ãã©ã«ãã¼" +END + +STRINGTABLE +BEGIN + IDS_HISTORYTEXT "å±¥æ´(&H)\tCtrl+H" +END + +STRINGTABLE +BEGIN + IDS_UP "ä¸ã¸" +END + +STRINGTABLE +BEGIN + IDS_BACK "%s ã¸æ»ã" + IDS_FORWARD "%s ã¸é²ã" +END + +STRINGTABLE +BEGIN + IDS_STANDARD_TOOLBAR, "|æ»ã|é²ã|ä¸ã¸|æ¤ç´¢|ãã©ã«ãã¼|ç§»å|ã³ãã¼|åé¤|åã«æ»ã|è¡¨ç¤º|åæ¢|åæç»|ãã¼ã |ãã©ã¤ãæ¥ç¶|æ¥ç¶åæ|ãæ°ã«å¥ã|å±¥æ´|ãã«ã¹ã¯ãªã¼ã³|ããããã£|åãåã|ã³ãã¼|è²¼ãä»ã|ãã©ã«ãã¼ ãªãã·ã§ã³||" +END + +STRINGTABLE +BEGIN + IDS_LEGAL_URL, "https://www.reactos.org/joining/faqs" + IDS_SORRY_CAPTION, "ç³ãè¨³ããã¾ãã" + IDS_SORRY_MESSAGE, "ReactOSã¯ã'%s'ãåç§ã§ãã¾ããã§ãã (ã¨ã©ã¼ 0x%lx)ã\nã¤ã³ã¹ãã¼ã«æ¸ã¿ã®ã¦ã§ã ãã©ã¦ã¶ã¼ããããã¨ãç¢ºèªãã¦ä¸ããã" +END Propchange: trunk/reactos/dll/win32/browseui/lang/ja-JP.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/credui/credui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/credui.rc… ============================================================================== --- trunk/reactos/dll/win32/credui/credui.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/credui/credui.rc [iso-8859-1] Thu Aug 25 03:44:29 2016 @@ -55,6 +55,9 @@ #ifdef LANGUAGE_IT_IT #include "lang/credui_It.rc" #endif +#ifdef LANGUAGE_JA_JP + #include "lang/credui_Ja.rc" +#endif #ifdef LANGUAGE_KO_KR #include "lang/credui_Ko.rc" #endif Added: trunk/reactos/dll/win32/credui/lang/credui_Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/lang/cred… ============================================================================== --- trunk/reactos/dll/win32/credui/lang/credui_Ja.rc (added) +++ trunk/reactos/dll/win32/credui/lang/credui_Ja.rc [iso-8859-1] Thu Aug 25 03:44:29 2016 @@ -0,0 +1,49 @@ +/* + * English language resource file for Credentials UI + * + * Copyright 2016 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +STRINGTABLE +{ + IDS_TITLEFORMAT "%s ã«æ¥ç¶" + IDS_MESSAGEFORMAT "%s ã«æ¥ç¶ä¸" + IDS_INCORRECTPASSWORDTITLE "ãã°ãªã³ã«å¤±æ" + IDS_INCORRECTPASSWORD "ã¦ã¼ã¶ã¼åã¨ãã¹ã¯ã¼ãã\næ£ãããã¨ãç¢ºèªãã¦ä¸ããã" + IDS_CAPSLOCKONTITLE "Caps Lockã¯ãªã³" + IDS_CAPSLOCKON "Caps Lockããªã³ã®ããããã¹ã¯ã¼ãã®å¥åãééã£ã¦ãã¾ãã\n\nãã¹ã¯ã¼ãã®å¥åã®åã«ãã¼ãã¼ãã®Caps Lockãã¼ã\næ¼ãã¦ãªãã«ãã¦ä¸ããã" +} + +IDD_CREDDIALOG DIALOGEX 0, 0, 213, 149 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 9, "MS UI Gothic" +BEGIN + CONTROL IDB_BANNER,-1,"Static",SS_BITMAP | SS_CENTERIMAGE,0, + 0,213,37 + LTEXT "",IDC_MESSAGE,8,48,199,8,NOT WS_GROUP + LTEXT "ã¦ã¼ã¶ã¼å(&U):",-1,8,62,72,12,SS_CENTERIMAGE + CONTROL "",IDC_USERNAME,"ComboBoxEx32",CBS_DROPDOWN | + CBS_NOINTEGRALHEIGHT | WS_TABSTOP,80,62,126,87 + LTEXT "ãã¹ã¯ã¼ã(&P):",-1,8,80,72,12,SS_CENTERIMAGE + EDITTEXT IDC_PASSWORD,80,80,126,12,ES_PASSWORD | ES_AUTOHSCROLL + CONTROL "ãã¹ã¯ã¼ããè¨é²ãã(&R)",IDC_SAVE,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,80,98,126,12 + DEFPUSHBUTTON "OK",IDOK,97,128,50,14 + PUSHBUTTON "ãã£ã³ã»ã«",IDCANCEL,156,128,50,14 +END Propchange: trunk/reactos/dll/win32/credui/lang/credui_Ja.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/ieframe/ieframe.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/ieframe.… ============================================================================== --- trunk/reactos/dll/win32/ieframe/ieframe.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ieframe/ieframe.rc [iso-8859-1] Thu Aug 25 03:44:29 2016 @@ -43,6 +43,9 @@ #endif #ifdef LANGUAGE_IT_IT #include "lang/it-IT.rc" +#endif +#ifdef LANGUAGE_JA_JP + #include "lang/ja-JP.rc" #endif #ifdef LANGUAGE_PL_PL #include "lang/pl-PL.rc" Added: trunk/reactos/dll/win32/ieframe/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/lang/ja-… ============================================================================== --- trunk/reactos/dll/win32/ieframe/lang/ja-JP.rc (added) +++ trunk/reactos/dll/win32/ieframe/lang/ja-JP.rc [iso-8859-1] Thu Aug 25 03:44:29 2016 @@ -0,0 +1,77 @@ +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +IDR_BROWSE_MAIN_MENU MENU +{ + POPUP "ãã¡ã¤ã«(&F)" + { + POPUP "æ°è¦(&N)" + { + MENUITEM "ã¦ã£ã³ãã¦(&W)", ID_BROWSE_NEW_WINDOW + } + MENUITEM "éã(&O)...", ID_BROWSE_OPEN + MENUITEM "ä¿å(&S)", ID_BROWSE_SAVE + MENUITEM "ååãä»ãã¦ä¿å(&A)...", ID_BROWSE_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "å°å·å½¢å¼(&F)...", ID_BROWSE_PRINT_FORMAT + MENUITEM "å°å·(&I)...", ID_BROWSE_PRINT + MENUITEM "å°å·ãã¬ãã¥ã¼(&W)", ID_BROWSE_PRINT_PREVIEW + MENUITEM SEPARATOR + MENUITEM "ããããã£(&P)", ID_BROWSE_PROPERTIES + MENUITEM "éãã(&C)", ID_BROWSE_QUIT + } + POPUP "è¡¨ç¤º(&V)" + { + POPUP "ãã¼ã« ãã¼(&T)" + { + MENUITEM "æ¨æºã®ãã¼(&S)", ID_BROWSE_BAR_STD + MENUITEM "ã¢ãã¬ã¹ ãã¼(&A)", ID_BROWSE_BAR_ADDR + } + } + POPUP "ãæ°ã«å¥ã(&F)" + { + MENUITEM "ãæ°ã«å¥ãã«è¿½å (&A)...", ID_BROWSE_ADDFAV + MENUITEM SEPARATOR + } + POPUP "ãã«ã(&H)" + { + MENUITEM "Internet Explorerã«ã¤ãã¦(&A)", ID_BROWSE_ABOUT + } +} + +STRINGTABLE +{ + IDS_TB_BACK "æ»ã" + IDS_TB_FORWARD "é²ã" + IDS_TB_STOP "åæ¢" + IDS_TB_REFRESH "æ´æ°" + IDS_TB_HOME "ãã¼ã " + IDS_TB_PRINT "å°å·..." +} + +STRINGTABLE +{ + IDS_ADDRESS "ã¢ãã¬ã¹" +} + +STRINGTABLE +{ + IDS_FINDINGRESOURCE "%s ãæ¤ç´¢ä¸" + IDS_BEGINDOWNLOADDATA "%s ã®ãã¦ã³ãã¼ããéå§" + IDS_ENDDOWNLOADDATA "%s ããã¦ã³ãã¼ãä¸" + IDS_SENDINGREQUEST "%s ãåãåããä¸" +} + +IDD_BROWSE_OPEN DIALOGEX 10, 10, 200, 70 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION +CAPTION "Open URL" +FONT 9, "MS UI Gothic" +{ + LTEXT "Internet Explorerã§éãããURLãæå®ãã¦ä¸ããã",-1, 35,5,160,25 + LTEXT "éã:", -1, 5, 32, 30, 15 +#ifdef __REACTOS__ + ICON IDC_PAGEICO, IDC_PAGEICO, 2, 5, 21, 20, SS_ICON +#endif + EDITTEXT IDC_BROWSE_OPEN_URL, 35, 30, 160, 13 + DEFPUSHBUTTON "OK", IDOK, 90, 50, 50, 14 + PUSHBUTTON "ãã£ã³ã»ã«", IDCANCEL, 145, 50, 50, 14 +} Propchange: trunk/reactos/dll/win32/ieframe/lang/ja-JP.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/iernonce/iernonce.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iernonce/iernonc… ============================================================================== --- trunk/reactos/dll/win32/iernonce/iernonce.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iernonce/iernonce.rc [iso-8859-1] Thu Aug 25 03:44:29 2016 @@ -17,6 +17,9 @@ #ifdef LANGUAGE_EN_US #include "lang/en-US.rc" #endif +#ifdef LANGUAGE_JA_JP + #include "lang/ja-JP.rc" +#endif #ifdef LANGUAGE_MS_MY #include "lang/ms-MY.rc" #endif Added: trunk/reactos/dll/win32/iernonce/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iernonce/lang/ja… ============================================================================== --- trunk/reactos/dll/win32/iernonce/lang/ja-JP.rc (added) +++ trunk/reactos/dll/win32/iernonce/lang/ja-JP.rc [iso-8859-1] Thu Aug 25 03:44:29 2016 @@ -0,0 +1,27 @@ +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_INVALIDFORMAT "%1 RunEx ã¾ãã¯ RunOnceEx ã®å½¢å¼ã¯ä¸æ£ã§ãããé¢æ°åã®å¾ã«ç¸¦ç· ('|') ãå¿è¦ã§ãããé¢æ°ã¯ WinMainå¼æ°ããµãã¼ãããå¿è¦ãããã¾ãã" + IDS_LOADERROR "%1 ã®èªã¿è¾¼ã¿ã«ã¨ã©ã¼ãçºçãã¾ããããã®ãã¡ã¤ã«ã¯ãã¤ã³ã¹ãã¼ã«ããã¦ããªãããå£ãã¦ãã¾ãã" + IDS_CALLERROR "%2 ã®é¢æ° %1 ã®å¼ã³åºãã®ã¨ã©ã¼ã¾ãã¯ä¾å¤ãçºçãã¾ããã" + IDS_INCORRECTFORMAT "æ¬¡ã® RunEx ã¾ãã¯RunOnceEx ã³ãã³ãã®å½¢å¼ãä¸æ£ã§ã: %1ãã·ã§ã«ã®å®è¡ã³ãã³ãã¯ã||ã§å§ã¾ããªããã°ãªãã¾ããã" + IDS_NOEXPORT "ãã¡ã¤ã« %2 ã®é¢æ° %1 ãå¼ã³åºããã¨ãã§ãã¾ããã§ãããé¢æ°ã¯åå¨ããªãããã¨ã¯ã¹ãã¼ãããã¦ãã¾ããã" + IDS_EXECUTEERROR "%1 ã®å®è¡ä¸ã«ã¨ã©ã¼ã¾ãã¯ä¾å¤ãçºçãã¾ããã" + IDS_NOFUNCTION "ãã¡ã¤ã« %2 ã®é¢æ° %1 ãè¦ã¤ããã¾ããã" + IDS_NODEPENDENCY "ä¾åãã¡ã¤ã« %1 ãèªã¿è¾¼ã¿ã§ãã¾ããã" + IDS_SETUPERROR "%1 ã®ã»ããã¢ããä¸ã«ã¨ã©ã¼ãçºçãã¾ããããã®ã¨ã©ã¼ã¯è¨é²ãããã¤ã³ã¹ãã¼ã«ã¯ç¶è¡ããã¾ãã" + IDS_INCOMPLETE "ã¢ããªã±ã¼ã·ã§ã³ã®ä»¥åã®ã¤ã³ã¹ãã¼ã«ã¯ãå®äºããã¦ãã¾ããã\n\nã¤ã³ã¹ãã¼ã«ãå®äºãããããç®¡çèæ¨©éã§ãã°ãªã³ãã¦ä¸ããã" + IDS_SETUP "ReactOSã»ããã¢ãã" + IDS_SERVICEERROR "ããã¤ãã®ãµã¼ãã¹ãéå§ã§ãã¾ããã§ãããã»ããã¢ããã¯ããµã¼ãã¹ãéå§ããããã«ã·ã¹ãã ãåèµ·åããå¿è¦ãããã¾ãã" +END + +IDD_DIALOG DIALOGEX 0, 0, 206, 166 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "ReactOSã»ããã¢ãã" +FONT 9, "MS UI Gothic" +BEGIN + LTEXT "ReactOSã¯ãæ¬¡ã®é ç®ãã»ããã¢ãããã¦ãã¾ã:", -1, 36, 13, 163, 11 + LISTBOX IDC_LB_ITEMS, 36, 32, 163, 127, LBS_NOTIFY | LBS_OWNERDRAWVARIABLE | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_VSCROLL | WS_TABSTOP + ICON IDI_ICON, -1, 7, 7, 20, 20 +END Propchange: trunk/reactos/dll/win32/iernonce/lang/ja-JP.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/msports/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/lang/ja-… ============================================================================== --- trunk/reactos/dll/win32/msports/lang/ja-JP.rc (added) +++ trunk/reactos/dll/win32/msports/lang/ja-JP.rc [iso-8859-1] Thu Aug 25 03:44:29 2016 @@ -0,0 +1,41 @@ +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +IDD_SERIALSETTINGS DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "ãã¼ãè¨å®" +FONT 9, "MS UI Gothic" +BEGIN + RTEXT "ä¸ç§ãã¨ã®ãããæ°(&I):", -1, 6, 19, 130, 8, WS_GROUP + COMBOBOX IDC_SERIAL_BITSPERSECOND, 139, 17, 106, 90, WS_TABSTOP | CBS_DROPDOWNLIST + RTEXT "ãã¼ã¿ããã(&D):", -1, 6, 40, 130, 8 + COMBOBOX IDC_SERIAL_DATABITS, 139, 38, 106, 54, WS_TABSTOP | CBS_DROPDOWNLIST + RTEXT "ããªãã£(&P):", -1, 6, 61, 130, 8 + COMBOBOX IDC_SERIAL_PARITY, 139, 59, 106, 62, WS_TABSTOP | CBS_DROPDOWNLIST + RTEXT "ã¹ãããããã(&S):", -1, 6, 82, 130, 8 + COMBOBOX IDC_SERIAL_STOPBITS, 139, 80, 106, 54, WS_TABSTOP | CBS_DROPDOWNLIST + RTEXT "ããã¼å¶å¾¡(&F):", -1, 6, 102, 130, 8 + COMBOBOX IDC_SERIAL_FLOWCONTROL, 139, 100, 106, 54, WS_TABSTOP | CBS_DROPDOWNLIST + PUSHBUTTON "ä¸ç´èåã(&A)...", IDC_SERIAL_ADVANCED, 71, 130, 85, 14, WS_GROUP + PUSHBUTTON "æ¢å®å¤ãå¾©å(&R)", IDC_SERIAL_RESTORE, 160, 130, 85, 14, WS_GROUP +END + +IDD_PARALLELSETTINGS DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "ãã¼ãè¨å®" +FONT 9, "MS UI Gothic" +BEGIN + GROUPBOX "ãªã½ã¼ã¹ãµããåãæ¹å¼", -1, 6, 6, 237, 75, WS_GROUP + AUTORADIOBUTTON "ä¸åº¦å²ãè¾¼ã¿ãä½¿ããªãã§è©¦ã", IDC_TRY_INTERRUPT, 11, 22, 227, 10 + AUTORADIOBUTTON "å²ãè¾¼ã¿ãä½¿ããªã", IDC_NEVER_INTERRUPT, 11, 44, 227, 10 + AUTORADIOBUTTON "ãã¼ãã«å²ãå½ã¦ããããã¹ã¦ã®å²ãè¾¼ã¿ãä½¿ã", IDC_ANY_INTERRUPT, 11, 66, 227, 10, WS_GROUP + AUTOCHECKBOX "ã¬ã¬ã·ã¼ãªãã©ã°ã¢ã³ããã¬ã¤æ¤åºãæå¹ã«ãã", -1, 6, 90, 237, 10 + LTEXT "LPTãã¼ãçªå·:", -1, 6, 107, 140, 10, WS_GROUP + COMBOBOX IDC_PARALLEL_NAME, 65, 105, 75, 20, WS_TABSTOP | CBS_DROPDOWNLIST +END + +STRINGTABLE +BEGIN + IDS_LPT1 "LPT1" + IDS_LPT2 "LPT2" + IDS_LPT3 "LPT3" +END Propchange: trunk/reactos/dll/win32/msports/lang/ja-JP.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/msports/msports.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/msports.… ============================================================================== --- trunk/reactos/dll/win32/msports/msports.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msports/msports.rc [iso-8859-1] Thu Aug 25 03:44:29 2016 @@ -34,6 +34,9 @@ #ifdef LANGUAGE_IT_IT #include "lang/it-IT.rc" #endif +#ifdef LANGUAGE_JA_JP + #include "lang/ja-JP.rc" +#endif #ifdef LANGUAGE_PL_PL #include "lang/pl-PL.rc" #endif Added: trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/lang/msv… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Ja.rc (added) +++ trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Ja.rc [iso-8859-1] Thu Aug 25 03:44:29 2016 @@ -0,0 +1,51 @@ +/* + * Copyright 2016 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +STRINGTABLE +{ + IDS_FULLFRAMES "ãã« ãã¬ã¼ã (éå§ç¸®)" +} + +ICM_CHOOSE_COMPRESSOR DIALOGEX 36, 24, 210, 95 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ãããªå§ç¸®" +FONT 9, "MS UI Gothic" +{ + DEFPUSHBUTTON "OK",IDOK,154,2,52,14 + PUSHBUTTON "ãã£ã³ã»ã«",IDCANCEL,154,18,52,14 + + LTEXT "å§ç¸®å¨(&C):",-1,9,6,135,8 + COMBOBOX IDC_COMP_LIST,9,16,135,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP + + PUSHBUTTON "è¨å®(&F)...",IDC_CONFIGURE,154,36,52,14 + PUSHBUTTON "è©³ç´°(&A)",IDC_ABOUT,154,52,52,14 + + SCROLLBAR IDC_QUALITY_SCROLL,9,44,135,10,WS_TABSTOP + + LTEXT "å§ç¸®åè³ª(&Q):",IDC_QUALITY_TXT,9,34,135,8 + + CONTROL "ãã¼ãã¬ã¼ã éé(&K)",IDC_KEYFRAME_CHECKBOX,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,86,12 + EDITTEXT IDC_KEYFRAME,98,60,22,12 + LTEXT "ãã¬ã¼ã ãã¨",IDC_KEYFRAME_FRAMES,123,62,26,10 + + CONTROL "ãã¼ã¿ ã¬ã¼ã(&D)",IDC_DATARATE_CHECKBOX,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,86,12 + EDITTEXT IDC_DATARATE,98,76,22,12 + LTEXT "kB/s",IDC_DATARATE_KB,123,78,26,10 +} Propchange: trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Ja.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/msvfw32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/rsrc.rc?… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvfw32/rsrc.rc [iso-8859-1] Thu Aug 25 03:44:29 2016 @@ -50,6 +50,9 @@ #ifdef LANGUAGE_IT_IT #include "lang/msvfw32_It.rc" #endif +#ifdef LANGUAGE_JA_JP + #include "lang/msvfw32_Ja.rc" +#endif #ifdef LANGUAGE_KO_KR #include "lang/msvfw32_Ko.rc" #endif Added: trunk/reactos/dll/win32/mycomput/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mycomput/lang/ja… ============================================================================== --- trunk/reactos/dll/win32/mycomput/lang/ja-JP.rc (added) +++ trunk/reactos/dll/win32/mycomput/lang/ja-JP.rc [iso-8859-1] Thu Aug 25 03:44:29 2016 @@ -0,0 +1,6 @@ +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_MANAGE "ç®¡ç" +END Propchange: trunk/reactos/dll/win32/mycomput/lang/ja-JP.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/mycomput/mycomput.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mycomput/mycompu… ============================================================================== --- trunk/reactos/dll/win32/mycomput/mycomput.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mycomput/mycomput.rc [iso-8859-1] Thu Aug 25 03:44:29 2016 @@ -27,6 +27,9 @@ #ifdef LANGUAGE_IT_IT #include "lang/it-IT.rc" #endif +#ifdef LANGUAGE_JA_JP + #include "lang/ja-JP.rc" +#endif #ifdef LANGUAGE_PL_PL #include "lang/pl-PL.rc" #endif Added: trunk/reactos/dll/win32/oleacc/lang/oleacc_Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleacc/lang/olea… ============================================================================== --- trunk/reactos/dll/win32/oleacc/lang/oleacc_Ja.rc (added) +++ trunk/reactos/dll/win32/oleacc/lang/oleacc_Ja.rc [iso-8859-1] Thu Aug 25 03:44:29 2016 @@ -0,0 +1,123 @@ +/* + * Japanese resources for oleacc + * + * Copyright 2016 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +STRINGTABLE +{ + 0 "unknown object" /* undocumented */ + ROLE_SYSTEM_TITLEBAR "ã¿ã¤ãã« ãã¼" + ROLE_SYSTEM_MENUBAR "ã¡ãã¥ã¼ ãã¼" + ROLE_SYSTEM_SCROLLBAR "ã¹ã¯ãã¼ã« ãã¼" + ROLE_SYSTEM_GRIP "ã°ãªãã" + ROLE_SYSTEM_SOUND "ãµã¦ã³ã" + ROLE_SYSTEM_CURSOR "ã«ã¼ã½ã«" + ROLE_SYSTEM_CARET "ãã£ã¬ãã" + ROLE_SYSTEM_ALERT "ã¢ã©ã¼ã " + ROLE_SYSTEM_WINDOW "ã¦ã£ã³ãã¦" + ROLE_SYSTEM_CLIENT "ã¯ã©ã¤ã¢ã³ã" + ROLE_SYSTEM_MENUPOPUP "ãããã¢ãã ã¡ãã¥ã¼" + ROLE_SYSTEM_MENUITEM "ã¡ãã¥ã¼é ç®" + ROLE_SYSTEM_TOOLTIP "ãã¼ã«ããã" + ROLE_SYSTEM_APPLICATION "ã¢ããªã±ã¼ã·ã§ã³" + ROLE_SYSTEM_DOCUMENT "ææ¸" + ROLE_SYSTEM_PANE "ãã¤ã³" + ROLE_SYSTEM_CHART "ãã£ã¼ã" + ROLE_SYSTEM_DIALOG "ãã¤ã¢ãã°" + ROLE_SYSTEM_BORDER "å¢çç·" + ROLE_SYSTEM_GROUPING "ã°ã«ã¼ãå" + ROLE_SYSTEM_SEPARATOR "åºåç·" + ROLE_SYSTEM_TOOLBAR "ãã¼ã« ãã¼" + ROLE_SYSTEM_STATUSBAR "ã¹ãã¼ã¿ã¹ ãã¼" + ROLE_SYSTEM_TABLE "è¡¨" + ROLE_SYSTEM_COLUMNHEADER "åãããã¼" + ROLE_SYSTEM_ROWHEADER "è¡ãããã¼" + ROLE_SYSTEM_COLUMN "å" + ROLE_SYSTEM_ROW "è¡" + ROLE_SYSTEM_CELL "ã»ã«" + ROLE_SYSTEM_LINK "ãªã³ã¯" + ROLE_SYSTEM_HELPBALLOON "ãã«ã ãã«ã¼ã³" + ROLE_SYSTEM_CHARACTER "æå" + ROLE_SYSTEM_LIST "ãªã¹ã" + ROLE_SYSTEM_LISTITEM "ãªã¹ãé ç®" + ROLE_SYSTEM_OUTLINE "ã¢ã¦ãã©ã¤ã³" + ROLE_SYSTEM_OUTLINEITEM "ã¢ã¦ãã©ã¤ã³é ç®" + ROLE_SYSTEM_PAGETAB "ãã¼ã¸ ã¿ã" + ROLE_SYSTEM_PROPERTYPAGE "ããããã£ ãã¼ã¸" + ROLE_SYSTEM_INDICATOR "ã¤ã³ã¸ã±ã¼ã¿ã¼" + ROLE_SYSTEM_GRAPHIC "ã°ã©ãã£ãã¯" + ROLE_SYSTEM_STATICTEXT "ã¹ã¿ãã£ãã¯ ããã¹ã" + ROLE_SYSTEM_TEXT "ããã¹ã" + ROLE_SYSTEM_PUSHBUTTON "ããã·ã¥ãã¿ã³" + ROLE_SYSTEM_CHECKBUTTON "ãã§ãã¯ãã¿ã³" + ROLE_SYSTEM_RADIOBUTTON "ã©ã¸ãªãã¿ã³" + ROLE_SYSTEM_COMBOBOX "ã³ã³ãããã¯ã¹" + ROLE_SYSTEM_DROPLIST "ãããããã¦ã³" + ROLE_SYSTEM_PROGRESSBAR "ããã°ã¬ã¹ ãã¼" + ROLE_SYSTEM_DIAL "ãã¤ã¤ã«" + ROLE_SYSTEM_HOTKEYFIELD "ããããã¼ ãã£ã¼ã«ã" + ROLE_SYSTEM_SLIDER "ã¹ã©ã¤ãã¼" + ROLE_SYSTEM_SPINBUTTON "ã¹ãã³ããã¯ã¹" + ROLE_SYSTEM_DIAGRAM "å³" + ROLE_SYSTEM_ANIMATION "ã¢ãã¡ã¼ã·ã§ã³" + ROLE_SYSTEM_EQUATION "æ°å¼" + ROLE_SYSTEM_BUTTONDROPDOWN "ãããããã¦ã³ ãã¿ã³" + ROLE_SYSTEM_BUTTONMENU "ã¡ãã¥ã¼ ãã¿ã³" + ROLE_SYSTEM_BUTTONDROPDOWNGRID "ã°ãªãã ãããããã¦ã³ ãã¿ã³" + ROLE_SYSTEM_WHITESPACE "ç©ºç½" + ROLE_SYSTEM_PAGETABLIST "ãã¼ã¸ ã¿ã ãªã¹ã" + ROLE_SYSTEM_CLOCK "æè¨" + ROLE_SYSTEM_SPLITBUTTON "ã¹ããªãã ãã¿ã³" + ROLE_SYSTEM_IPADDRESS "IPã¢ãã¬ã¹" + ROLE_SYSTEM_OUTLINEBUTTON "ã¢ã¦ãã©ã¤ã³ ãã¿ã³" + + IDS_STATE_NORMAL "éå¸¸" + IDS_STATE_UNAVAILABLE "å©ç¨ä¸å¯" + IDS_STATE_SELECTED "é¸ææ¸ã¿" + IDS_STATE_FOCUSED "ãã©ã¼ã«ã¹ããã" + IDS_STATE_PRESSED "æ¼ããã" + IDS_STATE_CHECKED "ãã§ãã¯ããã" + IDS_STATE_MIXED "æ··å" + IDS_STATE_READONLY "èªã¿è¾¼ã¿å°ç¨" + IDS_STATE_HOTTRACKED "ããããã©ãã¯ããã" + IDS_STATE_DEFAULT "æ¢å®" + IDS_STATE_EXPANDED "å±éããã" + IDS_STATE_COLLAPSED "ã¤ã¶ãã" + IDS_STATE_BUSY "ãã¸ã¼" + IDS_STATE_FLOATING "ããã¼ãã£ã³ã°" + IDS_STATE_MARQUEED "ãã¼ãã¼" + IDS_STATE_ANIMATED "ã¢ãã¡ã¼ã·ã§ã³" + IDS_STATE_INVISIBLE "éè¡¨ç¤º" + IDS_STATE_OFFSCREEN "ãªãã¹ã¯ãªã¼ã³" + IDS_STATE_SIZEABLE "ãµã¤ãºå¤æ´å¯" + IDS_STATE_MOVEABLE "ç§»åå¯è½" + IDS_STATE_SELFVOICING "å£°ãåºã" + IDS_STATE_FOCUSABLE "ãã©ã¼ã«ã¹å¯" + IDS_STATE_SELECTABLE "é¸æå¯" + IDS_STATE_LINKED "ãªã³ã¯ããã" + IDS_STATE_TRAVERSED "æ¨ªåã£ã" + IDS_STATE_MULTISELECTABLE "è¤æ°é¸æ" + IDS_STATE_EXTSELECTABLE "æ¡å¼µé¸æå¯" + IDS_STATE_ALERT_LOW "ä½ããè¦å" + IDS_STATE_ALERT_MEDIUM "ä¸éãè¦å" + IDS_STATE_ALERT_HIGH "é«ããè¦å" + IDS_STATE_PROTECTED "ä¿è·ããã" + IDS_STATE_HASPOPUP "ãããã¢ããã®ãã" +} Propchange: trunk/reactos/dll/win32/oleacc/lang/oleacc_Ja.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/oleacc/oleacc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleacc/oleacc.rc… ============================================================================== --- trunk/reactos/dll/win32/oleacc/oleacc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleacc/oleacc.rc [iso-8859-1] Thu Aug 25 03:44:29 2016 @@ -59,6 +59,9 @@ #ifdef LANGUAGE_IT_IT #include "lang/oleacc_It.rc" #endif +#ifdef LANGUAGE_JA_JP + #include "lang/oleacc_Ja.rc" +#endif #ifdef LANGUAGE_KO_KR #include "lang/oleacc_Ko.rc" #endif Added: trunk/reactos/dll/win32/samsrv/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/lang/ja-J… ============================================================================== --- trunk/reactos/dll/win32/samsrv/lang/ja-JP.rc (added) +++ trunk/reactos/dll/win32/samsrv/lang/ja-JP.rc [iso-8859-1] Thu Aug 25 03:44:29 2016 @@ -0,0 +1,25 @@ +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_DOMAIN_BUILTIN_NAME "çµã¿è¾¼ã¿" + IDS_GROUP_NONE_NAME "ãªã" + IDS_GROUP_NONE_COMMENT "éå¸¸ã®ã¦ã¼ã¶ã¼" + IDS_ALIAS_ADMINISTRATORS_NAME "ç®¡çè" + IDS_ALIAS_ADMINISTRATORS_COMMENT "ç®¡çèã¯ãã³ã³ãã¥ã¼ã¿ã¼ããã¡ã¤ã³ã«ç¡å¶éã®ã¢ã¯ã»ã¹æ¨©ãæãã¾ãã" + IDS_ALIAS_GUESTS_NAME "ã²ã¹ã" + IDS_ALIAS_GUESTS_COMMENT "ã²ã¹ãã¯ãæ¢å®ã§ã¦ã¼ã¶ã¼ã°ã«ã¼ãã®ã¡ã³ãã¼ã¨åãã¢ã¯ã»ã¹æ¨©ãæãã¾ãã" + IDS_ALIAS_POWER_USERS_NAME "ãã¯ã¼ã¦ã¼ã¶ã¼" + IDS_ALIAS_POWER_USERS_COMMENT "ãã¯ã¼ã¦ã¼ã¶ã¼ã¯ãããã¤ãã®å¶éä»ãã§ã»ã¨ãã©ã®ç®¡çæ¨©éãæã¡ã¾ãã" + IDS_ALIAS_USERS_NAME "ã¦ã¼ã¶ã¼" + IDS_ALIAS_USERS_COMMENT "ã¦ã¼ã¶ã¼ã¯ãã·ã¹ãã è¦æ¨¡ã®å¤æ´ããããã¨ãã§ãã¾ããã" + /* + * ATTENTION: + * If you translate the administator account name, keep IDS_USER_ADMINISTRATOR_NAME and + * syssetup.dll:IDS_ADMINISTRATOR_NAME synchronized. + */ + IDS_USER_ADMINISTRATOR_NAME "Administrator" + IDS_USER_ADMINISTRATOR_COMMENT "ã³ã³ãã¥ã¼ã¿ããã¡ã¤ã³ãç®¡çããã®ã«ä½¿ãããçµã¿è¾¼ã¿ã®ã¢ã«ã¦ã³ãã§ãã" + IDS_USER_GUEST_NAME "Guest" + IDS_USER_GUEST_COMMENT "ã³ã³ãã¥ã¼ã¿ã¼ããã¡ã¤ã³ã¸ã²ã¹ãã§ã¢ã¯ã»ã¹ããããã®çµã¿è¾¼ã¿ã®ã¢ã«ã¦ã³ãã§ãã" +END Propchange: trunk/reactos/dll/win32/samsrv/lang/ja-JP.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/samsrv/samsrv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samsrv.rc… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samsrv.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samsrv.rc [iso-8859-1] Thu Aug 25 03:44:29 2016 @@ -34,6 +34,9 @@ #ifdef LANGUAGE_IT_IT #include "lang/it-IT.rc" #endif +#ifdef LANGUAGE_JA_JP + #include "lang/ja-JP.rc" +#endif #ifdef LANGUAGE_PL_PL #include "lang/pl-PL.rc" #endif Added: trunk/reactos/dll/win32/serialui/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/serialui/lang/ja… ============================================================================== --- trunk/reactos/dll/win32/serialui/lang/ja-JP.rc (added) +++ trunk/reactos/dll/win32/serialui/lang/ja-JP.rc [iso-8859-1] Thu Aug 25 03:44:29 2016 @@ -0,0 +1,37 @@ +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_EVENPARITY "å¶æ°" + IDS_MARKPARITY "ãã¼ã¯" + IDS_NOPARITY "ããªãã£ãªã" + IDS_ODDPARITY "å¥æ°" + IDS_SPACEPARITY "ã¹ãã¼ã¹" + IDS_ONESTOPBIT "1 ã¹ãããããã" + IDS_ONE5STOPBITS "1.5 ã¹ãããããã" + IDS_TWOSTOPBITS "2 ã¹ãããããã" + IDS_FC_NO "ãªã" + IDS_FC_CTSRTS "CTS/RTS" + IDS_FC_XONXOFF "XON/XOFF" + IDS_TITLE "%s ã®ããããã£" +END + +IDD_COMMDLG DIALOGEX 6, 5, 222, 175 +FONT 9, "MS UI Gothic" +STYLE 0x10C80080 +EXSTYLE 0x00000001 +BEGIN + CONTROL "", IDC_GRP1, "Button", 0x50000007, 6, 5, 210, 146, 0x00000000 + CONTROL "OK", IDC_OKBTN, "Button", 0x50010000, 98, 156, 56, 13, 0x00000000 + CONTROL "ãã£ã³ã»ã«", IDC_CANCELBTN, "Button", 0x50010000, 158, 156, 56, 13, 0x00000000 + CONTROL "ãã¼ã¬ã¼ã:", IDC_STC1, "Static", 0x50000000, 24, 31, 42, 9, 0x00000000 + CONTROL "ãã¤ããµã¤ãº:", IDC_STC2, "Static", 0x50000000, 24, 53, 42, 9, 0x00000000 + CONTROL "ããªãã£:", IDC_STC3, "Static", 0x50000000, 24, 73, 42, 9, 0x00000000 + CONTROL "ã¹ãããããã:", IDC_STC4, "Static", 0x50000000, 24, 96, 42, 9, 0x00000000 + CONTROL "ããã¼å¶å¾¡:", IDC_STC5, "Static", 0x50000000, 24, 120, 42, 9, 0x00000000 + CONTROL "", IDC_BAUDRATE, "ComboBox", 0x50210003, 98, 29, 100, 50, 0x00000000 + CONTROL "", IDC_BYTESIZE, "ComboBox", 0x50210003, 98, 49, 100, 50, 0x00000000 + CONTROL "", IDC_PARITY, "ComboBox", 0x50210003, 98, 72, 100, 50, 0x00000000 + CONTROL "", IDC_STOPBITS, "ComboBox", 0x50210003, 98, 94, 100, 50, 0x00000000 + CONTROL "", IDC_FLOW, "ComboBox", 0x50210003, 98, 116, 100, 50, 0x00000000 +END Propchange: trunk/reactos/dll/win32/serialui/lang/ja-JP.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/serialui/serialui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/serialui/serialu… ============================================================================== --- trunk/reactos/dll/win32/serialui/serialui.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/serialui/serialui.rc [iso-8859-1] Thu Aug 25 03:44:29 2016 @@ -42,6 +42,9 @@ #ifdef LANGUAGE_IT_IT #include "lang/it-IT.rc" #endif +#ifdef LANGUAGE_JA_JP + #include "lang/ja-JP.rc" +#endif #ifdef LANGUAGE_NB_NO #include "lang/no-NO.rc" #endif Added: trunk/reactos/dll/win32/shimgvw/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/lang/ja-… ============================================================================== --- trunk/reactos/dll/win32/shimgvw/lang/ja-JP.rc (added) +++ trunk/reactos/dll/win32/shimgvw/lang/ja-JP.rc [iso-8859-1] Thu Aug 25 03:44:29 2016 @@ -0,0 +1,28 @@ +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_APPTITLE "ReactOSç»åã¨FAXãã¥ã¢ã¼" + IDS_SETASDESKBG "ãã¹ã¯ãããã®èæ¯ã«è¨å®ãã" + IDS_PREVIEW "ãã¬ãã¥ã¼" + /* Tooltips */ + IDS_TOOLTIP_NEXT_PIC "æ¬¡ã®ç»å" + IDS_TOOLTIP_PREV_PIC "åã®ç»å" + IDS_TOOLTIP_ZOOM_IN "ãºã¼ã ã¤ã³ (+)" + IDS_TOOLTIP_ZOOM_OUT "ãºã¼ã ã¢ã¦ã (-)" + IDS_TOOLTIP_ROT_CLOCKW "æè¨åãã«åè»¢ (Ctrl+K)" + IDS_TOOLTIP_ROT_COUNCW "åæè¨åãã«åè»¢ (Ctrl+L)" + IDS_TOOLTIP_PRINT "å°å· (Ctrl+P)" + IDS_TOOLTIP_SAVEAS "ååãä»ãã¦ä¿å... (Ctrl+S)" +END + +STRINGTABLE +BEGIN + IDS_EMF_FILE "EMFç»å" + IDS_GIF_FILE "GIFç»å" + IDS_JPG_FILE "JPEGç»å" + IDS_BMP_FILE "Bitmapç»å" + IDS_PNG_FILE "PNGç»å" + IDS_TIF_FILE "TIFç»å" + IDS_WMF_FILE "WMFç»å" +END Propchange: trunk/reactos/dll/win32/shimgvw/lang/ja-JP.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/shimgvw/shimgvw.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/shimgvw.… ============================================================================== --- trunk/reactos/dll/win32/shimgvw/shimgvw.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shimgvw/shimgvw.rc [iso-8859-1] Thu Aug 25 03:44:29 2016 @@ -48,6 +48,9 @@ #ifdef LANGUAGE_IT_IT #include "lang/it-IT.rc" #endif +#ifdef LANGUAGE_JA_JP + #include "lang/ja-JP.rc" +#endif #ifdef LANGUAGE_NB_NO #include "lang/no-NO.rc" #endif Added: trunk/reactos/dll/win32/wldap32/lang/wldap32_Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/lang/wld… ============================================================================== --- trunk/reactos/dll/win32/wldap32/lang/wldap32_Ja.rc (added) +++ trunk/reactos/dll/win32/wldap32/lang/wldap32_Ja.rc [iso-8859-1] Thu Aug 25 03:44:29 2016 @@ -0,0 +1,123 @@ +/* + * Japanese resources for WLDAP32 + * + * Copyright 2016 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +STRINGTABLE +{ + 0 "æå" + 1 "æä½å¤±æ" + 2 "ãããã³ã« ã¨ã©ã¼" + 3 "æéå¶éãè¶ãã¾ãã" + 4 "ãµã¤ãºå¶éãè¶ãã¾ãã" + 5 "æ¯è¼ã¯å½" + 6 "æ¯è¼ã¯ç" + 7 "èªè¨¼æ¹å¼ããµãã¼ãããã¦ãã¾ãã" + 8 "å¼·ãèªè¨¼ãå¿è¦ã§ã" + 9 "å§è¨ (v2)" + 10 "å§è¨" + 11 "èªè¨¼å¶éãè¶ãã¾ãã" + 12 "éå¤§ãªæ¡å¼µãå©ç¨ã§ãã¾ãã" + 13 "æ©å¯ãè¦ãã¾ã" + 14 "" + 15 "" + 16 "ãã®ãããªå±æ§ã¯ããã¾ãã" + 17 "æªå®ç¾©ã®å" + 18 "ä¸é©åãªãããã³ã°" + 19 "å¶ç´ã®éå" + 20 "å±æ§ã¾ãã¯å¤ãåå¨ãã¾ã" + 21 "ç¡å¹ãªææ³" + 22 "" + 23 "" + 24 "" + 25 "" + 26 "" + 27 "" + 28 "" + 29 "" + 30 "" + 31 "" + 32 "ãã®ãããªãªãã¸ã§ã¯ãã¯ããã¾ãã" + 33 "ã¨ã¤ãªã¢ã¹åé¡" + 34 "ä¸æ£ãªDNææ³" + 35 "ãªã¼ãã" + 36 "ã¨ã¤ãªã¢ã¹å¤åç§åé¡" + 37 "" + 38 "" + 39 "" + 40 "" + 41 "" + 42 "" + 43 "" + 44 "" + 45 "" + 46 "" + 47 "" + 48 "ä¸é©åãªèªè¨¼" + 49 "ç¡å¹ãªè¨¼ææ¸" + 50 "æ¨©éãä¸è¶³" + 51 "ãã¸ã¼" + 52 "å©ç¨ã§ãã¾ãã" + 53 "æã¾ãªãå®è¡" + 54 "ã«ã¼ããæ¤åºããã¾ãã" + 55 "" + 56 "" + 57 "" + 58 "" + 59 "" + 60 "ä¸¦ã¹æ¿ãå¶å¾¡ãããã¾ãã" + 61 "ã¤ã³ããã¯ã¹ç¯å²å¤ã¨ã©ã¼" + 62 "" + 63 "" + 64 "ååä»ãéå" + 65 "ãªãã¸ã§ã¯ã ã¯ã©ã¹éå" + 66 "ãã³ãªã¼ãã§ã¯è¨±ããã¦ãã¾ãã" + 67 "RDNã§ã¯è¨±ããã¦ãã¾ãã" + 68 "ãã§ã«åå¨ãã¾ã" + 69 "ãªãã¸ã§ã¯ã ã¯ã©ã¹ ã¢ã¸ã¥ã¼ã«ãããã¾ãã" + 70 "çµæãå¤§ãããã¾ã" + 71 "è¤æ°ã®DSAã«å½±é¿ãã¾ã" + 72 "" + 73 "" + 74 "" + 75 "" + 76 "" + 77 "" + 78 "" + 79 "" + 80 "ãã®ä»" + 81 "ãµã¼ãã¼ãè½ã¡ã¦ãã¾ã" + 82 "ãã¼ã«ã« ã¨ã©ã¼" + 83 "ã¨ã³ã³ã¼ãã£ã³ã° ã¨ã©ã¼" + 84 "ãã³ã¼ãã£ã³ã° ã¨ã©ã¼" + 85 "ã¿ã¤ã ã¢ã¦ã" + 86 "æªç¥ã®èªè¨¼" + 87 "ãã£ã«ã¿ã¼ ã¨ã©ã¼" + 88 "ã¦ã¼ã¶ã¼ã«ãã£ã¦ãã£ã³ã»ã«ããã¾ãã" + 89 "å¼æ°ã¨ã©ã¼" + 90 "ã¡ã¢ãªã¼ä¸è¶³" + 91 "LDAPãµã¼ãã¼ã«æ¥ç¶ã§ãã¾ãã" + 92 "æä½ã¯ãã®ãã¼ã¸ã§ã³ã®LDAPãããã³ã«ã§ã¯ãµãã¼ãããã¦ãã¾ãã" + 93 "æå®ããå¶å¾¡ã¯ãã¡ãã»ã¼ã¸åã§è¦ã¤ããã¾ããã§ãã" + 94 "ã¡ãã»ã¼ã¸ã«çµæãããã¾ãã" + 95 "ãããªãçµæãè¿ããã¾ãã" + 96 "ãã³ããªã³ã°å§è¨ã®éãã«ã¼ã" + 97 "å§è¨å·¡ããéçãè¶ãã¾ãã" +} Propchange: trunk/reactos/dll/win32/wldap32/lang/wldap32_Ja.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/wldap32/wldap32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/wldap32.… ============================================================================== --- trunk/reactos/dll/win32/wldap32/wldap32.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/wldap32.rc [iso-8859-1] Thu Aug 25 03:44:29 2016 @@ -47,6 +47,9 @@ #ifdef LANGUAGE_IT_IT #include "lang/wldap32_It.rc" #endif +#ifdef LANGUAGE_JA_JP + #include "lang/wldap32_Ja.rc" +#endif #ifdef LANGUAGE_KO_KR #include "lang/wldap32_Ko.rc" #endif

1 0

[aandrejevic] 72451: [NTVDM:BIOS] Implement VBE function AH = 0x05, "CPU Video Memory Control".
by aandrejevic＠svn.reactos.org 25 Aug '16

25 Aug '16

Author: aandrejevic Date: Thu Aug 25 03:01:18 2016 New Revision: 72451 URL: http://svn.reactos.org/svn/reactos?rev=72451&view=rev Log: [NTVDM:BIOS] Implement VBE function AH = 0x05, "CPU Video Memory Control". Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vbe.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vbe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vbe.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vbe.c [iso-8859-1] Thu Aug 25 03:01:18 2016 @@ -525,6 +525,53 @@ break; } + /* CPU Video Memory Control */ + case 0x05: + { + BYTE Window = getBL(); + BYTE OldGcIndex = IOReadB(VGA_GC_INDEX); + + switch (getBH()) + { + /* Select Memory Window */ + case 0: + { + setAL(0x4F); + + if (getDH() != 0) + { + /* Offset too high */ + setAH(1); + break; + } + + IOWriteB(VGA_GC_INDEX, (Window == 0) ? SVGA_GC_OFFSET_0_REG : SVGA_GC_OFFSET_1_REG); + IOWriteB(VGA_GC_DATA, getDL()); + + setAH(0); + break; + } + + /* Return Memory Window */ + case 1: + { + IOWriteB(VGA_GC_INDEX, (Window == 0) ? SVGA_GC_OFFSET_0_REG : SVGA_GC_OFFSET_1_REG); + setDX(IOReadB(VGA_GC_DATA)); + + setAX(0x004F); + break; + } + + default: + { + DPRINT("VESA INT 0x10, AH = 0x05, Unknown subfunction: %02X", getBH()); + } + } + + IOWriteB(VGA_GC_INDEX, OldGcIndex); + break; + } + default: { DPRINT1("VESA BIOS Extensions function %02Xh NOT IMPLEMENTED!\n", getAL());

1 0

[hbelusca] 72450: [BOOTDATA] - Remove invalid "ServiceType" registry value of the MPU401 driver. - Fix MUP driver group. - Fix MountMgr driver group. - Fix rosfltmgr driver group. - Add "Base" grou...
by hbelusca＠svn.reactos.org 24 Aug '16

24 Aug '16

Author: hbelusca Date: Wed Aug 24 19:55:12 2016 New Revision: 72450 URL: http://svn.reactos.org/svn/reactos?rev=72450&view=rev Log: [BOOTDATA] - Remove invalid "ServiceType" registry value of the MPU401 driver. - Fix MUP driver group. - Fix MountMgr driver group. - Fix rosfltmgr driver group. - Add "Base" group list (until we have it inside some driver inf). - Add tags for acpi, pci, null, beep and ksecdd drivers. Modified: trunk/reactos/boot/bootdata/hivesys.inf trunk/reactos/drivers/base/beep/beep_reg.inf trunk/reactos/drivers/crypto/ksecdd/ksecdd_reg.inf trunk/rosapps/drivers/green/green.inf Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] Wed Aug 24 19:55:12 2016 @@ -1300,6 +1300,10 @@ ; Group order, the first DWORD is the count of entries, ; the following dwords are the tag entries for the load order. +HKLM,"SYSTEM\CurrentControlSet\Control\GroupOrderList","Base", 0x00000001, \ + 0x02, 0x00, 0x00, 0x00, \ + 0x01, 0x00, 0x00, 0x00, \ + 0x02, 0x00, 0x00, 0x00 HKLM,"SYSTEM\CurrentControlSet\Control\GroupOrderList","Video Save", 0x00000001, \ 0x02, 0x00, 0x00, 0x00, \ 0x01, 0x00, 0x00, 0x00, \ @@ -1499,18 +1503,16 @@ HKLM,"SYSTEM\CurrentControlSet\Services\lanmanworkstation\Parameters","ServiceDll",0x00020000,"%SystemRoot%\system32\wkssvc.dll" ; MPU-401 MIDI driver +HKLM,"SYSTEM\CurrentControlSet\Services\mpu401","ErrorControl",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\mpu401","Group",0x00000000,"Base" -HKLM,"SYSTEM\CurrentControlSet\Services\mpu401","ServiceType",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\mpu401","ImagePath",0x00020000,"system32\drivers\mpu401.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\mpu401","Start",0x00010001,0x00000004 HKLM,"SYSTEM\CurrentControlSet\Services\mpu401","Type",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\mpu401","Start",0x00010001,0x00000004 -HKLM,"SYSTEM\CurrentControlSet\Services\mpu401","ErrorControl",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\mpu401","ImagePath",0x00020000,"system32\drivers\mpu401.sys" ; Multiple UNC provider driver HKLM,"SYSTEM\CurrentControlSet\Services\Mup","Description",0x00000000,"Multiple UNC Provider (MUP)" HKLM,"SYSTEM\CurrentControlSet\Services\Mup","ErrorControl",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\Mup","Group",0x00000000,"Network" -HKLM,"SYSTEM\CurrentControlSet\Services\Mup","Group",0x00000000,"File System" HKLM,"SYSTEM\CurrentControlSet\Services\Mup","ImagePath",0x00020000,"system32\drivers\mup.sys" HKLM,"SYSTEM\CurrentControlSet\Services\Mup","Start",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\Mup","Type",0x00010001,0x00000002 @@ -1542,6 +1544,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Null","Group",0x00000000,"Base" HKLM,"SYSTEM\CurrentControlSet\Services\Null","ImagePath",0x00020000,"system32\drivers\null.sys" HKLM,"SYSTEM\CurrentControlSet\Services\Null","Start",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\Null","Tag",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\Null","Type",0x00010001,0x00000001 ; NMI device driver @@ -1630,7 +1633,7 @@ ; MountMgr driver HKLM,"SYSTEM\CurrentControlSet\Services\MountMgr","ErrorControl",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\MountMgr","Group",0x00000000,"Boot Bus Extender" +HKLM,"SYSTEM\CurrentControlSet\Services\MountMgr","Group",0x00000000,"System Bus Extender" HKLM,"SYSTEM\CurrentControlSet\Services\MountMgr","ImagePath",0x00020000,"system32\drivers\mountmgr.sys" HKLM,"SYSTEM\CurrentControlSet\Services\MountMgr","Start",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\MountMgr","Tag",0x00010001,0x00000008 @@ -1641,6 +1644,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\acpi","Group",0x00000000,"Boot Bus Extender" HKLM,"SYSTEM\CurrentControlSet\Services\acpi","ImagePath",0x00020000,"system32\drivers\acpi.sys" HKLM,"SYSTEM\CurrentControlSet\Services\acpi","Start",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\acpi","Tag",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\acpi","Type",0x00010001,0x00000001 ; PCI Bus driver @@ -1648,6 +1652,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Pci","Group",0x00000000,"Boot Bus Extender" HKLM,"SYSTEM\CurrentControlSet\Services\Pci","ImagePath",0x00020000,"system32\drivers\pci.sys" HKLM,"SYSTEM\CurrentControlSet\Services\Pci","Start",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci","Tag",0x00010001,0x00000002 HKLM,"SYSTEM\CurrentControlSet\Services\Pci","Type",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","1045C621",0x00030003,04,00,00,00,00,00,00,00 HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10950640",0x00030003,04,00,00,00,00,00,00,00 @@ -2004,7 +2009,7 @@ ; Filesystem Filter Manager driver HKLM,"SYSTEM\CurrentControlSet\Services\rosfltmgr","ErrorControl",0x00010001,0x00000003 -HKLM,"SYSTEM\CurrentControlSet\Services\rosfltmgr","Group",0x00000000,"Boot File System" +HKLM,"SYSTEM\CurrentControlSet\Services\rosfltmgr","Group",0x00000000,"FSFilter Infrastructure" HKLM,"SYSTEM\CurrentControlSet\Services\rosfltmgr","ImagePath",0x00020000,"system32\drivers\rosfltmgr.sys" HKLM,"SYSTEM\CurrentControlSet\Services\rosfltmgr","Start",0x00010001,0x00000003 HKLM,"SYSTEM\CurrentControlSet\Services\rosfltmgr","Type",0x00010001,0x00000002 Modified: trunk/reactos/drivers/base/beep/beep_reg.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/beep/beep_reg… ============================================================================== --- trunk/reactos/drivers/base/beep/beep_reg.inf [iso-8859-1] (original) +++ trunk/reactos/drivers/base/beep/beep_reg.inf [iso-8859-1] Wed Aug 24 19:55:12 2016 @@ -4,4 +4,5 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Beep","Group",0x00000000,"Base" HKLM,"SYSTEM\CurrentControlSet\Services\Beep","ImagePath",0x00020000,"system32\drivers\beep.sys" HKLM,"SYSTEM\CurrentControlSet\Services\Beep","Start",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\Beep","Tag",0x00010001,0x00000002 HKLM,"SYSTEM\CurrentControlSet\Services\Beep","Type",0x00010001,0x00000001 Modified: trunk/reactos/drivers/crypto/ksecdd/ksecdd_reg.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/crypto/ksecdd/ksec… ============================================================================== --- trunk/reactos/drivers/crypto/ksecdd/ksecdd_reg.inf [iso-8859-1] (original) +++ trunk/reactos/drivers/crypto/ksecdd/ksecdd_reg.inf [iso-8859-1] Wed Aug 24 19:55:12 2016 @@ -4,4 +4,5 @@ HKLM,"SYSTEM\CurrentControlSet\Services\ksecdd","Group",0x00000000,"Base" HKLM,"SYSTEM\CurrentControlSet\Services\ksecdd","ImagePath",0x00020000,"system32\drivers\ksecdd.sys" HKLM,"SYSTEM\CurrentControlSet\Services\ksecdd","Start",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\ksecdd","Tag",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\ksecdd","Type",0x00010001,0x00000001 Modified: trunk/rosapps/drivers/green/green.inf URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/drivers/green/green.inf?re… ============================================================================== --- trunk/rosapps/drivers/green/green.inf [iso-8859-1] (original) +++ trunk/rosapps/drivers/green/green.inf [iso-8859-1] Wed Aug 24 19:55:12 2016 @@ -38,7 +38,7 @@ StartType = 1 ErrorControl = 0 ServiceBinary = %12%\green.sys -LoadOrderGroup = Extended base +LoadOrderGroup = Extended Base Description = %GREEN.DriverDesc% Dependencies = blue, serial

1 0

[ekohl] 72449: [LSASRV] LsarSetSecurityObject: Impersonate the client and retrieve the client token when the owner sid will be set.
by ekohl＠svn.reactos.org 23 Aug '16

23 Aug '16

Author: ekohl Date: Tue Aug 23 21:14:17 2016 New Revision: 72449 URL: http://svn.reactos.org/svn/reactos?rev=72449&view=rev Log: [LSASRV] LsarSetSecurityObject: Impersonate the client and retrieve the client token when the owner sid will be set. Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsarpc.c?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] Tue Aug 23 21:14:17 2016 @@ -372,18 +372,27 @@ if (!NT_SUCCESS(Status)) goto done; -#if 0 - RpcImpersonateClient(NULL); - - Status = NtOpenThreadToken(NtCurrentThread(), - 8, - TRUE, - &hToken); - if (!NT_SUCCESS(Status)) - goto done; - - RpcRevertToSelf(); -#endif + /* Get the clients token if we try to set the owner */ + if (SecurityInformation & OWNER_SECURITY_INFORMATION) + { + Status = I_RpcMapWin32Status(RpcImpersonateClient(NULL)); + if (!NT_SUCCESS(Status)) + { + ERR("RpcImpersonateClient returns 0x%08lx\n", Status); + goto done; + } + + Status = NtOpenThreadToken(NtCurrentThread(), + TOKEN_QUERY, + TRUE, + &TokenHandle); + RpcRevertToSelf(); + if (!NT_SUCCESS(Status)) + { + ERR("NtOpenThreadToken returns 0x%08lx\n", Status); + goto done; + } + } /* Build the new security descriptor */ Status = RtlSetSecurityObject(SecurityInformation,

1 0

[akhaldi] 72448: [ACPPAGE] Improve header inclusions.
by akhaldi＠svn.reactos.org 23 Aug '16

23 Aug '16

Author: akhaldi Date: Tue Aug 23 19:37:31 2016 New Revision: 72448 URL: http://svn.reactos.org/svn/reactos?rev=72448&view=rev Log: [ACPPAGE] Improve header inclusions. Modified: trunk/reactos/dll/shellext/acppage/ACPPage.cpp trunk/reactos/dll/shellext/acppage/CLayerUIPropPage.cpp trunk/reactos/dll/shellext/acppage/precomp.h Modified: trunk/reactos/dll/shellext/acppage/ACPPage.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/ACPPa… ============================================================================== --- trunk/reactos/dll/shellext/acppage/ACPPage.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/acppage/ACPPage.cpp [iso-8859-1] Tue Aug 23 19:37:31 2016 @@ -17,6 +17,8 @@ */ #include "precomp.h" + +#include <shellutils.h> HMODULE g_hModule = NULL; LONG g_ModuleRefCnt = 0; Modified: trunk/reactos/dll/shellext/acppage/CLayerUIPropPage.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/CLaye… ============================================================================== --- trunk/reactos/dll/shellext/acppage/CLayerUIPropPage.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/acppage/CLayerUIPropPage.cpp [iso-8859-1] Tue Aug 23 19:37:31 2016 @@ -17,6 +17,11 @@ */ #include "precomp.h" + +#include <shlwapi.h> +#include <shellapi.h> +#include <strsafe.h> +#include <apphelp.h> #include <windowsx.h> #include <sfc.h> Modified: trunk/reactos/dll/shellext/acppage/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/preco… ============================================================================== --- trunk/reactos/dll/shellext/acppage/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/acppage/precomp.h [iso-8859-1] Tue Aug 23 19:37:31 2016 @@ -1,8 +1,5 @@ #ifndef ACPPAGE_PRECOMP_H #define ACPPAGE_PRECOMP_H - -#include <stdarg.h> -#include <assert.h> #define COBJMACROS #define WIN32_NO_STATUS @@ -10,25 +7,13 @@ #define COM_NO_WINDOWS_H #define NTOS_MODE_USER -#include <windows.h> - #include <windef.h> #include <winbase.h> -#include <winreg.h> -#include <winuser.h> - #include <shlobj.h> -#include <shlwapi.h> -#include <shellapi.h> -#include <tchar.h> -#include <strsafe.h> #include <atlbase.h> #include <atlcom.h> -#include <atlwin.h> + ULONG DbgPrint(PCH Format,...); -#include <shellutils.h> -#include <prsht.h> -#include <apphelp.h> extern const GUID CLSID_CLayerUIPropPage; extern HMODULE g_hModule;

1 0

[akhaldi] 72447: [STRMBASE] Sync with Wine Staging 1.9.16. CORE-11866
by akhaldi＠svn.reactos.org 23 Aug '16

23 Aug '16

Author: akhaldi Date: Tue Aug 23 19:35:53 2016 New Revision: 72447 URL: http://svn.reactos.org/svn/reactos?rev=72447&view=rev Log: [STRMBASE] Sync with Wine Staging 1.9.16. CORE-11866 Modified: trunk/reactos/media/doc/README.WINE trunk/reactos/sdk/lib/3rdparty/strmbase/mediatype.c trunk/reactos/sdk/lib/3rdparty/strmbase/qualitycontrol.c trunk/reactos/sdk/lib/3rdparty/strmbase/video.c Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Tue Aug 23 19:35:53 2016 @@ -252,7 +252,7 @@ from Winehq CVS. If you are looking to update something in these files check Wine current sources first as it may already be fixed. -reactos/sdk/lib/3rdparty/strmbase # Synced to WineStaging-1.9.11 +reactos/sdk/lib/3rdparty/strmbase # Synced to WineStaging-1.9.16 reactos/sdk/lib/rtl/actctx.c # Partly synced with WineStaging-1.7.55 reactos/sdk/lib/rtl/timerqueue.c # Partly synced with WineStaging-1.7.55 Modified: trunk/reactos/sdk/lib/3rdparty/strmbase/mediatype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/strmbase/… ============================================================================== --- trunk/reactos/sdk/lib/3rdparty/strmbase/mediatype.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/3rdparty/strmbase/mediatype.c [iso-8859-1] Tue Aug 23 19:35:53 2016 @@ -104,11 +104,11 @@ IEnumMediaTypesImpl * pEnumMediaTypes = CoTaskMemAlloc(sizeof(IEnumMediaTypesImpl)); AM_MEDIA_TYPE amt; + *ppEnum = NULL; + if (!pEnumMediaTypes) - { - *ppEnum = NULL; return E_OUTOFMEMORY; - } + pEnumMediaTypes->IEnumMediaTypes_iface.lpVtbl = &IEnumMediaTypesImpl_Vtbl; pEnumMediaTypes->refCount = 1; pEnumMediaTypes->uIndex = 0; @@ -122,14 +122,13 @@ pEnumMediaTypes->enumMediaDetails.cMediaTypes = i; pEnumMediaTypes->enumMediaDetails.pMediaTypes = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE) * i); + memset(pEnumMediaTypes->enumMediaDetails.pMediaTypes, 0, sizeof(AM_MEDIA_TYPE) * i); for (i = 0; i < pEnumMediaTypes->enumMediaDetails.cMediaTypes; i++) { enumFunc(basePin,i,&amt); if (FAILED(CopyMediaType(&pEnumMediaTypes->enumMediaDetails.pMediaTypes[i], &amt))) { - while (i--) - FreeMediaType(&pEnumMediaTypes->enumMediaDetails.pMediaTypes[i]); - CoTaskMemFree(pEnumMediaTypes->enumMediaDetails.pMediaTypes); + IEnumMediaTypes_Release(&pEnumMediaTypes->IEnumMediaTypes_iface); return E_OUTOFMEMORY; } } Modified: trunk/reactos/sdk/lib/3rdparty/strmbase/qualitycontrol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/strmbase/… ============================================================================== --- trunk/reactos/sdk/lib/3rdparty/strmbase/qualitycontrol.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/3rdparty/strmbase/qualitycontrol.c [iso-8859-1] Tue Aug 23 19:35:53 2016 @@ -25,9 +25,14 @@ #include "strmbase_private.h" -HRESULT QualityControlImpl_Create(IPin *input, IBaseFilter *self, QualityControlImpl **ppv) { +#define XTIME_FMT "%u.%03u" +#define XTIME(u) (int)(u/10000000), (int)((u / 10000)%1000) + +HRESULT QualityControlImpl_Create(IPin *input, IBaseFilter *self, QualityControlImpl **ppv) +{ QualityControlImpl *This; - *ppv = HeapAlloc(GetProcessHeap(),0,sizeof(QualityControlImpl)); + TRACE("%p, %p, %p\n", input, self, ppv); + *ppv = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(QualityControlImpl)); if (!*ppv) return E_OUTOFMEMORY; This = *ppv; @@ -35,6 +40,8 @@ This->self = self; This->tonotify = NULL; This->clock = NULL; + This->current_rstart = This->current_rstop = -1; + TRACE("-> %p\n", This); return S_OK; } @@ -43,26 +50,41 @@ HeapFree(GetProcessHeap(),0,This); } -HRESULT WINAPI QualityControlImpl_QueryInterface(IQualityControl *iface, REFIID riid, void **ppv) { - QualityControlImpl *This = (QualityControlImpl*)iface; +static inline QualityControlImpl *impl_from_IQualityControl(IQualityControl *iface) +{ + return CONTAINING_RECORD(iface, QualityControlImpl, IQualityControl_iface); +} + +HRESULT WINAPI QualityControlImpl_QueryInterface(IQualityControl *iface, REFIID riid, void **ppv) +{ + QualityControlImpl *This = impl_from_IQualityControl(iface); return IBaseFilter_QueryInterface(This->self, riid, ppv); } -ULONG WINAPI QualityControlImpl_AddRef(IQualityControl *iface) { - QualityControlImpl *This = (QualityControlImpl*)iface; +ULONG WINAPI QualityControlImpl_AddRef(IQualityControl *iface) +{ + QualityControlImpl *This = impl_from_IQualityControl(iface); return IBaseFilter_AddRef(This->self); } -ULONG WINAPI QualityControlImpl_Release(IQualityControl *iface) { - QualityControlImpl *This = (QualityControlImpl*)iface; +ULONG WINAPI QualityControlImpl_Release(IQualityControl *iface) +{ + QualityControlImpl *This = impl_from_IQualityControl(iface); return IBaseFilter_Release(This->self); } -HRESULT WINAPI QualityControlImpl_Notify(IQualityControl *iface, IBaseFilter *sender, Quality qm) { +HRESULT WINAPI QualityControlImpl_Notify(IQualityControl *iface, IBaseFilter *sender, Quality qm) +{ + QualityControlImpl *This = impl_from_IQualityControl(iface); HRESULT hr = S_FALSE; - QualityControlImpl *This = (QualityControlImpl*)iface; + + TRACE("%p %p { 0x%x %u " XTIME_FMT " " XTIME_FMT " }\n", + This, sender, qm.Type, qm.Proportion, + XTIME(qm.Late), XTIME(qm.TimeStamp)); + if (This->tonotify) return IQualityControl_Notify(This->tonotify, This->self, qm); + if (This->input) { IPin *to = NULL; IPin_ConnectedTo(This->input, &to); @@ -76,11 +98,14 @@ IPin_Release(to); } } + return hr; } -HRESULT WINAPI QualityControlImpl_SetSink(IQualityControl *iface, IQualityControl *tonotify) { - QualityControlImpl *This = (QualityControlImpl*)iface; +HRESULT WINAPI QualityControlImpl_SetSink(IQualityControl *iface, IQualityControl *tonotify) +{ + QualityControlImpl *This = impl_from_IQualityControl(iface); + TRACE("%p %p\n", This, tonotify); This->tonotify = tonotify; return S_OK; } @@ -97,7 +122,9 @@ #define UPDATE_RUNNING_AVG_P(avg,val) DO_RUNNING_AVG(avg,val,16) #define UPDATE_RUNNING_AVG_N(avg,val) DO_RUNNING_AVG(avg,val,4) -void QualityControlRender_Start(QualityControlImpl *This, REFERENCE_TIME tStart) { +void QualityControlRender_Start(QualityControlImpl *This, REFERENCE_TIME tStart) +{ + TRACE("%p " XTIME_FMT "\n", This, XTIME(tStart)); This->avg_render = This->last_in_time = This->last_left = This->avg_duration = This->avg_pt = -1; This->clockstart = tStart; This->avg_rate = -1.0; @@ -107,7 +134,9 @@ } -void QualityControlRender_SetClock(QualityControlImpl *This, IReferenceClock *clock) { +void QualityControlRender_SetClock(QualityControlImpl *This, IReferenceClock *clock) +{ + TRACE("%p %p\n", This, clock); This->clock = clock; } @@ -115,6 +144,9 @@ REFERENCE_TIME start, REFERENCE_TIME stop) { REFERENCE_TIME max_lateness = 200000; + + TRACE("%p " XTIME_FMT " " XTIME_FMT " " XTIME_FMT "\n", + This, XTIME(jitter), XTIME(start), XTIME(stop)); /* we can add a valid stop time */ if (stop >= start) @@ -137,8 +169,12 @@ return FALSE; } -HRESULT QualityControlRender_WaitFor(QualityControlImpl *This, IMediaSample *sample, HANDLE ev) { +HRESULT QualityControlRender_WaitFor(QualityControlImpl *This, IMediaSample *sample, HANDLE ev) +{ REFERENCE_TIME start = -1, stop = -1, jitter = 0; + + TRACE("%p %p %p\n", This, sample, ev); + This->current_rstart = This->current_rstop = -1; This->current_jitter = 0; if (!This->clock || FAILED(IMediaSample_GetTime(sample, &start, &stop))) @@ -178,6 +214,8 @@ REFERENCE_TIME start, stop, jitter, pt, entered, left, duration; double rate; + TRACE("%p\n", priv); + if (!priv->clock || priv->current_rstart < 0) return; @@ -217,14 +255,12 @@ pt = priv->avg_pt; } -#define XTIME(u) (int)(u/10000000), (int)((u / 10000)%1000) - TRACE("start: %u.%03u, entered %u.%03u, left %u.%03u, pt: %u.%03u, " - "duration %u.%03u, jitter %u.%03u\n", XTIME(start), XTIME(entered), + TRACE("start: " XTIME_FMT ", entered " XTIME_FMT ", left " XTIME_FMT ", pt: " XTIME_FMT ", " + "duration " XTIME_FMT ", jitter " XTIME_FMT "\n", XTIME(start), XTIME(entered), XTIME(left), XTIME(pt), XTIME(duration), XTIME(jitter)); - TRACE("avg_duration: %u.%03u, avg_pt: %u.%03u, avg_rate: %g\n", + TRACE("avg_duration: " XTIME_FMT ", avg_pt: " XTIME_FMT ", avg_rate: %g\n", XTIME(priv->avg_duration), XTIME(priv->avg_pt), priv->avg_rate); -#undef XTIME /* collect running averages. for first observations, we copy the * values */ @@ -277,7 +313,7 @@ q.Late = priv->current_jitter; q.TimeStamp = priv->current_rstart; TRACE("Late: %i from %i, rate: %g\n", (int)(q.Late/10000), (int)(q.TimeStamp/10000), 1./priv->avg_rate); - hr = IQualityControl_Notify((IQualityControl *)priv, priv->self, q); + hr = IQualityControl_Notify(&priv->IQualityControl_iface, priv->self, q); priv->qos_handled = hr == S_OK; } @@ -286,15 +322,25 @@ } -void QualityControlRender_BeginRender(QualityControlImpl *This) { +void QualityControlRender_BeginRender(QualityControlImpl *This) +{ + TRACE("%p\n", This); + This->start = -1; + if (!This->clock) return; + IReferenceClock_GetTime(This->clock, &This->start); -} - -void QualityControlRender_EndRender(QualityControlImpl *This) { + TRACE("at: " XTIME_FMT "\n", XTIME(This->start)); +} + +void QualityControlRender_EndRender(QualityControlImpl *This) +{ REFERENCE_TIME elapsed; + + TRACE("%p\n", This); + if (!This->clock || This->start < 0 || FAILED(IReferenceClock_GetTime(This->clock, &This->stop))) return; Modified: trunk/reactos/sdk/lib/3rdparty/strmbase/video.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/strmbase/… ============================================================================== --- trunk/reactos/sdk/lib/3rdparty/strmbase/video.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/3rdparty/strmbase/video.c [iso-8859-1] Tue Aug 23 19:35:53 2016 @@ -358,10 +358,8 @@ BaseControlVideo *This = impl_from_IBasicVideo(iface); TRACE("(%p/%p)->(%d, %d, %d, %d)\n", This, iface, Left, Top, Width, Height); - SourceRect.left = Left; - SourceRect.top = Top; - SourceRect.right = Left + Width; - SourceRect.bottom = Top + Height; + + SetRect(&SourceRect, Left, Top, Left + Width, Top + Height); This->pFuncsTable->pfnSetSourceRect(This, &SourceRect); return S_OK; @@ -398,10 +396,7 @@ TRACE("(%p/%p)->(%d, %d, %d, %d)\n", This, iface, Left, Top, Width, Height); - DestRect.left = Left; - DestRect.top = Top; - DestRect.right = Left + Width; - DestRect.bottom = Top + Height; + SetRect(&DestRect, Left, Top, Left + Width, Top + Height); This->pFuncsTable->pfnSetTargetRect(This, &DestRect); return S_OK;

1 0

[akhaldi] 72446: [RPCSS] Sync with Wine Staging 1.9.16. CORE-11866
by akhaldi＠svn.reactos.org 23 Aug '16

23 Aug '16

Author: akhaldi Date: Tue Aug 23 19:34:57 2016 New Revision: 72446 URL: http://svn.reactos.org/svn/reactos?rev=72446&view=rev Log: [RPCSS] Sync with Wine Staging 1.9.16. CORE-11866 Modified: trunk/reactos/base/services/rpcss/epmp.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/base/services/rpcss/epmp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/rpcss/epmp.c… ============================================================================== --- trunk/reactos/base/services/rpcss/epmp.c [iso-8859-1] (original) +++ trunk/reactos/base/services/rpcss/epmp.c [iso-8859-1] Tue Aug 23 19:34:57 2016 @@ -112,7 +112,6 @@ *status = EPT_S_CANT_PERFORM_OP; break; } - list_init(&entry->entry); memcpy(entry->annotation, entries[i].annotation, sizeof(entries[i].annotation)); rpc_status = TowerExplode(entries[i].tower, &entry->iface, &entry->syntax, &entry->protseq, &entry->endpoint, @@ -121,6 +120,7 @@ { WINE_WARN("TowerExplode failed %u\n", rpc_status); *status = rpc_status; + HeapFree(GetProcessHeap(), 0, entry); break; /* FIXME: more cleanup? */ } @@ -164,6 +164,11 @@ if (rpc_status != RPC_S_OK) break; entry = find_ept_entry(&iface, &syntax, protseq, endpoint, address, &entries[i].object); + + I_RpcFree(protseq); + I_RpcFree(endpoint); + I_RpcFree(address); + if (entry) delete_registered_ept_entry(entry); else @@ -171,9 +176,6 @@ *status = EPT_S_NOT_REGISTERED; break; } - I_RpcFree(protseq); - I_RpcFree(endpoint); - I_RpcFree(address); } LeaveCriticalSection(&csEpm); Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Tue Aug 23 19:34:57 2016 @@ -243,7 +243,7 @@ reactos/base/applications/winhlp32 # Synced to WineStaging-1.9.16 reactos/base/applications/wordpad # Synced to WineStaging-1.9.16 reactos/base/applications/write # Synced to WineStaging-1.9.16 -reactos/base/services/rpcss # Synced to WineStaging-1.9.11 +reactos/base/services/rpcss # Synced to WineStaging-1.9.16 reactos/base/system/expand # Synced to WineStaging-1.9.11 reactos/base/system/msiexec # Synced to WineStaging-1.9.11 reactos/modules/rosapps/winfile # Autosync

1 0

[akhaldi] 72445: [WRITE] Sync with Wine Staging 1.9.16. CORE-11866
by akhaldi＠svn.reactos.org 23 Aug '16

23 Aug '16

Author: akhaldi Date: Tue Aug 23 19:34:21 2016 New Revision: 72445 URL: http://svn.reactos.org/svn/reactos?rev=72445&view=rev Log: [WRITE] Sync with Wine Staging 1.9.16. CORE-11866 Modified: trunk/reactos/base/applications/write/write.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/base/applications/write/write.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/write/wr… ============================================================================== --- trunk/reactos/base/applications/write/write.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/write/write.c [iso-8859-1] Tue Aug 23 19:34:21 2016 @@ -25,8 +25,7 @@ #include "resources.h" -static const WCHAR SZ_BACKSLASH[] = {'\\',0}; -static const WCHAR SZ_WORDPAD[] = {'w','o','r','d','p','a','d','.','e','x','e',0}; +static const WCHAR SZ_WORDPAD[] = {'\\','w','o','r','d','p','a','d','.','e','x','e',0}; int CALLBACK wWinMain(HINSTANCE hInstance, HINSTANCE hOldInstance, LPWSTR szCmdParagraph, int res) { @@ -35,20 +34,14 @@ PROCESS_INFORMATION info; if (!GetSystemDirectoryW(path, MAX_PATH - 1 - lstrlenW(SZ_WORDPAD))) - goto failed; - - if (path[lstrlenW(path) - 1] != '\\') - lstrcatW(path, SZ_BACKSLASH); - + goto failed; lstrcatW(path, SZ_WORDPAD); - ZeroMemory(&stinf, sizeof(stinf)); - stinf.cb = sizeof(stinf); + stinf.cb = sizeof(STARTUPINFOW); GetStartupInfoW(&stinf); if (!CreateProcessW(path, GetCommandLineW(), NULL, NULL, FALSE, 0, NULL, NULL, &stinf, &info)) - goto failed; - + goto failed; CloseHandle(info.hProcess); CloseHandle(info.hThread); return 0; Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Tue Aug 23 19:34:21 2016 @@ -242,6 +242,7 @@ reactos/base/applications/regedit # Out of sync reactos/base/applications/winhlp32 # Synced to WineStaging-1.9.16 reactos/base/applications/wordpad # Synced to WineStaging-1.9.16 +reactos/base/applications/write # Synced to WineStaging-1.9.16 reactos/base/services/rpcss # Synced to WineStaging-1.9.11 reactos/base/system/expand # Synced to WineStaging-1.9.11 reactos/base/system/msiexec # Synced to WineStaging-1.9.11

1 0

[akhaldi] 72444: [WORDPAD] Sync with Wine Staging 1.9.16. CORE-11866
by akhaldi＠svn.reactos.org 23 Aug '16

23 Aug '16

Author: akhaldi Date: Tue Aug 23 19:32:58 2016 New Revision: 72444 URL: http://svn.reactos.org/svn/reactos?rev=72444&view=rev Log: [WORDPAD] Sync with Wine Staging 1.9.16. CORE-11866 Modified: trunk/reactos/base/applications/wordpad/print.c trunk/reactos/base/applications/wordpad/registry.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/base/applications/wordpad/print.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/print.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/print.c [iso-8859-1] Tue Aug 23 19:32:58 2016 @@ -93,12 +93,7 @@ if(!hKey || RegQueryValueExW(hKey, var_pagemargin, 0, NULL, (LPBYTE)&margins, &size) != ERROR_SUCCESS || size != sizeof(RECT)) - { - margins.top = 1417; - margins.bottom = 1417; - margins.left = 1757; - margins.right = 1757; - } + SetRect(&margins, 1757, 1417, 1757, 1417); } void registry_set_previewpages(HKEY hKey) @@ -206,10 +201,7 @@ height = centmm_to_twips(27000); } - rc.left = margins.left; - rc.right = width - margins.right; - rc.top = margins.top; - rc.bottom = height - margins.bottom; + SetRect(&rc, margins.left, margins.top, width - margins.right, height - margins.bottom); return rc; } @@ -394,8 +386,7 @@ GetClientRect(hWnd, &drawRect); FillRect(hdc, &drawRect, hBrush); - drawRect.top += 3; - drawRect.bottom -= 3; + InflateRect(&drawRect, 0, -3); drawRect.left = EditLeftmost; drawRect.right = twips_to_pixels(printRect.right - margins.left, GetDeviceCaps(hdc, LOGPIXELSX)); FillRect(hdc, &drawRect, GetStockObject(WHITE_BRUSH)); @@ -457,10 +448,7 @@ fr.hdcTarget = pd->hDC; fr.rc = get_print_rect(fr.hdc); - fr.rcPage.left = 0; - fr.rcPage.right = fr.rc.right + margins.right; - fr.rcPage.top = 0; - fr.rcPage.bottom = fr.rc.bottom + margins.bottom; + SetRect(&fr.rcPage, 0, 0, fr.rc.right + margins.right, fr.rc.bottom + margins.bottom); ZeroMemory(&di, sizeof(di)); di.cbSize = sizeof(di); @@ -517,19 +505,15 @@ ps.lStructSize = sizeof(ps); ps.hwndOwner = hMainWnd; ps.Flags = PSD_INHUNDREDTHSOFMILLIMETERS | PSD_MARGINS; - ps.rtMargin.left = twips_to_centmm(margins.left); - ps.rtMargin.right = twips_to_centmm(margins.right); - ps.rtMargin.top = twips_to_centmm(margins.top); - ps.rtMargin.bottom = twips_to_centmm(margins.bottom); + SetRect(&ps.rtMargin, twips_to_centmm(margins.left), twips_to_centmm(margins.top), + twips_to_centmm(margins.right), twips_to_centmm(margins.bottom)); ps.hDevMode = devMode; ps.hDevNames = devNames; if(PageSetupDlgW(&ps)) { - margins.left = centmm_to_twips(ps.rtMargin.left); - margins.right = centmm_to_twips(ps.rtMargin.right); - margins.top = centmm_to_twips(ps.rtMargin.top); - margins.bottom = centmm_to_twips(ps.rtMargin.bottom); + SetRect(&margins, centmm_to_twips(ps.rtMargin.left), centmm_to_twips(ps.rtMargin.top), + centmm_to_twips(ps.rtMargin.right), centmm_to_twips(ps.rtMargin.bottom)); devMode = ps.hDevMode; devNames = ps.hDevNames; update_ruler(get_ruler_wnd(hMainWnd)); @@ -718,20 +702,15 @@ dpi.cx = GetDeviceCaps(hdc, LOGPIXELSX); dpi.cy = GetDeviceCaps(hdc, LOGPIXELSY); - page_margin.left = preview.rcPage.left + margins.left; - page_margin.top = preview.rcPage.top + margins.top; - page_margin.bottom = preview.rcPage.bottom - margins.bottom; - page_margin.right = preview.rcPage.right - margins.right; + SetRect(&page_margin, preview.rcPage.left + margins.left, preview.rcPage.top + margins.top, + preview.rcPage.right - margins.right, preview.rcPage.bottom - margins.bottom); page_margin.left = (int)((float)twips_to_pixels(page_margin.left, dpi.cx) * ratio); page_margin.top = (int)((float)twips_to_pixels(page_margin.top, dpi.cy) * ratio); page_margin.bottom = (int)((float)twips_to_pixels(page_margin.bottom, dpi.cy) * ratio); page_margin.right = (int)((float)twips_to_pixels(page_margin.right, dpi.cx) * ratio); - page_margin.left += x; - page_margin.top += y; - page_margin.bottom += y; - page_margin.right += x; + OffsetRect(&page_margin, x, y); hPen = CreatePen(PS_DOT, 1, RGB(0,0,0)); oldPen = SelectObject(hdc, hPen); @@ -868,10 +847,8 @@ /* draw page outlines */ hPen = CreatePen(PS_SOLID|PS_INSIDEFRAME, 2, RGB(0,0,0)); oldPen = SelectObject(hdc, hPen); - background.left = x - 2; - background.right = x + preview.bmScaledSize.cx + 2; - background.top = y - 2; - background.bottom = y + preview.bmScaledSize.cy + 2; + SetRect(&background, x - 2, y - 2, x + preview.bmScaledSize.cx + 2, + y + preview.bmScaledSize.cy + 2); Rectangle(hdc, background.left, background.top, background.right, background.bottom); excl_rgn = CreateRectRgnIndirect(&background); @@ -908,10 +885,7 @@ draw_margin_lines(hdc, x, y, preview.zoomratio); } else { - background.left += 2; - background.right -= 2; - background.top += 2; - background.bottom -= 2; + InflateRect(&background, -2, -2); FillRect(hdc, &background, GetStockObject(WHITE_BRUSH)); } } @@ -964,10 +938,7 @@ fr.chrg.cpMin = 0; fr.chrg.cpMax = preview.textlength; - paper.left = 0; - paper.right = preview.bmSize.cx; - paper.top = 0; - paper.bottom = preview.bmSize.cy; + SetRect(&paper, 0, 0, preview.bmSize.cx, preview.bmSize.cy); if (!preview.hdc) { preview.hdc = CreateCompatibleDC(hdc); Modified: trunk/reactos/base/applications/wordpad/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/registry.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/registry.c [iso-8859-1] Tue Aug 23 19:32:58 2016 @@ -116,12 +116,7 @@ if(registry_get_handle(&hKey, 0, key_options) != ERROR_SUCCESS || RegQueryValueExW(hKey, var_framerect, 0, NULL, (LPBYTE)rc, &size) != ERROR_SUCCESS || size != sizeof(RECT)) - { - rc->top = 0; - rc->left = 0; - rc->bottom = 300; - rc->right = 600; - } + SetRect(rc, 0, 0, 600, 300); RegCloseKey(hKey); } @@ -300,7 +295,7 @@ if(!lstrcmpiW(pFiles[i], newFile)) { int j; - for(j = 0; pFiles[j] && j < i; j++) + for(j = 0; j < i; j++) { pFiles[i-j] = pFiles[i-j-1]; } Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Tue Aug 23 19:32:58 2016 @@ -241,7 +241,7 @@ reactos/base/applications/notepad # Forked at Wine-20041201 reactos/base/applications/regedit # Out of sync reactos/base/applications/winhlp32 # Synced to WineStaging-1.9.16 -reactos/base/applications/wordpad # Synced to WineStaging-1.9.11 +reactos/base/applications/wordpad # Synced to WineStaging-1.9.16 reactos/base/services/rpcss # Synced to WineStaging-1.9.11 reactos/base/system/expand # Synced to WineStaging-1.9.11 reactos/base/system/msiexec # Synced to WineStaging-1.9.11

1 0

[akhaldi] 72443: [WINHLP32] Sync with Wine Staging 1.9.16. CORE-11866
by akhaldi＠svn.reactos.org 23 Aug '16

23 Aug '16

Author: akhaldi Date: Tue Aug 23 19:31:44 2016 New Revision: 72443 URL: http://svn.reactos.org/svn/reactos?rev=72443&view=rev Log: [WINHLP32] Sync with Wine Staging 1.9.16. CORE-11866 Modified: trunk/reactos/base/applications/winhlp32/macro.c trunk/reactos/base/applications/winhlp32/winhelp.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/base/applications/winhlp32/macro.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/macro.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/macro.c [iso-8859-1] Tue Aug 23 19:31:44 2016 @@ -598,7 +598,7 @@ LPSTR ptr; WINE_TRACE("(%s, %s)\n", debugstr_a(lpszPathWindow), debugstr_a(topic_id)); - if ((ptr = strchr(lpszPathWindow, '>')) != NULL) + if (lpszPathWindow && (ptr = strchr(lpszPathWindow, '>')) != NULL) { LPSTR tmp; size_t sz; Modified: trunk/reactos/base/applications/winhlp32/winhelp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/winhelp.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/winhelp.c [iso-8859-1] Tue Aug 23 19:31:44 2016 @@ -501,7 +501,7 @@ /*********************************************************************** * - * WINHELP_RelaseWindow + * WINHELP_ReleaseWindow */ BOOL WINHELP_ReleaseWindow(WINHELP_WINDOW* win) { @@ -968,6 +968,7 @@ popup = Globals.active_popup; Globals.active_popup = NULL; WINHELP_ReleaseWindow(popup); + if (lret) *lret = 1; return TRUE; } return FALSE; Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Tue Aug 23 19:31:44 2016 @@ -240,7 +240,7 @@ reactos/base/applications/iexplore # Synced to WineStaging-1.9.11 reactos/base/applications/notepad # Forked at Wine-20041201 reactos/base/applications/regedit # Out of sync -reactos/base/applications/winhlp32 # Synced to WineStaging-1.9.11 +reactos/base/applications/winhlp32 # Synced to WineStaging-1.9.16 reactos/base/applications/wordpad # Synced to WineStaging-1.9.11 reactos/base/services/rpcss # Synced to WineStaging-1.9.11 reactos/base/system/expand # Synced to WineStaging-1.9.11

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