Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cgutman] 40175: - Query MaxMulticastAddresses from the miniport
by cgutman＠svn.reactos.org 22 Mar '09

22 Mar '09

Author: cgutman Date: Mon Mar 23 02:28:06 2009 New Revision: 40175 URL: http://svn.reactos.org/svn/reactos?rev=40175&view=rev Log: - Query MaxMulticastAddresses from the miniport Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Mon Mar 23 02:28:06 2009 @@ -1621,7 +1621,8 @@ NDIS_HANDLE ConfigHandle; ULONG Size; LARGE_INTEGER Timeout; - /* FIXME - KIRQL OldIrql; */ + UINT MaxMulticastAddresses; + ULONG BytesWritten; /* * Prepare wrapper context used by HW and configuration routines. @@ -1806,7 +1807,17 @@ NdisStatus = DoQueries(Adapter, AddressOID); if (NdisStatus == NDIS_STATUS_SUCCESS) { - Success = EthCreateFilter(32, /* FIXME: Query this from miniport. */ + NdisStatus = MiniQueryInformation(Adapter, OID_802_3_MAXIMUM_LIST_SIZE, sizeof(UINT), + &MaxMulticastAddresses, &BytesWritten); + + if (NdisStatus != NDIS_STATUS_SUCCESS) + { + ExInterlockedRemoveEntryList( &Adapter->ListEntry, &AdapterListLock ); + NDIS_DbgPrint(MAX_TRACE, ("MiniQueryInformation failed (%x)\n", NdisStatus)); + return NdisStatus; + } + + Success = EthCreateFilter(MaxMulticastAddresses, Adapter->Address.Type.Medium802_3, &Adapter->NdisMiniportBlock.EthDB); if (Success)

1 0

[dgorbachev] 40174: Update Japanese translation of Syssetup. Patch from Tomoya Kitagawa (jptomoya|AT|yahoo|DOT|co|DOT|jp), bug #4295.
by dgorbachev＠svn.reactos.org 22 Mar '09

22 Mar '09

Author: dgorbachev Date: Sun Mar 22 22:58:44 2009 New Revision: 40174 URL: http://svn.reactos.org/svn/reactos?rev=40174&view=rev Log: Update Japanese translation of Syssetup. Patch from Tomoya Kitagawa (jptomoya|AT|yahoo|DOT|co|DOT|jp), bug #4295. Modified: trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc Modified: trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/ja… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc [iso-8859-1] Sun Mar 22 22:58:44 2009 @@ -25,10 +25,10 @@ CAPTION "ReactOS ZbgAbv" FONT 9, "MS UI Gothic" BEGIN - LTEXT "ReactOS ZbgAbv EBU[hÖæ¤±»B", IDC_WELCOMETITLE, 115, 8, 195, 24 - LTEXT "±ÌEBU[hÅÍAReactOS ð È½ÌRs[^ÉCXg[µÜ·B"\ - "ReactOS ð³µCXg[·éÉÍApÒÆRs[^ÉÖ·éîñð"\ - "WßéKvª èÜ·B", IDC_STATIC, 115, 40, 195, 100 + LTEXT "ReactOSZbgAbv EBU[hÖæ¤±»B", IDC_WELCOMETITLE, 115, 8, 195, 24 + LTEXT "±ÌEBU[hÅÍAReactOS ðRs[^ÉCXg[µÜ·B "\ + "ReactOSð³µZbgAbv·é½ßÉA[U[ÆRs[^É "\ + "Ö·éîñðWßéKvª èÜ·B", IDC_STATIC, 115, 40, 195, 100 LTEXT "ZbgAbvð±s·éÉÍ [Ö] ðNbNµÄ¾³¢B", IDC_STATIC, 115, 169, 195, 17 END @@ -38,15 +38,15 @@ CAPTION "ReactOS ZbgAbv" FONT 9, "MS UI Gothic", 0, 0, 0x0 BEGIN - LTEXT "ReactOS ÌJÒæèAÈºÌI[v\\[X vWFNgÉ´ÓÌÓð\\¾µÜ·B"\ - "ReactOS ì¬ÉÍ±êçÌI[v\\[X vWFNgªp¢çêÜµ½:", + LTEXT "ReactOSÌJÒæèAºLÌI[v\\[X vWFNgÉ´ÓÌÓð\\¾µÜ·B "\ + "±êçÌ·×ÄÜ½ÍêÍReactOSÌJÉp³êÜµ½B", IDC_STATIC,15,7,286,19 LISTBOX IDC_PROJECTS,15,30,286,75,LBS_NOSEL | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL - LTEXT "ReactOS Í GPL ÌºÅCZX³êÄ¨èAReactOS â»ÌêðÄpâ"\ - "zzð·éÉÍ GPL É]íÈÄÍÈèÜ¹ñB", + LTEXT "ReactOS ÍGPLÌºÉCZX³êÄ¨èA·×ÄÜ½ÍêðÄpAÄzz·é "\ + "êÍGPLÉ]¤Kvª èÜ·B", IDC_STATIC,15,110,227,19 - PUSHBUTTON "GPL ðÇÞ(&V)...",IDC_VIEWGPL,251,110,50,19 + PUSHBUTTON "GPLð\\¦(&V)...",IDC_VIEWGPL,251,110,50,19 LTEXT "ZbgAbvð±s·éÉÍ [Ö] ðNbNµÄ¾³¢B",IDC_STATIC,15,136, 195,17 END @@ -71,20 +71,20 @@ CAPTION "ReactOS ZbgAbv" FONT 9, "MS UI Gothic" BEGIN - LTEXT "Rs[^¼ð¼p 63 ¶ÈàÅüÍµÄ¾³¢B"\ + LTEXT "Rs[^¼ð¼p63¶ÈàÅüÍµÄ¾³¢B "\ "Rs[^ªlbg[NãÉ éêÍA¼Oªd¡µÈ¢æ¤ÉµÄ¾³¢B", IDC_STATIC, 54, 7, 250, 24 LTEXT "Rs[^¼(&C):", IDC_STATIC, 54, 38, 75, 8 - EDITTEXT IDC_COMPUTERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE - LTEXT "Administrator ÆÄÎêé[U[ AJEgðì¬µÜ·B"\ - "Rs[^Ét ANZXªKvÈÆ«A±ÌAJEgðg¢Ü·B", + EDITTEXT IDC_COMPUTERNAME, 165, 35, 148, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE + LTEXT "AdministratorÆÄÎêé[U[AJEgðì¬µÜ·B"\ + "Rs[^ÉtANZXªKvÈÆ«A±ÌAJEgðgpµÜ·B", IDC_STATIC, 54, 57, 250, 25 - LTEXT "Administrator ÌpX[hð¼p 14 ¶ÈàÅüÍµÄ¾³¢B", + LTEXT "AdministratorÌpX[hð¼p 14 ¶ÈàÅüÍµÄ¾³¢B", IDC_STATIC, 54, 87, 250, 8 - LTEXT "Administrator ÌpX[h(&A):", IDC_STATIC, 54, 104, 75, 8 - EDITTEXT IDC_ADMINPASSWORD1, 132, 101, 172, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD - LTEXT "pX[hÌmFüÍ(&O):", IDC_STATIC, 54, 123, 75, 8 - EDITTEXT IDC_ADMINPASSWORD2, 132, 120, 172, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD + LTEXT "Administrator ÌpX[h(&A):", IDC_STATIC, 54, 104, 105, 8 + EDITTEXT IDC_ADMINPASSWORD1, 165, 101, 148, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD + LTEXT "pX[hÌmFüÍ(&O):", IDC_STATIC, 54, 123, 105, 8 + EDITTEXT IDC_ADMINPASSWORD2, 165, 120, 148, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD END @@ -93,19 +93,19 @@ CAPTION "ReactOS ZbgAbv" FONT 9, "MS UI Gothic" BEGIN - LTEXT "VXeÌP[ðAAvP[VÅgpµ½¢¾êÉÝèµÄ"\ - "¾³¢B[U[ P[ÍAlAÊÝAútÌ\\¦û@ð§ä"\ - "µÜ·B", IDC_STATIC, 53, 7, 253, 20 + LTEXT "VXeÌP[ðAAvP[VÅgpµ½¢¾êÉÝèµÄ¾³¢B "\ + "[U[P[ÍAlAÊÝAútÌ\\¦û@ð§äµÜ·B "\ + "", IDC_STATIC, 53, 7, 253, 20 LTEXT "", IDC_LOCALETEXT, 53, 29, 250, 16 - LTEXT "VXeâ[U[ÌP[ÝèðÏX·éÉÍA[JX^}CY] ðNbNµÄ¾³¢B", - IDC_STATIC, 53, 60, 184, 8 - PUSHBUTTON "JX^}CY(&C)...", IDC_CUSTOMLOCALE, 245, 57, 50, 14 + LTEXT "VXeA[U[P[ÝèÏXÉÍ[JX^}CY]ðNbNµÜ·B", + IDC_STATIC, 53, 60, 196, 8 + PUSHBUTTON "JX^}CY(&C)...", IDC_CUSTOMLOCALE, 250, 57, 50, 14 LTEXT "L[{[h CAEgÍAL[ðµ½Æ«ÉÇÌ¶ªüÍ³êé©ð§äµÜ·B", IDC_STATIC, 53, 86, 253, 8 LTEXT "", IDC_LAYOUTTEXT, 53, 100, 250, 16 - LTEXT "L[{[h CAEgðÏX·éÉÍA[JX^}CY] ðNbNµÄ¾³¢B", + LTEXT "L[{[hCAEgÏXÉÍ[JX^}CY]ðNbNµÜ·B", IDC_STATIC, 53, 126, 184, 8 - PUSHBUTTON "JX^}CY(&U)...", IDC_CUSTOMLAYOUT, 245, 122, 50, 14 + PUSHBUTTON "JX^}CY(&U)...", IDC_CUSTOMLAYOUT, 250, 122, 50, 14 END @@ -114,15 +114,15 @@ CAPTION "ReactOS ZbgAbv" FONT 9, "MS UI Gothic" BEGIN - LTEXT "útÆ", IDC_STATIC, 53, 7, 253, 8 + LTEXT "útÆ:", IDC_STATIC, 53, 7, 253, 8 CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 53, 17, 137, 14 CONTROL "", IDC_TIMEPICKER, "SysDateTimePick32", DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 200, 17, 54, 14 - LTEXT "^C ][", IDC_STATIC, 53, 42, 253, 8 + LTEXT "^C][:", IDC_STATIC, 53, 42, 253, 8 COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL - AUTOCHECKBOX "©®IÉT}[ ^CÌ²®ð·é(&D)", + AUTOCHECKBOX "©®IÉT}[^CÌ²®ð·é(&D)", IDC_AUTODAYLIGHT, 53, 124, 201, 10 END @@ -141,15 +141,15 @@ IDD_FINISHPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS ZbgAbvª®¹µÜµ½" -FONT 9, "MS UI Gothic" -BEGIN - LTEXT "ReactOS ZbgAbv EBU[hª®¹µÜµ½", IDC_FINISHTITLE, 115, 8, 195, 24 +CAPTION "ReactOS ZbgAbvÌ®¹" +FONT 9, "MS UI Gothic" +BEGIN + LTEXT "ReactOS ZbgAbv EBU[hÌ®¹", IDC_FINISHTITLE, 115, 8, 195, 24 LTEXT "ReactOS ZbgAbvª³íÉ®¹µÜµ½B\n\n" \ "[®¹] ðNbN·éÆARs[^ðÄN®µÜ·B", IDC_STATIC, 115, 40, 195, 100 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 115, 138, 188, 12 - LTEXT "hCuÉ CD ªüÁÄ¢éêÍACD ðæèoµÄ¾³¢BCD ðæèoµ"\ - "½çA[®¹] ðNbNµÄRs[^ðÄN®µÄ¾³¢B", IDC_STATIC, 115, 169, 195, 17 + LTEXT "hCuÉCDª éêÍæèoµÄ¾³¢B ÄN®·éÉÍ "\ + "®¹ðNbNµÄ¾³¢B", IDC_STATIC, 115, 169, 195, 17 END @@ -166,8 +166,8 @@ IDD_STATUSWINDOW_DLG DIALOGEX 0,0,274,26 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP -CAPTION "Please wait..." -FONT 9,"MS UI Gothic 2",400,0,1 +CAPTION "¨Ò¿¾³¢..." +FONT 9,"MS Shell Dlg 2",400,0,1 BEGIN LTEXT "",IDC_STATUSLABEL,7,8,234,12,SS_WORDELLIPSIS END @@ -179,118 +179,118 @@ IDS_ACKSUBTITLE "ReactOS ªpµÄ¢évWFNgÆCZXÉÖ·éîñ" IDS_OWNERTITLE "\\tgEFAÌÂlpÝè" IDS_OWNERSUBTITLE "±ÌîñÍAReactOS ÌÂlpÝèÉp¢çêÜ·B" - IDS_COMPUTERTITLE "Rs[^¼Æ Administrator ÌpX[h" - IDS_COMPUTERSUBTITLE "Rs[^¼Æ Administrator ÌpX[hðüÍ·éKvª èÜ·B" + IDS_COMPUTERTITLE "Rs[^¼Æ Administrator pX[h" + IDS_COMPUTERSUBTITLE "Rs[^¼Æ Administrator pX[hðüÍ·éKvª èÜ·B" IDS_LOCALETITLE "næÌÝè" IDS_LOCALESUBTITLE "ReactOS ðlXÈnæÆ¾êÉ í¹ÄJX^}CY·é±ÆªÅ«Ü·B" IDS_DATETIMETITLE "útÆ" - IDS_DATETIMESUBTITLE "Rs[^ÌútÆð³µÝèµÜ·B" - IDS_PROCESSTITLE "Process page title" - IDS_PROCESSSUBTITLE "Process page subtitle" -END - -STRINGTABLE -BEGIN - IDS_CMT_DOWNLOADER "Download and install various applications" -END - -STRINGTABLE -BEGIN - IDS_ACCESSORIES "Accessories" - IDS_CMT_CALC "Launch Calculator" - IDS_CMT_CMD "Open command prompt" - IDS_CMT_EXPLORER "Launch Explorer" - IDS_CMT_NOTEPAD "Launch Text Editor" - IDS_CMT_REGEDIT "Launch Registry Editor" - IDS_CMT_WORDPAD "Launch Document Editor" - IDS_CMT_SCREENSHOT "Take screenshot" - IDS_CMT_DEVMGMT "Launch Device Manager" - IDS_CMT_SERVMAN "Launch Service Manager" - IDS_CMT_RDESKTOP "Launch Remote Desktop" - IDS_CMT_EVENTVIEW "Launch Event Viewer" - IDS_CMT_MSCONFIG "Launch System Configuration program" -END - -STRINGTABLE -BEGIN - IDS_GAMES "Games" - IDS_CMT_SOLITAIRE "Solitaire" - IDS_CMT_WINEMINE "WineMine" -END - -STRINGTABLE -BEGIN - IDS_SYS_TOOLS "System Tools" - IDS_CMT_CHARMAP "CharMap" - IDS_CMT_KBSWITCH "Keyboard Layout Switcher" - IDS_CMT_DXDIAG "Launch ReactX-Diagnostic program" -END - -STRINGTABLE -BEGIN - IDS_SYS_ACCESSIBILITY "Accessibility" - IDS_CMT_MAGNIFY "Magnify" -END - -STRINGTABLE -BEGIN - IDS_SYS_ENTERTAINMENT "Entertainment" - IDS_CMT_MPLAY32 "Launch Multimedia Player" - IDS_CMT_SNDVOL32 "Launch Volume Control" -END - -STRINGTABLE -BEGIN - IDS_REACTOS_SETUP "ReactOS Setup" - IDS_UNKNOWN_ERROR "Unknown error" - IDS_REGISTERING_COMPONENTS "Registering components..." - IDS_LOADLIBRARY_FAILED "LoadLibrary failed: " - IDS_GETPROCADDR_FAILED "GetProcAddr failed: " - IDS_REGSVR_FAILED "DllRegisterServer failed: " - IDS_DLLINSTALL_FAILED "DllInstall failed: " - IDS_TIMEOUT "Timeout during registration" + IDS_DATETIMESUBTITLE "Rs[^ÌútÆð³µÝèµÄ¾³¢B" + IDS_PROCESSTITLE "R|[lgÌo^" + IDS_PROCESSSUBTITLE "¨Ò¿¾³¢..." +END + +STRINGTABLE +BEGIN + IDS_CMT_DOWNLOADER "lXÈAvP[VÌ_E[hÆCXg[ðs¢Ü·" +END + +STRINGTABLE +BEGIN + IDS_ACCESSORIES "ANZT" + IDS_CMT_CALC "dìðN®µÜ·" + IDS_CMT_CMD "R}h vvgðJ«Ü·" + IDS_CMT_DEVMGMT "foCX }l[WðN®µÜ·" + IDS_CMT_EVENTVIEW "Cxg r[AðN®µÜ·" + IDS_CMT_EXPLORER "GNXv[ðN®µÜ·" + IDS_CMT_MSCONFIG "VXeÌ\\¬vOðJ«Ü·" + IDS_CMT_NOTEPAD "eLXgGfB^ðN®µÜ·" + IDS_CMT_RDESKTOP "[g fXNgbvðN®µÜ·" + IDS_CMT_REGEDIT "WXgGfB^ðN®µÜ·" + IDS_CMT_SCREENSHOT "XN[VbgðBèÜ·" + IDS_CMT_SERVMAN "T[rX }l[WðN®µÜ·" + IDS_CMT_WORDPAD "hLgGfB^ðN®µÜ·" +END + +STRINGTABLE +BEGIN + IDS_GAMES "Q[" + IDS_CMT_SOLITAIRE "\\eBA" + IDS_CMT_WINEMINE "WineMine" +END + +STRINGTABLE +BEGIN + IDS_SYS_TOOLS "VXec[" + IDS_CMT_CHARMAP "LN^[}bv" + IDS_CMT_DXDIAG "ReactX ffvOðN®µÜ·" + IDS_CMT_KBSWITCH "L[{[hCAEgØÖí" +END + +STRINGTABLE +BEGIN + IDS_SYS_ACCESSIBILITY "ANZVreB" + IDS_CMT_MAGNIFY "gå¾" +END + +STRINGTABLE +BEGIN + IDS_SYS_ENTERTAINMENT "G^[eCg" + IDS_CMT_MPLAY32 "}`fBA v[[ðN®µÜ·" + IDS_CMT_SNDVOL32 "{[ Rg[ðN®µÜ·" +END + +STRINGTABLE +BEGIN + IDS_REACTOS_SETUP "ReactOS ZbgAbv" + IDS_UNKNOWN_ERROR "s¾ÈG[" + IDS_REGISTERING_COMPONENTS "R|[lgðo^µÄ¢Ü·..." + IDS_LOADLIBRARY_FAILED "LoadLibraryÉ¸s: " + IDS_GETPROCADDR_FAILED "GetProcAddrÉ¸s: " + IDS_REGSVR_FAILED "DllRegisterServerÉ¸s: " + IDS_DLLINSTALL_FAILED "DllInstallÉ¸s: " + IDS_TIMEOUT "o^É^CAEgµÜµ½" IDS_REASON_UNKNOWN "" END STRINGTABLE BEGIN - IDS_SHORT_CMD "Command Prompt.lnk" + IDS_SHORT_CALC "dì.lnk" + IDS_SHORT_CHARMAP "LN^[ }bv.lnk" + IDS_SHORT_CMD "R}h vvg.lnk" + IDS_SHORT_DEVICE "foCX }l[W.lnk" + IDS_SHORT_DOWNLOADER "_E[h !.lnk" + IDS_SHORT_DXDIAG "ReactX ff.lnk" + IDS_SHORT_EVENTVIEW "Cxg r[A.lnk" IDS_SHORT_EXPLORER "ReactOS Explorer.lnk" - IDS_SHORT_DOWNLOADER "Download !.lnk" - IDS_SHORT_SERVICE "Service Manager.lnk" - IDS_SHORT_DEVICE "Device Manager.lnk" - IDS_SHORT_MPLAY32 "Multimedia Player.lnk" - IDS_SHORT_CALC "Calculator.lnk" - IDS_SHORT_REGEDIT "Regedit.lnk" - IDS_SHORT_NOTEPAD "Notepad.lnk" - IDS_SHORT_WORDPAD "WordPad.lnk" - IDS_SHORT_SNAP "SnapShot.lnk" - IDS_SHORT_SOLITAIRE "Solitaire.lnk" + IDS_SHORT_KBSWITCH "L[{[h CAEg ØÖí.lnk" + IDS_SHORT_MAGNIFY "gå¾.lnk" + IDS_SHORT_MPLAY32 "}`fBA v[.lnk" + IDS_SHORT_MSCONFIG "VXeÌ\\¬.lnk" + IDS_SHORT_NOTEPAD " .lnk" + IDS_SHORT_RDESKTOP "[g fXNgbvÚ±.lnk" + IDS_SHORT_REGEDIT "WXg GfB^.lnk" + IDS_SHORT_SERVICE "T[rX }l[W.lnk" + IDS_SHORT_SNAP "XibvVbg.lnk" + IDS_SHORT_SNDVOL32 "{[ Rg[.lnk" + IDS_SHORT_SOLITAIRE "\\eBA.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" - IDS_SHORT_CHARMAP "CharMap.lnk" - IDS_SHORT_MAGNIFY "Magnify.lnk" - IDS_SHORT_RDESKTOP "Remote Desktop.lnk" - IDS_SHORT_KBSWITCH "Keyboard Layout Switcher.lnk" - IDS_SHORT_EVENTVIEW "Event Viewer.lnk" - IDS_SHORT_MSCONFIG "System Configuration.lnk" - IDS_SHORT_SNDVOL32 "Volume Control.lnk" - IDS_SHORT_DXDIAG "ReactX Diagnostic.lnk" -END - -STRINGTABLE -BEGIN - IDS_WZD_NAME "Setup cannot continue until you enter your name." - IDS_WZD_SETCOMPUTERNAME "Setup failed to set the computer name." - IDS_WZD_COMPUTERNAME "Setup cannot continue until you enter the name of your computer." - IDS_WZD_PASSWORDEMPTY "You must enter a password !" - IDS_WZD_PASSWORDMATCH "The passwords you entered do not match. Please enter the desired password again." - IDS_WZD_PASSWORDCHAR "The password you entered contains invalid characters. Please enter a cleaned password." - IDS_WZD_LOCALTIME "Setup was unable to set the local time." -END - -STRINGTABLE -BEGIN - IDS_STATUS_INSTALL_DEV "Installing devices..." + IDS_SHORT_WORDPAD "[hpbh.lnk" +END + +STRINGTABLE +BEGIN + IDS_WZD_NAME "ZbgAbvÍ[U¼ªüÍ³êéÜÅ±sÅ«Ü¹ñB" + IDS_WZD_SETCOMPUTERNAME "Rs[^¼ÌÝèÉ¸sµÜµ½B" + IDS_WZD_COMPUTERNAME "ZbgAbvÍRs[^¼ªüÍ³êéÜÅ±sÅ«Ü¹ñB" + IDS_WZD_PASSWORDEMPTY "pX[hðüÍµÄ¾³¢ !" + IDS_WZD_PASSWORDMATCH "üÍ³ê½pX[hªêvµÜ¹ñB à¤êx]Üµ¢pX[hðüÍµÄ¾³¢B" + IDS_WZD_PASSWORDCHAR "üÍ³ê½pX[hÉÍ³øÈ¶ªÜÜêÄ¢Ü·B LøÈpX[hðüÍµÄ¾³¢B" + IDS_WZD_LOCALTIME "ZbgAbvÍ[J^CðÝèÅ«Ü¹ñÅµ½B" +END + +STRINGTABLE +BEGIN + IDS_STATUS_INSTALL_DEV "foCXðCXg[µÄ¢Ü·..." END /* EOF */

1 0

[mkupfer] 40173: - Disable "Back" in last page of syssetup, because it doesn't make any sense.
by mkupfer＠svn.reactos.org 22 Mar '09

22 Mar '09

Author: mkupfer Date: Sun Mar 22 19:36:16 2009 New Revision: 40173 URL: http://svn.reactos.org/svn/reactos?rev=40173&view=rev Log: - Disable "Back" in last page of syssetup, because it doesn't make any sense. Modified: trunk/reactos/dll/win32/syssetup/wizard.c Modified: trunk/reactos/dll/win32/syssetup/wizard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/wizard.… ============================================================================== --- trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] Sun Mar 22 19:36:16 2009 @@ -1990,22 +1990,13 @@ { case PSN_SETACTIVE: /* Enable the correct buttons on for the active page */ - PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_FINISH); + PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_FINISH); SendDlgItemMessage(hwndDlg, IDC_RESTART_PROGRESS, PBM_SETRANGE, 0, MAKELPARAM(0, 300)); SendDlgItemMessage(hwndDlg, IDC_RESTART_PROGRESS, PBM_SETPOS, 0, 0); SetTimer(hwndDlg, 1, 50, NULL); break; - - case PSN_WIZBACK: - /* Handle a Back button click, if necessary */ - KillTimer(hwndDlg, 1); - - /* Skip the progress page */ - SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_DATETIMEPAGE); - SetupData.UnattendSetup = FALSE; - return TRUE; case PSN_WIZFINISH: /* Handle a Finish button click, if necessary */

1 0

[janderwald] 40172: - Clean up my working copy
by janderwald＠svn.reactos.org 22 Mar '09

22 Mar '09

Author: janderwald Date: Sun Mar 22 17:28:50 2009 New Revision: 40172 URL: http://svn.reactos.org/svn/reactos?rev=40172&view=rev Log: - Clean up my working copy Modified: trunk/reactos/include/psdk/ksmedia.h Modified: trunk/reactos/include/psdk/ksmedia.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ksmedia.h?rev… ============================================================================== --- trunk/reactos/include/psdk/ksmedia.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ksmedia.h [iso-8859-1] Sun Mar 22 17:28:50 2009 @@ -560,4 +560,19 @@ #define KSAUDIO_SPEAKER_5POINT1_BACK KSAUDIO_SPEAKER_5POINT1 #define KSAUDIO_SPEAKER_7POINT1_WIDE KSAUDIO_SPEAKER_7POINT1 #endif + +typedef struct +{ + KSPROPERTY Property; + ULONG NodeId; + ULONG Reserved; +} KSNODEPROPERTY, *PKSNODEPROPERTY; + +typedef struct +{ + KSNODEPROPERTY NodeProperty; + LONG Channel; + ULONG Reserved; +} KSNODEPROPERTY_AUDIO_CHANNEL, *PKSNODEPROPERTY_AUDIO_CHANNEL; + #endif

1 0

[jimtabor] 40171: - Implement AddFontMemResourceEx and simplify RemoveFontMemResourceEx.
by jimtabor＠svn.reactos.org 22 Mar '09

22 Mar '09

Author: jimtabor Date: Sun Mar 22 08:20:55 2009 New Revision: 40171 URL: http://svn.reactos.org/svn/reactos?rev=40171&view=rev Log: - Implement AddFontMemResourceEx and simplify RemoveFontMemResourceEx. Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c [iso-8859-1] Sun Mar 22 08:20:55 2009 @@ -955,7 +955,7 @@ } /* - * @unimplemented + * @implemented */ HANDLE WINAPI @@ -966,9 +966,12 @@ DWORD *pcFonts ) { - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + if ( pbFont && cbFont && pcFonts) + { + return NtGdiAddFontMemResourceEx(pbFont, cbFont, NULL, 0, pcFonts); + } + SetLastError(ERROR_INVALID_PARAMETER); + return NULL; } /* @@ -1267,17 +1270,12 @@ WINAPI RemoveFontMemResourceEx(HANDLE fh) { - BOOL retValue=0; - - if (fh) - { - retValue = NtGdiRemoveFontMemResourceEx(fh); - } - else - { - SetLastError(ERROR_INVALID_PARAMETER); - } - return retValue; + if (fh) + { + return NtGdiRemoveFontMemResourceEx(fh); + } + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; } /*

1 0

[cgutman] 40170: - Fix release build
by cgutman＠svn.reactos.org 22 Mar '09

22 Mar '09

Author: cgutman Date: Sun Mar 22 05:02:22 2009 New Revision: 40170 URL: http://svn.reactos.org/svn/reactos?rev=40170&view=rev Log: - Fix release build Modified: trunk/reactos/drivers/network/afd/afd/read.c Modified: trunk/reactos/drivers/network/afd/afd/read.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/re… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] Sun Mar 22 05:02:22 2009 @@ -228,7 +228,6 @@ ( PDEVICE_OBJECT DeviceObject, PIRP Irp, PVOID Context ) { - NTSTATUS Status = Irp->IoStatus.Status; PAFD_FCB FCB = (PAFD_FCB)Context; AFD_DbgPrint(MID_TRACE,("Called\n")); @@ -275,8 +274,6 @@ PollReeval( FCB->DeviceExt, FCB->FileObject ); SocketStateUnlock( FCB ); - - AFD_DbgPrint(MID_TRACE,("Returned %x\n", Status)); return STATUS_SUCCESS; }

1 0

[jmorlan] 40169: Make START command able to open non-executable files/directories/URLs using ShellExecute. (Bug 4055)
by jmorlan＠svn.reactos.org 22 Mar '09

22 Mar '09

Author: jmorlan Date: Sun Mar 22 04:51:29 2009 New Revision: 40169 URL: http://svn.reactos.org/svn/reactos?rev=40169&view=rev Log: Make START command able to open non-executable files/directories/URLs using ShellExecute. (Bug 4055) Modified: trunk/reactos/base/shell/cmd/cmd.c trunk/reactos/base/shell/cmd/cmd.h trunk/reactos/base/shell/cmd/start.c Modified: trunk/reactos/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.c?rev=4… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] Sun Mar 22 04:51:29 2009 @@ -265,7 +265,8 @@ typedef BOOL (WINAPI *MYEX)(LPSHELLEXECUTEINFO lpExecInfo); -static HANDLE RunFile(LPTSTR filename, LPTSTR params) +HANDLE RunFile(DWORD flags, LPTSTR filename, LPTSTR params, + LPTSTR directory, INT show) { SHELLEXECUTEINFO sei; HMODULE hShell32; @@ -292,10 +293,11 @@ memset(&sei, 0, sizeof sei); sei.cbSize = sizeof sei; - sei.fMask = SEE_MASK_NOCLOSEPROCESS | SEE_MASK_NO_CONSOLE; + sei.fMask = flags; sei.lpFile = filename; sei.lpParameters = params; - sei.nShow = SW_SHOWNORMAL; + sei.lpDirectory = directory; + sei.nShow = show; ret = hShExt(&sei); TRACE ("RunFile: ShellExecuteExA/W returned 0x%p\n", ret); @@ -499,7 +501,11 @@ else { // See if we can run this with ShellExecute() ie myfile.xls - prci.hProcess = RunFile(szFullName, rest); + prci.hProcess = RunFile(SEE_MASK_NOCLOSEPROCESS | SEE_MASK_NO_CONSOLE, + szFullName, + rest, + NULL, + SW_SHOWNORMAL); } if (prci.hProcess != NULL) Modified: trunk/reactos/base/shell/cmd/cmd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.h?rev=4… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.h [iso-8859-1] Sun Mar 22 04:51:29 2009 @@ -100,6 +100,7 @@ /* Prototypes for CMD.C */ INT ConvertULargeInteger(ULONGLONG num, LPTSTR des, INT len, BOOL bPutSeperator); +HANDLE RunFile(DWORD, LPTSTR, LPTSTR, LPTSTR, INT); VOID ParseCommandLine (LPTSTR); struct _PARSED_COMMAND; BOOL ExecuteCommand(struct _PARSED_COMMAND *Cmd); Modified: trunk/reactos/base/shell/cmd/start.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/start.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/start.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/start.c [iso-8859-1] Sun Mar 22 04:51:29 2009 @@ -37,7 +37,7 @@ INT cmd_start (LPTSTR Rest) { TCHAR szFullName[CMDLINE_LENGTH]; - TCHAR rest[CMDLINE_LENGTH]; + TCHAR szUnquotedName[CMDLINE_LENGTH]; TCHAR *param = NULL; TCHAR *dot; INT size; @@ -136,7 +136,6 @@ break; } } - _tcscpy(rest, Rest); /* get comspec */ comspec = cmd_alloc ( MAX_PATH * sizeof(TCHAR)); @@ -166,81 +165,56 @@ nErrorLevel = 0; - if(!*rest) - { - _tcscpy(rest,_T("\"")); - _tcscat(rest,comspec); - _tcscat(rest,_T("\"")); - } - + if (!*Rest) + { + Rest = _T("cmd.exe"); + } + else /* Parsing the command that gets called by start, and it's parameters */ { BOOL bInside = FALSE; /* find the end of the command and put the arguments in param */ - for(i = 0; rest[i]; i++) - { - if(rest[i] == _T('\"')) + for (i = 0; Rest[i]; i++) + { + if (Rest[i] == _T('\"')) bInside = !bInside; - if((rest[i] == _T(' ')) && !bInside) - { - param = &rest[i+1]; - rest[i] = _T('\0'); + if (_istspace(Rest[i]) && !bInside) + { + param = &Rest[i+1]; + Rest[i] = _T('\0'); break; } } - /* remove any slashes */ - StripQuotes(rest); - } - - /* check for a drive change */ - - if (!_tcscmp (rest + 1, _T(":")) && _istalpha (*rest)) - { - TCHAR szPath[CMDLINE_LENGTH]; - - _tcscpy (szPath, _T("A:")); - szPath[0] = _totupper (*rest); - SetCurrentDirectory (szPath); - GetCurrentDirectory (CMDLINE_LENGTH, szPath); - if (szPath[0] != (TCHAR)_totupper (*rest)) - ConErrResPuts (STRING_FREE_ERROR1); - - cmd_free(comspec); - return 0; - } + } + + _tcscpy(szUnquotedName, Rest); + StripQuotes(szUnquotedName); /* get the PATH environment variable and parse it */ /* search the PATH environment variable for the binary */ - if (!SearchForExecutable (rest, szFullName)) - { - error_bad_command(rest); - - cmd_free(comspec); - return 1; - } - - - /* check if this is a .BAT or .CMD file */ - dot = _tcsrchr (szFullName, _T('.')); - if (dot && (!_tcsicmp (dot, _T(".bat")) || !_tcsicmp (dot, _T(".cmd")))) - { - bBat = TRUE; - _stprintf(szFullCmdLine, _T("\"%s\" /K \"%s\""), comspec, szFullName); - TRACE ("[BATCH: %s %s]\n", debugstr_aw(szFullName), debugstr_aw(rest)); - } - else - { - TRACE ("[EXEC: %s %s]\n", debugstr_aw(szFullName), debugstr_aw(rest)); + if (SearchForExecutable(szUnquotedName, szFullName)) + { + /* check if this is a .BAT or .CMD file */ + dot = _tcsrchr(szFullName, _T('.')); + if (dot && (!_tcsicmp(dot, _T(".bat")) || !_tcsicmp(dot, _T(".cmd")))) + { + bBat = TRUE; + _stprintf(szFullCmdLine, _T("\"%s\" /K %s"), comspec, Rest); + TRACE ("[BATCH: %s %s]\n", debugstr_aw(szFullName), debugstr_aw(Rest)); + } + else + { + TRACE ("[EXEC: %s %s]\n", debugstr_aw(szFullName), debugstr_aw(Rest)); + _tcscpy(szFullCmdLine, Rest); + } + /* build command line for CreateProcess() */ - _tcscpy (szFullCmdLine, rest); - if( param != NULL ) - { - - _tcscat(szFullCmdLine, _T(" ") ); - _tcscat (szFullCmdLine, param); - } - } + if (param != NULL) + { + _tcscat(szFullCmdLine, _T(" ")); + _tcscat(szFullCmdLine, param); + } /* fill startup info */ memset (&stui, 0, sizeof (STARTUPINFO)); @@ -259,9 +233,25 @@ bCreate = CreateProcess (szFullName, szFullCmdLine, NULL, NULL, FALSE, CREATE_NEW_CONSOLE | Priority, NULL, lpDirectory, &stui, &prci); } - if (bCreate) - { + CloseHandle(prci.hThread); + } + else + { + /* The file name did not seem to be valid, but maybe it's actually a + * directory or URL, so we still want to pass it to ShellExecute. */ + _tcscpy(szFullName, szUnquotedName); + } + + if (!bCreate) + { + /* CreateProcess didn't work; try ShellExecute */ + prci.hProcess = RunFile(SEE_MASK_NOCLOSEPROCESS, szFullName, + param, lpDirectory, wShowWindow); + } + + if (prci.hProcess != NULL) + { if (bWait) { DWORD dwExitCode; @@ -269,7 +259,6 @@ GetExitCodeProcess (prci.hProcess, &dwExitCode); nErrorLevel = (INT)dwExitCode; } - CloseHandle (prci.hThread); CloseHandle (prci.hProcess); /* Get New code page if it has change */ InputCodePage= GetConsoleCP();

1 0

[cgutman] 40168: - Don't forget to store the status in the IRP - Fix some return statuses
by cgutman＠svn.reactos.org 21 Mar '09

21 Mar '09

Author: cgutman Date: Sun Mar 22 01:54:08 2009 New Revision: 40168 URL: http://svn.reactos.org/svn/reactos?rev=40168&view=rev Log: - Don't forget to store the status in the IRP - Fix some return statuses Modified: trunk/reactos/drivers/network/afd/afd/listen.c trunk/reactos/drivers/network/afd/afd/read.c trunk/reactos/drivers/network/afd/afd/write.c Modified: trunk/reactos/drivers/network/afd/afd/listen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/li… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/listen.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/listen.c [iso-8859-1] Sun Mar 22 01:54:08 2009 @@ -104,19 +104,27 @@ PAFD_FCB FCB = (PAFD_FCB)Context; PAFD_TDI_OBJECT_QELT Qelt; - if( !SocketAcquireStateLock( FCB ) ) return STATUS_FILE_CLOSED; + if( !SocketAcquireStateLock( FCB ) ) { + Irp->IoStatus.Status = STATUS_FILE_CLOSED; + Irp->IoStatus.Information = 0; + return STATUS_FILE_CLOSED; + } FCB->ListenIrp.InFlightRequest = NULL; if( Irp->Cancel ) { + Irp->IoStatus.Status = STATUS_CANCELLED; + Irp->IoStatus.Information = 0; SocketStateUnlock( FCB ); return STATUS_CANCELLED; } if( FCB->State == SOCKET_STATE_CLOSED ) { + Irp->IoStatus.Status = STATUS_FILE_CLOSED; + Irp->IoStatus.Information = 0; SocketStateUnlock( FCB ); DestroySocket( FCB ); - return STATUS_SUCCESS; + return STATUS_FILE_CLOSED; } AFD_DbgPrint(MID_TRACE,("Completing listen request.\n")); Modified: trunk/reactos/drivers/network/afd/afd/read.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/re… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] Sun Mar 22 01:54:08 2009 @@ -235,11 +235,17 @@ ASSERT_IRQL(APC_LEVEL); - if( !SocketAcquireStateLock( FCB ) ) return Status; + if( !SocketAcquireStateLock( FCB ) ) { + Irp->IoStatus.Status = STATUS_FILE_CLOSED; + Irp->IoStatus.Information = 0; + return STATUS_FILE_CLOSED; + } FCB->ReceiveIrp.InFlightRequest = NULL; if( Irp->Cancel ) { + Irp->IoStatus.Status = STATUS_CANCELLED; + Irp->IoStatus.Information = 0; SocketStateUnlock( FCB ); return STATUS_CANCELLED; } @@ -249,11 +255,15 @@ if( FCB->State == SOCKET_STATE_CLOSED ) { AFD_DbgPrint(MIN_TRACE,("!!! CLOSED SOCK GOT A RECEIVE COMPLETE !!!\n")); + Irp->IoStatus.Status = STATUS_FILE_CLOSED; + Irp->IoStatus.Information = 0; SocketStateUnlock( FCB ); DestroySocket( FCB ); - return STATUS_SUCCESS; + return STATUS_FILE_CLOSED; } else if( FCB->State == SOCKET_STATE_LISTENING ) { AFD_DbgPrint(MIN_TRACE,("!!! LISTENER GOT A RECEIVE COMPLETE !!!\n")); + Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; + Irp->IoStatus.Information = 0; SocketStateUnlock( FCB ); return STATUS_INVALID_PARAMETER; } @@ -457,19 +467,27 @@ AFD_DbgPrint(MID_TRACE,("Called on %x\n", FCB)); - if( !SocketAcquireStateLock( FCB ) ) return STATUS_FILE_CLOSED; + if( !SocketAcquireStateLock( FCB ) ) { + Irp->IoStatus.Status = STATUS_FILE_CLOSED; + Irp->IoStatus.Information = 0; + return STATUS_FILE_CLOSED; + } FCB->ReceiveIrp.InFlightRequest = NULL; if( Irp->Cancel ) { + Irp->IoStatus.Status = STATUS_CANCELLED; + Irp->IoStatus.Information = 0; SocketStateUnlock( FCB ); return STATUS_CANCELLED; } if( FCB->State == SOCKET_STATE_CLOSED ) { + Irp->IoStatus.Status = STATUS_FILE_CLOSED; + Irp->IoStatus.Information = 0; SocketStateUnlock( FCB ); DestroySocket( FCB ); - return STATUS_SUCCESS; + return STATUS_FILE_CLOSED; } DatagramRecv = ExAllocatePool( NonPagedPool, DGSize ); @@ -488,6 +506,8 @@ } else Status = STATUS_NO_MEMORY; if( !NT_SUCCESS( Status ) ) { + Irp->IoStatus.Status = Status; + Irp->IoStatus.Information = 0; if( DatagramRecv ) ExFreePool( DatagramRecv ); SocketStateUnlock( FCB ); return Status; Modified: trunk/reactos/drivers/network/afd/afd/write.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/wr… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/write.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/write.c [iso-8859-1] Sun Mar 22 01:54:08 2009 @@ -40,20 +40,28 @@ ASSERT_IRQL(APC_LEVEL); - if( !SocketAcquireStateLock( FCB ) ) return Status; + if( !SocketAcquireStateLock( FCB ) ) { + Irp->IoStatus.Status = STATUS_FILE_CLOSED; + Irp->IoStatus.Information = 0; + return STATUS_FILE_CLOSED; + } FCB->SendIrp.InFlightRequest = NULL; /* Request is not in flight any longer */ if( Irp->Cancel ) { + Irp->IoStatus.Status = STATUS_CANCELLED; + Irp->IoStatus.Information = 0; SocketStateUnlock( FCB ); return STATUS_CANCELLED; } if( FCB->State == SOCKET_STATE_CLOSED ) { + Irp->IoStatus.Status = STATUS_FILE_CLOSED; + Irp->IoStatus.Information = 0; SocketStateUnlock( FCB ); DestroySocket( FCB ); - return STATUS_SUCCESS; + return STATUS_FILE_CLOSED; } if( !NT_SUCCESS(Status) ) { @@ -176,13 +184,18 @@ Irp->IoStatus.Status, Irp->IoStatus.Information)); - /* It's ok if the FCB already died */ - if( !SocketAcquireStateLock( FCB ) ) return STATUS_SUCCESS; + if( !SocketAcquireStateLock( FCB ) ) { + Irp->IoStatus.Status = STATUS_FILE_CLOSED; + Irp->IoStatus.Information = 0; + return STATUS_FILE_CLOSED; + } FCB->SendIrp.InFlightRequest = NULL; /* Request is not in flight any longer */ if( Irp->Cancel ) { + Irp->IoStatus.Status = STATUS_CANCELLED; + Irp->IoStatus.Information = 0; SocketStateUnlock( FCB ); return STATUS_CANCELLED; } @@ -191,9 +204,11 @@ PollReeval( FCB->DeviceExt, FCB->FileObject ); if( FCB->State == SOCKET_STATE_CLOSED ) { + Irp->IoStatus.Status = STATUS_FILE_CLOSED; + Irp->IoStatus.Information = 0; SocketStateUnlock( FCB ); DestroySocket( FCB ); - return STATUS_SUCCESS; + return STATUS_FILE_CLOSED; } SocketStateUnlock( FCB );

1 0

[spetreolle] 40167: Fix file location in file properties dialog.
by spetreolle＠svn.reactos.org 21 Mar '09

21 Mar '09

Author: spetreolle Date: Sun Mar 22 01:19:27 2009 New Revision: 40167 URL: http://svn.reactos.org/svn/reactos?rev=40167&view=rev Log: Fix file location in file properties dialog. Modified: trunk/reactos/dll/win32/shell32/fprop.c Modified: trunk/reactos/dll/win32/shell32/fprop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/fprop.c?… ============================================================================== --- trunk/reactos/dll/win32/shell32/fprop.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/fprop.c [iso-8859-1] Sun Mar 22 01:19:27 2009 @@ -249,7 +249,7 @@ if (lpstr == NULL) return FALSE; - lpdir = wcschr(lpstr, '\\'); /* find the last occurence of '\\' */ + lpdir = wcsrchr(lpstr, '\\'); /* find the last occurence of '\\' */ plength = wcslen(lpstr); flength = wcslen(lpdir);

1 0

[gschneider] 40166: - GetBitmapBits: This function should return DDB size since it's for 16 bit win only. So calculate this size instead of supplying the DIB size - BITMAP_GetObject: Don't always supply compression type BI_RGB, but distinguish compression from bitmap format. A problem with BI_BITFIELDS remains, since it can't be detected that way. Add a comment to GetDIBits too, same problem - this implicit BITFIELDS -> RGB issue could be the reason for some (delayed?) drawing problems - GetDIBi
by gschneider＠svn.reactos.org 21 Mar '09

21 Mar '09

Author: gschneider Date: Sat Mar 21 22:15:52 2009 New Revision: 40166 URL: http://svn.reactos.org/svn/reactos?rev=40166&view=rev Log: - GetBitmapBits: This function should return DDB size since it's for 16 bit win only. So calculate this size instead of supplying the DIB size - BITMAP_GetObject: Don't always supply compression type BI_RGB, but distinguish compression from bitmap format. A problem with BI_BITFIELDS remains, since it can't be detected that way. Add a comment to GetDIBits too, same problem - this implicit BITFIELDS -> RGB issue could be the reason for some (delayed?) drawing problems - GetDIBits: The palette information should be copied in both operation modes so move it to the beginning of the function - Fixes ~10 gdi32 bitmap winetests (but depends on used bit depth) Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c trunk/reactos/subsystems/win32/win32k/objects/dibobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] Sat Mar 21 22:15:52 2009 @@ -485,7 +485,7 @@ OUT OPTIONAL PBYTE pUnsafeBits) { PSURFACE psurf; - LONG ret; + LONG bmSize, ret; if (pUnsafeBits != NULL && Bytes == 0) { @@ -499,16 +499,19 @@ return 0; } + bmSize = BITMAP_GetWidthBytes(psurf->SurfObj.sizlBitmap.cx, + BitsPerFormat(psurf->SurfObj.iBitmapFormat)) * + abs(psurf->SurfObj.sizlBitmap.cy); + /* If the bits vector is null, the function should return the read size */ if (pUnsafeBits == NULL) { - ret = psurf->SurfObj.cjBits; SURFACE_UnlockSurface(psurf); - return ret; + return bmSize; } /* Don't copy more bytes than the buffer has */ - Bytes = min(Bytes, psurf->SurfObj.cjBits); + Bytes = min(Bytes, bmSize); // FIXME: use MmSecureVirtualMemory _SEH2_TRY @@ -852,7 +855,30 @@ pds->dsBmih.biHeight = pds->dsBm.bmHeight; pds->dsBmih.biPlanes = pds->dsBm.bmPlanes; pds->dsBmih.biBitCount = pds->dsBm.bmBitsPixel; - pds->dsBmih.biCompression = 0; // FIXME! + switch (psurf->SurfObj.iBitmapFormat) + { + /* FIXME: What about BI_BITFIELDS? */ + case BMF_1BPP: + case BMF_4BPP: + case BMF_8BPP: + case BMF_16BPP: + case BMF_24BPP: + case BMF_32BPP: + pds->dsBmih.biCompression = BI_RGB; + break; + case BMF_4RLE: + pds->dsBmih.biCompression = BI_RLE4; + break; + case BMF_8RLE: + pds->dsBmih.biCompression = BI_RLE8; + break; + case BMF_JPEG: + pds->dsBmih.biCompression = BI_JPEG; + break; + case BMF_PNG: + pds->dsBmih.biCompression = BI_PNG; + break; + } pds->dsBmih.biSizeImage = psurf->SurfObj.cjBits; pds->dsBmih.biXPelsPerMeter = 0; pds->dsBmih.biYPelsPerMeter = 0; Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] Sat Mar 21 22:15:52 2009 @@ -606,6 +606,9 @@ PBYTE ChkBits = Bits; PVOID ColorPtr; RGBQUAD *rgbQuads; + ULONG SourcePaletteType = 0; + ULONG DestPaletteType; + ULONG Index; DPRINT("Entered NtGdiGetDIBitsInternal()\n"); @@ -655,6 +658,163 @@ ColorPtr = ((PBYTE)Info + Info->bmiHeader.biSize); rgbQuads = (RGBQUAD *)ColorPtr; + + /* Copy palette information */ + if (Info->bmiHeader.biBitCount == BitsPerFormat(psurf->SurfObj.iBitmapFormat)) + { + hDestPalette = hSourcePalette; + bPaletteMatch = TRUE; + } + else + hDestPalette = BuildDIBPalette(Info, (PINT)&DestPaletteType); //hDestPalette = Dc->DevInfo->hpalDefault; + + SourcePalette = PALETTE_LockPalette(hSourcePalette); + /* FIXME - SourcePalette can be NULL!!! Don't assert here! */ + ASSERT(SourcePalette); + SourcePaletteType = SourcePalette->Mode; + PALETTE_UnlockPalette(SourcePalette); + + if (bPaletteMatch) + { + DestPalette = PALETTE_LockPalette(hDestPalette); + /* FIXME - DestPalette can be NULL!!!! Don't assert here!!! */ + DPRINT("DestPalette : %p\n", DestPalette); + ASSERT(DestPalette); + DestPaletteType = DestPalette->Mode; + } + else + { + DestPalette = SourcePalette; + } + + /* Copy palette. */ + /* FIXME: This is largely incomplete. ATM no Core!*/ + switch(Info->bmiHeader.biBitCount) + { + case 1: + case 4: + case 8: + Info->bmiHeader.biClrUsed = 0; + if ( psurf->hSecure && + BitsPerFormat(psurf->SurfObj.iBitmapFormat) == Info->bmiHeader.biBitCount) + { + if (Usage == DIB_RGB_COLORS) + { + if (DestPalette->NumColors != 1 << Info->bmiHeader.biBitCount) + Info->bmiHeader.biClrUsed = DestPalette->NumColors; + for (Index = 0; + Index < (1 << Info->bmiHeader.biBitCount) && Index < DestPalette->NumColors; + Index++) + { + rgbQuads[Index].rgbRed = DestPalette->IndexedColors[Index].peRed; + rgbQuads[Index].rgbGreen = DestPalette->IndexedColors[Index].peGreen; + rgbQuads[Index].rgbBlue = DestPalette->IndexedColors[Index].peBlue; + rgbQuads[Index].rgbReserved = 0; + } + } + else + { + PWORD Ptr = ColorPtr; + for (Index = 0; + Index < (1 << Info->bmiHeader.biBitCount); + Index++) + { + Ptr[Index] = (WORD)Index; + } + } + } + else + { + if (Usage == DIB_PAL_COLORS) + { + PWORD Ptr = ColorPtr; + for (Index = 0; + Index < (1 << Info->bmiHeader.biBitCount); + Index++) + { + Ptr[Index] = (WORD)Index; + } + } + else if (Info->bmiHeader.biBitCount > 1 && bPaletteMatch) + { + for (Index = 0; + Index < (1 << Info->bmiHeader.biBitCount) && Index < DestPalette->NumColors; + Index++) + { + Info->bmiColors[Index].rgbRed = DestPalette->IndexedColors[Index].peRed; + Info->bmiColors[Index].rgbGreen = DestPalette->IndexedColors[Index].peGreen; + Info->bmiColors[Index].rgbBlue = DestPalette->IndexedColors[Index].peBlue; + Info->bmiColors[Index].rgbReserved = 0; + } + } + else + { + switch(Info->bmiHeader.biBitCount) + { + case 1: + rgbQuads[0].rgbRed = rgbQuads[0].rgbGreen = rgbQuads[0].rgbBlue = 0; + rgbQuads[0].rgbReserved = 0; + rgbQuads[1].rgbRed = rgbQuads[1].rgbGreen = rgbQuads[1].rgbBlue = 0xff; + rgbQuads[1].rgbReserved = 0; + break; + case 4: + RtlCopyMemory(ColorPtr, EGAColorsQuads, sizeof(EGAColorsQuads)); + break; + case 8: + { + INT r, g, b; + RGBQUAD *color; + + RtlCopyMemory(rgbQuads, DefLogPaletteQuads, 10 * sizeof(RGBQUAD)); + RtlCopyMemory(rgbQuads + 246, DefLogPaletteQuads + 10, 10 * sizeof(RGBQUAD)); + color = rgbQuads + 10; + for(r = 0; r <= 5; r++) /* FIXME */ + for(g = 0; g <= 5; g++) + for(b = 0; b <= 5; b++) + { + color->rgbRed = (r * 0xff) / 5; + color->rgbGreen = (g * 0xff) / 5; + color->rgbBlue = (b * 0xff) / 5; + color->rgbReserved = 0; + color++; + } + } + break; + } + } + } + + case 15: + if (Info->bmiHeader.biCompression == BI_BITFIELDS) + { + ((PDWORD)Info->bmiColors)[0] = 0x7c00; + ((PDWORD)Info->bmiColors)[1] = 0x03e0; + ((PDWORD)Info->bmiColors)[2] = 0x001f; + } + break; + + case 16: + if (Info->bmiHeader.biCompression == BI_BITFIELDS) + { + ((PDWORD)Info->bmiColors)[0] = 0xf800; + ((PDWORD)Info->bmiColors)[1] = 0x07e0; + ((PDWORD)Info->bmiColors)[2] = 0x001f; + } + break; + + case 24: + case 32: + if (Info->bmiHeader.biCompression == BI_BITFIELDS) + { + ((PDWORD)Info->bmiColors)[0] = 0xff0000; + ((PDWORD)Info->bmiColors)[1] = 0x00ff00; + ((PDWORD)Info->bmiColors)[2] = 0x0000ff; + } + break; + } + + if (bPaletteMatch) + PALETTE_UnlockPalette(DestPalette); /* fill out the BITMAPINFO struct */ if (!ChkBits) @@ -678,6 +838,7 @@ Info->bmiHeader.biBitCount = BitsPerFormat(psurf->SurfObj.iBitmapFormat); switch (psurf->SurfObj.iBitmapFormat) { + /* FIXME: What about BI_BITFIELDS? */ case BMF_1BPP: case BMF_4BPP: case BMF_8BPP: @@ -715,166 +876,8 @@ else { SIZEL DestSize; - ULONG SourcePaletteType = 0; - ULONG DestPaletteType; POINTL SourcePoint; - ULONG Index; - - if (Info->bmiHeader.biBitCount == BitsPerFormat(psurf->SurfObj.iBitmapFormat)) - { - hDestPalette = hSourcePalette; - bPaletteMatch = TRUE; - } - else - hDestPalette = BuildDIBPalette(Info, (PINT)&DestPaletteType); //hDestPalette = Dc->DevInfo->hpalDefault; - - SourcePalette = PALETTE_LockPalette(hSourcePalette); - /* FIXME - SourcePalette can be NULL!!! Don't assert here! */ - ASSERT(SourcePalette); - SourcePaletteType = SourcePalette->Mode; - PALETTE_UnlockPalette(SourcePalette); - - if (bPaletteMatch) - { - DestPalette = PALETTE_LockPalette(hDestPalette); - /* FIXME - DestPalette can be NULL!!!! Don't assert here!!! */ - DPRINT("DestPalette : %p\n", DestPalette); - ASSERT(DestPalette); - DestPaletteType = DestPalette->Mode; - } - else - { - DestPalette = SourcePalette; - } - - /* Copy palette. */ - /* FIXME: This is largely incomplete. ATM no Core!*/ - switch(Info->bmiHeader.biBitCount) - { - case 1: - case 4: - case 8: - Info->bmiHeader.biClrUsed = 0; - if ( psurf->hSecure && - BitsPerFormat(psurf->SurfObj.iBitmapFormat) == Info->bmiHeader.biBitCount) - { - if (Usage == DIB_RGB_COLORS) - { - if (DestPalette->NumColors != 1 << Info->bmiHeader.biBitCount) - Info->bmiHeader.biClrUsed = DestPalette->NumColors; - for (Index = 0; - Index < (1 << Info->bmiHeader.biBitCount) && Index < DestPalette->NumColors; - Index++) - { - rgbQuads[Index].rgbRed = DestPalette->IndexedColors[Index].peRed; - rgbQuads[Index].rgbGreen = DestPalette->IndexedColors[Index].peGreen; - rgbQuads[Index].rgbBlue = DestPalette->IndexedColors[Index].peBlue; - rgbQuads[Index].rgbReserved = 0; - } - } - else - { - PWORD Ptr = ColorPtr; - for (Index = 0; - Index < (1 << Info->bmiHeader.biBitCount); - Index++) - { - Ptr[Index] = (WORD)Index; - } - } - } - else - { - if (Usage == DIB_PAL_COLORS) - { - PWORD Ptr = ColorPtr; - for (Index = 0; - Index < (1 << Info->bmiHeader.biBitCount); - Index++) - { - Ptr[Index] = (WORD)Index; - } - } - else if (Info->bmiHeader.biBitCount > 1 && bPaletteMatch) - { - for (Index = 0; - Index < (1 << Info->bmiHeader.biBitCount) && Index < DestPalette->NumColors; - Index++) - { - Info->bmiColors[Index].rgbRed = DestPalette->IndexedColors[Index].peRed; - Info->bmiColors[Index].rgbGreen = DestPalette->IndexedColors[Index].peGreen; - Info->bmiColors[Index].rgbBlue = DestPalette->IndexedColors[Index].peBlue; - Info->bmiColors[Index].rgbReserved = 0; - } - } - else - { - switch(Info->bmiHeader.biBitCount) - { - case 1: - rgbQuads[0].rgbRed = rgbQuads[0].rgbGreen = rgbQuads[0].rgbBlue = 0; - rgbQuads[0].rgbReserved = 0; - rgbQuads[1].rgbRed = rgbQuads[1].rgbGreen = rgbQuads[1].rgbBlue = 0xff; - rgbQuads[1].rgbReserved = 0; - break; - case 4: - RtlCopyMemory(ColorPtr, EGAColorsQuads, sizeof(EGAColorsQuads)); - break; - case 8: - { - INT r, g, b; - RGBQUAD *color; - - RtlCopyMemory(rgbQuads, DefLogPaletteQuads, 10 * sizeof(RGBQUAD)); - RtlCopyMemory(rgbQuads + 246, DefLogPaletteQuads + 10, 10 * sizeof(RGBQUAD)); - color = rgbQuads + 10; - for(r = 0; r <= 5; r++) /* FIXME */ - for(g = 0; g <= 5; g++) - for(b = 0; b <= 5; b++) - { - color->rgbRed = (r * 0xff) / 5; - color->rgbGreen = (g * 0xff) / 5; - color->rgbBlue = (b * 0xff) / 5; - color->rgbReserved = 0; - color++; - } - } - break; - } - } - } - - case 15: - if (Info->bmiHeader.biCompression == BI_BITFIELDS) - { - ((PDWORD)Info->bmiColors)[0] = 0x7c00; - ((PDWORD)Info->bmiColors)[1] = 0x03e0; - ((PDWORD)Info->bmiColors)[2] = 0x001f; - } - break; - - case 16: - if (Info->bmiHeader.biCompression == BI_BITFIELDS) - { - ((PDWORD)Info->bmiColors)[0] = 0xf800; - ((PDWORD)Info->bmiColors)[1] = 0x07e0; - ((PDWORD)Info->bmiColors)[2] = 0x001f; - } - break; - - case 24: - case 32: - if (Info->bmiHeader.biCompression == BI_BITFIELDS) - { - ((PDWORD)Info->bmiColors)[0] = 0xff0000; - ((PDWORD)Info->bmiColors)[1] = 0x00ff00; - ((PDWORD)Info->bmiColors)[2] = 0x0000ff; - } - break; - } - - if (bPaletteMatch) - PALETTE_UnlockPalette(DestPalette); + // // If we have a good dib pointer, why not just copy bits from there w/o XLATE'ing them. //

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