Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (a0ac7f2f4dbc6dd798a2a26cbb291ef221778b14)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (a0ac7f2f4dbc6dd798a2a26cbb291ef221778b14)
  • Date: Thu, 25 Jul 2013 12:51:47 -0500

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

x11-libs/wine/HISTORY | 3 +++
x11-libs/wine/sc2-login.diff | 33 ++++++++++++---------------------
2 files changed, 15 insertions(+), 21 deletions(-)

New commits:
commit a0ac7f2f4dbc6dd798a2a26cbb291ef221778b14
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

wine: sc2-login.diff updated to apply cleanly to 1.6

diff --git a/x11-libs/wine/HISTORY b/x11-libs/wine/HISTORY
index 5e0e664..1d50564 100644
--- a/x11-libs/wine/HISTORY
+++ b/x11-libs/wine/HISTORY
@@ -1,3 +1,6 @@
+2013-07-24 Eric Sandall <sandalle AT sourcemage.org>
+ * sc2-login.diff: Updated to apply cleanly to 1.6
+
2013-07-19 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.6
* DEPENDS: openssl removed
diff --git a/x11-libs/wine/sc2-login.diff b/x11-libs/wine/sc2-login.diff
index 3c78df8..7a42b6e 100644
--- a/x11-libs/wine/sc2-login.diff
+++ b/x11-libs/wine/sc2-login.diff
@@ -1,15 +1,9 @@
# http://appdb.winehq.org/objectManager.php?sClass=version&iId=19376
# http://www.winehq.org/pipermail/wine-patches/2010-March/085817.html
----
- dlls/kernel32/tests/debugger.c | 98
+++++++++++++++++++++++++++++++++++++++-
- dlls/ntdll/loader.c | 7 ++-
- 2 files changed, 101 insertions(+), 4 deletions(-)
-
-diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c
-index 057b977..f9b3889 100644
---- a/dlls/kernel32/tests/debugger.c
-+++ b/dlls/kernel32/tests/debugger.c
-@@ -555,8 +555,10 @@ static void doChild(int argc, char **argv)
+diff -Naur wine-1.6.orig/dlls/kernel32/tests/debugger.c
wine-1.6/dlls/kernel32/tests/debugger.c
+--- wine-1.6.orig/dlls/kernel32/tests/debugger.c 2013-07-18
10:57:36.000000000 -0700
++++ wine-1.6/dlls/kernel32/tests/debugger.c 2013-07-24 11:46:32.712785675
-0700
+@@ -605,8 +605,10 @@
static void test_debug_loop(int argc, char **argv)
{
const char *arguments = " debugger child ";
@@ -20,7 +14,7 @@ index 057b977..f9b3889 100644
PROCESS_INFORMATION pi;
STARTUPINFOA si;
BOOL debug;
-@@ -597,13 +599,107 @@ static void test_debug_loop(int argc, char **argv)
+@@ -647,13 +649,107 @@
ok(ret, "WaitForDebugEvent failed, last error %#x.\n",
GetLastError());
if (!ret) break;

@@ -129,11 +123,10 @@ index 057b977..f9b3889 100644
ret = CloseHandle(pi.hThread);
ok(ret, "CloseHandle failed, last error %#x.\n", GetLastError());
ret = CloseHandle(pi.hProcess);
-diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
-index 1723f18..fbdda00 100644
---- a/dlls/ntdll/loader.c
-+++ b/dlls/ntdll/loader.c
-@@ -2533,10 +2533,14 @@ PIMAGE_NT_HEADERS WINAPI RtlImageNtHeader(HMODULE
hModule)
+diff -Naur wine-1.6.orig/dlls/ntdll/loader.c wine-1.6/dlls/ntdll/loader.c
+--- wine-1.6.orig/dlls/ntdll/loader.c 2013-07-18 10:57:36.000000000 -0700
++++ wine-1.6/dlls/ntdll/loader.c 2013-07-24 11:46:32.713785683 -0700
+@@ -2612,10 +2612,14 @@
*/
static NTSTATUS attach_process_dlls( void *wm )
{
@@ -148,15 +141,15 @@ index 1723f18..fbdda00 100644
RtlEnterCriticalSection( &loader_section );
if ((status = process_attach( wm, (LPVOID)1 )) != STATUS_SUCCESS)
{
-@@ -2622,7 +2626,6 @@ void WINAPI LdrInitializeThunk( void *kernel_start,
ULONG_PTR unknown2,
+@@ -2701,7 +2705,6 @@
static const WCHAR globalflagW[] =
{'G','l','o','b','a','l','F','l','a','g',0};
NTSTATUS status;
WINE_MODREF *wm;
- LPCWSTR load_path;
PEB *peb = NtCurrentTeb()->Peb;
- IMAGE_NT_HEADERS *nt = RtlImageNtHeader( peb->ImageBaseAddress );

-@@ -2652,8 +2655,6 @@ void WINAPI LdrInitializeThunk( void *kernel_start,
ULONG_PTR unknown2,
+ if (main_exe_file) NtClose( main_exe_file ); /* at this point the main
module is created */
+@@ -2733,8 +2736,6 @@
if ((status = server_init_process_done()) != STATUS_SUCCESS) goto error;

actctx_init();
@@ -165,5 +158,3 @@ index 1723f18..fbdda00 100644
if ((status = alloc_process_tls()) != STATUS_SUCCESS) goto error;
if ((status = alloc_thread_tls()) != STATUS_SUCCESS) goto error;
heap_set_debug_flags( GetProcessHeap() );
---
-1.6.4.4



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (a0ac7f2f4dbc6dd798a2a26cbb291ef221778b14), Eric Sandall, 07/25/2013

Archive powered by MHonArc 2.6.24.

Top of Page