June 2013 - Wine-Commits - list.winehq.org

Alexandre Julliard : Wine release 1.6-rc2
by Alexandre Julliard June 14, 2013

June 14, 2013

Module: website Branch: master Commit: 9d91314ff73f7b56f5ab719fda963ba1b62cc500 URL: http://source.winehq.org/git/website.git/?a=commit;h=9d91314ff73f7b56f5ab71… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 14 20:24:40 2013 +0200 Wine release 1.6-rc2 --- news/en/2013061401.xml | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/news/en/2013061401.xml b/news/en/2013061401.xml new file mode 100644 index 0000000..dbc59de --- /dev/null +++ b/news/en/2013061401.xml @@ -0,0 +1,12 @@ +<news> +<date>June 14, 2013</date> +<title>Wine 1.6-rc2 Released</title> +<body> + The Wine development release 1.6-rc2 is now available. + <a href="{$root}/announce/1.6-rc2">What's new</a> in this release: +<ul> + <li>Bug fixes only, we are in code freeze.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.6-rc2.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : Release 1.6-rc2.
by Alexandre Julliard June 14, 2013

June 14, 2013

Module: wine Branch: master Commit: f56a36e18e8ad1e3dd9c3a5a81e52f87fb9b76fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=f56a36e18e8ad1e3dd9c3a5a8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 14 20:15:43 2013 +0200 Release 1.6-rc2. --- ANNOUNCE | 546 +++++++++++++++++-------------------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 164 insertions(+), 402 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f56a36e18e8ad1e3dd9c3…

1 0

Tag wine-1.6-rc2 : Alexandre Julliard : Release 1.6-rc2
by Alexandre Julliard June 14, 2013

June 14, 2013

Module: wine Branch: refs/tags/wine-1.6-rc2 Tag: 96529f2d945c73f4ef43692bfb6fa5594b4e5718 URL: http://source.winehq.org/git/wine.git/?a=tag;h=96529f2d945c73f4ef43692bfb6f… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 14 20:15:43 2013 +0200 Release 1.6-rc2

1 0

Akihiro Sagawa : po: Update Japanese translation.
by Alexandre Julliard June 14, 2013

June 14, 2013

Module: wine Branch: master Commit: 901a08f480f4c29dd0f87a8c9537955b3e178a6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=901a08f480f4c29dd0f87a8c9… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Jun 14 21:23:25 2013 +0900 po: Update Japanese translation. --- po/ja.po | 54 ++++++++++++++++++------------------------------------ 1 files changed, 18 insertions(+), 36 deletions(-) diff --git a/po/ja.po b/po/ja.po index 9ca1496..3ff8160 100644 --- a/po/ja.po +++ b/po/ja.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2013-01-17 20:12+0900\n" +"PO-Revision-Date: 2013-06-14 21:16+0900\n" "Last-Translator: Akihiro Sagawa <sagawa.aki(a)gmail.com>\n" "Language-Team: none\n" "Language: Japanese\n" @@ -8226,7 +8226,7 @@ msgstr "エラー" #: shlwapi.rc:40 msgid "Don't show me th&is message again" -msgstr "今後はこのメッセージを表示しない(&i)" +msgstr "今後はこのメッセージを表示しない(&I)" #: shlwapi.rc:27 msgid "%d bytes" @@ -8351,7 +8351,7 @@ msgstr "ウィンドウの一覧(&M)..." #: wineps.rc:28 msgid "Paper Si&ze:" -msgstr "用紙サイズ(&z):" +msgstr "用紙サイズ(&Z):" #: wineps.rc:36 msgid "Duplex:" @@ -10420,77 +10420,59 @@ msgstr "不明なプロトコル" #: netstat.rc:41 msgid "TCP Statistics for IPv4" -msgstr "" +msgstr "TCP 統計値 (IPv4)" #: netstat.rc:42 -#, fuzzy -#| msgid "Active Connections" msgid "Active Opens" -msgstr "アクティブな接続" +msgstr "能動的な開始" #: netstat.rc:43 msgid "Passive Opens" -msgstr "" +msgstr "受動的な開始" #: netstat.rc:44 -#, fuzzy -#| msgid "Active Connections" msgid "Failed Connection Attempts" -msgstr "アクティブな接続" +msgstr "失敗した接続の試行" #: netstat.rc:45 -#, fuzzy -#| msgid "Active Connections" msgid "Reset Connections" -msgstr "アクティブな接続" +msgstr "リセットされた接続" #: netstat.rc:46 -#, fuzzy -#| msgid "Active Connections" msgid "Current Connections" -msgstr "アクティブな接続" +msgstr "現在の接続" #: netstat.rc:47 -#, fuzzy -#| msgid "Segment locked.\n" msgid "Segments Received" -msgstr "セグメントはロックされています。\n" +msgstr "受信セグメント" #: netstat.rc:48 -#, fuzzy -#| msgid "Segment locked.\n" msgid "Segments Sent" -msgstr "セグメントはロックされています。\n" +msgstr "送信セグメント" #: netstat.rc:49 msgid "Segments Retransmitted" -msgstr "" +msgstr "再送信セグメント" #: netstat.rc:50 msgid "UDP Statistics for IPv4" -msgstr "" +msgstr "UDP 統計値 (IPv4)" #: netstat.rc:51 -#, fuzzy -#| msgid "Segment locked.\n" msgid "Datagrams Received" -msgstr "セグメントはロックされています。\n" +msgstr "受信データグラム" #: netstat.rc:52 -#, fuzzy -#| msgid "Local Port" msgid "No Ports" -msgstr "ローカルポート" +msgstr "ポートなし" #: netstat.rc:53 -#, fuzzy -#| msgid "Decoding Error" msgid "Receive Errors" -msgstr "デコードエラー" +msgstr "受信エラー" #: netstat.rc:54 msgid "Datagrams Sent" -msgstr "" +msgstr "送信データグラム" #: notepad.rc:27 msgid "&New\tCtrl+N" @@ -11380,7 +11362,7 @@ msgstr "検索(&F)...\tCtrl+F" #: regedit.rc:61 msgid "Find Ne&xt\tF3" -msgstr "次の検索候補(&x)\tF3" +msgstr "次の検索候補(&X)\tF3" #: regedit.rc:65 msgid "Status &Bar"

1 0

Hans Leidekker : wbemprox: Implement Win32_OperatingSystem.CodeSet.
by Alexandre Julliard June 14, 2013

June 14, 2013

Module: wine Branch: master Commit: ba3fe55cd4ee88db33d9cff519a98f51a2ad7124 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba3fe55cd4ee88db33d9cff51… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jun 14 10:04:11 2013 +0200 wbemprox: Implement Win32_OperatingSystem.CodeSet. --- dlls/wbemprox/builtin.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 3504602..5ac7630 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -102,6 +102,8 @@ static const WCHAR prop_captionW[] = {'C','a','p','t','i','o','n',0}; static const WCHAR prop_classW[] = {'C','l','a','s','s',0}; +static const WCHAR prop_codesetW[] = + {'C','o','d','e','S','e','t',0}; static const WCHAR prop_commandlineW[] = {'C','o','m','m','a','n','d','L','i','n','e',0}; static const WCHAR prop_cpustatusW[] = @@ -322,6 +324,7 @@ static const struct column col_networkadapter[] = static const struct column col_os[] = { { prop_captionW, CIM_STRING }, + { prop_codesetW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_csdversionW, CIM_STRING }, { prop_lastbootuptimeW, CIM_DATETIME|COL_FLAG_DYNAMIC }, { prop_osarchitectureW, CIM_STRING }, @@ -565,6 +568,7 @@ struct record_networkadapter struct record_operatingsystem { const WCHAR *caption; + const WCHAR *codeset; const WCHAR *csdversion; const WCHAR *lastbootuptime; const WCHAR *osarchitecture; @@ -1752,6 +1756,13 @@ static WCHAR *get_systemdirectory(void) Wow64RevertWow64FsRedirection( redir ); return ret; } +static WCHAR *get_codeset(void) +{ + static const WCHAR fmtW[] = {'%','u',0}; + WCHAR *ret = heap_alloc( 11 * sizeof(WCHAR) ); + if (ret) sprintfW( ret, fmtW, GetACP() ); + return ret; +} static enum fill_status fill_os( struct table *table, const struct expr *cond ) { @@ -1763,6 +1774,7 @@ static enum fill_status fill_os( struct table *table, const struct expr *cond ) rec = (struct record_operatingsystem *)table->data; rec->caption = os_captionW; + rec->codeset = get_codeset(); rec->csdversion = os_csdversionW; rec->lastbootuptime = get_lastbootuptime(); rec->osarchitecture = get_osarchitecture();

1 0

Maxime Lombard : wined3d: Add Nvidia GeForce GTX 670MX.
by Alexandre Julliard June 14, 2013

June 14, 2013

Module: wine Branch: master Commit: 214d6ed0ba2ef6d882a59c0c6646e5cac231063e URL: http://source.winehq.org/git/wine.git/?a=commit;h=214d6ed0ba2ef6d882a59c0c6… Author: Maxime Lombard <berillions(a)gmail.com> Date: Thu Jun 13 17:33:05 2013 +0000 wined3d: Add Nvidia GeForce GTX 670MX. --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 067c60b..f5c1a76 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1163,6 +1163,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX660, "NVIDIA GeForce GTX 660", DRIVER_NVIDIA_GEFORCE6, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX660TI, "NVIDIA GeForce GTX 660 Ti", DRIVER_NVIDIA_GEFORCE6, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX670, "NVIDIA GeForce GTX 670", DRIVER_NVIDIA_GEFORCE6, 2048}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX670MX, "NVIDIA GeForce GTX 670MX", DRIVER_NVIDIA_GEFORCE6, 3072}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX680, "NVIDIA GeForce GTX 680", DRIVER_NVIDIA_GEFORCE6, 2048}, /* AMD cards */ @@ -1567,6 +1568,7 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl cards[] = { {"GTX 680", CARD_NVIDIA_GEFORCE_GTX680}, /* Geforce 600 - highend */ + {"GTX 670MX", CARD_NVIDIA_GEFORCE_GTX670MX}, /* Geforce 600 - highend */ {"GTX 670", CARD_NVIDIA_GEFORCE_GTX670}, /* Geforce 600 - midend high */ {"GTX 660 Ti", CARD_NVIDIA_GEFORCE_GTX660TI}, /* Geforce 600 - midend high */ {"GTX 660", CARD_NVIDIA_GEFORCE_GTX660}, /* Geforce 600 - midend high */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1fbe081..ce785b3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1463,6 +1463,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX660 = 0x11c0, CARD_NVIDIA_GEFORCE_GTX660TI = 0x1183, CARD_NVIDIA_GEFORCE_GTX670 = 0x1189, + CARD_NVIDIA_GEFORCE_GTX670MX = 0x11a1, CARD_NVIDIA_GEFORCE_GTX680 = 0x1180, CARD_INTEL_830M = 0x3577,

1 0

Hans Leidekker : wbemprox: Implement Win32_OperatingSystem. ServicePackMinorVersion.
by Alexandre Julliard June 14, 2013

June 14, 2013

Module: wine Branch: master Commit: ad60f235d25adb5592c661899b8e508fa79b9e44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad60f235d25adb5592c661899… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jun 14 10:06:01 2013 +0200 wbemprox: Implement Win32_OperatingSystem.ServicePackMinorVersion. --- dlls/wbemprox/builtin.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index ec039dc..53d3b6f 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -206,6 +206,8 @@ static const WCHAR prop_serialnumberW[] = {'S','e','r','i','a','l','N','u','m','b','e','r',0}; static const WCHAR prop_servicepackmajorW[] = {'S','e','r','v','i','c','e','P','a','c','k','M','a','j','o','r','V','e','r','s','i','o','n',0}; +static const WCHAR prop_servicepackminorW[] = + {'S','e','r','v','i','c','e','P','a','c','k','M','i','n','o','r','V','e','r','s','i','o','n',0}; static const WCHAR prop_servicetypeW[] = {'S','e','r','v','i','c','e','T','y','p','e',0}; static const WCHAR prop_startmodeW[] = @@ -338,6 +340,7 @@ static const struct column col_os[] = { prop_osproductsuiteW, CIM_UINT32, VT_I4 }, { prop_ostypeW, CIM_UINT16, VT_I4 }, { prop_servicepackmajorW, CIM_UINT16, VT_I4 }, + { prop_servicepackminorW, CIM_UINT16, VT_I4 }, { prop_suitemaskW, CIM_UINT32, VT_I4 }, { prop_systemdirectoryW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_versionW, CIM_STRING } @@ -584,6 +587,7 @@ struct record_operatingsystem UINT32 osproductsuite; UINT16 ostype; UINT16 servicepackmajor; + UINT16 servicepackminor; UINT32 suitemask; const WCHAR *systemdirectory; const WCHAR *version; @@ -1804,6 +1808,7 @@ static enum fill_status fill_os( struct table *table, const struct expr *cond ) rec->osproductsuite = 2461140; /* Windows XP Professional */ rec->ostype = 18; /* WINNT */ rec->servicepackmajor = 3; + rec->servicepackminor = 0; rec->suitemask = 272; /* Single User + Terminal */ rec->systemdirectory = get_systemdirectory(); rec->version = os_versionW;

1 0

Hans Leidekker : wbemprox: Implement Win32_Processor.AddressWidth.
by Alexandre Julliard June 14, 2013

June 14, 2013

Module: wine Branch: master Commit: 38e976acdd0ae9fdfdd08497e3b076c5adfbc75e URL: http://source.winehq.org/git/wine.git/?a=commit;h=38e976acdd0ae9fdfdd08497e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jun 14 10:02:29 2013 +0200 wbemprox: Implement Win32_Processor.AddressWidth. --- dlls/wbemprox/builtin.c | 19 ++++++++++++------- 1 files changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 35c18e3..1e9c297 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -92,6 +92,8 @@ static const WCHAR prop_adapterramW[] = {'A','d','a','p','t','e','r','R','A','M',0}; static const WCHAR prop_adaptertypeW[] = {'A','d','a','p','t','e','r','T','y','p','e',0}; +static const WCHAR prop_addresswidthW[] = + {'A','d','d','r','e','s','s','W','i','d','t','h',0}; static const WCHAR prop_bootableW[] = {'B','o','o','t','a','b','l','e',0}; static const WCHAR prop_bootpartitionW[] = @@ -354,6 +356,7 @@ static const struct column col_process[] = }; static const struct column col_processor[] = { + { prop_addresswidthW, CIM_UINT16, VT_I4 }, { prop_cpustatusW, CIM_UINT16 }, { prop_deviceidW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, { prop_familyW, CIM_UINT16, VT_I4 }, @@ -595,6 +598,7 @@ struct record_process }; struct record_processor { + UINT16 addresswidth; UINT16 cpu_status; const WCHAR *device_id; UINT16 family; @@ -1655,6 +1659,13 @@ static UINT get_processor_maxclockspeed( void ) } return ret; } +static const WCHAR *get_osarchitecture(void) +{ + SYSTEM_INFO info; + GetNativeSystemInfo( &info ); + if (info.u.s.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) return os_64bitW; + return os_32bitW; +} static enum fill_status fill_processor( struct table *table, const struct expr *cond ) { @@ -1676,6 +1687,7 @@ static enum fill_status fill_processor( struct table *table, const struct expr * for (i = 0; i < count; i++) { rec = (struct record_processor *)(table->data + offset); + rec->addresswidth = get_osarchitecture() == os_32bitW ? 32 : 64; rec->cpu_status = 1; /* CPU Enabled */ sprintfW( device_id, fmtW, i ); rec->device_id = heap_strdupW( device_id ); @@ -1715,13 +1727,6 @@ static WCHAR *get_lastbootuptime(void) sprintfW( ret, fmtW, tf.Year, tf.Month, tf.Day, tf.Hour, tf.Minute, tf.Second, tf.Milliseconds * 1000 ); return ret; } -static const WCHAR *get_osarchitecture(void) -{ - SYSTEM_INFO info; - GetNativeSystemInfo( &info ); - if (info.u.s.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) return os_64bitW; - return os_32bitW; -} static WCHAR *get_systemdirectory(void) { void *redir;

1 0

Karol Herbst : wined3d: Add Nvidia GeForce GTX 770M.
by Alexandre Julliard June 14, 2013

June 14, 2013

Module: wine Branch: master Commit: 627aebf77467d594cb986c523f81bb48c6bdea68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=627aebf77467d594cb986c523… Author: Karol Herbst <wine(a)karolherbst.de> Date: Thu Jun 13 23:15:39 2013 +0200 wined3d: Add Nvidia GeForce GTX 770M. --- dlls/wined3d/directx.c | 3 +++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index f5c1a76..c97225c 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1165,6 +1165,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX670, "NVIDIA GeForce GTX 670", DRIVER_NVIDIA_GEFORCE6, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX670MX, "NVIDIA GeForce GTX 670MX", DRIVER_NVIDIA_GEFORCE6, 3072}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX680, "NVIDIA GeForce GTX 680", DRIVER_NVIDIA_GEFORCE6, 2048}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX770M, "NVIDIA GeForce GTX 770M", DRIVER_NVIDIA_GEFORCE6, 3072}, /* AMD cards */ {HW_VENDOR_AMD, CARD_AMD_RAGE_128PRO, "ATI Rage Fury", DRIVER_AMD_RAGE_128PRO, 16 }, @@ -1567,6 +1568,7 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl } cards[] = { + {"GTX 770M", CARD_NVIDIA_GEFORCE_GTX770M}, /* Geforce 700 - midend high mobile */ {"GTX 680", CARD_NVIDIA_GEFORCE_GTX680}, /* Geforce 600 - highend */ {"GTX 670MX", CARD_NVIDIA_GEFORCE_GTX670MX}, /* Geforce 600 - highend */ {"GTX 670", CARD_NVIDIA_GEFORCE_GTX670}, /* Geforce 600 - midend high */ @@ -2058,6 +2060,7 @@ static enum wined3d_pci_device select_card_nvidia_mesa(const struct wined3d_gl_i cards[] = { /* Kepler */ + {"NVE6", CARD_NVIDIA_GEFORCE_GTX770M}, {"NVE4", CARD_NVIDIA_GEFORCE_GTX680}, /* Fermi */ {"NVD9", CARD_NVIDIA_GEFORCE_GT520}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ce785b3..1ed2587 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1465,6 +1465,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX670 = 0x1189, CARD_NVIDIA_GEFORCE_GTX670MX = 0x11a1, CARD_NVIDIA_GEFORCE_GTX680 = 0x1180, + CARD_NVIDIA_GEFORCE_GTX770M = 0x11e0, CARD_INTEL_830M = 0x3577, CARD_INTEL_855GM = 0x3582,

1 0

Jacek Caban : wininet/tests: Added more cert struct tests.
by Alexandre Julliard June 14, 2013

June 14, 2013

Module: wine Branch: master Commit: 2782f36b1dcaec4144a41eb5eb3291b37318399e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2782f36b1dcaec4144a41eb5e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 14 15:18:18 2013 +0200 wininet/tests: Added more cert struct tests. --- dlls/wininet/tests/http.c | 90 ++++++++++++++++++++------------------------ 1 files changed, 41 insertions(+), 49 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index b8b34e2..e763ebf 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -3622,27 +3622,44 @@ static void release_cert_info(INTERNET_CERTIFICATE_INFOA *info) LocalFree(info->lpszEncryptionAlgName); } -static void test_cert_struct(HINTERNET req) +typedef struct { + const char *ex_subject; + const char *ex_issuer; +} cert_struct_test_t; + +static const cert_struct_test_t test_winehq_org_cert = { + "0mJuv1t-1CFypQkyTZwfvjHHBAbnUndG\r\n" + "GT98380011\r\n" + "See www.rapidssl.com/resources/cps (c)13\r\n" + "Domain Control Validated - RapidSSL(R)\r\n" + "*.winehq.org", + + "US\r\n" + "\"GeoTrust, Inc.\"\r\n" + "RapidSSL CA" +}; + +static const cert_struct_test_t test_winehq_com_cert = { + "US\r\n" + "Minnesota\r\n" + "Saint Paul\r\n" + "WineHQ\r\n" + "test.winehq.com\r\n" + "webmaster(a)winehq.org", + + "US\r\n" + "Minnesota\r\n" + "WineHQ\r\n" + "test.winehq.com\r\n" + "webmaster(a)winehq.org" +}; + +static void test_cert_struct(HINTERNET req, const cert_struct_test_t *test) { INTERNET_CERTIFICATE_INFOA info; DWORD size; BOOL res; - static const char ex_subject[] = - "US\r\n" - "Minnesota\r\n" - "Saint Paul\r\n" - "WineHQ\r\n" - "test.winehq.com\r\n" - "webmaster(a)winehq.org"; - - static const char ex_issuer[] = - "US\r\n" - "Minnesota\r\n" - "WineHQ\r\n" - "test.winehq.com\r\n" - "webmaster(a)winehq.org"; - memset(&info, 0x5, sizeof(info)); size = sizeof(info); @@ -3650,8 +3667,8 @@ static void test_cert_struct(HINTERNET req) ok(res, "InternetQueryOption failed: %u\n", GetLastError()); ok(size == sizeof(info), "size = %u\n", size); - ok(!strcmp(info.lpszSubjectInfo, ex_subject), "lpszSubjectInfo = %s\n", info.lpszSubjectInfo); - ok(!strcmp(info.lpszIssuerInfo, ex_issuer), "lpszIssuerInfo = %s\n", info.lpszIssuerInfo); + ok(!strcmp(info.lpszSubjectInfo, test->ex_subject), "lpszSubjectInfo = %s\n", info.lpszSubjectInfo); + ok(!strcmp(info.lpszIssuerInfo, test->ex_issuer), "lpszIssuerInfo = %s\n", info.lpszIssuerInfo); ok(!info.lpszSignatureAlgName, "lpszSignatureAlgName = %s\n", info.lpszSignatureAlgName); ok(!info.lpszEncryptionAlgName, "lpszEncryptionAlgName = %s\n", info.lpszEncryptionAlgName); ok(!info.lpszProtocolName, "lpszProtocolName = %s\n", info.lpszProtocolName); @@ -3850,7 +3867,7 @@ static void test_security_flags(void) CLEAR_NOTIFIED(INTERNET_STATUS_DETECTING_PROXY); if(req_error != ERROR_INTERNET_SEC_CERT_REV_FAILED) { - win_skip("Unexpected cert errors, skipping security flags tests\n"); + win_skip("Unexpected cert errors %u, skipping security flags tests\n", req_error); close_async_handle(ses, hCompleteEvent, 3); CloseHandle(hCompleteEvent); @@ -3891,7 +3908,7 @@ static void test_security_flags(void) test_request_flags(req, INTERNET_REQFLAG_NO_HEADERS); test_secflags_option(req, SECURITY_FLAG_IGNORE_REVOCATION|0x1800000); - test_security_info("https://test.winehq.org/data/some_file.html?q", ERROR_INTERNET_ITEM_NOT_FOUND, 0); + test_security_info("https://test.winehq.com/data/some_file.html?q", ERROR_INTERNET_ITEM_NOT_FOUND, 0); set_secflags(req, FALSE, SECURITY_FLAG_IGNORE_UNKNOWN_CA); test_secflags_option(req, 0x1800000|SECURITY_FLAG_IGNORE_REVOCATION|SECURITY_FLAG_IGNORE_UNKNOWN_CA @@ -3928,7 +3945,7 @@ static void test_security_flags(void) test_secflags_option(req, SECURITY_FLAG_SECURE|SECURITY_FLAG_IGNORE_UNKNOWN_CA|SECURITY_FLAG_IGNORE_REVOCATION |SECURITY_FLAG_STRENGTH_STRONG|0x1800000); - test_cert_struct(req); + test_cert_struct(req, &test_winehq_com_cert); test_security_info("https://test.winehq.com/data/some_file.html?q", 0, 0x1800000); res = InternetReadFile(req, buf, sizeof(buf), &size); @@ -4038,32 +4055,7 @@ static void test_secure_connection(void) ok(ret, "InternetQueryOption failed: %d\n", GetLastError()); ok(flags & SECURITY_FLAG_SECURE, "expected secure flag to be set\n"); - ret = InternetQueryOptionA(req, INTERNET_OPTION_SECURITY_CERTIFICATE_STRUCT, - NULL, &size); - ok(ret || GetLastError() == ERROR_INSUFFICIENT_BUFFER, "InternetQueryOption failed: %d\n", GetLastError()); - ok(size == sizeof(INTERNET_CERTIFICATE_INFOA), "size = %d\n", size); - certificate_structA = HeapAlloc(GetProcessHeap(), 0, size); - ret = InternetQueryOption(req, INTERNET_OPTION_SECURITY_CERTIFICATE_STRUCT, - certificate_structA, &size); - ok(ret, "InternetQueryOption failed: %d\n", GetLastError()); - if (ret) - { - ok(certificate_structA->lpszSubjectInfo && - strlen(certificate_structA->lpszSubjectInfo) > 1, - "expected a non-empty subject name\n"); - ok(certificate_structA->lpszIssuerInfo && - strlen(certificate_structA->lpszIssuerInfo) > 1, - "expected a non-empty issuer name\n"); - ok(!certificate_structA->lpszSignatureAlgName, - "unexpected signature algorithm name\n"); - ok(!certificate_structA->lpszEncryptionAlgName, - "unexpected encryption algorithm name\n"); - ok(!certificate_structA->lpszProtocolName, - "unexpected protocol name\n"); - ok(certificate_structA->dwKeySize, "expected a non-zero key size\n"); - release_cert_info(certificate_structA); - } - HeapFree(GetProcessHeap(), 0, certificate_structA); + test_cert_struct(req, &test_winehq_org_cert); /* Querying the same option through InternetQueryOptionW still results in * ASCII strings being returned. @@ -4111,7 +4103,7 @@ static void test_secure_connection(void) ok(con != NULL, "InternetConnect failed\n"); req = HttpOpenRequestW(con, get, testpage, NULL, NULL, NULL, - INTERNET_FLAG_SECURE, 0); + INTERNET_FLAG_SECURE|INTERNET_FLAG_RELOAD, 0); ok(req != NULL, "HttpOpenRequest failed\n"); ret = HttpSendRequest(req, NULL, 0, NULL, 0); @@ -4120,7 +4112,7 @@ static void test_secure_connection(void) size = sizeof(flags); ret = InternetQueryOption(req, INTERNET_OPTION_SECURITY_FLAGS, &flags, &size); ok(ret, "InternetQueryOption failed: %d\n", GetLastError()); - ok(flags & SECURITY_FLAG_SECURE, "expected secure flag to be set\n"); + ok(flags & SECURITY_FLAG_SECURE, "expected secure flag to be set, got %x\n", flags); ret = InternetQueryOptionA(req, INTERNET_OPTION_SECURITY_CERTIFICATE_STRUCT, NULL, &size);

1 0