Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 54490: [KS] * Add a missing break. CID 13502.
by akhaldi＠svn.reactos.org 24 Nov '11

24 Nov '11

Author: akhaldi Date: Thu Nov 24 12:36:49 2011 New Revision: 54490 URL: http://svn.reactos.org/svn/reactos?rev=54490&view=rev Log: [KS] * Add a missing break. CID 13502. Modified: trunk/reactos/drivers/ksfilter/ks/irp.c Modified: trunk/reactos/drivers/ksfilter/ks/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/irp.c?… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/irp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/irp.c [iso-8859-1] Thu Nov 24 12:36:49 2011 @@ -1963,6 +1963,7 @@ break; case IRP_MJ_PNP: Dispatch = KsDefaultDispatchPnp; + break; default: Dispatch = NULL; }

1 0

[akhaldi] 54489: [SHELL32] * Initialize fSite in the constructor. CID 15134.
by akhaldi＠svn.reactos.org 24 Nov '11

24 Nov '11

Author: akhaldi Date: Thu Nov 24 11:40:43 2011 New Revision: 54489 URL: http://svn.reactos.org/svn/reactos?rev=54489&view=rev Log: [SHELL32] * Initialize fSite in the constructor. CID 15134. Modified: trunk/reactos/dll/win32/shell32/shv_item_new.cpp Modified: trunk/reactos/dll/win32/shell32/shv_item_new.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_item… ============================================================================== --- trunk/reactos/dll/win32/shell32/shv_item_new.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shv_item_new.cpp [iso-8859-1] Thu Nov 24 11:40:43 2011 @@ -27,8 +27,9 @@ CNewMenu::CNewMenu() { + szPath = NULL; s_SnHead = NULL; - szPath = NULL; + fSite = NULL; }

1 0

[akhaldi] 54488: [SHLWAPI] * Fix the syntax of some resource files (Spotted by windres).
by akhaldi＠svn.reactos.org 24 Nov '11

24 Nov '11

Author: akhaldi Date: Thu Nov 24 11:27:36 2011 New Revision: 54488 URL: http://svn.reactos.org/svn/reactos?rev=54488&view=rev Log: [SHLWAPI] * Fix the syntax of some resource files (Spotted by windres). Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_Hu.rc trunk/reactos/dll/win32/shlwapi/shlwapi_Pt.rc Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/shlwapi_Hu.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/shlwapi_Hu.rc [iso-8859-1] Thu Nov 24 11:27:36 2011 @@ -33,10 +33,10 @@ LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 CHECKBOX "Ne jelenÃ&tse meg ezt az Ã¼zenetet mÃ©gegyszer", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON "&OK" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&MÃ©gse" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Igen" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Nem" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&OK", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&MÃ©gse", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Igen", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Nem", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP } STRINGTABLE Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/shlwapi_Pt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/shlwapi_Pt.rc [iso-8859-1] Thu Nov 24 11:27:36 2011 @@ -34,10 +34,10 @@ LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 CHECKBOX "NÃ£o &mostrar esta mensagem novamente", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON "&OK" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Cancelar" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Sim" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&NÃ£o" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&OK", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Cancelar", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Sim", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&NÃ£o", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP } STRINGTABLE

1 0

[akhaldi] 54487: [HAL] * Timo Kreuzer: Fix a NULL pointer dereference. CID 13453.
by akhaldi＠svn.reactos.org 24 Nov '11

24 Nov '11

Author: akhaldi Date: Thu Nov 24 11:25:40 2011 New Revision: 54487 URL: http://svn.reactos.org/svn/reactos?rev=54487&view=rev Log: [HAL] * Timo Kreuzer: Fix a NULL pointer dereference. CID 13453. Modified: trunk/reactos/hal/halx86/acpi/halacpi.c Modified: trunk/reactos/hal/halx86/acpi/halacpi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/acpi/halacpi.c?… ============================================================================== --- trunk/reactos/hal/halx86/acpi/halacpi.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/acpi/halacpi.c [iso-8859-1] Thu Nov 24 11:25:40 2011 @@ -747,19 +747,22 @@ { /* Use HAL heap */ HalpUnmapVirtualAddress(MappedAddress, TableLength); + + LoaderExtension = LoaderBlock->Extension; } else { /* Use Mm */ MmUnmapIoSpace(MappedAddress, TableLength << PAGE_SHIFT); + + LoaderExtension = NULL; } /* Cache the RSDT */ HalpAcpiCacheTable(&Rsdt->Header); /* Check for compatible loader block extension */ - LoaderExtension = LoaderBlock->Extension; - if (LoaderExtension->Size >= 0x58) + if (LoaderExtension && (LoaderExtension->Size >= 0x58)) { /* Compatible loader: did it provide an ACPI table override? */ if ((LoaderExtension->AcpiTable) && (LoaderExtension->AcpiTableSize))

1 0

[akhaldi] 54486: [NTOSKRNL] * Timo Kreuzer: Fix some dead code. CID 14595.
by akhaldi＠svn.reactos.org 24 Nov '11

24 Nov '11

Author: akhaldi Date: Thu Nov 24 11:22:18 2011 New Revision: 54486 URL: http://svn.reactos.org/svn/reactos?rev=54486&view=rev Log: [NTOSKRNL] * Timo Kreuzer: Fix some dead code. CID 14595. Modified: trunk/reactos/ntoskrnl/mm/i386/page.c Modified: trunk/reactos/ntoskrnl/mm/i386/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/page.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] Thu Nov 24 11:22:18 2011 @@ -213,7 +213,7 @@ { /* We should have a process for user land addresses */ ASSERT(Process != NULL); - + if(Process != PsGetCurrentProcess()) { PageDir = MmCreateHyperspaceMapping(PTE_TO_PFN(Process->Pcb.DirectoryTableBase[0])); @@ -229,8 +229,9 @@ return NULL; } MI_SET_USAGE(MI_USAGE_LEGACY_PAGE_DIRECTORY); - if (Process) MI_SET_PROCESS2(Process->ImageFileName); - if (!Process) MI_SET_PROCESS2("Kernel Legacy"); + + MI_SET_PROCESS2(Process->ImageFileName); + Status = MmRequestPageMemoryConsumer(MC_SYSTEM, FALSE, &Pfn); if (!NT_SUCCESS(Status) || Pfn == 0) { @@ -264,8 +265,8 @@ return NULL; } MI_SET_USAGE(MI_USAGE_LEGACY_PAGE_DIRECTORY); - if (Process) MI_SET_PROCESS2(Process->ImageFileName); - if (!Process) MI_SET_PROCESS2("Kernel Legacy"); + MI_SET_PROCESS2(Process->ImageFileName); + Status = MmRequestPageMemoryConsumer(MC_SYSTEM, FALSE, &Pfn); if (!NT_SUCCESS(Status) || Pfn == 0) {

1 0

[akhaldi] 54485: [SHELL32] * Fix the syntax of the Japanese resource file (Spotted by windres).
by akhaldi＠svn.reactos.org 24 Nov '11

24 Nov '11

Author: akhaldi Date: Thu Nov 24 10:17:48 2011 New Revision: 54485 URL: http://svn.reactos.org/svn/reactos?rev=54485&view=rev Log: [SHELL32] * Fix the syntax of the Japanese resource file (Spotted by windres). Modified: trunk/reactos/dll/win32/shell32/lang/ja-JP.rc Modified: trunk/reactos/dll/win32/shell32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ja-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] Thu Nov 24 10:17:48 2011 @@ -31,7 +31,7 @@ BEGIN POPUP "" BEGIN - POPUP "è¡¨\ç¤º(&V)" + POPUP "è¡¨ç¤º(&V)" BEGIN MENUITEM "å¤§ããã¢ã¤ã³ã³(&G)", FCIDM_SHVIEW_BIGICON MENUITEM "å°ããã¢ã¤ã³ã³(&M)", FCIDM_SHVIEW_SMALLICON @@ -52,8 +52,8 @@ MENUITEM SEPARATOR MENUITEM "ææ°ã®æå ±ã«æ´æ°", FCIDM_SHVIEW_REFRESH MENUITEM SEPARATOR - MENUITEM "è²¼\ãä»ã", FCIDM_SHVIEW_INSERT - MENUITEM "ã·ã§ã¼ãã«ããã®è²¼\ãä»ã", FCIDM_SHVIEW_INSERTLINK + MENUITEM "è²¼ãä»ã", FCIDM_SHVIEW_INSERT + MENUITEM "ã·ã§ã¼ãã«ããã®è²¼ãä»ã", FCIDM_SHVIEW_INSERTLINK MENUITEM SEPARATOR MENUITEM "ããããã£", FCIDM_SHVIEW_PROPERTIES END @@ -159,7 +159,7 @@ FONT 9, "MS UI Gothic" BEGIN ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE - LTEXT "å®è¡ããããã°ã©ã åãã¾ãã¯éããã©ã«ããææ¸åãã¤ã³ã¿ã¼ããã ãªã½\ã¼ã¹åãå¥åãã¦ãã ããã", 12289, 36, 11, 182, 18 + LTEXT "å®è¡ããããã°ã©ã åãã¾ãã¯éããã©ã«ããææ¸åãã¤ã³ã¿ã¼ããã ãªã½ã¼ã¹åãå¥åãã¦ãã ããã", 12289, 36, 11, 182, 18 LTEXT "åå(&O):", 12305, 7, 39, 24, 10 CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 DEFPUSHBUTTON "OK", IDOK, 62, 63, 50, 14, WS_TABSTOP @@ -336,7 +336,7 @@ LTEXT "ãã®ããã°ã©ã ãå®è¡ããã¦ã¼ã¶ã¼ã¢ã«ã¦ã³ããé¸æãã¦ãã ãã", -1, 10, 20, 220, 20 CHECKBOX "ç¾å¨ã®ã¦ã¼ã¶ã¼ (%s)", 14000, 10, 45, 150, 10 LTEXT "è¨±å¯ããã¦ããªãããã°ã©ã ã®æ´»åããã³ã³ãã¥ã¼ã¿ã¨ãã¼ã¿ãä¿è·ãã", -1, 25, 57, 200, 10, WS_DISABLED - CHECKBOX "ãã®ãªãã·ã§ã³ã¯ã³ã³ãã¥ã¼ã¿ãåäººãã¼ã¿ã«å±å®³ãããããã³ã³ãã¥ã¼ã¿ã¦ã¤ã«ã¹ãæªç¶ã«é²æ¢ãããã¨ãã§ãã¾ãããã ãããã®ãªãã·ã§ã³ãé¸æããã¨ããã°ã©ã ãæ£å¸¸ã«æ©è½\ããªããªãå¯è½\æ§ãããã¾ãã", 14001, 25, 68, 200, 30, WS_DISABLED | BS_MULTILINE + CHECKBOX "ãã®ãªãã·ã§ã³ã¯ã³ã³ãã¥ã¼ã¿ãåäººãã¼ã¿ã«å±å®³ãããããã³ã³ãã¥ã¼ã¿ã¦ã¤ã«ã¹ãæªç¶ã«é²æ¢ãããã¨ãã§ãã¾ãããã ãããã®ãªãã·ã§ã³ãé¸æããã¨ããã°ã©ã ãæ£å¸¸ã«æ©è½ããªããªãå¯è½æ§ãããã¾ãã", 14001, 25, 68, 200, 30, WS_DISABLED | BS_MULTILINE CHECKBOX "æ¬¡ã®ã¦ã¼ã¶ã¼:", 14002, 10, 100, 90, 10 LTEXT "ã¦ã¼ã¶ã¼å:", -1, 20, 118, 54, 10 COMBOBOX 14003, 75, 115, 100, 15, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP @@ -360,7 +360,7 @@ EDITTEXT 14002, 106, 87, 50, 14, WS_TABSTOP | ES_NUMBER LTEXT "æå¤§ãµã¤ãº(MB)(&A):", -1, 20, 105, 70, 10 RADIOBUTTON "ãã¡ã¤ã«ããã¿ç®±ã«ã»ï¾åããã«ããã«åé¤ããã(&R)", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP - AUTOCHECKBOX "åé¤ã®ç¢ºèªãã¤ã¢ãã°ãè¡¨\ç¤ºãã(&D)", 14004, 20, 155, 140, 10, WS_TABSTOP + AUTOCHECKBOX "åé¤ã®ç¢ºèªãã¤ã¢ãã°ãè¡¨ç¤ºãã(&D)", 14004, 20, 155, 140, 10, WS_TABSTOP END OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 @@ -386,7 +386,7 @@ BEGIN GROUPBOX "ã¿ã¹ã¯", -1, 7, 10, 249, 45 ICON "", 30109, 14, 25, 21, 20, SS_REALSIZECONTROL - AUTORADIOBUTTON "ãã©ã«ãã«å±éã®ã¿ã¹ã¯ãè¡¨\ç¤ºãã(&F)", 14001, 40, 25, 120, 10, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "ãã©ã«ãã«å±éã®ã¿ã¹ã¯ãè¡¨ç¤ºãã(&F)", 14001, 40, 25, 120, 10, WS_TABSTOP | WS_GROUP AUTORADIOBUTTON "ReactOS ã¯ã©ã·ãã¯ ãã©ã«ããä½¿ç¨ãã(&I)", 14002, 40, 37, 120, 10, WS_TABSTOP | WS_GROUP GROUPBOX "ãã©ã«ãã®åç§", -1, 7, 60, 249, 45, WS_TABSTOP ICON "", 30110, 14, 70, 21, 20, SS_REALSIZECONTROL @@ -403,12 +403,12 @@ FOLDER_OPTIONS_VIEW_DLG DIALOGEX 0, 0, 264, 256 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION -CAPTION "è¡¨\ç¤º" -FONT 9, "MS UI Gothic", 0, 0, 0x0 -BEGIN -GROUPBOX "ãã©ã«ãã®è¡¨\ç¤ºæ¹æ³", -1, 7, 10, 249, 60 +CAPTION "è¡¨ç¤º" +FONT 9, "MS UI Gothic", 0, 0, 0x0 +BEGIN +GROUPBOX "ãã©ã«ãã®è¡¨ç¤ºæ¹æ³", -1, 7, 10, 249, 60 //ICON -LTEXT "ãã®ãã©ã«ãã«ä½¿ç¨ãã¦ããè¡¨\ç¤ºæ¹æ³(è©³ç´°è¡¨\ç¤ºãä¸¦ã¹ã¦è¡¨\ç¤ºãªã©)\nããã¹ã¦ã®ãã©ã«ãã«é©ç¨ã§ãã¾ãã", -1, 60, 20, 180, 20 +LTEXT "ãã®ãã©ã«ãã«ä½¿ç¨ãã¦ããè¡¨ç¤ºæ¹æ³(è©³ç´°è¡¨ç¤ºãä¸¦ã¹ã¦è¡¨ç¤ºãªã©)\nããã¹ã¦ã®ãã©ã«ãã«é©ç¨ã§ãã¾ãã", -1, 60, 20, 180, 20 PUSHBUTTON "ãã¹ã¦ã®ãã©ã«ãã«é©ç¨(&L)", 14001, 60, 50, 80, 14, WS_TABSTOP PUSHBUTTON "ãã¹ã¦ã®ãã©ã«ãããªã»ãã(&R)", 14002, 150, 50, 80, 14, WS_TABSTOP LTEXT "è©³ç´°è¨å®:", -1, 7, 80, 100, 10 @@ -510,7 +510,7 @@ FONT 9, "MS UI Gothic" BEGIN ICON "", 1000, 5, 7, 21, 20 - LTEXT "ReactOS ã¯ãã£ã¹ã¯ãæ¿å¥ãããããããã¯ãã®ãã¡ã¤ã«ã®ç¨®é¡ã®ããã¤ã¹ãæ¥ç¶ãããã¨ãæ¯ååãåä½ãå¯è½\ã§ã:", 1001, 30, 7, 193, 20 + LTEXT "ReactOS ã¯ãã£ã¹ã¯ãæ¿å¥ãããããããã¯ãã®ãã¡ã¤ã«ã®ç¨®é¡ã®ããã¤ã¹ãæ¥ç¶ãããã¨ãæ¯ååãåä½ãå¯è½ã§ã:", 1001, 30, 7, 193, 20 ICON "", 1005, 32, 27, 11, 10, SS_REALSIZECONTROL EDITTEXT 1006, 49, 28, 177, 14, ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP LTEXT "ReactOS ãå®è¡ããåä½ãé¸æãã¦ãã ãã", 1002, 32, 41, 190, 8 @@ -526,7 +526,7 @@ FONT 9, "MS UI Gothic" BEGIN ICON "", 1000, 5, 7, 21, 20 - LTEXT "ReactOS ã¯ãã®ããã¤ã¹ãæ¥ç¶ãããã¨ãæ¯ååãåä½ãå¯è½\ã§ãã", 1001, 32, 7, 190, 22 + LTEXT "ReactOS ã¯ãã®ããã¤ã¹ãæ¥ç¶ãããã¨ãæ¯ååãåä½ãå¯è½ã§ãã", 1001, 32, 7, 190, 22 LTEXT "ReactOS ãå®è¡ããåä½ãé¸æãã¦ãã ãã(&W)", 1002, 32, 31, 190, 8 CONTROL "", 1003, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000C04D, 32, 43, 187, 96 AUTOCHECKBOX "å¸¸ã«é¸æããåä½ãè¡ã(&A)", 1004, 32, 143, 190, 8 @@ -727,21 +727,21 @@ IDS_EMPTY_BITBUCKET "ãã¿ç®±ãç©ºã«ãã" IDS_PICK_ICON_TITLE "ã¢ã¤ã³ã³ã®é¸æ" IDS_PICK_ICON_FILTER "ã¢ã¤ã³ã³ãã¡ã¤ã« (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" - IDS_OPEN_WITH_FILTER "å®è¡å¯è½\ ãã¡ã¤ã« (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" + IDS_OPEN_WITH_FILTER "å®è¡å¯è½ ãã¡ã¤ã« (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" IDS_DIRECTORY "ãã©ã«ã" IDS_VIRTUAL_DRIVER "ä»®æ³ ããã¤ã¹ ãã©ã¤ã" IDS_BAT_FILE "ReactOS ããã ãã¡ã¤ã«" IDS_CMD_FILE "ReactOS ã³ãã³ã ã¹ã¯ãªãã" IDS_COM_FILE "Dos ã¢ããªã±ã¼ã·ã§ã³" IDS_CPL_FILE "ã³ã³ããã¼ã« ããã«ã®é ç®" - IDS_CUR_FILE "ã«ã¼ã½\ã«" + IDS_CUR_FILE "ã«ã¼ã½ã«" IDS_DLL_FILE "ã¢ããªã±ã¼ã·ã§ã³ æ¡å¼µ" IDS_DRV_FILE "ããã¤ã¹ ãã©ã¤ã" IDS_EXE_FILE "ã¢ããªã±ã¼ã·ã§ã³" IDS_FON_FILE "ãã©ã³ã ãã¡ã¤ã«" IDS_TTF_FILE "TrueType ãã©ã³ã ãã¡ã¤ã«" IDS_HLP_FILE "ãã«ã ãã¡ã¤ã«" - IDS_INI_FILE "æ§\æè¨å®" + IDS_INI_FILE "æ§æè¨å®" IDS_LNK_FILE "ã·ã§ã¼ãã«ãã" IDS_SYS_FILE "ã·ã¹ãã ãã¡ã¤ã«"

1 0

[cgutman] 54484: [SCSIPORT] - Implement ScsiPortGetLogicalUnit
by cgutman＠svn.reactos.org 24 Nov '11

24 Nov '11

Author: cgutman Date: Thu Nov 24 00:07:15 2011 New Revision: 54484 URL: http://svn.reactos.org/svn/reactos?rev=54484&view=rev Log: [SCSIPORT] - Implement ScsiPortGetLogicalUnit Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/s… ============================================================================== --- trunk/reactos/drivers/storage/scsiport/scsiport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/scsiport/scsiport.c [iso-8859-1] Thu Nov 24 00:07:15 2011 @@ -580,37 +580,35 @@ IN UCHAR TargetId, IN UCHAR Lun) { - UNIMPLEMENTED; -#if 0 - PSCSI_PORT_DEVICE_EXTENSION DeviceExtension; - PSCSI_PORT_LUN_EXTENSION LunExtension; - PLIST_ENTRY Entry; - - DPRINT("ScsiPortGetLogicalUnit() called\n"); - - DeviceExtension = CONTAINING_RECORD(HwDeviceExtension, - SCSI_PORT_DEVICE_EXTENSION, - MiniPortDeviceExtension); - if (IsListEmpty(&DeviceExtension->LunExtensionListHead)) - return NULL; - - Entry = DeviceExtension->LunExtensionListHead.Flink; - while (Entry != &DeviceExtension->LunExtensionListHead) - { - LunExtension = CONTAINING_RECORD(Entry, - SCSI_PORT_LUN_EXTENSION, - List); - if (LunExtension->PathId == PathId && - LunExtension->TargetId == TargetId && - LunExtension->Lun == Lun) - { - return (PVOID)&LunExtension->MiniportLunExtension; - } - - Entry = Entry->Flink; - } -#endif - return NULL; + PSCSI_PORT_DEVICE_EXTENSION DeviceExtension; + PSCSI_PORT_LUN_EXTENSION LunExtension; + + DPRINT("ScsiPortGetLogicalUnit() called\n"); + + DeviceExtension = CONTAINING_RECORD(HwDeviceExtension, + SCSI_PORT_DEVICE_EXTENSION, + MiniPortDeviceExtension); + + /* Check the extension size */ + if (!DeviceExtension->LunExtensionSize) + { + /* They didn't want one */ + return NULL; + } + + LunExtension = SpiGetLunExtension(DeviceExtension, + PathId, + TargetId, + Lun); + /* Check that the logical unit exists */ + if (!LunExtension) + { + /* Nope, return NULL */ + return NULL; + } + + /* Return the logical unit miniport extension */ + return (LunExtension + 1); }

1 0

[gadamopoulos] 54483: [win32k] - Fix a typo in NtUserSetClipboardData that tried to print a struct as a pointer (cid 15051) - Clean up clipboard.c a bit. note: this cleanup "fixes" cid 14599 and 14...
by gadamopoulos＠svn.reactos.org 23 Nov '11

23 Nov '11

Author: gadamopoulos Date: Wed Nov 23 19:52:06 2011 New Revision: 54483 URL: http://svn.reactos.org/svn/reactos?rev=54483&view=rev Log: [win32k] - Fix a typo in NtUserSetClipboardData that tried to print a struct as a pointer (cid 15051) - Clean up clipboard.c a bit. note: this cleanup "fixes" cid 14599 and 14598, but even though they are false positives, this cleanup was needed - Add missing break in NtUserQueryWindow (cid 13486) Modified: trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c [iso-8859-1] Wed Nov 23 19:52:06 2011 @@ -780,7 +780,6 @@ HANDLE APIENTRY NtUserGetClipboardData(UINT fmt, PGETCLIPBDATA pgcd) { - NTSTATUS Status = STATUS_SUCCESS; HANDLE hRet = NULL; PCLIP pElement; PWINSTATION_OBJECT pWinStaObj = NULL; @@ -861,20 +860,14 @@ if (pPaletteEl && !IS_DATA_DELAYED(pPaletteEl)) pgcd->hPalette = pPaletteEl->hData; } + + hRet = pElement->hData; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - Status = _SEH2_GetExceptionCode(); + SetLastNtError(_SEH2_GetExceptionCode()); } _SEH2_END - - if (!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - goto cleanup; - } - - hRet = pElement->hData; cleanup: if(pWinStaObj) @@ -882,7 +875,7 @@ UserLeave(); - TRACE("Ret: %p\n", hRet); + TRACE("NtUserGetClipboardData returns %p\n", hRet); return hRet; } @@ -952,12 +945,9 @@ NtUserSetClipboardData(UINT fmt, HANDLE hData, PSETCLIPBDATA pUnsafeScd) { SETCLIPBDATA scd; - NTSTATUS Status = STATUS_SUCCESS; - HANDLE hRet = NULL; - - TRACE("NtUserSetClipboardData(%x %p %p)\n", fmt, hData, scd); - - UserEnterExclusive(); + HANDLE hRet; + + TRACE("NtUserSetClipboardData(%x %p %p)\n", fmt, hData, pUnsafeScd); _SEH2_TRY { @@ -966,20 +956,16 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - Status = _SEH2_GetExceptionCode(); + SetLastNtError(_SEH2_GetExceptionCode()); + _SEH2_YIELD(return NULL;) } _SEH2_END - if (!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - goto cleanup; - } + UserEnterExclusive(); /* Call internal function */ hRet = UserSetClipboardData(fmt, hData, &scd); -cleanup: UserLeave(); return hRet; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Wed Nov 23 19:52:06 2011 @@ -3683,6 +3683,7 @@ case QUERY_WINDOW_REAL_ID: Result = (DWORD)pWnd->head.pti->pEThread->Cid.UniqueProcess; + break; default: Result = (DWORD)NULL;

1 0

[tfaber] 54482: [SERVICES] - Do not use an unsigned type for a value that can become negative in ScmAssignNewTag (CID 14665)
by tfaber＠svn.reactos.org 23 Nov '11

23 Nov '11

Author: tfaber Date: Wed Nov 23 18:15:26 2011 New Revision: 54482 URL: http://svn.reactos.org/svn/reactos?rev=54482&view=rev Log: [SERVICES] - Do not use an unsigned type for a value that can become negative in ScmAssignNewTag (CID 14665) Modified: trunk/reactos/base/system/services/rpcserver.c Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] Wed Nov 23 18:15:26 2011 @@ -271,7 +271,7 @@ DWORD dwFreeTag = 0; DWORD dwTagUsedBase = 1; BOOLEAN TagUsed[TAG_ARRAY_SIZE]; - DWORD dwTagOffset; + INT nTagOffset; DWORD i; DWORD cbDataSize; PLIST_ENTRY ServiceEntry; @@ -333,9 +333,9 @@ /* mark tags in GroupOrderList as used */ for (i = 1; i <= dwGroupTagCount; i++) { - dwTagOffset = pdwGroupTags[i] - dwTagUsedBase; - if (dwTagOffset >= 0 && dwTagOffset < TAG_ARRAY_SIZE) - TagUsed[dwTagOffset] = TRUE; + nTagOffset = pdwGroupTags[i] - dwTagUsedBase; + if (nTagOffset >= 0 && nTagOffset < TAG_ARRAY_SIZE) + TagUsed[nTagOffset] = TRUE; } /* mark tags in service list as used */ @@ -346,9 +346,9 @@ CurrentService = CONTAINING_RECORD(ServiceEntry, SERVICE, ServiceListEntry); if (CurrentService->lpGroup == lpService->lpGroup) { - dwTagOffset = CurrentService->dwTag - dwTagUsedBase; - if (dwTagOffset >= 0 && dwTagOffset < TAG_ARRAY_SIZE) - TagUsed[dwTagOffset] = TRUE; + nTagOffset = CurrentService->dwTag - dwTagUsedBase; + if (nTagOffset >= 0 && nTagOffset < TAG_ARRAY_SIZE) + TagUsed[nTagOffset] = TRUE; } ServiceEntry = ServiceEntry->Flink; @@ -365,8 +365,7 @@ } dwTagUsedBase += TAG_ARRAY_SIZE; - } - while (!dwFreeTag); + } while (!dwFreeTag); cleanup: if (pdwGroupTags)

1 0

[tfaber] 54481: [SERVICES] - Fix dwServiceType and dwServiceState checks in REnumServicesStatusW (see r54373) - Fix a memory leak in RQueryServiceConfig2A
by tfaber＠svn.reactos.org 23 Nov '11

23 Nov '11

Author: tfaber Date: Wed Nov 23 17:13:53 2011 New Revision: 54481 URL: http://svn.reactos.org/svn/reactos?rev=54481&view=rev Log: [SERVICES] - Fix dwServiceType and dwServiceState checks in REnumServicesStatusW (see r54373) - Fix a memory leak in RQueryServiceConfig2A Modified: trunk/reactos/base/system/services/rpcserver.c Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] Wed Nov 23 17:13:53 2011 @@ -2511,13 +2511,16 @@ *pcbBytesNeeded = 0; *lpServicesReturned = 0; - if ((dwServiceType!=SERVICE_DRIVER) && (dwServiceType!=SERVICE_WIN32)) + if ((dwServiceType == 0) || + ((dwServiceType & ~(SERVICE_DRIVER | SERVICE_WIN32)) != 0)) { DPRINT("Not a valid Service Type!\n"); return ERROR_INVALID_PARAMETER; } - if ((dwServiceState<SERVICE_ACTIVE) || (dwServiceState>SERVICE_STATE_ALL)) + if ((dwServiceState != SERVICE_ACTIVE) && + (dwServiceState != SERVICE_INACTIVE) && + (dwServiceState != SERVICE_STATE_ALL)) { DPRINT("Not a valid Service State!\n"); return ERROR_INVALID_PARAMETER; @@ -2667,7 +2670,7 @@ dwRequiredSize += dwSize; } - if (dwError == 0) + if (dwError == ERROR_SUCCESS) { *pcbBytesNeeded = 0; if (lpResumeHandle) *lpResumeHandle = 0; @@ -4800,7 +4803,6 @@ PSERVICE lpService = NULL; HKEY hServiceKey = NULL; LPWSTR lpDescriptionW = NULL; - LPSTR lpDescription = NULL; DPRINT("RQueryServiceConfig2A() called hService %p dwInfoLevel %u, lpBuffer %p cbBufSize %u pcbBytesNeeded %p\n", hService, dwInfoLevel, lpBuffer, cbBufSize, pcbBytesNeeded); @@ -4894,8 +4896,8 @@ /* Unlock the service database */ ScmUnlockDatabase(); - if (lpDescription != NULL) - HeapFree(GetProcessHeap(), 0, lpDescription); + if (lpDescriptionW != NULL) + HeapFree(GetProcessHeap(), 0, lpDescriptionW); if (hServiceKey != NULL) RegCloseKey(hServiceKey);

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