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

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

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

@ -2,8 +2,12 @@
@ 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)
@ -15,10 +19,9 @@
@ 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 gluGetTessProperty(ptr long ptr)
@ stdcall gluLoadSamplingMatrices(ptr ptr ptr ptr)
@ stdcall gluLookAt(double double double double double double double double double)
@ stdcall gluNewNurbsRenderer()
@ -26,6 +29,8 @@
@ 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)
@ -51,3 +56,4 @@
@ 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/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/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>