Revert 17858 and fix all warnings at once.
This fix may be strange at first sight, but original Linux code doesn't
use "flags" variable at all. This fix is here only to prevent a warning
and shouldn't break the behaviour of the code.
Modified: trunk/reactos/drivers/usb/miniport/linux/linux_wrapper.h
Modified: trunk/reactos/drivers/usb/miniport/usbohci/ohci-hcd.c
Modified: trunk/reactos/drivers/usb/miniport/usbohci/ohci-q.c
_____
Modified: trunk/reactos/drivers/usb/miniport/linux/linux_wrapper.h
--- trunk/reactos/drivers/usb/miniport/linux/linux_wrapper.h
2005-09-15 12:57:11 UTC (rev 17858)
+++ trunk/reactos/drivers/usb/miniport/linux/linux_wrapper.h
2005-09-15 13:25:32 UTC (rev 17859)
@@ -399,7 +399,7 @@
#define spin_unlock(a) my_spin_unlock(a)
void my_spin_unlock(spinlock_t *sl);
-#define spin_lock_irqsave(a,b) my_spin_lock_irqsave(a,b)
+#define spin_lock_irqsave(a,b) b=0, my_spin_lock_irqsave(a,b)
void my_spin_lock_irqsave(spinlock_t *sl, int flags);
#define spin_unlock_irqrestore(a,b) my_spin_unlock(a)
_____
Modified: trunk/reactos/drivers/usb/miniport/usbohci/ohci-hcd.c
--- trunk/reactos/drivers/usb/miniport/usbohci/ohci-hcd.c
2005-09-15 12:57:11 UTC (rev 17858)
+++ trunk/reactos/drivers/usb/miniport/usbohci/ohci-hcd.c
2005-09-15 13:25:32 UTC (rev 17859)
@@ -165,7 +165,7 @@
urb_priv_t *urb_priv;
unsigned int pipe = urb->pipe;
int i, size = 0;
- unsigned long flags = 0;
+ unsigned long flags;
int retval = 0;
#ifdef OHCI_VERBOSE_DEBUG
_____
Modified: trunk/reactos/drivers/usb/miniport/usbohci/ohci-q.c
--- trunk/reactos/drivers/usb/miniport/usbohci/ohci-q.c 2005-09-15
12:57:11 UTC (rev 17858)
+++ trunk/reactos/drivers/usb/miniport/usbohci/ohci-q.c 2005-09-15
13:25:32 UTC (rev 17859)
@@ -344,7 +344,7 @@
struct hcd_dev *dev = (struct hcd_dev *) udev->hcpriv;
struct ed *ed;
unsigned ep;
- unsigned long flags = 0;
+ unsigned long flags;
ep = usb_pipeendpoint (pipe) << 1;
if (type != PIPE_CONTROL && is_out)
Added a text test to rosperf, and build as unicode.
Modified: trunk/reactos/apps/utils/rosperf/rosperf.h
Modified: trunk/reactos/apps/utils/rosperf/rosperf.xml
Modified: trunk/reactos/apps/utils/rosperf/testlist.c
Added: trunk/reactos/apps/utils/rosperf/text.c
_____
Modified: trunk/reactos/apps/utils/rosperf/rosperf.h
--- trunk/reactos/apps/utils/rosperf/rosperf.h 2005-09-15 04:51:14 UTC
(rev 17854)
+++ trunk/reactos/apps/utils/rosperf/rosperf.h 2005-09-15 04:57:51 UTC
(rev 17855)
@@ -59,6 +59,8 @@
void LinesVerticalProc(void *Context, PPERF_INFO PerfInfo, unsigned
Reps);
void LinesProc(void *Context, PPERF_INFO PerfInfo, unsigned Reps);
+void TextProc(void *Context, PPERF_INFO PerfInfo, unsigned Reps);
+
#endif /* ROSPERF_H_INCLUDED */
/* EOF */
_____
Modified: trunk/reactos/apps/utils/rosperf/rosperf.xml
--- trunk/reactos/apps/utils/rosperf/rosperf.xml 2005-09-15
04:51:14 UTC (rev 17854)
+++ trunk/reactos/apps/utils/rosperf/rosperf.xml 2005-09-15
04:57:51 UTC (rev 17855)
@@ -1,6 +1,7 @@
<module name="rosperf" type="win32cui" installbase="system32"
installname="rosperf.exe">
<include base="rosperf">.</include>
<define name="__USE_W32API" />
+ <define name="UNICODE" />
<library>version</library>
<library>gdi32</library>
<library>user32</library>
@@ -9,6 +10,7 @@
<file>rosperf.c</file>
<file>lines.c</file>
<file>fill.c</file>
+ <file>text.c</file>
<file>testlist.c</file>
<file>rosperf.rc</file>
-</module>
\ No newline at end of file
+</module>
_____
Modified: trunk/reactos/apps/utils/rosperf/testlist.c
--- trunk/reactos/apps/utils/rosperf/testlist.c 2005-09-15 04:51:14 UTC
(rev 17854)
+++ trunk/reactos/apps/utils/rosperf/testlist.c 2005-09-15 04:57:51 UTC
(rev 17855)
@@ -25,7 +25,8 @@
{ L"smallfill", L"Small Fill", NullInit, FillSmallProc,
NullCleanup, NullCleanup },
{ L"hlines", L"Horizontal Lines", NullInit, LinesHorizontalProc,
NullCleanup, NullCleanup },
{ L"vlines", L"Vertical Lines", NullInit, LinesVerticalProc,
NullCleanup, NullCleanup },
- { L"lines", L"Lines", NullInit, LinesProc, NullCleanup, NullCleanup
}
+ { L"lines", L"Lines", NullInit, LinesProc, NullCleanup, NullCleanup
},
+ { L"text", L"Text", NullInit, TextProc, NullCleanup, NullCleanup }
};
_____
Added: trunk/reactos/apps/utils/rosperf/text.c
--- trunk/reactos/apps/utils/rosperf/text.c 2005-09-15 04:51:14 UTC
(rev 17854)
+++ trunk/reactos/apps/utils/rosperf/text.c 2005-09-15 04:57:51 UTC
(rev 17855)
@@ -0,0 +1,44 @@
+/*
+ * ReactOS RosPerf - ReactOS GUI performance test program
+ *
+ * This program is free software; you can redistribute it and/or
modify
+ * it under the terms of the GNU General Public License as published
by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <windows.h>
+#include "rosperf.h"
+
+void
+TextProc(void *Context, PPERF_INFO PerfInfo, unsigned Reps)
+{
+ unsigned Rep;
+ int y;
+ HDC Dc = NULL;
+ HFONT hfFont = GetStockObject(DEFAULT_GUI_FONT);
+
+ for (Rep = 0; Rep < Reps; )
+ {
+ Dc = (Rep & 0x10000) ? PerfInfo->BackgroundDc :
PerfInfo->ForegroundDc;
+ SelectObject(Dc, hfFont);
+
+ for (y = 0; y < PerfInfo->WndHeight && Rep < Reps; Rep++, y +=
15)
+ {
+ TextOut(Dc, 0, y,
L"AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz:?<>0123456789",
66);
+ }
+ InvalidateRect(PerfInfo->Wnd, NULL, TRUE);
+ UpdateWindow(PerfInfo->Wnd);
+ }
+}
+
+/* EOF */