Ros-diffs September 2005

ros-diffs@reactos.org

22 participants
582 discussions

[greatlrd] 17631: remove some hardcode buffer value. The dymatic buffer does not work yet, until all CMDLINE_LENGTH are remove.
by greatlrd＠svn.reactos.com 04 Sep '05

04 Sep '05

remove some hardcode buffer value. The dymatic buffer does not work yet, until all CMDLINE_LENGTH are remove. Modified: trunk/reactos/subsys/system/cmd/bugs.txt Modified: trunk/reactos/subsys/system/cmd/cmd.c Modified: trunk/reactos/subsys/system/cmd/cmd.h Modified: trunk/reactos/subsys/system/cmd/cmdinput.c _____ Modified: trunk/reactos/subsys/system/cmd/bugs.txt --- trunk/reactos/subsys/system/cmd/bugs.txt 2005-09-04 11:17:37 UTC (rev 17630) +++ trunk/reactos/subsys/system/cmd/bugs.txt 2005-09-04 11:18:39 UTC (rev 17631) @@ -11,5 +11,12 @@ o "alias v = dir" doesn't work because of the spaces. +o Dymatic commandline buffer need to be implement, current set to 8192bytes +o Batchfile read row size need to be implement as dymatic not set to 2000bytes + + + + + **** Please report bugs to ekohl(a)rz-online.de! **** _____ Modified: trunk/reactos/subsys/system/cmd/cmd.c --- trunk/reactos/subsys/system/cmd/cmd.c 2005-09-04 11:17:37 UTC (rev 17630) +++ trunk/reactos/subsys/system/cmd/cmd.c 2005-09-04 11:18:39 UTC (rev 17631) @@ -1037,13 +1037,14 @@ ProcessInput (BOOL bFlag) { TCHAR commandline[CMDLINE_LENGTH]; - TCHAR readline[CMDLINE_LENGTH]; + TCHAR *readline = NULL; LPTSTR tp = NULL; LPTSTR ip; LPTSTR cp; BOOL bEchoThisLine; + + readline = malloc(CMDLINE_LENGTH * sizeof(TCHAR)); - do { /* if no batch input then... */ @@ -1052,7 +1053,7 @@ if (bFlag) return 0; - ReadCommand (readline, CMDLINE_LENGTH); + readline = ReadCommand (readline, CMDLINE_LENGTH); ip = readline; bEchoThisLine = FALSE; } _____ Modified: trunk/reactos/subsys/system/cmd/cmd.h --- trunk/reactos/subsys/system/cmd/cmd.h 2005-09-04 11:17:37 UTC (rev 17630) +++ trunk/reactos/subsys/system/cmd/cmd.h 2005-09-04 11:18:39 UTC (rev 17631) @@ -106,7 +106,7 @@ /* Prototypes for CMDINPUT.C */ -VOID ReadCommand (LPTSTR, INT); +TCHAR * ReadCommand (LPTSTR, INT); /* Prototypes for CMDTABLE.C */ _____ Modified: trunk/reactos/subsys/system/cmd/cmdinput.c --- trunk/reactos/subsys/system/cmd/cmdinput.c 2005-09-04 11:17:37 UTC (rev 17630) +++ trunk/reactos/subsys/system/cmd/cmdinput.c 2005-09-04 11:18:39 UTC (rev 17631) @@ -124,7 +124,7 @@ /* read in a command line */ -VOID ReadCommand (LPTSTR str, INT maxlen) +TCHAR * ReadCommand (LPTSTR str, INT maxlen) { SHORT orgx; /* origin x/y */ SHORT orgy; @@ -508,10 +508,15 @@ default: #ifdef _UNICODE ch = ir.Event.KeyEvent.uChar.UnicodeChar; - if ((ch >= 32 && ch <= 255) && (charcount != (maxlen - 2))) + charcount ++; + str = realloc(str, charcount); + + if ((ch >= 32 && ch <= 255)) #else - ch = ir.Event.KeyEvent.uChar.AsciiChar; - if ((UCHAR)ch >= 32 && (charcount != (maxlen - 2))) + ch = ir.Event.KeyEvent.uChar.AsciiChar; + str = realloc(str, 2 + current * sizeof(TCHAR)); + + if ((UCHAR)ch >= 32 ) #endif /* _UNICODE */ { /* insert character into string... */ @@ -520,6 +525,8 @@ /* If this character insertion will cause screen scrolling, * adjust the saved origin of the command prompt. */ tempscreen = _tcslen(str + current) + curx; + str = realloc(str, tempscreen * sizeof(TCHAR)); + if ((tempscreen % maxx) == (maxx - 1) && (tempscreen / maxx) + cury == (maxy - 1)) { @@ -527,6 +534,8 @@ cury--; } + + for (count = charcount; count > current; count--) str[count] = str[count - 1]; str[current++] = ch; @@ -570,4 +579,6 @@ while (ir.Event.KeyEvent.wVirtualKeyCode != VK_RETURN); SetCursorType (bInsert, TRUE); + + return str; }

1 0

[navaraf] 17630: Fix the return value of HalReadDmaCounter at the end of transfer.
by navaraf＠svn.reactos.com 04 Sep '05

04 Sep '05

Fix the return value of HalReadDmaCounter at the end of transfer. Modified: trunk/reactos/hal/halx86/generic/dma.c _____ Modified: trunk/reactos/hal/halx86/generic/dma.c --- trunk/reactos/hal/halx86/generic/dma.c 2005-09-04 10:02:19 UTC (rev 17629) +++ trunk/reactos/hal/halx86/generic/dma.c 2005-09-04 11:17:37 UTC (rev 17630) @@ -977,6 +977,7 @@ KeReleaseSpinLock(&AdapterObject->MasterAdapter->SpinLock, OldIrql); Count++; + Count &= 0xffff; if (AdapterObject->Width16Bits) Count *= 2;

1 0

[navaraf] 17629: - Set the MAP_BASE_SW_SG flag for map registers in IoFreeMapRegisters.
by navaraf＠svn.reactos.com 04 Sep '05

04 Sep '05

- Set the MAP_BASE_SW_SG flag for map registers in IoFreeMapRegisters. - Fix address calculation in HalpCopyBufferMap. - Correctly set the map register counter in IoMapTransfer if dealing with MAP_BASE_SW_SG map registers. Modified: trunk/reactos/hal/halx86/generic/dma.c _____ Modified: trunk/reactos/hal/halx86/generic/dma.c --- trunk/reactos/hal/halx86/generic/dma.c 2005-09-04 09:54:59 UTC (rev 17628) +++ trunk/reactos/hal/halx86/generic/dma.c 2005-09-04 10:02:19 UTC (rev 17629) @@ -1402,6 +1402,13 @@ AdapterObject->MapRegisterBase = MasterAdapter->MapRegisterBase + Index; + if (!AdapterObject->ScatterGather) + { + AdapterObject->MapRegisterBase = + (PMAP_REGISTER_ENTRY)( + (ULONG_PTR)AdapterObject->MapRegisterBase | + MAP_BASE_SW_SG); + } Result = ((PDRIVER_CONTROL)AdapterObject->CurrentWcb->DeviceRoutine)( AdapterObject->CurrentWcb->DeviceObject, @@ -1471,7 +1478,8 @@ KEBUGCHECK(0); } - CurrentAddress = (ULONG_PTR)CurrentVa - + CurrentAddress = (ULONG_PTR)VirtualAddress + + (ULONG_PTR)CurrentVa - (ULONG_PTR)MmGetMdlVirtualAddress(Mdl); while (Length > 0) @@ -1583,7 +1591,7 @@ Length -= HalReadDmaCounter(AdapterObject); } - HalpCopyBufferMap(Mdl, RealMapRegisterBase, CurrentVa, Length, 0); + HalpCopyBufferMap(Mdl, RealMapRegisterBase, CurrentVa, Length, FALSE); } else { @@ -1763,7 +1771,7 @@ RealMapRegisterBase->Counter += BYTES_TO_PAGES(ByteOffset + TransferLength); /* - * Check if the buffer doesn't exceed the highest phisical address + * Check if the buffer doesn't exceed the highest physical address * limit of the device. In that case we must use the map registers to * store the data. */ @@ -1775,6 +1783,10 @@ UseMapRegisters = TRUE; PhysicalAddress = RealMapRegisterBase->PhysicalAddress; PhysicalAddress.QuadPart += ByteOffset; + if ((ULONG_PTR)MapRegisterBase & MAP_BASE_SW_SG) + { + RealMapRegisterBase->Counter = ~0; + } } }

1 0

[greatlrd] 17628: Remove more hardcode buffer value to dymatic buffer.
by greatlrd＠svn.reactos.com 04 Sep '05

04 Sep '05

Remove more hardcode buffer value to dymatic buffer. Modified: trunk/reactos/subsys/system/cmd/cmd.c _____ Modified: trunk/reactos/subsys/system/cmd/cmd.c --- trunk/reactos/subsys/system/cmd/cmd.c 2005-09-04 09:29:44 UTC (rev 17627) +++ trunk/reactos/subsys/system/cmd/cmd.c 2005-09-04 09:54:59 UTC (rev 17628) @@ -296,9 +296,9 @@ Execute (LPTSTR Full, LPTSTR First, LPTSTR Rest) { TCHAR szFullName[MAX_PATH]; - TCHAR first[CMDLINE_LENGTH]; - TCHAR rest[CMDLINE_LENGTH]; - TCHAR full[CMDLINE_LENGTH]; + TCHAR *first = NULL; + TCHAR *rest = NULL; + TCHAR *full = NULL; #ifndef __REACTOS__ TCHAR szWindowTitle[MAX_PATH]; #endif @@ -308,10 +308,39 @@ DebugPrintf (_T("Execute: \'%s\' \'%s\'\n"), first, rest); #endif + /* we need biger buffer that First, Rest, Full are already + need rewrite some code to use realloc when it need instead + of add 512bytes extra */ + + first = malloc ( _tcslen(First) + 512 * sizeof(TCHAR)); + if (first == NULL) + { + error_out_of_memory(); + return ; + } + + rest = malloc ( _tcslen(Rest) + 512 * sizeof(TCHAR)); + if (rest == NULL) + { + free (full); + error_out_of_memory(); + return ; + } + + full = malloc ( _tcslen(Full) + 512 * sizeof(TCHAR)); + if (full == NULL) + { + free (full); + free (rest); + error_out_of_memory(); + return ; + } + + /* Though it was already parsed once, we have a different set of rules for parsing before we pass to CreateProccess */ if(!_tcschr(Full,_T('\"'))) - { + { _tcscpy(first,First); _tcscpy(rest,Rest); _tcscpy(full,Full); @@ -468,6 +497,10 @@ #ifndef __REACTOS__ SetConsoleTitle (szWindowTitle); #endif + + free(first); + free(rest); + free(full); }

1 0

[greatlrd] 17627: fix a small bug after me, and check if it really got memmory or not.
by greatlrd＠svn.reactos.com 04 Sep '05

04 Sep '05

fix a small bug after me, and check if it really got memmory or not. Modified: trunk/reactos/subsys/system/cmd/start.c _____ Modified: trunk/reactos/subsys/system/cmd/start.c --- trunk/reactos/subsys/system/cmd/start.c 2005-09-03 23:12:17 UTC (rev 17626) +++ trunk/reactos/subsys/system/cmd/start.c 2005-09-04 09:29:44 UTC (rev 17627) @@ -21,8 +21,8 @@ { TCHAR szFullName[MAX_PATH]; TCHAR first[CMDLINE_LENGTH]; - TCHAR *rest; - TCHAR *param; + TCHAR *rest = NULL; + TCHAR *param = NULL; BOOL bWait = FALSE; BOOL bBat = FALSE; BOOL bCreate = FALSE; @@ -30,11 +30,8 @@ PROCESS_INFORMATION prci; STARTUPINFO stui; + - - - param[0] = _T('\0'); - if (_tcsncmp (Rest, _T("/?"), 2) == 0) { ConOutResPaging(TRUE,STRING_START_HELP1); @@ -50,7 +47,23 @@ } rest = malloc ( _tcslen(Rest) + 1 * sizeof(TCHAR)); + if (rest == NULL) + { + error_out_of_memory(); + return 1; + } + param =malloc ( _tcslen(Rest) + 1 * sizeof(TCHAR)); + if (rest == NULL) + { + free(rest); + error_out_of_memory(); + return 1; + } + + param[0] = _T('\0'); + + _tcscpy(rest,Rest); /* Parsing the command that gets called by start, and it's parameters */ @@ -63,8 +76,8 @@ for(i = 0; i < count; i++) { if(rest[i] == _T(' ')) - { - param = malloc ( _tcslen(&rest[i]) + 1 * sizeof(TCHAR)); + { + _tcscpy(param,&rest[i]); rest[i] = _T('\0'); break; @@ -83,7 +96,7 @@ if(rest[i] == _T('\"')) bInside = !bInside; if((rest[i] == _T(' ')) && !bInside) - { + { _tcscpy(param,&rest[i]); rest[i] = _T('\0'); break; @@ -134,6 +147,7 @@ if (param != NULL) free(param); + return 1; } @@ -148,6 +162,7 @@ if (!SearchForExecutable (_T("CMD"), szFullCmdLine)) { error_bad_command (); + if (rest != NULL) free(rest); @@ -179,8 +194,9 @@ if (bBat == FALSE) { _tcscpy (szFullCmdLine, first); - if( param ) + if( param != NULL ) { + _tcscat(szFullCmdLine, _T(" ") ); _tcscat (szFullCmdLine, param); } @@ -224,8 +240,8 @@ ErrorMessage(GetLastError (), _T("Error executing CreateProcess()!!\n")); } -// } + if (rest != NULL) free(rest);

1 0

[greatlrd] 17626: remove some hardcode commadline buffer value. first step to implement dymatic buffer. but we need do it very carefull, so nothing will be broken.
by greatlrd＠svn.reactos.com 03 Sep '05

03 Sep '05

remove some hardcode commadline buffer value. first step to implement dymatic buffer. but we need do it very carefull, so nothing will be broken. Modified: trunk/reactos/subsys/system/cmd/start.c _____ Modified: trunk/reactos/subsys/system/cmd/start.c --- trunk/reactos/subsys/system/cmd/start.c 2005-09-03 19:59:51 UTC (rev 17625) +++ trunk/reactos/subsys/system/cmd/start.c 2005-09-03 23:12:17 UTC (rev 17626) @@ -21,8 +21,8 @@ { TCHAR szFullName[MAX_PATH]; TCHAR first[CMDLINE_LENGTH]; - TCHAR rest[CMDLINE_LENGTH]; - TCHAR param[CMDLINE_LENGTH]; + TCHAR *rest; + TCHAR *param; BOOL bWait = FALSE; BOOL bBat = FALSE; BOOL bCreate = FALSE; @@ -30,6 +30,9 @@ PROCESS_INFORMATION prci; STARTUPINFO stui; + + + param[0] = _T('\0'); if (_tcsncmp (Rest, _T("/?"), 2) == 0) @@ -46,6 +49,8 @@ Rest = _T("cmd"); } + rest = malloc ( _tcslen(Rest) + 1 * sizeof(TCHAR)); + _tcscpy(rest,Rest); /* Parsing the command that gets called by start, and it's parameters */ @@ -59,6 +64,7 @@ { if(rest[i] == _T(' ')) { + param = malloc ( _tcslen(&rest[i]) + 1 * sizeof(TCHAR)); _tcscpy(param,&rest[i]); rest[i] = _T('\0'); break; @@ -95,6 +101,7 @@ } /* check for a drive change */ + if (!_tcscmp (first + 1, _T(":")) && _istalpha (*first)) { TCHAR szPath[MAX_PATH]; @@ -106,14 +113,27 @@ if (szPath[0] != (TCHAR)_totupper (*first)) ConErrResPuts (STRING_FREE_ERROR1); + if (rest != NULL) + free(rest); + + if (param != NULL) + free(param); + return 0; } + /* get the PATH environment variable and parse it */ /* search the PATH environment variable for the binary */ if (!SearchForExecutable (rest, szFullName)) { error_bad_command (); + + if (rest != NULL) + free(rest); + + if (param != NULL) + free(param); return 1; } @@ -128,6 +148,12 @@ if (!SearchForExecutable (_T("CMD"), szFullCmdLine)) { error_bad_command (); + if (rest != NULL) + free(rest); + + if (param != NULL) + free(param); + return 1; } @@ -200,6 +226,12 @@ } // } + if (rest != NULL) + free(rest); + + if (param != NULL) + free(param); + return 0; }

1 0

[greatlrd] 17625: fix type can handler \n at text output thx ravelo for the small patch. see file misc.c. prompt.c fix the szParam so it have a buffer set. and do not use szParam for param, the param length can in future very big. when dymatic buffer be implement at command line.
by greatlrd＠svn.reactos.com 03 Sep '05

03 Sep '05

fix type can handler \n at text output thx ravelo for the small patch. see file misc.c. prompt.c fix the szParam so it have a buffer set. and do not use szParam for param, the param length can in future very big. when dymatic buffer be implement at command line. Modified: trunk/reactos/subsys/system/cmd/misc.c Modified: trunk/reactos/subsys/system/cmd/prompt.c _____ Modified: trunk/reactos/subsys/system/cmd/misc.c --- trunk/reactos/subsys/system/cmd/misc.c 2005-09-03 19:44:47 UTC (rev 17624) +++ trunk/reactos/subsys/system/cmd/misc.c 2005-09-03 19:59:51 UTC (rev 17625) @@ -381,10 +381,10 @@ while ((--nBufferLength > 0) && ReadFile(hFile, &ch, 1, &dwRead, NULL) && dwRead) { - if (ch == '\r') + if ((ch == '\n') || (ch == '\r')) { - /* overread '\n' */ - ReadFile (hFile, &ch, 1, &dwRead, NULL); + /* read it*/ + lpString[len++] = ch; break; } lpString[len++] = ch; _____ Modified: trunk/reactos/subsys/system/cmd/prompt.c --- trunk/reactos/subsys/system/cmd/prompt.c 2005-09-03 19:44:47 UTC (rev 17624) +++ trunk/reactos/subsys/system/cmd/prompt.c 2005-09-03 19:59:51 UTC (rev 17625) @@ -192,8 +192,7 @@ #ifdef INCLUDE_CMD_PROMPT INT cmd_prompt (LPTSTR cmd, LPTSTR param) -{ - LPTSTR szParam; +{ if (!_tcsncmp (param, _T("/?"), 2)) { ConOutResPaging(TRUE,STRING_PROMPT_HELP1); @@ -210,15 +209,24 @@ so even if param is null you _must_ still set prompt to the default. There seems to be some kinda difference between winxp and 2k in this matter and this way will - cover both. */ + cover both. Do not use fixed size of szParam for param the buffer are 8192bytes + and will later change to dymatic buffer */ + + /* set PROMPT environment variable */ if (param[0] != _T('\0')) - _tcscpy(szParam,param); + { + if (!SetEnvironmentVariable (_T("PROMPT"), param)) + return 1; + } else + { + TCHAR szParam[5]; _tcscpy(szParam,_T("$P$G")); + if (!SetEnvironmentVariable (_T("PROMPT"),szParam)) + return 1; + } - /* set PROMPT environment variable */ - if (!SetEnvironmentVariable (_T("PROMPT"), szParam)) - return 1; + return 0; }

1 0

[ekohl] 17624: Fix GUID->String conversion.
by ekohl＠svn.reactos.com 03 Sep '05

03 Sep '05

Fix GUID->String conversion. Implement CM_Get_Class[_Ex]A/W. Modified: trunk/reactos/include/wine/cfgmgr32.h Modified: trunk/reactos/lib/setupapi/cfgmgr.c Modified: trunk/reactos/lib/setupapi/setupapi.spec Modified: trunk/reactos/w32api/include/ddk/cfgmgr32.h _____ Modified: trunk/reactos/include/wine/cfgmgr32.h --- trunk/reactos/include/wine/cfgmgr32.h 2005-09-03 18:05:33 UTC (rev 17623) +++ trunk/reactos/include/wine/cfgmgr32.h 2005-09-03 19:44:47 UTC (rev 17624) @@ -139,6 +139,12 @@ CONFIGRET WINAPI CM_Get_Class_Key_Name_ExA( LPGUID, LPSTR, PULONG, ULONG, HMACHINE ); CONFIGRET WINAPI CM_Get_Class_Key_Name_ExW( LPGUID, LPWSTR, PULONG, ULONG, HMACHINE ); #define CM_Get_Class_Key_Name_Ex WINELIB_NAME_AW(CM_Get_Class_Key_Name_Ex) +CONFIGRET WINAPI CM_Get_Class_NameA( LPGUID, PCHAR, PULONG, ULONG ); +CONFIGRET WINAPI CM_Get_Class_NameW( LPGUID, PWCHAR, PULONG, ULONG); +#define CM_Get_Class_Name WINELIB_NAME_AW(CM_Get_Class_Name) +CONFIGRET WINAPI CM_Get_Class_Name_ExA( LPGUID, PCHAR, PULONG, ULONG, HMACHINE ); +CONFIGRET WINAPI CM_Get_Class_Name_ExW( LPGUID, PWCHAR, PULONG, ULONG, HMACHINE ); +#define CM_Get_Class_Name_Ex WINELIB_NAME_AW(CM_Get_Class_Name_Ex) CONFIGRET WINAPI CM_Get_Depth( PULONG, DEVINST, ULONG ); CONFIGRET WINAPI CM_Get_Depth_Ex( PULONG, DEVINST, ULONG, HMACHINE ); CONFIGRET WINAPI CM_Get_DevNode_Registry_PropertyA( DEVINST, ULONG, PULONG, PVOID, PULONG, ULONG ); _____ Modified: trunk/reactos/lib/setupapi/cfgmgr.c --- trunk/reactos/lib/setupapi/cfgmgr.c 2005-09-03 18:05:33 UTC (rev 17623) +++ trunk/reactos/lib/setupapi/cfgmgr.c 2005-09-03 19:44:47 UTC (rev 17624) @@ -363,6 +363,21 @@ } +static BOOL GuidToString(LPGUID Guid, LPWSTR String) +{ + LPWSTR lpString; + + if (UuidToStringW(Guid, &lpString) != RPC_S_OK) + return FALSE; + + lstrcpyW(String, lpString); + + RpcStringFree(&lpString); + + return TRUE; +} + + /*********************************************************************** * CM_Get_Class_Key_Name_ExW [SETUPAPI.@] */ @@ -370,7 +385,7 @@ LPGUID ClassGuid, LPWSTR pszKeyName, PULONG pulLength, ULONG ulFlags, HMACHINE hMachine) { - FIXME("%p %p %p %lx %lx\n", + TRACE("%p %p %p %lx %lx\n", ClassGuid, pszKeyName, pulLength, ulFlags, hMachine); if (ClassGuid == NULL || pszKeyName == NULL || pulLength == NULL) @@ -385,7 +400,7 @@ return CR_BUFFER_SMALL; } - if (UuidToStringW(ClassGuid, &pszKeyName) != RPC_S_OK) + if (!GuidToString(ClassGuid, pszKeyName)) return CR_INVALID_DATA; *pulLength = MAX_GUID_STRING_LEN; @@ -395,6 +410,88 @@ /*********************************************************************** + * CM_Get_Class_NameA [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Get_Class_NameA( + LPGUID ClassGuid, PCHAR Buffer, PULONG pulLength, ULONG ulFlags) +{ + TRACE("%p %p %p %lx\n", ClassGuid, Buffer, pulLength, ulFlags); + return CM_Get_Class_Name_ExA(ClassGuid, Buffer, pulLength, ulFlags, + NULL); +} + + +/********************************************************************** * + * CM_Get_Class_NameW [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Get_Class_NameW( + LPGUID ClassGuid, PWCHAR Buffer, PULONG pulLength, ULONG ulFlags) +{ + TRACE("%p %p %p %lx\n", ClassGuid, Buffer, pulLength, ulFlags); + return CM_Get_Class_Name_ExW(ClassGuid, Buffer, pulLength, ulFlags, + NULL); +} + + +/********************************************************************** * + * CM_Get_Class_Name_ExA [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Get_Class_Name_ExA( + LPGUID ClassGuid, PCHAR Buffer, PULONG pulLength, ULONG ulFlags, + HMACHINE hMachine) +{ + FIXME("%p %p %p %lx %lx\n", + ClassGuid, Buffer, pulLength, ulFlags, hMachine); + return CR_FAILURE; +} + + +/********************************************************************** * + * CM_Get_Class_Name_ExW [SETUPAPI.@] + */ +CONFIGRET WINAPI +CM_Get_Class_Name_ExW( + LPGUID ClassGuid, PWCHAR Buffer, PULONG pulLength, ULONG ulFlags, + HMACHINE hMachine) +{ + WCHAR szGuidString[MAX_GUID_STRING_LEN]; + RPC_BINDING_HANDLE BindingHandle = NULL; + + TRACE("%p %p %p %lx %lx\n", + ClassGuid, Buffer, pulLength, ulFlags, hMachine); + + if (ClassGuid == NULL || Buffer == NULL || pulLength == NULL) + return CR_INVALID_POINTER; + + if (ulFlags != 0) + return CR_INVALID_FLAG; + + if (!GuidToString(ClassGuid, szGuidString)) + return CR_INVALID_DATA; + + TRACE("Guid %s\n", debugstr_w(szGuidString)); + + if (hMachine != NULL) + { + BindingHandle = ((PMACHINE_INFO)hMachine)->BindingHandle; + if (BindingHandle == NULL) + return CR_FAILURE; + } + else + { + if (!PnpGetLocalHandles(&BindingHandle, NULL)) + return CR_FAILURE; + } + + return PNP_GetClassName(BindingHandle, + szGuidString, + Buffer, + pulLength, + ulFlags); +} + + +/********************************************************************** * * CM_Get_Depth [SETUPAPI.@] */ CONFIGRET WINAPI CM_Get_Depth( _____ Modified: trunk/reactos/lib/setupapi/setupapi.spec --- trunk/reactos/lib/setupapi/setupapi.spec 2005-09-03 18:05:33 UTC (rev 17623) +++ trunk/reactos/lib/setupapi/setupapi.spec 2005-09-03 19:44:47 UTC (rev 17624) @@ -59,10 +59,10 @@ @ stdcall CM_Get_Class_Key_NameW(ptr wstr ptr long) @ stdcall CM_Get_Class_Key_Name_ExA(ptr str ptr long long) @ stdcall CM_Get_Class_Key_Name_ExW(ptr wstr ptr long long) -@ stub CM_Get_Class_NameA -@ stub CM_Get_Class_NameW -@ stub CM_Get_Class_Name_ExA -@ stub CM_Get_Class_Name_ExW +@ stdcall CM_Get_Class_NameA(ptr str ptr long) +@ stdcall CM_Get_Class_NameW(ptr wstr ptr long) +@ stdcall CM_Get_Class_Name_ExA(ptr str ptr long long) +@ stdcall CM_Get_Class_Name_ExW(ptr wstr ptr long long) @ stdcall CM_Get_Depth(ptr long long) @ stdcall CM_Get_Depth_Ex(ptr long long long) @ stdcall CM_Get_DevNode_Registry_PropertyA(long long ptr ptr ptr long) @@ -166,6 +166,7 @@ @ stub CM_Request_Device_EjectA @ stub CM_Request_Device_EjectW @ stub CM_Request_Eject_PC +@ stub CM_Request_Eject_PC_Ex @ stub CM_Reset_Children_Marks @ stub CM_Reset_Children_Marks_Ex @ stub CM_Run_Detection _____ Modified: trunk/reactos/w32api/include/ddk/cfgmgr32.h --- trunk/reactos/w32api/include/ddk/cfgmgr32.h 2005-09-03 18:05:33 UTC (rev 17623) +++ trunk/reactos/w32api/include/ddk/cfgmgr32.h 2005-09-03 19:44:47 UTC (rev 17624) @@ -862,12 +862,55 @@ IN ULONG ulFlags, IN HMACHINE hMachine); -/* FIXME: Obsolete CM_Get_Class_Name */ -/* FIXME: Obsolete CM_Get_Class_Name_Ex */ +CMAPI +CONFIGRET +WINAPI +CM_Get_Class_NameA( + IN LPGUID ClassGuid, + OUT PCHAR Buffer, + IN OUT PULONG pulLength, + IN ULONG ulFlags); CMAPI CONFIGRET WINAPI +CM_Get_Class_NameW( + IN LPGUID ClassGuid, + OUT PWCHAR Buffer, + IN OUT PULONG pulLength, + IN ULONG ulFlags); + +CMAPI +CONFIGRET +WINAPI +CM_Get_Class_Name_ExA( + IN LPGUID ClassGuid, + OUT PCHAR Buffer, + IN OUT PULONG pulLength, + IN ULONG ulFlags, + IN HMACHINE hMachine); + +CMAPI +CONFIGRET +WINAPI +CM_Get_Class_Name_ExW( + IN LPGUID ClassGuid, + OUT PWCHAR Buffer, + IN OUT PULONG pulLength, + IN ULONG ulFlags, + IN HMACHINE hMachine); + +#ifdef UNICODE +#define CM_Get_Class_Name CM_Get_Class_NameW +#define CM_Get_Class_Name_Ex CM_Get_Class_Name_ExW +#else +#define CM_Get_Class_Name CM_Get_Class_NameA +#define CM_Get_Class_Name_Ex CM_Get_Class_Name_ExA +#endif /* UNICODE */ + +CMAPI +CONFIGRET +WINAPI CM_Get_Class_Key_NameA( IN LPGUID ClassGuid, OUT LPSTR pszKeyName,

1 0

[amunger] 17623: Fix cmd build. Please check your changes before commiting.
by amunger＠svn.reactos.com 03 Sep '05

03 Sep '05

Fix cmd build. Please check your changes before commiting. Modified: trunk/reactos/subsys/system/cmd/prompt.c _____ Modified: trunk/reactos/subsys/system/cmd/prompt.c --- trunk/reactos/subsys/system/cmd/prompt.c 2005-09-03 18:00:54 UTC (rev 17622) +++ trunk/reactos/subsys/system/cmd/prompt.c 2005-09-03 18:05:33 UTC (rev 17623) @@ -193,6 +193,7 @@ INT cmd_prompt (LPTSTR cmd, LPTSTR param) { + LPTSTR szParam; if (!_tcsncmp (param, _T("/?"), 2)) { ConOutResPaging(TRUE,STRING_PROMPT_HELP1);

1 0

[hbirr] 17622: Fixed the return value in KeRundownQueue if the queue is empty. This should fix bug 751.
by hbirr＠svn.reactos.com 03 Sep '05

03 Sep '05

Fixed the return value in KeRundownQueue if the queue is empty. This should fix bug 751. Modified: trunk/reactos/ntoskrnl/ke/queue.c _____ Modified: trunk/reactos/ntoskrnl/ke/queue.c --- trunk/reactos/ntoskrnl/ke/queue.c 2005-09-03 17:40:33 UTC (rev 17621) +++ trunk/reactos/ntoskrnl/ke/queue.c 2005-09-03 18:00:54 UTC (rev 17622) @@ -344,7 +344,7 @@ if (FirstEntry == &Queue->EntryListHead) { /* It is, so don't return anything */ - EnumEntry = NULL; + FirstEntry = NULL; } else {

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 September 2005