reduce differences to trunk

svn path=/branches/ros-amd64-bringup/; revision=44779

diff --git a/reactos/dll/win32/beepmidi/beepmidi.c b/reactos/dll/win32/beepmidi/beepmidi.c
index 57facf3..6365d05 100644 (file)
--- a/reactos/dll/win32/beepmidi/beepmidi.c
+++ b/reactos/dll/win32/beepmidi/beepmidi.c
@@ -749,7 +749,7 @@ ProcessLongMidiMessage(
     header->dwFlags |= MHDR_DONE;
     header->dwFlags &= ~ MHDR_INQUEUE;
 
-    DPRINT("Success? %d\n", CallClient(the_device, MOM_DONE, (DWORD_PTR)header, 0));
+    DPRINT("Success? %d\n", CallClient(the_device, MOM_DONE, (DWORD_PTR) header, 0));
 
     return MMSYSERR_NOERROR;
 }

diff --git a/reactos/dll/win32/comctl32/commctrl.c b/reactos/dll/win32/comctl32/commctrl.c
index c9050df..db0eade 100644 (file)
--- a/reactos/dll/win32/comctl32/commctrl.c
+++ b/reactos/dll/win32/comctl32/commctrl.c
@@ -707,7 +707,6 @@ CreateUpDownControl (DWORD style, INT x, INT y, INT cx, INT cy,
 VOID WINAPI
 InitCommonControls (void)
 {
-    return;
 }
 
 

diff --git a/reactos/dll/win32/gdiplus/brush.c b/reactos/dll/win32/gdiplus/brush.c
index 4819540..bfce7d8 100644 (file)
--- a/reactos/dll/win32/gdiplus/brush.c
+++ b/reactos/dll/win32/gdiplus/brush.c
@@ -303,20 +303,20 @@ GpStatus WINGDIPAPI GdipCreateHatchBrush(HatchStyle hatchstyle, ARGB forecol, AR
     }
     else
     {
-            FIXME("Unimplemented hatch style %d\n", hatchstyle);
+        FIXME("Unimplemented hatch style %d\n", hatchstyle);
 
-            (*brush)->brush.lb.lbStyle = BS_SOLID;
-            (*brush)->brush.lb.lbColor = fgcol;
-            (*brush)->brush.lb.lbHatch = 0;
+        (*brush)->brush.lb.lbStyle = BS_SOLID;
+        (*brush)->brush.lb.lbColor = fgcol;
+        (*brush)->brush.lb.lbHatch = 0;
         (*brush)->brush.gdibrush = CreateBrushIndirect(&(*brush)->brush.lb);
     }
 
     if (stat == Ok)
     {
-    (*brush)->brush.bt = BrushTypeHatchFill;
-    (*brush)->forecol = forecol;
-    (*brush)->backcol = backcol;
-    (*brush)->hatchstyle = hatchstyle;
+        (*brush)->brush.bt = BrushTypeHatchFill;
+        (*brush)->forecol = forecol;
+        (*brush)->backcol = backcol;
+        (*brush)->hatchstyle = hatchstyle;
     }
     else
     {

diff --git a/reactos/dll/win32/gdiplus/gdiplus.c b/reactos/dll/win32/gdiplus/gdiplus.c
index b32ed37..9fe9332 100644 (file)
--- a/reactos/dll/win32/gdiplus/gdiplus.c
+++ b/reactos/dll/win32/gdiplus/gdiplus.c
@@ -235,7 +235,7 @@ INT arc2polybezier(GpPointF * points, REAL x1, REAL y1, REAL x2, REAL y2,
         }
 
         if (points)
-        add_arc_part(&points[i], x1, y1, x2, y2, start_angle, end_angle, i == 0);
+            add_arc_part(&points[i], x1, y1, x2, y2, start_angle, end_angle, i == 0);
 
         start_angle += M_PI_2 * (sweepAngle < 0.0 ? -1.0 : 1.0);
     }

diff --git a/reactos/dll/win32/gdiplus/graphics.c b/reactos/dll/win32/gdiplus/graphics.c
index 5efa58f..df107e4 100644 (file)
--- a/reactos/dll/win32/gdiplus/graphics.c
+++ b/reactos/dll/win32/gdiplus/graphics.c
@@ -222,7 +222,7 @@ static ARGB blend_line_gradient(GpLineGradient* brush, REAL position)
     }
 
     if (brush->pblendcount == 0)
-    return blend_colors(brush->startcolor, brush->endcolor, blendfac);
+        return blend_colors(brush->startcolor, brush->endcolor, blendfac);
     else
     {
         int i=1;
@@ -240,7 +240,7 @@ static ARGB blend_line_gradient(GpLineGradient* brush, REAL position)
         right_blendcolor = brush->pblendcolor[i];
         blendfac = (blendfac - left_blendpos) / (right_blendpos - left_blendpos);
         return blend_colors(left_blendcolor, right_blendcolor, blendfac);
-}
+    }
 }
 
 static void brush_fill_path(GpGraphics *graphics, GpBrush* brush)

diff --git a/reactos/dll/win32/gdiplus/image.c b/reactos/dll/win32/gdiplus/image.c
index 3742b87..5b70918 100644 (file)
--- a/reactos/dll/win32/gdiplus/image.c
+++ b/reactos/dll/win32/gdiplus/image.c
@@ -257,8 +257,8 @@ GpStatus WINGDIPAPI GdipBitmapGetPixel(GpBitmap* bitmap, INT x, INT y,
             break;
         default:
             FIXME("not implemented for format 0x%x\n", bitmap->format);
-    return NotImplemented;
-}
+            return NotImplemented;
+    }
 
     *color = a<<24|r<<16|g<<8|b;
 
@@ -405,8 +405,8 @@ GpStatus WINGDIPAPI GdipBitmapSetPixel(GpBitmap* bitmap, INT x, INT y,
             break;
         default:
             FIXME("not implemented for format 0x%x\n", bitmap->format);
-    return NotImplemented;
-}
+            return NotImplemented;
+    }
 
     return Ok;
 }
@@ -1789,23 +1789,23 @@ static GpStatus decode_image_bmp(IStream* stream, REFCLSID clsid, GpImage **imag
     bitmap = (GpBitmap*)*image;
 
     if (status == Ok && bitmap->format == PixelFormat32bppARGB)
-{
+    {
         /* WIC supports bmp files with alpha, but gdiplus does not */
         bitmap->format = PixelFormat32bppRGB;
     }
 
     return status;
-    }
+}
 
 static GpStatus decode_image_jpeg(IStream* stream, REFCLSID clsid, GpImage **image)
 {
     return decode_image_wic(stream, &CLSID_WICJpegDecoder, image);
-    }
+}
 
 static GpStatus decode_image_png(IStream* stream, REFCLSID clsid, GpImage **image)
-    {
+{
     return decode_image_wic(stream, &CLSID_WICPngDecoder, image);
-    }
+}
 
 static GpStatus decode_image_gif(IStream* stream, REFCLSID clsid, GpImage **image)
 {
@@ -1925,7 +1925,7 @@ GpStatus WINGDIPAPI GdipLoadImageFromStream(IStream* stream, GpImage **image)
     if (stat == Ok)
     {
         memcpy(&(*image)->format, &codec->info.FormatID, sizeof(GUID));
-}
+    }
 
     return stat;
 }

diff --git a/reactos/dll/win32/glu32/glu32.spec b/reactos/dll/win32/glu32/glu32.spec
index 79a6548..e9db336 100644 (file)
--- a/reactos/dll/win32/glu32/glu32.spec
+++ b/reactos/dll/win32/glu32/glu32.spec
@@ -1,53 +1,59 @@
-@ stdcall gluBeginCurve(ptr) 
-@ stdcall gluBeginPolygon(ptr) 
-@ stdcall gluBeginSurface(ptr) 
-@ stdcall gluBeginTrim(ptr) 
-@ stdcall gluBuild1DMipmaps(long long long long long ptr) 
-@ stdcall gluBuild2DMipmaps(long long long long long long ptr) 
-@ stdcall gluCheckExtension(str ptr) 
-@ stdcall gluCylinder(ptr double double double long long) 
-@ stdcall gluDeleteNurbsRenderer(ptr) 
-@ stdcall gluDeleteQuadric(ptr) 
-@ stdcall gluDeleteTess(ptr) 
-@ stdcall gluDisk(ptr double double long long) 
-@ stdcall gluEndCurve(ptr) 
-@ stdcall gluEndPolygon(ptr) 
-@ stdcall gluEndSurface(ptr) 
-@ stdcall gluEndTrim(ptr) 
-@ stdcall gluErrorString(long) 
-@ stub gluErrorUnicodeStringEXT
-@ stdcall gluGetNurbsProperty(ptr long ptr) 
-@ stdcall gluGetString(long) 
-@ stdcall gluGetTessProperty(ptr ptr ptr)
-@ stdcall gluLoadSamplingMatrices(ptr ptr ptr ptr) 
-@ stdcall gluLookAt(double double double double double double double double double) 
-@ stdcall gluNewNurbsRenderer() 
-@ stdcall gluNewQuadric() 
-@ stdcall gluNewTess() 
-@ stdcall gluNextContour(ptr long) 
-@ stdcall gluNurbsCallback(ptr long ptr) 
-@ stdcall gluNurbsCurve(ptr long ptr long ptr long long) 
-@ stdcall gluNurbsProperty(ptr long long) 
-@ stdcall gluNurbsSurface(ptr long ptr long ptr long long ptr long long long) 
-@ stdcall gluOrtho2D(double double double double) 
-@ stdcall gluPartialDisk(ptr double double long long double double) 
-@ stdcall gluPerspective(double double double double) 
-@ stdcall gluPickMatrix(double double double double ptr) 
-@ stdcall gluProject(double double double ptr ptr ptr ptr ptr ptr) 
-@ stdcall gluPwlCurve(ptr long ptr long long) 
-@ stdcall gluQuadricCallback(ptr long ptr) 
-@ stdcall gluQuadricDrawStyle(ptr long) 
-@ stdcall gluQuadricNormals(ptr long) 
-@ stdcall gluQuadricOrientation(ptr long) 
-@ stdcall gluQuadricTexture(ptr long) 
-@ stdcall gluScaleImage(long long long long ptr long long long ptr) 
-@ stdcall gluSphere(ptr double long long) 
-@ stdcall gluTessBeginContour(ptr) 
-@ stdcall gluTessBeginPolygon(ptr ptr) 
-@ stdcall gluTessCallback(ptr long ptr) 
-@ stdcall gluTessEndContour(ptr) 
-@ stdcall gluTessEndPolygon(ptr) 
-@ stdcall gluTessNormal(ptr double double double) 
-@ stdcall gluTessProperty(ptr long double) 
-@ stdcall gluTessVertex(ptr ptr ptr) 
-@ stdcall gluUnProject(double double double ptr ptr ptr ptr ptr ptr) 
\ No newline at end of file
+@ stdcall gluBeginCurve(ptr)
+@ stdcall gluBeginPolygon(ptr)
+@ stdcall gluBeginSurface(ptr)
+@ stdcall gluBeginTrim(ptr)
+@ stdcall gluBuild1DMipmapLevels(long long long long long long long long ptr)
+@ stdcall gluBuild1DMipmaps(long long long long long ptr)
+@ stdcall gluBuild2DMipmapLevels(long long long long long long long long long ptr)
+@ stdcall gluBuild2DMipmaps(long long long long long long ptr)
+@ stdcall gluBuild3DMipmapLevels(long long long long long long long long long long ptr)
+@ stdcall gluBuild3DMipmaps(long long long long long long long ptr)
+@ stdcall gluCheckExtension(str ptr)
+@ stdcall gluCylinder(ptr double double double long long)
+@ stdcall gluDeleteNurbsRenderer(ptr)
+@ stdcall gluDeleteQuadric(ptr)
+@ stdcall gluDeleteTess(ptr)
+@ stdcall gluDisk(ptr double double long long)
+@ stdcall gluEndCurve(ptr)
+@ stdcall gluEndPolygon(ptr)
+@ stdcall gluEndSurface(ptr)
+@ stdcall gluEndTrim(ptr)
+@ stdcall gluErrorString(long)
+@ stdcall gluGetNurbsProperty(ptr long ptr)
+@ stdcall gluGetString(long)
+@ stdcall gluGetTessProperty(ptr long ptr)
+@ stdcall gluLoadSamplingMatrices(ptr ptr ptr ptr)
+@ stdcall gluLookAt(double double double double double double double double double)
+@ stdcall gluNewNurbsRenderer()
+@ stdcall gluNewQuadric()
+@ stdcall gluNewTess()
+@ stdcall gluNextContour(ptr long)
+@ stdcall gluNurbsCallback(ptr long ptr)
+@ stdcall gluNurbsCallbackData(ptr ptr)
+@ stdcall gluNurbsCallbackDataEXT(ptr ptr)
+@ stdcall gluNurbsCurve(ptr long ptr long ptr long long)
+@ stdcall gluNurbsProperty(ptr long long)
+@ stdcall gluNurbsSurface(ptr long ptr long ptr long long ptr long long long)
+@ stdcall gluOrtho2D(double double double double)
+@ stdcall gluPartialDisk(ptr double double long long double double)
+@ stdcall gluPerspective(double double double double)
+@ stdcall gluPickMatrix(double double double double ptr)
+@ stdcall gluProject(double double double ptr ptr ptr ptr ptr ptr)
+@ stdcall gluPwlCurve(ptr long ptr long long)
+@ stdcall gluQuadricCallback(ptr long ptr)
+@ stdcall gluQuadricDrawStyle(ptr long)
+@ stdcall gluQuadricNormals(ptr long)
+@ stdcall gluQuadricOrientation(ptr long)
+@ stdcall gluQuadricTexture(ptr long)
+@ stdcall gluScaleImage(long long long long ptr long long long ptr)
+@ stdcall gluSphere(ptr double long long)
+@ stdcall gluTessBeginContour(ptr)
+@ stdcall gluTessBeginPolygon(ptr ptr)
+@ stdcall gluTessCallback(ptr long ptr)
+@ stdcall gluTessEndContour(ptr)
+@ stdcall gluTessEndPolygon(ptr)
+@ stdcall gluTessNormal(ptr double double double)
+@ stdcall gluTessProperty(ptr long double)
+@ stdcall gluTessVertex(ptr ptr ptr)
+@ stdcall gluUnProject(double double double ptr ptr ptr ptr ptr ptr)
+@ stdcall gluUnProject4(double double double double ptr ptr ptr double double ptr ptr ptr ptr)

diff --git a/reactos/dll/win32/mmdrv/wave.c b/reactos/dll/win32/mmdrv/wave.c
index fb688de..408eb86 100644 (file)
--- a/reactos/dll/win32/mmdrv/wave.c
+++ b/reactos/dll/win32/mmdrv/wave.c
@@ -112,7 +112,7 @@ ReturnCompletedBuffers(SessionInfo* session_info)
             message = (session_info->device_type == WaveOutDevice) ? WOM_DONE :
                                                                      WIM_DATA;
 
-            DPRINT("Notifying client that buffer 0x%x is done\n", header);
+            DPRINT("Notifying client that buffer 0x%p is done\n", header);
 
             /* Notify the client */
             NotifyClient(session_info, message, (DWORD_PTR) header, 0);

diff --git a/reactos/dll/win32/ole32/ole32.spec b/reactos/dll/win32/ole32/ole32.spec
index f39dbb0..79e7686 100644 (file)
--- a/reactos/dll/win32/ole32/ole32.spec
+++ b/reactos/dll/win32/ole32/ole32.spec
@@ -282,4 +282,4 @@
 @ stdcall WriteClassStm(ptr ptr)
 @ stdcall WriteFmtUserTypeStg(ptr long ptr)
 @ stub WriteOleStg
-@ stub WriteStringStream
\ No newline at end of file
+@ stub WriteStringStream

diff --git a/reactos/dll/win32/setupapi/parser.c b/reactos/dll/win32/setupapi/parser.c
index f9ca84b..e1b693d 100644 (file)
--- a/reactos/dll/win32/setupapi/parser.c
+++ b/reactos/dll/win32/setupapi/parser.c
@@ -1906,13 +1906,13 @@ BOOL WINAPI SetupGetIntField( PINFCONTEXT context, DWORD index, PINT result )
     if (!*buffer) *result = 0;
     else
     {
-    res = strtol( buffer, &end, 0 );
+        res = strtol( buffer, &end, 0 );
         if (end != buffer && !*end) *result = res;
         else
-    {
+        {
             SetLastError( ERROR_INVALID_DATA );
             ret = FALSE;
-    }
+        }
     }
 
  done:

diff --git a/reactos/dll/win32/shell32/shell32.rbuild b/reactos/dll/win32/shell32/shell32.rbuild
index f020da5..5276af0 100644 (file)
--- a/reactos/dll/win32/shell32/shell32.rbuild
+++ b/reactos/dll/win32/shell32/shell32.rbuild
@@ -1,5 +1,5 @@
 <group>
-<module name="shell32" type="win32dll" baseaddress="${BASEADDRESS_SHELL32}" installbase="system32" installname="shell32.dll" crt="msvcrt" allowwarnings="true">
+<module name="shell32" type="win32dll" baseaddress="${BASEADDRESS_SHELL32}" installbase="system32" installname="shell32.dll" crt="msvcrt">
        <autoregister infsection="OleControlDlls" type="Both" />
        <importlibrary definition="shell32.spec" />
        <include base="shell32">.</include>

diff --git a/reactos/dll/win32/wdmaud.drv/wdmaud.rbuild b/reactos/dll/win32/wdmaud.drv/wdmaud.rbuild
index 53473c9..69b1f57 100644 (file)
--- a/reactos/dll/win32/wdmaud.drv/wdmaud.rbuild
+++ b/reactos/dll/win32/wdmaud.drv/wdmaud.rbuild
@@ -22,4 +22,4 @@
        <file>mmixer.c</file>
        <file>legacy.c</file>
        <file>wdmaud.rc</file>
-</module>
\ No newline at end of file
+</module>

diff --git a/reactos/dll/win32/ws2_32_new/ws2_32.rbuild b/reactos/dll/win32/ws2_32_new/ws2_32.rbuild
index 5e768ff..2fee79c 100644 (file)
--- a/reactos/dll/win32/ws2_32_new/ws2_32.rbuild
+++ b/reactos/dll/win32/ws2_32_new/ws2_32.rbuild
@@ -1,4 +1,4 @@
-<module name="ws2_32_new" type="win32dll" baseaddress="${BASEADDRESS_WS2_32}" installbase="system32" installname="ws2_32_new.dll" allowwarnings="true">
+<module name="ws2_32_new" type="win32dll" baseaddress="${BASEADDRESS_WS2_32}" installbase="system32" installname="ws2_32_new.dll">
        <importlibrary definition="ws2_32.spec" />
        <include base="ws2_32_new">inc</include>
        <include base="ReactOS">include/reactos/winsock</include>