Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-25 01:39:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

reduce differences to trunk

Browse source 
svn path=/branches/ros-amd64-bringup/; revision=44779
This commit is contained in:
Timo Kreuzer 2009-12-27 22:06:48 +00:00
parent 5f039ce636
commit ea9bdd25e8
13 changed files with 89 additions and 84 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/dll/win32/beepmidi/beepmidi.c
View file

@ -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;
}

1
reactos/dll/win32/comctl32/commctrl.c
View file

@ -707,7 +707,6 @@ CreateUpDownControl (DWORD style, INT x, INT y, INT cx, INT cy,
VOID WINAPI
InitCommonControls (void)
{
return;
}

16
reactos/dll/win32/gdiplus/brush.c
View file

@ -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
{

2
reactos/dll/win32/gdiplus/gdiplus.c
View file

@ -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);
}

4
reactos/dll/win32/gdiplus/graphics.c
View file

@ -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)

20
reactos/dll/win32/gdiplus/image.c
View file

@ -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;
}

112
reactos/dll/win32/glu32/glu32.spec
View file

@ -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)
@ 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)

2
reactos/dll/win32/mmdrv/wave.c
View file

@ -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);

2
reactos/dll/win32/ole32/ole32.spec
View file

@ -282,4 +282,4 @@
@ stdcall WriteClassStm(ptr ptr)
@ stdcall WriteFmtUserTypeStg(ptr long ptr)
@ stub WriteOleStg
@ stub WriteStringStream
@ stub WriteStringStream

6
reactos/dll/win32/setupapi/parser.c
View file

@ -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:

2
reactos/dll/win32/shell32/shell32.rbuild
View file

@ -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>

2
reactos/dll/win32/wdmaud.drv/wdmaud.rbuild
View file

@ -22,4 +22,4 @@
<file>mmixer.c</file>
<file>legacy.c</file>
<file>wdmaud.rc</file>
</module>
</module>

2
reactos/dll/win32/ws2_32_new/ws2_32.rbuild
View file

@ -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>