From 5aa8486265d1069ae57cbdd641550848a84b8674 Mon Sep 17 00:00:00 2001 From: "Markus F.X.J. Oberhumer" Date: Tue, 14 Feb 2006 14:48:37 +0000 Subject: [PATCH] Prefer restoring the original protection flags. committer: mfx 1139928517 +0000 --- src/stub/l_w32pe.asm | 2 +- src/stub/l_w32pe.h | 36 ++++++++++++++++++------------------ 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/stub/l_w32pe.asm b/src/stub/l_w32pe.asm index 810a65e7..b52731ba 100644 --- a/src/stub/l_w32pe.asm +++ b/src/stub/l_w32pe.asm @@ -215,7 +215,7 @@ relhi0: and byte [edi + 'SWRI'], 0x7f - %if 1 + %if 0 push esp push byte 2 ; PAGE_READONLY %else diff --git a/src/stub/l_w32pe.h b/src/stub/l_w32pe.h index 00197886..cc912af0 100644 --- a/src/stub/l_w32pe.h +++ b/src/stub/l_w32pe.h @@ -28,8 +28,8 @@ #define NRV_LOADER_SIZE 4365 -#define NRV_LOADER_ADLER32 0xe06f16df -#define NRV_LOADER_CRC32 0x695701fd +#define NRV_LOADER_ADLER32 0xa5491778 +#define NRV_LOADER_CRC32 0xb0249332 unsigned char nrv_loader[4365] = { 128,124, 36, 8, 1, 15,133, 0, 0, 0, 0, 96,190, 69, 83, 73, /* 0x 0 */ @@ -104,12 +104,12 @@ unsigned char nrv_loader[4365] = { 173, 9,192,117,247,193,233, 16,169,102, 1, 12, 7,173, 9,192, /* 0x 450 */ 117,247,139,174, 86, 80, 82, 79,141,190, 73, 77, 71, 66,187, 0, /* 0x 460 */ 16, 0, 0, 80, 84,106, 4, 83, 87,255,213,128,167, 83, 87, 82, /* 0x 470 */ - 73,127, 84,106, 2, 83, 87,255,213, 88, 97,141, 68, 36,128,106, /* 0x 480 */ - 0, 57,196,117,250,131,236,128, 80,141, 68, 36,128,106, 0, 57, /* 0x 490 */ -196,117,250,131,236,128, 88,106, 0,131,196, 4, 49,192, 64,194, /* 0x 4a0 */ - 12, 0,233, 74, 77, 80, 79, 85, 80, 88, 33,161,216,208,213, 0, /* 0x 4b0 */ + 73,127, 88, 80, 84, 80, 83, 87,255,213, 88, 97,141, 68, 36,128, /* 0x 480 */ +106, 0, 57,196,117,250,131,236,128, 80,141, 68, 36,128,106, 0, /* 0x 490 */ + 57,196,117,250,131,236,128, 88,106, 0,131,196, 4, 49,192, 64, /* 0x 4a0 */ +194, 12, 0,233, 74, 77, 80, 79, 85, 80, 88, 33,161,216,208,213, /* 0x 4b0 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x 4c0 */ - 0, 0, 0, 0, 0, 0, 45, 0, 80, 69, 73, 83, 68, 76, 76, 49, /* 0x 4d0 */ + 0, 0, 0, 0, 0, 0, 0, 45, 80, 69, 73, 83, 68, 76, 76, 49, /* 0x 4d0 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 80, 69, 77, /* 0x 4e0 */ 65, 73, 78, 50, 49, 0, 0, 0, 0, 0, 80, 69, 77, 65, 73, 78, /* 0x 4f0 */ 48, 49, 0, 11, 0, 0, 0, 80, 69, 73, 67, 79, 78, 83, 49, 0, /* 0x 500 */ @@ -292,17 +292,17 @@ unsigned char nrv_loader[4365] = { 90, 0, 85, 4, 0, 0, 80, 69, 82, 69, 76, 72, 73, 48, 0, 85, /* 0x1010 */ 4, 0, 0, 80, 69, 82, 69, 76, 72, 73, 90, 0, 98, 4, 0, 0, /* 0x1020 */ 80, 69, 68, 69, 80, 72, 65, 75, 0, 98, 4, 0, 0, 80, 69, 68, /* 0x1030 */ - 69, 80, 72, 65, 88, 0,138, 4, 0, 0, 80, 69, 77, 65, 73, 78, /* 0x1040 */ - 50, 48, 0,138, 4, 0, 0, 80, 69, 82, 69, 84, 85, 82, 78, 95, /* 0x1050 */ - 67, 76, 69, 65, 82, 83, 84, 65, 67, 75, 0,139, 4, 0, 0, 80, /* 0x1060 */ + 69, 80, 72, 65, 88, 0,139, 4, 0, 0, 80, 69, 77, 65, 73, 78, /* 0x1040 */ + 50, 48, 0,139, 4, 0, 0, 80, 69, 82, 69, 84, 85, 82, 78, 95, /* 0x1050 */ + 67, 76, 69, 65, 82, 83, 84, 65, 67, 75, 0,140, 4, 0, 0, 80, /* 0x1060 */ 69, 82, 69, 84, 85, 82, 78, 95, 67, 76, 69, 65, 82, 83, 84, 65, /* 0x1070 */ - 67, 75, 57, 0,152, 4, 0, 0, 80, 69, 68, 79, 74, 85, 77, 80, /* 0x1080 */ - 95, 67, 76, 69, 65, 82, 83, 84, 65, 67, 75, 0,152, 4, 0, 0, /* 0x1090 */ + 67, 75, 57, 0,153, 4, 0, 0, 80, 69, 68, 79, 74, 85, 77, 80, /* 0x1080 */ + 95, 67, 76, 69, 65, 82, 83, 84, 65, 67, 75, 0,153, 4, 0, 0, /* 0x1090 */ 80, 69, 68, 79, 74, 85, 77, 80, 95, 67, 76, 69, 65, 82, 83, 84, /* 0x10a0 */ - 65, 67, 75, 57, 0,172, 4, 0, 0, 80, 69, 77, 65, 73, 78, 50, /* 0x10b0 */ - 49, 0,172, 4, 0, 0, 80, 69, 82, 69, 84, 85, 82, 78, 0,172, /* 0x10c0 */ - 4, 0, 0, 80, 69, 68, 79, 74, 85, 77, 80, 0,178, 4, 0, 0, /* 0x10d0 */ - 80, 69, 68, 85, 77, 77, 89, 51, 0,183, 4, 0, 0, 85, 80, 88, /* 0x10e0 */ - 49, 72, 69, 65, 68, 0,183, 4, 0, 0, 80, 69, 84, 72, 69, 69, /* 0x10f0 */ - 78, 68, 0,215, 4, 0, 0,255,255,255,255,215, 4 /* 0x1100 */ + 65, 67, 75, 57, 0,173, 4, 0, 0, 80, 69, 77, 65, 73, 78, 50, /* 0x10b0 */ + 49, 0,173, 4, 0, 0, 80, 69, 82, 69, 84, 85, 82, 78, 0,173, /* 0x10c0 */ + 4, 0, 0, 80, 69, 68, 79, 74, 85, 77, 80, 0,179, 4, 0, 0, /* 0x10d0 */ + 80, 69, 68, 85, 77, 77, 89, 51, 0,184, 4, 0, 0, 85, 80, 88, /* 0x10e0 */ + 49, 72, 69, 65, 68, 0,184, 4, 0, 0, 80, 69, 84, 72, 69, 69, /* 0x10f0 */ + 78, 68, 0,216, 4, 0, 0,255,255,255,255,216, 4 /* 0x1100 */ };