cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make it compile with gcc 3.3

Browse Source
This commit is contained in:
espie 2003-12-31 04:21:45 +00:00
parent 02ad252de6
commit 50feb7053c
11 changed files with 227 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
emulators/wine/patches/patch-aa
View File

@ -1,5 +1,5 @@
--- msdos/dpmi.c.orig Thu Feb 25 14:32:56 1999 --- msdos/dpmi.c.orig 1999-02-25 18:32:56.000000000 +0100
+++ msdos/dpmi.c Tue Nov 9 02:42:00 1999 +++ msdos/dpmi.c 2003-12-31 04:57:46.000000000 +0100
@@ -20,6 +20,7 @@ @@ -20,6 +20,7 @@
#include "process.h" #include "process.h"
#include "callback.h" #include "callback.h"
@ -8,20 +8,34 @@
#define DOS_GET_DRIVE(reg) ((reg) ? (reg) - 1 : DRIVE_GetCurrentDrive()) #define DOS_GET_DRIVE(reg) ((reg) ? (reg) - 1 : DRIVE_GetCurrentDrive())
@@ -212,6 +213,7 @@ @@ -211,22 +212,24 @@ static void DPMI_CallRMCBProc( CONTEXT *
* real-mode call structure. */
if (flag & 1) { if (flag & 1) {
/* 32-bit DPMI client */ /* 32-bit DPMI client */
__asm__ __volatile__(" - __asm__ __volatile__("
+ pushl %%si - pushl %%es
pushl %%es - pushl %%ds
pushl %%ds - pushfl
pushfl - movl %4,%%es
@@ -221,12 +223,13 @@ - movl %3,%%ds
popl %%ds - lcall %2
movl %%es,%0 - popl %%ds
popl %%es - movl %%es,%0
+ popl %%si - popl %%es
" - "
+ __asm__ __volatile__("\n"
+" pushl %%si\n"
+" pushl %%es\n"
+" pushl %%ds\n"
+" pushfl\n"
+" movl %4,%%es\n"
+" movl %3,%%ds\n"
+" lcall %2\n"
+" popl %%ds\n"
+" movl %%es,%0\n"
+" popl %%es\n"
+" popl %%si\n"
+" "
: "=g" (es), "=D" (edi) : "=g" (es), "=D" (edi)
: "m" (rmcb->proc_ofs), : "m" (rmcb->proc_ofs),
"g" (ss), "g" (rmcb->regs_sel), "g" (ss), "g" (rmcb->regs_sel),

30
emulators/wine/patches/patch-dlls_comctl32_treeview_c Normal file
View File

@ -0,0 +1,30 @@
$OpenBSD: patch-dlls_comctl32_treeview_c,v 1.1 2003/12/31 04:21:45 espie Exp $
--- dlls/comctl32/treeview.c.orig 2003-12-31 04:42:42.000000000 +0100
+++ dlls/comctl32/treeview.c 2003-12-31 04:43:02.000000000 +0100
@@ -1127,7 +1127,7 @@ TREEVIEW_InsertItem32A (WND *wndPtr, WPA
if (listItems>1) {
prevsib=NULL;
switch ((INT32)ptdi->hInsertAfter) {
- case TVI_FIRST:
+ case (INT32)TVI_FIRST:
if (wineItem->parent) {
wineItem->sibling=parentItem->firstChild;
parentItem->firstChild=(HTREEITEM)iItem;
@@ -1137,7 +1137,7 @@ TREEVIEW_InsertItem32A (WND *wndPtr, WPA
}
sibItem->upsibling=(HTREEITEM)iItem;
break;
- case TVI_LAST:
+ case (INT32)TVI_LAST:
if (sibItem==wineItem) break;
while (sibItem->sibling) {
prevsib=sibItem;
@@ -1146,7 +1146,7 @@ TREEVIEW_InsertItem32A (WND *wndPtr, WPA
sibItem->sibling=(HTREEITEM)iItem;
wineItem->upsibling=sibItem->hItem;
break;
- case TVI_SORT:
+ case (INT32)TVI_SORT:
FIXME (treeview, "Sorted insert not implemented yet\n");
break;
default:

21
emulators/wine/patches/patch-if1632_thunk_c Normal file
View File

@ -0,0 +1,21 @@
$OpenBSD: patch-if1632_thunk_c,v 1.1 2003/12/31 04:21:45 espie Exp $
--- if1632/thunk.c.orig 2003-12-31 05:04:32.000000000 +0100
+++ if1632/thunk.c 2003-12-31 05:05:00.000000000 +0100
@@ -863,7 +863,7 @@ void THUNK_InitCallout(void)
if ( hModule )
{
#define GETADDR( var, name ) \
- *(FARPROC32 *)&Callout.##var = GetProcAddress32( hModule, name )
+ *(FARPROC32 *)&Callout.var = GetProcAddress32( hModule, name )
GETADDR( PeekMessage32A, "PeekMessageA" );
GETADDR( PeekMessage32W, "PeekMessageW" );
@@ -887,7 +887,7 @@ void THUNK_InitCallout(void)
if ( hModule )
{
#define GETADDR( var, name, thk ) \
- *(FARPROC32 *)&Callout.##var = (FARPROC32) \
+ *(FARPROC32 *)&Callout.var = (FARPROC32) \
THUNK_Alloc( WIN32_GetProcAddress16( hModule, name ), \
(RELAY)CallTo16_##thk )

12
emulators/wine/patches/patch-include_sysmetrics_h Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-include_sysmetrics_h,v 1.1 2003/12/31 04:21:45 espie Exp $
--- include/sysmetrics.h.orig 2003-12-31 04:43:28.000000000 +0100
+++ include/sysmetrics.h 2003-12-31 04:43:35.000000000 +0100
@@ -43,7 +43,7 @@
#define SYSMETRICS_CXMINTRACK 100
#define SYSMETRICS_CYMINTRACK 28
#endif
-#endif 0
+#endif /* 0 */
/* Some non-constant system metrics */
#define SYSMETRICS_CXSCREEN sysMetrics[SM_CXSCREEN] /* 0 */

12
emulators/wine/patches/patch-include_wintypes_h Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-include_wintypes_h,v 1.1 2003/12/31 04:21:45 espie Exp $
--- include/wintypes.h.orig 2003-12-31 04:37:32.000000000 +0100
+++ include/wintypes.h 2003-12-31 04:37:54.000000000 +0100
@@ -61,7 +61,7 @@ extern "C" {
/* Calling conventions definitions */
#ifdef __i386__
-# if defined(__GNUC__) && (__GNUC__ == 2) && (__GNUC_MINOR__ >= 7)
+# if defined(__GNUC__) && ((__GNUC__ == 2) && (__GNUC_MINOR__ >= 7)) || (__GNUC__ >= 3)
# define __stdcall __attribute__((__stdcall__))
# define __cdecl __attribute__((__cdecl__))
# define __RESTORE_ES __asm__ __volatile__("pushl %ds\n\tpopl %es")

29
emulators/wine/patches/patch-ipc_bit_array_c Normal file
View File

@ -0,0 +1,29 @@
$OpenBSD: patch-ipc_bit_array_c,v 1.1 2003/12/31 04:21:45 espie Exp $
--- ipc/bit_array.c.orig 2003-12-31 04:53:17.000000000 +0100
+++ ipc/bit_array.c 2003-12-31 04:53:37.000000000 +0100
@@ -143,9 +143,9 @@ static __inline__ int clear_bit(int bit,
{
int ret;
- __asm__("xor %1,%1
- btrl %2,%0
- adcl %1,%1"
+ __asm__("xor %1,%1\n"
+" btrl %2,%0\n"
+" adcl %1,%1"
:"=m" (*mem), "=&r" (ret)
:"r" (bit));
return (ret);
@@ -154,9 +154,9 @@ static __inline__ int clear_bit(int bit,
static __inline__ int set_bit(int bit, int *mem)
{
int ret;
- __asm__("xor %1,%1
- btsl %2,%0
- adcl %1,%1"
+ __asm__("xor %1,%1\n"
+" btsl %2,%0\n"
+" adcl %1,%1"
:"=m" (*mem), "=&r" (ret)
:"r" (bit));
return (ret);

14
emulators/wine/patches/patch-misc_winsock_c Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-misc_winsock_c,v 1.1 2003/12/31 04:21:45 espie Exp $
--- misc/winsock.c.orig 2003-12-31 04:56:34.000000000 +0100
+++ misc/winsock.c 2003-12-31 04:56:42.000000000 +0100
@@ -1964,8 +1964,8 @@ HANDLE16 WINAPI WSAAsyncGetHostByName16(
{
LPWSINFO pwsi = wsi_find(GetCurrentTask());
- TRACE(winsock, "(%08x): hwnd %04x, msg %04x, host %s,
-buffer %i\n", (unsigned)pwsi, hWnd, uMsg, (name)?name:NULL_STRING, (int)buflen );
+ TRACE(winsock, "(%08x): hwnd %04x, msg %04x, host %s, \n"
+"buffer %i\n", (unsigned)pwsi, hWnd, uMsg, (name)?name:NULL_STRING, (int)buflen );
if( pwsi )
return __WSAsyncDBQuery(pwsi, hWnd, uMsg, 0, name, 0,

32
emulators/wine/patches/patch-objects_font_c Normal file
View File

@ -0,0 +1,32 @@
$OpenBSD: patch-objects_font_c,v 1.1 2003/12/31 04:21:45 espie Exp $
--- objects/font.c.orig 2003-12-31 04:58:55.000000000 +0100
+++ objects/font.c 2003-12-31 04:59:17.000000000 +0100
@@ -940,17 +940,17 @@ BOOL32 WINAPI GetTextMetrics32A( HDC32 h
metrics->tmMaxCharWidth = WDPTOLP(metrics->tmMaxCharWidth);
metrics->tmOverhang = WDPTOLP(metrics->tmOverhang);
- TRACE(font,"text metrics:
- Weight = %03i\t FirstChar = %03i\t AveCharWidth = %i
- Italic = % 3i\t LastChar = %03i\t\t MaxCharWidth = %i
- UnderLined = %01i\t DefaultChar = %03i\t Overhang = %i
- StruckOut = %01i\t BreakChar = %03i\t CharSet = %i
- PitchAndFamily = %02x
- --------------------
- InternalLeading = %i
- Ascent = %i
- Descent = %i
- Height = %i\n",
+ TRACE(font,"text metrics:\n"
+" Weight = %03i\t FirstChar = %03i\t AveCharWidth = %i\n"
+" Italic = % 3i\t LastChar = %03i\t\t MaxCharWidth = %i\n"
+" UnderLined = %01i\t DefaultChar = %03i\t Overhang = %i\n"
+" StruckOut = %01i\t BreakChar = %03i\t CharSet = %i\n"
+" PitchAndFamily = %02x\n"
+" --------------------\n"
+" InternalLeading = %i\n"
+" Ascent = %i\n"
+" Descent = %i\n"
+" Height = %i\n",
metrics->tmWeight, metrics->tmFirstChar, metrics->tmAveCharWidth,
metrics->tmItalic, metrics->tmLastChar, metrics->tmMaxCharWidth,
metrics->tmUnderlined, metrics->tmDefaultChar, metrics->tmOverhang,

14
emulators/wine/patches/patch-ole_ole2nls_c Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-ole_ole2nls_c,v 1.1 2003/12/31 04:21:45 espie Exp $
--- ole/ole2nls.c.orig 2003-12-31 04:59:48.000000000 +0100
+++ ole/ole2nls.c 2003-12-31 04:59:54.000000000 +0100
@@ -2661,8 +2661,8 @@ static INT32 OLE_GetFormatW(LCID locale,
int datevars=0, timevars=0;
/* make a debug report */
- TRACE(ole, "args: 0x%lx, 0x%lx, 0x%lx, time(d=%d,h=%d,m=%d,s=%d), fmt:%s (at %p),
- %p with max len %d\n",
+ TRACE(ole, "args: 0x%lx, 0x%lx, 0x%lx, time(d=%d,h=%d,m=%d,s=%d), fmt:%s (at %p),\n"
+" %p with max len %d\n",
locale, flags, tflags,
xtime->wDay, xtime->wHour, xtime->wMinute, xtime->wSecond,
debugstr_w(format), format, output, outlen);

14
emulators/wine/patches/patch-windows_class_c Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-windows_class_c,v 1.1 2003/12/31 04:21:45 espie Exp $
--- windows/class.c.orig 2003-12-31 05:01:45.000000000 +0100
+++ windows/class.c 2003-12-31 05:01:52.000000000 +0100
@@ -421,8 +421,8 @@ ATOM WINAPI RegisterClass16( const WNDCL
return 0;
}
- TRACE(class, "atom=%04x wndproc=%08lx hinst=%04x
-bg=%04x style=%08x clsExt=%d winExt=%d class=%p name='%s'\n",
+ TRACE(class, "atom=%04x wndproc=%08lx hinst=%04x\n"
+"bg=%04x style=%08x clsExt=%d winExt=%d class=%p name='%s'\n",
atom, (DWORD)wc->lpfnWndProc, hInstance,
wc->hbrBackground, wc->style, wc->cbClsExtra,
wc->cbWndExtra, classPtr,

21
emulators/wine/patches/patch-windows_dinput_c Normal file
View File

@ -0,0 +1,21 @@
$OpenBSD: patch-windows_dinput_c,v 1.1 2003/12/31 04:21:45 espie Exp $
--- windows/dinput.c.orig 2003-12-31 05:02:09.000000000 +0100
+++ windows/dinput.c 2003-12-31 05:02:35.000000000 +0100
@@ -382,7 +382,7 @@ static HRESULT WINAPI SysKeyboardAImpl_S
ph->dwSize,ph->dwHeaderSize,ph->dwObj,ph->dwHow);
if (!HIWORD(rguid)) {
switch ((DWORD)rguid) {
- case DIPROP_BUFFERSIZE: {
+ case (DWORD)DIPROP_BUFFERSIZE: {
LPCDIPROPDWORD pd = (LPCDIPROPDWORD)ph;
TRACE(dinput,"(buffersize=%ld)\n",pd->dwData);
@@ -1068,7 +1068,7 @@ static HRESULT WINAPI SysMouseAImpl_SetP
if (!HIWORD(rguid)) {
switch ((DWORD)rguid) {
- case DIPROP_BUFFERSIZE: {
+ case (DWORD)DIPROP_BUFFERSIZE: {
LPCDIPROPDWORD pd = (LPCDIPROPDWORD)ph;
TRACE(dinput,"buffersize = %ld\n",pd->dwData);