Ros-diffs

ros-diffs@reactos.org

81390 discussions

[chorns] 16856: Display implemented/unimplemented icon for functions
by chorns＠svn.reactos.com 29 Jul '05

29 Jul '05

Display implemented/unimplemented icon for functions Modified: trunk/cis/ReactOS.ApiStatus/rapistatus.xsl _____ Modified: trunk/cis/ReactOS.ApiStatus/rapistatus.xsl --- trunk/cis/ReactOS.ApiStatus/rapistatus.xsl 2005-07-29 11:40:01 UTC (rev 16855) +++ trunk/cis/ReactOS.ApiStatus/rapistatus.xsl 2005-07-29 12:19:26 UTC (rev 16856) @@ -116,17 +116,17 @@ </xsl:attribute> <xsl:call-template name="toggle"/> <xsl:choose> - <xsl:when test="./node() and local-name() != 'component' and @i = 'true'"> - <img src="i.gif" class="i"/> + <xsl:when test="local-name() != 'component' and @i = 'true'"> + <img src="i.gif" class="i"/> </xsl:when> - <xsl:when test="./node() and local-name() != 'component' and @i = 'false'"> - <img src="u.gif" class="u"/> + <xsl:when test="local-name() != 'component' and @i = 'false'"> + <img src="u.gif" class="u"/> </xsl:when> - <xsl:when test="./node() and local-name() = 'component' and @complete >= 100"> - <img src="sc.gif"/> + <xsl:when test="local-name() = 'component' and @complete >= 100"> + <img src="sc.gif"/> </xsl:when> <xsl:otherwise> - <img src="tb.gif" with="12" height="12"/> + <xsl:value-of select="@i"/><img src="tb.gif" with="12" height="12"/> </xsl:otherwise> </xsl:choose> <xsl:choose>

1 0

[chorns] 16855: Browser XSLT support. Optimize for size.
by chorns＠svn.reactos.com 29 Jul '05

29 Jul '05

Browser XSLT support. Optimize for size. Modified: trunk/cis/ReactOS.ApiStatus/Default.build Modified: trunk/cis/ReactOS.ApiStatus/rapistatus.xsl Modified: trunk/reactos/tools/rgenstat/rgenstat.c Added: trunk/reactos/tools/rgenstat/web/index.html _____ Modified: trunk/cis/ReactOS.ApiStatus/Default.build --- trunk/cis/ReactOS.ApiStatus/Default.build 2005-07-29 10:04:38 UTC (rev 16854) +++ trunk/cis/ReactOS.ApiStatus/Default.build 2005-07-29 11:40:01 UTC (rev 16855) @@ -21,7 +21,7 @@ <property name="reactos.dir" value="reactos" /> <property name="apistatus.xsl" value="rapistatus.xsl" /> <property name="apistatus.xml" value="rapistatus.xml" /> - <property name="apistatus.html" value="index.html" /> + <property name="apistatus.html" value="index2.html" /> <include buildfile="config.include" /> <target name="publish"> _____ Modified: trunk/cis/ReactOS.ApiStatus/rapistatus.xsl --- trunk/cis/ReactOS.ApiStatus/rapistatus.xsl 2005-07-29 10:04:38 UTC (rev 16854) +++ trunk/cis/ReactOS.ApiStatus/rapistatus.xsl 2005-07-29 11:40:01 UTC (rev 16855) @@ -76,22 +76,28 @@ <xsl:call-template name="ELEMENT"> <xsl:with-param name="class">c</xsl:with-param> </xsl:call-template> - <xsl:apply-templates/> + <xsl:apply-templates> + <xsl:with-param name="base"><xsl:value-of select="@base"/></xsl:with-param> + </xsl:apply-templates> </DIV> </xsl:template>  <xsl:template match="functions"> - <xsl:apply-templates select="function"> - <xsl:sort select="@name"/> + <xsl:param name="base"/> + <xsl:apply-templates select="f"> + <xsl:sort select="@n"/> + <xsl:with-param name="base"><xsl:value-of select="$base"/></xsl:with-param> </xsl:apply-templates> </xsl:template> - <xsl:template match="functions/function"> + <xsl:template match="functions/f"> + <xsl:param name="base"/> <DIV> <xsl:call-template name="ELEMENT"> <xsl:with-param name="class">f</xsl:with-param> + <xsl:with-param name="base"><xsl:value-of select="$base"/></xsl:with-param> </xsl:call-template> <xsl:apply-templates/> </DIV> @@ -102,6 +108,7 @@ <xsl:template name="ELEMENT"> <xsl:param name="class"/> + <xsl:param name="base"/> <xsl:param name="image"/> <xsl:attribute name="class"> <xsl:value-of select="$class"/> @@ -109,10 +116,10 @@ </xsl:attribute> <xsl:call-template name="toggle"/> <xsl:choose> - <xsl:when test="./node() and local-name() != 'component' and @implemented = 'true'"> + <xsl:when test="./node() and local-name() != 'component' and @i = 'true'"> <img src="i.gif" class="i"/> </xsl:when> - <xsl:when test="./node() and local-name() != 'component' and @implemented = 'false'"> + <xsl:when test="./node() and local-name() != 'component' and @i = 'false'"> <img src="u.gif" class="u"/> </xsl:when> <xsl:when test="./node() and local-name() = 'component' and @complete >= 100"> @@ -131,7 +138,10 @@ </xsl:otherwise> </xsl:choose> <xsl:call-template name="name"/> - <xsl:call-template name="file"/> + <xsl:call-template name="n"/> + <xsl:call-template name="file"> + <xsl:with-param name="base"><xsl:value-of select="$base"/></xsl:with-param> + </xsl:call-template> <xsl:call-template name="status"/> </xsl:template> @@ -173,9 +183,16 @@ </xsl:if> </xsl:template> + <xsl:template name="n"> + <xsl:if test="@n"> + <SPAN class="l"><xsl:value-of select="@n"/></SPAN> + </xsl:if> + </xsl:template> + <xsl:template name="file"> - <xsl:if test="@file"> - <SPAN class="h"><xsl:value-of select="@file"/></SPAN> + <xsl:param name="base"/> + <xsl:if test="@f"> + <SPAN class="h"><xsl:value-of select="$base"/><xsl:value-of select="@f"/></SPAN> </xsl:if> </xsl:template> _____ Modified: trunk/reactos/tools/rgenstat/rgenstat.c --- trunk/reactos/tools/rgenstat/rgenstat.c 2005-07-29 10:04:38 UTC (rev 16854) +++ trunk/reactos/tools/rgenstat/rgenstat.c 2005-07-29 11:40:01 UTC (rev 16855) @@ -398,7 +398,7 @@ return 0; } -// Build a path and filename so it is of the format [cvs-module][directory][filename]. +// Build a path and filename so it is of the format [module][directory][filename]. // Also convert all backslashes into forward slashes. static void get_filename(char *cvspath, char *filename, char *result) @@ -659,10 +659,19 @@ return strcmp(p->name, q->name); } +char * +get_filename_without_base(char *component_base, + char *filename) +{ + return &filename[strlen(component_base)]; +} + static void -generate_xml_for_component(char *component_name) +generate_xml_for_component(char *component_name, + char *component_base) { PAPI_INFO api_info; + char canonical_base[MAX_PATH]; char buf[200]; int complete; int implemented_total; @@ -678,28 +687,23 @@ while (api_info != NULL) { if (api_info->tag_id == TAG_IMPLEMENTED) - { implemented_total ++; - } else if (api_info->tag_id == TAG_UNIMPLEMENTED) - { unimplemented_total ++; - } api_info = api_info->next; } if (implemented_total + unimplemented_total > 0) - { complete = ((implemented_total) * 100) / (implemented_total + unimplemented_total); - } else - { complete = 100; - } - sprintf(buf, "<component name=\"%s\" complete=\"%d\" implemented_total=\"%d\" unimplemented_total=\"%d\">", - component_name, complete, implemented_total, unimplemented_total); + strcpy(canonical_base, component_base); + path_to_url(canonical_base); + + sprintf(buf, "<component name=\"%s\" base=\"%s\" complete=\"%d\" implemented_total=\"%d\" unimplemented_total=\"%d\">", + component_name, canonical_base, complete, implemented_total, unimplemented_total); write_line(buf); if (api_info_list != NULL) @@ -709,12 +713,12 @@ api_info = api_info_list; while (api_info != NULL) { - sprintf(buf, "<function name=\"%s\" implemented=\"%s\" file=\"%s\">", + sprintf(buf, "<f n=\"%s\" i=\"%s\" f=\"%s\" />", api_info->name, api_info->tag_id == TAG_IMPLEMENTED ? "true" : "false", - api_info->filename); + get_filename_without_base(component_base, + api_info->filename)); write_line(buf); - write_line("</function>"); api_info = api_info->next; } @@ -783,38 +787,26 @@ /* Skip whitespace and eol characters */ while ((index < size) && (is_whitespace(buffer[index]) || (is_eol_char(buffer[index])))) - { index++; - } if ((file_pointer < size) && (buffer[index] == '\n')) - { index++; - } if (buffer[index] == ';') { /* Skip comments */ while ((index < size) && (!is_eol_char(buffer[index]))) - { index++; - } if ((index < size) && (buffer[index] == '\n')) - { index++; - } continue; } /* Get component name */ start = index; while ((index < size) && (!is_whitespace(buffer[index]))) - { index++; - } if (index >= size) - { break; - } len = index - start; strncpy(component_name, &buffer[start], len); @@ -822,20 +814,14 @@ /* Skip whitespace */ while ((index < size) && (is_whitespace(buffer[index]))) - { index++; - } if (index >= size) - { break; - } /* Get component path */ start = index; while ((index < size) && (!is_whitespace(buffer[index]) && !is_eol_char(buffer[index]))) - { index++; - } len = index - start; strncpy(component_path, &buffer[start], len); @@ -851,20 +837,17 @@ /* Skip to end of line */ while ((index < size) && (!is_eol_char(buffer[index]))) - { index++; - } if ((index < size) && (buffer[index] == '\n')) - { index++; - } canonical_path = convert_path(component_path); if (canonical_path != NULL) { process_directory(canonical_path, canonical_path); free(canonical_path); - generate_xml_for_component(component_name); + generate_xml_for_component(component_name, + component_path); } } _____ Added: trunk/reactos/tools/rgenstat/web/index.html --- trunk/reactos/tools/rgenstat/web/index.html 2005-07-29 10:04:38 UTC (rev 16854) +++ trunk/reactos/tools/rgenstat/web/index.html 2005-07-29 11:40:01 UTC (rev 16855) @@ -0,0 +1,14 @@ +<html> +<body> +If your browser do not support XSLT click <a href="index2.html">here</a>. +<script type="text/javascript"> + var xml = new ActiveXObject("Microsoft.XMLDOM") + xml.async = false + xml.load("rapistatus.xml") + var xsl = new ActiveXObject("Microsoft.XMLDOM") + xsl.async = false + xsl.load("rapistatus.xsl") + document.write(xml.transformNode(xsl)) +</script> +</body> +</html> Property changes on: trunk/reactos/tools/rgenstat/web/index.html ___________________________________________________________________ Name: svn:eol-style + native

1 0

[ea] 16854: Various fixex to make HEAD compile.
by ea＠svn.reactos.com 29 Jul '05

29 Jul '05

Various fixex to make HEAD compile. I hope I did break nothing. Modified: trunk/reactos/hal/halx86/generic/processor.c Modified: trunk/reactos/lib/advapi32/sec/trustee.c Modified: trunk/reactos/lib/advapi32/service/scm.c Modified: trunk/reactos/subsys/csrss/win32csr/desktopbg.c Modified: trunk/reactos/subsys/ntvdm/ntvdm.c Modified: trunk/reactos/subsys/smss/client.c Modified: trunk/reactos/subsys/system/setup/setup.c Modified: trunk/reactos/subsys/system/winlogon/setup.c Modified: trunk/reactos/subsys/win32k/ntuser/keyboard.c _____ Modified: trunk/reactos/hal/halx86/generic/processor.c --- trunk/reactos/hal/halx86/generic/processor.c 2005-07-29 09:51:08 UTC (rev 16853) +++ trunk/reactos/hal/halx86/generic/processor.c 2005-07-29 10:04:38 UTC (rev 16854) @@ -39,7 +39,9 @@ HalStartNextProcessor(ULONG Unknown1, ULONG ProcessorStack) { +#if 0 DPRINT("HalStartNextProcessor(%x %x)\n", ProcessorNumber, ProcessorStack); +#endif return TRUE; } _____ Modified: trunk/reactos/lib/advapi32/sec/trustee.c --- trunk/reactos/lib/advapi32/sec/trustee.c 2005-07-29 09:51:08 UTC (rev 16853) +++ trunk/reactos/lib/advapi32/sec/trustee.c 2005-07-29 10:04:38 UTC (rev 16854) @@ -198,8 +198,10 @@ SE_OBJECT_TYPE ObjectType, LPSTR ObjectTypeName, LPSTR InheritedObjectTypeName, LPSTR Name) { +#if 0 DPRINT("%p %p 0x%08x %p %p %s\n", pTrustee, pObjName, ObjectType, ObjectTypeName, InheritedObjectTypeName, debugstr_a(Name)); +#endif pTrustee->pMultipleTrustee = NULL; pTrustee->MultipleTrusteeOperation = NO_MULTIPLE_TRUSTEE; @@ -217,8 +219,10 @@ SE_OBJECT_TYPE ObjectType, LPWSTR ObjectTypeName, LPWSTR InheritedObjectTypeName, LPWSTR Name) { +#if 0 DPRINT("%p %p 0x%08x %p %p %s\n", pTrustee, pObjName, ObjectType, ObjectTypeName, InheritedObjectTypeName, debugstr_w(Name)); +#endif pTrustee->pMultipleTrustee = NULL; pTrustee->MultipleTrusteeOperation = NO_MULTIPLE_TRUSTEE; _____ Modified: trunk/reactos/lib/advapi32/service/scm.c --- trunk/reactos/lib/advapi32/service/scm.c 2005-07-29 09:51:08 UTC (rev 16853) +++ trunk/reactos/lib/advapi32/service/scm.c 2005-07-29 10:04:38 UTC (rev 16854) @@ -928,7 +928,9 @@ { DWORD dwError; +#if 0 DPRINT("UnlockServiceDatabase(%x)\n", hSCManager); +#endif HandleBind(); _____ Modified: trunk/reactos/subsys/csrss/win32csr/desktopbg.c --- trunk/reactos/subsys/csrss/win32csr/desktopbg.c 2005-07-29 09:51:08 UTC (rev 16853) +++ trunk/reactos/subsys/csrss/win32csr/desktopbg.c 2005-07-29 10:04:38 UTC (rev 16854) @@ -108,7 +108,7 @@ } default: - DPRINT("Unknown notification code 0x%x sent to the desktop window!\n", nmh->code); + DPRINT("Unknown notification code 0x%x sent to the desktop window!\n", nmh->hdr.code); return 0; } } _____ Modified: trunk/reactos/subsys/ntvdm/ntvdm.c --- trunk/reactos/subsys/ntvdm/ntvdm.c 2005-07-29 09:51:08 UTC (rev 16853) +++ trunk/reactos/subsys/ntvdm/ntvdm.c 2005-07-29 10:04:38 UTC (rev 16854) @@ -16,6 +16,9 @@ #include <wchar.h> #include "resource.h" +#define NTOS_MODE_USER +#include <ndk/ntndk.h> + #define NDEBUG #include <debug.h> _____ Modified: trunk/reactos/subsys/smss/client.c --- trunk/reactos/subsys/smss/client.c 2005-07-29 09:51:08 UTC (rev 16853) +++ trunk/reactos/subsys/smss/client.c 2005-07-29 10:04:38 UTC (rev 16854) @@ -62,6 +62,7 @@ VOID FASTCALL SmpSetClientInitialized (PSM_CLIENT_DATA Client) { + DPRINT("SM: %s(%08lx) called\n", __FUNCTION__, Client); Client->Flags |= SM_CLIENT_FLAG_INITIALIZED; } /********************************************************************** @@ -101,8 +102,10 @@ Client = SmpClientDirectory.Client; while (NULL != Client) { + DPRINT("SM: %s: Client==%08lx\n", __FUNCTION__, Client); if (SubsystemId == Client->SubsystemId) { + DPRINT("SM: %s: FOUND Client==%08lx\n", __FUNCTION__, Client); break; } if(NULL != Parent) _____ Modified: trunk/reactos/subsys/system/setup/setup.c --- trunk/reactos/subsys/system/setup/setup.c 2005-07-29 09:51:08 UTC (rev 16853) +++ trunk/reactos/subsys/system/setup/setup.c 2005-07-29 10:04:38 UTC (rev 16854) @@ -29,6 +29,9 @@ #include <syssetup/syssetup.h> #include <userenv.h> +#define NTOS_MODE_USER +#include <ndk/ntndk.h> + #define NDEBUG #include <debug.h> _____ Modified: trunk/reactos/subsys/system/winlogon/setup.c --- trunk/reactos/subsys/system/winlogon/setup.c 2005-07-29 09:51:08 UTC (rev 16853) +++ trunk/reactos/subsys/system/winlogon/setup.c 2005-07-29 10:04:38 UTC (rev 16854) @@ -33,6 +33,9 @@ #include "setup.h" +#define NTOS_MODE_USER +#include <ndk/ntndk.h> + #define NDEBUG #include <debug.h> _____ Modified: trunk/reactos/subsys/win32k/ntuser/keyboard.c --- trunk/reactos/subsys/win32k/ntuser/keyboard.c 2005-07-29 09:51:08 UTC (rev 16853) +++ trunk/reactos/subsys/win32k/ntuser/keyboard.c 2005-07-29 10:04:38 UTC (rev 16854) @@ -1160,8 +1160,10 @@ if(vkPtr->wch[CapsState] == wChar) { CapsMod = KeyLayout->pCharModifiers->ModNumber[CapsState]; +#if 0 DPRINT("nMod %d Vk %04x: CapsMod %08x CapsState %08x MaxModBits %08x\n", nMod, wVirtKey, CapsMod, CapsState, KeyLayout->pCharModifiers->wMaxModBits); +#endif return ((CapsMod << 8)|(vkPtr->VirtualKey & 0xff)); } }

1 0

[ea] 16853: Add PORT_MESSAGE_TYPE macro.
by ea＠svn.reactos.com 29 Jul '05

29 Jul '05

Add PORT_MESSAGE_TYPE macro. Modified: trunk/reactos/include/ndk/lpctypes.h _____ Modified: trunk/reactos/include/ndk/lpctypes.h --- trunk/reactos/include/ndk/lpctypes.h 2005-07-29 09:30:41 UTC (rev 16852) +++ trunk/reactos/include/ndk/lpctypes.h 2005-07-29 09:51:08 UTC (rev 16853) @@ -9,6 +9,8 @@ #ifndef _LPCTYPES_H #define _LPCTYPES_H +#define PORT_MESSAGE_TYPE(m) ((m).Header.MessageType) + /* DEPENDENCIES **************************************************************/ /* EXPORTED DATA *************************************************************/

1 0

[ea] 16852: Various fixes to DPRINT parameter list.
by ea＠svn.reactos.com 29 Jul '05

29 Jul '05

Various fixes to DPRINT parameter list. Some were #if0'ed because they referenced non existing variables or parameters. Modified: trunk/reactos/drivers/bus/isapnp/isapnp.c Modified: trunk/reactos/drivers/fs/np/fsctrl.c Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.c Modified: trunk/reactos/drivers/input/mouclass/mouclass.c Modified: trunk/reactos/drivers/storage/atapi/atapi.c Modified: trunk/reactos/drivers/storage/diskdump/diskdump.c Modified: trunk/reactos/drivers/storage/floppy/csqrtns.c Modified: trunk/reactos/drivers/storage/floppy/floppy.c Modified: trunk/reactos/drivers/storage/floppy/hardware.c Modified: trunk/reactos/drivers/storage/floppy/ioctl.c Modified: trunk/reactos/drivers/storage/floppy/readwrite.c _____ Modified: trunk/reactos/drivers/bus/isapnp/isapnp.c --- trunk/reactos/drivers/bus/isapnp/isapnp.c 2005-07-29 09:25:26 UTC (rev 16851) +++ trunk/reactos/drivers/bus/isapnp/isapnp.c 2005-07-29 09:30:41 UTC (rev 16852) @@ -433,10 +433,10 @@ } #endif } - +#if 0 DPRINT("Tag = 0x%X, Type = 0x%X, Size = %d (%s)\n", tag, *Type, *Size, TagName(*Type, *Small)); - +#endif /* Probably invalid data */ if ((*Type == 0xff) && (*Size == 0xffff)) { DPRINT("Invalid data (Type 0x%X Size 0x%X)\n", *Type, *Size); _____ Modified: trunk/reactos/drivers/fs/np/fsctrl.c --- trunk/reactos/drivers/fs/np/fsctrl.c 2005-07-29 09:25:26 UTC (rev 16851) +++ trunk/reactos/drivers/fs/np/fsctrl.c 2005-07-29 09:30:41 UTC (rev 16852) @@ -464,7 +464,7 @@ break; default: - DPRINT("IoControlCode: %x\n", IoStack->Parameters.FileSystemControl.FsControlCode) + DPRINT("IoControlCode: %x\n", IoStack->Parameters.FileSystemControl.FsControlCode); Status = STATUS_UNSUCCESSFUL; } _____ Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.c --- trunk/reactos/drivers/input/i8042prt/i8042prt.c 2005-07-29 09:25:26 UTC (rev 16851) +++ trunk/reactos/drivers/input/i8042prt/i8042prt.c 2005-07-29 09:30:41 UTC (rev 16852) @@ -572,7 +572,7 @@ } if (!DevExt->KeyboardExists) { - DPRINT("Keyboard not detected\n") + DPRINT("Keyboard not detected\n"); if (DevExt->Settings.Headless) /* Act as if it exists regardless */ DevExt->KeyboardExists = TRUE; _____ Modified: trunk/reactos/drivers/input/mouclass/mouclass.c --- trunk/reactos/drivers/input/mouclass/mouclass.c 2005-07-29 09:25:26 UTC (rev 16851) +++ trunk/reactos/drivers/input/mouclass/mouclass.c 2005-07-29 09:30:41 UTC (rev 16852) @@ -94,7 +94,7 @@ KeReleaseSpinLock(&ClassDeviceExtension->SpinLock, OldIrql); (*ConsumedCount) += ReadSize; } else { - DPRINT("MouseClassCallBack() entered, InputCount = %d - DOING NOTHING\n", *InputCount); + DPRINT("MouseClassCallBack() entered, InputCount = %d - DOING NOTHING\n", InputCount); } DPRINT("Leaving MouseClassCallBack\n"); _____ Modified: trunk/reactos/drivers/storage/atapi/atapi.c --- trunk/reactos/drivers/storage/atapi/atapi.c 2005-07-29 09:25:26 UTC (rev 16851) +++ trunk/reactos/drivers/storage/atapi/atapi.c 2005-07-29 09:30:41 UTC (rev 16852) @@ -2054,7 +2054,7 @@ CylinderLow[1] = 0; CylinderHigh[1] = 0; DrvHead = (Srb->TargetId ? IDE_DH_DRV1 : 0) | IDE_DH_LBA; - +#if 0 DPRINT("%s:BUS=%04x:DRV=%d:LBA48=1:BLK=%08d:SC=%02x:CM=%02x\n", (Srb->SrbFlags & SRB_FLAGS_DATA_IN) ? "READ" : "WRITE", DeviceExtension->CommandPortBase, @@ -2063,6 +2063,7 @@ (CylinderHigh[0] << 16) + (CylinderLow[0] << 8) + DectorNumberLow[0], SectorCount, Command); +#endif } else if (DeviceParams->Capabilities & IDE_DRID_LBA_SUPPORTED) { _____ Modified: trunk/reactos/drivers/storage/diskdump/diskdump.c --- trunk/reactos/drivers/storage/diskdump/diskdump.c 2005-07-29 09:25:26 UTC (rev 16851) +++ trunk/reactos/drivers/storage/diskdump/diskdump.c 2005-07-29 09:30:41 UTC (rev 16852) @@ -371,7 +371,9 @@ *FunctionNameList + 2); Hint = *(PWORD)((DWORD)DriverBase + *FunctionNameList); } +#if 0 DPRINT(" Hint:%04x Name:%s\n", Hint, pName); +#endif for (i = 0; i < (sizeof(DiskDumpExports) / sizeof(DiskDumpExports[0])); i++) { _____ Modified: trunk/reactos/drivers/storage/floppy/csqrtns.c --- trunk/reactos/drivers/storage/floppy/csqrtns.c 2005-07-29 09:25:26 UTC (rev 16851) +++ trunk/reactos/drivers/storage/floppy/csqrtns.c 2005-07-29 09:30:41 UTC (rev 16852) @@ -70,7 +70,7 @@ */ { UNREFERENCED_PARAMETER(UnusedCsq); - DPRINT(("CSQ: Removing IRP 0x%x\n", Irp)); + DPRINT("CSQ: Removing IRP 0x%x\n", Irp); RemoveEntryList(&Irp->Tail.Overlay.ListEntry); } @@ -148,7 +148,7 @@ */ { UNREFERENCED_PARAMETER(UnusedCsq); - DPRINT(("CSQ: Canceling irp 0x%x\n", Irp)); + DPRINT("CSQ: Canceling irp 0x%x\n", Irp); Irp->IoStatus.Status = STATUS_CANCELLED; Irp->IoStatus.Information = 0; IoCompleteRequest(Irp, IO_NO_INCREMENT); @@ -173,7 +173,7 @@ */ { UNREFERENCED_PARAMETER(UnusedCsq); - DPRINT(("CSQ: Inserting IRP 0x%x\n", Irp)); + DPRINT("CSQ: Inserting IRP 0x%x\n", Irp); InsertTailList(&IrpQueue, &Irp->Tail.Overlay.ListEntry); KeReleaseSemaphore(&QueueSemaphore, 0, 1, FALSE); } _____ Modified: trunk/reactos/drivers/storage/floppy/floppy.c --- trunk/reactos/drivers/storage/floppy/floppy.c 2005-07-29 09:25:26 UTC (rev 16851) +++ trunk/reactos/drivers/storage/floppy/floppy.c 2005-07-29 09:30:41 UTC (rev 16852) @@ -88,7 +88,7 @@ ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); ASSERT(ControllerInfo); - DPRINT(("floppy: MotorStopDpcFunc called\n")); + DPRINT("floppy: MotorStopDpcFunc called\n"); HwTurnOffMotor(ControllerInfo); ControllerInfo->StopDpcQueued = FALSE; @@ -115,21 +115,21 @@ PAGED_CODE(); ASSERT(DriveInfo); - DPRINT(("floppy: StartMotor called\n")); + DPRINT("floppy: StartMotor called\n"); if(DriveInfo->ControllerInfo->StopDpcQueued && !KeCancelTimer(&DriveInfo->ControllerInfo->MotorTimer)) { /* Motor turner-offer is already running; wait for it to finish */ - DPRINT(("floppy: StartMotor: motor turner-offer is already running; waiting for it\n")); + DPRINT("floppy: StartMotor: motor turner-offer is already running; waiting for it\n"); KeWaitForSingleObject(&DriveInfo->ControllerInfo->MotorStoppedEvent, Executive, KernelMode, FALSE, NULL); - DPRINT(("floppy: StartMotor: wait satisfied\n")); + DPRINT("floppy: StartMotor: wait satisfied\n"); } DriveInfo->ControllerInfo->StopDpcQueued = FALSE; if(HwTurnOnMotor(DriveInfo) != STATUS_SUCCESS) { - DPRINT(("floppy: StartMotor(): warning: HwTurnOnMotor failed\n")); + DPRINT("floppy: StartMotor(): warning: HwTurnOnMotor failed\n"); } } @@ -149,7 +149,7 @@ ASSERT(ControllerInfo); - DPRINT(("floppy: StopMotor called\n")); + DPRINT("floppy: StopMotor called\n"); /* one relative second, in 100-ns units */ StopTime.QuadPart = 10000000; @@ -202,7 +202,7 @@ { UNREFERENCED_PARAMETER(DeviceObject); - DPRINT(("floppy: CreateClose called\n")); + DPRINT("floppy: CreateClose called\n"); Irp->IoStatus.Status = STATUS_SUCCESS; Irp->IoStatus.Information = FILE_OPENED; @@ -237,10 +237,10 @@ StartMotor(DriveInfo); /* set the data rate */ - DPRINT(("floppy: FIXME: UN-HARDCODE DATA RATE\n")); + DPRINT("floppy: FIXME: UN-HARDCODE DATA RATE\n"); if(HwSetDataRate(DriveInfo->ControllerInfo, 0) != STATUS_SUCCESS) { - DPRINT(("floppy: Recalibrate: HwSetDataRate failed\n")); + DPRINT("floppy: Recalibrate: HwSetDataRate failed\n"); StopMotor(DriveInfo->ControllerInfo); return STATUS_IO_DEVICE_ERROR; } @@ -258,7 +258,7 @@ Status = HwRecalibrate(DriveInfo); if(Status != STATUS_SUCCESS) { - DPRINT(("floppy: Recalibrate: HwRecalibrate returned error\n")); + DPRINT("floppy: Recalibrate: HwRecalibrate returned error\n"); continue; } @@ -268,7 +268,7 @@ Status = HwRecalibrateResult(DriveInfo->ControllerInfo); if(Status != STATUS_SUCCESS) { - DPRINT(("floppy: Recalibrate: HwRecalibrateResult returned error\n")); + DPRINT("floppy: Recalibrate: HwRecalibrateResult returned error\n"); break; } } @@ -303,7 +303,7 @@ PAGED_CODE(); ASSERT(DriveInfo); - DPRINT(("floppy: ResetChangeFlag called\n")); + DPRINT("floppy: ResetChangeFlag called\n"); /* Try to recalibrate. We don't care if it works. */ Recalibrate(DriveInfo); @@ -317,7 +317,7 @@ /* Seek to 1 */ if(HwSeek(DriveInfo, 1) != STATUS_SUCCESS) { - DPRINT(("floppy: ResetChangeFlag(): HwSeek failed; returning STATUS_IO_DEVICE_ERROR\n")); + DPRINT("floppy: ResetChangeFlag(): HwSeek failed; returning STATUS_IO_DEVICE_ERROR\n"); StopMotor(DriveInfo->ControllerInfo); return STATUS_IO_DEVICE_ERROR; } @@ -326,7 +326,7 @@ if(HwSenseInterruptStatus(DriveInfo->ControllerInfo) != STATUS_SUCCESS) { - DPRINT(("floppy: ResetChangeFlag(): HwSenseInterruptStatus failed; bailing out\n")); + DPRINT("floppy: ResetChangeFlag(): HwSenseInterruptStatus failed; bailing out\n"); StopMotor(DriveInfo->ControllerInfo); return STATUS_IO_DEVICE_ERROR; } @@ -334,7 +334,7 @@ /* Seek back to 0 */ if(HwSeek(DriveInfo, 0) != STATUS_SUCCESS) { - DPRINT(("floppy: ResetChangeFlag(): HwSeek failed; returning STATUS_IO_DEVICE_ERROR\n")); + DPRINT("floppy: ResetChangeFlag(): HwSeek failed; returning STATUS_IO_DEVICE_ERROR\n"); StopMotor(DriveInfo->ControllerInfo); return STATUS_IO_DEVICE_ERROR; } @@ -343,7 +343,7 @@ if(HwSenseInterruptStatus(DriveInfo->ControllerInfo) != STATUS_SUCCESS) { - DPRINT(("floppy: ResetChangeFlag(): HwSenseInterruptStatus #2 failed; bailing\n")); + DPRINT("floppy: ResetChangeFlag(): HwSenseInterruptStatus #2 failed; bailing\n"); StopMotor(DriveInfo->ControllerInfo); return STATUS_IO_DEVICE_ERROR; } @@ -351,7 +351,7 @@ /* Check the change bit */ if(HwDiskChanged(DriveInfo, &DiskChanged) != STATUS_SUCCESS) { - DPRINT(("floppy: ResetChangeFlag(): HwDiskChagned failed; returning STATUS_IO_DEVICE_ERROR\n")); + DPRINT("floppy: ResetChangeFlag(): HwDiskChagned failed; returning STATUS_IO_DEVICE_ERROR\n"); StopMotor(DriveInfo->ControllerInfo); return STATUS_IO_DEVICE_ERROR; } @@ -379,7 +379,7 @@ PAGED_CODE(); UNREFERENCED_PARAMETER(DriverObject); - DPRINT(("floppy: unloading\n")); + DPRINT("floppy: unloading\n"); KeSetEvent(&QueueThreadTerminate, 0, FALSE); KeWaitForSingleObject(QueueThreadObject, Executive, KernelMode, FALSE, 0); @@ -414,7 +414,7 @@ /* Power down the controller */ if(HwPowerOff(&gControllerInfo[i]) != STATUS_SUCCESS) { - DPRINT(("floppy: unload: warning: HwPowerOff failed\n")); + DPRINT("floppy: unload: warning: HwPowerOff failed\n"); } } } @@ -483,7 +483,7 @@ UNREFERENCED_PARAMETER(PathName); - DPRINT(("floppy: ConfigCallback called with ControllerNumber %d\n", ControllerNumber)); + DPRINT("floppy: ConfigCallback called with ControllerNumber %d\n", ControllerNumber); gControllerInfo[gNumberOfControllers].ControllerNumber = ControllerNumber; gControllerInfo[gNumberOfControllers].InterfaceType = BusType; @@ -514,7 +514,7 @@ if(!HalTranslateBusAddress(BusType, BusNumber, PartialDescriptor->u.Port.Start, &AddressSpace, &TranslatedAddress)) { - DPRINT(("floppy: HalTranslateBusAddress failed; returning\n")); + DPRINT("floppy: HalTranslateBusAddress failed; returning\n"); return STATUS_IO_DEVICE_ERROR; } @@ -606,7 +606,7 @@ ASSERT(ControllerInfo); - DPRINT(("floppy: ISR called\n")); + DPRINT("floppy: ISR called\n"); /* * Due to the stupidity of the drive/controller relationship on the floppy drive, only one device object @@ -650,7 +650,7 @@ ASSERT(ControllerInfo); - DPRINT(("floppy: DpcForIsr called\n")); + DPRINT("floppy: DpcForIsr called\n"); KeSetEvent(&ControllerInfo->SynchEvent, EVENT_INCREMENT, FALSE); } @@ -674,29 +674,29 @@ PAGED_CODE(); ASSERT(ControllerInfo); - DPRINT(("floppy: InitController called with Controller 0x%x\n", ControllerInfo)); + DPRINT("floppy: InitController called with Controller 0x%x\n", ControllerInfo); KeClearEvent(&ControllerInfo->SynchEvent); - DPRINT(("floppy: InitController: resetting the controller\n")); + DPRINT("floppy: InitController: resetting the controller\n"); /* Reset the controller */ if(HwReset(ControllerInfo) != STATUS_SUCCESS) { - DPRINT(("floppy: InitController: unable to reset controller\n")); + DPRINT("floppy: InitController: unable to reset controller\n"); return STATUS_IO_DEVICE_ERROR; } - DPRINT(("floppy: InitController: setting data rate\n")); + DPRINT("floppy: InitController: setting data rate\n"); /* Set data rate */ if(HwSetDataRate(ControllerInfo, DRSR_DSEL_500KBPS) != STATUS_SUCCESS) { - DPRINT(("floppy: InitController: unable to set data rate\n")); + DPRINT("floppy: InitController: unable to set data rate\n"); return STATUS_IO_DEVICE_ERROR; } - DPRINT(("floppy: InitController: waiting for initial interrupt\n")); + DPRINT("floppy: InitController: waiting for initial interrupt\n"); /* Wait for an interrupt */ WaitForControllerInterrupt(ControllerInfo); @@ -704,16 +704,16 @@ /* Reset means you have to clear each of the four interrupts (one per drive) */ for(i = 0; i < MAX_DRIVES_PER_CONTROLLER; i++) { - DPRINT(("floppy: InitController: Sensing interrupt %d\n", i)); + DPRINT("floppy: InitController: Sensing interrupt %d\n", i); if(HwSenseInterruptStatus(ControllerInfo) != STATUS_SUCCESS) { - DPRINT(("floppy: InitController: Unable to clear interrupt 0x%x\n", i)); + DPRINT("floppy: InitController: Unable to clear interrupt 0x%x\n", i); return STATUS_IO_DEVICE_ERROR; } } - DPRINT(("floppy: InitController: done sensing interrupts\n")); + DPRINT("floppy: InitController: done sensing interrupts\n"); /* Next, see if we have the right version to do implied seek */ if(HwGetVersion(ControllerInfo) == VERSION_ENHANCED) @@ -721,12 +721,12 @@ /* If so, set that up -- all defaults below except first TRUE for EIS */ if(HwConfigure(ControllerInfo, TRUE, TRUE, FALSE, 0, 0) != STATUS_SUCCESS) { - DPRINT(("floppy: InitController: unable to set up implied seek\n")); + DPRINT("floppy: InitController: unable to set up implied seek\n"); ControllerInfo->ImpliedSeeks = FALSE; } else { - DPRINT(("floppy: InitController: implied seeks set!\n")); + DPRINT("floppy: InitController: implied seeks set!\n"); ControllerInfo->ImpliedSeeks = TRUE; } @@ -753,23 +753,23 @@ } else { - DPRINT(("floppy: InitController: enhanced version not supported; disabling implied seeks\n")); + DPRINT("floppy: InitController: enhanced version not supported; disabling implied seeks\n"); ControllerInfo->ImpliedSeeks = FALSE; ControllerInfo->Model30 = FALSE; } /* Specify */ - DPRINT(("FLOPPY: FIXME: Figure out speed\n")); + DPRINT("FLOPPY: FIXME: Figure out speed\n"); HeadLoadTime = SPECIFY_HLT_500K; HeadUnloadTime = SPECIFY_HUT_500K; StepRateTime = SPECIFY_SRT_500K; - DPRINT(("floppy: InitController: issuing specify command to controller\n")); + DPRINT("floppy: InitController: issuing specify command to controller\n"); /* Don't disable DMA --> enable dma (dumb & confusing) */ if(HwSpecify(ControllerInfo, HeadLoadTime, HeadUnloadTime, StepRateTime, FALSE) != STATUS_SUCCESS) { - DPRINT(("floppy: InitController: unable to specify options\n")); + DPRINT("floppy: InitController: unable to specify options\n"); return STATUS_IO_DEVICE_ERROR; } @@ -785,11 +785,11 @@ */ for(i = 0; i < ControllerInfo->NumberOfDrives; i++) { - DPRINT(("floppy: InitController: recalibrating drive 0x%x on controller 0x%x\n", i, ControllerInfo)); + DPRINT("floppy: InitController: recalibrating drive 0x%x on controller 0x%x\n", i, ControllerInfo); Recalibrate(&ControllerInfo->DriveInfo[i]); } - DPRINT(("floppy: InitController: done initializing; returning STATUS_SUCCESS\n")); + DPRINT("floppy: InitController: done initializing; returning STATUS_SUCCESS\n"); return STATUS_SUCCESS; } @@ -831,7 +831,7 @@ */ if(!gControllerInfo[0].Populated) { - DPRINT(("floppy: AddControllers: failed to get controller info from registry\n")); + DPRINT("floppy: AddControllers: failed to get controller info from registry\n"); return FALSE; } @@ -849,15 +849,15 @@ /* Must set up the DPC before we connect the interrupt */ KeInitializeDpc(&gControllerInfo[i].Dpc, DpcForIsr, &gControllerInfo[i]); - DPRINT(("floppy: Connecting interrupt %d to controller%d (object 0x%x)\n", gControllerInfo[i].MappedVector, - i, &gControllerInfo[i])); + DPRINT("floppy: Connecting interrupt %d to controller%d (object 0x%x)\n", gControllerInfo[i].MappedVector, + i, &gControllerInfo[i]); /* NOTE: We cannot share our interrupt, even on level-triggered buses. See Isr() for details. */ if(IoConnectInterrupt(&gControllerInfo[i].InterruptObject, Isr, &gControllerInfo[i], 0, gControllerInfo[i].MappedVector, gControllerInfo[i].MappedLevel, gControllerInfo[i].MappedLevel, gControllerInfo[i].InterruptMode, FALSE, Affinity, 0) != STATUS_SUCCESS) { - DPRINT(("floppy: AddControllers: unable to connect interrupt\n")); + DPRINT("floppy: AddControllers: unable to connect interrupt\n"); continue; } @@ -876,7 +876,7 @@ if(!gControllerInfo[i].AdapterObject) { - DPRINT(("floppy: AddControllers: unable to allocate an adapter object\n")); + DPRINT("floppy: AddControllers: unable to allocate an adapter object\n"); IoDisconnectInterrupt(gControllerInfo[i].InterruptObject); continue; } @@ -884,7 +884,7 @@ /* 2b: Initialize the new controller */ if(InitController(&gControllerInfo[i]) != STATUS_SUCCESS) { - DPRINT(("floppy: AddControllers():Unable to set up controller %d - initialization failed\n", i)); + DPRINT("floppy: AddControllers():Unable to set up controller %d - initialization failed\n", i); IoDisconnectInterrupt(gControllerInfo[i].InterruptObject); continue; } @@ -901,7 +901,7 @@ UNICODE_STRING ArcPath; UCHAR DriveNumber; - DPRINT(("floppy: AddControllers(): Configuring drive %d on controller %d\n", i, j)); + DPRINT("floppy: AddControllers(): Configuring drive %d on controller %d\n", i, j); /* * 3a: create a device object for the drive @@ -925,12 +925,12 @@ FILE_DEVICE_DISK, FILE_REMOVABLE_MEDIA | FILE_FLOPPY_DISKETTE, FALSE, &gControllerInfo[i].DriveInfo[j].DeviceObject) != STATUS_SUCCESS) { - DPRINT(("floppy: AddControllers: unable to register a Device object\n")); + DPRINT("floppy: AddControllers: unable to register a Device object\n"); IoDisconnectInterrupt(gControllerInfo[i].InterruptObject); continue; /* continue on to next drive */ } - DPRINT(("floppy: AddControllers: New device: %S (0x%x)\n", DeviceNameBuf, gControllerInfo[i].DriveInfo[j].DeviceObject)); + DPRINT("floppy: AddControllers: New device: %S (0x%x)\n", DeviceNameBuf, gControllerInfo[i].DriveInfo[j].DeviceObject); /* 3b.5: Create an ARC path in case we're booting from this drive */ swprintf(gControllerInfo[i].DriveInfo[j].ArcPathBuffer, @@ -947,7 +947,7 @@ RtlInitUnicodeString(&LinkName, gControllerInfo[i].DriveInfo[j].SymLinkBuffer); if(IoCreateSymbolicLink(&LinkName, &DeviceName) != STATUS_SUCCESS) { - DPRINT(("floppy: AddControllers: Unable to create a symlink for drive %d\n", DriveNumber)); + DPRINT("floppy: AddControllers: Unable to create a symlink for drive %d\n", DriveNumber); IoDisconnectInterrupt(gControllerInfo[i].InterruptObject); IoDeassignArcName(&ArcPath); continue; /* continue to next drive */ @@ -970,7 +970,7 @@ } } - DPRINT(("floppy: AddControllers: --------------------------------------------> finished adding controllers\n")); + DPRINT("floppy: AddControllers: --------------------------------------------> finished adding controllers\n"); return TRUE; } @@ -991,7 +991,7 @@ { PDRIVE_INFO DriveInfo = DeviceObject->DeviceExtension; - DPRINT(("floppy: SignalMediaChanged called\n")); + DPRINT("floppy: SignalMediaChanged called\n"); DriveInfo->DiskChangeCount++; @@ -1044,18 +1044,18 @@ if(KeReadStateEvent(&QueueThreadTerminate)) { - DPRINT(("floppy: QueueThread terminating\n")); + DPRINT("floppy: QueueThread terminating\n"); return; } - DPRINT(("floppy: QueueThread: servicing an IRP\n")); + DPRINT("floppy: QueueThread: servicing an IRP\n"); Irp = IoCsqRemoveNextIrp(&Csq, 0); /* we won't get an irp if it was canceled */ if(!Irp) { - DPRINT(("floppy: QueueThread: IRP queue empty\n")); + DPRINT("floppy: QueueThread: IRP queue empty\n"); continue; } @@ -1078,7 +1078,7 @@ break; default: - DPRINT(("floppy: QueueThread(): Unrecognized irp: mj: 0x%x\n", Stack->MajorFunction)); + DPRINT("floppy: QueueThread(): Unrecognized irp: mj: 0x%x\n", Stack->MajorFunction); Irp->IoStatus.Status = STATUS_NOT_SUPPORTED; Irp->IoStatus.Information = 0; IoCompleteRequest(Irp, IO_NO_INCREMENT); @@ -1155,13 +1155,13 @@ */ if(PsCreateSystemThread(&ThreadHandle, 0, 0, 0, 0, QueueThread, 0) != STATUS_SUCCESS) { - DPRINT(("floppy: Unable to create system thread; failing init\n")); + DPRINT("floppy: Unable to create system thread; failing init\n"); return STATUS_INSUFFICIENT_RESOURCES; } if(ObReferenceObjectByHandle(ThreadHandle, STANDARD_RIGHTS_ALL, NULL, KernelMode, &QueueThreadObject, NULL) != STATUS_SUCCESS) { - DPRINT(("floppy: Unable to reference returned thread handle; failing init\n")); + DPRINT("floppy: Unable to reference returned thread handle; failing init\n"); return STATUS_UNSUCCESSFUL; } _____ Modified: trunk/reactos/drivers/storage/floppy/hardware.c --- trunk/reactos/drivers/storage/floppy/hardware.c 2005-07-29 09:25:26 UTC (rev 16851) +++ trunk/reactos/drivers/storage/floppy/hardware.c 2005-07-29 09:30:41 UTC (rev 16852) @@ -82,7 +82,7 @@ { UCHAR Status = READ_PORT_UCHAR(ControllerInfo->BaseAddress + MAIN_STATUS_REGISTER); - if((Status & MSR_IO_DIRECTION)) /* 0 for out */ + if(Status & MSR_IO_DIRECTION) /* 0 for out */ return FALSE; if(!(Status & MSR_DATA_REG_READY_FOR_IO)) @@ -183,7 +183,7 @@ return STATUS_SUCCESS; } - DPRINT(("floppy: Send_Byte: timed out trying to write\n")); + DPRINT("floppy: Send_Byte: timed out trying to write\n"); HwDumpRegisters(ControllerInfo); return STATUS_UNSUCCESSFUL; } @@ -252,7 +252,7 @@ return STATUS_SUCCESS; } - DPRINT(("floppy: Get_Byte: timed out trying to read\n")); + DPRINT("floppy: Get_Byte: timed out trying to read\n"); HwDumpRegisters(ControllerInfo); return STATUS_UNSUCCESSFUL; } @@ -269,7 +269,7 @@ * STATUS_SUCCESS */ { - DPRINT(("floppy: HwSetDataRate called; writing rate code 0x%x to offset 0x%x\n", DataRate, DATA_RATE_SELECT_REGISTER)); + DPRINT("floppy: HwSetDataRate called; writing rate code 0x%x to offset 0x%x\n", DataRate, DATA_RATE_SELECT_REGISTER); WRITE_PORT_UCHAR(ControllerInfo->BaseAddress + DATA_RATE_SELECT_REGISTER, DataRate); @@ -290,7 +290,7 @@ * - Called at DISPATCH_LEVEL */ { - DPRINT(("floppy: HwTurnOffMotor: writing byte 0x%x to offset 0x%x\n", DOR_FDC_ENABLE|DOR_DMA_IO_INTERFACE_ENABLE, DIGITAL_OUTPUT_REGISTER)); + DPRINT("floppy: HwTurnOffMotor: writing byte 0x%x to offset 0x%x\n", DOR_FDC_ENABLE|DOR_DMA_IO_INTERFACE_ENABLE, DIGITAL_OUTPUT_REGISTER); WRITE_PORT_UCHAR(ControllerInfo->BaseAddress + DIGITAL_OUTPUT_REGISTER, DOR_FDC_ENABLE|DOR_DMA_IO_INTERFACE_ENABLE); @@ -332,7 +332,7 @@ else if (Unit == 3) Buffer |= DOR_FLOPPY_MOTOR_ON_D; - DPRINT(("floppy: HwTurnOnMotor: writing byte 0x%x to offset 0x%x\n", Buffer, DIGITAL_OUTPUT_REGISTER)); + DPRINT("floppy: HwTurnOnMotor: writing byte 0x%x to offset 0x%x\n", Buffer, DIGITAL_OUTPUT_REGISTER); WRITE_PORT_UCHAR(ControllerInfo->BaseAddress + DIGITAL_OUTPUT_REGISTER, Buffer); return STATUS_SUCCESS; @@ -357,7 +357,7 @@ PAGED_CODE(); - DPRINT(("floppy: HwSenseDriveStatus called\n")); + DPRINT("floppy: HwSenseDriveStatus called\n"); Buffer[0] = COMMAND_SENSE_DRIVE_STATUS; Buffer[1] = DriveInfo->UnitNumber; /* hard-wired to head 0 for now */ @@ -365,7 +365,7 @@ for(i = 0; i < 2; i++) if(Send_Byte(DriveInfo->ControllerInfo, Buffer[i]) != STATUS_SUCCESS) { - DPRINT(("floppy: HwSenseDriveStatus: failed to write FIFO\n")); + DPRINT("floppy: HwSenseDriveStatus: failed to write FIFO\n"); return STATUS_UNSUCCESSFUL; } @@ -431,11 +431,11 @@ /* Send the command */ for(i = 0; i < 9; i++) { - DPRINT(("floppy: HwReadWriteData: Sending a command byte to the FIFO: 0x%x\n", Buffer[i])); + DPRINT("floppy: HwReadWriteData: Sending a command byte to the FIFO: 0x%x\n", Buffer[i]); if(Send_Byte(ControllerInfo, Buffer[i]) != STATUS_SUCCESS) { - DPRINT(("HwReadWriteData: Unable to write to the FIFO\n")); + DPRINT("HwReadWriteData: Unable to write to the FIFO\n"); return STATUS_UNSUCCESSFUL; } } @@ -467,19 +467,19 @@ if(Send_Byte(ControllerInfo, COMMAND_SENSE_INTERRUPT_STATUS) != STATUS_SUCCESS) { - DPRINT(("floppy: HwRecalibrateResult: Unable to write the controller\n")); + DPRINT("floppy: HwRecalibrateResult: Unable to write the controller\n"); return STATUS_UNSUCCESSFUL; } for(i = 0; i < 2; i++) if(Get_Byte(ControllerInfo, &Buffer[i]) != STATUS_SUCCESS) { - DPRINT(("floppy: HwRecalibrateResult: unable to read FIFO\n")); + DPRINT("floppy: HwRecalibrateResult: unable to read FIFO\n"); return STATUS_UNSUCCESSFUL; } /* Validate that it did what we told it to */ - DPRINT(("floppy: HwRecalibrateResult results: ST0: 0x%x PCN: 0x%x\n", Buffer[0], Buffer[1])); + DPRINT("floppy: HwRecalibrateResult results: ST0: 0x%x PCN: 0x%x\n", Buffer[0], Buffer[1]); /* * Buffer[0] = ST0 @@ -489,20 +489,20 @@ /* Is the PCN 0? */ if(Buffer[1] != 0) { - DPRINT(("floppy: HwRecalibrateResult: PCN not 0\n")); + DPRINT("floppy: HwRecalibrateResult: PCN not 0\n"); return STATUS_UNSUCCESSFUL; } /* test seek complete */ if((Buffer[0] & SR0_SEEK_COMPLETE) != SR0_SEEK_COMPLETE) { - DPRINT(("floppy: HwRecalibrateResult: Failed to complete the seek\n")); + DPRINT("floppy: HwRecalibrateResult: Failed to complete the seek\n"); return STATUS_UNSUCCESSFUL; } /* Is the equipment check flag set? Could be no disk in drive... */ if((Buffer[0] & SR0_EQUIPMENT_CHECK) == SR0_EQUIPMENT_CHECK) - DPRINT(("floppy: HwRecalibrateResult: Seeked to track 0 successfully, but EC is set; returning STATUS_SUCCESS anyway\n")); + DPRINT("floppy: HwRecalibrateResult: Seeked to track 0 successfully, but EC is set; returning STATUS_SUCCESS anyway\n"); return STATUS_SUCCESS; } @@ -532,13 +532,13 @@ for(i = 0; i < 7; i++) if(Get_Byte(ControllerInfo, &Buffer[i]) != STATUS_SUCCESS) { - DPRINT(("floppy: HwReadWriteResult: unable to read fifo\n")); + DPRINT("floppy: HwReadWriteResult: unable to read fifo\n"); return STATUS_UNSUCCESSFUL; } /* Validate that it did what we told it to */ - DPRINT(("floppy: HwReadWriteResult results: 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x\n", Buffer[0], Buffer[1], Buffer[2], Buffer[3], - Buffer[4], Buffer[5], Buffer[6])); + DPRINT("floppy: HwReadWriteResult results: 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x\n", Buffer[0], Buffer[1], Buffer[2], Buffer[3], + Buffer[4], Buffer[5], Buffer[6]); /* Last command successful? */ if((Buffer[0] & SR0_LAST_COMMAND_STATUS) != SR0_LCS_SUCCESS) @@ -565,7 +565,7 @@ UCHAR Buffer[2]; int i; - DPRINT(("floppy: HwRecalibrate called\n")); + DPRINT("floppy: HwRecalibrate called\n"); PAGED_CODE(); @@ -575,7 +575,7 @@ for(i = 0; i < 2; i++) if(Send_Byte(ControllerInfo, Buffer[i]) != STATUS_SUCCESS) { - DPRINT(("floppy: HwRecalibrate: unable to write FIFO\n")); + DPRINT("floppy: HwRecalibrate: unable to write FIFO\n"); return STATUS_UNSUCCESSFUL; } @@ -600,7 +600,7 @@ if(Send_Byte(ControllerInfo, COMMAND_SENSE_INTERRUPT_STATUS) != STATUS_SUCCESS) { - DPRINT(("floppy: HwSenseInterruptStatus: failed to write controller\n")); + DPRINT("floppy: HwSenseInterruptStatus: failed to write controller\n"); return STATUS_UNSUCCESSFUL; } @@ -608,12 +608,12 @@ { if(Get_Byte(ControllerInfo, &Buffer[i]) != STATUS_SUCCESS) { - DPRINT(("floppy: HwSenseInterruptStatus: failed to read controller\n")); + DPRINT("floppy: HwSenseInterruptStatus: failed to read controller\n"); return STATUS_UNSUCCESSFUL; } } - DPRINT(("floppy: HwSenseInterruptStatus returned 0x%x 0x%x\n", Buffer[0], Buffer[1])); + DPRINT("floppy: HwSenseInterruptStatus returned 0x%x 0x%x\n", Buffer[0], Buffer[1]); return STATUS_SUCCESS; } @@ -635,7 +635,7 @@ UCHAR Buffer[2]; int i; - DPRINT(("floppy: HwReadId called\n")); + DPRINT("floppy: HwReadId called\n"); PAGED_CODE(); @@ -645,7 +645,7 @@ for(i = 0; i < 2; i++) if(Send_Byte(DriveInfo->ControllerInfo, Buffer[i]) != STATUS_SUCCESS) { - DPRINT(("floppy: HwReadId: unable to send bytes to fifo\n")); + DPRINT("floppy: HwReadId: unable to send bytes to fifo\n"); return STATUS_UNSUCCESSFUL; } @@ -678,7 +678,7 @@ UCHAR Buffer[6]; int i; - DPRINT(("floppy: HwFormatTrack called\n")); + DPRINT("floppy: HwFormatTrack called\n"); PAGED_CODE(); @@ -692,7 +692,7 @@ for(i = 0; i < 6; i++) if(Send_Byte(ControllerInfo, Buffer[i]) != STATUS_SUCCESS) { - DPRINT(("floppy: HwFormatTrack: unable to send bytes to floppy\n")); + DPRINT("floppy: HwFormatTrack: unable to send bytes to floppy\n"); return STATUS_UNSUCCESSFUL; } @@ -718,7 +718,7 @@ UCHAR Buffer[3]; int i; - DPRINT(("floppy: HwSeek called for cyl 0x%x\n", Cylinder)); + DPRINT("floppy: HwSeek called for cyl 0x%x\n", Cylinder); PAGED_CODE(); @@ -729,7 +729,7 @@ for(i = 0; i < 3; i++) if(Send_Byte(DriveInfo->ControllerInfo, Buffer[i]) != STATUS_SUCCESS) { - DPRINT(("floppy: HwSeek: failed to write fifo\n")); + DPRINT("floppy: HwSeek: failed to write fifo\n"); return STATUS_UNSUCCESSFUL; } @@ -769,7 +769,7 @@ UCHAR Buffer[4]; int i; - DPRINT(("floppy: HwConfigure called\n")); + DPRINT("floppy: HwConfigure called\n"); PAGED_CODE(); @@ -781,7 +781,7 @@ for(i = 0; i < 4; i++) if(Send_Byte(ControllerInfo, Buffer[i]) != STATUS_SUCCESS) { - DPRINT(("floppy: HwConfigure: failed to write the fifo\n")); + DPRINT("floppy: HwConfigure: failed to write the fifo\n"); return STATUS_UNSUCCESSFUL; } @@ -809,17 +809,17 @@ if(Send_Byte(ControllerInfo, COMMAND_VERSION) != STATUS_SUCCESS) { - DPRINT(("floppy: HwGetVersion: unable to write fifo\n")); + DPRINT("floppy: HwGetVersion: unable to write fifo\n"); return STATUS_UNSUCCESSFUL; } if(Get_Byte(ControllerInfo, &Buffer) != STATUS_SUCCESS) { - DPRINT(("floppy: HwGetVersion: unable to write fifo\n")); + DPRINT("floppy: HwGetVersion: unable to write fifo\n"); return STATUS_UNSUCCESSFUL; } - DPRINT(("floppy: HwGetVersion returning version 0x%x\n", Buffer)); + DPRINT("floppy: HwGetVersion returning version 0x%x\n", Buffer); return Buffer; } @@ -843,18 +843,18 @@ Buffer = READ_PORT_UCHAR(ControllerInfo->BaseAddress + DIGITAL_INPUT_REGISTER); - DPRINT(("floppy: HwDiskChanged: read 0x%x from DIR\n", Buffer)); + DPRINT("floppy: HwDiskChanged: read 0x%x from DIR\n", Buffer); if(ControllerInfo->Model30) { if(!(Buffer & DIR_DISKETTE_CHANGE)) { - DPRINT(("floppy: HdDiskChanged - Model30 - returning TRUE\n")); + DPRINT("floppy: HdDiskChanged - Model30 - returning TRUE\n"); *DiskChanged = TRUE; } else { - DPRINT(("floppy: HdDiskChanged - Model30 - returning FALSE\n")); + DPRINT("floppy: HdDiskChanged - Model30 - returning FALSE\n"); *DiskChanged = FALSE; } } @@ -862,12 +862,12 @@ { if(Buffer & DIR_DISKETTE_CHANGE) { - DPRINT(("floppy: HdDiskChanged - PS2 - returning TRUE\n")); + DPRINT("floppy: HdDiskChanged - PS2 - returning TRUE\n"); *DiskChanged = TRUE; } else { - DPRINT(("floppy: HdDiskChanged - PS2 - returning FALSE\n")); + DPRINT("floppy: HdDiskChanged - PS2 - returning FALSE\n"); *DiskChanged = FALSE; } } @@ -893,11 +893,11 @@ if(Get_Byte(ControllerInfo, Status) != STATUS_SUCCESS) { - DPRINT(("floppy: HwSenseDriveStatus: unable to read fifo\n")); + DPRINT("floppy: HwSenseDriveStatus: unable to read fifo\n"); return STATUS_UNSUCCESSFUL; } - DPRINT(("floppy: HwSenseDriveStatusResult: ST3: 0x%x\n", *Status)); + DPRINT("floppy: HwSenseDriveStatusResult: ST3: 0x%x\n", *Status); return STATUS_SUCCESS; } @@ -931,25 +931,25 @@ for(i = 0; i < 7; i++) if(Get_Byte(ControllerInfo, &Buffer[i]) != STATUS_SUCCESS) { - DPRINT(("floppy: ReadIdResult(): can't read from the controller\n")); + DPRINT("floppy: ReadIdResult(): can't read from the controller\n"); return STATUS_UNSUCCESSFUL; } /* Validate that it did what we told it to */ - DPRINT(("floppy: ReadId results: 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x\n", Buffer[0], Buffer[1], Buffer[2], Buffer[3], - Buffer[4], Buffer[5], Buffer[6])); + DPRINT("floppy: ReadId results: 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x\n", Buffer[0], Buffer[1], Buffer[2], Buffer[3], + Buffer[4], Buffer[5], Buffer[6]); /* Last command successful? */ if((Buffer[0] & SR0_LAST_COMMAND_STATUS) != SR0_LCS_SUCCESS) { - DPRINT(("floppy: ReadId didn't return last command success\n")); + DPRINT("floppy: ReadId didn't return last command success\n"); return STATUS_UNSUCCESSFUL; } /* ID mark found? */ if(Buffer[1] & SR1_CANNOT_FIND_ID_ADDRESS) { - DPRINT(("floppy: ReadId didn't find an address mark\n")); + DPRINT("floppy: ReadId didn't find an address mark\n"); return STATUS_UNSUCCESSFUL; } @@ -996,13 +996,13 @@ Buffer[1] = 0xdf; Buffer[2] = 0x2; - //DPRINT(("HwSpecify: sending 0x%x 0x%x 0x%x to FIFO\n", Buffer[0], Buffer[1], Buffer[2])); - DPRINT(("FLOPPY: HWSPECIFY: FIXME - sending 0x3 0xd1 0x2 to FIFO\n")); + //DPRINT("HwSpecify: sending 0x%x 0x%x 0x%x to FIFO\n", Buffer[0], Buffer[1], Buffer[2]); + DPRINT("FLOPPY: HWSPECIFY: FIXME - sending 0x3 0xd1 0x2 to FIFO\n"); for(i = 0; i < 3; i++) if(Send_Byte(ControllerInfo, Buffer[i]) != STATUS_SUCCESS) { - DPRINT(("floppy: HwSpecify: unable to write to controller\n")); + DPRINT("floppy: HwSpecify: unable to write to controller\n"); return STATUS_UNSUCCESSFUL; } @@ -1021,7 +1021,7 @@ * - Generates an interrupt that must be serviced four times (one per drive) */ { - DPRINT(("floppy: HwReset called\n")); + DPRINT("floppy: HwReset called\n"); /* Write the reset bit in the DRSR */ WRITE_PORT_UCHAR(ControllerInfo->BaseAddress + DATA_RATE_SELECT_REGISTER, DRSR_SW_RESET); @@ -1030,13 +1030,13 @@ if(!(READ_PORT_UCHAR(ControllerInfo->BaseAddress + DIGITAL_OUTPUT_REGISTER) & DOR_RESET)) { HwDumpRegisters(ControllerInfo); - DPRINT(("floppy: HwReset: Setting Enable bit\n")); + DPRINT("floppy: HwReset: Setting Enable bit\n"); WRITE_PORT_UCHAR(ControllerInfo->BaseAddress + DIGITAL_OUTPUT_REGISTER, DOR_DMA_IO_INTERFACE_ENABLE|DOR_RESET); HwDumpRegisters(ControllerInfo); if(!(READ_PORT_UCHAR(ControllerInfo->BaseAddress + DIGITAL_OUTPUT_REGISTER) & DOR_RESET)) { - DPRINT(("floppy: HwReset: failed to set the DOR enable bit!\n")); + DPRINT("floppy: HwReset: failed to set the DOR enable bit!\n"); HwDumpRegisters(ControllerInfo); return STATUS_UNSUCCESSFUL; } @@ -1057,7 +1057,7 @@ * - Wake up with a hardware reset */ { - DPRINT(("floppy: HwPowerOff called on controller 0x%x\n", ControllerInfo)); + DPRINT("floppy: HwPowerOff called on controller 0x%x\n", ControllerInfo); WRITE_PORT_UCHAR(ControllerInfo->BaseAddress + DATA_RATE_SELECT_REGISTER, DRSR_POWER_DOWN); @@ -1073,11 +1073,11 @@ { UNREFERENCED_PARAMETER(ControllerInfo); [truncated at 1000 lines; 513 more skipped]

1 0

[ea] 16851: [11:21] EmanueleAliberti: Usurp: drivers/dd/beep/bbep.c:178: only one DPRINT was #if 0'ed
by ea＠svn.reactos.com 29 Jul '05

29 Jul '05

[11:21] EmanueleAliberti: Usurp: drivers/dd/beep/bbep.c:178: only one DPRINT was #if 0'ed [11:22] Usurp: EmanueleAliberti: its a 2 line change [11:22] Usurp: <Usurp> - pbsp->Frequency, [11:22] Usurp: <Usurp> - pbsp->Duration); [11:22] Usurp: <Usurp> + BeepParam->Frequency, [11:22] Usurp: <Usurp> + BeepParam->Duration); Modified: trunk/reactos/drivers/dd/beep/beep.c _____ Modified: trunk/reactos/drivers/dd/beep/beep.c --- trunk/reactos/drivers/dd/beep/beep.c 2005-07-29 00:14:05 UTC (rev 16850) +++ trunk/reactos/drivers/dd/beep/beep.c 2005-07-29 09:25:26 UTC (rev 16851) @@ -177,9 +177,8 @@ /* do the beep!! */ DPRINT("Beep:\n Freq: %lu Hz\n Dur: %lu ms\n", - pbsp->Frequency, - pbsp->Duration); - + BeepParam->Frequency, + BeepParam->Duration); if (BeepParam->Duration >= 0) { DueTime.QuadPart = (LONGLONG)BeepParam->Duration * -10000;

1 0

[ion] 16850: - Fix debug header, spottted by Gunnar
by ion＠svn.reactos.com 29 Jul '05

29 Jul '05

- Fix debug header, spottted by Gunnar Modified: trunk/reactos/include/reactos/debug.h _____ Modified: trunk/reactos/include/reactos/debug.h --- trunk/reactos/include/reactos/debug.h 2005-07-28 23:29:44 UTC (rev 16849) +++ trunk/reactos/include/reactos/debug.h 2005-07-29 00:14:05 UTC (rev 16850) @@ -16,7 +16,6 @@ #ifndef __INTERNAL_DEBUG #define __INTERNAL_DEBUG -//#define UNIMPLEMENTED do {DbgPrint("%s at %s:%d is unimplemented, have a nice day\n",__FUNCTION__,__FILE__,__LINE__); for(;;); } while(0); #define UNIMPLEMENTED DbgPrint("WARNING: %s at %s:%d is UNIMPLEMENTED!\n",__FUNCTION__,__FILE__,__LINE__); /* FIXME: should probably remove this later */ @@ -48,32 +47,35 @@ #endif #endif -/* TODO: Make the output of file/line and the debug message atomic */ +/* Print stuff only on Debug Builds*/ #ifdef DBG -#define DPRINT1 DbgPrint("(%s:%d) ",__FILE__,__LINE__), DbgPrint -#define CHECKPOINT1 do { DbgPrint("%s:%d\n",__FILE__,__LINE__); } while(0); + + /* These are always printed */ + #define DPRINT1 DbgPrint("(%s:%d) ",__FILE__,__LINE__), DbgPrint + #define CHECKPOINT1 do { DbgPrint("%s:%d\n",__FILE__,__LINE__); } while(0); + + /* These are printed only if NDEBUG is NOT defined */ + #ifndef NDEBUG + + #define DPRINT DbgPrint("(%s:%d) ",__FILE__,__LINE__), DbgPrint + #define CHECKPOINT do { DbgPrint("%s:%d\n",__FILE__,__LINE__); } while(0); + + #else + + #define DPRINT(...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0) + #define CHECKPOINT + + #endif + #else -#ifdef __GNUC__ -#define DPRINT1(args...) -#define CHECKPOINT1 -#else -#define DPRINT1 -#define CHECKPOINT1 -#endif /* __GNUC__ */ + + /* On non-debug builds, we never show these */ + #define DPRINT1 do { if(0) { DbgPrint(__VA_ARGS__); } } while(0) + #define DPRINT(...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0) + #define CHECKPOINT1 + #define CHECKPOINT #endif -#ifndef NDEBUG -#define DPRINT(...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0) -#define CHECKPOINT do { DbgPrint("%s:%d\n",__FILE__,__LINE__); } while(0); -#else -#ifdef __GNUC__ -#define DPRINT(args...) -#else -#define DPRINT -#endif /* __GNUC__ */ -#define CHECKPOINT -#endif /* NDEBUG */ - /* * FUNCTION: Assert a maximum value for the current irql * ARGUMENTS:

1 0

[weiden] 16849: clear out the lower 2 bits of a pid before using it to calculate the hash as they may vary
by weiden＠svn.reactos.com 28 Jul '05

28 Jul '05

clear out the lower 2 bits of a pid before using it to calculate the hash as they may vary Modified: trunk/reactos/subsys/csrss/api/process.c _____ Modified: trunk/reactos/subsys/csrss/api/process.c --- trunk/reactos/subsys/csrss/api/process.c 2005-07-28 23:22:47 UTC (rev 16848) +++ trunk/reactos/subsys/csrss/api/process.c 2005-07-28 23:29:44 UTC (rev 16849) @@ -37,7 +37,7 @@ ULONG hash; PCSRSS_PROCESS_DATA pProcessData; - hash = (ULONG_PTR)ProcessId % (sizeof(ProcessData) / sizeof(*ProcessData)); + hash = ((ULONG_PTR)ProcessId & ~0x3) % (sizeof(ProcessData) / sizeof(*ProcessData)); LOCK; @@ -59,7 +59,7 @@ CLIENT_ID ClientId; NTSTATUS Status; - hash = (ULONG_PTR)ProcessId % (sizeof(ProcessData) / sizeof(*ProcessData)); + hash = ((ULONG_PTR)ProcessId & ~0x3) % (sizeof(ProcessData) / sizeof(*ProcessData)); LOCK; @@ -121,7 +121,7 @@ UINT c; PCSRSS_PROCESS_DATA pProcessData, pPrevProcessData = NULL; - hash = (ULONG_PTR)Pid % (sizeof(ProcessData) / sizeof(*ProcessData)); + hash = ((ULONG_PTR)Pid & ~0x3) % (sizeof(ProcessData) / sizeof(*ProcessData)); LOCK;

1 0

[weiden] 16848: don't generate meaningless lvalue typecast
by weiden＠svn.reactos.com 28 Jul '05

28 Jul '05

don't generate meaningless lvalue typecast Modified: trunk/reactos/tools/widl/server.c _____ Modified: trunk/reactos/tools/widl/server.c --- trunk/reactos/tools/widl/server.c 2005-07-28 23:19:22 UTC (rev 16847) +++ trunk/reactos/tools/widl/server.c 2005-07-28 23:22:47 UTC (rev 16848) @@ -892,9 +892,9 @@ } else if (var->ptr_level == 1) { - print_server("("); + fprintf(server, "%s = (", var->name); write_type(server, var->type, NULL, var->tname); - fprintf(server, " __RPC_FAR *)%s = 0;\n", var->name); + print_server(" __RPC_FAR *)0;\n"); } else if (var->ptr_level > 1) {

1 0

[weiden] 16847: discard explicitly returned value
by weiden＠svn.reactos.com 28 Jul '05

28 Jul '05

discard explicitly returned value Modified: trunk/reactos/subsys/system/explorer/dialogs/searchprogram.cpp Modified: trunk/reactos/subsys/system/explorer/explorer.cpp Modified: trunk/reactos/subsys/system/explorer/shell/mainframe.cpp Modified: trunk/reactos/subsys/system/explorer/shell/shellbrowser.cpp Modified: trunk/reactos/subsys/system/explorer/taskbar/favorites.cpp Modified: trunk/reactos/subsys/system/explorer/taskbar/traynotify.cpp Modified: trunk/reactos/subsys/system/ibrowser/favorites.cpp Modified: trunk/reactos/subsys/system/ibrowser/ibrowser.cpp Modified: trunk/reactos/subsys/system/ibrowser/mainframe.cpp _____ Modified: trunk/reactos/subsys/system/explorer/dialogs/searchprogram.cpp --- trunk/reactos/subsys/system/explorer/dialogs/searchprogram.cpp 2005-07-28 22:43:24 UTC (rev 16846) +++ trunk/reactos/subsys/system/explorer/dialogs/searchprogram.cpp 2005-07-28 23:19:22 UTC (rev 16847) @@ -103,7 +103,7 @@ _haccel = LoadAccelerators(g_Globals._hInstance, MAKEINTRESOURCE(IDA_SEARCH_PROGRAM)); - ListView_SetImageList(_list_ctrl, g_Globals._icon_cache.get_sys_imagelist(), LVSIL_SMALL); + (void)ListView_SetImageList(_list_ctrl, g_Globals._icon_cache.get_sys_imagelist(), LVSIL_SMALL); LV_COLUMN column = {LVCF_FMT|LVCF_WIDTH|LVCF_TEXT, LVCFMT_LEFT, 250}; @@ -263,7 +263,7 @@ { switch(nmsg) { case WM_CLOSE: - ListView_SetImageList(_list_ctrl, 0, LVSIL_SMALL); // detach system image list + (void)ListView_SetImageList(_list_ctrl, 0, LVSIL_SMALL); // detach system image list goto def; case PM_TRANSLATE_MSG: { _____ Modified: trunk/reactos/subsys/system/explorer/explorer.cpp --- trunk/reactos/subsys/system/explorer/explorer.cpp 2005-07-28 22:43:24 UTC (rev 16846) +++ trunk/reactos/subsys/system/explorer/explorer.cpp 2005-07-28 23:19:22 UTC (rev 16847) @@ -519,10 +519,10 @@ void SetWindowIcon(HWND hwnd, UINT nid) { HICON hIcon = ResIcon(nid); - Window_SetIcon(hwnd, ICON_BIG, hIcon); + (void)Window_SetIcon(hwnd, ICON_BIG, hIcon); HICON hIconSmall = SmallIcon(nid); - Window_SetIcon(hwnd, ICON_SMALL, hIconSmall); + (void)Window_SetIcon(hwnd, ICON_SMALL, hIconSmall); } _____ Modified: trunk/reactos/subsys/system/explorer/shell/mainframe.cpp --- trunk/reactos/subsys/system/explorer/shell/mainframe.cpp 2005-07-28 22:43:24 UTC (rev 16846) +++ trunk/reactos/subsys/system/explorer/shell/mainframe.cpp 2005-07-28 23:19:22 UTC (rev 16847) @@ -215,7 +215,7 @@ WS_CHILD|WS_TABSTOP|WS_BORDER|/*WS_VISIBLE|*/WS_CHILD|TVS_HASLINES|TVS_H ASBUTTONS|TVS_SHOWSELALWAYS|TVS_INFOTIP, -1, -1, 200, 0, _hwnd, (HMENU)IDW_SIDEBAR, g_Globals._hInstance, 0); - TreeView_SetImageList(_hsidebar, _himl, TVSIL_NORMAL); + (void)TreeView_SetImageList(_hsidebar, _himl, TVSIL_NORMAL); CheckMenuItem(_menu_info._hMenuView, ID_VIEW_SIDE_BAR, MF_BYCOMMAND|MF_UNCHECKED/*MF_CHECKED*/); _____ Modified: trunk/reactos/subsys/system/explorer/shell/shellbrowser.cpp --- trunk/reactos/subsys/system/explorer/shell/shellbrowser.cpp 2005-07-28 22:43:24 UTC (rev 16846) +++ trunk/reactos/subsys/system/explorer/shell/shellbrowser.cpp 2005-07-28 23:19:22 UTC (rev 16847) @@ -50,7 +50,7 @@ ShellBrowser::~ShellBrowser() { - TreeView_SetImageList(_left_hwnd, 0, TVSIL_NORMAL); + (void)TreeView_SetImageList(_left_hwnd, 0, TVSIL_NORMAL); if (_pShellView) _pShellView->Release(); @@ -137,7 +137,7 @@ { CONTEXT("ShellBrowserChild::InitializeTree()"); - TreeView_SetImageList(_left_hwnd, himl, TVSIL_NORMAL); + (void)TreeView_SetImageList(_left_hwnd, himl, TVSIL_NORMAL); TreeView_SetScrollTime(_left_hwnd, 100); TV_INSERTSTRUCT tvInsert; @@ -199,7 +199,7 @@ ScreenToClient(_left_hwnd, &tvhti.pt); tvhti.flags = LVHT_NOWHERE; - TreeView_HitTest(_left_hwnd, &tvhti); + (void)TreeView_HitTest(_left_hwnd, &tvhti); if (TVHT_ONITEM & tvhti.flags) { LPARAM itemData = TreeView_GetItemData(_left_hwnd, tvhti.hItem); @@ -318,7 +318,7 @@ tvInsert.hInsertAfter = TVI_LAST; tvInsert.hParent = hParentItem; - TreeView_InsertItem(_left_hwnd, &tvInsert); + (void)TreeView_InsertItem(_left_hwnd, &tvInsert); } ++cnt; _____ Modified: trunk/reactos/subsys/system/explorer/taskbar/favorites.cpp --- trunk/reactos/subsys/system/explorer/taskbar/favorites.cpp 2005-07-28 22:43:24 UTC (rev 16846) +++ trunk/reactos/subsys/system/explorer/taskbar/favorites.cpp 2005-07-28 23:19:22 UTC (rev 16847) @@ -362,7 +362,7 @@ tv.iImage = tv.iSelectedImage = icon.add_to_imagelist(himagelist, hdc_wnd); } - TreeView_InsertItem(hwnd, &tvi); + (void)TreeView_InsertItem(hwnd, &tvi); } } } _____ Modified: trunk/reactos/subsys/system/explorer/taskbar/traynotify.cpp --- trunk/reactos/subsys/system/explorer/taskbar/traynotify.cpp 2005-07-28 22:43:24 UTC (rev 16846) +++ trunk/reactos/subsys/system/explorer/taskbar/traynotify.cpp 2005-07-28 23:19:22 UTC (rev 16847) @@ -918,7 +918,7 @@ ImageList_AddAlphaIcon(_himl, SmallIcon(IDI_DOT_RED), hbkgnd, canvas); } - TreeView_SetImageList(_tree_ctrl, _himl, TVSIL_NORMAL); + (void)TreeView_SetImageList(_tree_ctrl, _himl, TVSIL_NORMAL); _resize_mgr.Add(IDC_NOTIFY_ICONS, RESIZE); _resize_mgr.Add(IDC_LABEL1, MOVE_Y); @@ -1077,7 +1077,7 @@ tv.lParam = (LPARAM)idx; tv.pszText = (LPTSTR)txt.c_str(); tv.iSelectedImage = tv.iImage = ImageList_AddAlphaIcon(_himl, hicon, GetStockBrush(WHITE_BRUSH), hdc); - TreeView_InsertItem(_tree_ctrl, &tvi); + (void)TreeView_InsertItem(_tree_ctrl, &tvi); } LRESULT TrayNotifyDlg::WndProc(UINT nmsg, WPARAM wparam, LPARAM lparam) _____ Modified: trunk/reactos/subsys/system/ibrowser/favorites.cpp --- trunk/reactos/subsys/system/ibrowser/favorites.cpp 2005-07-28 22:43:24 UTC (rev 16846) +++ trunk/reactos/subsys/system/ibrowser/favorites.cpp 2005-07-28 23:19:22 UTC (rev 16847) @@ -360,7 +360,7 @@ tv.iImage = tv.iSelectedImage = icon.add_to_imagelist(himagelist, hdc_wnd); } - TreeView_InsertItem(hwnd, &tvi); + (void)TreeView_InsertItem(hwnd, &tvi); } } } _____ Modified: trunk/reactos/subsys/system/ibrowser/ibrowser.cpp --- trunk/reactos/subsys/system/ibrowser/ibrowser.cpp 2005-07-28 22:43:24 UTC (rev 16846) +++ trunk/reactos/subsys/system/ibrowser/ibrowser.cpp 2005-07-28 23:19:22 UTC (rev 16847) @@ -344,10 +344,10 @@ void SetWindowIcon(HWND hwnd, UINT nid) { HICON hIcon = ResIcon(nid); - Window_SetIcon(hwnd, ICON_BIG, hIcon); + (void)Window_SetIcon(hwnd, ICON_BIG, hIcon); HICON hIconSmall = SmallIcon(nid); - Window_SetIcon(hwnd, ICON_SMALL, hIconSmall); + (void)Window_SetIcon(hwnd, ICON_SMALL, hIconSmall); } _____ Modified: trunk/reactos/subsys/system/ibrowser/mainframe.cpp --- trunk/reactos/subsys/system/ibrowser/mainframe.cpp 2005-07-28 22:43:24 UTC (rev 16846) +++ trunk/reactos/subsys/system/ibrowser/mainframe.cpp 2005-07-28 23:19:22 UTC (rev 16847) @@ -119,7 +119,7 @@ WS_CHILD|WS_TABSTOP|WS_BORDER|/*WS_VISIBLE|*/WS_CHILD|TVS_HASLINES|TVS_H ASBUTTONS|TVS_SHOWSELALWAYS|TVS_INFOTIP, -1, -1, 200, 0, _hwnd, (HMENU)IDW_SIDEBAR, g_hInstance, 0); - TreeView_SetImageList(_hsidebar, _himl, TVSIL_NORMAL); + (void)TreeView_SetImageList(_hsidebar, _himl, TVSIL_NORMAL); CheckMenuItem(_menu_info._hMenuView, ID_VIEW_SIDE_BAR, MF_BYCOMMAND|MF_UNCHECKED/*MF_CHECKED*/);

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