April 2011 - Wine-Commits - list.winehq.org

Austin English : ntdll: Add support for win2k8r2.
by Alexandre Julliard April 13, 2011

April 13, 2011

Module: wine Branch: master Commit: 24ba89c5294af0bb850bf691ae097877c6a22e0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=24ba89c5294af0bb850bf691a… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Apr 13 00:16:00 2011 -0500 ntdll: Add support for win2k8r2. --- dlls/ntdll/version.c | 11 ++++++++++- programs/winecfg/appdefaults.c | 29 +++++++++++++++-------------- 2 files changed, 25 insertions(+), 15 deletions(-) diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c index 46385c9..bcb92a9 100644 --- a/dlls/ntdll/version.c +++ b/dlls/ntdll/version.c @@ -53,6 +53,7 @@ typedef enum WIN2K3, /* Windows 2003 */ WINVISTA,/* Windows Vista */ WIN2K8, /* Windows 2008 */ + WIN2K8R2,/* Windows 2008 R2 */ WIN7, /* Windows 7 */ NB_WINDOWS_VERSIONS } WINDOWS_VERSION; @@ -155,7 +156,14 @@ static const RTL_OSVERSIONINFOEXW VersionData[NB_WINDOWS_VERSIONS] = sizeof(RTL_OSVERSIONINFOEXW), 6, 1, 0x1DB1, VER_PLATFORM_WIN32_NT, {'S','e','r','v','i','c','e',' ','P','a','c','k',' ','1',0}, 1, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 0 - } + }, + /* WIN2K8 */ + { + sizeof(RTL_OSVERSIONINFOEXW), 6, 1, 0x1DB1, VER_PLATFORM_WIN32_NT, + {'S','e','r','v','i','c','e',' ','P','a','c','k',' ','1',0}, + 1, 0, VER_SUITE_SINGLEUSERTS, VER_NT_SERVER, 0 + }, + }; static const char * const WinVersionNames[NB_WINDOWS_VERSIONS] = @@ -173,6 +181,7 @@ static const char * const WinVersionNames[NB_WINDOWS_VERSIONS] = "win2003,win2k3", /* WIN2K3 */ "vista,winvista", /* WINVISTA*/ "win2008,win2k8", /* WIN2K8 */ + "win2008r2,win2k8r2", /* WIN2K8R2 */ "win7", /* WIN7 */ }; diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index 6101c48..f16f5bb 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -49,20 +49,21 @@ static const struct const char *szProductType; } win_versions[] = { - { "win7", "Windows 7", 6, 1, 0x1DB1,VER_PLATFORM_WIN32_NT, "Service Pack 1", 1, 0, "WinNT"}, - { "win2008", "Windows 2008", 6, 0, 0x1771,VER_PLATFORM_WIN32_NT, "Service Pack 1", 0, 0, "ServerNT"}, - { "vista", "Windows Vista", 6, 0, 0x1772,VER_PLATFORM_WIN32_NT, "Service Pack 2", 2, 0, "WinNT"}, - { "win2003", "Windows 2003", 5, 2, 0xECE, VER_PLATFORM_WIN32_NT, "Service Pack 2", 2, 0, "ServerNT"}, - { "winxp", "Windows XP", 5, 1, 0xA28, VER_PLATFORM_WIN32_NT, "Service Pack 3", 3, 0, "WinNT"}, - { "win2k", "Windows 2000", 5, 0, 0x893, VER_PLATFORM_WIN32_NT, "Service Pack 4", 4, 0, "WinNT"}, - { "winme", "Windows ME", 4, 90, 0xBB8, VER_PLATFORM_WIN32_WINDOWS, " ", 0, 0, ""}, - { "win98", "Windows 98", 4, 10, 0x8AE, VER_PLATFORM_WIN32_WINDOWS, " A ", 0, 0, ""}, - { "win95", "Windows 95", 4, 0, 0x3B6, VER_PLATFORM_WIN32_WINDOWS, "", 0, 0, ""}, - { "nt40", "Windows NT 4.0", 4, 0, 0x565, VER_PLATFORM_WIN32_NT, "Service Pack 6a", 6, 0, "WinNT"}, - { "nt351", "Windows NT 3.5", 3, 51, 0x421, VER_PLATFORM_WIN32_NT, "Service Pack 2", 0, 0, "WinNT"}, - { "win31", "Windows 3.1", 2, 10, 0, VER_PLATFORM_WIN32s, "Win32s 1.3", 0, 0, ""}, - { "win30", "Windows 3.0", 3, 0, 0, VER_PLATFORM_WIN32s, "Win32s 1.3", 0, 0, ""}, - { "win20", "Windows 2.0", 2, 0, 0, VER_PLATFORM_WIN32s, "Win32s 1.3", 0, 0, ""} + { "win2008r2", "Windows 2008 R2", 6, 1, 0x1DB1,VER_PLATFORM_WIN32_NT, "Service Pack 1", 1, 0, "ServerNT"}, + { "win7", "Windows 7", 6, 1, 0x1DB1,VER_PLATFORM_WIN32_NT, "Service Pack 1", 1, 0, "WinNT"}, + { "win2008", "Windows 2008", 6, 0, 0x1771,VER_PLATFORM_WIN32_NT, "Service Pack 1", 0, 0, "ServerNT"}, + { "vista", "Windows Vista", 6, 0, 0x1772,VER_PLATFORM_WIN32_NT, "Service Pack 2", 2, 0, "WinNT"}, + { "win2003", "Windows 2003", 5, 2, 0xECE, VER_PLATFORM_WIN32_NT, "Service Pack 2", 2, 0, "ServerNT"}, + { "winxp", "Windows XP", 5, 1, 0xA28, VER_PLATFORM_WIN32_NT, "Service Pack 3", 3, 0, "WinNT"}, + { "win2k", "Windows 2000", 5, 0, 0x893, VER_PLATFORM_WIN32_NT, "Service Pack 4", 4, 0, "WinNT"}, + { "winme", "Windows ME", 4, 90, 0xBB8, VER_PLATFORM_WIN32_WINDOWS, " ", 0, 0, ""}, + { "win98", "Windows 98", 4, 10, 0x8AE, VER_PLATFORM_WIN32_WINDOWS, " A ", 0, 0, ""}, + { "win95", "Windows 95", 4, 0, 0x3B6, VER_PLATFORM_WIN32_WINDOWS, "", 0, 0, ""}, + { "nt40", "Windows NT 4.0", 4, 0, 0x565, VER_PLATFORM_WIN32_NT, "Service Pack 6a", 6, 0, "WinNT"}, + { "nt351", "Windows NT 3.5", 3, 51, 0x421, VER_PLATFORM_WIN32_NT, "Service Pack 2", 0, 0, "WinNT"}, + { "win31", "Windows 3.1", 2, 10, 0, VER_PLATFORM_WIN32s, "Win32s 1.3", 0, 0, ""}, + { "win30", "Windows 3.0", 3, 0, 0, VER_PLATFORM_WIN32s, "Win32s 1.3", 0, 0, ""}, + { "win20", "Windows 2.0", 2, 0, 0, VER_PLATFORM_WIN32s, "Win32s 1.3", 0, 0, ""} }; #define NB_VERSIONS (sizeof(win_versions)/sizeof(win_versions[0]))

1 0

Detlef Riekenberg : inetcpl: Add German version of the security propsheet.
by Alexandre Julliard April 13, 2011

April 13, 2011

Module: wine Branch: master Commit: 5d9223cca9f83c1b94593e3774af021b37038c7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d9223cca9f83c1b94593e377… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Apr 13 05:33:50 2011 +0200 inetcpl: Add German version of the security propsheet. --- dlls/inetcpl.cpl/cpl_De.rc | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/inetcpl.cpl/cpl_De.rc b/dlls/inetcpl.cpl/cpl_De.rc index 0f75bee..5d278f1 100644 --- a/dlls/inetcpl.cpl/cpl_De.rc +++ b/dlls/inetcpl.cpl/cpl_De.rc @@ -69,6 +69,24 @@ BEGIN END +/* "Security" propsheet */ +IDD_SECURITY DIALOG 0, 0, 320, 220 +STYLE WS_CAPTION | WS_CHILD | WS_DISABLED +FONT 8, "MS Shell Dlg" +CAPTION "Sicherheit" +BEGIN + + CONTROL "Listview", IDC_SEC_LISTVIEW, "SysListView32", + LVS_ICON | LVS_ALIGNLEFT | LVS_AUTOARRANGE | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_VSCROLL, + 4, 4, 312, 58 + LTEXT "", IDC_SEC_ZONE_INFO, 4, 68, 312, 20 + GROUPBOX "", IDC_SEC_GROUP, 4, 88, 312, 126 + CONTROL "trackbar", IDC_SEC_TRACKBAR, "msctls_trackbar32", + TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_REVERSED, 8, 98, 32, 100 + LTEXT "", IDC_SEC_LEVEL, 48, 102, 180, 12 + LTEXT "", IDC_SEC_LEVEL_INFO, 48, 114, 260, 80 +END + /* "Content" propsheet */ IDD_CONTENT DIALOG 0, 0, 320, 220 STYLE WS_CAPTION | WS_CHILD | WS_DISABLED

1 0

Piotr Caban : ntdll: Restore stack guard and prevent stack from shrinking.
by Alexandre Julliard April 13, 2011

April 13, 2011

Module: wine Branch: master Commit: 6b2c9505c6a84f53798aa9509ef75bb4e1b86d56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b2c9505c6a84f53798aa9509… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 12 15:10:05 2011 +0200 ntdll: Restore stack guard and prevent stack from shrinking. --- dlls/ntdll/virtual.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 0913b71..d88b734 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1618,8 +1618,12 @@ BOOL virtual_handle_stack_fault( void *addr ) if (vprot & VPROT_GUARD) { VIRTUAL_SetProt( view, page, page_size, vprot & ~VPROT_GUARD ); - if ((char *)page + page_size == NtCurrentTeb()->Tib.StackLimit) - NtCurrentTeb()->Tib.StackLimit = page; + NtCurrentTeb()->Tib.StackLimit = page; + if ((char *)page >= (char *)NtCurrentTeb()->DeallocationStack + 2*page_size) + { + vprot = view->prot[((char *)page - page_size - (char *)view->base) >> page_shift]; + VIRTUAL_SetProt( view, (char *)page - page_size, page_size, vprot | VPROT_GUARD ); + } ret = TRUE; } }

1 0

Detlef Riekenberg : inetcpl: Add a security propsheet.
by Alexandre Julliard April 13, 2011

April 13, 2011

Module: wine Branch: master Commit: 137f75328be1ab33ffd1585c9b48580926519cd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=137f75328be1ab33ffd1585c9… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Apr 13 05:33:47 2011 +0200 inetcpl: Add a security propsheet. --- dlls/inetcpl.cpl/Makefile.in | 5 +- dlls/inetcpl.cpl/cpl_En.rc | 12 +++ dlls/inetcpl.cpl/inetcpl.c | 18 ++++ dlls/inetcpl.cpl/inetcpl.h | 25 +++++- dlls/inetcpl.cpl/security.c | 195 ++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 252 insertions(+), 3 deletions(-) diff --git a/dlls/inetcpl.cpl/Makefile.in b/dlls/inetcpl.cpl/Makefile.in index 8046dc7..98a1930 100644 --- a/dlls/inetcpl.cpl/Makefile.in +++ b/dlls/inetcpl.cpl/Makefile.in @@ -1,11 +1,12 @@ MODULE = inetcpl.cpl IMPORTS = comctl32 shlwapi user32 advapi32 -DELAYIMPORTS = cryptui wininet +DELAYIMPORTS = cryptui wininet ole32 urlmon C_SRCS = \ content.c \ general.c \ - inetcpl.c + inetcpl.c \ + security.c RC_SRCS = \ cpl_De.rc \ diff --git a/dlls/inetcpl.cpl/cpl_En.rc b/dlls/inetcpl.cpl/cpl_En.rc index f8459b4..cd7f5f5 100644 --- a/dlls/inetcpl.cpl/cpl_En.rc +++ b/dlls/inetcpl.cpl/cpl_En.rc @@ -67,6 +67,18 @@ BEGIN END +/* "Security" propsheet */ +IDD_SECURITY DIALOG 0, 0, 320, 220 +STYLE WS_CAPTION | WS_CHILD | WS_DISABLED +FONT 8, "MS Shell Dlg" +CAPTION "Security" +BEGIN + + CONTROL "Listview", IDC_SEC_LISTVIEW, "SysListView32", + LVS_ICON | LVS_ALIGNLEFT | LVS_AUTOARRANGE | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_VSCROLL, + 4, 4, 312, 58 +END + /* "Content" propsheet */ IDD_CONTENT DIALOG 0, 0, 320, 220 STYLE WS_CAPTION | WS_CHILD | WS_DISABLED diff --git a/dlls/inetcpl.cpl/inetcpl.c b/dlls/inetcpl.cpl/inetcpl.c index 49cd892..019a0af 100644 --- a/dlls/inetcpl.cpl/inetcpl.c +++ b/dlls/inetcpl.cpl/inetcpl.c @@ -20,6 +20,8 @@ */ #define NONAMELESSUNION +#define COBJMACROS +#define CONST_VTABLE #include <stdarg.h> #include <windef.h> @@ -28,6 +30,7 @@ #include <winuser.h> #include <commctrl.h> #include <cpl.h> +#include "ole2.h" #include "wine/debug.h" @@ -82,10 +85,17 @@ static int CALLBACK propsheet_callback(HWND hwnd, UINT msg, LPARAM lparam) */ static void display_cpl_sheets(HWND parent) { + INITCOMMONCONTROLSEX icex; PROPSHEETPAGEW psp[NUM_PROPERTY_PAGES]; PROPSHEETHEADERW psh; DWORD id = 0; + OleInitialize(NULL); + /* Initialize common controls */ + icex.dwSize = sizeof(INITCOMMONCONTROLSEX); + icex.dwICC = ICC_LISTVIEW_CLASSES | ICC_BAR_CLASSES; + InitCommonControlsEx(&icex); + ZeroMemory(&psh, sizeof(psh)); ZeroMemory(psp, sizeof(psp)); @@ -98,6 +108,12 @@ static void display_cpl_sheets(HWND parent) psp[id].dwSize = sizeof (PROPSHEETPAGEW); psp[id].hInstance = hcpl; + psp[id].u.pszTemplate = MAKEINTRESOURCEW(IDD_SECURITY); + psp[id].pfnDlgProc = security_dlgproc; + id++; + + psp[id].dwSize = sizeof (PROPSHEETPAGEW); + psp[id].hInstance = hcpl; psp[id].u.pszTemplate = MAKEINTRESOURCEW(IDD_CONTENT); psp[id].pfnDlgProc = content_dlgproc; id++; @@ -115,6 +131,8 @@ static void display_cpl_sheets(HWND parent) /* display the dialog */ PropertySheetW(&psh); + + OleUninitialize(); } /********************************************************************* diff --git a/dlls/inetcpl.cpl/inetcpl.h b/dlls/inetcpl.cpl/inetcpl.h index 45b1ba4..1797b49 100644 --- a/dlls/inetcpl.cpl/inetcpl.h +++ b/dlls/inetcpl.cpl/inetcpl.h @@ -24,11 +24,31 @@ #include <windef.h> #include <winuser.h> - +#include <commctrl.h> extern HMODULE hcpl; INT_PTR CALLBACK content_dlgproc(HWND, UINT, WPARAM, LPARAM) DECLSPEC_HIDDEN; INT_PTR CALLBACK general_dlgproc(HWND, UINT, WPARAM, LPARAM) DECLSPEC_HIDDEN; +INT_PTR CALLBACK security_dlgproc(HWND, UINT, WPARAM, LPARAM) DECLSPEC_HIDDEN; + +/* ## Memory allocation functions ## */ + +static inline void * __WINE_ALLOC_SIZE(1) heap_alloc( size_t len ) +{ + return HeapAlloc( GetProcessHeap(), 0, len ); +} + +static inline void * __WINE_ALLOC_SIZE(1) heap_alloc_zero( size_t len ) +{ + return HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, len ); +} + +static inline BOOL heap_free( void *mem ) +{ + return HeapFree( GetProcessHeap(), 0, mem ); +} + +/* ######### */ #define NUM_PROPERTY_PAGES 8 @@ -57,6 +77,9 @@ INT_PTR CALLBACK general_dlgproc(HWND, UINT, WPARAM, LPARAM) DECLSPEC_HIDDEN; #define IDC_DELETE_FORM_DATA 1014 #define IDC_DELETE_PASSWORDS 1015 +#define IDD_SECURITY 2000 +#define IDC_SEC_LISTVIEW 2001 + #define IDD_CONTENT 4000 #define IDC_CERT 4100 #define IDC_CERT_PUBLISHER 4101 diff --git a/dlls/inetcpl.cpl/security.c b/dlls/inetcpl.cpl/security.c new file mode 100644 index 0000000..e853dd0 --- /dev/null +++ b/dlls/inetcpl.cpl/security.c @@ -0,0 +1,195 @@ +/* + * Internet control panel applet: security propsheet + * + * Copyright 2011 Detlef Riekenberg + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#define COBJMACROS +#define CONST_VTABLE +#define NONAMELESSUNION + +#include <stdarg.h> +#include <windef.h> +#include <winbase.h> +#include <winuser.h> +#include <prsht.h> +#include "commctrl.h" + +#include "ole2.h" +#include "urlmon.h" +#include "initguid.h" +#include "winreg.h" +#include "shlwapi.h" + +#include "inetcpl.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(inetcpl); + +typedef struct secdlg_data_s { + HWND hsec; /* security propsheet */ + HWND hlv; /* listview */ + IInternetSecurityManager *sec_mgr; + IInternetZoneManager *zone_mgr; + DWORD zone_enumerator; + DWORD num_zones; +} secdlg_data; + +/********************************************************************* + * security_cleanup_zones [internal] + * + */ +static void security_cleanup_zones(secdlg_data *sd) +{ + if (sd->zone_enumerator) { + IInternetZoneManager_DestroyZoneEnumerator(sd->zone_mgr, sd->zone_enumerator); + } + + if (sd->zone_mgr) { + IInternetZoneManager_Release(sd->zone_mgr); + } + + if (sd->sec_mgr) { + IInternetSecurityManager_Release(sd->sec_mgr); + } +} + +/********************************************************************* + * security_enum_zones [internal] + * + */ +static HRESULT security_enum_zones(secdlg_data * sd) +{ + HRESULT hr; + + hr = CoInternetCreateSecurityManager(NULL, &sd->sec_mgr, 0); + if (SUCCEEDED(hr)) { + hr = CoInternetCreateZoneManager(NULL, &sd->zone_mgr, 0); + if (SUCCEEDED(hr)) { + hr = IInternetZoneManager_CreateZoneEnumerator(sd->zone_mgr, &sd->zone_enumerator, &sd->num_zones, 0); + } + } + return hr; +} + +/********************************************************************* + * security_on_destroy [internal] + * + * handle WM_NCDESTROY + * + */ +static INT_PTR security_on_destroy(secdlg_data * sd) +{ + TRACE("(%p)\n", sd); + + security_cleanup_zones(sd); + SetWindowLongPtrW(sd->hsec, DWLP_USER, 0); + heap_free(sd); + return TRUE; +} + +/********************************************************************* + * security_on_initdialog [internal] + * + * handle WM_INITDIALOG + * + */ +static INT_PTR security_on_initdialog(HWND hsec) +{ + secdlg_data *sd; + HRESULT hr; + + sd = heap_alloc_zero(sizeof(secdlg_data)); + SetWindowLongPtrW(hsec, DWLP_USER, (LONG_PTR) sd); + if (!sd) { + return FALSE; + } + + sd->hsec = hsec; + sd->hlv = GetDlgItem(hsec, IDC_SEC_LISTVIEW); + + hr = security_enum_zones(sd); + if (FAILED(hr)) { + ERR("got 0x%x\n", hr); + security_on_destroy(sd); + return FALSE; + } + + TRACE("found %d zones\n", sd->num_zones); + return TRUE; +} + +/********************************************************************* + * security_on_notify [internal] + * + * handle WM_NOTIFY + * + */ +static INT_PTR security_on_notify(WPARAM wparam, LPARAM lparam) +{ + NMLISTVIEW *nm; + + nm = (NMLISTVIEW *) lparam; + switch (nm->hdr.code) + { + case PSN_APPLY: + TRACE("PSN_APPLY (0x%lx, 0x%lx) from %p with code: %d\n", wparam, lparam, + nm->hdr.hwndFrom, nm->hdr.code); + break; + + default: + TRACE("WM_NOTIFY (0x%lx, 0x%lx) from %p with code: %d\n", wparam, lparam, + nm->hdr.hwndFrom, nm->hdr.code); + + } + return FALSE; +} + +/********************************************************************* + * security_dlgproc [internal] + * + */ +INT_PTR CALLBACK security_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) +{ + secdlg_data *sd; + + if (msg == WM_INITDIALOG) { + return security_on_initdialog(hwnd); + } + + sd = (secdlg_data *)GetWindowLongPtrW(hwnd, DWLP_USER); + if (sd) { + switch (msg) + { + case WM_NOTIFY: + return security_on_notify(wparam, lparam); + + case WM_NCDESTROY: + return security_on_destroy(sd); + + default: + /* do not flood the log */ + if ((msg == WM_SETCURSOR) || (msg == WM_NCHITTEST) || + (msg == WM_MOUSEMOVE) || (msg == WM_MOUSEACTIVATE) || (msg == WM_PARENTNOTIFY)) + return FALSE; + + TRACE("(%p, 0x%08x/%03d, 0x%08lx, 0x%08lx)\n", hwnd, msg, msg, wparam, lparam); + } + } + return FALSE; +}

1 0

Detlef Riekenberg : inetcpl: Fill the security listview with zones.
by Alexandre Julliard April 13, 2011

April 13, 2011

Module: wine Branch: master Commit: 25a1d80725db5318b949b23533b80e915122a322 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25a1d80725db5318b949b2353… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Apr 13 05:33:48 2011 +0200 inetcpl: Fill the security listview with zones. --- dlls/inetcpl.cpl/security.c | 131 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 131 insertions(+), 0 deletions(-) diff --git a/dlls/inetcpl.cpl/security.c b/dlls/inetcpl.cpl/security.c index e853dd0..1aa29a5 100644 --- a/dlls/inetcpl.cpl/security.c +++ b/dlls/inetcpl.cpl/security.c @@ -48,9 +48,90 @@ typedef struct secdlg_data_s { IInternetZoneManager *zone_mgr; DWORD zone_enumerator; DWORD num_zones; + ZONEATTRIBUTES *zone_attr; + DWORD *zones; + HIMAGELIST himages; } secdlg_data; /********************************************************************* + * add_zone_to_listview [internal] + * + */ +static void add_zone_to_listview(secdlg_data *sd, DWORD *pindex, DWORD zone) +{ + DWORD lv_index = *pindex; + ZONEATTRIBUTES *za = &sd->zone_attr[lv_index]; + LVITEMW lvitem; + HRESULT hr; + INT iconid = 0; + HMODULE hdll = NULL; + WCHAR * ptr; + HICON icon; + + TRACE("item %d (zone %d)\n", lv_index, zone); + + sd->zones[lv_index] = zone; + + memset(&lvitem, 0, sizeof(LVITEMW)); + memset(za, 0, sizeof(ZONEATTRIBUTES)); + za->cbSize = sizeof(ZONEATTRIBUTES); + hr = IInternetZoneManager_GetZoneAttributes(sd->zone_mgr, zone, za); + if (SUCCEEDED(hr)) { + TRACE("displayname: %s\n", debugstr_w(za->szDisplayName)); + TRACE("description: %s\n", debugstr_w(za->szDescription)); + TRACE("minlevel: 0x%x, recommended: 0x%x, current: 0x%x (flags: 0x%x)\n", za->dwTemplateMinLevel, + za->dwTemplateRecommended, za->dwTemplateCurrentLevel, za->dwFlags); + + if (za->dwFlags & ZAFLAGS_NO_UI ) { + TRACE("item %d (zone %d): UI disabled for %s\n", lv_index, zone, debugstr_w(za->szDisplayName)); + return; + } + + lvitem.mask = LVIF_TEXT | LVIF_IMAGE | LVIF_PARAM; + lvitem.iItem = lv_index; + lvitem.iSubItem = 0; + lvitem.pszText = za->szDisplayName; + lvitem.lParam = (LPARAM) zone; + + /* format is "filename.ext#iconid" */ + ptr = StrChrW(za->szIconPath, '#'); + if (ptr) { + *ptr = 0; + ptr++; + iconid = StrToIntW(ptr); + hdll = LoadLibraryExW(za->szIconPath, NULL, LOAD_LIBRARY_AS_DATAFILE); + TRACE("%p: icon #%d from %s\n", hdll, iconid, debugstr_w(za->szIconPath)); + + icon = LoadImageW(hdll, MAKEINTRESOURCEW(iconid), IMAGE_ICON, GetSystemMetrics(SM_CXICON), + GetSystemMetrics(SM_CYICON), LR_SHARED); + + if (!icon) { + FIXME("item %d (zone %d): missing icon #%d in %s\n", lv_index, zone, iconid, debugstr_w(za->szIconPath)); + } + + /* the failure result (NULL) from LoadImageW let ImageList_AddIcon fail + with -1, which is reused in ListView_InsertItemW to disable the image */ + lvitem.iImage = ImageList_AddIcon(sd->himages, icon); + } + else + FIXME("item %d (zone %d): malformed szIconPath %s\n", lv_index, zone, debugstr_w(za->szIconPath)); + + if (ListView_InsertItemW(sd->hlv, &lvitem) >= 0) { + /* activate first item in the listview */ + if (! lv_index) { + lvitem.state = LVIS_FOCUSED | LVIS_SELECTED; + lvitem.stateMask = LVIS_FOCUSED | LVIS_SELECTED; + SendMessageW(sd->hlv, LVM_SETITEMSTATE, 0, (LPARAM) &lvitem); + } + (*pindex)++; + } + FreeLibrary(hdll); + } + else + FIXME("item %d (zone %d): GetZoneAttributes failed with 0x%x\n", lv_index, zone, hr); +} + +/********************************************************************* * security_cleanup_zones [internal] * */ @@ -97,6 +178,13 @@ static INT_PTR security_on_destroy(secdlg_data * sd) { TRACE("(%p)\n", sd); + heap_free(sd->zone_attr); + heap_free(sd->zones); + if (sd->himages) { + SendMessageW(sd->hlv, LVM_SETIMAGELIST, LVSIL_NORMAL, 0); + ImageList_Destroy(sd->himages); + } + security_cleanup_zones(sd); SetWindowLongPtrW(sd->hsec, DWLP_USER, 0); heap_free(sd); @@ -113,6 +201,9 @@ static INT_PTR security_on_initdialog(HWND hsec) { secdlg_data *sd; HRESULT hr; + DWORD current_zone; + DWORD lv_index = 0; + DWORD i; sd = heap_alloc_zero(sizeof(secdlg_data)); SetWindowLongPtrW(hsec, DWLP_USER, (LONG_PTR) sd); @@ -123,6 +214,16 @@ static INT_PTR security_on_initdialog(HWND hsec) sd->hsec = hsec; sd->hlv = GetDlgItem(hsec, IDC_SEC_LISTVIEW); + /* Create the image lists for the listview */ + sd->himages = ImageList_Create(GetSystemMetrics(SM_CXICON), GetSystemMetrics(SM_CYICON), ILC_COLOR32 | ILC_MASK, 1, 1); + + TRACE("using imagelist: %p\n", sd->himages); + if (!sd->himages) { + ERR("ImageList_Create failed!\n"); + return FALSE; + } + SendMessageW(sd->hlv, LVM_SETIMAGELIST, LVSIL_NORMAL, (LPARAM)sd->himages); + hr = security_enum_zones(sd); if (FAILED(hr)) { ERR("got 0x%x\n", hr); @@ -131,6 +232,36 @@ static INT_PTR security_on_initdialog(HWND hsec) } TRACE("found %d zones\n", sd->num_zones); + + /* remember ZONEATTRIBUTES for a listview entry */ + sd->zone_attr = heap_alloc(sizeof(ZONEATTRIBUTES) * sd->num_zones); + if (!sd->zone_attr) { + security_on_destroy(sd); + return FALSE; + } + + /* remember zone number for a listview entry */ + sd->zones = heap_alloc(sizeof(DWORD) * sd->num_zones); + if (!sd->zones) { + security_on_destroy(sd); + return FALSE; + } + + /* use the same order as visible with native inetcpl.cpl */ + add_zone_to_listview(sd, &lv_index, URLZONE_INTERNET); + add_zone_to_listview(sd, &lv_index, URLZONE_INTRANET); + add_zone_to_listview(sd, &lv_index, URLZONE_TRUSTED); + add_zone_to_listview(sd, &lv_index, URLZONE_UNTRUSTED); + + for (i = 0; i < sd->num_zones; i++) + { + hr = IInternetZoneManager_GetZoneAt(sd->zone_mgr, sd->zone_enumerator, i, &current_zone); + if (SUCCEEDED(hr) && (current_zone != (DWORD)URLZONE_INVALID)) { + if (!current_zone || (current_zone > URLZONE_UNTRUSTED)) { + add_zone_to_listview(sd, &lv_index, current_zone); + } + } + } return TRUE; }

1 0

Francois Gouget : programs: Standardize the Help menus.
by Alexandre Julliard April 13, 2011

April 13, 2011

1 0

Huw Davies : gdi32: Add support for solid diagonal lines.
by Alexandre Julliard April 13, 2011

April 13, 2011

Module: wine Branch: master Commit: 626ab3a9d943c03c37df49d60986afb1799e2116 URL: http://source.winehq.org/git/wine.git/?a=commit;h=626ab3a9d943c03c37df49d60… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Apr 13 13:42:06 2011 +0100 gdi32: Add support for solid diagonal lines. --- dlls/gdi32/dibdrv/objects.c | 24 ++++++++++++++++++++---- dlls/gdi32/tests/dib.c | 14 ++++++++++++++ 2 files changed, 34 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index 4ebeee1..1ad2f30 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -106,6 +106,19 @@ static inline BOOL pt_in_rect( const RECT *rect, POINT pt ) (pt.y >= rect->top) && (pt.y < rect->bottom)); } +static void WINAPI solid_pen_line_callback(INT x, INT y, LPARAM lparam) +{ + dibdrv_physdev *pdev = (dibdrv_physdev *)lparam; + RECT rect; + + rect.left = x; + rect.right = x + 1; + rect.top = y; + rect.bottom = y + 1; + pdev->dib.funcs->solid_rects(&pdev->dib, 1, &rect, pdev->pen_and, pdev->pen_xor); + return; +} + static BOOL solid_pen_line(dibdrv_physdev *pdev, POINT *start, POINT *end) { RECT rc; @@ -124,17 +137,20 @@ static BOOL solid_pen_line(dibdrv_physdev *pdev, POINT *start, POINT *end) order_end_points(&rc.left, &rc.right); rc.bottom++; pdev->dib.funcs->solid_rects(&pdev->dib, 1, &rc, pdev->pen_and, pdev->pen_xor); - return TRUE; } else if(rc.left == rc.right) { order_end_points(&rc.top, &rc.bottom); rc.right++; pdev->dib.funcs->solid_rects(&pdev->dib, 1, &rc, pdev->pen_and, pdev->pen_xor); - return TRUE; } - - return FALSE; + else + { + /* FIXME: Optimize by moving Bresenham algorithm to the primitive functions, + or at least cache adjacent points in the callback */ + LineDDA(start->x, start->y, end->x, end->y, solid_pen_line_callback, (LPARAM)pdev); + } + return TRUE; } /*********************************************************************** diff --git a/dlls/gdi32/tests/dib.c b/dlls/gdi32/tests/dib.c index d89a6fa..a6a1156 100644 --- a/dlls/gdi32/tests/dib.c +++ b/dlls/gdi32/tests/dib.c @@ -20,6 +20,7 @@ #include <stdarg.h> #include <stdio.h> +#include <math.h> #include "windef.h" #include "winbase.h" @@ -76,6 +77,7 @@ static const char *sha1_graphics_a8r8g8b8[] = { "a3cadd34d95d3d5cc23344f69aab1c2e55935fcf", "2426172d9e8fec27d9228088f382ef3c93717da9", + "9e8f27ca952cdba01dbf25d07c34e86a7820c012", "17b2c177bdce5e94433574a928bda5c94a8cdfa5", NULL }; @@ -174,6 +176,18 @@ static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char ***sh compare_hash(bmi, bits, sha1, "h and v solid lines"); memset(bits, 0xcc, dib_size); + SetROP2(hdc, R2_COPYPEN); + for(i = 0; i < 16; i++) + { + double s = sin(M_PI * i / 8.0); + double c = cos(M_PI * i / 8.0); + + MoveToEx(hdc, 200.5 + 10 * c, 200.5 + 10 * s, NULL); + LineTo(hdc, 200.5 + 100 * c, 200.5 + 100 * s); + } + compare_hash(bmi, bits, sha1, "diagonal solid lines"); + memset(bits, 0xcc, dib_size); + solid_brush = CreateSolidBrush(RGB(0x33, 0xaa, 0xff)); orig_brush = SelectObject(hdc, solid_brush);

1 0

Stefan Dösinger : wined3d: Only acquire a context in buffer::PreLoad if we have to.
by Alexandre Julliard April 13, 2011

April 13, 2011

Module: wine Branch: master Commit: c79864f871123abb557c3ca03a6c04531f33d613 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c79864f871123abb557c3ca03… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Apr 11 23:09:15 2011 +0200 wined3d: Only acquire a context in buffer::PreLoad if we have to. --- dlls/wined3d/buffer.c | 25 ++++++++++++------------- 1 files changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index a6b79ec..ba3d06f 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -777,21 +777,20 @@ void CDECL wined3d_buffer_preload(struct wined3d_buffer *buffer) buffer->flags &= ~(WINED3D_BUFFER_NOSYNC | WINED3D_BUFFER_DISCARD); - context = context_acquire(device, NULL); - gl_info = context->gl_info; - if (!buffer->buffer_object) { /* TODO: Make converting independent from VBOs */ if (buffer->flags & WINED3D_BUFFER_CREATEBO) { - buffer_create_buffer_object(buffer, gl_info); + context = context_acquire(device, NULL); + buffer_create_buffer_object(buffer, context->gl_info); + context_release(context); buffer->flags &= ~WINED3D_BUFFER_CREATEBO; } else { /* Not doing any conversion */ - goto end; + return; } } @@ -804,7 +803,6 @@ void CDECL wined3d_buffer_preload(struct wined3d_buffer *buffer) if (!decl_changed && !(buffer->flags & WINED3D_BUFFER_HASDESC && buffer_is_dirty(buffer))) { - context_release(context); ++buffer->draw_count; if (buffer->draw_count > VB_RESETDECLCHANGE) buffer->decl_change_count = 0; @@ -836,7 +834,7 @@ void CDECL wined3d_buffer_preload(struct wined3d_buffer *buffer) * reload. This happens only once per changed vertexbuffer and * should occur rather rarely. */ IWineD3DDeviceImpl_MarkStateDirty(device, STATE_STREAMSRC); - goto end; + return; } /* The declaration changed, reload the whole buffer */ @@ -845,7 +843,7 @@ void CDECL wined3d_buffer_preload(struct wined3d_buffer *buffer) if (!buffer_add_dirty_area(buffer, 0, 0)) { ERR("buffer_add_dirty_area failed, this is not expected\n"); - goto end; + return; } /* Avoid unfenced updates, we might overwrite more areas of the buffer than the application * cleared for unsynchronized updates @@ -867,7 +865,7 @@ void CDECL wined3d_buffer_preload(struct wined3d_buffer *buffer) buffer_unload(&buffer->resource); buffer->flags &= ~WINED3D_BUFFER_CREATEBO; IWineD3DDeviceImpl_MarkStateDirty(device, STATE_STREAMSRC); - goto end; + return; } } else @@ -895,17 +893,20 @@ void CDECL wined3d_buffer_preload(struct wined3d_buffer *buffer) /* Nothing to do because we locked directly into the vbo */ if (!(buffer->flags & WINED3D_BUFFER_DOUBLEBUFFER)) { - context_release(context); return; } + context = context_acquire(device, NULL); buffer_direct_upload(buffer, context->gl_info, flags); context_release(context); return; } - if (!(buffer->flags & WINED3D_BUFFER_DOUBLEBUFFER)) + context = context_acquire(device, NULL); + gl_info = context->gl_info; + + if(!(buffer->flags & WINED3D_BUFFER_DOUBLEBUFFER)) { buffer_get_sysmem(buffer, gl_info); } @@ -957,8 +958,6 @@ void CDECL wined3d_buffer_preload(struct wined3d_buffer *buffer) } HeapFree(GetProcessHeap(), 0, data); - -end: context_release(context); }

1 0

Austin English : progman: Avoid assigning a variable to itself (LLVM/Clang) .
by Alexandre Julliard April 13, 2011

April 13, 2011

Module: wine Branch: master Commit: cd39f0cd6b81daf3b45b017e7a2656588f4fcbf6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd39f0cd6b81daf3b45b017e7… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Apr 12 18:22:15 2011 -0500 progman: Avoid assigning a variable to itself (LLVM/Clang). --- programs/progman/program.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/programs/progman/program.c b/programs/progman/program.c index bfbbc89..fc1c612 100644 --- a/programs/progman/program.c +++ b/programs/progman/program.c @@ -272,10 +272,8 @@ VOID PROGRAM_ExecuteProgram(HLOCAL hProgram) { PROGRAM *program = LocalLock(hProgram); LPSTR lpszCmdLine = LocalLock(program->hCmdLine); - LPSTR lpszWorkDir = LocalLock(program->hWorkDir); - /* FIXME set working directory */ - lpszWorkDir = lpszWorkDir; + /* FIXME set working directory from program->hWorkDir */ WinExec(lpszCmdLine, program->nCmdShow); if (Globals.bMinOnRun) CloseWindow(Globals.hMainWnd);

1 0

Francois Gouget : winemine: Fix and standardize the menus.
by Alexandre Julliard April 13, 2011

April 13, 2011

Module: wine Branch: master Commit: 2b431508287a9b6c55124ea0342b33446be67e1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b431508287a9b6c55124ea03… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Apr 13 09:52:16 2011 +0200 winemine: Fix and standardize the menus. --- po/ar.po | 24 ++++++++++++------------ po/bg.po | 24 ++++++++++++------------ po/ca.po | 24 ++++++++++++------------ po/cs.po | 27 ++++++++++++++------------- po/da.po | 27 ++++++++++++++------------- po/de.po | 27 ++++++++++++++------------- po/el.po | 24 ++++++++++++------------ po/en.po | 24 ++++++++++++------------ po/en_US.po | 28 ++++++++++++++-------------- po/eo.po | 24 ++++++++++++------------ po/es.po | 27 ++++++++++++++------------- po/fa.po | 24 ++++++++++++------------ po/fi.po | 27 ++++++++++++++------------- po/fr.po | 27 ++++++++++++++------------- po/he.po | 27 ++++++++++++++------------- po/hi.po | 24 ++++++++++++------------ po/hu.po | 25 ++++++++++++------------- po/it.po | 27 ++++++++++++++------------- po/ja.po | 27 ++++++++++++++------------- po/ko.po | 27 ++++++++++++++------------- po/lt.po | 27 ++++++++++++++------------- po/ml.po | 24 ++++++++++++------------ po/nb_NO.po | 27 ++++++++++++++------------- po/nl.po | 27 ++++++++++++++------------- po/or.po | 24 ++++++++++++------------ po/pa.po | 24 ++++++++++++------------ po/pl.po | 27 ++++++++++++++------------- po/pt_BR.po | 27 ++++++++++++++------------- po/pt_PT.po | 27 ++++++++++++++------------- po/rm.po | 24 ++++++++++++------------ po/ro.po | 27 ++++++++++++++------------- po/ru.po | 27 ++++++++++++++------------- po/sk.po | 24 ++++++++++++------------ po/sl.po | 27 ++++++++++++++------------- po/sr_RS(a)cyrillic.po | 24 ++++++++++++------------ po/sr_RS(a)latin.po | 24 ++++++++++++------------ po/sv.po | 27 ++++++++++++++------------- po/te.po | 24 ++++++++++++------------ po/th.po | 24 ++++++++++++------------ po/tr.po | 27 ++++++++++++++------------- po/uk.po | 27 ++++++++++++++------------- po/wa.po | 24 ++++++++++++------------ po/wine.pot | 24 ++++++++++++------------ po/zh_CN.po | 27 ++++++++++++++------------- po/zh_TW.po | 27 ++++++++++++++------------- programs/winemine/winemine.rc | 9 +++++---- 46 files changed, 595 insertions(+), 571 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2b431508287a9b6c55124…

1 0