Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 31112: - Our NtCreateKey currently allows building trees (which is incorrect) if the parent key is a symbolic link (which does exist), but if the target doesn't exist (Since the check 'does parent exist' is done Before the symlink is converted to its target. One side-effect is that although we create the CurrentControlSet symlink to ControlSet001, we never create ControlSet001. We end up creating it later during the boot by creating a sub-key, by exposing the bug in NtCreateKey. Since
by fireball＠svn.reactos.org 09 Dec '07

09 Dec '07

Author: fireball Date: Sun Dec 9 22:36:04 2007 New Revision: 31112 URL: http://svn.reactos.org/svn/reactos?rev=31112&view=rev Log: - Our NtCreateKey currently allows building trees (which is incorrect) if the parent key is a symbolic link (which does exist), but if the target doesn't exist (Since the check 'does parent exist' is done Before the symlink is converted to its target. One side-effect is that although we create the CurrentControlSet symlink to ControlSet001, we never create ControlSet001. We end up creating it later during the boot by creating a sub-key, by exposing the bug in NtCreateKey. Since the new NtCreateKey uses the new parse routine code and doesn't exhibit this bug, we have to create ControlSet001 manually to avoid a failure. Other bugs of this nature may exist. Bug found and fixed by Alex. - Implement the last bit of the new parse routine (creating children) and write a new version of NtCreateKey which uses the parse routine. Disable it for now until other latent bugs are fixed. Modified: trunk/reactos/ntoskrnl/config/cm.h trunk/reactos/ntoskrnl/config/cmparse.c trunk/reactos/ntoskrnl/config/cmsysini.c trunk/reactos/ntoskrnl/config/ntapi.c Modified: trunk/reactos/ntoskrnl/config/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cm.h?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/config/cm.h (original) +++ trunk/reactos/ntoskrnl/config/cm.h Sun Dec 9 22:36:04 2007 @@ -495,15 +495,6 @@ // // BUGBUG Old Hive Stuff for Temporary Support // -NTSTATUS -NTAPI -CmFindObject(POBJECT_CREATE_INFORMATION ObjectCreateInfo, - PUNICODE_STRING ObjectName, - PVOID* ReturnedObject, - PUNICODE_STRING RemainingPath, - POBJECT_TYPE ObjectType, - IN PACCESS_STATE AccessState, - IN PVOID ParseContext); NTSTATUS CmiCallRegisteredCallbacks(IN REG_NOTIFY_CLASS Argument1, IN PVOID Argument2); /////////////////////////////////////////////////////////////////////////////// Modified: trunk/reactos/ntoskrnl/config/cmparse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmparse.c?… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmparse.c (original) +++ trunk/reactos/ntoskrnl/config/cmparse.c Sun Dec 9 22:36:04 2007 @@ -1077,7 +1077,7 @@ while (TRUE) { /* Get the next component */ - Result = CmpGetNextName(&Current, &NextName, &Last); + Result = CmpGetNextName(&Current, &NextName, &Last); if ((Result) && (NextName.Length)) { /* See if this is a sym link */ @@ -1184,9 +1184,15 @@ } else { - /* Create: should not see this (yet) */ - DPRINT1("Unexpected: Creating new child\n"); - while (TRUE); + /* Do the create */ + Status = CmpDoCreate(Hive, + Cell, + AccessState, + &NextName, + AccessMode, + ParseContext, + ParentKcb, + Object); } /* Check for reparse (in this case, someone beat us) */ Modified: trunk/reactos/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmsysini.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmsysini.c (original) +++ trunk/reactos/ntoskrnl/config/cmsysini.c Sun Dec 9 22:36:04 2007 @@ -363,6 +363,26 @@ /* ReactOS Hack: Hard-code current to 001 for SetupLdr */ if (!LoaderBlock->RegistryBase) { + /* Build the ControlSet001 key */ + RtlInitUnicodeString(&KeyName, + L"\\Registry\\Machine\\System\\ControlSet001"); + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = NtCreateKey(&KeyHandle, + KEY_ALL_ACCESS, + &ObjectAttributes, + 0, + NULL, + 0, + &Disposition); + if (!NT_SUCCESS(Status)) return Status; + + /* Don't need the handle */ + ZwClose(KeyHandle); + /* Use hard-coded setting */ ControlSet = 1; goto UseSet; @@ -396,7 +416,6 @@ OBJ_CASE_INSENSITIVE, NULL, NULL); - Status = NtCreateKey(&KeyHandle, KEY_CREATE_LINK, &ObjectAttributes, Modified: trunk/reactos/ntoskrnl/config/ntapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/ntapi.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/config/ntapi.c (original) +++ trunk/reactos/ntoskrnl/config/ntapi.c Sun Dec 9 22:36:04 2007 @@ -17,6 +17,42 @@ BOOLEAN CmFirstTime = TRUE; /* FUNCTIONS *****************************************************************/ + +#if 0 +NTSTATUS +NTAPI +NtCreateKey(OUT PHANDLE KeyHandle, + IN ACCESS_MASK DesiredAccess, + IN POBJECT_ATTRIBUTES ObjectAttributes, + IN ULONG TitleIndex, + IN PUNICODE_STRING Class, + IN ULONG CreateOptions, + OUT PULONG Disposition) +{ + NTSTATUS Status; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + CM_PARSE_CONTEXT ParseContext = {0}; + PAGED_CODE(); + + /* Setup the parse context */ + ParseContext.CreateOperation = TRUE; + ParseContext.CreateOptions = CreateOptions; + if (Class) ParseContext.Class = *Class; + + /* Do the create */ + Status = ObOpenObjectByName(ObjectAttributes, + CmpKeyObjectType, + PreviousMode, + NULL, + DesiredAccess, + &ParseContext, + KeyHandle); + + /* Return data to user */ + if (Disposition) *Disposition = ParseContext.Disposition; + return Status; +} +#endif NTSTATUS NTAPI

1 0

[jimtabor] 31111: Prevent crash in gdibatch.
by jimtabor＠svn.reactos.org 09 Dec '07

09 Dec '07

Author: jimtabor Date: Sun Dec 9 21:45:13 2007 New Revision: 31111 URL: http://svn.reactos.org/svn/reactos?rev=31111&view=rev Log: Prevent crash in gdibatch. Modified: trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c Modified: trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c Sun Dec 9 21:45:13 2007 @@ -65,7 +65,7 @@ { PDC dc = NULL; PDC_ATTR Dc_Attr = NULL; - if (hDC) + if (hDC && !IsObjectDead(hDC)) { dc = DC_LockDc(hDC); if (dc)

1 0

[hpoussin] 31110: CurrentControlSet should already be created at this point.
by hpoussin＠svn.reactos.org 09 Dec '07

09 Dec '07

Author: hpoussin Date: Sun Dec 9 21:07:33 2007 New Revision: 31110 URL: http://svn.reactos.org/svn/reactos?rev=31110&view=rev Log: CurrentControlSet should already be created at this point. Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Sun Dec 9 21:07:33 2007 @@ -3224,8 +3224,7 @@ static NTSTATUS INIT_FUNCTION IopUpdateRootKey(VOID) { - UNICODE_STRING ControlSetU = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet"); - UNICODE_STRING EnumU = RTL_CONSTANT_STRING(L"Enum"); + UNICODE_STRING EnumU = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\Enum"); UNICODE_STRING RootPathU = RTL_CONSTANT_STRING(L"Root"); UNICODE_STRING MultiKeyPathU = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\HARDWARE\\DESCRIPTION\\System\\MultifunctionAdapter"); UNICODE_STRING DeviceDescU = RTL_CONSTANT_STRING(L"DeviceDesc"); @@ -3236,20 +3235,11 @@ UNICODE_STRING HalAcpiDeviceDesc = RTL_CONSTANT_STRING(L"HAL ACPI"); UNICODE_STRING HalAcpiHardwareID = RTL_CONSTANT_STRING(L"*PNP0C08\0"); OBJECT_ATTRIBUTES ObjectAttributes; - HANDLE hControlSet, hEnum, hRoot, hHalAcpiDevice, hHalAcpiId, hLogConf; + HANDLE hEnum, hRoot, hHalAcpiDevice, hHalAcpiId, hLogConf; NTSTATUS Status; - InitializeObjectAttributes(&ObjectAttributes, &ControlSetU, OBJ_KERNEL_HANDLE, NULL, NULL); - Status = ZwCreateKey(&hControlSet, KEY_CREATE_SUB_KEY, &ObjectAttributes, 0, NULL, 0, NULL); - if (!NT_SUCCESS(Status)) - { - DPRINT1("ZwCreateKey() failed with status 0x%08lx\n", Status); - return Status; - } - - InitializeObjectAttributes(&ObjectAttributes, &EnumU, OBJ_KERNEL_HANDLE, hControlSet, NULL); + InitializeObjectAttributes(&ObjectAttributes, &EnumU, OBJ_KERNEL_HANDLE, NULL, NULL); Status = ZwCreateKey(&hEnum, KEY_CREATE_SUB_KEY, &ObjectAttributes, 0, NULL, 0, NULL); - ZwClose(hControlSet); if (!NT_SUCCESS(Status)) { DPRINT1("ZwCreateKey() failed with status 0x%08lx\n", Status);

1 0

[cwittich] 31109: fix a bug in ScConnectControlPipe
by cwittich＠svn.reactos.org 09 Dec '07

09 Dec '07

Author: cwittich Date: Sun Dec 9 21:05:02 2007 New Revision: 31109 URL: http://svn.reactos.org/svn/reactos?rev=31109&view=rev Log: fix a bug in ScConnectControlPipe Modified: trunk/reactos/dll/win32/advapi32/service/sctrl.c Modified: trunk/reactos/dll/win32/advapi32/service/sctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/sctrl.c (original) +++ trunk/reactos/dll/win32/advapi32/service/sctrl.c Sun Dec 9 21:05:02 2007 @@ -247,7 +247,7 @@ dwState = PIPE_READMODE_MESSAGE; if (!SetNamedPipeHandleState(*hPipe, &dwState, NULL, NULL)) { - CloseHandle(hPipe); + CloseHandle(*hPipe); *hPipe = INVALID_HANDLE_VALUE; return ERROR_FAILED_SERVICE_CONTROLLER_CONNECT; }

1 0

[cwittich] 31108: Andrew Talbot : advapi32: Explicitly initialize nested array element. <Andrew.Talbot at talbotville.com>
by cwittich＠svn.reactos.org 09 Dec '07

09 Dec '07

Author: cwittich Date: Sun Dec 9 18:46:24 2007 New Revision: 31108 URL: http://svn.reactos.org/svn/reactos?rev=31108&view=rev Log: Andrew Talbot : advapi32: Explicitly initialize nested array element. <Andrew.Talbot at talbotville.com> Modified: trunk/reactos/dll/win32/advapi32/sec/sid.c Modified: trunk/reactos/dll/win32/advapi32/sec/sid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/sid… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/sid.c (original) +++ trunk/reactos/dll/win32/advapi32/sec/sid.c Sun Dec 9 18:46:24 2007 @@ -60,7 +60,7 @@ { {'C','G'}, WinCreatorGroupSid, { SID_REVISION, 1, { SECURITY_CREATOR_SID_AUTHORITY }, { SECURITY_CREATOR_GROUP_RID } } }, { {0,0}, WinCreatorOwnerServerSid, { SID_REVISION, 1, { SECURITY_CREATOR_SID_AUTHORITY }, { SECURITY_CREATOR_OWNER_SERVER_RID } } }, { {0,0}, WinCreatorGroupServerSid, { SID_REVISION, 1, { SECURITY_CREATOR_SID_AUTHORITY }, { SECURITY_CREATOR_GROUP_SERVER_RID } } }, - { {0,0}, WinNtAuthoritySid, { SID_REVISION, 0, { SECURITY_NT_AUTHORITY }, { } } }, + { {0,0}, WinNtAuthoritySid, { SID_REVISION, 0, { SECURITY_NT_AUTHORITY }, { SECURITY_NULL_RID } } }, { {0,0}, WinDialupSid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_DIALUP_RID } } }, { {'N','U'}, WinNetworkSid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_NETWORK_RID } } }, { {0,0}, WinBatchSid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_BATCH_RID } } },

1 0

[cwittich] 31107: regedit: Correctly parse key name containing ']' when deleting/exporting. <thestig at google.com>
by cwittich＠svn.reactos.org 09 Dec '07

09 Dec '07

Author: cwittich Date: Sun Dec 9 18:34:14 2007 New Revision: 31107 URL: http://svn.reactos.org/svn/reactos?rev=31107&view=rev Log: regedit: Correctly parse key name containing ']' when deleting/exporting. <thestig at google.com> Modified: trunk/reactos/base/applications/regedit/regproc.c Modified: trunk/reactos/base/applications/regedit/regproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/regproc.c (original) +++ trunk/reactos/base/applications/regedit/regproc.c Sun Dec 9 18:34:14 2007 @@ -441,12 +441,14 @@ keyNameBeg = strchr(lpLineCopy, '\\'); /* The key name start by '\' */ if (keyNameBeg) { - LPSTR keyNameEnd; - - keyNameBeg++; /* is not part of the name */ - keyNameEnd = strchr(lpLineCopy, ']'); - if (keyNameEnd) { - *keyNameEnd = '\0'; /* remove ']' from the key name */ + if (lpLine[0] == '[') /* need to find matching ']' */ + { + LPSTR keyNameEnd; + + keyNameEnd = strrchr(lpLineCopy, ']'); + if (keyNameEnd) { + *keyNameEnd = '\0'; /* remove ']' from the key name */ + } } } else { keyNameBeg = lpLineCopy + strlen(lpLineCopy); /* branch - empty string */

1 0

[cwittich] 31106: Lei Zhang : regedit: Allow entering - for a key in a . reg file to delete that key. <thestig at google.com> Lei Zhang : regedit: Removed dead code from regproc.c. <thestig at google.com>
by cwittich＠svn.reactos.org 09 Dec '07

09 Dec '07

Author: cwittich Date: Sun Dec 9 18:31:41 2007 New Revision: 31106 URL: http://svn.reactos.org/svn/reactos?rev=31106&view=rev Log: Lei Zhang : regedit: Allow entering - for a key in a . reg file to delete that key. <thestig at google.com> Lei Zhang : regedit: Removed dead code from regproc.c. <thestig at google.com> Modified: trunk/reactos/base/applications/regedit/regproc.c trunk/reactos/base/applications/regedit/regproc.h Modified: trunk/reactos/base/applications/regedit/regproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/regproc.c (original) +++ trunk/reactos/base/applications/regedit/regproc.c Sun Dec 9 18:31:41 2007 @@ -24,14 +24,11 @@ #define REG_VAL_BUF_SIZE 4096 -/* Delimiters used to parse the "value" to query queryValue*/ -#define QUERY_VALUE_MAX_ARGS 1 - /* maximal number of characters in hexadecimal data line, not including '\' character */ #define REG_FILE_HEX_LINE_LEN 76 -/* Globals used by the api setValue, queryValue */ +/* Globals used by the api setValue */ static LPSTR currentKeyName = NULL; static HKEY currentKeyClass = 0; static HKEY currentKeyHandle = 0; @@ -165,55 +162,6 @@ return FALSE; } return TRUE; -} - -/****************************************************************************** - * Converts a hex buffer into a hex comma separated values - */ -char* convertHexToHexCSV(BYTE *buf, ULONG bufLen) -{ - char* str; - char* ptrStr; - BYTE* ptrBuf; - - ULONG current = 0; - - str = HeapAlloc(GetProcessHeap(), 0, (bufLen+1)*2); - memset(str, 0, (bufLen+1)*2); - ptrStr = str; /* Pointer to result */ - ptrBuf = buf; /* Pointer to current */ - - while (current < bufLen) { - BYTE bCur = ptrBuf[current++]; - char res[3]; - - sprintf(res, "%02x", (unsigned int)*&bCur); - strcat(str, res); - strcat(str, ","); - } - - /* Get rid of the last comma */ - str[strlen(str)-1] = '\0'; - return str; -} - -/****************************************************************************** - * Converts a hex buffer into a DWORD string - */ -char* convertHexToDWORDStr(BYTE *buf, ULONG bufLen) -{ - char* str; - DWORD dw; - - if ( bufLen != sizeof(DWORD) ) return NULL; - - str = HeapAlloc(GetProcessHeap(), 0, (bufLen*2)+1); - - memcpy(&dw,buf,sizeof(DWORD)); - sprintf(str, "%08lx", dw); - - /* Get rid of the last comma */ - return str; } /****************************************************************************** @@ -327,6 +275,7 @@ if( arg[0] == '\"' ) arg++; tmp = HeapAlloc(GetProcessHeap(), 0, strlen(arg)+1); + CHECK_ENOUGH_MEMORY(tmp); strcpy(tmp, arg); return tmp; @@ -589,6 +538,18 @@ if ( bTheKeyIsOpen != FALSE ) closeKey(); /* Close the previous key before */ + /* delete the key if we encounter '-' at the start of reg key */ + if ( stdInput[1] == '-') + { + int last_chr = strlen(stdInput) - 1; + + /* skip leading "[-" and get rid of trailing "]" */ + if (stdInput[last_chr] == ']') + stdInput[last_chr] = '\0'; + delete_registry_key(stdInput+2); + return; + } + if ( openKey(stdInput) != ERROR_SUCCESS ) fprintf(stderr,"%s: setValue failed to open key %s\n", getAppName(), stdInput); @@ -597,44 +558,6 @@ ( stdInput[0] == '\"'))) /* reading a new value=data pair */ { processSetValue(stdInput); - } else /* since we are assuming that the */ - { /* file format is valid we must */ - if ( bTheKeyIsOpen ) /* be reading a blank line which */ - closeKey(); /* indicate end of this key processing */ - } -} - -/****************************************************************************** - * This function is the main entry point to the queryValue type of action. It - * receives the currently read line and dispatch the work depending on the - * context. - */ -void doQueryValue(LPSTR stdInput) -{ - /* - * We encountered the end of the file, make sure we - * close the opened key and exit - */ - if (stdInput == NULL) { - if (bTheKeyIsOpen != FALSE) - closeKey(); - - return; - } - - if ( stdInput[0] == '[') /* We are reading a new key */ - { - if ( bTheKeyIsOpen != FALSE ) - closeKey(); /* Close the previous key before */ - - if ( openKey(stdInput) != ERROR_SUCCESS ) - fprintf(stderr,"%s: queryValue failed to open key %s\n", - getAppName(), stdInput); - } else if( ( bTheKeyIsOpen ) && - (( stdInput[0] == '@') || /* reading a default @=data pair */ - ( stdInput[0] == '\"'))) /* reading a new value=data pair */ - { - processQueryValue(stdInput); } else /* since we are assuming that the */ { /* file format is valid we must */ if ( bTheKeyIsOpen ) /* be reading a blank line which */ @@ -742,136 +665,6 @@ } /****************************************************************************** - * This function is a wrapper for the queryValue function. It prepares the - * land and clean the area once completed. - */ -void processQueryValue(LPSTR cmdline) -{ - UNREFERENCED_PARAMETER(cmdline); - fprintf(stderr,"ERROR!!! - temporary disabled"); - exit(1); -#if 0 - LPSTR argv[QUERY_VALUE_MAX_ARGS];/* args storage */ - LPSTR token = NULL; /* current token analyzed */ - ULONG argCounter = 0; /* counter of args */ - INT counter; - HRESULT hRes = 0; - LPSTR keyValue = NULL; - LPSTR lpsRes = NULL; - - /* - * Init storage and parse the line - */ - for (counter=0; counter<QUERY_VALUE_MAX_ARGS; counter++) - argv[counter]=NULL; - - while( (token = getToken(&cmdline, queryValueDelim[argCounter])) != NULL ) { - argv[argCounter++] = getArg(token); - - if (argCounter == QUERY_VALUE_MAX_ARGS) - break; /* Stop processing args no matter what */ - } - - /* The value we look for is the first token on the line */ - if ( argv[0] == NULL ) - return; /* SHOULD NOT HAPPEN */ - else - keyValue = argv[0]; - - if( (keyValue[0] == '@') && (strlen(keyValue) == 1) ) { - LONG lLen = KEY_MAX_LEN; - CHAR* lpsData=HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,KEY_MAX_LEN); - /* - * We need to query the key default value - */ - hRes = RegQueryValue( - currentKeyHandle, - currentKeyName, - (LPBYTE)lpsData, - &lLen); - - if (hRes==ERROR_MORE_DATA) { - lpsData=HeapReAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,lpsData,lLen); - hRes = RegQueryValue(currentKeyHandle,currentKeyName,(LPBYTE)lpsData,&lLen); - } - - if (hRes == ERROR_SUCCESS) { - lpsRes = HeapAlloc( GetProcessHeap(), 0, lLen); - lstrcpynA(lpsRes, lpsData, lLen); - } - } else { - DWORD dwLen = KEY_MAX_LEN; - BYTE* lpbData=HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,KEY_MAX_LEN); - DWORD dwType; - /* - * We need to query a specific value for the key - */ - hRes = RegQueryValueEx( - currentKeyHandle, - keyValue, - 0, - &dwType, - (LPBYTE)lpbData, - &dwLen); - - if (hRes==ERROR_MORE_DATA) { - lpbData=HeapReAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,lpbData,dwLen); - hRes = RegQueryValueEx(currentKeyHandle,keyValue,NULL,&dwType,(LPBYTE)lpbData,&dwLen); - } - - if (hRes == ERROR_SUCCESS) { - /* - * Convert the returned data to a displayable format - */ - switch ( dwType ) { - case REG_SZ: - case REG_EXPAND_SZ: { - lpsRes = HeapAlloc( GetProcessHeap(), 0, dwLen); - lstrcpynA(lpsRes, lpbData, dwLen); - break; - } - case REG_DWORD: { - lpsRes = convertHexToDWORDStr(lpbData, dwLen); - break; - } - default: { - lpsRes = convertHexToHexCSV(lpbData, dwLen); - break; - } - } - } - - HeapFree(GetProcessHeap(), 0, lpbData); - } - - - if ( hRes == ERROR_SUCCESS ) - fprintf(stderr, - "%s: Value \"%s\" = \"%s\" in key [%s]\n", - getAppName(), - keyValue, - lpsRes, - currentKeyName); - - else - fprintf(stderr,"%s: ERROR Value \"%s\" not found for key \"%s\".\n", - getAppName(), - keyValue, - currentKeyName); - - /* - * Do some cleanup - */ - for (counter=0; counter<argCounter; counter++) - if (argv[counter] != NULL) - HeapFree(GetProcessHeap(), 0, argv[counter]); - - if (lpsRes != NULL) - HeapFree(GetProcessHeap(), 0, lpsRes); -#endif -} - -/****************************************************************************** * Calls command for each line of a registry file. * Correctly processes comments (in # form), line continuation. * Modified: trunk/reactos/base/applications/regedit/regproc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/regproc.h (original) +++ trunk/reactos/base/applications/regedit/regproc.h Sun Dec 9 18:31:41 2007 @@ -34,7 +34,6 @@ void doDeleteValue(LPSTR lpsLine); void doCreateKey(LPSTR lpsLine); void doDeleteKey(LPSTR lpsLine); -void doQueryValue(LPSTR lpsLine); void doRegisterDLL(LPSTR lpsLine); void doUnregisterDLL(LPSTR lpsLine); @@ -66,11 +65,6 @@ */ void processSetValue(LPSTR cmdline); HRESULT setValue(LPSTR val_name, LPSTR val_data); - -/* - * api queryValue prototypes - */ -void processQueryValue(LPSTR cmdline); /* * Permission prototypes

1 0

[cwittich] 31105: forgot to save this one before committing
by cwittich＠svn.reactos.org 09 Dec '07

09 Dec '07

Author: cwittich Date: Sun Dec 9 17:16:49 2007 New Revision: 31105 URL: http://svn.reactos.org/svn/reactos?rev=31105&view=rev Log: forgot to save this one before committing Modified: trunk/reactos/dll/win32/user32/controls/listbox.c Modified: trunk/reactos/dll/win32/user32/controls/listbox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/listbox.c (original) +++ trunk/reactos/dll/win32/user32/controls/listbox.c Sun Dec 9 17:16:49 2007 @@ -2696,7 +2696,7 @@ } if (descr->style & LBS_COMBOBOX) lphc = descr->lphc; - TRACE("[%p]: msg %s wp %08x lp %08lx\n", + TRACE("[%p]: msg %s wp %08lx lp %08lx\n", hwnd, SPY_GetMsgName(msg, hwnd), wParam, lParam ); switch(msg)

1 0

[cwittich] 31104: Dmitry Timoshkov : wine: Switch to using 'long' for INT_PTR type for 64-bit compatibility. <dmitry at codeweavers.com>
by cwittich＠svn.reactos.org 09 Dec '07

09 Dec '07

Author: cwittich Date: Sun Dec 9 17:15:31 2007 New Revision: 31104 URL: http://svn.reactos.org/svn/reactos?rev=31104&view=rev Log: Dmitry Timoshkov : wine: Switch to using 'long' for INT_PTR type for 64-bit compatibility. <dmitry at codeweavers.com> Modified: trunk/reactos/dll/win32/user32/controls/edit.c trunk/reactos/dll/win32/user32/controls/scrollbar.c trunk/reactos/dll/win32/user32/misc/dde.c trunk/reactos/dll/win32/user32/misc/ddeclient.c trunk/reactos/dll/win32/user32/misc/ddeserver.c trunk/reactos/dll/win32/user32/windows/mdi.c trunk/reactos/dll/win32/user32/windows/menu.c trunk/reactos/dll/win32/user32/windows/spy.c Modified: trunk/reactos/dll/win32/user32/controls/edit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/edit.c (original) +++ trunk/reactos/dll/win32/user32/controls/edit.c Sun Dec 9 17:15:31 2007 @@ -458,7 +458,7 @@ EDITSTATE *es = (EDITSTATE *)GetWindowLongPtrW( hwnd, 0 ); LRESULT result = 0; - TRACE("hwnd=%p msg=%x (%s) wparam=%x lparam=%lx\n", hwnd, msg, SPY_GetMsgName(msg, hwnd), wParam, lParam); + TRACE("hwnd=%p msg=%x (%s) wparam=%lx lparam=%lx\n", hwnd, msg, SPY_GetMsgName(msg, hwnd), wParam, lParam); if (!es && msg != WM_NCCREATE) return DefWindowProcT(hwnd, msg, wParam, lParam, unicode); @@ -5283,7 +5283,7 @@ } else if (GWL_EXSTYLE == which) { ; /* FIXME - what is needed here */ } else { - WARN ("Invalid style change %d\n",which); + WARN ("Invalid style change %ld\n",which); } return 0; Modified: trunk/reactos/dll/win32/user32/controls/scrollbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/scrollbar.c (original) +++ trunk/reactos/dll/win32/user32/controls/scrollbar.c Sun Dec 9 17:15:31 2007 @@ -729,7 +729,7 @@ WPARAM wParam /* [in] Variable input including enable state */, LPARAM lParam /* [in] Variable input including input point */) { - TRACE("Wnd=%p wParam=%d lParam=%ld\n", Wnd, wParam, lParam); + TRACE("Wnd=%p wParam=%ld lParam=%ld\n", Wnd, wParam, lParam); /* hide caret on first KEYDOWN to prevent flicker */ if (0 == (lParam & PFD_DOUBLEBUFFER_DONTCARE)) @@ -1445,14 +1445,14 @@ case 0x00ed: case 0x00ee: case 0x00ef: - WARN("unknown Win32 msg %04x wp=%08x lp=%08lx\n", + WARN("unknown Win32 msg %04x wp=%08lx lp=%08lx\n", Msg, wParam, lParam ); break; default: if (WM_USER <= Msg) { - WARN("unknown msg %04x wp=%04x lp=%08lx\n", Msg, wParam, lParam); + WARN("unknown msg %04x wp=%04lx lp=%08lx\n", Msg, wParam, lParam); } return DefWindowProcW(Wnd, Msg, wParam, lParam ); } Modified: trunk/reactos/dll/win32/user32/misc/dde.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/dde.… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/dde.c (original) +++ trunk/reactos/dll/win32/user32/misc/dde.c Sun Dec 9 17:15:31 2007 @@ -117,7 +117,7 @@ ERR("GlobalLock failed (%lx)\n", lParam); return FALSE; } - TRACE("unpacked: low %08x, high %08x\n", params[0], params[1]); + TRACE("unpacked: low %08lx, high %08lx\n", params[0], params[1]); if (uiLo) *uiLo = params[0]; if (uiHi) *uiHi = params[1]; GlobalUnlock( (HGLOBAL)lParam ); @@ -192,7 +192,7 @@ } params[0] = uiLo; params[1] = uiHi; - TRACE("Reusing pack %08x %08x\n", uiLo, uiHi); + TRACE("Reusing pack %08lx %08lx\n", uiLo, uiHi); GlobalUnlock( (HGLOBAL)lParam ); return lParam; Modified: trunk/reactos/dll/win32/user32/misc/ddeclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/ddec… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/ddeclient.c (original) +++ trunk/reactos/dll/win32/user32/misc/ddeclient.c Sun Dec 9 17:15:31 2007 @@ -526,7 +526,7 @@ case WM_DDE_DATA: UnpackDDElParam(WM_DDE_DATA, msg->lParam, &uiLo, &uiHi); - TRACE("Got the result (%08x)\n", uiLo); + TRACE("Got the result (%08lx)\n", uiLo); hsz = WDML_MakeHszFromAtom(pConv->instance, uiHi); @@ -1272,7 +1272,7 @@ WDML_CONV* pConv = NULL; HSZ hszSrv, hszTpc; - TRACE("%p %04x %08x %08lx\n", hwnd, iMsg, wParam , lParam); + TRACE("%p %04x %08lx %08lx\n", hwnd, iMsg, wParam , lParam); if (iMsg == WM_DDE_ACK && /* in the initial WM_INITIATE sendmessage */ Modified: trunk/reactos/dll/win32/user32/misc/ddeserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/ddes… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/ddeserver.c (original) +++ trunk/reactos/dll/win32/user32/misc/ddeserver.c Sun Dec 9 17:15:31 2007 @@ -983,7 +983,7 @@ WDML_CONV* pConv; WDML_XACT* pXAct = NULL; - TRACE("%p %04x %08x %08lx\n", hwndServer, iMsg, wParam , lParam); + TRACE("%p %04x %08lx %08lx\n", hwndServer, iMsg, wParam , lParam); if (iMsg == WM_DESTROY) { Modified: trunk/reactos/dll/win32/user32/windows/mdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/mdi.c (original) +++ trunk/reactos/dll/win32/user32/windows/mdi.c Sun Dec 9 17:15:31 2007 @@ -1052,7 +1052,7 @@ { MDICLIENTINFO *ci = NULL; - TRACE("%p %04x (%s) %08x %08lx\n", hwnd, message, SPY_GetMsgName(message, hwnd), wParam, lParam); + TRACE("%p %04x (%s) %08lx %08lx\n", hwnd, message, SPY_GetMsgName(message, hwnd), wParam, lParam); if (WM_NCCREATE != message && NULL == (ci = get_client_info(hwnd))) { @@ -1370,7 +1370,7 @@ { MDICLIENTINFO *ci = get_client_info( hwndMDIClient ); - TRACE("%p %p %04x (%s) %08x %08lx\n", hwnd, hwndMDIClient, message, SPY_GetMsgName(message, hwnd), wParam, lParam); + TRACE("%p %p %04x (%s) %08lx %08lx\n", hwnd, hwndMDIClient, message, SPY_GetMsgName(message, hwnd), wParam, lParam); if (ci) { @@ -1468,7 +1468,7 @@ HWND client = GetParent(hwnd); MDICLIENTINFO *ci = get_client_info( client ); - TRACE("%p %04x (%s) %08x %08lx\n", hwnd, message, SPY_GetMsgName(message, hwnd), wParam, lParam); + TRACE("%p %04x (%s) %08lx %08lx\n", hwnd, message, SPY_GetMsgName(message, hwnd), wParam, lParam); #ifndef __REACTOS__ hwnd = WIN_GetFullHandle( hwnd ); #endif @@ -1511,7 +1511,7 @@ HWND client = GetParent(hwnd); MDICLIENTINFO *ci = get_client_info( client ); - TRACE("%p %04x (%s) %08x %08lx\n", hwnd, message, SPY_GetMsgName(message, hwnd), wParam, lParam); + TRACE("%p %04x (%s) %08lx %08lx\n", hwnd, message, SPY_GetMsgName(message, hwnd), wParam, lParam); #ifndef __REACTOS__ hwnd = WIN_GetFullHandle( hwnd ); #endif @@ -1713,7 +1713,7 @@ default: return 0; } - TRACE("wParam = %04x\n", wParam); + TRACE("wParam = %04lx\n", wParam); SendMessageW(ci->hwndActiveChild, WM_SYSCOMMAND, wParam, (LPARAM)msg->wParam); return 1; } Modified: trunk/reactos/dll/win32/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/menu.c (original) +++ trunk/reactos/dll/win32/user32/windows/menu.c Sun Dec 9 17:15:31 2007 @@ -940,7 +940,7 @@ static LRESULT WINAPI PopupMenuWndProcW(HWND Wnd, UINT Message, WPARAM wParam, LPARAM lParam) { - TRACE("hwnd=%x msg=0x%04x wp=0x%04x lp=0x%08lx\n", Wnd, Message, wParam, lParam); + TRACE("hwnd=%x msg=0x%04x wp=0x%04lx lp=0x%08lx\n", Wnd, Message, wParam, lParam); switch(Message) { Modified: trunk/reactos/dll/win32/user32/windows/spy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/s… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/spy.c (original) +++ trunk/reactos/dll/win32/user32/windows/spy.c Sun Dec 9 17:15:31 2007 @@ -2390,7 +2390,7 @@ p = SPY_Bsearch_Notify (&spnfy_array[0], end_spnfy_array, pnmh->code); if (p) { - TRACE("NMHDR hwndFrom=%p idFrom=0x%08x code=%s<0x%08x>, extra=0x%x\n", + TRACE("NMHDR hwndFrom=%p idFrom=0x%08lx code=%s<0x%08x>, extra=0x%x\n", pnmh->hwndFrom, pnmh->idFrom, p->name, pnmh->code, p->len); dumplen = p->len; @@ -2412,7 +2412,7 @@ } } else - TRACE("NMHDR hwndFrom=%p idFrom=0x%08x code=0x%08x\n", + TRACE("NMHDR hwndFrom=%p idFrom=0x%08lx code=0x%08x\n", pnmh->hwndFrom, pnmh->idFrom, pnmh->code); } default: @@ -2446,13 +2446,13 @@ { #ifndef __REACTOS__ case SPY_DISPATCHMESSAGE16: - TRACE("%*s(%04x) %-16s message [%04x] %s dispatched wp=%04x lp=%08lx\n", + TRACE("%*s(%04x) %-16s message [%04x] %s dispatched wp=%04lx lp=%08lx\n", indent, "", HWND_16(hWnd), debugstr_w(sp_e.wnd_name), msg, sp_e.msg_name, wParam, lParam); break; #endif case SPY_DISPATCHMESSAGE: - TRACE("%*s(%p) %-16s message [%04x] %s dispatched wp=%08x lp=%08lx\n", + TRACE("%*s(%p) %-16s message [%04x] %s dispatched wp=%08lx lp=%08lx\n", indent, "", hWnd, debugstr_w(sp_e.wnd_name), msg, sp_e.msg_name, wParam, lParam); break; @@ -2467,12 +2467,12 @@ else sprintf( taskName, "tid %04lx", GetCurrentThreadId() ); #ifndef __REACTOS__ if (iFlag == SPY_SENDMESSAGE16) - TRACE("%*s(%04x) %-16s message [%04x] %s sent from %s wp=%04x lp=%08lx\n", + TRACE("%*s(%04x) %-16s message [%04x] %s sent from %s wp=%04lx lp=%08lx\n", indent, "", HWND_16(hWnd), debugstr_w(sp_e.wnd_name), msg, sp_e.msg_name, taskName, wParam, lParam ); else #endif - { TRACE("%*s(%p) %-16s message [%04x] %s sent from %s wp=%08x lp=%08lx\n", + { TRACE("%*s(%p) %-16s message [%04x] %s sent from %s wp=%08lx lp=%08lx\n", indent, "", hWnd, debugstr_w(sp_e.wnd_name), msg, sp_e.msg_name, taskName, wParam, lParam ); SPY_DumpStructure(&sp_e, TRUE); @@ -2483,14 +2483,14 @@ #ifndef __REACTOS__ case SPY_DEFWNDPROC16: if( SPY_ExcludeDWP ) return; - TRACE("%*s(%04x) DefWindowProc16: %s [%04x] wp=%04x lp=%08lx\n", + TRACE("%*s(%04x) DefWindowProc16: %s [%04x] wp=%04lx lp=%08lx\n", indent, "", HWND_16(hWnd), sp_e.msg_name, msg, wParam, lParam ); break; #endif case SPY_DEFWNDPROC: if( SPY_ExcludeDWP ) return; - TRACE("%*s(%p) DefWindowProc32: %s [%04x] wp=%08x lp=%08lx\n", + TRACE("%*s(%p) DefWindowProc32: %s [%04x] wp=%08lx lp=%08lx\n", indent, "", hWnd, sp_e.msg_name, msg, wParam, lParam ); break;

1 0

[cwittich] 31103: Dmitry Timoshkov : include/wine/debug.h: Fix compilation warning in 64-bit mode. <dmitry at codeweavers.com>
by cwittich＠svn.reactos.org 09 Dec '07

09 Dec '07

Author: cwittich Date: Sun Dec 9 16:57:09 2007 New Revision: 31103 URL: http://svn.reactos.org/svn/reactos?rev=31103&view=rev Log: Dmitry Timoshkov : include/wine/debug.h: Fix compilation warning in 64-bit mode. <dmitry at codeweavers.com> Modified: trunk/reactos/include/reactos/wine/debug.h Modified: trunk/reactos/include/reactos/wine/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/debug… ============================================================================== --- trunk/reactos/include/reactos/wine/debug.h (original) +++ trunk/reactos/include/reactos/wine/debug.h Sun Dec 9 16:57:09 2007 @@ -189,7 +189,7 @@ static __inline const char *wine_dbgstr_guid( const GUID *id ) { if (!id) return "(null)"; - if (!((INT_PTR)id >> 16)) return wine_dbg_sprintf( "<guid-0x%04x>", (INT_PTR)id & 0xffff ); + if (!((ULONG_PTR)id >> 16)) return wine_dbg_sprintf( "<guid-0x%04lx>", (ULONG_PTR)id & 0xffff ); return wine_dbg_sprintf( "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", id->Data1, id->Data2, id->Data3, id->Data4[0], id->Data4[1], id->Data4[2], id->Data4[3],

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