Ros-diffs August 2009

ros-diffs@reactos.org

21 participants
654 discussions

[sginsberg] 42976: - Fix a valid gcc 4.4.0 uninitialized variable warning
by sginsberg＠svn.reactos.org 31 Aug '09

31 Aug '09

Author: sginsberg Date: Mon Aug 31 22:40:02 2009 New Revision: 42976 URL: http://svn.reactos.org/svn/reactos?rev=42976&view=rev Log: - Fix a valid gcc 4.4.0 uninitialized variable warning Modified: trunk/reactos/dll/win32/secur32/sspi.c Modified: trunk/reactos/dll/win32/secur32/sspi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/secur32/sspi.c?r… ============================================================================== --- trunk/reactos/dll/win32/secur32/sspi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/secur32/sspi.c [iso-8859-1] Mon Aug 31 22:40:02 2009 @@ -100,7 +100,7 @@ ) { SECURITY_STATUS ret; - PSecPkgInfoW info; + PSecPkgInfoW info = NULL; ret = EnumerateSecurityPackagesW(pcPackages, &info); if (ret == SEC_E_OK && *pcPackages && info)

1 0

[sginsberg] 42975: - Partial revert of 42973 for the systeminfo utility -- the issue was fixed in 42930 - GCC 4.1.3 doesn't support %I64 -- compile the code conditionally
by sginsberg＠svn.reactos.org 31 Aug '09

31 Aug '09

Author: sginsberg Date: Mon Aug 31 16:37:54 2009 New Revision: 42975 URL: http://svn.reactos.org/svn/reactos?rev=42975&view=rev Log: - Partial revert of 42973 for the systeminfo utility -- the issue was fixed in 42930 - GCC 4.1.3 doesn't support %I64 -- compile the code conditionally Modified: trunk/rosapps/applications/devutils/symdump/symdump.c trunk/rosapps/applications/devutils/syscalldump/syscalldump.c trunk/rosapps/applications/sysutils/systeminfo/systeminfo.c Modified: trunk/rosapps/applications/devutils/symdump/symdump.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/symd… ============================================================================== --- trunk/rosapps/applications/devutils/symdump/symdump.c [iso-8859-1] (original) +++ trunk/rosapps/applications/devutils/symdump/symdump.c [iso-8859-1] Mon Aug 31 16:37:54 2009 @@ -875,7 +875,12 @@ } else { +#if defined(__GNUC__) && \ + (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__ < 40400) + printf("Symbol: %s, TypeIndex=%ld, Flags=%lx, Value=0x%llx\n", +#else printf("Symbol: %s, TypeIndex=%ld, Flags=%lx, Value=0x%I64x\n", +#endif pSymInfo->Name, pSymInfo->TypeIndex, pSymInfo->Flags, pSymInfo->Value); //if (pSymInfo->Flags & SYMFLAG_FUNCTION) { Modified: trunk/rosapps/applications/devutils/syscalldump/syscalldump.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/sysc… ============================================================================== --- trunk/rosapps/applications/devutils/syscalldump/syscalldump.c [iso-8859-1] (original) +++ trunk/rosapps/applications/devutils/syscalldump/syscalldump.c [iso-8859-1] Mon Aug 31 16:37:54 2009 @@ -36,7 +36,12 @@ printf("SymGetSymFromName64() failed: %ld\n", GetLastError()); return 0; } +#if defined(__GNUC__) && \ + (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__ < 40400) + printf("looking up adress for %s: 0x%llx\n", Name, pSym->Address); +#else printf("looking up adress for %s: 0x%I64x\n", Name, pSym->Address); +#endif NtHeaders = ImageNtHeader(pModule); p = ImageRvaToVa(NtHeaders, pModule, pSym->Address - pSym->ModBase, NULL); Modified: trunk/rosapps/applications/sysutils/systeminfo/systeminfo.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst… ============================================================================== --- trunk/rosapps/applications/sysutils/systeminfo/systeminfo.c [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/systeminfo/systeminfo.c [iso-8859-1] Mon Aug 31 16:37:54 2009 @@ -358,8 +358,7 @@ int main(int argc, char *argv[]) { - char str[] = "/?"; - if (argc > 1 && !strcmp(argv[1], str)) + if (argc > 1 && !strcmp(argv[1], "/?")) { Usage(); return 0;

1 0

[hpoussin] 42974: Use memory wrappers instead of ExAllocatePool/ExFreePool directly
by hpoussin＠svn.reactos.org 30 Aug '09

30 Aug '09

Author: hpoussin Date: Sun Aug 30 21:20:30 2009 New Revision: 42974 URL: http://svn.reactos.org/svn/reactos?rev=42974&view=rev Log: Use memory wrappers instead of ExAllocatePool/ExFreePool directly Modified: trunk/reactos/ntoskrnl/config/cmalloc.c trunk/reactos/ntoskrnl/config/cmindex.c trunk/reactos/ntoskrnl/config/cmkcbncb.c trunk/reactos/ntoskrnl/config/cmvalche.c trunk/reactos/ntoskrnl/config/cmvalue.c Modified: trunk/reactos/ntoskrnl/config/cmalloc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmalloc.c?… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmalloc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmalloc.c [iso-8859-1] Sun Aug 30 21:20:30 2009 @@ -62,7 +62,7 @@ if (!Kcb->PrivateAlloc) { /* Free it from the pool */ - ExFreePoolWithTag(Kcb, TAG_CM); + CmpFree(Kcb, 0); return; } @@ -98,7 +98,7 @@ } /* Free the page */ - ExFreePoolWithTag(AllocPage, TAG_CM); + CmpFree(AllocPage, 0); } /* Release the lock */ @@ -151,7 +151,7 @@ } /* Allocate an allocation page */ - AllocPage = ExAllocatePoolWithTag(PagedPool, PAGE_SIZE, TAG_CM); + AllocPage = CmpAllocate(PAGE_SIZE, TRUE, TAG_CM); if (AllocPage) { /* Set default entries */ @@ -178,9 +178,9 @@ } /* Allocate a KCB only */ - CurrentKcb = ExAllocatePoolWithTag(PagedPool, - sizeof(CM_KEY_CONTROL_BLOCK), - TAG_CM); + CurrentKcb = CmpAllocate(sizeof(CM_KEY_CONTROL_BLOCK), + TRUE, + TAG_CM); if (CurrentKcb) { /* Set it up */ @@ -231,7 +231,7 @@ } /* Allocate an allocation page */ - AllocPage = ExAllocatePoolWithTag(PagedPool, PAGE_SIZE, TAG_CM); + AllocPage = CmpAllocate(PAGE_SIZE, TRUE, TAG_CM); if (AllocPage) { /* Set default entries */ @@ -295,7 +295,7 @@ } /* Now free the page */ - ExFreePoolWithTag(AllocPage, TAG_CM); + CmpFree(AllocPage, 0); } /* Release the lock */ Modified: trunk/reactos/ntoskrnl/config/cmindex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmindex.c?… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmindex.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmindex.c [iso-8859-1] Sun Aug 30 21:20:30 2009 @@ -821,9 +821,9 @@ SearchName.Length = CmpCompressedNameSize(Node->Name, Node->NameLength); SearchName.MaximumLength = SearchName.Length; - SearchName.Buffer = ExAllocatePoolWithTag(PagedPool, - SearchName.Length, - TAG_CM); + SearchName.Buffer = CmpAllocate(SearchName.Length, + TRUE, + TAG_CM); if (!SearchName.Buffer) { /* Fail */ @@ -917,7 +917,7 @@ if (Child != HCELL_NIL) { /* We found it, free the name now */ - if (IsCompressed) ExFreePool(SearchName.Buffer); + if (IsCompressed) CmpFree(SearchName.Buffer, 0); /* Release the parent key */ HvReleaseCell(Hive, ParentKey); @@ -942,7 +942,7 @@ if (CellToRelease != HCELL_NIL) HvReleaseCell(Hive, CellToRelease); /* Free the search name and return failure */ - if (IsCompressed) ExFreePool(SearchName.Buffer); + if (IsCompressed) CmpFree(SearchName.Buffer, 0); return FALSE; } @@ -1758,9 +1758,9 @@ if (SearchName.MaximumLength > sizeof(Buffer)) { /* Allocate one */ - SearchName.Buffer = ExAllocatePoolWithTag(PagedPool, - SearchName.Length, - TAG_CM); + SearchName.Buffer = CmpAllocate(SearchName.Length, + TRUE, + TAG_CM); if (!SearchName.Buffer) return FALSE; } else @@ -1899,7 +1899,7 @@ if ((IsCompressed) && (SearchName.MaximumLength > sizeof(Buffer))) { /* Free the buffer we allocated */ - ExFreePool(SearchName.Buffer); + CmpFree(SearchName.Buffer, 0); } /* Return the result */ Modified: trunk/reactos/ntoskrnl/config/cmkcbncb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmkcbncb.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmkcbncb.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmkcbncb.c [iso-8859-1] Sun Aug 30 21:20:30 2009 @@ -32,7 +32,7 @@ Length = CmpHashTableSize * sizeof(CM_KEY_HASH_TABLE_ENTRY); /* Allocate it */ - CmpCacheTable = ExAllocatePoolWithTag(PagedPool, Length, TAG_CM); + CmpCacheTable = CmpAllocate(Length, TRUE, TAG_CM); if (!CmpCacheTable) { /* Take the system down */ @@ -53,7 +53,7 @@ Length = CmpHashTableSize * sizeof(CM_NAME_HASH_TABLE_ENTRY); /* Now allocate the name cache table */ - CmpNameCacheTable = ExAllocatePoolWithTag(PagedPool, Length, TAG_CM); + CmpNameCacheTable = CmpAllocate(Length, TRUE, TAG_CM); if (!CmpNameCacheTable) { /* Take the system down */ @@ -249,7 +249,7 @@ { /* Allocate one */ NcbSize = FIELD_OFFSET(CM_NAME_CONTROL_BLOCK, Name) + Length; - Ncb = ExAllocatePoolWithTag(PagedPool, NcbSize, TAG_CM); + Ncb = CmpAllocate(NcbSize, TRUE, TAG_CM); if (!Ncb) { /* Release the lock and fail */ @@ -343,7 +343,7 @@ } /* Found it, now free it */ - ExFreePool(Ncb); + CmpFree(Ncb, 0); } /* Release the lock */ @@ -446,12 +446,12 @@ if (CMP_IS_CELL_CACHED(CachedList[i])) { /* Free it */ - ExFreePool((PVOID)CMP_GET_CACHED_CELL(CachedList[i])); + CmpFree((PVOID)CMP_GET_CACHED_CELL(CachedList[i]), 0); } } /* Now free the list */ - ExFreePool((PVOID)CMP_GET_CACHED_CELL(Kcb->ValueCache.ValueList)); + CmpFree((PVOID)CMP_GET_CACHED_CELL(Kcb->ValueCache.ValueList), 0); Kcb->ValueCache.ValueList = HCELL_NIL; } else if (Kcb->ExtFlags & CM_KCB_SYM_LINK_FOUND) @@ -490,7 +490,7 @@ CmpDereferenceNameControlBlockWithLock(Kcb->NameBlock); /* Check if we have an index hint block and free it */ - if (Kcb->ExtFlags & CM_KCB_SUBKEY_HINT) ExFreePool(Kcb->IndexHint); + if (Kcb->ExtFlags & CM_KCB_SUBKEY_HINT) CmpFree(Kcb->IndexHint, 0); /* Check if we were already deleted */ Parent = Kcb->ParentKcb; @@ -529,7 +529,7 @@ if (Kcb->ExtFlags & (CM_KCB_SUBKEY_HINT)) { /* Kill it */ - ExFreePool(Kcb->IndexHint); + CmpFree(Kcb->IndexHint, 0); } /* Remove subkey flags */ @@ -931,9 +931,9 @@ } /* Allocate the unicode string now */ - KeyName = ExAllocatePoolWithTag(PagedPool, - NameLength + sizeof(UNICODE_STRING), - TAG_CM); + KeyName = CmpAllocate(NameLength + sizeof(UNICODE_STRING), + TRUE, + TAG_CM); if (!KeyName) return NULL; @@ -954,7 +954,7 @@ MyKcb->ExtFlags & CM_KCB_KEY_NON_EXIST) { /* Failure */ - ExFreePool(KeyName); + CmpFree(KeyName, 0); return NULL; } @@ -967,7 +967,7 @@ if (!KeyNode) { /* Failure */ - ExFreePool(KeyName); + CmpFree(KeyName, 0); return NULL; } } Modified: trunk/reactos/ntoskrnl/config/cmvalche.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmvalche.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmvalche.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmvalche.c [iso-8859-1] Sun Aug 30 21:20:30 2009 @@ -797,7 +797,7 @@ if (ValueCellToRelease) HvReleaseCell(Kcb->KeyHive, ValueCellToRelease); /* Free the buffer */ - if (BufferAllocated) ExFreePool(Buffer); + if (BufferAllocated) CmpFree(Buffer, 0); /* Free the cell */ if (CellToRelease) HvReleaseCell(Kcb->KeyHive, CellToRelease); Modified: trunk/reactos/ntoskrnl/config/cmvalue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmvalue.c?… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmvalue.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmvalue.c [iso-8859-1] Sun Aug 30 21:20:30 2009 @@ -188,7 +188,7 @@ if (BufferAllocated) { /* Free the buffer and bugcheck */ - ExFreePool(Buffer); + CmpFree(Buffer, 0); KeBugCheckEx(REGISTRY_ERROR, 8, 0, (ULONG_PTR)Hive, (ULONG_PTR)Value); }

1 0

[sginsberg] 42973: - %llx -> %I64x - Don't pass a string literal to strcmp
by sginsberg＠svn.reactos.org 30 Aug '09

30 Aug '09

Author: sginsberg Date: Sun Aug 30 20:40:58 2009 New Revision: 42973 URL: http://svn.reactos.org/svn/reactos?rev=42973&view=rev Log: - %llx -> %I64x - Don't pass a string literal to strcmp Modified: trunk/rosapps/applications/devutils/symdump/symdump.c trunk/rosapps/applications/devutils/syscalldump/syscalldump.c trunk/rosapps/applications/sysutils/systeminfo/systeminfo.c Modified: trunk/rosapps/applications/devutils/symdump/symdump.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/symd… ============================================================================== --- trunk/rosapps/applications/devutils/symdump/symdump.c [iso-8859-1] (original) +++ trunk/rosapps/applications/devutils/symdump/symdump.c [iso-8859-1] Sun Aug 30 20:40:58 2009 @@ -875,7 +875,7 @@ } else { - printf("Symbol: %s, TypeIndex=%ld, Flags=%lx, Value=0x%llx\n", + printf("Symbol: %s, TypeIndex=%ld, Flags=%lx, Value=0x%I64x\n", pSymInfo->Name, pSymInfo->TypeIndex, pSymInfo->Flags, pSymInfo->Value); //if (pSymInfo->Flags & SYMFLAG_FUNCTION) { Modified: trunk/rosapps/applications/devutils/syscalldump/syscalldump.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/sysc… ============================================================================== --- trunk/rosapps/applications/devutils/syscalldump/syscalldump.c [iso-8859-1] (original) +++ trunk/rosapps/applications/devutils/syscalldump/syscalldump.c [iso-8859-1] Sun Aug 30 20:40:58 2009 @@ -36,7 +36,7 @@ printf("SymGetSymFromName64() failed: %ld\n", GetLastError()); return 0; } - printf("looking up adress for %s: 0x%llx\n", Name, pSym->Address); + printf("looking up adress for %s: 0x%I64x\n", Name, pSym->Address); NtHeaders = ImageNtHeader(pModule); p = ImageRvaToVa(NtHeaders, pModule, pSym->Address - pSym->ModBase, NULL); Modified: trunk/rosapps/applications/sysutils/systeminfo/systeminfo.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst… ============================================================================== --- trunk/rosapps/applications/sysutils/systeminfo/systeminfo.c [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/systeminfo/systeminfo.c [iso-8859-1] Sun Aug 30 20:40:58 2009 @@ -358,7 +358,8 @@ int main(int argc, char *argv[]) { - if (argc > 1 && !strcmp(argv[1], "/?")) + char str[] = "/?"; + if (argc > 1 && !strcmp(argv[1], str)) { Usage(); return 0;

1 0

[sginsberg] 42972: - Add missing prototype
by sginsberg＠svn.reactos.org 30 Aug '09

30 Aug '09

Author: sginsberg Date: Sun Aug 30 20:25:38 2009 New Revision: 42972 URL: http://svn.reactos.org/svn/reactos?rev=42972&view=rev Log: - Add missing prototype Modified: trunk/reactos/base/services/telnetd/serviceentry.c trunk/reactos/base/services/telnetd/telnetd.rbuild Modified: trunk/reactos/base/services/telnetd/serviceentry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/telnetd/serv… ============================================================================== --- trunk/reactos/base/services/telnetd/serviceentry.c [iso-8859-1] (original) +++ trunk/reactos/base/services/telnetd/serviceentry.c [iso-8859-1] Sun Aug 30 20:25:38 2009 @@ -20,6 +20,8 @@ #include <windows.h> #include "wine/debug.h" + +int kickoff_telnetd(void); WINE_DEFAULT_DEBUG_CHANNEL(telnetd); Modified: trunk/reactos/base/services/telnetd/telnetd.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/telnetd/teln… ============================================================================== --- trunk/reactos/base/services/telnetd/telnetd.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/services/telnetd/telnetd.rbuild [iso-8859-1] Sun Aug 30 20:25:38 2009 @@ -1,4 +1,4 @@ -<module name="telnetd" type="win32cui" installbase="system32" installname="telnetd.exe" allowwarnings="true" unicode="no"> +<module name="telnetd" type="win32cui" installbase="system32" installname="telnetd.exe" unicode="no"> <include base="reactos"></include> <include base="telnetd">..</include>

1 0

[sginsberg] 42971: - Fix some inflib warnings
by sginsberg＠svn.reactos.org 30 Aug '09

30 Aug '09

Author: sginsberg Date: Sun Aug 30 20:11:09 2009 New Revision: 42971 URL: http://svn.reactos.org/svn/reactos?rev=42971&view=rev Log: - Fix some inflib warnings Modified: trunk/reactos/lib/inflib/infcore.c trunk/reactos/lib/inflib/infget.c trunk/reactos/lib/inflib/infhostgen.c trunk/reactos/lib/inflib/infpriv.h Modified: trunk/reactos/lib/inflib/infcore.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/inflib/infcore.c?rev=4… ============================================================================== --- trunk/reactos/lib/inflib/infcore.c [iso-8859-1] (original) +++ trunk/reactos/lib/inflib/infcore.c [iso-8859-1] Sun Aug 30 20:11:09 2009 @@ -181,8 +181,8 @@ } /* Allocate and initialize the new section */ - Size = FIELD_OFFSET(INFCACHESECTION, - Name[_tcslen (Name) + 1]); + Size = (ULONG)FIELD_OFFSET(INFCACHESECTION, + Name[_tcslen (Name) + 1]); Section = (PINFCACHESECTION)MALLOC (Size); if (Section == NULL) { @@ -286,8 +286,8 @@ PINFCACHEFIELD Field; ULONG Size; - Size = FIELD_OFFSET(INFCACHEFIELD, - Data[_tcslen(Data) + 1]); + Size = (ULONG)FIELD_OFFSET(INFCACHEFIELD, + Data[_tcslen(Data) + 1]); Field = (PINFCACHEFIELD)MALLOC(Size); if (Field == NULL) { @@ -382,7 +382,7 @@ /* push data from current token start up to pos into the current token */ static int push_token( struct parser *parser, const CHAR *pos ) { - unsigned int len = pos - parser->start; + UINT len = (UINT)(pos - parser->start); const CHAR *src = parser->start; TCHAR *dst = parser->token + parser->token_len; @@ -808,7 +808,7 @@ { if (error_line) *error_line = parser.line_pos; - return parser.error; + return (INFSTATUS)parser.error; } /* find the [strings] section */ Modified: trunk/reactos/lib/inflib/infget.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/inflib/infget.c?rev=42… ============================================================================== --- trunk/reactos/lib/inflib/infget.c [iso-8859-1] (original) +++ trunk/reactos/lib/inflib/infget.c [iso-8859-1] Sun Aug 30 20:11:09 2009 @@ -243,7 +243,7 @@ for (Index = 1; Index < FieldIndex; Index++) CacheField = CacheField->Next; - Size = CacheLine->FieldCount - FieldIndex + 1; + Size = (ULONG)CacheLine->FieldCount - FieldIndex + 1; if (RequiredSize != NULL) *RequiredSize = Size; Modified: trunk/reactos/lib/inflib/infhostgen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/inflib/infhostgen.c?re… ============================================================================== --- trunk/reactos/lib/inflib/infhostgen.c [iso-8859-1] (original) +++ trunk/reactos/lib/inflib/infhostgen.c [iso-8859-1] Sun Aug 30 20:11:09 2009 @@ -107,7 +107,7 @@ return -1; } - FileLength = ftell(File); + FileLength = (ULONG)ftell(File); if ((ULONG) -1 == FileLength) { DPRINT1("ftell() failed (errno %d)\n", errno); Modified: trunk/reactos/lib/inflib/infpriv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/inflib/infpriv.h?rev=4… ============================================================================== --- trunk/reactos/lib/inflib/infpriv.h [iso-8859-1] (original) +++ trunk/reactos/lib/inflib/infpriv.h [iso-8859-1] Sun Aug 30 20:11:09 2009 @@ -69,7 +69,7 @@ PINFCACHELINE Line; } INFCONTEXT; -typedef long INFSTATUS; +typedef int INFSTATUS; /* FUNCTIONS ****************************************************************/

1 0

[sginsberg] 42970: - gcc 4.4.0 bringup 1 of ?: - servman: Disable unused, static function - explorer, mpu401: Fix "deprecated conversion from string constant to 'xxx'" under - ws2_32_new, portcls: Hack around bogus uninitialized variable usage warning for - glu32: Fix various warnings and errors
by sginsberg＠svn.reactos.org 30 Aug '09

30 Aug '09

Author: sginsberg Date: Sun Aug 30 17:53:16 2009 New Revision: 42970 URL: http://svn.reactos.org/svn/reactos?rev=42970&view=rev Log: - gcc 4.4.0 bringup 1 of ?: - servman: Disable unused, static function - explorer, mpu401: Fix "deprecated conversion from string constant to 'xxx'" under - ws2_32_new, portcls: Hack around bogus uninitialized variable usage warning for - glu32: Fix various warnings and errors Modified: trunk/reactos/base/applications/mscutils/servman/propsheet_depends.c trunk/reactos/base/shell/explorer/shell/mainframe.cpp trunk/reactos/base/shell/explorer/shell/pane.cpp trunk/reactos/dll/win32/glu32/libnurbs/internals/backend.cc trunk/reactos/dll/win32/glu32/libnurbs/internals/backend.h trunk/reactos/dll/win32/glu32/libnurbs/internals/bin.cc trunk/reactos/dll/win32/glu32/libnurbs/internals/bin.h trunk/reactos/dll/win32/glu32/libnurbs/internals/bufpool.cc trunk/reactos/dll/win32/glu32/libnurbs/internals/bufpool.h trunk/reactos/dll/win32/glu32/libnurbs/internals/intersect.cc trunk/reactos/dll/win32/glu32/libnurbs/internals/knotvector.cc trunk/reactos/dll/win32/glu32/libnurbs/internals/knotvector.h trunk/reactos/dll/win32/glu32/libnurbs/internals/nurbstess.cc trunk/reactos/dll/win32/glu32/libnurbs/internals/nurbstess.h trunk/reactos/dll/win32/glu32/libnurbs/internals/subdivider.cc trunk/reactos/dll/win32/glu32/libnurbs/nurbtess/partitionY.cc trunk/reactos/dll/win32/ws2_32_new/src/select.c trunk/reactos/drivers/wdm/audio/backpln/portcls/unregister.c trunk/reactos/drivers/wdm/audio/drivers/mpu401/adapter.cpp Modified: trunk/reactos/base/applications/mscutils/servman/propsheet_depends.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/propsheet_depends.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/propsheet_depends.c [iso-8859-1] Sun Aug 30 17:53:16 2009 @@ -50,6 +50,7 @@ return TreeView_InsertItem(hTreeView, &tvins); } +#if 0 static VOID AddServiceDependency(PSERVICEPROPSHEET dlgInfo, HWND hTreeView, @@ -123,6 +124,7 @@ } } +#endif static VOID AddServiceDependent(HWND hTreeView, Modified: trunk/reactos/base/shell/explorer/shell/mainframe.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/shell/… ============================================================================== --- trunk/reactos/base/shell/explorer/shell/mainframe.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/shell/mainframe.cpp [iso-8859-1] Sun Aug 30 17:53:16 2009 @@ -153,6 +153,11 @@ : super(hwnd) { HDC hDC = GetDC(NULL); +#ifndef _NO_REBAR + //static WCHAR Title1[] = TEXT("Toolbar"); + static WCHAR Title2[] = TEXT("Address :"); +#endif + if (hDC) { DWORD ilMask; @@ -264,7 +269,7 @@ rbBand.cyMaxChild = 0; rbBand.cyIntegral = btn_hgt; - rbBand.lpText = NULL;//TEXT("Toolbar"); + rbBand.lpText = NULL;//Title1 rbBand.hwndChild = _htoolbar; rbBand.cxMinChild = 0; rbBand.cyMinChild = btn_hgt; @@ -273,7 +278,7 @@ rbBand.fStyle &= ~RBBS_HIDETITLE; rbBand.fStyle |= RBBS_BREAK; - rbBand.lpText = TEXT("Address :"); + rbBand.lpText = Title2; rbBand.hwndChild = _haddrcombo; rbBand.cxMinChild = 0; rbBand.cyMinChild = btn_hgt; Modified: trunk/reactos/base/shell/explorer/shell/pane.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/shell/… ============================================================================== --- trunk/reactos/base/shell/explorer/shell/pane.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/shell/pane.cpp [iso-8859-1] Sun Aug 30 17:53:16 2009 @@ -42,7 +42,7 @@ #define IMAGE_HEIGHT 13 -static const LPTSTR g_pos_names[COLUMNS] = { +static const TCHAR* g_pos_names[COLUMNS] = { TEXT(""), /* symbol */ TEXT("Name"), TEXT("Type"), @@ -141,7 +141,7 @@ hdi.mask = HDI_TEXT|HDI_WIDTH|HDI_FORMAT; for(int idx=0; idx<COLUMNS; idx++) { - hdi.pszText = g_pos_names[idx]; + hdi.pszText = (TCHAR*)g_pos_names[idx]; hdi.fmt = HDF_STRING | g_pos_align[idx]; hdi.cxy = _widths[idx]; Header_InsertItem(hwnd, idx, &hdi); Modified: trunk/reactos/dll/win32/glu32/libnurbs/internals/backend.cc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/glu32/libnurbs/i… ============================================================================== --- trunk/reactos/dll/win32/glu32/libnurbs/internals/backend.cc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/glu32/libnurbs/internals/backend.cc [iso-8859-1] Sun Aug 30 17:53:16 2009 @@ -246,7 +246,7 @@ *------------------------------------------------------------------------- */ void -Backend::bgntmesh( char * ) +Backend::bgntmesh( const char * ) { #ifndef NOWIREFRAME Modified: trunk/reactos/dll/win32/glu32/libnurbs/internals/backend.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/glu32/libnurbs/i… ============================================================================== --- trunk/reactos/dll/win32/glu32/libnurbs/internals/backend.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/glu32/libnurbs/internals/backend.h [iso-8859-1] Sun Aug 30 17:53:16 2009 @@ -65,7 +65,7 @@ void surfbbox( long, REAL *, REAL * ); void surfgrid( REAL, REAL, long, REAL, REAL, long ); void surfmesh( long, long, long, long ); - void bgntmesh( char * ); + void bgntmesh( const char * ); void endtmesh( void ); void swaptmesh( void ); void tmeshvert( GridTrimVertex * ); Modified: trunk/reactos/dll/win32/glu32/libnurbs/internals/bin.cc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/glu32/libnurbs/i… ============================================================================== --- trunk/reactos/dll/win32/glu32/libnurbs/internals/bin.cc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/glu32/libnurbs/internals/bin.cc [iso-8859-1] Sun Aug 30 17:53:16 2009 @@ -120,7 +120,7 @@ */ void -Bin::show( char *name ) +Bin::show( const char *name ) { #ifndef NDEBUG dprintf( "%s\n", name ); Modified: trunk/reactos/dll/win32/glu32/libnurbs/internals/bin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/glu32/libnurbs/i… ============================================================================== --- trunk/reactos/dll/win32/glu32/libnurbs/internals/bin.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/glu32/libnurbs/internals/bin.h [iso-8859-1] Sun Aug 30 17:53:16 2009 @@ -63,7 +63,7 @@ int numarcs( void ); void adopt( void ); void markall( void ); - void show( char * ); + void show( const char * ); void listBezier( void ); }; Modified: trunk/reactos/dll/win32/glu32/libnurbs/internals/bufpool.cc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/glu32/libnurbs/i… ============================================================================== --- trunk/reactos/dll/win32/glu32/libnurbs/internals/bufpool.cc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/glu32/libnurbs/internals/bufpool.cc [iso-8859-1] Sun Aug 30 17:53:16 2009 @@ -48,7 +48,7 @@ * Pool - allocate a new pool of buffers *----------------------------------------------------------------------------- */ -Pool::Pool( int _buffersize, int initpoolsize, char *n ) +Pool::Pool( int _buffersize, int initpoolsize, const char *n ) { buffersize= (_buffersize < (int)sizeof(Buffer)) ? sizeof(Buffer) : _buffersize; initsize = initpoolsize * buffersize; Modified: trunk/reactos/dll/win32/glu32/libnurbs/internals/bufpool.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/glu32/libnurbs/i… ============================================================================== --- trunk/reactos/dll/win32/glu32/libnurbs/internals/bufpool.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/glu32/libnurbs/internals/bufpool.h [iso-8859-1] Sun Aug 30 17:53:16 2009 @@ -55,7 +55,7 @@ class Pool { public: - Pool( int, int, char * ); + Pool( int, int, const char * ); ~Pool( void ); inline void* new_buffer( void ); inline void free_buffer( void * ); @@ -74,7 +74,7 @@ int nextfree; /* byte offset past next free buffer */ int initsize; enum Magic { is_allocated = 0xf3a1, is_free = 0xf1a2 }; - char *name; /* name of the pool */ + const char *name; /* name of the pool */ Magic magic; /* marker for valid pool */ }; Modified: trunk/reactos/dll/win32/glu32/libnurbs/internals/intersect.cc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/glu32/libnurbs/i… ============================================================================== --- trunk/reactos/dll/win32/glu32/libnurbs/internals/intersect.cc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/glu32/libnurbs/internals/intersect.cc [iso-8859-1] Sun Aug 30 17:53:16 2009 @@ -179,6 +179,13 @@ TrimVertex* v = jarc->pwlArc->pts; int loc[3]; + +#if defined(__GNUC__) && \ + (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__ == 40400) + /* Silence incorrect GCC 4.4.0 warnings */ + loc[0] = loc[1] = loc[2] = 0; +#endif + switch( pwlarc_intersect( jarc->pwlArc, param, value, dir, loc ) ) { // When the parameter value lands on a vertex, life is sweet Modified: trunk/reactos/dll/win32/glu32/libnurbs/internals/knotvector.cc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/glu32/libnurbs/i… ============================================================================== --- trunk/reactos/dll/win32/glu32/libnurbs/internals/knotvector.cc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/glu32/libnurbs/internals/knotvector.cc [iso-8859-1] Sun Aug 30 17:53:16 2009 @@ -126,7 +126,7 @@ return 0; } -void Knotvector::show( char *msg ) +void Knotvector::show( const char *msg ) { #ifndef NDEBUG dprintf( "%s\n", msg ); Modified: trunk/reactos/dll/win32/glu32/libnurbs/internals/knotvector.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/glu32/libnurbs/i… ============================================================================== --- trunk/reactos/dll/win32/glu32/libnurbs/internals/knotvector.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/glu32/libnurbs/internals/knotvector.h [iso-8859-1] Sun Aug 30 17:53:16 2009 @@ -49,7 +49,7 @@ ~Knotvector( void ); void init( long, long, long, INREAL * ); int validate( void ); - void show( char * ); + void show( const char * ); long order; /* order of spline */ long knotcount; /* number of knots */ Modified: trunk/reactos/dll/win32/glu32/libnurbs/internals/nurbstess.cc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/glu32/libnurbs/i… ============================================================================== --- trunk/reactos/dll/win32/glu32/libnurbs/internals/nurbstess.cc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/glu32/libnurbs/internals/nurbstess.cc [iso-8859-1] Sun Aug 30 17:53:16 2009 @@ -677,7 +677,7 @@ } int -NurbsTessellator::do_check_knots( Knotvector *knots, char *msg ) +NurbsTessellator::do_check_knots( Knotvector *knots, const char *msg ) { int status = knots->validate(); if( status ) { Modified: trunk/reactos/dll/win32/glu32/libnurbs/internals/nurbstess.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/glu32/libnurbs/i… ============================================================================== --- trunk/reactos/dll/win32/glu32/libnurbs/internals/nurbstess.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/glu32/libnurbs/internals/nurbstess.h [iso-8859-1] Sun Aug 30 17:53:16 2009 @@ -112,7 +112,7 @@ private: void resetObjects( void ); - int do_check_knots( Knotvector *, char * ); + int do_check_knots( Knotvector *, const char * ); void do_nurbserror( int ); void do_bgncurve( O_curve * ); void do_endcurve( void ); Modified: trunk/reactos/dll/win32/glu32/libnurbs/internals/subdivider.cc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/glu32/libnurbs/i… ============================================================================== --- trunk/reactos/dll/win32/glu32/libnurbs/internals/subdivider.cc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/glu32/libnurbs/internals/subdivider.cc [iso-8859-1] Sun Aug 30 17:53:16 2009 @@ -531,16 +531,18 @@ patchlist.pspec[param].range[1] ) * 0.5; split( source, left, right, param, mid ); Patchlist subpatchlist( patchlist, param, mid ); - if( left.isnonempty() ) + if( left.isnonempty() ) { if( subpatchlist.cullCheck() == CULL_TRIVIAL_REJECT ) freejarcs( left ); else nonSamplingSplit( left, subpatchlist, subdivisions-1, param ); - if( right.isnonempty() ) + } + if( right.isnonempty() ) { if( patchlist.cullCheck() == CULL_TRIVIAL_REJECT ) freejarcs( right ); else nonSamplingSplit( right, patchlist, subdivisions-1, param ); + } } else { // make bbox calls Modified: trunk/reactos/dll/win32/glu32/libnurbs/nurbtess/partitionY.cc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/glu32/libnurbs/n… ============================================================================== --- trunk/reactos/dll/win32/glu32/libnurbs/nurbtess/partitionY.cc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/glu32/libnurbs/nurbtess/partitionY.cc [iso-8859-1] Sun Aug 30 17:53:16 2009 @@ -113,8 +113,8 @@ else if(A[1] > B[1] && C[1] > B[1]) return 1; - if(isAbove(v, v) && isAbove(v, v->getPrev()) || - isBelow(v, v) && isBelow(v, v->getPrev())) + if((isAbove(v, v) && isAbove(v, v->getPrev())) || + (isBelow(v, v) && isBelow(v, v->getPrev()))) return 1; else return 0; Modified: trunk/reactos/dll/win32/ws2_32_new/src/select.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/s… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/select.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/select.c [iso-8859-1] Sun Aug 30 17:53:16 2009 @@ -51,6 +51,12 @@ BOOL Found = FALSE; SOCKET Handle; DPRINT("select: %lx %p %p %p %p\n", s, readfds, writefds, exceptfds, timeout); + +#if defined(__GNUC__) && \ + (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__ == 40400) + /* Silence incorrect GCC 4.4.0 warning */ + Handle = 0; +#endif /* Check for WSAStartup */ if ((ErrorCode = WsQuickProlog()) == ERROR_SUCCESS) Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/unregister.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/unregister.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/unregister.c [iso-8859-1] Sun Aug 30 17:53:16 2009 @@ -79,6 +79,12 @@ NTSTATUS Status; ASSERT_IRQL_EQUAL(PASSIVE_LEVEL); + +#if defined(__GNUC__) && \ + (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__ == 40400) + /* Silence incorrect GCC 4.4.0 warning */ + SubDeviceEntry = NULL; +#endif DeviceExtension = (PPCLASS_DEVICE_EXTENSION)DeviceObject->DeviceExtension; ASSERT(DeviceExtension); Modified: trunk/reactos/drivers/wdm/audio/drivers/mpu401/adapter.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/drivers/mpu401/adapter.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/drivers/mpu401/adapter.cpp [iso-8859-1] Sun Aug 30 17:53:16 2009 @@ -17,6 +17,8 @@ #include <ntddk.h> #include <portcls.h> #include <debug.h> + +WCHAR DeviceName[] = L"Uart"; NTSTATUS NTAPI @@ -68,7 +70,7 @@ } DPRINT1("Registering subdevice via PcRegisterSubdevice\n"); - Status = PcRegisterSubdevice(pDeviceObject, L"Uart", port); + Status = PcRegisterSubdevice(pDeviceObject, DeviceName, port); if (!NT_SUCCESS(Status)) {

1 0

[sginsberg] 42969: - Make ddraw test compile warning free under gcc 4.4.0
by sginsberg＠svn.reactos.org 30 Aug '09

30 Aug '09

Author: sginsberg Date: Sun Aug 30 17:36:37 2009 New Revision: 42969 URL: http://svn.reactos.org/svn/reactos?rev=42969&view=rev Log: - Make ddraw test compile warning free under gcc 4.4.0 Modified: trunk/rostests/dxtest/ddraw/debug.cpp Modified: trunk/rostests/dxtest/ddraw/debug.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/ddraw/debug.cpp?re… ============================================================================== --- trunk/rostests/dxtest/ddraw/debug.cpp [iso-8859-1] (original) +++ trunk/rostests/dxtest/ddraw/debug.cpp [iso-8859-1] Sun Aug 30 17:36:37 2009 @@ -1,7 +1,7 @@ #define GetCode(X) printf("%s\n", DDErrorString(X)); -const PCHAR DDErrorString (HRESULT hResult) +const CHAR* DDErrorString (HRESULT hResult) { switch (hResult) {

1 0

[sginsberg] 42968: - Fix gdb2 and regexpl warnings under gcc 4.4.0
by sginsberg＠svn.reactos.org 30 Aug '09

30 Aug '09

Author: sginsberg Date: Sun Aug 30 17:35:14 2009 New Revision: 42968 URL: http://svn.reactos.org/svn/reactos?rev=42968&view=rev Log: - Fix gdb2 and regexpl warnings under gcc 4.4.0 Modified: trunk/rosapps/applications/devutils/gdb2/gdb2.cpp trunk/rosapps/applications/sysutils/regexpl/Console.cpp trunk/rosapps/applications/sysutils/regexpl/Console.h trunk/rosapps/applications/sysutils/regexpl/RegistryKey.cpp trunk/rosapps/applications/sysutils/regexpl/RegistryTree.cpp trunk/rosapps/applications/sysutils/regexpl/ShellCommandDeleteValue.cpp trunk/rosapps/applications/sysutils/regexpl/ShellCommandSetValue.cpp trunk/rosapps/applications/sysutils/regexpl/ShellCommandValue.cpp Modified: trunk/rosapps/applications/devutils/gdb2/gdb2.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/gdb2… ============================================================================== --- trunk/rosapps/applications/devutils/gdb2/gdb2.cpp [iso-8859-1] (original) +++ trunk/rosapps/applications/devutils/gdb2/gdb2.cpp [iso-8859-1] Sun Aug 30 17:35:14 2009 @@ -177,6 +177,7 @@ { PROCESS_INFORMATION pi; STARTUPINFO si; + static CHAR Title[] = "debugged program console"; // Set up the start up info struct. ZeroMemory(&si,sizeof(STARTUPINFO)); @@ -185,7 +186,7 @@ si.hStdOutput = hChildStdOut; si.hStdInput = hChildStdIn; si.hStdError = hChildStdErr; - si.lpTitle = "debugged program console"; + si.lpTitle = Title; // Use this if you want to hide the child: // si.wShowWindow = SW_HIDE; // Note that dwFlags must include STARTF_USESHOWWINDOW if you want to Modified: trunk/rosapps/applications/sysutils/regexpl/Console.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/rege… ============================================================================== --- trunk/rosapps/applications/sysutils/regexpl/Console.cpp [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/regexpl/Console.cpp [iso-8859-1] Sun Aug 30 17:35:14 2009 @@ -220,7 +220,7 @@ return TAB_WIDTH; } -BOOL CConsole::SetTitle(TCHAR *p) +BOOL CConsole::SetTitle(const TCHAR *p) { return SetConsoleTitle(p); } @@ -640,7 +640,7 @@ m_pchBuffer[dwLastCharOffset] = 0; // terminate string in buffer ret = Write(m_pchBuffer); m_History.AddHistoryLine(m_pchBuffer); - TCHAR *strLF = _T("\n"); + static TCHAR strLF[] = _T("\n"); ret = Write(strLF); break; } @@ -1008,7 +1008,7 @@ m_Lines = 0; } -BOOL CConsole::WriteString(TCHAR *pchString, COORD Position) +BOOL CConsole::WriteString(const TCHAR *pchString, COORD Position) { CHAR_INFO ciBuffer[256]; int nSize = _tcslen(pchString); Modified: trunk/rosapps/applications/sysutils/regexpl/Console.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/rege… ============================================================================== --- trunk/rosapps/applications/sysutils/regexpl/Console.h [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/regexpl/Console.h [iso-8859-1] Sun Aug 30 17:35:14 2009 @@ -25,7 +25,7 @@ // BOOL SetInputMode(DWORD dwMode); BOOL SetTextAttribute(WORD wAttributes); BOOL GetTextAttribute(WORD& rwAttributes); - BOOL SetTitle(TCHAR *p); + BOOL SetTitle(const TCHAR *p); BOOL Write(const TCHAR *p, DWORD dwChars = 0); CConsole(); virtual ~CConsole(); @@ -38,7 +38,7 @@ COORD m_BufferSize; WORD m_wAttributes; SHORT m_Lines; - BOOL WriteString(TCHAR *pchString, COORD Position); + BOOL WriteString(const TCHAR *pchString, COORD Position); BOOL WriteChar(TCHAR ch); BOOL m_blnInsetMode; // TRUE - insert, FALSE - overwrite DWORD m_dwInsertModeCursorHeight; Modified: trunk/rosapps/applications/sysutils/regexpl/RegistryKey.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/rege… ============================================================================== --- trunk/rosapps/applications/sysutils/regexpl/RegistryKey.cpp [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/regexpl/RegistryKey.cpp [iso-8859-1] Sun Aug 30 17:35:14 2009 @@ -27,7 +27,7 @@ #include "ph.h" #include "RegistryKey.h" -static TCHAR *g_ppszHiveNames[] = +static const TCHAR *g_ppszHiveNames[] = { _T("HKEY_CLASSES_ROOT"), _T("HKEY_CURRENT_USER"), Modified: trunk/rosapps/applications/sysutils/regexpl/RegistryTree.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/rege… ============================================================================== --- trunk/rosapps/applications/sysutils/regexpl/RegistryTree.cpp [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/regexpl/RegistryTree.cpp [iso-8859-1] Sun Aug 30 17:35:14 2009 @@ -95,7 +95,7 @@ GotoRoot(); // This is full absolute path. // split path to key names. - TCHAR *pszSeps = _T("\\"); + const TCHAR *pszSeps = _T("\\"); // Make buffer and copy relative path into it. TCHAR *pszBuffer = new TCHAR[_tcslen(pszRelativePath)+1]; @@ -124,7 +124,7 @@ } } - TCHAR *pszNewKey = _tcstok(pszBuffer,pszSeps); + const TCHAR *pszNewKey = _tcstok(pszBuffer,pszSeps); if ((!pszNewKey)&&((*pszRelativePath != _T('\\'))||(*(pszRelativePath+1) != 0))) { Modified: trunk/rosapps/applications/sysutils/regexpl/ShellCommandDeleteValue.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/rege… ============================================================================== --- trunk/rosapps/applications/sysutils/regexpl/ShellCommandDeleteValue.cpp [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/regexpl/ShellCommandDeleteValue.cpp [iso-8859-1] Sun Aug 30 17:35:14 2009 @@ -93,6 +93,7 @@ CRegistryKey Key; TCHAR *pszValueNamePattern; + const TCHAR *pszEmpty = _T(""); const TCHAR *pszPath; if (blnHelp) @@ -115,7 +116,7 @@ } else { - pszValueNamePattern = _T(""); + pszValueNamePattern = (TCHAR*)pszEmpty; pszPath = _T("."); } Modified: trunk/rosapps/applications/sysutils/regexpl/ShellCommandSetValue.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/rege… ============================================================================== --- trunk/rosapps/applications/sysutils/regexpl/ShellCommandSetValue.cpp [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/regexpl/ShellCommandSetValue.cpp [iso-8859-1] Sun Aug 30 17:35:14 2009 @@ -209,6 +209,7 @@ CRegistryKey Key; TCHAR *pszValueName; + const TCHAR *pszEmpty = _T(""); const TCHAR *pszPath; if (blnHelp) @@ -241,7 +242,7 @@ } else { - pszValueName = _T(""); + pszValueName = (TCHAR*)pszEmpty; pszPath = _T("."); } Modified: trunk/rosapps/applications/sysutils/regexpl/ShellCommandValue.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/rege… ============================================================================== --- trunk/rosapps/applications/sysutils/regexpl/ShellCommandValue.cpp [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/regexpl/ShellCommandValue.cpp [iso-8859-1] Sun Aug 30 17:35:14 2009 @@ -122,6 +122,7 @@ CRegistryKey Key; TCHAR *pchValueName; + const TCHAR *pszEmpty = _T(""); const TCHAR *pszPath; if (blnHelp) @@ -154,7 +155,7 @@ } else { - pchValueName = _T(""); + pchValueName = (TCHAR*)pszEmpty; pszPath = _T("."); }

1 0

[dreimer] 42967: OK, I give up. Pigglesworth, HAALP. What do I do wrong??!
by dreimer＠svn.reactos.org 30 Aug '09

30 Aug '09

Author: dreimer Date: Sun Aug 30 13:35:28 2009 New Revision: 42967 URL: http://svn.reactos.org/svn/reactos?rev=42967&view=rev Log: OK, I give up. Pigglesworth, HAALP. What do I do wrong??! Modified: trunk/reactos/dll/directx/wine/d3d8/cubetexture.c trunk/reactos/dll/directx/wine/d3d8/d3d8_main.c trunk/reactos/dll/directx/wine/d3d8/d3d8_private.h trunk/reactos/dll/directx/wine/d3d8/device.c trunk/reactos/dll/directx/wine/d3d8/directx.c trunk/reactos/dll/directx/wine/d3d8/indexbuffer.c trunk/reactos/dll/directx/wine/d3d8/pixelshader.c trunk/reactos/dll/directx/wine/d3d8/stateblock.c trunk/reactos/dll/directx/wine/d3d8/surface.c trunk/reactos/dll/directx/wine/d3d8/swapchain.c trunk/reactos/dll/directx/wine/d3d8/texture.c trunk/reactos/dll/directx/wine/d3d8/vertexbuffer.c trunk/reactos/dll/directx/wine/d3d8/vertexdeclaration.c trunk/reactos/dll/directx/wine/d3d8/vertexshader.c trunk/reactos/dll/directx/wine/d3d8/volume.c trunk/reactos/dll/directx/wine/d3d8/volumetexture.c trunk/reactos/dll/directx/wine/d3d9/cubetexture.c trunk/reactos/dll/directx/wine/d3d9/d3d9_main.c trunk/reactos/dll/directx/wine/d3d9/d3d9_private.h trunk/reactos/dll/directx/wine/d3d9/device.c trunk/reactos/dll/directx/wine/d3d9/directx.c trunk/reactos/dll/directx/wine/d3d9/indexbuffer.c trunk/reactos/dll/directx/wine/d3d9/pixelshader.c trunk/reactos/dll/directx/wine/d3d9/query.c trunk/reactos/dll/directx/wine/d3d9/stateblock.c trunk/reactos/dll/directx/wine/d3d9/surface.c trunk/reactos/dll/directx/wine/d3d9/swapchain.c trunk/reactos/dll/directx/wine/d3d9/texture.c trunk/reactos/dll/directx/wine/d3d9/vertexbuffer.c trunk/reactos/dll/directx/wine/d3d9/vertexdeclaration.c trunk/reactos/dll/directx/wine/d3d9/vertexshader.c trunk/reactos/dll/directx/wine/d3d9/volume.c trunk/reactos/dll/directx/wine/d3d9/volumetexture.c trunk/reactos/dll/directx/wine/wined3d/arb_program_shader.c trunk/reactos/dll/directx/wine/wined3d/ati_fragment_shader.c trunk/reactos/dll/directx/wine/wined3d/baseshader.c trunk/reactos/dll/directx/wine/wined3d/basetexture.c trunk/reactos/dll/directx/wine/wined3d/buffer.c trunk/reactos/dll/directx/wine/wined3d/context.c trunk/reactos/dll/directx/wine/wined3d/cubetexture.c trunk/reactos/dll/directx/wine/wined3d/device.c trunk/reactos/dll/directx/wine/wined3d/directx.c trunk/reactos/dll/directx/wine/wined3d/drawprim.c trunk/reactos/dll/directx/wine/wined3d/gl_compat.c trunk/reactos/dll/directx/wine/wined3d/glsl_shader.c trunk/reactos/dll/directx/wine/wined3d/nvidia_texture_shader.c trunk/reactos/dll/directx/wine/wined3d/palette.c trunk/reactos/dll/directx/wine/wined3d/pixelshader.c trunk/reactos/dll/directx/wine/wined3d/query.c trunk/reactos/dll/directx/wine/wined3d/resource.c trunk/reactos/dll/directx/wine/wined3d/shader_sm1.c trunk/reactos/dll/directx/wine/wined3d/shader_sm4.c trunk/reactos/dll/directx/wine/wined3d/state.c trunk/reactos/dll/directx/wine/wined3d/stateblock.c trunk/reactos/dll/directx/wine/wined3d/surface.c trunk/reactos/dll/directx/wine/wined3d/surface_base.c trunk/reactos/dll/directx/wine/wined3d/surface_gdi.c trunk/reactos/dll/directx/wine/wined3d/swapchain.c trunk/reactos/dll/directx/wine/wined3d/texture.c trunk/reactos/dll/directx/wine/wined3d/utils.c trunk/reactos/dll/directx/wine/wined3d/vertexshader.c trunk/reactos/dll/directx/wine/wined3d/volume.c trunk/reactos/dll/directx/wine/wined3d/volumetexture.c trunk/reactos/dll/directx/wine/wined3d/wined3d.spec trunk/reactos/dll/directx/wine/wined3d/wined3d_gl.h trunk/reactos/dll/directx/wine/wined3d/wined3d_main.c trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h trunk/reactos/include/reactos/wine/wined3d.idl [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/directx/wine/d3d8/cubetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/cube… Modified: trunk/reactos/dll/directx/wine/d3d8/d3d8_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/d3d8… Modified: trunk/reactos/dll/directx/wine/d3d8/d3d8_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/d3d8… Modified: trunk/reactos/dll/directx/wine/d3d8/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/devi… Modified: trunk/reactos/dll/directx/wine/d3d8/directx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/dire… Modified: trunk/reactos/dll/directx/wine/d3d8/indexbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/inde… Modified: trunk/reactos/dll/directx/wine/d3d8/pixelshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/pixe… Modified: trunk/reactos/dll/directx/wine/d3d8/stateblock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/stat… Modified: trunk/reactos/dll/directx/wine/d3d8/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/surf… Modified: trunk/reactos/dll/directx/wine/d3d8/swapchain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/swap… Modified: trunk/reactos/dll/directx/wine/d3d8/texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/text… Modified: trunk/reactos/dll/directx/wine/d3d8/vertexbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/vert… Modified: trunk/reactos/dll/directx/wine/d3d8/vertexdeclaration.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/vert… Modified: trunk/reactos/dll/directx/wine/d3d8/vertexshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/vert… Modified: trunk/reactos/dll/directx/wine/d3d8/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/volu… Modified: trunk/reactos/dll/directx/wine/d3d8/volumetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/volu… Modified: trunk/reactos/dll/directx/wine/d3d9/cubetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/cube… Modified: trunk/reactos/dll/directx/wine/d3d9/d3d9_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/d3d9… Modified: trunk/reactos/dll/directx/wine/d3d9/d3d9_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/d3d9… Modified: trunk/reactos/dll/directx/wine/d3d9/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/devi… Modified: trunk/reactos/dll/directx/wine/d3d9/directx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/dire… Modified: trunk/reactos/dll/directx/wine/d3d9/indexbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/inde… Modified: trunk/reactos/dll/directx/wine/d3d9/pixelshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/pixe… Modified: trunk/reactos/dll/directx/wine/d3d9/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/quer… Modified: trunk/reactos/dll/directx/wine/d3d9/stateblock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/stat… Modified: trunk/reactos/dll/directx/wine/d3d9/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/surf… Modified: trunk/reactos/dll/directx/wine/d3d9/swapchain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/swap… Modified: trunk/reactos/dll/directx/wine/d3d9/texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/text… Modified: trunk/reactos/dll/directx/wine/d3d9/vertexbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/vert… Modified: trunk/reactos/dll/directx/wine/d3d9/vertexdeclaration.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/vert… Modified: trunk/reactos/dll/directx/wine/d3d9/vertexshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/vert… Modified: trunk/reactos/dll/directx/wine/d3d9/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/volu… Modified: trunk/reactos/dll/directx/wine/d3d9/volumetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/volu… Modified: trunk/reactos/dll/directx/wine/wined3d/arb_program_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/a… Modified: trunk/reactos/dll/directx/wine/wined3d/ati_fragment_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/a… Modified: trunk/reactos/dll/directx/wine/wined3d/baseshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/b… Modified: trunk/reactos/dll/directx/wine/wined3d/basetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/b… Modified: trunk/reactos/dll/directx/wine/wined3d/buffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/b… Modified: trunk/reactos/dll/directx/wine/wined3d/context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/c… Modified: trunk/reactos/dll/directx/wine/wined3d/cubetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/c… Modified: trunk/reactos/dll/directx/wine/wined3d/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… Modified: trunk/reactos/dll/directx/wine/wined3d/directx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… Modified: trunk/reactos/dll/directx/wine/wined3d/drawprim.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… Modified: trunk/reactos/dll/directx/wine/wined3d/gl_compat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/g… Modified: trunk/reactos/dll/directx/wine/wined3d/glsl_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/g… Modified: trunk/reactos/dll/directx/wine/wined3d/nvidia_texture_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/n… Modified: trunk/reactos/dll/directx/wine/wined3d/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/p… Modified: trunk/reactos/dll/directx/wine/wined3d/pixelshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/p… Modified: trunk/reactos/dll/directx/wine/wined3d/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/q… Modified: trunk/reactos/dll/directx/wine/wined3d/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/r… Modified: trunk/reactos/dll/directx/wine/wined3d/shader_sm1.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/shader_sm4.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/state.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/stateblock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/surface_base.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/surface_gdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/swapchain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/t… Modified: trunk/reactos/dll/directx/wine/wined3d/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/u… Modified: trunk/reactos/dll/directx/wine/wined3d/vertexshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… Modified: trunk/reactos/dll/directx/wine/wined3d/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… Modified: trunk/reactos/dll/directx/wine/wined3d/volumetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_gl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/include/reactos/wine/wined3d.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/wined…

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2009