Ros-diffs August 2005

ros-diffs@reactos.org

23 participants
669 discussions

by hpoussin＠svn.reactos.com

Remove warnings Modified: trunk/rosapps/cmdutils/mode/mode.c Modified: trunk/rosapps/cmdutils/mode/mode.xml _____ Modified: trunk/rosapps/cmdutils/mode/mode.c --- trunk/rosapps/cmdutils/mode/mode.c 2005-08-28 09:04:39 UTC (rev 17578) +++ trunk/rosapps/cmdutils/mode/mode.c 2005-08-28 09:07:43 UTC (rev 17579) @@ -137,10 +137,10 @@ _tprintf(_T(" Columns: %d\n"), ConsoleScreenBufferInfo.dwSize.X); } if (SystemParametersInfo(SPI_GETKEYBOARDDELAY, 0, &dwKbdDelay, 0)) { - _tprintf(_T(" Keyboard delay: %d\n"), dwKbdDelay); + _tprintf(_T(" Keyboard delay: %ld\n"), dwKbdDelay); } if (SystemParametersInfo(SPI_GETKEYBOARDSPEED, 0, &dwKbdSpeed, 0)) { - _tprintf(_T(" Keyboard rate: %d\n"), dwKbdSpeed); + _tprintf(_T(" Keyboard rate: %ld\n"), dwKbdSpeed); } _tprintf(_T(" Code page: %d\n"), GetConsoleOutputCP()); return 0; @@ -165,7 +165,7 @@ 0, // no attributes NULL); // no template - if (hPort == (HANDLE)-1) { + if (hPort == INVALID_HANDLE_VALUE) { _tprintf(_T("Illegal device name - %s\n"), szPortName); _tprintf(_T("Last error = 0x%lx\n"), GetLastError()); return FALSE; @@ -197,10 +197,8 @@ int ShowSerialStatus(int nPortNum) { - HANDLE hPort; DCB dcb; COMMTIMEOUTS CommTimeouts; - TCHAR szPortName[MAX_PORTNAME_LEN]; if (!SerialPortQuery(nPortNum, &dcb, &CommTimeouts, FALSE)) { return 1; @@ -215,7 +213,7 @@ } _tprintf(_T("\nStatus for device COM%d:\n"), nPortNum); _tprintf(_T("-----------------------\n")); - _tprintf(_T(" Baud: %d\n"), dcb.BaudRate); + _tprintf(_T(" Baud: %ld\n"), dcb.BaudRate); _tprintf(_T(" Parity: %s\n"), parity_strings[dcb.Parity]); _tprintf(_T(" Data Bits: %d\n"), dcb.ByteSize); _tprintf(_T(" Stop Bits: %s\n"), stopbit_strings[dcb.StopBits]); @@ -239,9 +237,9 @@ if (!DefineDosDevice(DDD_REMOVE_DEFINITION, szPortName, szTargetPath)) { DWORD error = GetLastError(); - _tprintf(_T("SetParallelState(%d) - DefineDosDevice(%s) failed: %x\n"), nPortNum, error); + _tprintf(_T("SetParallelState(%d) - DefineDosDevice(%s) failed: 0x%lx\n"), nPortNum, szPortName, error); } - return 0; + return 0; } /* _____ Modified: trunk/rosapps/cmdutils/mode/mode.xml --- trunk/rosapps/cmdutils/mode/mode.xml 2005-08-28 09:04:39 UTC (rev 17578) +++ trunk/rosapps/cmdutils/mode/mode.xml 2005-08-28 09:07:43 UTC (rev 17579) @@ -1,4 +1,4 @@ -<module name="mode" type="win32cui" installbase="system32" installname="mode.exe" warnings="true"> +<module name="mode" type="win32cui" installbase="system32" installname="mode.exe"> <include base="mode">.</include> <include base="mode">.</include> <define name="__USE_W32API" />

19 years

[hpoussin] 17578: Remove warnings

by hpoussin＠svn.reactos.com

Remove warnings Modified: trunk/rosapps/sysutils/ctm/ctm.c Modified: trunk/rosapps/sysutils/ctm/ctm.xml _____ Modified: trunk/rosapps/sysutils/ctm/ctm.c --- trunk/rosapps/sysutils/ctm/ctm.c 2005-08-28 07:34:35 UTC (rev 17577) +++ trunk/rosapps/sysutils/ctm/ctm.c 2005-08-28 09:04:39 UTC (rev 17578) @@ -7,7 +7,7 @@ Most of the code dealing with getting system parameters is taken from ReactOS Task Manager written by Brian Palmer (brianp(a)reactos.org) - Localization features added by HervÚ Poussineau (hpoussineau(a)fr.st) + Localization features added by HervÚ Poussineau (hpoussin(a)reactos.org) History: 24 October 2004 - added localization features @@ -138,10 +138,9 @@ { COORD pos; TCHAR lpStr[80]; - int posStr; DWORD numChars; int lines; - int idx, i; + int idx; if (first == 0) { @@ -170,14 +169,13 @@ first = 1; } - // Processess + // Processess lines = ProcessCount; if (lines > MAX_PROC) lines = MAX_PROC; for (idx=0; idx<MAX_PROC; idx++) { int len, i; - TCHAR imgName[MAX_PATH]; TCHAR lpPid[8]; TCHAR lpCpu[6]; TCHAR lpMemUsg[12]; @@ -351,14 +349,15 @@ LONG status; ULONG ulSize; LPBYTE pBuffer; - ULONG BufferSize; ULONG Idx, Idx2; - HANDLE hProcess; - HANDLE hProcessToken; PSYSTEM_PROCESS_INFORMATION pSPI; PPERFDATA pPDOld; +#ifdef EXTRA_INFO + HANDLE hProcess; + HANDLE hProcessToken; TCHAR szTemp[MAX_PATH]; DWORD dwSize; +#endif #ifdef TIMES LARGE_INTEGER liCurrentKernelTime; LARGE_INTEGER liCurrentIdleTime; @@ -501,7 +500,7 @@ //pPerfData[Idx].SessionId = pSPI->SessionId; #ifdef EXTRA_INFO - hProcess = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, pSPI->UniqueProcessId); + hProcess = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, (DWORD)pSPI->UniqueProcessId); if (hProcess) { if (OpenProcessToken(hProcess, TOKEN_QUERY|TOKEN_DUPLICATE|TOKEN_IMPERSONATE, &hProcessToken)) { ImpersonateLoggedOnUser(hProcessToken); @@ -510,16 +509,6 @@ GetUserName(szTemp, &dwSize); #ifndef UNICODE MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, szTemp, -1, pPerfData[Idx].UserName, MAX_PATH); -/* -int MultiByteToWideChar( - UINT CodePage, // code page - DWORD dwFlags, // character-type options - LPCSTR lpMultiByteStr, // string to map - int cbMultiByte, // number of bytes in string - LPWSTR lpWideCharStr, // wide-character buffer - int cchWideChar // size of buffer -); - */ #endif RevertToSelf(); CloseHandle(hProcessToken); @@ -541,7 +530,6 @@ // Code partly taken from slw32tty.c from mc/slang unsigned int GetKeyPressed(int events) { - long key; DWORD bytesRead; INPUT_RECORD record; int i; _____ Modified: trunk/rosapps/sysutils/ctm/ctm.xml --- trunk/rosapps/sysutils/ctm/ctm.xml 2005-08-28 07:34:35 UTC (rev 17577) +++ trunk/rosapps/sysutils/ctm/ctm.xml 2005-08-28 09:04:39 UTC (rev 17578) @@ -1,4 +1,4 @@ -<module name="ctm" type="win32cui" installbase="system32" installname="ctm.exe" warnings="true"> +<module name="ctm" type="win32cui" installbase="system32" installname="ctm.exe"> <define name="__USE_W32API" /> <define name="UNICODE" /> <define name="_UNICODE" />

19 years

[ea] 17577: Autoregister Debug internal subsystem too. Now 'sm info' displays meaningful information.

by ea＠svn.reactos.com

Autoregister Debug internal subsystem too. Now 'sm info' displays meaningful information. NOTE: It seems the new client management introduced a stupid bug that shows up on system shutdown (smss crashes calling an LPC related API). I can't locate it now (of course, that happens for every 'stupid' bug, but will tray again later). Modified: trunk/reactos/subsys/smss/debug.c _____ Modified: trunk/reactos/subsys/smss/debug.c --- trunk/reactos/subsys/smss/debug.c 2005-08-28 05:34:22 UTC (rev 17576) +++ trunk/reactos/subsys/smss/debug.c 2005-08-28 07:34:35 UTC (rev 17577) @@ -140,7 +140,6 @@ DPRINT("SM: %s called\n", __FUNCTION__); /* Self register */ -#if 0 Status = SmRegisterInternalSubsystem (L"Debug", (USHORT)-1, & hSmDbgApiPort); @@ -150,7 +149,6 @@ __FUNCTION__, Status); return Status; } -#endif /* Create the \DbgSsApiPort object (LPC) */ Status = SmpCreatePT(& DbgSsApiPort, SM_DBGSS_PORT_NAME,

19 years

[royce] 17576: add include directories from xml, remove "." hack, as projects that need to include their base directory have done so already in the xml.

by royce＠svn.reactos.com

add include directories from xml, remove "." hack, as projects that need to include their base directory have done so already in the xml. Modified: trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp _____ Modified: trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp --- trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp 2005-08-28 02:37:06 UTC (rev 17575) +++ trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp 2005-08-28 05:34:22 UTC (rev 17576) @@ -56,7 +56,7 @@ // TODO FIXME - what's diff. betw. 'c_srcs' and 'source_files'? string dsp_path = module.GetBasePath(); - vector<string> c_srcs, source_files, resource_files; + vector<string> c_srcs, source_files, resource_files, includes; vector<const IfableData*> ifs_list; ifs_list.push_back ( &module.non_if_data ); while ( ifs_list.size() ) @@ -78,6 +78,16 @@ if ( !stricmp ( Right(file,3).c_str(), ".rc" ) ) resource_files.push_back ( file ); } + const vector<Include*>& incs = data.includes; + for ( i = 0; i < incs.size(); i++ ) + { + string path = Path::RelativeFromDirectory ( + incs[i]->directory, + module.GetBasePath() ); + if ( !path.size() ) + i = i; + includes.push_back ( path ); + } } // TODO FIXME - we don't include header files in our build system //my @header_files = @{module->{header_files}}; @@ -308,7 +318,6 @@ } } - fprintf ( OUT, " /I \".\"" ); for ( i = 0; i < defines.size(); i++ ) { fprintf ( OUT, " /D \"%s\"", defines[i].c_str() ); @@ -359,7 +368,6 @@ } } - std::vector<std::string> includes; // TODO FIXME - wine hack? if ( wine ) { @@ -391,9 +399,9 @@ }*/ } - if ( wine ) + //if ( wine ) { - for ( i = 0; i < includes.size(); i++ ); + for ( i = 0; i < includes.size(); i++ ) { const string& include = includes[i]; if ( strpbrk ( include.c_str(), "[\\\"]" ) )

19 years

[royce] 17575: add . to list of include directories for all projects

by royce＠svn.reactos.com

add . to list of include directories for all projects Modified: trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp _____ Modified: trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp --- trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp 2005-08-27 23:35:51 UTC (rev 17574) +++ trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp 2005-08-28 02:37:06 UTC (rev 17575) @@ -308,6 +308,7 @@ } } + fprintf ( OUT, " /I \".\"" ); for ( i = 0; i < defines.size(); i++ ) { fprintf ( OUT, " /D \"%s\"", defines[i].c_str() ); @@ -406,6 +407,7 @@ } } + fprintf ( OUT, " /I \".\"" ); for ( i = 0; i < defines2.size(); i++ ) { const string& define = defines2[i];

19 years

[weiden] 17574: #include "precomp.h" -> #include <precomp.h>

by weiden＠svn.reactos.com

#include "precomp.h" -> #include <precomp.h> Modified: trunk/reactos/lib/userenv/desktop.c Modified: trunk/reactos/lib/userenv/directory.c Modified: trunk/reactos/lib/userenv/environment.c Modified: trunk/reactos/lib/userenv/misc.c Modified: trunk/reactos/lib/userenv/precomp.h Modified: trunk/reactos/lib/userenv/profile.c Modified: trunk/reactos/lib/userenv/registry.c Modified: trunk/reactos/lib/userenv/setup.c Modified: trunk/reactos/lib/userenv/userenv.c _____ Modified: trunk/reactos/lib/userenv/desktop.c --- trunk/reactos/lib/userenv/desktop.c 2005-08-27 19:14:35 UTC (rev 17573) +++ trunk/reactos/lib/userenv/desktop.c 2005-08-27 23:35:51 UTC (rev 17574) @@ -25,8 +25,7 @@ * PROGRAMMER: Eric Kohl */ -#include "precomp.h" -#include <shlobj.h> +#include <precomp.h> /* FUNCTIONS ***************************************************************/ _____ Modified: trunk/reactos/lib/userenv/directory.c --- trunk/reactos/lib/userenv/directory.c 2005-08-27 19:14:35 UTC (rev 17573) +++ trunk/reactos/lib/userenv/directory.c 2005-08-27 23:35:51 UTC (rev 17574) @@ -25,7 +25,7 @@ * PROGRAMMER: Eric Kohl */ -#include "precomp.h" +#include <precomp.h> /* FUNCTIONS ***************************************************************/ _____ Modified: trunk/reactos/lib/userenv/environment.c --- trunk/reactos/lib/userenv/environment.c 2005-08-27 19:14:35 UTC (rev 17573) +++ trunk/reactos/lib/userenv/environment.c 2005-08-27 23:35:51 UTC (rev 17574) @@ -25,7 +25,7 @@ * PROGRAMMER: Eric Kohl */ -#include "precomp.h" +#include <precomp.h> static BOOL _____ Modified: trunk/reactos/lib/userenv/misc.c --- trunk/reactos/lib/userenv/misc.c 2005-08-27 19:14:35 UTC (rev 17573) +++ trunk/reactos/lib/userenv/misc.c 2005-08-27 23:35:51 UTC (rev 17574) @@ -25,7 +25,7 @@ * PROGRAMMER: Eric Kohl */ -#include "precomp.h" +#include <precomp.h> /* FUNCTIONS ***************************************************************/ _____ Modified: trunk/reactos/lib/userenv/precomp.h --- trunk/reactos/lib/userenv/precomp.h 2005-08-27 19:14:35 UTC (rev 17573) +++ trunk/reactos/lib/userenv/precomp.h 2005-08-27 23:35:51 UTC (rev 17574) @@ -3,6 +3,7 @@ #define NTOS_MODE_USER #include <ndk/ntndk.h> #include <userenv.h> +#include <shlobj.h> #include "internal.h" #include "resources.h" _____ Modified: trunk/reactos/lib/userenv/profile.c --- trunk/reactos/lib/userenv/profile.c 2005-08-27 19:14:35 UTC (rev 17573) +++ trunk/reactos/lib/userenv/profile.c 2005-08-27 23:35:51 UTC (rev 17574) @@ -25,7 +25,7 @@ * PROGRAMMER: Eric Kohl */ -#include "precomp.h" +#include <precomp.h> /* FUNCTIONS ***************************************************************/ _____ Modified: trunk/reactos/lib/userenv/registry.c --- trunk/reactos/lib/userenv/registry.c 2005-08-27 19:14:35 UTC (rev 17573) +++ trunk/reactos/lib/userenv/registry.c 2005-08-27 23:35:51 UTC (rev 17574) @@ -25,7 +25,7 @@ * PROGRAMMER: Eric Kohl */ -#include "precomp.h" +#include <precomp.h> /* FUNCTIONS ***************************************************************/ _____ Modified: trunk/reactos/lib/userenv/setup.c --- trunk/reactos/lib/userenv/setup.c 2005-08-27 19:14:35 UTC (rev 17573) +++ trunk/reactos/lib/userenv/setup.c 2005-08-27 23:35:51 UTC (rev 17574) @@ -25,7 +25,7 @@ * PROGRAMMER: Eric Kohl */ -#include "precomp.h" +#include <precomp.h> typedef struct _FOLDERDATA { _____ Modified: trunk/reactos/lib/userenv/userenv.c --- trunk/reactos/lib/userenv/userenv.c 2005-08-27 19:14:35 UTC (rev 17573) +++ trunk/reactos/lib/userenv/userenv.c 2005-08-27 23:35:51 UTC (rev 17574) @@ -25,7 +25,7 @@ * PROGRAMMER: Eric Kohl */ -#include "precomp.h" +#include <precomp.h> HINSTANCE hInstance = NULL;

19 years

[ekohl] 17573: Implement StringTableInitializeEx, StringTableGetExtraData and StringTableSetExtraData.

by ekohl＠svn.reactos.com

Implement StringTableInitializeEx, StringTableGetExtraData and StringTableSetExtraData. Add StringTableAddStringEx and StringTableLookUpStringEx stubs. Modified: trunk/reactos/lib/setupapi/setupapi.spec Modified: trunk/reactos/lib/setupapi/stringtable.c Modified: trunk/reactos/w32api/include/setupapi.h _____ Modified: trunk/reactos/lib/setupapi/setupapi.spec --- trunk/reactos/lib/setupapi/setupapi.spec 2005-08-27 18:13:52 UTC (rev 17572) +++ trunk/reactos/lib/setupapi/setupapi.spec 2005-08-27 19:14:35 UTC (rev 17573) @@ -8,7 +8,7 @@ @ stub CMP_Report_LogOn @ stub CMP_UnregisterNotification @ stub CMP_WaitNoPendingInstallEvents -@ stub CMP_WaitServices +@ stub CMP_WaitServicesAvailable @ stub CM_Add_Empty_Log_Conf @ stub CM_Add_Empty_Log_Conf_Ex @ stub CM_Add_IDA @@ -516,16 +516,16 @@ @ stub ShouldDeviceBeExcluded @ stdcall StampFileSecurity(wstr ptr) @ stdcall StringTableAddString(ptr wstr long) -@ stub StringTableAddStringEx +@ stdcall StringTableAddStringEx(ptr wstr long ptr long) @ stdcall StringTableDestroy(ptr) @ stdcall StringTableDuplicate(ptr) @ stub StringTableEnum -@ stub StringTableGetExtraData +@ stdcall StringTableGetExtraData(ptr long ptr long) @ stdcall StringTableInitialize() -@ stub StringTableInitializeEx +@ stdcall StringTableInitializeEx(long long) @ stdcall StringTableLookUpString(ptr wstr long) -@ stub StringTableLookUpStringEx -@ stub StringTableSetExtraData +@ stdcall StringTableLookUpStringEx(ptr wstr long ptr ptr) +@ stdcall StringTableSetExtraData(ptr long ptr long) @ stdcall StringTableStringFromId(ptr long) @ stdcall StringTableStringFromIdEx(ptr long ptr ptr) @ stdcall StringTableTrim(ptr) _____ Modified: trunk/reactos/lib/setupapi/stringtable.c --- trunk/reactos/lib/setupapi/stringtable.c 2005-08-27 18:13:52 UTC (rev 17572) +++ trunk/reactos/lib/setupapi/stringtable.c 2005-08-27 19:14:35 UTC (rev 17573) @@ -34,11 +34,19 @@ WINE_DEFAULT_DEBUG_CHANNEL(setupapi); +typedef struct _TABLE_SLOT +{ + LPWSTR pString; + LPVOID pData; + DWORD dwSize; +} TABLE_SLOT, *PTABLE_SLOT; + typedef struct _STRING_TABLE { - LPWSTR *pSlots; + PTABLE_SLOT pSlots; DWORD dwUsedSlots; DWORD dwMaxSlots; + DWORD dwMaxDataSize; } STRING_TABLE, *PSTRING_TABLE; @@ -70,17 +78,18 @@ memset(pStringTable, 0, sizeof(STRING_TABLE)); - pStringTable->pSlots = MyMalloc(sizeof(LPWSTR) * TABLE_DEFAULT_SIZE); + pStringTable->pSlots = MyMalloc(sizeof(TABLE_SLOT) * TABLE_DEFAULT_SIZE); if (pStringTable->pSlots == NULL) { MyFree(pStringTable->pSlots); return NULL; } - memset(pStringTable->pSlots, 0, sizeof(LPWSTR) * TABLE_DEFAULT_SIZE); + memset(pStringTable->pSlots, 0, sizeof(TABLE_SLOT) * TABLE_DEFAULT_SIZE); pStringTable->dwUsedSlots = 0; pStringTable->dwMaxSlots = TABLE_DEFAULT_SIZE; + pStringTable->dwMaxDataSize = 0; TRACE("Done\n"); @@ -89,6 +98,55 @@ /*********************************************************************** *** + * StringTableInitializeEx [SETUPAPI.@] + * + * Creates a new string table and initializes it. + * + * PARAMS + * dwMaxExtraDataSize [I] Maximum extra data size + * dwReserved [I] Unused + * + * RETURNS + * Success: Handle to the string table + * Failure: NULL + */ +HSTRING_TABLE WINAPI +StringTableInitializeEx(DWORD dwMaxExtraDataSize, + DWORD dwReserved) +{ + PSTRING_TABLE pStringTable; + + TRACE("\n"); + + pStringTable = MyMalloc(sizeof(STRING_TABLE)); + if (pStringTable == NULL) + { + ERR("Invalid hStringTable!\n"); + return NULL; + } + + memset(pStringTable, 0, sizeof(STRING_TABLE)); + + pStringTable->pSlots = MyMalloc(sizeof(TABLE_SLOT) * TABLE_DEFAULT_SIZE); + if (pStringTable->pSlots == NULL) + { + MyFree(pStringTable->pSlots); + return NULL; + } + + memset(pStringTable->pSlots, 0, sizeof(TABLE_SLOT) * TABLE_DEFAULT_SIZE); + + pStringTable->dwUsedSlots = 0; + pStringTable->dwMaxSlots = TABLE_DEFAULT_SIZE; + pStringTable->dwMaxDataSize = dwMaxExtraDataSize; + + TRACE("Done\n"); + + return (HSTRING_TABLE)pStringTable; +} + + +/********************************************************************** **** * StringTableDestroy [SETUPAPI.@] * * Destroys a string table. @@ -115,11 +173,18 @@ { for (i = 0; i < pStringTable->dwMaxSlots; i++) { - if (pStringTable->pSlots[i] != NULL) + if (pStringTable->pSlots[i].pString != NULL) { - MyFree(pStringTable->pSlots[i]); - pStringTable->pSlots[i] = NULL; + MyFree(pStringTable->pSlots[i].pString); + pStringTable->pSlots[i].pString = NULL; } + + if (pStringTable->pSlots[i].pData != NULL) + { + MyFree(pStringTable->pSlots[i].pData); + pStringTable->pSlots[i].pData = NULL; + pStringTable->pSlots[i].dwSize = 0; + } } MyFree(pStringTable->pSlots); @@ -169,18 +234,18 @@ /* Search for existing string in the string table */ for (i = 0; i < pStringTable->dwMaxSlots; i++) { - if (pStringTable->pSlots[i] != NULL) + if (pStringTable->pSlots[i].pString != NULL) { if (dwFlags & 1) { - if (!lstrcmpW(pStringTable->pSlots[i], lpString)) + if (!lstrcmpW(pStringTable->pSlots[i].pString, lpString)) { return i; } } else { - if (!lstrcmpiW(pStringTable->pSlots[i], lpString)) + if (!lstrcmpiW(pStringTable->pSlots[i].pString, lpString)) { return i; } @@ -198,16 +263,16 @@ /* Search for an empty slot */ for (i = 0; i < pStringTable->dwMaxSlots; i++) { - if (pStringTable->pSlots[i] == NULL) + if (pStringTable->pSlots[i].pString == NULL) { - pStringTable->pSlots[i] = MyMalloc((lstrlenW(lpString) + 1) * sizeof(WCHAR)); - if (pStringTable->pSlots[i] == NULL) + pStringTable->pSlots[i].pString = MyMalloc((lstrlenW(lpString) + 1) * sizeof(WCHAR)); + if (pStringTable->pSlots[i].pString == NULL) { TRACE("Couldn't allocate memory for a new string!\n"); return (DWORD)-1; } - lstrcpyW(pStringTable->pSlots[i], lpString); + lstrcpyW(pStringTable->pSlots[i].pString, lpString); pStringTable->dwUsedSlots++; @@ -222,6 +287,40 @@ /*********************************************************************** *** + * StringTableAddStringEx [SETUPAPI.@] + * + * Adds a new string plus extra data to the string table. + * + * PARAMS + * hStringTable [I] Handle to the string table + * lpString [I] String to be added to the string table + * dwFlags [I] Flags + * 1: case sensitive compare + * lpExtraData [I] Pointer to the extra data + * dwExtraDataSize [I] Size of the extra data + * + * RETURNS + * Success: String ID + * Failure: -1 + * + * NOTES + * If the given string already exists in the string table it will not + * be added again. The ID of the existing string will be returned in + * this case. + */ +DWORD WINAPI +StringTableAddStringEx(HSTRING_TABLE hStringTable, + LPWSTR lpString, + DWORD dwFlags, + LPVOID lpExtraData, + DWORD dwExtraDataSize) +{ + FIXME("\n"); + return (DWORD)-1; +} + + +/********************************************************************** **** * StringTableDuplicate [SETUPAPI.@] * * Duplicates a given string table. @@ -260,31 +359,44 @@ memset(pDestinationTable, 0, sizeof(STRING_TABLE)); - pDestinationTable->pSlots = MyMalloc(sizeof(LPWSTR) * pSourceTable->dwMaxSlots); + pDestinationTable->pSlots = MyMalloc(sizeof(TABLE_SLOT) * pSourceTable->dwMaxSlots); if (pDestinationTable->pSlots == NULL) { MyFree(pDestinationTable); return (HSTRING_TABLE)NULL; } - memset(pDestinationTable->pSlots, 0, sizeof(LPWSTR) * pSourceTable->dwMaxSlots); + memset(pDestinationTable->pSlots, 0, sizeof(TABLE_SLOT) * pSourceTable->dwMaxSlots); pDestinationTable->dwUsedSlots = 0; pDestinationTable->dwMaxSlots = pSourceTable->dwMaxSlots; for (i = 0; i < pSourceTable->dwMaxSlots; i++) { - if (pSourceTable->pSlots[i] != NULL) + if (pSourceTable->pSlots[i].pString != NULL) { - length = (lstrlenW(pSourceTable->pSlots[i]) + 1) * sizeof(WCHAR); - pDestinationTable->pSlots[i] = MyMalloc(length); - if (pDestinationTable->pSlots[i] != NULL) + length = (lstrlenW(pSourceTable->pSlots[i].pString) + 1) * sizeof(WCHAR); + pDestinationTable->pSlots[i].pString = MyMalloc(length); + if (pDestinationTable->pSlots[i].pString != NULL) { - memcpy(pDestinationTable->pSlots[i], - pSourceTable->pSlots[i], + memcpy(pDestinationTable->pSlots[i].pString, + pSourceTable->pSlots[i].pString, length); pDestinationTable->dwUsedSlots++; } + + if (pSourceTable->pSlots[i].pData != NULL) + { + length = pSourceTable->pSlots[i].dwSize; + pDestinationTable->pSlots[i].pData = MyMalloc(length); + if (pDestinationTable->pSlots[i].pData) + { + memcpy(pDestinationTable->pSlots[i].pData, + pSourceTable->pSlots[i].pData, + length); + pDestinationTable->pSlots[i].dwSize = length; + } + } } } @@ -293,6 +405,59 @@ /*********************************************************************** *** + * StringTableGetExtraData [SETUPAPI.@] + * + * Retrieves extra data from a given string table entry. + * + * PARAMS + * hStringTable [I] Handle to the string table + * dwId [I] String ID + * lpExtraData [I] Pointer a buffer that receives the extra data + * dwExtraDataSize [I] Size of the buffer + * + * RETURNS + * Success: TRUE + * Failure: FALSE + */ +BOOL WINAPI +StringTableGetExtraData(HSTRING_TABLE hStringTable, + DWORD dwId, + LPVOID lpExtraData, + DWORD dwExtraDataSize) +{ + PSTRING_TABLE pStringTable; + + TRACE("%p %lx %p %lu\n", + (PVOID)hStringTable, dwId, lpExtraData, dwExtraDataSize); + + pStringTable = (PSTRING_TABLE)hStringTable; + if (pStringTable == NULL) + { + ERR("Invalid hStringTable!\n"); + return FALSE; + } + + if (dwId >= pStringTable->dwMaxSlots) + { + ERR("Invalid Slot id!\n"); + return FALSE; + } + + if (pStringTable->pSlots[dwId].dwSize < dwExtraDataSize) + { + ERR("Data size is too large!\n"); + return FALSE; + } + + memcpy(lpExtraData, + pStringTable->pSlots[dwId].pData, + dwExtraDataSize); + + return TRUE; +} + + +/********************************************************************** **** * StringTableLookUpString [SETUPAPI.@] * * Searches a string table for a given string. @@ -327,21 +492,17 @@ /* Search for existing string in the string table */ for (i = 0; i < pStringTable->dwMaxSlots; i++) { - if (pStringTable->pSlots[i] != NULL) + if (pStringTable->pSlots[i].pString != NULL) { if (dwFlags & 1) { - if (!lstrcmpW(pStringTable->pSlots[i], lpString)) - { + if (!lstrcmpW(pStringTable->pSlots[i].pString, lpString)) return i; - } } else { - if (!lstrcmpiW(pStringTable->pSlots[i], lpString)) - { + if (!lstrcmpiW(pStringTable->pSlots[i].pString, lpString)) return i; - } } } } @@ -351,6 +512,96 @@ /*********************************************************************** *** + * StringTableLookUpStringEx [SETUPAPI.@] + * + * Searches a string table and extra data for a given string. + * + * PARAMS + * hStringTable [I] Handle to the string table + * lpString [I] String to be searched for + * dwFlags [I] Flags + * 1: case sensitive compare + * lpExtraData [O] Pointer to the buffer that receives the extra data + * lpReserved [I/O] Unused + * + * RETURNS + * Success: String ID + * Failure: -1 + */ +DWORD WINAPI +StringTableLookUpStringEx(HSTRING_TABLE hStringTable, + LPWSTR lpString, + DWORD dwFlags, + LPVOID lpExtraData, + LPDWORD lpReserved) +{ + FIXME("\n"); + return (DWORD)-1; +} + + +/********************************************************************** **** + * StringTableSetExtraData [SETUPAPI.@] + * + * Sets extra data for a given string table entry. + * + * PARAMS + * hStringTable [I] Handle to the string table + * dwId [I] String ID + * lpExtraData [I] Pointer to the extra data + * dwExtraDataSize [I] Size of the extra data + * + * RETURNS + * Success: TRUE + * Failure: FALSE + */ +BOOL WINAPI +StringTableSetExtraData(HSTRING_TABLE hStringTable, + DWORD dwId, + LPVOID lpExtraData, + DWORD dwExtraDataSize) +{ + PSTRING_TABLE pStringTable; + + TRACE("%p %lx %p %lu\n", + (PVOID)hStringTable, dwId, lpExtraData, dwExtraDataSize); + + pStringTable = (PSTRING_TABLE)hStringTable; + if (pStringTable == NULL) + { + ERR("Invalid hStringTable!\n"); + return FALSE; + } + + if (dwId >= pStringTable->dwMaxSlots) + { + ERR("Invalid Slot id!\n"); + return FALSE; + } + + if (pStringTable->dwMaxDataSize < dwExtraDataSize) + { + ERR("Data size is too large!\n"); + return FALSE; + } + + pStringTable->pSlots[dwId].pData = MyMalloc(dwExtraDataSize); + if (pStringTable->pSlots[dwId].pData == NULL) + { + ERR("\n"); + return FALSE; + } + + memcpy(pStringTable->pSlots[dwId].pData, + lpExtraData, + dwExtraDataSize); + pStringTable->pSlots[dwId].dwSize = dwExtraDataSize; + + return TRUE; +} + + +/********************************************************************** **** * StringTableStringFromId [SETUPAPI.@] * * Returns a pointer to a string for the given string ID. @@ -381,7 +632,7 @@ if (dwId >= pStringTable->dwMaxSlots) return NULL; - return pStringTable->pSlots[dwId]; + return pStringTable->pSlots[dwId].pString; } @@ -422,17 +673,17 @@ } if (dwId >= pStringTable->dwMaxSlots || - pStringTable->pSlots[dwId] == NULL) + pStringTable->pSlots[dwId].pString == NULL) { WARN("Invalid string ID!\n"); *lpBufferLength = 0; return FALSE; } - dwLength = (lstrlenW(pStringTable->pSlots[dwId]) + 1) * sizeof(WCHAR); + dwLength = (lstrlenW(pStringTable->pSlots[dwId].pString) + 1) * sizeof(WCHAR); if (dwLength <= *lpBufferLength) { - lstrcpyW(lpBuffer, pStringTable->pSlots[dwId]); + lstrcpyW(lpBuffer, pStringTable->pSlots[dwId].pString); bResult = TRUE; } _____ Modified: trunk/reactos/w32api/include/setupapi.h --- trunk/reactos/w32api/include/setupapi.h 2005-08-27 18:13:52 UTC (rev 17572) +++ trunk/reactos/w32api/include/setupapi.h 2005-08-27 19:14:35 UTC (rev 17573) @@ -1382,10 +1382,15 @@ WINSETUPAPI DWORD WINAPI StampFileSecurity(PCWSTR, PSECURITY_DESCRIPTOR); WINSETUPAPI DWORD WINAPI StringTableAddString(HSTRING_TABLE, LPWSTR, DWORD); +WINSETUPAPI DWORD WINAPI StringTableAddStringEx(HSTRING_TABLE, LPWSTR, DWORD, LPVOID, DWORD); WINSETUPAPI VOID WINAPI StringTableDestroy(HSTRING_TABLE); WINSETUPAPI HSTRING_TABLE WINAPI StringTableDuplicate(HSTRING_TABLE); +WINSETUPAPI BOOL WINAPI StringTableGetExtraData(HSTRING_TABLE, DWORD, LPVOID, DWORD); WINSETUPAPI HSTRING_TABLE WINAPI StringTableInitialize(VOID); +WINSETUPAPI HSTRING_TABLE WINAPI StringTableInitializeEx(DWORD, DWORD); WINSETUPAPI DWORD WINAPI StringTableLookUpString(HSTRING_TABLE, LPWSTR, DWORD); +WINSETUPAPI DWORD WINAPI StringTableLookUpStringEx(HSTRING_TABLE, LPWSTR, DWORD, LPVOID, LPDWORD); +WINSETUPAPI BOOL WINAPI StringTableSetExtraData(HSTRING_TABLE, DWORD, LPVOID, DWORD); WINSETUPAPI LPWSTR WINAPI StringTableStringFromId(HSTRING_TABLE, DWORD); WINSETUPAPI BOOL WINAPI StringTableStringFromIdEx(HSTRING_TABLE, DWORD, LPWSTR, LPDWORD); WINSETUPAPI VOID WINAPI StringTableTrim(HSTRING_TABLE);

19 years

[weiden] 17572: implemented RegDeleteTree() (untested!)

by weiden＠svn.reactos.com

implemented RegDeleteTree() (untested!) Modified: trunk/reactos/lib/advapi32/reg/reg.c _____ Modified: trunk/reactos/lib/advapi32/reg/reg.c --- trunk/reactos/lib/advapi32/reg/reg.c 2005-08-27 17:21:07 UTC (rev 17571) +++ trunk/reactos/lib/advapi32/reg/reg.c 2005-08-27 18:13:52 UTC (rev 17572) @@ -970,10 +970,182 @@ } +static NTSTATUS +RegpDeleteTree(IN HKEY hKey) +{ + typedef struct + { + LIST_ENTRY ListEntry; + HANDLE KeyHandle; + } REGP_DEL_KEYS, *PREG_DEL_KEYS; + + LIST_ENTRY delQueueHead; + PREG_DEL_KEYS delKeys = NULL, newDelKeys; + HANDLE ProcessHeap; + ULONG BufferSize; + PKEY_BASIC_INFORMATION BasicInfo; + PREG_DEL_KEYS KeyDelRoot; + NTSTATUS Status = STATUS_SUCCESS; + NTSTATUS Status2 = STATUS_SUCCESS; + + InitializeListHead(&delQueueHead); + + ProcessHeap = RtlGetProcessHeap(); + + /* NOTE: no need to allocate enough memory for an additional KEY_BASIC_INFORMATION + structure for the root key, we only do that for subkeys as we need to + allocate REGP_DEL_KEYS structures anyway! */ + KeyDelRoot = RtlAllocateHeap(ProcessHeap, + 0, + sizeof(REGP_DEL_KEYS)); + if (KeyDelRoot != NULL) + { + KeyDelRoot->KeyHandle = hKey; + InsertTailList(&delQueueHead, + &KeyDelRoot->ListEntry); + + do + { + delKeys = CONTAINING_RECORD(delQueueHead.Flink, + REGP_DEL_KEYS, + ListEntry); + + BufferSize = 0; + BasicInfo = NULL; + newDelKeys = NULL; + +ReadFirstSubKey: + /* check if this key contains subkeys and delete them first by queuing + them at the head of the list */ + Status2 = NtEnumerateKey(delKeys->KeyHandle, + 0, + KeyBasicInformation, + BasicInfo, + BufferSize, + &BufferSize); + + if (NT_SUCCESS(Status2)) + { + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING SubKeyName; + + ASSERT(newDelKeys != NULL); + ASSERT(BasicInfo != NULL); + + /* don't use RtlInitUnicodeString as the string is not NULL-terminated! */ + SubKeyName.Length = BasicInfo->NameLength; + SubKeyName.MaximumLength = BasicInfo->NameLength; + SubKeyName.Buffer = BasicInfo->Name; + + InitializeObjectAttributes(&ObjectAttributes, + &SubKeyName, + OBJ_CASE_INSENSITIVE, + delKeys->KeyHandle, + NULL); + + /* open the subkey */ + Status2 = NtOpenKey(&newDelKeys->KeyHandle, + DELETE | KEY_ENUMERATE_SUB_KEYS | KEY_QUERY_VALUE, + &ObjectAttributes); + if (!NT_SUCCESS(Status2)) + { + goto SubKeyFailure; + } + + /* enqueue this key to the head of the deletion queue */ + InsertHeadList(&delQueueHead, + &newDelKeys->ListEntry); + + /* try again from the head of the list */ + continue; + } + else + { + if (Status2 == STATUS_BUFFER_TOO_SMALL) + { + newDelKeys = RtlAllocateHeap(ProcessHeap, + 0, + BufferSize + sizeof(REGP_DEL_KEYS)); + if (newDelKeys != NULL) + { + BasicInfo = (PKEY_BASIC_INFORMATION)(newDelKeys + 1); + + /* try again */ + goto ReadFirstSubKey; + } + else + { + /* don't break, let's try to delete as many keys as possible */ + Status2 = STATUS_INSUFFICIENT_RESOURCES; + goto SubKeyFailureNoFree; + } + } + else if (Status2 == STATUS_BUFFER_OVERFLOW) + { + PREG_DEL_KEYS newDelKeys2; + + ASSERT(newDelKeys != NULL); + + /* we need more memory to query the key name */ + newDelKeys2 = RtlReAllocateHeap(ProcessHeap, + 0, + newDelKeys, + BufferSize + sizeof(REGP_DEL_KEYS)); + if (newDelKeys2 != NULL) + { + newDelKeys = newDelKeys2; + BasicInfo = (PKEY_BASIC_INFORMATION)(newDelKeys + 1); + + /* try again */ + goto ReadFirstSubKey; + } + else + { + /* don't break, let's try to delete as many keys as possible */ + Status2 = STATUS_INSUFFICIENT_RESOURCES; + } + } +SubKeyFailure: + RtlFreeHeap(ProcessHeap, + 0, + newDelKeys); +SubKeyFailureNoFree: + /* don't break, let's try to delete as many keys as possible */ + if (Status2 != STATUS_NO_MORE_ENTRIES && NT_SUCCESS(Status)) + { + Status = Status2; + } + } + + Status2 = NtDeleteKey(delKeys->KeyHandle); + + /* NOTE: do NOT close the handle anymore, it's invalid already! */ + + if (!NT_SUCCESS(Status2) && NT_SUCCESS(Status)) + { + /* don't break, let's try to delete as many keys as possible */ + Status = Status2; + } + + /* remove the entry from the list */ + RemoveEntryList(&delKeys->ListEntry); + + RtlFreeHeap(ProcessHeap, + 0, + delKeys); + } while (!IsListEmpty(&delQueueHead)); + } + else + Status = STATUS_INSUFFICIENT_RESOURCES; + + return Status; +} + + /*********************************************************************** * * RegDeleteTreeW * - * @unimplemented + * @implemented */ LONG STDCALL RegDeleteTreeW(IN HKEY hKey, @@ -1016,8 +1188,7 @@ else CurKey = KeyHandle; - /* FIXME - delete all keys recursively */ - Status = STATUS_NOT_IMPLEMENTED; + Status = RegpDeleteTree(CurKey); if (SubKeyHandle != NULL) {

19 years

[ea] 17571: native EOL

by ea＠svn.reactos.com

native EOL Modified: trunk/reactos/subsys/system/reactos/It.rc _____ Modified: trunk/reactos/subsys/system/reactos/It.rc --- trunk/reactos/subsys/system/reactos/It.rc 2005-08-27 17:18:29 UTC (rev 17570) +++ trunk/reactos/subsys/system/reactos/It.rc 2005-08-27 17:21:07 UTC (rev 17571) @@ -1,13 +1,13 @@ -/* $Id$ */ - -LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL - -/* String Tables */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_CAPTION "Installazione di ReactOS" - IDS_TEXT "Non Þ possibile installare direttamente ReactOS da questo CD!\n\n"\ - "Per installare ReactOS, riavvia il computer da questo CD." -END - -/* EOF */ +/* $Id$ */ + +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL + +/* String Tables */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_CAPTION "Installazione di ReactOS" + IDS_TEXT "Non Þ possibile installare direttamente ReactOS da questo CD!\n\n"\ + "Per installare ReactOS, riavvia il computer da questo CD." +END + +/* EOF */ Property changes on: trunk/reactos/subsys/system/reactos/It.rc ___________________________________________________________________ Name: svn:eol-style + native

19 years

[ea] 17570: Minor changes and IT resource file.

by ea＠svn.reactos.com

Minor changes and IT resource file. Added: trunk/reactos/subsys/system/reactos/It.rc Modified: trunk/reactos/subsys/system/reactos/reactos.c Modified: trunk/reactos/subsys/system/reactos/reactos.rc _____ Added: trunk/reactos/subsys/system/reactos/It.rc --- trunk/reactos/subsys/system/reactos/It.rc 2005-08-27 14:59:22 UTC (rev 17569) +++ trunk/reactos/subsys/system/reactos/It.rc 2005-08-27 17:18:29 UTC (rev 17570) @@ -0,0 +1,13 @@ +/* $Id$ */ + +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL + +/* String Tables */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_CAPTION "Installazione di ReactOS" + IDS_TEXT "Non Þ possibile installare direttamente ReactOS da questo CD!\n\n"\ + "Per installare ReactOS, riavvia il computer da questo CD." +END + +/* EOF */ _____ Modified: trunk/reactos/subsys/system/reactos/reactos.c --- trunk/reactos/subsys/system/reactos/reactos.c 2005-08-27 14:59:22 UTC (rev 17569) +++ trunk/reactos/subsys/system/reactos/reactos.c 2005-08-27 17:18:29 UTC (rev 17570) @@ -51,13 +51,13 @@ if (!LoadString(hInstance, IDS_CAPTION, szCaption, - 256)) + (sizeof szCaption / sizeof szCaption[0]))) return 0; if (!LoadString(hInstance, IDS_TEXT, szText, - 256)) + (sizeof szText / sizeof szText[0]))) return 0; MessageBox(NULL, _____ Modified: trunk/reactos/subsys/system/reactos/reactos.rc --- trunk/reactos/subsys/system/reactos/reactos.rc 2005-08-27 14:59:22 UTC (rev 17569) +++ trunk/reactos/subsys/system/reactos/reactos.rc 2005-08-27 17:18:29 UTC (rev 17570) @@ -20,5 +20,6 @@ #include "Cz.rc" #include "De.rc" #include "Sv.rc" +#include "It.rc" /* EOF */

19 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2005