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

André Hentschel : include: Add more minor shutdown reasons.
by Alexandre Julliard April 7, 2011

April 7, 2011

Module: wine Branch: stable Commit: f874b287917696fdab4190e1d02bc765634a27bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=f874b287917696fdab4190e1d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jan 2 20:17:41 2011 +0100 include: Add more minor shutdown reasons. (cherry picked from commit c59db6d2744950015172f9825748e1a94a2f962f) --- include/reason.h | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) diff --git a/include/reason.h b/include/reason.h index 2fe8a57..e8bf7c1 100644 --- a/include/reason.h +++ b/include/reason.h @@ -36,8 +36,39 @@ #define SHTDN_REASON_MAJOR_LEGACY_API 0x00070000 #define SHTDN_REASON_MINOR_OTHER 0x00000000 +#define SHTDN_REASON_MINOR_MAINTENANCE 0x00000001 +#define SHTDN_REASON_MINOR_INSTALLATION 0x00000002 +#define SHTDN_REASON_MINOR_UPGRADE 0x00000003 +#define SHTDN_REASON_MINOR_RECONFIG 0x00000004 +#define SHTDN_REASON_MINOR_HUNG 0x00000005 +#define SHTDN_REASON_MINOR_UNSTABLE 0x00000006 +#define SHTDN_REASON_MINOR_DISK 0x00000007 +#define SHTDN_REASON_MINOR_PROCESSOR 0x00000008 +#define SHTDN_REASON_MINOR_NETWORKCARD 0x00000009 +#define SHTDN_REASON_MINOR_POWER_SUPPLY 0x0000000a +#define SHTDN_REASON_MINOR_CORDUNPLUGGED 0x0000000b +#define SHTDN_REASON_MINOR_ENVIRONMENT 0x0000000c +#define SHTDN_REASON_MINOR_HARDWARE_DRIVER 0x0000000d +#define SHTDN_REASON_MINOR_OTHERDRIVER 0x0000000e +#define SHTDN_REASON_MINOR_BLUESCREEN 0x0000000f +#define SHTDN_REASON_MINOR_SERVICEPACK 0x00000010 +#define SHTDN_REASON_MINOR_HOTFIX 0x00000011 +#define SHTDN_REASON_MINOR_SECURITYFIX 0x00000012 +#define SHTDN_REASON_MINOR_SECURITY 0x00000013 +#define SHTDN_REASON_MINOR_NETWORK_CONNECTIVITY 0x00000014 +#define SHTDN_REASON_MINOR_WMI 0x00000015 +#define SHTDN_REASON_MINOR_SERVICEPACK_UNINSTALL 0x00000016 +#define SHTDN_REASON_MINOR_HOTFIX_UNINSTALL 0x00000017 +#define SHTDN_REASON_MINOR_SECURITYFIX_UNINSTALL 0x00000018 +#define SHTDN_REASON_MINOR_MMC 0x00000019 +#define SHTDN_REASON_MINOR_SYSTEMRESTORE 0x0000001a +#define SHTDN_REASON_MINOR_TERMSRV 0x00000020 +#define SHTDN_REASON_MINOR_DC_PROMOTION 0x00000021 +#define SHTDN_REASON_MINOR_DC_DEMOTION 0x00000022 #define SHTDN_REASON_MINOR_NONE 0x000000ff +#define SHTDN_REASON_VALID_BIT_MASK 0xc0ffffff + #define SHTDN_REASON_UNKNOWN SHTDN_REASON_MINOR_NONE #define SHTDN_REASON_LEGACY_API (SHTDN_REASON_MAJOR_LEGACY_API | SHTDN_REASON_FLAG_PLANNED)

1 0

Alexandre Julliard : Update copyright info for 2011.
by Alexandre Julliard April 7, 2011

April 7, 2011

Module: wine Branch: stable Commit: 05a7e541ff177d57fbb4a9eccc0e793d678f3be6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05a7e541ff177d57fbb4a9ecc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jan 1 11:57:08 2011 +0100 Update copyright info for 2011. (cherry picked from commit 8e2becf394f2fff9a67138419a27cbec8874c81c) --- LICENSE | 2 +- include/wine/wine_common_ver.rc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/LICENSE b/LICENSE index c9549e3..bcd8991 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 1993-2010 the Wine project authors (see the file AUTHORS +Copyright (c) 1993-2011 the Wine project authors (see the file AUTHORS for a complete list) Wine is free software; you can redistribute it and/or modify it under diff --git a/include/wine/wine_common_ver.rc b/include/wine/wine_common_ver.rc index 29dcd98..340f38b 100644 --- a/include/wine/wine_common_ver.rc +++ b/include/wine/wine_common_ver.rc @@ -104,7 +104,7 @@ FILESUBTYPE WINE_FILESUBTYPE VALUE "FileDescription", WINE_FILEDESCRIPTION_STR VALUE "FileVersion", WINE_FILEVERSION_STR VALUE "InternalName", WINE_FILENAME - VALUE "LegalCopyright", "Copyright (c) 1993-2010 the Wine project authors (see the file AUTHORS for a complete list)" + VALUE "LegalCopyright", "Copyright (c) 1993-2011 the Wine project authors (see the file AUTHORS for a complete list)" VALUE "OriginalFilename", WINE_FILENAME_STR VALUE "ProductName", WINE_PRODUCTNAME_STR VALUE "ProductVersion", WINE_PRODUCTVERSION_STR

1 0

Juan Lang : include: Add some missing definitions.
by Alexandre Julliard April 7, 2011

April 7, 2011

Module: wine Branch: stable Commit: 2a8e275827ec5a28e9f885d267f690f8af69ff2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a8e275827ec5a28e9f885d26… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Mar 3 10:25:55 2011 -0800 include: Add some missing definitions. (cherry picked from commit e71a23505846b51224fd799f717b0eec6cfb6a10) --- include/winineti.h | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/include/winineti.h b/include/winineti.h index 27efa50..87bebb4 100644 --- a/include/winineti.h +++ b/include/winineti.h @@ -84,6 +84,26 @@ typedef struct _INTERNET_CACHE_CONFIG_INFOW DECL_WINELIB_TYPE_AW(INTERNET_CACHE_CONFIG_INFO) DECL_WINELIB_TYPE_AW(LPINTERNET_CACHE_CONFIG_INFO) +typedef enum { + WININET_SYNC_MODE_NEVER = 0, + WININET_SYNC_MODE_ON_EXPIRY, + WININET_SYNC_MODE_ONCE_PER_SESSION, + WININET_SYNC_MODE_ALWAYS, + WININET_SYNC_MODE_AUTOMATIC, + WININET_SYNC_MODE_DEFAULT = WININET_SYNC_MODE_AUTOMATIC +} WININET_SYNC_MODE; + +/* Flags for GetUrlCacheConfigInfoA/W and SetUrlCacheConfigInfoA/W */ +#define CACHE_CONFIG_FORCE_CLEANUP_FC 0x00000020 +#define CACHE_CONFIG_DISK_CACHE_PATHS_FC 0x00000040 +#define CACHE_CONFIG_SYNC_MODE_FC 0x00000080 +#define CACHE_CONFIG_CONTENT_PATHS_FC 0x00000100 +#define CACHE_CONFIG_COOKIES_PATHS_FC 0x00000200 +#define CACHE_CONFIG_HISTORY_PATHS_FC 0x00000400 +#define CACHE_CONFIG_QUOTA_FC 0x00000800 +#define CACHE_CONFIG_USER_MODE_FC 0x00001000 +#define CACHE_CONFIG_CONTENT_USAGE_FC 0x00002000 +#define CACHE_CONFIG_STICKY_CONTENT_USAGE_FC 0x00004000 #ifdef __cplusplus extern "C" {

1 0

Hwang YunSong : wineps.drv: Update Korean resource.
by Alexandre Julliard April 7, 2011

April 7, 2011

Module: wine Branch: stable Commit: c316a1810dd399b57bd246202b5413094fa48655 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c316a1810dd399b57bd246202… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Fri Jan 7 10:59:58 2011 +0900 wineps.drv: Update Korean resource. (cherry picked from commit d512ccdfa14e5411c8f56801e35b25d7bb8cc420) --- dlls/wineps.drv/wps_Ko.rc | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/wineps.drv/wps_Ko.rc b/dlls/wineps.drv/wps_Ko.rc index 8e0c9a3..5e8e9c6 100644 --- a/dlls/wineps.drv/wps_Ko.rc +++ b/dlls/wineps.drv/wps_Ko.rc @@ -1,6 +1,6 @@ /* * Copyright 2002 Won-kyu Park <wkpark(a)kldp.org> - * Copyright 2005 YunSong Hwang + * Copyright 2005,2011 YunSong Hwang * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -19,22 +19,24 @@ #include "psdlg.h" +#pragma code_page(65001) + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT PAPER DIALOG LOADONCALL MOVEABLE DISCARDABLE 5, 43, 227, 215 STYLE WS_POPUP | WS_CAPTION | WS_CLIPSIBLINGS | WS_VISIBLE -CAPTION "��" +CAPTION "종이" FONT 9, "MS Shell Dlg" { - LTEXT "�� ũ��(&Z):", -1, 10, 6, 100, 8 + LTEXT "종이 크기(&Z):", -1, 10, 6, 100, 8 LISTBOX IDD_PAPERS, 10, 15, 200, 45, LBS_STANDARD | LBS_HASSTRINGS | WS_TABSTOP - GROUPBOX "��", -1, 10, 80, 200, 50 - CONTROL "��(&P)", IDD_ORIENT_PORTRAIT, "Button", BS_AUTORADIOBUTTON | + GROUPBOX "방향", -1, 10, 80, 200, 50 + CONTROL "세로(&P)", IDD_ORIENT_PORTRAIT, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 20, 90, 60, 10 - CONTROL "��(&L)", IDD_ORIENT_LANDSCAPE, "Button", BS_AUTORADIOBUTTON, + CONTROL "가로(&L)", IDD_ORIENT_LANDSCAPE, "Button", BS_AUTORADIOBUTTON, 20, 110, 60, 10 - LTEXT "�� :", IDD_DUPLEX_NAME, 10, 140, 100, 8 + LTEXT "양방향 통신:", IDD_DUPLEX_NAME, 10, 140, 100, 8 COMBOBOX IDD_DUPLEX, 10, 151, 200, 20, CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_TABSTOP }

1 0

André Hentschel : include: Add winhttp secure protocol flags.
by Alexandre Julliard April 7, 2011

April 7, 2011

Module: wine Branch: stable Commit: a9497c69dfe8a933e59ab74f097dcb5106a1557d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9497c69dfe8a933e59ab74f0… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Dec 14 19:05:22 2010 +0100 include: Add winhttp secure protocol flags. (cherry picked from commit 94c99df25d0b603739b6cb5c5c77710f017cea96) --- include/winhttp.h | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/include/winhttp.h b/include/winhttp.h index 17fc38a..68bec0a 100644 --- a/include/winhttp.h +++ b/include/winhttp.h @@ -429,6 +429,11 @@ typedef int INTERNET_SCHEME, *LPINTERNET_SCHEME; #define WINHTTP_CALLBACK_STATUS_FLAG_CERT_WRONG_USAGE 0x00000040 #define WINHTTP_CALLBACK_STATUS_FLAG_SECURITY_CHANNEL_ERROR 0x80000000 +#define WINHTTP_FLAG_SECURE_PROTOCOL_SSL2 0x00000008 +#define WINHTTP_FLAG_SECURE_PROTOCOL_SSL3 0x00000020 +#define WINHTTP_FLAG_SECURE_PROTOCOL_TLS1 0x00000080 +#define WINHTTP_FLAG_SECURE_PROTOCOL_ALL (WINHTTP_FLAG_SECURE_PROTOCOL_SSL2 | WINHTTP_FLAG_SECURE_PROTOCOL_SSL3 | WINHTTP_FLAG_SECURE_PROTOCOL_TLS1) + #define WINHTTP_AUTH_SCHEME_BASIC 0x00000001 #define WINHTTP_AUTH_SCHEME_NTLM 0x00000002 #define WINHTTP_AUTH_SCHEME_PASSPORT 0x00000004

1 0

Hwang YunSong : winspool.drv: Update Korean resource.
by Alexandre Julliard April 7, 2011

April 7, 2011

Module: wine Branch: stable Commit: 3b1799c5eb32a6f0eca6eed3c309d7a5673e3665 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b1799c5eb32a6f0eca6eed3c… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Sat Jan 8 10:41:46 2011 +0900 winspool.drv: Update Korean resource. (cherry picked from commit ac2b56162a742b36f2d30fe5a8af55fccb8e17a3) --- dlls/winspool.drv/Ko.rc | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/winspool.drv/Ko.rc b/dlls/winspool.drv/Ko.rc index 8c5a9c4..23142e0 100644 --- a/dlls/winspool.drv/Ko.rc +++ b/dlls/winspool.drv/Ko.rc @@ -1,7 +1,7 @@ /* * Korean resources for winspool * - * Copyright 2005 YunSong Hwang + * Copyright 2005,2011 YunSong Hwang * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -20,22 +20,24 @@ #include "wspool.h" +#pragma code_page(65001) + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT FILENAME_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47 STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "��Ϸ� �μ�" +CAPTION "파일로 인쇄" FONT 9, "MS Shell Dlg" BEGIN - LTEXT "�� ̸�(&O):", -1, 7, 13, 194, 13, WS_VISIBLE + LTEXT "출력 파일 이름(&O):", -1, 7, 13, 194, 13, WS_VISIBLE EDITTEXT EDITBOX, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL - DEFPUSHBUTTON "Ȯ��", IDOK, 199, 10, 40, 14, WS_VISIBLE - PUSHBUTTON "��", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE + DEFPUSHBUTTON "확인", IDOK, 199, 10, 40, 14, WS_VISIBLE + PUSHBUTTON "취소", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE END STRINGTABLE DISCARDABLE { - IDS_CAPTION "�� Ʈ" - IDS_FILE_EXISTS "�� մϴ�. 'Ȯ��'�� ��̴ϴ�." - IDS_CANNOT_OPEN "�� ϴ�." + IDS_CAPTION "지역 포트" + IDS_FILE_EXISTS "출력 파일은 존재합니다. '확인'을 누르면 덮어쓰여질겁니다." + IDS_CANNOT_OPEN "출력 파일을 만들수 없습니다." }

1 0

Austin English : msiexec: Add /unreg as an alias for /z.
by Alexandre Julliard April 7, 2011

April 7, 2011

Module: wine Branch: stable Commit: 3ee07aa3dc0e7dd6b87f18a49e816261b557424d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ee07aa3dc0e7dd6b87f18a49… Author: Austin English <austinenglish(a)gmail.com> Date: Sat Feb 12 21:05:20 2011 -0800 msiexec: Add /unreg as an alias for /z. (cherry picked from commit b827ab329be24e8bb590ae6b1905e49b44f7d3ba) --- programs/msiexec/msiexec.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/programs/msiexec/msiexec.c b/programs/msiexec/msiexec.c index 70e3255..d7c83cb 100644 --- a/programs/msiexec/msiexec.c +++ b/programs/msiexec/msiexec.c @@ -563,7 +563,8 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine { FunctionRegServer = TRUE; } - else if (msi_option_equal(argvW[i], "unregserver") || msi_option_equal(argvW[i], "unregister")) + else if (msi_option_equal(argvW[i], "unregserver") || msi_option_equal(argvW[i], "unregister") + || msi_option_equal(argvW[i], "unreg")) { FunctionUnregServer = TRUE; }

1 0

Martin Storsjo : wineconsole: Don' t overwrite the backend selection when parsing --use-event.
by Alexandre Julliard April 7, 2011

April 7, 2011

Module: wine Branch: stable Commit: d23c622471ee9a450d7cfb876f3270c1d06cdd85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d23c622471ee9a450d7cfb876… Author: Martin Storsjo <martin(a)martin.st> Date: Wed Dec 22 00:07:51 2010 +0200 wineconsole: Don't overwrite the backend selection when parsing --use-event. (cherry picked from commit 0f3ff8b4b162202e687ebeaa33062b46d56574b1) --- programs/wineconsole/wineconsole.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index 5acb9ad..6500950 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -743,7 +743,6 @@ static UINT WINECON_ParseOptions(const char* lpCmdLine, struct wc_init* wci) if (end == wci->ptr + 12) return IDS_CMD_INVALID_EVENT_ID; wci->mode = from_event; wci->ptr = end; - wci->backend = WCUSER_InitBackend; } else if (strncmp(wci->ptr, "--backend=", 10) == 0) {

1 0

Martin Storsjo : wineconsole: Fallback to window based console if the curses library isn't found.
by Alexandre Julliard April 7, 2011

April 7, 2011

Module: wine Branch: stable Commit: a55cafb6778d7047440b65980eab8c8149c0eb44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a55cafb6778d7047440b65980… Author: Martin Storsjo <martin(a)martin.st> Date: Tue Dec 21 14:26:03 2010 +0200 wineconsole: Fallback to window based console if the curses library isn't found. (cherry picked from commit 59398d7ca7e43cc9fe4bfecd5277ce648a181a97) --- programs/wineconsole/curses.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/wineconsole/curses.c b/programs/wineconsole/curses.c index 773f985..a49bcea 100644 --- a/programs/wineconsole/curses.c +++ b/programs/wineconsole/curses.c @@ -951,7 +951,7 @@ static int WCCURSES_MainLoop(struct inner_data* data) enum init_return WCCURSES_InitBackend(struct inner_data* data) { if( !WCCURSES_bind_libcurses() ) - return init_failed; + return init_not_supported; data->private = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct inner_data_curse)); if (!data->private) return init_failed;

1 0

Hwang YunSong : wordpad: Update Korean resource.
by Alexandre Julliard April 7, 2011

April 7, 2011

Module: wine Branch: stable Commit: 10d62a66aa7c63d1c7888b6693d1a58731c34220 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10d62a66aa7c63d1c7888b669… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Sat Jan 8 10:43:18 2011 +0900 wordpad: Update Korean resource. (cherry picked from commit 302415c3db8f03db0abcd6c44dc4bd2146e6da78) --- programs/wordpad/Ko.rc | 284 ++++++++++++++++++++++++------------------------ 1 files changed, 143 insertions(+), 141 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=10d62a66aa7c63d1c7888…

1 0