Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ekohl] 50682: [CFGMGR32] - Add missing functions. - Add forwarders to functions that are exported by setupapi.dll. - Mark deprecated functions.
by ekohl＠svn.reactos.org 13 Feb '11

13 Feb '11

Author: ekohl Date: Sun Feb 13 10:02:31 2011 New Revision: 50682 URL: http://svn.reactos.org/svn/reactos?rev=50682&view=rev Log: [CFGMGR32] - Add missing functions. - Add forwarders to functions that are exported by setupapi.dll. - Mark deprecated functions. Modified: trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.spec Modified: trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cfgmgr32/cfgmgr3… ============================================================================== --- trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.spec [iso-8859-1] Sun Feb 13 10:02:31 2011 @@ -1,9 +1,9 @@ @ stdcall CMP_Init_Detection(long) setupapi.CMP_Init_Detection @ stdcall CMP_RegisterNotification(ptr ptr long ptr) setupapi.CMP_RegisterNotification @ stdcall CMP_Report_LogOn(long long) setupapi.CMP_Report_LogOn -@ stub CMP_UnregisterNotification # setupapi.CMP_UnregisterNotification +@ stdcall CMP_UnregisterNotification(ptr) setupapi.CMP_UnregisterNotification @ stdcall CMP_WaitNoPendingInstallEvents(long) setupapi.CMP_WaitNoPendingInstallEvents -@ stub CMP_WaitServicesAvailable # setupapi.CMP_WaitServicesAvailable +@ stdcall CMP_WaitServicesAvailable(ptr) setupapi.CMP_WaitServicesAvailable @ stdcall CM_Add_Empty_Log_Conf(ptr ptr long long) setupapi.CM_Add_Empty_Log_Conf @ stdcall CM_Add_Empty_Log_Conf_Ex(ptr ptr long long ptr) setupapi.CM_Add_Empty_Log_Conf_Ex @ stdcall CM_Add_IDA(ptr str long) setupapi.CM_Add_IDA @@ -11,8 +11,8 @@ @ stdcall CM_Add_ID_ExA(ptr str long ptr) setupapi.CM_Add_ID_ExA @ stdcall CM_Add_ID_ExW(ptr wstr long ptr) setupapi.CM_Add_ID_ExW @ stub CM_Add_Range # setupapi.CM_Add_Range -@ stub CM_Add_Res_Des # setupapi.CM_Add_Res_Des -@ stub CM_Add_Res_Des_Ex # setupapi.CM_Add_Res_Des_Ex +@ stdcall CM_Add_Res_Des(ptr ptr long ptr long long) setupapi.CM_Add_Res_Des +@ stdcall CM_Add_Res_Des_Ex(ptr ptr long ptr long long long) setupapi.CM_Add_Res_Des_Ex @ stdcall CM_Connect_MachineA(str ptr) setupapi.CM_Connect_MachineA @ stdcall CM_Connect_MachineW(wstr ptr) setupapi.CM_Connect_MachineW @ stdcall CM_Create_DevNodeA(ptr str long long) setupapi.CM_Create_DevNodeA @@ -45,9 +45,10 @@ @ stdcall CM_Free_Log_Conf_Ex(ptr long ptr) setupapi.CM_Free_Log_Conf_Ex @ stdcall CM_Free_Log_Conf_Handle(ptr) setupapi.CM_Free_Log_Conf_Handle @ stub CM_Free_Range_List # setupapi.CM_Free_Range_List -@ stub CM_Free_Res_Des # setupapi.CM_Free_Res_Des -@ stub CM_Free_Res_Des_Ex # setupapi.CM_Free_Res_Des_Ex -@ stub CM_Free_Res_Des_Handle # setupapi.CM_Free_Res_Des_Handle +@ stdcall CM_Free_Res_Des(ptr ptr long) setupapi.CM_Free_Res_Des +@ stdcall CM_Free_Res_Des_Ex(ptr ptr long long) setupapi.CM_Free_Res_Des_Ex +@ stdcall CM_Free_Res_Des_Handle(ptr) setupapi.CM_Free_Res_Des_Handle +@ stub CM_Free_Resource_Conflict_Handle # setupapi.CM_Free_Resource_Conflict_Handle @ stdcall CM_Get_Child(ptr long long) setupapi.CM_Get_Child @ stdcall CM_Get_Child_Ex(ptr long long long) setupapi.CM_Get_Child_Ex @ stdcall CM_Get_Class_Key_NameA(ptr str ptr long) setupapi.CM_Get_Class_Key_NameA @@ -58,6 +59,8 @@ @ stdcall CM_Get_Class_NameW(ptr wstr ptr long) setupapi.CM_Get_Class_NameW @ stdcall CM_Get_Class_Name_ExA(ptr str ptr long long) setupapi.CM_Get_Class_Name_ExA @ stdcall CM_Get_Class_Name_ExW(ptr wstr ptr long long) setupapi.CM_Get_Class_Name_ExW +@ stub CM_Get_Class_Registry_PropertyA # setupapi.CM_Get_Class_Registry_PropertyA +@ stub CM_Get_Class_Registry_PropertyW # setupapi.CM_Get_Class_Registry_PropertyW @ stdcall CM_Get_Depth(ptr long long) setupapi.CM_Get_Depth @ stdcall CM_Get_Depth_Ex(ptr long long long) setupapi.CM_Get_Depth_Ex @ stdcall CM_Get_DevNode_Registry_PropertyA(long long ptr ptr ptr long) setupapi.CM_Get_DevNode_Registry_PropertyA @@ -108,14 +111,17 @@ @ stdcall CM_Get_Log_Conf_Priority_Ex(ptr ptr long long) setupapi.CM_Get_Log_Conf_Priority_Ex @ stdcall CM_Get_Next_Log_Conf(ptr ptr long) setupapi.CM_Get_Next_Log_Conf @ stdcall CM_Get_Next_Log_Conf_Ex(ptr ptr long long) setupapi.CM_Get_Next_Log_Conf_Ex -@ stub CM_Get_Next_Res_Des # setupapi.CM_Get_Next_Res_Des -@ stub CM_Get_Next_Res_Des_Ex # setupapi.CM_Get_Next_Res_Des_Ex +@ stdcall CM_Get_Next_Res_Des(ptr ptr long ptr long) setupapi.CM_Get_Next_Res_Des +@ stdcall CM_Get_Next_Res_Des_Ex(ptr ptr long ptr long long) setupapi.CM_Get_Next_Res_Des_Ex @ stdcall CM_Get_Parent(ptr long long) setupapi.CM_Get_Parent @ stdcall CM_Get_Parent_Ex(ptr long long long) setupapi.CM_Get_Parent_Ex -@ stub CM_Get_Res_Des_Data # setupapi.CM_Get_Res_Des_Data -@ stub CM_Get_Res_Des_Data_Ex # setupapi.CM_Get_Res_Des_Data_Ex -@ stub CM_Get_Res_Des_Data_Size # setupapi.CM_Get_Res_Des_Data_Size -@ stub CM_Get_Res_Des_Data_Size_Ex # setupapi.CM_Get_Res_Des_Data_Size_Ex +@ stdcall CM_Get_Res_Des_Data(ptr ptr long long) setupapi.CM_Get_Res_Des_Data +@ stdcall CM_Get_Res_Des_Data_Ex(ptr ptr long long long) setupapi.CM_Get_Res_Des_Data_Ex +@ stdcall CM_Get_Res_Des_Data_Size(ptr ptr long) setupapi.CM_Get_Res_Des_Data_Size +@ stdcall CM_Get_Res_Des_Data_Size_Ex(ptr ptr long long) setupapi.CM_Get_Res_Des_Data_Size_Ex +@ stub CM_Get_Resource_Conflict_Count # setupapi.CM_Get_Resource_Conflict_Count +@ stub CM_Get_Resource_Conflict_DetailsA # setupapi.CM_Get_Resource_Conflict_DetailsA +@ stub CM_Get_Resource_Conflict_DetailsW # setupapi.CM_Get_Resource_Conflict_DetailsW @ stdcall CM_Get_Sibling(ptr long long) setupapi.CM_Get_Sibling @ stdcall CM_Get_Sibling_Ex(ptr long long long) setupapi.CM_Get_Sibling_Ex @ stdcall CM_Get_Version() setupapi.CM_Get_Version @@ -129,8 +135,8 @@ @ stdcall CM_Locate_DevNode_ExA(ptr str long long) setupapi.CM_Locate_DevNode_ExA @ stdcall CM_Locate_DevNode_ExW(ptr wstr long long) setupapi.CM_Locate_DevNode_ExW @ stub CM_Merge_Range_List # setupapi.CM_Merge_Range_List -@ stub CM_Modify_Res_Des # setupapi.CM_Modify_Res_Des -@ stub CM_Modify_Res_Des_Ex # setupapi.CM_Modify_Res_Des_Ex +@ stdcall CM_Modify_Res_Des(ptr ptr long ptr long long) setupapi.CM_Modify_Res_Des +@ stdcall CM_Modify_Res_Des_Ex(ptr ptr long ptr long long long) setupapi.CM_Modify_Res_Des_Ex @ stdcall CM_Move_DevNode(long long long) setupapi.CM_Move_DevNode @ stdcall CM_Move_DevNode_Ex(long long long long) setupapi.CM_Move_DevNode_Ex @ stub CM_Next_Range # setupapi.CM_Next_Range @@ -140,14 +146,17 @@ @ stdcall CM_Open_Class_Key_ExW(ptr wstr long long ptr long long) setupapi.CM_Open_Class_Key_ExW @ stdcall CM_Open_DevNode_Key(ptr long long long ptr long) setupapi.CM_Open_DevNode_Key @ stdcall CM_Open_DevNode_Key_Ex(ptr long long long ptr long long) setupapi.CM_Open_DevNode_Key_Ex -@ stub CM_Query_And_Remove_SubTreeA -@ stub CM_Query_And_Remove_SubTreeW +@ stub CM_Query_And_Remove_SubTreeA # setupapi.CM_Query_And_Remove_SubTreeA +@ stub CM_Query_And_Remove_SubTreeW # setupapi.CM_Query_And_Remove_SubTreeW +@ stub CM_Query_And_Remove_SubTree_ExA # setupapi.CM_Query_And_Remove_SubTree_ExA +@ stub CM_Query_And_Remove_SubTree_ExW # setupapi.CM_Query_And_Remove_SubTree_ExW @ stub CM_Query_Arbitrator_Free_Data # setupapi.CM_Query_Arbitrator_Free_Data @ stub CM_Query_Arbitrator_Free_Data_Ex # setupapi.CM_Query_Arbitrator_Free_Data_Ex @ stub CM_Query_Arbitrator_Free_Size # setupapi.CM_Query_Arbitrator_Free_Size @ stub CM_Query_Arbitrator_Free_Size_Ex # setupapi.CM_Query_Arbitrator_Free_Size_Ex @ stub CM_Query_Remove_SubTree # setupapi.CM_Query_Remove_SubTree @ stub CM_Query_Remove_SubTree_Ex # setupapi.CM_Query_Remove_SubTree_Ex +@ stub CM_Query_Resource_Conflict_List # setupapi.CM_Query_Resource_Conflict_List @ stdcall CM_Reenumerate_DevNode(long long) setupapi.CM_Reenumerate_DevNode @ stdcall CM_Reenumerate_DevNode_Ex(long long long) setuapi.CM_Reenumerate_DevNode_Ex @ stub CM_Register_Device_Driver # setupapi.CM_Register_Device_Driver @@ -158,16 +167,14 @@ @ stub CM_Register_Device_Interface_ExW # setupapi.CM_Register_Device_Interface_ExW @ stub CM_Remove_SubTree # setupapi.CM_Remove_SubTree @ stub CM_Remove_SubTree_Ex # setupapi.CM_Remove_SubTree_Ex -@ stub CM_Remove_Unmarked_Children # setupapi.CM_Remove_Unmarked_Children -@ stub CM_Remove_Unmarked_Children_Ex # setupapi.CM_Remove_Unmarked_Children_Ex @ stub CM_Request_Device_EjectA # setupapi.CM_Request_Device_EjectA @ stub CM_Request_Device_EjectW # setupapi.CM_Request_Device_EjectW @ stdcall CM_Request_Eject_PC() setupapi.CM_Request_Eject_PC @ stdcall CM_Request_Eject_PC_Ex(long) setupapi.CM_Request_Eject_PC_Ex -@ stub CM_Reset_Children_Marks # setupapi.CM_Reset_Children_Marks -@ stub CM_Reset_Children_Marks_Ex # setupapi.CM_Reset_Children_Marks_Ex @ stdcall CM_Run_Detection(long) setupapi.CM_Run_Detection @ stdcall CM_Run_Detection_Ex(long long) setupapi.CM_Run_Detection_Ex +@ stub CM_Set_Class_Registry_PropertyA # setupapi.CM_Set_Class_Registry_PropertyA +@ stub CM_Set_Class_Registry_PropertyW # setupapi.CM_Set_Class_Registry_PropertyW @ stdcall CM_Set_DevNode_Problem(long long long) setupapi.CM_Set_DevNode_Problem @ stdcall CM_Set_DevNode_Problem_Ex(long long long long) setupapi.CM_Set_DevNode_Problem_Ex @ stdcall CM_Set_DevNode_Registry_PropertyA(long long ptr long long) setupapi.CM_Set_DevNode_Registry_PropertyA @@ -189,3 +196,9 @@ @ stub CM_Unregister_Device_InterfaceW # setupapi.CM_Unregister_Device_InterfaceW @ stub CM_Unregister_Device_Interface_ExA # setupapi.CM_Unregister_Device_Interface_ExA @ stub CM_Unregister_Device_Interface_ExW # setupapi.CM_Unregister_Device_Interface_ExW + +# Deprecated functions, they are not present in Win2003 SP1 +@ stub CM_Remove_Unmarked_Children # setupapi.CM_Remove_Unmarked_Children +@ stub CM_Remove_Unmarked_Children_Ex # setupapi.CM_Remove_Unmarked_Children_Ex +@ stub CM_Reset_Children_Marks # setupapi.CM_Reset_Children_Marks +@ stub CM_Reset_Children_Marks_Ex # setupapi.CM_Reset_Children_Marks_Ex

1 0

[pschweitzer] 50681: [KMTEST] Some more tests to FsRtlIsNameInExpression & FsRtlIsDbcsInExpression. Some are failing.
by pschweitzer＠svn.reactos.org 13 Feb '11

13 Feb '11

Author: pschweitzer Date: Sun Feb 13 09:43:01 2011 New Revision: 50681 URL: http://svn.reactos.org/svn/reactos?rev=50681&view=rev Log: [KMTEST] Some more tests to FsRtlIsNameInExpression & FsRtlIsDbcsInExpression. Some are failing. Modified: trunk/rostests/drivers/kmtest/ntos_fsrtl.c Modified: trunk/rostests/drivers/kmtest/ntos_fsrtl.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/drivers/kmtest/ntos_fsrtl… ============================================================================== --- trunk/rostests/drivers/kmtest/ntos_fsrtl.c [iso-8859-1] (original) +++ trunk/rostests/drivers/kmtest/ntos_fsrtl.c [iso-8859-1] Sun Feb 13 09:43:01 2011 @@ -139,6 +139,8 @@ RtlInitUnicodeString(&Expression, L"*.c.d"); RtlInitUnicodeString(&Name, L"a.b.c.d"); ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE"); + RtlInitUnicodeString(&Expression, L"*.?.c.d"); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE"); RtlInitUnicodeString(&Expression, L"*?"); RtlInitUnicodeString(&Name, L""); ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE"); @@ -146,6 +148,8 @@ ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE"); RtlInitUnicodeString(&Name, L"aa"); ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE"); + RtlInitUnicodeString(&Name, L"aaa"); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE"); RtlInitUnicodeString(&Expression, L"?*?"); RtlInitUnicodeString(&Name, L""); ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE"); @@ -154,6 +158,8 @@ RtlInitUnicodeString(&Name, L"aa"); ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE"); RtlInitUnicodeString(&Name, L"aaa"); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE"); + RtlInitUnicodeString(&Name, L"aaaa"); ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE"); } @@ -267,6 +273,8 @@ RtlInitAnsiString(&Expression, "*.c.d"); RtlInitAnsiString(&Name, "a.b.c.d"); ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE"); + RtlInitAnsiString(&Expression, "*.?.c.d"); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE"); RtlInitAnsiString(&Expression, "*?"); RtlInitAnsiString(&Name, ""); ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE"); @@ -274,6 +282,8 @@ ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE"); RtlInitAnsiString(&Name, "aa"); ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE"); + RtlInitAnsiString(&Name, "aaa"); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE"); RtlInitAnsiString(&Expression, "?*?"); RtlInitAnsiString(&Name, ""); ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE"); @@ -282,6 +292,8 @@ RtlInitAnsiString(&Name, "aa"); ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE"); RtlInitAnsiString(&Name, "aaa"); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE"); + RtlInitAnsiString(&Name, "aaaa"); ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE"); }

1 0

[pschweitzer] 50680: [NTOSKRNL] For both FsRtlIsNameInExpression & FsRtlIsDbcsInExpression: - Get back "useless checks" (tests show they weren't that useless) - Prevent code redundancy This fixes 4...
by pschweitzer＠svn.reactos.org 13 Feb '11

13 Feb '11

Author: pschweitzer Date: Sun Feb 13 08:43:48 2011 New Revision: 50680 URL: http://svn.reactos.org/svn/reactos?rev=50680&view=rev Log: [NTOSKRNL] For both FsRtlIsNameInExpression & FsRtlIsDbcsInExpression: - Get back "useless checks" (tests show they weren't that useless) - Prevent code redundancy This fixes 4 failing kmtest tests added in r50679 Modified: trunk/reactos/ntoskrnl/fsrtl/dbcsname.c trunk/reactos/ntoskrnl/fsrtl/name.c Modified: trunk/reactos/ntoskrnl/fsrtl/dbcsname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/dbcsname.c?… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/dbcsname.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/dbcsname.c [iso-8859-1] Sun Feb 13 08:43:48 2011 @@ -184,40 +184,37 @@ else if (Expression->Buffer[ExpressionPosition] == '*') { StarFound = ExpressionPosition++; - if (StarFound < (Expression->Length - 1)) + if (ExpressionPosition == Expression->Length) + { + NamePosition = Name->Length; + } + } + else if (Expression->Buffer[ExpressionPosition] == ANSI_DOS_STAR) + { + StarFound = MAXUSHORT; + MatchingChars = NamePosition; + while (MatchingChars < Name->Length) + { + if (Name->Buffer[MatchingChars] == '.') + { + NamePosition = MatchingChars; + } + MatchingChars++; + } + ExpressionPosition++; + } + else if (StarFound != MAXUSHORT) + { + ExpressionPosition = StarFound + 1; + if (Expression->Buffer[ExpressionPosition] != '*' && Expression->Buffer[ExpressionPosition] != '?' && + Expression->Buffer[ExpressionPosition] != ANSI_DOS_DOT && Expression->Buffer[ExpressionPosition] != ANSI_DOS_QM && + Expression->Buffer[ExpressionPosition] != ANSI_DOS_STAR) { while (Name->Buffer[NamePosition] != Expression->Buffer[ExpressionPosition] && NamePosition < Name->Length) { NamePosition++; } - } - else - { - NamePosition = Name->Length; - } - } - else if (Expression->Buffer[ExpressionPosition] == ANSI_DOS_STAR) - { - StarFound = MAXUSHORT; - MatchingChars = NamePosition; - while (MatchingChars < Name->Length) - { - if (Name->Buffer[MatchingChars] == '.') - { - NamePosition = MatchingChars; - } - MatchingChars++; - } - ExpressionPosition++; - } - else if (StarFound != MAXUSHORT) - { - ExpressionPosition = StarFound + 1; - while (Name->Buffer[NamePosition] != Expression->Buffer[ExpressionPosition] && - NamePosition < Name->Length) - { - NamePosition++; } } else Modified: trunk/reactos/ntoskrnl/fsrtl/name.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/name.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/name.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/name.c [iso-8859-1] Sun Feb 13 08:43:48 2011 @@ -44,40 +44,37 @@ else if (Expression->Buffer[ExpressionPosition] == L'*') { StarFound = ExpressionPosition++; - if (StarFound < (Expression->Length / sizeof(WCHAR) - 1)) + if (ExpressionPosition == Expression->Length / sizeof(WCHAR)) + { + NamePosition = Name->Length / sizeof(WCHAR); + } + } + else if (Expression->Buffer[ExpressionPosition] == DOS_STAR) + { + StarFound = MAXUSHORT; + MatchingChars = NamePosition; + while (MatchingChars < Name->Length / sizeof(WCHAR)) + { + if (Name->Buffer[MatchingChars] == L'.') + { + NamePosition = MatchingChars; + } + MatchingChars++; + } + ExpressionPosition++; + } + else if (StarFound != MAXUSHORT) + { + ExpressionPosition = StarFound + 1; + if (Expression->Buffer[ExpressionPosition] != L'*' && Expression->Buffer[ExpressionPosition] != L'?' && + Expression->Buffer[ExpressionPosition] != DOS_DOT && Expression->Buffer[ExpressionPosition] != DOS_QM && + Expression->Buffer[ExpressionPosition] != DOS_STAR) { while ((IgnoreCase ? UpcaseTable[Name->Buffer[NamePosition]] : Name->Buffer[NamePosition]) != Expression->Buffer[ExpressionPosition] && NamePosition < Name->Length / sizeof(WCHAR)) { NamePosition++; } - } - else - { - NamePosition = Name->Length / sizeof(WCHAR); - } - } - else if (Expression->Buffer[ExpressionPosition] == DOS_STAR) - { - StarFound = MAXUSHORT; - MatchingChars = NamePosition; - while (MatchingChars < Name->Length / sizeof(WCHAR)) - { - if (Name->Buffer[MatchingChars] == L'.') - { - NamePosition = MatchingChars; - } - MatchingChars++; - } - ExpressionPosition++; - } - else if (StarFound != MAXUSHORT) - { - ExpressionPosition = StarFound + 1; - while ((IgnoreCase ? UpcaseTable[Name->Buffer[NamePosition]] : Name->Buffer[NamePosition]) != Expression->Buffer[ExpressionPosition] && - NamePosition < Name->Length / sizeof(WCHAR)) - { - NamePosition++; } } else

1 0

[pschweitzer] 50679: [KMTEST] Some more tests to FsRtlIsNameInExpression & FsRtlIsDbcsInExpression. Some are failing.
by pschweitzer＠svn.reactos.org 13 Feb '11

13 Feb '11

Author: pschweitzer Date: Sun Feb 13 08:19:16 2011 New Revision: 50679 URL: http://svn.reactos.org/svn/reactos?rev=50679&view=rev Log: [KMTEST] Some more tests to FsRtlIsNameInExpression & FsRtlIsDbcsInExpression. Some are failing. Modified: trunk/rostests/drivers/kmtest/ntos_fsrtl.c Modified: trunk/rostests/drivers/kmtest/ntos_fsrtl.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/drivers/kmtest/ntos_fsrtl… ============================================================================== --- trunk/rostests/drivers/kmtest/ntos_fsrtl.c [iso-8859-1] (original) +++ trunk/rostests/drivers/kmtest/ntos_fsrtl.c [iso-8859-1] Sun Feb 13 08:19:16 2011 @@ -139,6 +139,22 @@ RtlInitUnicodeString(&Expression, L"*.c.d"); RtlInitUnicodeString(&Name, L"a.b.c.d"); ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE"); + RtlInitUnicodeString(&Expression, L"*?"); + RtlInitUnicodeString(&Name, L""); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE"); + RtlInitUnicodeString(&Name, L"a"); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE"); + RtlInitUnicodeString(&Name, L"aa"); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE"); + RtlInitUnicodeString(&Expression, L"?*?"); + RtlInitUnicodeString(&Name, L""); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE"); + RtlInitUnicodeString(&Name, L"a"); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE"); + RtlInitUnicodeString(&Name, L"aa"); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE"); + RtlInitUnicodeString(&Name, L"aaa"); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE"); } VOID FsRtlIsDbcsInExpressionTest() @@ -250,6 +266,22 @@ RtlInitAnsiString(&Expression, "*.c.d"); RtlInitAnsiString(&Name, "a.b.c.d"); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE"); + RtlInitAnsiString(&Expression, "*?"); + RtlInitAnsiString(&Name, ""); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE"); + RtlInitAnsiString(&Name, "a"); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE"); + RtlInitAnsiString(&Name, "aa"); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE"); + RtlInitAnsiString(&Expression, "?*?"); + RtlInitAnsiString(&Name, ""); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE"); + RtlInitAnsiString(&Name, "a"); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE"); + RtlInitAnsiString(&Name, "aa"); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE"); + RtlInitAnsiString(&Name, "aaa"); ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE"); }

1 0

[ekohl] 50678: [SETUPAPI] Add resource descriptor function stubs.
by ekohl＠svn.reactos.org 12 Feb '11

12 Feb '11

Author: ekohl Date: Sat Feb 12 23:59:12 2011 New Revision: 50678 URL: http://svn.reactos.org/svn/reactos?rev=50678&view=rev Log: [SETUPAPI] Add resource descriptor function stubs. Modified: trunk/reactos/dll/win32/setupapi/cfgmgr.c trunk/reactos/dll/win32/setupapi/setupapi.spec Modified: trunk/reactos/dll/win32/setupapi/cfgmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/cfgmgr.… ============================================================================== --- trunk/reactos/dll/win32/setupapi/cfgmgr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/cfgmgr.c [iso-8859-1] Sat Feb 12 23:59:12 2011 @@ -414,6 +414,34 @@ /*********************************************************************** + * CM_Add_Res_Des [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Add_Res_Des( + PRES_DES prdResDes, LOG_CONF lcLogConf, RESOURCEID ResourceID, + PCVOID ResourceData, ULONG ResourceLen, ULONG ulFlags) +{ + TRACE("%p %p %lu %p %lu %lx\n", prdResDes, lcLogConf, ResourceID, + ResourceData, ResourceLen, ulFlags); + return CM_Add_Res_Des_Ex(prdResDes, lcLogConf, ResourceID, ResourceData, + ResourceLen, ulFlags, NULL); +} + + +/*********************************************************************** + * CM_Add_Res_Des_Ex [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Add_Res_Des_Ex( + PRES_DES prdResDes, LOG_CONF lcLogConf, RESOURCEID ResourceID, + PCVOID ResourceData, ULONG ResourceLen, ULONG ulFlags, HMACHINE hMachine) +{ + FIXME("%p %p %lu %p %lu %lx %p\n", prdResDes, lcLogConf, ResourceID, + ResourceData, ResourceLen, ulFlags, hMachine); + + return CR_CALL_NOT_IMPLEMENTED; +} + + +/*********************************************************************** * CM_Connect_MachineA [SETUPAPI.@] */ CONFIGRET WINAPI CM_Connect_MachineA( @@ -1169,6 +1197,42 @@ HeapFree(GetProcessHeap(), 0, pLogConfInfo); return CR_SUCCESS; +} + + +/*********************************************************************** + * CM_Free_Res_Des [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Free_Res_Des( + PRES_DES prdResDes, RES_DES rdResDes, ULONG ulFlags) +{ + TRACE("%p %p %lx\n", prdResDes, rdResDes, ulFlags); + return CM_Free_Res_Des_Ex(prdResDes, rdResDes, ulFlags, NULL); +} + + +/*********************************************************************** + * CM_Free_Res_Des_Ex [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Free_Res_Des_Ex( + PRES_DES prdResDes, RES_DES rdResDes, ULONG ulFlags, + HMACHINE hMachine) +{ + FIXME("%p %p %lx %lx\n", prdResDes, rdResDes, ulFlags, hMachine); + + return CR_CALL_NOT_IMPLEMENTED; +} + + +/*********************************************************************** + * CM_Free_Res_Des_Handle [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Free_Res_Des_Handle( + RES_DES rdResDes) +{ + FIXME("%p\n", rdResDes); + + return CR_CALL_NOT_IMPLEMENTED; } @@ -2641,6 +2705,34 @@ /*********************************************************************** + * CM_Get_Next_Re_Des [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Get_Next_Res_Des( + PRES_DES prdResDes, RES_DES rdResDes, RESOURCEID ForResource, + PRESOURCEID pResourceID, ULONG ulFlags) +{ + TRACE("%p %p %lu %p %lx\n", prdResDes, rdResDes, ForResource, + pResourceID, ulFlags); + return CM_Get_Next_Res_Des_Ex(prdResDes, rdResDes, ForResource, + pResourceID, ulFlags, NULL); +} + + +/*********************************************************************** + * CM_Get_Next_Re_Des_Ex [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Get_Next_Res_Des_Ex( + PRES_DES prdResDes, RES_DES rdResDes, RESOURCEID ForResource, + PRESOURCEID pResourceID, ULONG ulFlags, HMACHINE hMachine) +{ + FIXME("%p %p %lu %p %lx %lx\n", prdResDes, rdResDes, ForResource, + pResourceID, ulFlags, hMachine); + + return CR_CALL_NOT_IMPLEMENTED; +} + + +/*********************************************************************** * CM_Get_Parent [SETUPAPI.@] */ CONFIGRET WINAPI CM_Get_Parent( @@ -2724,6 +2816,51 @@ *pdnDevInst = dwIndex; return CR_SUCCESS; +} + + +/*********************************************************************** + * CM_Get_Res_Des_Data [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Get_Res_Des_Data( + RES_DES rdResDes, PVOID Buffer, ULONG BufferLen, ULONG ulFlags) +{ + TRACE("%p %p %l %lx\n", rdResDes, Buffer, BufferLen, ulFlags); + return CM_Get_Res_Des_Data_Ex(rdResDes, Buffer, BufferLen, ulFlags, NULL); +} + + +/*********************************************************************** + * CM_Get_Res_Des_Data_Ex [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Get_Res_Des_Data_Ex( + RES_DES rdResDes, PVOID Buffer, ULONG BufferLen, ULONG ulFlags, + HMACHINE hMachine) +{ + FIXME("%p %p %l %lx %lx\n", rdResDes, Buffer, BufferLen, ulFlags, hMachine); + return CR_CALL_NOT_IMPLEMENTED; +} + + +/*********************************************************************** + * CM_Get_Res_Des_Size [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Get_Res_Des_Data_Size( + PULONG pulSize, RES_DES rdResDes, ULONG ulFlags) +{ + TRACE("%p %p %lx\n", pulSize, rdResDes, ulFlags); + return CM_Get_Res_Des_Data_Size_Ex(pulSize, rdResDes, ulFlags, NULL); +} + + +/*********************************************************************** + * CM_Get_Res_Des_Size_Ex [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Get_Res_Des_Data_Size_Ex( + PULONG pulSize, RES_DES rdResDes, ULONG ulFlags, HMACHINE hMachine) +{ + TRACE("%p %p %lx %lx\n", pulSize, rdResDes, ulFlags, hMachine); + return CR_CALL_NOT_IMPLEMENTED; } @@ -3101,6 +3238,33 @@ } return ret; +} + + +/*********************************************************************** + * CM_Modify_Res_Des [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Modify_Res_Des( + PRES_DES prdResDes, RES_DES rdResDes, RESOURCEID ResourceID, + PCVOID ResourceData, ULONG ResourceLen, ULONG ulFlags) +{ + TRACE("%p %p %lx %p %lu %lx", prdResDes, rdResDes, ResourceID, ResourceData, + ResourceLen, ulFlags); + return CM_Modify_Res_Des_Ex(prdResDes, rdResDes, ResourceID, ResourceData, + ResourceLen, ulFlags, NULL); +} + + +/*********************************************************************** + * CM_Modify_Res_Des_Ex [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Modify_Res_Des_Ex( + PRES_DES prdResDes, RES_DES rdResDes, RESOURCEID ResourceID, PCVOID ResourceData, + ULONG ResourceLen, ULONG ulFlags, HMACHINE hMachine) +{ + FIXME("%p %p %lx %p %lu %lx %lx", prdResDes, rdResDes, ResourceID, ResourceData, + ResourceLen, ulFlags, hMachine); + return CR_CALL_NOT_IMPLEMENTED; } Modified: trunk/reactos/dll/win32/setupapi/setupapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/setupapi.spec [iso-8859-1] Sat Feb 12 23:59:12 2011 @@ -14,8 +14,8 @@ @ stdcall CM_Add_ID_ExA(ptr str long ptr) @ stdcall CM_Add_ID_ExW(ptr wstr long ptr) @ stub CM_Add_Range -@ stub CM_Add_Res_Des -@ stub CM_Add_Res_Des_Ex +@ stdcall CM_Add_Res_Des(ptr ptr long ptr long long) +@ stdcall CM_Add_Res_Des_Ex(ptr ptr long ptr long long long) @ stdcall CM_Connect_MachineA(str ptr) @ stdcall CM_Connect_MachineW(wstr ptr) @ stdcall CM_Create_DevNodeA(ptr str long long) @@ -48,9 +48,9 @@ @ stdcall CM_Free_Log_Conf_Ex(ptr long ptr) @ stdcall CM_Free_Log_Conf_Handle(ptr) @ stub CM_Free_Range_List -@ stub CM_Free_Res_Des -@ stub CM_Free_Res_Des_Ex -@ stub CM_Free_Res_Des_Handle +@ stdcall CM_Free_Res_Des(ptr ptr long) +@ stdcall CM_Free_Res_Des_Ex(ptr ptr long long) +@ stdcall CM_Free_Res_Des_Handle(ptr) @ stub CM_Free_Resource_Conflict_Handle @ stdcall CM_Get_Child(ptr long long) @ stdcall CM_Get_Child_Ex(ptr long long long) @@ -118,14 +118,14 @@ @ stdcall CM_Get_Log_Conf_Priority_Ex(ptr ptr long long) @ stdcall CM_Get_Next_Log_Conf(ptr ptr long) @ stdcall CM_Get_Next_Log_Conf_Ex(ptr ptr long long) -@ stub CM_Get_Next_Res_Des -@ stub CM_Get_Next_Res_Des_Ex +@ stdcall CM_Get_Next_Res_Des(ptr ptr long ptr long) +@ stdcall CM_Get_Next_Res_Des_Ex(ptr ptr long ptr long long) @ stdcall CM_Get_Parent(ptr long long) @ stdcall CM_Get_Parent_Ex(ptr long long long) -@ stub CM_Get_Res_Des_Data -@ stub CM_Get_Res_Des_Data_Ex -@ stub CM_Get_Res_Des_Data_Size -@ stub CM_Get_Res_Des_Data_Size_Ex +@ stdcall CM_Get_Res_Des_Data(ptr ptr long long) +@ stdcall CM_Get_Res_Des_Data_Ex(ptr ptr long long long) +@ stdcall CM_Get_Res_Des_Data_Size(ptr ptr long) +@ stdcall CM_Get_Res_Des_Data_Size_Ex(ptr ptr long long) @ stub CM_Get_Resource_Conflict_Count @ stub CM_Get_Resource_Conflict_DetailsA @ stub CM_Get_Resource_Conflict_DetailsW @@ -144,8 +144,8 @@ @ stdcall CM_Locate_DevNode_ExA(ptr str long long) @ stdcall CM_Locate_DevNode_ExW(ptr wstr long long) @ stub CM_Merge_Range_List -@ stub CM_Modify_Res_Des -@ stub CM_Modify_Res_Des_Ex +@ stdcall CM_Modify_Res_Des(ptr ptr long ptr long long) +@ stdcall CM_Modify_Res_Des_Ex(ptr ptr long ptr long long long) @ stdcall CM_Move_DevNode(long long long) @ stdcall CM_Move_DevNode_Ex(long long long long) @ stub CM_Next_Range

1 0

[pschweitzer] 50677: Remove some artifact from ARM build. Would it fix build?
by pschweitzer＠svn.reactos.org 12 Feb '11

12 Feb '11

Author: pschweitzer Date: Sat Feb 12 20:32:49 2011 New Revision: 50677 URL: http://svn.reactos.org/svn/reactos?rev=50677&view=rev Log: Remove some artifact from ARM build. Would it fix build? Modified: trunk/reactos/ReactOS-arm.rbuild Modified: trunk/reactos/ReactOS-arm.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-arm.rbuild?rev=506… ============================================================================== --- trunk/reactos/ReactOS-arm.rbuild [iso-8859-1] (original) +++ trunk/reactos/ReactOS-arm.rbuild [iso-8859-1] Sat Feb 12 20:32:49 2011 @@ -104,9 +104,6 @@ <xi:include href="lib/sdk/wdmguid/wdmguid.rbuild" /> </directory> </directory> - <directory name="ntdllsys"> - <xi:include href="lib/ntdllsys/ntdllsys.rbuild" /> - </directory> <directory name="smlib"> <xi:include href="lib/smlib/smlib.rbuild" /> </directory>

1 0

[tkreuzer] 50676: [WIN32K] Handle BITMAPV4HEADER and BITMAPV5HEADER, when creating a DIB palette. Detect PAL_RGB like done with PAL_BGR in PALETTE_AllocPalette (optimization). Fixes pink icons.
by tkreuzer＠svn.reactos.org 12 Feb '11

12 Feb '11

Author: tkreuzer Date: Sat Feb 12 20:30:09 2011 New Revision: 50676 URL: http://svn.reactos.org/svn/reactos?rev=50676&view=rev Log: [WIN32K] Handle BITMAPV4HEADER and BITMAPV5HEADER, when creating a DIB palette. Detect PAL_RGB like done with PAL_BGR in PALETTE_AllocPalette (optimization). Fixes pink icons. Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c trunk/reactos/subsystems/win32/win32k/objects/palette.c 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 Feb 12 20:30:09 2011 @@ -1750,9 +1750,19 @@ else if (bmi->bmiHeader.biCompression == BI_BITFIELDS) { paletteType = PAL_BITFIELDS; - RedMask = pdwColors[0]; - GreenMask = pdwColors[1]; - BlueMask = pdwColors[2]; + if (bmi->bmiHeader.biSize >= sizeof(BITMAPV4HEADER)) + { + PBITMAPV4HEADER pV4Header = (PBITMAPV4HEADER)&bmi->bmiHeader; + RedMask = pV4Header->bV4RedMask; + GreenMask = pV4Header->bV4GreenMask; + BlueMask = pV4Header->bV4BlueMask; + } + else + { + RedMask = pdwColors[0]; + GreenMask = pdwColors[1]; + BlueMask = pdwColors[2]; + } } else { Modified: trunk/reactos/subsystems/win32/win32k/objects/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/palette.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/palette.c [iso-8859-1] Sat Feb 12 20:30:09 2011 @@ -197,6 +197,8 @@ PalGDI->flFlags |= PAL_RGB16_565; else if (Red == 0xFF0000 && Green == 0xFF00 && Blue == 0xFF) PalGDI->flFlags |= PAL_BGR; + else if (Red == 0xFF && Green == 0xFF00 && Blue == 0xFF0000) + PalGDI->flFlags |= PAL_RGB; } PALETTE_UnlockPalette(PalGDI);

1 0

[ekohl] 50675: [ADVAPI32] Move file encryption functions from crypt/crypt.c to misc/efs.c.
by ekohl＠svn.reactos.org 12 Feb '11

12 Feb '11

Author: ekohl Date: Sat Feb 12 20:23:16 2011 New Revision: 50675 URL: http://svn.reactos.org/svn/reactos?rev=50675&view=rev Log: [ADVAPI32] Move file encryption functions from crypt/crypt.c to misc/efs.c. Modified: trunk/reactos/dll/win32/advapi32/crypt/crypt.c trunk/reactos/dll/win32/advapi32/misc/efs.c Modified: trunk/reactos/dll/win32/advapi32/crypt/crypt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/crypt/c… ============================================================================== --- trunk/reactos/dll/win32/advapi32/crypt/crypt.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/crypt/crypt.c [iso-8859-1] Sat Feb 12 20:23:16 2011 @@ -2217,124 +2217,3 @@ return result; } - -/* - * @unimplemented - */ -DWORD WINAPI AddUsersToEncryptedFile ( - LPCWSTR lpcwstr, - PENCRYPTION_CERTIFICATE_LIST pencryption_certificate_list - ) -{ - FIXME("%s() not implemented!\n", __FUNCTION__); - return ERROR_CALL_NOT_IMPLEMENTED; -} - -/* - * @unimplemented - */ -DWORD WINAPI RemoveUsersFromEncryptedFile ( - LPCWSTR lpcwstr, - PENCRYPTION_CERTIFICATE_HASH_LIST pencryption_certificate_hash_list - ) -{ - FIXME("%s() not implemented!\n", __FUNCTION__); - return ERROR_CALL_NOT_IMPLEMENTED; -} - -/* - * @unimplemented - */ -BOOL WINAPI FileEncryptionStatusW ( - LPCWSTR lpFileName, - LPDWORD lpStatus - ) -{ - FIXME("%s(%S) not implemented!\n", __FUNCTION__, lpFileName); - if (!lpStatus) - return FALSE; - *lpStatus = FILE_SYSTEM_NOT_SUPPORT; - return TRUE; -} - - -/* - * @implemented - */ -BOOL WINAPI FileEncryptionStatusA ( - LPCSTR lpFileName, - LPDWORD lpStatus - ) -{ - UNICODE_STRING FileName; - NTSTATUS Status; - BOOL ret = FALSE; - - TRACE("(%s, %p)\n", lpFileName, lpStatus); - - FileName.Buffer = NULL; - - Status = RtlCreateUnicodeStringFromAsciiz(&FileName, lpFileName); - if (!NT_SUCCESS(Status)) - { - SetLastError(RtlNtStatusToDosError(Status)); - goto cleanup; - } - ret = FileEncryptionStatusW(FileName.Buffer, lpStatus); - -cleanup: - if (FileName.Buffer != NULL) - RtlFreeUnicodeString(&FileName); - return ret; -} - -/* - * @unimplemented - */ -DWORD WINAPI QueryUsersOnEncryptedFile ( - LPCWSTR lpctstr, - PENCRYPTION_CERTIFICATE_HASH_LIST* pencryption_certificate_hash_list - ) -{ - FIXME("%s() not implemented!\n", __FUNCTION__); - return ERROR_CALL_NOT_IMPLEMENTED; -} - - -/* - * @unimplemented - */ -void WINAPI FreeEncryptionCertificateHashList ( - PENCRYPTION_CERTIFICATE_HASH_LIST pencryption_certificate_hash_list - ) -{ - FIXME("%s() not implemented!\n", __FUNCTION__); - return; -} - - -/* - * @unimplemented - */ -DWORD WINAPI QueryRecoveryAgentsOnEncryptedFile ( - LPCWSTR lpctstr, - PENCRYPTION_CERTIFICATE_HASH_LIST* pencryption_certificate_hash_list - ) -{ - FIXME("%s() not implemented!\n", __FUNCTION__); - return ERROR_CALL_NOT_IMPLEMENTED; -} - -/* - * @unimplemented - */ -BOOL WINAPI EncryptionDisable( - LPCWSTR DirPath, - BOOL Disable - ) -{ - FIXME("%s() not implemented!\n", __FUNCTION__); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - Modified: trunk/reactos/dll/win32/advapi32/misc/efs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/misc/ef… ============================================================================== --- trunk/reactos/dll/win32/advapi32/misc/efs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/misc/efs.c [iso-8859-1] Sat Feb 12 20:23:16 2011 @@ -13,10 +13,23 @@ /* + * @unimplemented + */ +DWORD WINAPI +AddUsersToEncryptedFile(LPCWSTR lpcwstr, + PENCRYPTION_CERTIFICATE_LIST pencryption_certificate_list) +{ + FIXME("%s() not implemented!\n", __FUNCTION__); + return ERROR_CALL_NOT_IMPLEMENTED; +} + + +/* * @implemented */ BOOL WINAPI -DecryptFileA(LPCSTR lpFileName, DWORD dwReserved) +DecryptFileA(LPCSTR lpFileName, + DWORD dwReserved) { UNICODE_STRING FileName; NTSTATUS Status; @@ -40,7 +53,9 @@ /* * @unimplemented */ -BOOL WINAPI DecryptFileW(LPCWSTR lpFileName, DWORD dwReserved) +BOOL WINAPI +DecryptFileW(LPCWSTR lpFileName, + DWORD dwReserved) { FIXME("%s(%S) not implemented!\n", __FUNCTION__, lpFileName); return TRUE; @@ -82,4 +97,113 @@ return TRUE; } + +/* + * @unimplemented + */ +BOOL WINAPI +EncryptionDisable(LPCWSTR DirPath, + BOOL Disable) +{ + FIXME("%s() not implemented!\n", __FUNCTION__); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + + +/* + * @implemented + */ +BOOL WINAPI +FileEncryptionStatusA(LPCSTR lpFileName, + LPDWORD lpStatus) +{ + UNICODE_STRING FileName; + NTSTATUS Status; + BOOL ret = FALSE; + + TRACE("(%s, %p)\n", lpFileName, lpStatus); + + FileName.Buffer = NULL; + + Status = RtlCreateUnicodeStringFromAsciiz(&FileName, lpFileName); + if (!NT_SUCCESS(Status)) + { + SetLastError(RtlNtStatusToDosError(Status)); + goto cleanup; + } + + ret = FileEncryptionStatusW(FileName.Buffer, lpStatus); + +cleanup: + if (FileName.Buffer != NULL) + RtlFreeUnicodeString(&FileName); + + return ret; +} + +/* + * @unimplemented + */ +BOOL WINAPI +FileEncryptionStatusW(LPCWSTR lpFileName, + LPDWORD lpStatus) +{ + FIXME("%s(%S) not implemented!\n", __FUNCTION__, lpFileName); + + if (!lpStatus) + return FALSE; + + *lpStatus = FILE_SYSTEM_NOT_SUPPORT; + + return TRUE; +} + + +/* + * @unimplemented + */ +VOID WINAPI +FreeEncryptionCertificateHashList(PENCRYPTION_CERTIFICATE_HASH_LIST pencryption_certificate_hash_list) +{ + FIXME("%s() not implemented!\n", __FUNCTION__); + return; +} + + +/* + * @unimplemented + */ +DWORD WINAPI +QueryRecoveryAgentsOnEncryptedFile(LPCWSTR lpctstr, + PENCRYPTION_CERTIFICATE_HASH_LIST* pencryption_certificate_hash_list) +{ + FIXME("%s() not implemented!\n", __FUNCTION__); + return ERROR_CALL_NOT_IMPLEMENTED; +} + + +/* + * @unimplemented + */ +DWORD WINAPI +QueryUsersOnEncryptedFile(LPCWSTR lpctstr, + PENCRYPTION_CERTIFICATE_HASH_LIST* pencryption_certificate_hash_list) +{ + FIXME("%s() not implemented!\n", __FUNCTION__); + return ERROR_CALL_NOT_IMPLEMENTED; +} + + +/* + * @unimplemented + */ +DWORD WINAPI +RemoveUsersFromEncryptedFile(LPCWSTR lpcwstr, + PENCRYPTION_CERTIFICATE_HASH_LIST pencryption_certificate_hash_list) +{ + FIXME("%s() not implemented!\n", __FUNCTION__); + return ERROR_CALL_NOT_IMPLEMENTED; +} + /* EOF */

1 0

[janderwald] 50674: [MMIXER] - Allocate memory for the logical pin array - Use the correct counter variable for logical pin array - Found by msvc
by janderwald＠svn.reactos.org 12 Feb '11

12 Feb '11

Author: janderwald Date: Sat Feb 12 19:08:22 2011 New Revision: 50674 URL: http://svn.reactos.org/svn/reactos?rev=50674&view=rev Log: [MMIXER] - Allocate memory for the logical pin array - Use the correct counter variable for logical pin array - Found by msvc Modified: branches/cmake-bringup/lib/drivers/sound/mmixer/sup.c Modified: branches/cmake-bringup/lib/drivers/sound/mmixer/sup.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/drivers/sound… ============================================================================== --- branches/cmake-bringup/lib/drivers/sound/mmixer/sup.c [iso-8859-1] (original) +++ branches/cmake-bringup/lib/drivers/sound/mmixer/sup.c [iso-8859-1] Sat Feb 12 19:08:22 2011 @@ -544,6 +544,14 @@ ASSERT(MixerData->Topology); ASSERT(MixerData->MixerInfo == MixerInfo); + /* now allocate logical pin array */ + Status = MMixerAllocateTopologyNodeArray(MixerContext, MixerData->Topology, &LogicalNodes); + if (Status != MM_STATUS_SUCCESS) + { + /* no memory */ + return MM_STATUS_NO_MEMORY; + } + /* get logical pin nodes */ MMixerGetConnectedFromLogicalTopologyPins(MixerData->Topology, MixerControl->NodeID, &LogicalNodesCount, LogicalNodes); @@ -552,7 +560,7 @@ ASSERT(LogicalNodesCount == MixerControl->Control.Metrics.dwReserved[0]); Values = (LPMIXERCONTROLDETAILS_BOOLEAN)MixerControlDetails->paDetails; - for(Index = 0; Index < ConnectedNodesCount; Index++) + for(Index = 0; Index < LogicalNodesCount; Index++) { /* getting logical pin offset */ MMixerGetLowestLogicalTopologyPinOffsetFromArray(LogicalNodesCount, LogicalNodes, &CurLogicalPinOffset);

1 0

[janderwald] 50673: - Fix a bug where a spinlock was acquired on not initialized local variable
by janderwald＠svn.reactos.org 12 Feb '11

12 Feb '11

Author: janderwald Date: Sat Feb 12 18:55:52 2011 New Revision: 50673 URL: http://svn.reactos.org/svn/reactos?rev=50673&view=rev Log: - Fix a bug where a spinlock was acquired on not initialized local variable Modified: trunk/reactos/drivers/ksfilter/ks/swenum.c Modified: trunk/reactos/drivers/ksfilter/ks/swenum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/swenum… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/swenum.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/swenum.c [iso-8859-1] Sat Feb 12 18:55:52 2011 @@ -1156,11 +1156,11 @@ BOOLEAN DoInvalidate = FALSE; KIRQL OldLevel; + /* get device extension */ + BusDeviceExtension = (PBUS_ENUM_DEVICE_EXTENSION)Parameter; + /* acquire lock */ KeAcquireSpinLock(&BusDeviceExtension->Lock, &OldLevel); - - /* get device extension */ - BusDeviceExtension = (PBUS_ENUM_DEVICE_EXTENSION)Parameter; /* get current time */ KeQuerySystemTime(&Time);

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