Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-27 17:44:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

Avoid ReactOS changes getting lost

Browse source 
svn path=/trunk/; revision=8699
This commit is contained in:
Gé van Geldorp 2004-03-14 09:17:53 +00:00
parent ff837bae4a
commit 8dc9f6bf9c
2 changed files with 34 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
reactos/lib/comctl32/winehq2ros.patch
View file

@ -4,7 +4,7 @@ RCS file: /home/wine/wine/dlls/comctl32/comctl32.spec,v
retrieving revision 1.43
diff -u -r1.43 comctl32.spec
--- comctl32.spec 20 Feb 2004 05:16:37 -0000 1.43
+++ comctl32.spec 11 Mar 2004 11:16:16 -0000
+++ comctl32.spec 14 Mar 2004 09:18:35 -0000
@@ -106,13 +106,13 @@
412 stdcall RemoveWindowSubclass(long ptr long)
413 stdcall DefSubclassProc(long long long long)
@ -26,13 +26,28 @@ diff -u -r1.43 comctl32.spec
# Functions imported by name
Index: listview.c
===================================================================
RCS file: /home/wine/wine/dlls/comctl32/listview.c,v
retrieving revision 1.384
diff -u -r1.384 listview.c
--- listview.c 20 Feb 2004 05:12:49 -0000 1.384
+++ listview.c 14 Mar 2004 09:18:43 -0000
@@ -147,6 +147,7 @@
#include <assert.h>
#include <ctype.h>
#include <string.h>
+#include <stddef.h>
#include <stdlib.h>
#include <stdarg.h>
#include <stdio.h>
Index: rebar.c
===================================================================
RCS file: /home/wine/wine/dlls/comctl32/rebar.c,v
retrieving revision 1.85
diff -u -r1.85 rebar.c
--- rebar.c 27 Feb 2004 04:32:54 -0000 1.85
+++ rebar.c 11 Mar 2004 11:16:19 -0000
+++ rebar.c 14 Mar 2004 09:18:47 -0000
@@ -985,7 +985,7 @@
}
@ -67,7 +82,7 @@ RCS file: /home/wine/wine/dlls/comctl32/string.c,v
retrieving revision 1.3
diff -u -r1.3 string.c
--- string.c 20 Feb 2004 19:58:39 -0000 1.3
+++ string.c 11 Mar 2004 11:16:19 -0000
+++ string.c 14 Mar 2004 09:18:48 -0000
@@ -254,7 +254,7 @@
{
TRACE("(%s,%s)\n", debugstr_w(lpszStr), debugstr_w(lpszSearch));
@ -86,19 +101,3 @@ diff -u -r1.3 string.c
}
/*************************************************************************
Index: toolbar.c
===================================================================
RCS file: /home/wine/wine/dlls/comctl32/toolbar.c,v
retrieving revision 1.160
diff -u -r1.160 toolbar.c
--- toolbar.c 7 Mar 2004 03:13:26 -0000 1.160
+++ toolbar.c 11 Mar 2004 11:16:21 -0000
@@ -2299,7 +2299,7 @@
TRACE ("creating default image list!\n");
himlDef = ImageList_Create (infoPtr->nBitmapWidth, infoPtr->nBitmapHeight,
- ILC_COLOR | ILC_MASK, nButtons, 2);
+ ILC_COLORDDB | ILC_MASK, nButtons, 2);
TOOLBAR_InsertImageList(&infoPtr->himlDef, &infoPtr->cimlDef, himlDef, 0);
infoPtr->himlInt = himlDef;
}

17
reactos/lib/ole32/winehq2ros.patch
View file

@ -4,7 +4,7 @@ RCS file: /home/wine/wine/dlls/ole32/ifs.h,v
retrieving revision 1.11
diff -u -r1.11 ifs.h
--- ifs.h 23 Jan 2004 22:51:42 -0000 1.11
+++ ifs.h 28 Jan 2004 21:32:28 -0000
+++ ifs.h 14 Mar 2004 09:24:36 -0000
@@ -35,6 +35,7 @@
typedef struct IMalloc16 IMalloc16, *LPMALLOC16;
@ -13,3 +13,18 @@ diff -u -r1.11 ifs.h
#define INTERFACE IMalloc16
#define IMalloc16_METHODS \
IUnknown_METHODS \
Index: oleproxy.c
===================================================================
RCS file: /home/wine/wine/dlls/ole32/oleproxy.c,v
retrieving revision 1.13
diff -u -r1.13 oleproxy.c
--- oleproxy.c 23 Jan 2004 01:51:34 -0000 1.13
+++ oleproxy.c 14 Mar 2004 09:24:39 -0000
@@ -35,6 +35,7 @@
#include <stdlib.h>
#include <stdarg.h>
+#include <stddef.h>
#include <stdio.h>
#include <string.h>