From 4ce415b730426d37a5ef43c944ac4b9ac657b460 Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Fri, 26 Oct 2007 21:04:25 +0000 Subject: [PATCH] - use our naming scheme for patches --- emulators/wine/patches/patch-ab | 11 ----------- .../wine/patches/patch-dlls_comctl32_treeview_c | 12 ++++++------ emulators/wine/patches/patch-ipc_bit_array_c | 10 +++++----- emulators/wine/patches/patch-misc_winsock_c | 8 ++++---- .../wine/patches/{patch-aa => patch-msdos_dpmi_c} | 7 ++++--- emulators/wine/patches/patch-multimedia_mcicda_c | 12 ++++++++++++ emulators/wine/patches/patch-objects_font_c | 8 ++++---- emulators/wine/patches/patch-ole_ole2nls_c | 8 ++++---- emulators/wine/patches/patch-windows_class_c | 8 ++++---- emulators/wine/patches/patch-windows_dinput_c | 10 +++++----- 10 files changed, 48 insertions(+), 46 deletions(-) delete mode 100644 emulators/wine/patches/patch-ab rename emulators/wine/patches/{patch-aa => patch-msdos_dpmi_c} (85%) create mode 100644 emulators/wine/patches/patch-multimedia_mcicda_c diff --git a/emulators/wine/patches/patch-ab b/emulators/wine/patches/patch-ab deleted file mode 100644 index 0b2702b6ba3..00000000000 --- a/emulators/wine/patches/patch-ab +++ /dev/null @@ -1,11 +0,0 @@ ---- multimedia/mcicda.c.orig Fri Feb 26 23:26:58 1999 -+++ multimedia/mcicda.c Fri Feb 26 23:27:28 1999 -@@ -6,6 +6,8 @@ - * Copyright 1998-99 Eric Pouech - */ - -+#include -+ - #include "winuser.h" - #include "driver.h" - #include "multimedia.h" diff --git a/emulators/wine/patches/patch-dlls_comctl32_treeview_c b/emulators/wine/patches/patch-dlls_comctl32_treeview_c index d3836c71991..bb9547a5d76 100644 --- a/emulators/wine/patches/patch-dlls_comctl32_treeview_c +++ b/emulators/wine/patches/patch-dlls_comctl32_treeview_c @@ -1,7 +1,7 @@ -$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 +$OpenBSD: patch-dlls_comctl32_treeview_c,v 1.2 2007/10/26 21:04:25 ajacoutot Exp $ +--- dlls/comctl32/treeview.c.orig Wed Feb 17 14:51:07 1999 ++++ dlls/comctl32/treeview.c Fri Oct 26 22:55:05 2007 +@@ -1127,7 +1127,7 @@ TREEVIEW_InsertItem32A (WND *wndPtr, WPARAM32 wParam, if (listItems>1) { prevsib=NULL; switch ((INT32)ptdi->hInsertAfter) { @@ -10,7 +10,7 @@ $OpenBSD: patch-dlls_comctl32_treeview_c,v 1.1 2003/12/31 04:21:45 espie Exp $ if (wineItem->parent) { wineItem->sibling=parentItem->firstChild; parentItem->firstChild=(HTREEITEM)iItem; -@@ -1137,7 +1137,7 @@ TREEVIEW_InsertItem32A (WND *wndPtr, WPA +@@ -1137,7 +1137,7 @@ TREEVIEW_InsertItem32A (WND *wndPtr, WPARAM32 wParam, } sibItem->upsibling=(HTREEITEM)iItem; break; @@ -19,7 +19,7 @@ $OpenBSD: patch-dlls_comctl32_treeview_c,v 1.1 2003/12/31 04:21:45 espie Exp $ if (sibItem==wineItem) break; while (sibItem->sibling) { prevsib=sibItem; -@@ -1146,7 +1146,7 @@ TREEVIEW_InsertItem32A (WND *wndPtr, WPA +@@ -1146,7 +1146,7 @@ TREEVIEW_InsertItem32A (WND *wndPtr, WPARAM32 wParam, sibItem->sibling=(HTREEITEM)iItem; wineItem->upsibling=sibItem->hItem; break; diff --git a/emulators/wine/patches/patch-ipc_bit_array_c b/emulators/wine/patches/patch-ipc_bit_array_c index bc6a5404688..6fa08ce149c 100644 --- a/emulators/wine/patches/patch-ipc_bit_array_c +++ b/emulators/wine/patches/patch-ipc_bit_array_c @@ -1,7 +1,7 @@ -$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, +$OpenBSD: patch-ipc_bit_array_c,v 1.2 2007/10/26 21:04:25 ajacoutot Exp $ +--- ipc/bit_array.c.orig Thu Sep 24 05:43:37 1998 ++++ ipc/bit_array.c Fri Oct 26 22:55:06 2007 +@@ -143,9 +143,9 @@ static __inline__ int clear_bit(int bit, int *mem) { int ret; @@ -14,7 +14,7 @@ $OpenBSD: patch-ipc_bit_array_c,v 1.1 2003/12/31 04:21:45 espie Exp $ :"=m" (*mem), "=&r" (ret) :"r" (bit)); return (ret); -@@ -154,9 +154,9 @@ static __inline__ int clear_bit(int bit, +@@ -154,9 +154,9 @@ static __inline__ int clear_bit(int bit, int *mem) static __inline__ int set_bit(int bit, int *mem) { int ret; diff --git a/emulators/wine/patches/patch-misc_winsock_c b/emulators/wine/patches/patch-misc_winsock_c index fd8b2aa5aa1..84a0b019d61 100644 --- a/emulators/wine/patches/patch-misc_winsock_c +++ b/emulators/wine/patches/patch-misc_winsock_c @@ -1,7 +1,7 @@ -$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( +$OpenBSD: patch-misc_winsock_c,v 1.2 2007/10/26 21:04:25 ajacoutot Exp $ +--- misc/winsock.c.orig Sat Feb 20 17:46:39 1999 ++++ misc/winsock.c Fri Oct 26 22:55:06 2007 +@@ -1964,8 +1964,8 @@ HANDLE16 WINAPI WSAAsyncGetHostByName16(HWND16 hWnd, U { LPWSINFO pwsi = wsi_find(GetCurrentTask()); diff --git a/emulators/wine/patches/patch-aa b/emulators/wine/patches/patch-msdos_dpmi_c similarity index 85% rename from emulators/wine/patches/patch-aa rename to emulators/wine/patches/patch-msdos_dpmi_c index 66ca75d7895..26a4d036931 100644 --- a/emulators/wine/patches/patch-aa +++ b/emulators/wine/patches/patch-msdos_dpmi_c @@ -1,5 +1,6 @@ ---- msdos/dpmi.c.orig 1999-02-25 18:32:56.000000000 +0100 -+++ msdos/dpmi.c 2003-12-31 04:57:46.000000000 +0100 +$OpenBSD: patch-msdos_dpmi_c,v 1.1 2007/10/26 21:04:25 ajacoutot Exp $ +--- msdos/dpmi.c.orig Thu Feb 25 18:32:56 1999 ++++ msdos/dpmi.c Fri Oct 26 22:55:04 2007 @@ -20,6 +20,7 @@ #include "process.h" #include "callback.h" @@ -8,7 +9,7 @@ #define DOS_GET_DRIVE(reg) ((reg) ? (reg) - 1 : DRIVE_GetCurrentDrive()) -@@ -211,22 +212,24 @@ static void DPMI_CallRMCBProc( CONTEXT * +@@ -211,22 +212,24 @@ static void DPMI_CallRMCBProc( CONTEXT *context, RMCB * real-mode call structure. */ if (flag & 1) { /* 32-bit DPMI client */ diff --git a/emulators/wine/patches/patch-multimedia_mcicda_c b/emulators/wine/patches/patch-multimedia_mcicda_c new file mode 100644 index 00000000000..e1bb967e252 --- /dev/null +++ b/emulators/wine/patches/patch-multimedia_mcicda_c @@ -0,0 +1,12 @@ +$OpenBSD: patch-multimedia_mcicda_c,v 1.1 2007/10/26 21:04:25 ajacoutot Exp $ +--- multimedia/mcicda.c.orig Mon Feb 22 11:16:00 1999 ++++ multimedia/mcicda.c Fri Oct 26 22:55:05 2007 +@@ -6,6 +6,8 @@ + * Copyright 1998-99 Eric Pouech + */ + ++#include ++ + #include "winuser.h" + #include "driver.h" + #include "multimedia.h" diff --git a/emulators/wine/patches/patch-objects_font_c b/emulators/wine/patches/patch-objects_font_c index f18d9553fb1..d26f111edc2 100644 --- a/emulators/wine/patches/patch-objects_font_c +++ b/emulators/wine/patches/patch-objects_font_c @@ -1,7 +1,7 @@ -$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 +$OpenBSD: patch-objects_font_c,v 1.2 2007/10/26 21:04:25 ajacoutot Exp $ +--- objects/font.c.orig Wed Feb 17 14:51:13 1999 ++++ objects/font.c Fri Oct 26 22:55:06 2007 +@@ -940,17 +940,17 @@ BOOL32 WINAPI GetTextMetrics32A( HDC32 hdc, TEXTMETRIC metrics->tmMaxCharWidth = WDPTOLP(metrics->tmMaxCharWidth); metrics->tmOverhang = WDPTOLP(metrics->tmOverhang); diff --git a/emulators/wine/patches/patch-ole_ole2nls_c b/emulators/wine/patches/patch-ole_ole2nls_c index 15a3a701db3..32741588e5c 100644 --- a/emulators/wine/patches/patch-ole_ole2nls_c +++ b/emulators/wine/patches/patch-ole_ole2nls_c @@ -1,7 +1,7 @@ -$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, +$OpenBSD: patch-ole_ole2nls_c,v 1.2 2007/10/26 21:04:25 ajacoutot Exp $ +--- ole/ole2nls.c.orig Wed Feb 17 14:51:13 1999 ++++ ole/ole2nls.c Fri Oct 26 22:55:07 2007 +@@ -2661,8 +2661,8 @@ static INT32 OLE_GetFormatW(LCID locale, DWORD flags, int datevars=0, timevars=0; /* make a debug report */ diff --git a/emulators/wine/patches/patch-windows_class_c b/emulators/wine/patches/patch-windows_class_c index 239dc6788aa..6a94ccaf192 100644 --- a/emulators/wine/patches/patch-windows_class_c +++ b/emulators/wine/patches/patch-windows_class_c @@ -1,7 +1,7 @@ -$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 +$OpenBSD: patch-windows_class_c,v 1.2 2007/10/26 21:04:25 ajacoutot Exp $ +--- windows/class.c.orig Wed Feb 17 14:51:14 1999 ++++ windows/class.c Fri Oct 26 22:55:07 2007 +@@ -421,8 +421,8 @@ ATOM WINAPI RegisterClass16( const WNDCLASS16 *wc ) return 0; } diff --git a/emulators/wine/patches/patch-windows_dinput_c b/emulators/wine/patches/patch-windows_dinput_c index 9a21a355143..5357e566396 100644 --- a/emulators/wine/patches/patch-windows_dinput_c +++ b/emulators/wine/patches/patch-windows_dinput_c @@ -1,7 +1,7 @@ -$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 +$OpenBSD: patch-windows_dinput_c,v 1.2 2007/10/26 21:04:25 ajacoutot Exp $ +--- windows/dinput.c.orig Wed Feb 24 11:53:30 1999 ++++ windows/dinput.c Fri Oct 26 22:55:07 2007 +@@ -382,7 +382,7 @@ static HRESULT WINAPI SysKeyboardAImpl_SetProperty( ph->dwSize,ph->dwHeaderSize,ph->dwObj,ph->dwHow); if (!HIWORD(rguid)) { switch ((DWORD)rguid) { @@ -10,7 +10,7 @@ $OpenBSD: patch-windows_dinput_c,v 1.1 2003/12/31 04:21:45 espie Exp $ LPCDIPROPDWORD pd = (LPCDIPROPDWORD)ph; TRACE(dinput,"(buffersize=%ld)\n",pd->dwData); -@@ -1068,7 +1068,7 @@ static HRESULT WINAPI SysMouseAImpl_SetP +@@ -1068,7 +1068,7 @@ static HRESULT WINAPI SysMouseAImpl_SetProperty(LPDIRE if (!HIWORD(rguid)) { switch ((DWORD)rguid) {