mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-01-28 22:04:43 -08:00
Rebase against cc49c40f05a600327b80711f6f80844608dde366.
This commit is contained in:
Sebastian Lackner
parent
6b9d11ac58
commit
41562729cd
@ -52,7 +52,7 @@ usage()
|
||||
# Get the upstream commit sha
|
||||
upstream_commit()
|
||||
{
|
||||
echo "79ebd3f3bf9e5b6607363667d03def04e254f710"
|
||||
echo "cc49c40f05a600327b80711f6f80844608dde366"
|
||||
}
|
||||
|
||||
# Show version information
|
||||
@ -389,7 +389,6 @@ patch_enable_all ()
|
||||
enable_user32_Auto_Radio_Button="$1"
|
||||
enable_user32_Combobox_WM_SIZE="$1"
|
||||
enable_user32_DM_SETDEFID="$1"
|
||||
enable_user32_DialogBoxParam="$1"
|
||||
enable_user32_Dialog_Focus="$1"
|
||||
enable_user32_Dialog_Paint_Event="$1"
|
||||
enable_user32_DrawMenuItem="$1"
|
||||
@ -1443,9 +1442,6 @@ patch_enable ()
|
||||
user32-DM_SETDEFID)
|
||||
enable_user32_DM_SETDEFID="$2"
|
||||
;;
|
||||
user32-DialogBoxParam)
|
||||
enable_user32_DialogBoxParam="$2"
|
||||
;;
|
||||
user32-Dialog_Focus)
|
||||
enable_user32_Dialog_Focus="$2"
|
||||
;;
|
||||
@ -8552,23 +8548,6 @@ if test "$enable_user32_DM_SETDEFID" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset user32-DialogBoxParam
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
# | * [#40025] DialogBoxParam should return -1 when dialog control creation fails
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/user32/dialog.c, dlls/user32/tests/dialog.c, dlls/user32/tests/resource.rc
|
||||
# |
|
||||
if test "$enable_user32_DialogBoxParam" -eq 1; then
|
||||
patch_apply user32-DialogBoxParam/0001-user32-tests-Test-DialogBoxParam-using-a-dialog-temp.patch
|
||||
patch_apply user32-DialogBoxParam/0002-user32-DialogBoxParam-should-return-1-when-dialog-co.patch
|
||||
(
|
||||
printf '%s\n' '+ { "Dmitry Timoshkov", "user32/tests: Test DialogBoxParam using a dialog template with invalid control class.", 1 },';
|
||||
printf '%s\n' '+ { "Dmitry Timoshkov", "user32: DialogBoxParam should return -1 when dialog control creation fails.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset user32-Dialog_Focus
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From f4d7f0919cd5fd3ad3611e0a3df209846920f1b1 Mon Sep 17 00:00:00 2001
|
||||
From 8ac8c40269c0b6f3784b429ebdd301b43f60aaef Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Lackner <sebastian@fds-team.de>
|
||||
Date: Thu, 3 Sep 2015 04:56:23 +0200
|
||||
Subject: shell32: Create Microsoft\Windows\Themes directory during Wineprefix
|
||||
@ -9,18 +9,18 @@ Subject: shell32: Create Microsoft\Windows\Themes directory during Wineprefix
|
||||
1 file changed, 9 insertions(+)
|
||||
|
||||
diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c
|
||||
index 1a4528f..2c73442 100644
|
||||
index c5ba6295cda..374f0fa4d61 100644
|
||||
--- a/dlls/shell32/shellpath.c
|
||||
+++ b/dlls/shell32/shellpath.c
|
||||
@@ -854,6 +854,7 @@ static const WCHAR Microsoft_Windows_Sidebar_GadgetsW[] = {'M','i','c','r','o','
|
||||
static const WCHAR Microsoft_Windows_Start_MenuW[] = {'M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','S','t','a','r','t',' ','M','e','n','u',0};
|
||||
@@ -857,6 +857,7 @@ static const WCHAR Microsoft_Windows_Start_Menu_Admin_ToolsW[] = {'M','i','c','r
|
||||
static const WCHAR Microsoft_Windows_Start_Menu_StartupW[] = {'M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','S','t','a','r','t',' ','M','e','n','u','\\','P','r','o','g','r','a','m','s','\\','S','t','a','r','t','U','p','\0'};
|
||||
static const WCHAR Microsoft_Windows_TemplatesW[] = {'M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','T','e','m','p','l','a','t','e','s',0};
|
||||
static const WCHAR Microsoft_Windows_Temporary_Internet_FilesW[] = {'M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','T','e','m','p','o','r','a','r','y',' ','I','n','t','e','r','n','e','t',' ','F','i','l','e','s',0};
|
||||
+static const WCHAR Microsoft_Windows_ThemesW[] = {'M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','T','h','e','m','e','s',0};
|
||||
static const WCHAR MoviesW[] = {'M','o','v','i','e','s','\0'};
|
||||
static const WCHAR MusicW[] = {'M','u','s','i','c','\0'};
|
||||
static const WCHAR MusicLibraryW[] = {'M','u','s','i','c','L','i','b','r','a','r','y',0};
|
||||
@@ -4107,6 +4108,7 @@ static HRESULT _SHRegisterUserShellFolders(BOOL bDefault)
|
||||
@@ -4265,6 +4266,7 @@ static HRESULT _SHRegisterUserShellFolders(BOOL bDefault)
|
||||
};
|
||||
WCHAR userShellFolderPath[MAX_PATH], shellFolderPath[MAX_PATH];
|
||||
LPCWSTR pUserShellFolderPath, pShellFolderPath;
|
||||
@ -28,7 +28,7 @@ index 1a4528f..2c73442 100644
|
||||
HRESULT hr = S_OK;
|
||||
HKEY hRootKey;
|
||||
HANDLE hToken;
|
||||
@@ -4135,6 +4137,13 @@ static HRESULT _SHRegisterUserShellFolders(BOOL bDefault)
|
||||
@@ -4293,6 +4295,13 @@ static HRESULT _SHRegisterUserShellFolders(BOOL bDefault)
|
||||
|
||||
hr = _SHRegisterFolders(hRootKey, hToken, pUserShellFolderPath,
|
||||
pShellFolderPath, folders, sizeof(folders) / sizeof(folders[0]));
|
||||
@ -43,5 +43,5 @@ index 1a4528f..2c73442 100644
|
||||
return hr;
|
||||
}
|
||||
--
|
||||
2.5.0
|
||||
2.14.1
|
||||
|
||||
|
||||
@ -1,48 +0,0 @@
|
||||
From 2bee693b0105133d7414a6602ce4c0cd155f5cf8 Mon Sep 17 00:00:00 2001
|
||||
From: Dmitry Timoshkov <dmitry@baikal.ru>
|
||||
Date: Fri, 13 May 2016 16:13:47 +0800
|
||||
Subject: user32/tests: Test DialogBoxParam using a dialog template with
|
||||
invalid control class.
|
||||
|
||||
---
|
||||
dlls/user32/tests/dialog.c | 6 ++++++
|
||||
dlls/user32/tests/resource.rc | 6 ++++++
|
||||
2 files changed, 12 insertions(+)
|
||||
|
||||
diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c
|
||||
index a6cd1be..470ffdc 100644
|
||||
--- a/dlls/user32/tests/dialog.c
|
||||
+++ b/dlls/user32/tests/dialog.c
|
||||
@@ -1222,6 +1222,12 @@ static void test_DialogBoxParamA(void)
|
||||
"got %d, expected ERROR_RESOURCE_NAME_NOT_FOUND\n",GetLastError());
|
||||
|
||||
SetLastError(0xdeadbeef);
|
||||
+ ret = DialogBoxParamA(GetModuleHandleA(NULL), "TEST_DIALOG_INVALID_CLASS", 0, DestroyDlgWinProc, 0);
|
||||
+todo_wine
|
||||
+ ok(ret == -1, "DialogBoxParamA returned %ld, expected -1\n", ret);
|
||||
+ ok(GetLastError() == 0, "got %d\n", GetLastError());
|
||||
+
|
||||
+ SetLastError(0xdeadbeef);
|
||||
ret = DefDlgProcA(0, WM_ERASEBKGND, 0, 0);
|
||||
ok(ret == 0, "DefDlgProcA returned %ld, expected 0\n", ret);
|
||||
ok(GetLastError() == ERROR_INVALID_WINDOW_HANDLE ||
|
||||
diff --git a/dlls/user32/tests/resource.rc b/dlls/user32/tests/resource.rc
|
||||
index f116b85..756e38f 100644
|
||||
--- a/dlls/user32/tests/resource.rc
|
||||
+++ b/dlls/user32/tests/resource.rc
|
||||
@@ -124,6 +124,12 @@ FONT 8, "MS Shell Dlg"
|
||||
EDITTEXT 200,4,4,50,14
|
||||
}
|
||||
|
||||
+TEST_DIALOG_INVALID_CLASS DIALOG 0, 0, 60, 30
|
||||
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
|
||||
+{
|
||||
+ CONTROL "",1,"wine invalid class",WS_CHILD,0,0,40,10
|
||||
+}
|
||||
+
|
||||
IDD_DIALOG DIALOG 0, 0, 186, 95
|
||||
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
|
||||
CAPTION "Dialog"
|
||||
--
|
||||
2.8.0
|
||||
|
||||
@ -1,61 +0,0 @@
|
||||
From 7f3ff2cf69b045541c2ffa6646b8051d78f7e970 Mon Sep 17 00:00:00 2001
|
||||
From: Dmitry Timoshkov <dmitry@baikal.ru>
|
||||
Date: Fri, 13 May 2016 16:19:40 +0800
|
||||
Subject: user32: DialogBoxParam should return -1 when dialog control creation
|
||||
fails.
|
||||
|
||||
For bugs #40025 and #40609.
|
||||
---
|
||||
dlls/user32/dialog.c | 8 ++++++--
|
||||
dlls/user32/tests/dialog.c | 1 -
|
||||
2 files changed, 6 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c
|
||||
index 9cb4b8d..02b407b 100644
|
||||
--- a/dlls/user32/dialog.c
|
||||
+++ b/dlls/user32/dialog.c
|
||||
@@ -837,11 +837,13 @@ INT_PTR WINAPI DialogBoxParamA( HINSTANCE hInst, LPCSTR name,
|
||||
HRSRC hrsrc;
|
||||
LPCDLGTEMPLATEA ptr;
|
||||
|
||||
+ if (owner && !IsWindow(owner)) return 0;
|
||||
+
|
||||
if (!(hrsrc = FindResourceA( hInst, name, (LPSTR)RT_DIALOG ))) return -1;
|
||||
if (!(ptr = LoadResource(hInst, hrsrc))) return -1;
|
||||
hwnd = DIALOG_CreateIndirect( hInst, ptr, owner, dlgProc, param, FALSE, &owner );
|
||||
if (hwnd) return DIALOG_DoDialogBox( hwnd, owner );
|
||||
- return 0;
|
||||
+ return -1;
|
||||
}
|
||||
|
||||
|
||||
@@ -855,11 +857,13 @@ INT_PTR WINAPI DialogBoxParamW( HINSTANCE hInst, LPCWSTR name,
|
||||
HRSRC hrsrc;
|
||||
LPCDLGTEMPLATEW ptr;
|
||||
|
||||
+ if (owner && !IsWindow(owner)) return 0;
|
||||
+
|
||||
if (!(hrsrc = FindResourceW( hInst, name, (LPWSTR)RT_DIALOG ))) return -1;
|
||||
if (!(ptr = LoadResource(hInst, hrsrc))) return -1;
|
||||
hwnd = DIALOG_CreateIndirect( hInst, ptr, owner, dlgProc, param, TRUE, &owner );
|
||||
if (hwnd) return DIALOG_DoDialogBox( hwnd, owner );
|
||||
- return 0;
|
||||
+ return -1;
|
||||
}
|
||||
|
||||
|
||||
diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c
|
||||
index 470ffdc..60819c3 100644
|
||||
--- a/dlls/user32/tests/dialog.c
|
||||
+++ b/dlls/user32/tests/dialog.c
|
||||
@@ -1223,7 +1223,6 @@ static void test_DialogBoxParamA(void)
|
||||
|
||||
SetLastError(0xdeadbeef);
|
||||
ret = DialogBoxParamA(GetModuleHandleA(NULL), "TEST_DIALOG_INVALID_CLASS", 0, DestroyDlgWinProc, 0);
|
||||
-todo_wine
|
||||
ok(ret == -1, "DialogBoxParamA returned %ld, expected -1\n", ret);
|
||||
ok(GetLastError() == 0, "got %d\n", GetLastError());
|
||||
|
||||
--
|
||||
2.8.0
|
||||
|
||||
@ -1 +0,0 @@
|
||||
Fixes: [40025] DialogBoxParam should return -1 when dialog control creation fails
|
||||
Loading…
x
Reference in New Issue
Block a user