From 2228abee0afb9d48adb80ce0239ebe37d81550fb Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Fri, 26 Feb 2016 20:50:47 +0100 Subject: [PATCH] Rebase against 1510b8b92af23a2305de95f074468c231dc11fa3. [inetcpl-Default_Home] Removed patch to implement default page button in inetcpl (fixed upstream). [user32-MDI_Extra_Data] Removed patch to preserve beginning of extra data for MDI windows (accepted upstream). --- ...netcpl-Implement-default-page-button.patch | 48 ---------------- patches/inetcpl-Default_Home/definition | 1 - patches/patchinstall.sh | 37 +----------- ...beginning-of-extra-data-for-MDI-wind.patch | 57 ------------------- patches/user32-MDI_Extra_Data/definition | 1 - ...-invalid-memory-access-when-relocati.patch | 14 ++--- 6 files changed, 8 insertions(+), 150 deletions(-) delete mode 100644 patches/inetcpl-Default_Home/0001-inetcpl-Implement-default-page-button.patch delete mode 100644 patches/inetcpl-Default_Home/definition delete mode 100644 patches/user32-MDI_Extra_Data/0001-user32-Preserve-beginning-of-extra-data-for-MDI-wind.patch delete mode 100644 patches/user32-MDI_Extra_Data/definition diff --git a/patches/inetcpl-Default_Home/0001-inetcpl-Implement-default-page-button.patch b/patches/inetcpl-Default_Home/0001-inetcpl-Implement-default-page-button.patch deleted file mode 100644 index 2af887df..00000000 --- a/patches/inetcpl-Default_Home/0001-inetcpl-Implement-default-page-button.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 3247690bbc075d37863f6f2c9f8f33c5ee6276ee Mon Sep 17 00:00:00 2001 -From: Jared Smudde -Date: Thu, 4 Jun 2015 14:01:14 -0500 -Subject: inetcpl: Implement default page button. - -This patch implements the button default page to set back the -default homepage is the user changes the homepage. - - dlls/inetcpl.cpl/general.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) ---- - dlls/inetcpl.cpl/general.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/dlls/inetcpl.cpl/general.c b/dlls/inetcpl.cpl/general.c -index 0691579..24631c6 100644 ---- a/dlls/inetcpl.cpl/general.c -+++ b/dlls/inetcpl.cpl/general.c -@@ -35,6 +35,7 @@ - WINE_DEFAULT_DEBUG_CHANNEL(inetcpl); - - static const WCHAR about_blank[] = {'a','b','o','u','t',':','b','l','a','n','k',0}; -+static const WCHAR default_home[] = {'h','t','t','p',':','/','/','w','w','w','.','w','i','n','e','h','q','.','o','r','g',0}; - static const WCHAR start_page[] = {'S','t','a','r','t',' ','P','a','g','e',0}; - static const WCHAR reg_ie_main[] = {'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\', -@@ -43,7 +44,6 @@ static const WCHAR reg_ie_main[] = {'S','o','f','t','w','a','r','e','\\', - - /* list of unimplemented buttons */ - static DWORD disabled_general_buttons[] = {IDC_HOME_CURRENT, -- IDC_HOME_DEFAULT, - IDC_HISTORY_SETTINGS, - 0}; - static DWORD disabled_delhist_buttons[] = {IDC_DELETE_FORM_DATA, -@@ -187,6 +187,10 @@ static INT_PTR general_on_command(HWND hwnd, WPARAM wparam) - SetDlgItemTextW(hwnd, IDC_HOME_EDIT, about_blank); - break; - -+ case MAKEWPARAM(IDC_HOME_DEFAULT, BN_CLICKED): -+ SetDlgItemTextW(hwnd, IDC_HOME_EDIT, default_home); -+ break; -+ - case MAKEWPARAM(IDC_HISTORY_DELETE, BN_CLICKED): - DialogBoxW(hcpl, MAKEINTRESOURCEW(IDD_DELETE_HISTORY), hwnd, - delhist_dlgproc); --- -2.4.2 - diff --git a/patches/inetcpl-Default_Home/definition b/patches/inetcpl-Default_Home/definition deleted file mode 100644 index a7f36ffa..00000000 --- a/patches/inetcpl-Default_Home/definition +++ /dev/null @@ -1 +0,0 @@ -Fixes: Implement default homepage button in inetcpl.cpl diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 53bf79aa..df71986f 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -51,7 +51,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "215e2d7fed58ccd7c5e55ad536fb311608b51d26" + echo "1510b8b92af23a2305de95f074468c231dc11fa3" } # Show version information @@ -157,7 +157,6 @@ patch_enable_all () enable_imagehlp_Cleanup="$1" enable_imagehlp_ImageLoad="$1" enable_imm32_IMMDisableLegacyIME="$1" - enable_inetcpl_Default_Home="$1" enable_iphlpapi_System_Ping="$1" enable_iphlpapi_TCP_Table="$1" enable_kernel32_COMSPEC="$1" @@ -311,7 +310,6 @@ patch_enable_all () enable_user32_GetSystemMetrics="$1" enable_user32_Invalidate_Key_State="$1" enable_user32_ListBox_Size="$1" - enable_user32_MDI_Extra_Data="$1" enable_user32_MessageBox_WS_EX_TOPMOST="$1" enable_user32_Mouse_Message_Hwnd="$1" enable_user32_Refresh_MDI_Menus="$1" @@ -617,9 +615,6 @@ patch_enable () imm32-IMMDisableLegacyIME) enable_imm32_IMMDisableLegacyIME="$2" ;; - inetcpl-Default_Home) - enable_inetcpl_Default_Home="$2" - ;; iphlpapi-System_Ping) enable_iphlpapi_System_Ping="$2" ;; @@ -1079,9 +1074,6 @@ patch_enable () user32-ListBox_Size) enable_user32_ListBox_Size="$2" ;; - user32-MDI_Extra_Data) - enable_user32_MDI_Extra_Data="$2" - ;; user32-MessageBox_WS_EX_TOPMOST) enable_user32_MessageBox_WS_EX_TOPMOST="$2" ;; @@ -3830,18 +3822,6 @@ if test "$enable_imm32_IMMDisableLegacyIME" -eq 1; then ) >> "$patchlist" fi -# Patchset inetcpl-Default_Home -# | -# | Modified files: -# | * dlls/inetcpl.cpl/general.c -# | -if test "$enable_inetcpl_Default_Home" -eq 1; then - patch_apply inetcpl-Default_Home/0001-inetcpl-Implement-default-page-button.patch - ( - echo '+ { "Jared Smudde", "inetcpl: Implement default page button.", 1 },'; - ) >> "$patchlist" -fi - # Patchset iphlpapi-System_Ping # | # | This patchset fixes the following Wine bugs: @@ -6356,21 +6336,6 @@ if test "$enable_user32_ListBox_Size" -eq 1; then ) >> "$patchlist" fi -# Patchset user32-MDI_Extra_Data -# | -# | This patchset fixes the following Wine bugs: -# | * [#15473] Preserve beginning of extra data for MDI windows -# | -# | Modified files: -# | * dlls/user32/mdi.c, dlls/user32/tests/msg.c -# | -if test "$enable_user32_MDI_Extra_Data" -eq 1; then - patch_apply user32-MDI_Extra_Data/0001-user32-Preserve-beginning-of-extra-data-for-MDI-wind.patch - ( - echo '+ { "Michael Müller", "user32: Preserve beginning of extra data for MDI windows.", 1 },'; - ) >> "$patchlist" -fi - # Patchset user32-MessageBox_WS_EX_TOPMOST # | # | Modified files: diff --git a/patches/user32-MDI_Extra_Data/0001-user32-Preserve-beginning-of-extra-data-for-MDI-wind.patch b/patches/user32-MDI_Extra_Data/0001-user32-Preserve-beginning-of-extra-data-for-MDI-wind.patch deleted file mode 100644 index 86fc5dcd..00000000 --- a/patches/user32-MDI_Extra_Data/0001-user32-Preserve-beginning-of-extra-data-for-MDI-wind.patch +++ /dev/null @@ -1,57 +0,0 @@ -From fe8f3aa132c6fed2d663a95f9f5c8d3626a6693a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Michael=20M=C3=BCller?= -Date: Sun, 14 Feb 2016 04:49:46 +0100 -Subject: user32: Preserve beginning of extra data for MDI windows. - ---- - dlls/user32/mdi.c | 1 + - dlls/user32/tests/msg.c | 6 +++++- - 2 files changed, 6 insertions(+), 1 deletion(-) - -diff --git a/dlls/user32/mdi.c b/dlls/user32/mdi.c -index b5a0473..62023a7 100644 ---- a/dlls/user32/mdi.c -+++ b/dlls/user32/mdi.c -@@ -127,6 +127,7 @@ typedef struct - * states it must keep coherency with USER32 on its own. This is true for - * Windows as well. - */ -+ LRESULT reserved; - UINT nActiveChildren; - HWND hwndChildMaximized; - HWND hwndActiveChild; -diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c -index d15a8e7..eeb887b 100644 ---- a/dlls/user32/tests/msg.c -+++ b/dlls/user32/tests/msg.c -@@ -3380,6 +3380,7 @@ static void test_mdi_messages(void) - BOOL zoomed; - RECT rc; - HMENU hMenu = CreateMenu(); -+ DWORD val; - - if (!mdi_RegisterWindowClasses()) assert(0); - -@@ -3408,8 +3409,9 @@ static void test_mdi_messages(void) - rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, - mdi_frame, 0, GetModuleHandleA(0), &client_cs); - assert(mdi_client); -- ok_sequence(WmCreateMDIclientSeq, "Create visible MDI client window", FALSE); -+ SetWindowLongA(mdi_client, 0, 0xdeadbeef); - -+ ok_sequence(WmCreateMDIclientSeq, "Create visible MDI client window", FALSE); - ok(GetActiveWindow() == mdi_frame, "wrong active window %p\n", GetActiveWindow()); - ok(GetFocus() == mdi_frame, "input focus should be on MDI frame not on %p\n", GetFocus()); - -@@ -3867,6 +3869,8 @@ static void test_mdi_messages(void) - SetFocus(0); - flush_sequence(); - -+ val = GetWindowLongA(mdi_client, 0); -+ ok(val == 0xdeadbeef || broken(val == 0) /* >= Win 2003 */, "Expected 0xdeadbeef, got 0x%x\n", val); - DestroyWindow(mdi_client); - ok_sequence(WmDestroyMDIclientSeq, "Destroy MDI client window", FALSE); - --- -2.7.1 - diff --git a/patches/user32-MDI_Extra_Data/definition b/patches/user32-MDI_Extra_Data/definition deleted file mode 100644 index 64d66e1e..00000000 --- a/patches/user32-MDI_Extra_Data/definition +++ /dev/null @@ -1 +0,0 @@ -Fixes: [15473] Preserve beginning of extra data for MDI windows diff --git a/patches/winedevice-Fix_Relocation/0001-winedevice-Avoid-invalid-memory-access-when-relocati.patch b/patches/winedevice-Fix_Relocation/0001-winedevice-Avoid-invalid-memory-access-when-relocati.patch index 4016781f..994e07a4 100644 --- a/patches/winedevice-Fix_Relocation/0001-winedevice-Avoid-invalid-memory-access-when-relocati.patch +++ b/patches/winedevice-Fix_Relocation/0001-winedevice-Avoid-invalid-memory-access-when-relocati.patch @@ -1,4 +1,4 @@ -From d0620ed863ec0155f65ef1844ee75127aa003f07 Mon Sep 17 00:00:00 2001 +From a99b0eeff3202d63f55f252ceb7cf364549d812c Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Mon, 10 Nov 2014 04:05:38 +0100 Subject: winedevice: Avoid invalid memory access when relocation block @@ -9,11 +9,11 @@ Subject: winedevice: Avoid invalid memory access when relocation block 1 file changed, 43 insertions(+), 6 deletions(-) diff --git a/programs/winedevice/device.c b/programs/winedevice/device.c -index ef1e1ef..101fdf9 100644 +index 94132ed..6bcc2b2 100644 --- a/programs/winedevice/device.c +++ b/programs/winedevice/device.c -@@ -61,6 +61,39 @@ static LDR_MODULE *find_ldr_module( HMODULE module ) - return NULL; +@@ -63,6 +63,39 @@ static LDR_MODULE *find_ldr_module( HMODULE module ) + return ldr; } +/* change permissions of a specific memory range, save original permissions */ @@ -52,7 +52,7 @@ index ef1e1ef..101fdf9 100644 /* load the driver module file */ static HMODULE load_driver_module( const WCHAR *name ) { -@@ -84,7 +117,7 @@ static HMODULE load_driver_module( const WCHAR *name ) +@@ -86,7 +119,7 @@ static HMODULE load_driver_module( const WCHAR *name ) if (nt->OptionalHeader.SectionAlignment < info.PageSize || !(nt->FileHeader.Characteristics & IMAGE_FILE_DLL)) { @@ -61,7 +61,7 @@ index ef1e1ef..101fdf9 100644 IMAGE_BASE_RELOCATION *rel, *end; if ((rel = RtlImageDirectoryEntryToData( module, TRUE, IMAGE_DIRECTORY_ENTRY_BASERELOC, &size ))) -@@ -92,20 +125,24 @@ static HMODULE load_driver_module( const WCHAR *name ) +@@ -94,20 +127,24 @@ static HMODULE load_driver_module( const WCHAR *name ) WINE_TRACE( "%s: relocating from %p to %p\n", wine_dbgstr_w(name), (char *)module - delta, module ); end = (IMAGE_BASE_RELOCATION *)((char *)rel + size); @@ -92,5 +92,5 @@ index ef1e1ef..101fdf9 100644 } -- -2.3.5 +2.7.1