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

Hans Leidekker : wbemprox: Implement Win32_NetworkAdapter.PhysicalAdapter.
by Alexandre Julliard 14 Jun '13

14 Jun '13

Module: wine Branch: master Commit: 02ba712a0531f97e4c3c0f1d09ee5e6232145b10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02ba712a0531f97e4c3c0f1d0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jun 14 10:07:43 2013 +0200 wbemprox: Implement Win32_NetworkAdapter.PhysicalAdapter. --- dlls/wbemprox/builtin.c | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index d9755ea..500e6ec 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -192,6 +192,8 @@ static const WCHAR prop_ostypeW[] = {'O','S','T','y','p','e',0}; static const WCHAR prop_parameterW[] = {'P','a','r','a','m','e','t','e','r',0}; +static const WCHAR prop_physicaladapterW[] = + {'P','h','y','s','i','c','a','l','A','d','a','p','t','e','r',0}; static const WCHAR prop_pnpdeviceidW[] = {'P','N','P','D','e','v','i','c','e','I','D',0}; static const WCHAR prop_pprocessidW[] = @@ -326,6 +328,7 @@ static const struct column col_networkadapter[] = { prop_macaddressW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_manufacturerW, CIM_STRING }, { prop_netconnectionstatusW, CIM_UINT16, VT_I4 }, + { prop_physicaladapterW, CIM_BOOLEAN }, { prop_pnpdeviceidW, CIM_STRING }, { prop_speedW, CIM_UINT64 } }; @@ -576,6 +579,7 @@ struct record_networkadapter const WCHAR *mac_address; const WCHAR *manufacturer; UINT16 netconnection_status; + int physicaladapter; const WCHAR *pnpdevice_id; UINT64 speed; }; @@ -1499,7 +1503,7 @@ static WCHAR *get_mac_address( const BYTE *addr, DWORD len ) sprintfW( ret, fmtW, addr[0], addr[1], addr[2], addr[3], addr[4], addr[5] ); return ret; } -static const WCHAR *get_adaptertype( DWORD type ) +static const WCHAR *get_adaptertype( DWORD type, int *physical ) { static const WCHAR ethernetW[] = {'E','t','h','e','r','n','e','t',' ','8','0','2','.','3',0}; static const WCHAR wirelessW[] = {'W','i','r','e','l','e','s','s',0}; @@ -1508,13 +1512,12 @@ static const WCHAR *get_adaptertype( DWORD type ) switch (type) { - case IF_TYPE_ETHERNET_CSMACD: return ethernetW; - case IF_TYPE_IEEE80211: return wirelessW; - case IF_TYPE_IEEE1394: return firewireW; - case IF_TYPE_TUNNEL: return tunnelW; - default: break; + case IF_TYPE_ETHERNET_CSMACD: *physical = -1; return ethernetW; + case IF_TYPE_IEEE80211: *physical = -1; return wirelessW; + case IF_TYPE_IEEE1394: *physical = -1; return firewireW; + case IF_TYPE_TUNNEL: *physical = 0; return tunnelW; + default: *physical = 0; return NULL; } - return NULL; } static enum fill_status fill_networkadapter( struct table *table, const struct expr *cond ) @@ -1525,6 +1528,7 @@ static enum fill_status fill_networkadapter( struct table *table, const struct e IP_ADAPTER_ADDRESSES *aa, *buffer; UINT row = 0, offset = 0, count = 0; DWORD size = 0, ret; + int physical; enum fill_status status = FILL_STATUS_UNFILTERED; ret = GetAdaptersAddresses( AF_UNSPEC, 0, NULL, NULL, &size ); @@ -1546,12 +1550,13 @@ static enum fill_status fill_networkadapter( struct table *table, const struct e { rec = (struct record_networkadapter *)(table->data + offset); sprintfW( device_id, fmtW, aa->u.s.IfIndex ); - rec->adaptertype = get_adaptertype( aa->IfType ); + rec->adaptertype = get_adaptertype( aa->IfType, &physical ); rec->device_id = heap_strdupW( device_id ); rec->interface_index = aa->u.s.IfIndex; rec->mac_address = get_mac_address( aa->PhysicalAddress, aa->PhysicalAddressLength ); rec->manufacturer = compsys_manufacturerW; rec->netconnection_status = get_connection_status( aa->OperStatus ); + rec->physicaladapter = physical; rec->pnpdevice_id = networkadapter_pnpdeviceidW; rec->speed = 1000000; if (!match_row( table, row, cond, &status ))

1 0

Maxime Lombard : wined3d: Add Nvidia GeForce GTX 670MX.
by Alexandre Julliard 14 Jun '13

14 Jun '13

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_SoundDevice.Name.
by Alexandre Julliard 14 Jun '13

14 Jun '13

Module: wine Branch: master Commit: 74cf8f53f099af6b38fa0a4a91e74e192d5a657e URL: http://source.winehq.org/git/wine.git/?a=commit;h=74cf8f53f099af6b38fa0a4a9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jun 14 10:08:24 2013 +0200 wbemprox: Implement Win32_SoundDevice.Name. --- dlls/wbemprox/builtin.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 500e6ec..d90165f 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -416,6 +416,7 @@ static const struct column col_service[] = }; static const struct column col_sounddevice[] = { + { prop_nameW, CIM_STRING }, { prop_productnameW, CIM_STRING } }; static const struct column col_stdregprov[] = @@ -667,6 +668,7 @@ struct record_service }; struct record_sounddevice { + const WCHAR *name; const WCHAR *productname; }; struct record_stdregprov @@ -736,7 +738,7 @@ static const struct record_qualifier data_qualifier[] = }; static const struct record_sounddevice data_sounddevice[] = { - { sounddevice_productnameW } + { sounddevice_productnameW, sounddevice_productnameW } }; static const struct record_stdregprov data_stdregprov[] = {

1 0

Karol Herbst : wined3d: Add Nvidia GeForce GTX 770M.
by Alexandre Julliard 14 Jun '13

14 Jun '13

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 14 Jun '13

14 Jun '13

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

Akihiro Sagawa : po: Update Japanese translation.
by Alexandre Julliard 14 Jun '13

14 Jun '13

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

Francois Gouget : user32/tests: Add a trailing '\n' to a few ok() calls.
by Alexandre Julliard 14 Jun '13

14 Jun '13

Module: wine Branch: master Commit: bd97f64d04d68940039fcc9059792af1c9d4d532 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd97f64d04d68940039fcc905… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jun 13 22:21:26 2013 +0200 user32/tests: Add a trailing '\n' to a few ok() calls. --- dlls/user32/tests/win.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index abd7f8d..515a57e 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -1524,13 +1524,13 @@ static void test_MDI_child_stack(HWND mdi_client) cs.lParam = (LPARAM)mdi_lParam_test_message; child_1 = (HWND)SendMessageA(mdi_client, WM_MDICREATE, 0, (LPARAM)&cs); - ok(child_1 != 0, "expected child_1 to be non NULL"); + ok(child_1 != 0, "expected child_1 to be non NULL\n"); child_2 = (HWND)SendMessageA(mdi_client, WM_MDICREATE, 0, (LPARAM)&cs); - ok(child_2 != 0, "expected child_2 to be non NULL"); + ok(child_2 != 0, "expected child_2 to be non NULL\n"); child_3 = (HWND)SendMessageA(mdi_client, WM_MDICREATE, 0, (LPARAM)&cs); - ok(child_3 != 0, "expected child_3 to be non NULL"); + ok(child_3 != 0, "expected child_3 to be non NULL\n"); child_4 = (HWND)SendMessageA(mdi_client, WM_MDICREATE, 0, (LPARAM)&cs); - ok(child_4 != 0, "expected child_4 to be non NULL"); + ok(child_4 != 0, "expected child_4 to be non NULL\n"); stack[0] = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0); stack[1] = GetWindow(stack[0], GW_HWNDNEXT);

1 0

Dmitry Timoshkov : oleaut32: Do not rely on vtable placement in the implementation structure.
by Alexandre Julliard 14 Jun '13

14 Jun '13

Module: wine Branch: master Commit: 08bade6880e3818a990d05b25ba0ccc266755bbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=08bade6880e3818a990d05b25… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jun 14 10:03:56 2013 +0900 oleaut32: Do not rely on vtable placement in the implementation structure. --- dlls/oleaut32/typelib.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 9502b3c..bc7ee56 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -4628,7 +4628,7 @@ static HRESULT WINAPI ITypeLib2_fnGetTypeInfo( if(index >= This->TypeInfoCount) return TYPE_E_ELEMENTNOTFOUND; - *ppTInfo = (ITypeInfo*)This->typeinfos[index]; + *ppTInfo = (ITypeInfo *)&This->typeinfos[index]->ITypeInfo2_iface; ITypeInfo_AddRef(*ppTInfo); return S_OK; @@ -4676,7 +4676,7 @@ static HRESULT WINAPI ITypeLib2_fnGetTypeInfoOfGuid( for(i = 0; i < This->TypeInfoCount; ++i){ if(IsEqualIID(TLB_get_guid_null(This->typeinfos[i]->guid), guid)){ - *ppTInfo = (ITypeInfo*)This->typeinfos[i]; + *ppTInfo = (ITypeInfo *)&This->typeinfos[i]->ITypeInfo2_iface; ITypeInfo_AddRef(*ppTInfo); return S_OK; } @@ -4918,8 +4918,8 @@ static HRESULT WINAPI ITypeLib2_fnFindName( continue; ITypeLib2_fnFindName_exit: - ITypeInfo_AddRef((ITypeInfo*)pTInfo); - ppTInfo[count]=(LPTYPEINFO)pTInfo; + ITypeInfo2_AddRef(&pTInfo->ITypeInfo2_iface); + ppTInfo[count] = (ITypeInfo *)&pTInfo->ITypeInfo2_iface; count++; } TRACE("found %d typeinfos\n", count); @@ -5253,7 +5253,7 @@ static HRESULT WINAPI ITypeLibComp_fnBind( return hr; *pDescKind = DESCKIND_IMPLICITAPPOBJ; - *ppTInfo = (ITypeInfo *)pTypeInfo; + *ppTInfo = (ITypeInfo *)&pTypeInfo->ITypeInfo2_iface; ITypeInfo_AddRef(*ppTInfo); return S_OK; } @@ -8195,7 +8195,7 @@ HRESULT WINAPI CreateDispTypeInfo( dump_TypeInfo(pTIClass); - *pptinfo = (ITypeInfo*)pTIClass; + *pptinfo = (ITypeInfo *)&pTIClass->ITypeInfo2_iface; ITypeInfo_AddRef(*pptinfo); ITypeLib2_Release(&pTypeLibImpl->ITypeLib2_iface); @@ -8208,21 +8208,21 @@ static HRESULT WINAPI ITypeComp_fnQueryInterface(ITypeComp * iface, REFIID riid, { ITypeInfoImpl *This = info_impl_from_ITypeComp(iface); - return ITypeInfo_QueryInterface((ITypeInfo *)This, riid, ppv); + return ITypeInfo2_QueryInterface(&This->ITypeInfo2_iface, riid, ppv); } static ULONG WINAPI ITypeComp_fnAddRef(ITypeComp * iface) { ITypeInfoImpl *This = info_impl_from_ITypeComp(iface); - return ITypeInfo_AddRef((ITypeInfo *)This); + return ITypeInfo2_AddRef(&This->ITypeInfo2_iface); } static ULONG WINAPI ITypeComp_fnRelease(ITypeComp * iface) { ITypeInfoImpl *This = info_impl_from_ITypeComp(iface); - return ITypeInfo_Release((ITypeInfo *)This); + return ITypeInfo2_Release(&This->ITypeInfo2_iface); } static HRESULT WINAPI ITypeComp_fnBind(

1 0

Dmitry Timoshkov : winspool.drv: Avoid converting garbage if there was no DEVMODE passed in.
by Alexandre Julliard 14 Jun '13

14 Jun '13

Module: wine Branch: master Commit: aa0cc00b48c458d02d3a069a92da8a358f97efdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa0cc00b48c458d02d3a069a9… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jun 14 12:18:49 2013 +0900 winspool.drv: Avoid converting garbage if there was no DEVMODE passed in. --- dlls/winspool.drv/info.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index fc74e76..2ab2401 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -2410,7 +2410,7 @@ LONG WINAPI DocumentPropertiesW(HWND hWnd, HANDLE hPrinter, if(ret < 0) return ret; pDevModeOutputA = HeapAlloc(GetProcessHeap(), 0, ret); } - pDevModeInputA = DEVMODEdupWtoA(pDevModeInput); + pDevModeInputA = (fMode & DM_IN_BUFFER) ? DEVMODEdupWtoA(pDevModeInput) : NULL; ret = DocumentPropertiesA(hWnd, hPrinter, pDeviceNameA, pDevModeOutputA, pDevModeInputA, fMode); if(pDevModeOutput) {

1 0

Henri Verbeet : wined3d: Allow a custom pitch to be specified in wined3d_surface_set_mem().
by Alexandre Julliard 14 Jun '13

14 Jun '13

Module: wine Branch: master Commit: 4de77fa23f1c41dbafdcf8382dcb5daf39b6b5c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4de77fa23f1c41dbafdcf8382… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 14 09:07:10 2013 +0200 wined3d: Allow a custom pitch to be specified in wined3d_surface_set_mem(). --- dlls/d3d9/device.c | 2 +- dlls/ddraw/surface.c | 18 +++++++++++++----- dlls/wined3d/surface.c | 9 +++++++-- dlls/wined3d/wined3d.spec | 2 +- dlls/wined3d/wined3d_private.h | 5 +++-- include/wine/wined3d.h | 2 +- 6 files changed, 26 insertions(+), 12 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 49de853..738a274 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -766,7 +766,7 @@ static HRESULT WINAPI d3d9_device_CreateTexture(IDirect3DDevice9Ex *iface, resource = wined3d_texture_get_sub_resource(object->wined3d_texture, 0); surface = wined3d_resource_get_parent(resource); - wined3d_surface_set_mem(surface->wined3d_surface, *shared_handle); + wined3d_surface_set_mem(surface->wined3d_surface, *shared_handle, 0); } TRACE("Created texture %p.\n", object); diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 4ca02bd..4108fcd 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -4233,7 +4233,7 @@ static HRESULT WINAPI ddraw_surface7_SetSurfaceDesc(IDirectDrawSurface7 *iface, | DDSD_HEIGHT | DDSD_PITCH | DDSD_CAPS; enum wined3d_format_id format_id; BOOL update_wined3d = FALSE; - UINT width, height; + UINT pitch, width, height; TRACE("iface %p, surface_desc %p, flags %#x.\n", iface, DDSD, Flags); @@ -4293,6 +4293,7 @@ static HRESULT WINAPI ddraw_surface7_SetSurfaceDesc(IDirectDrawSurface7 *iface, TRACE("Surface pitch changed from %u to %u.\n", This->surface_desc.u1.lPitch, DDSD->u1.lPitch); update_wined3d = TRUE; } + pitch = DDSD->u1.lPitch; width = DDSD->dwWidth; } else if (DDSD->dwFlags & DDSD_PITCH) @@ -4302,6 +4303,7 @@ static HRESULT WINAPI ddraw_surface7_SetSurfaceDesc(IDirectDrawSurface7 *iface, } else { + pitch = This->surface_desc.u1.lPitch; width = This->surface_desc.dwWidth; } @@ -4370,8 +4372,7 @@ static HRESULT WINAPI ddraw_surface7_SetSurfaceDesc(IDirectDrawSurface7 *iface, if (DDSD->dwFlags & DDSD_LPSURFACE && DDSD->lpSurface) { - hr = wined3d_surface_set_mem(This->wined3d_surface, DDSD->lpSurface); - if (FAILED(hr)) + if (FAILED(hr = wined3d_surface_set_mem(This->wined3d_surface, DDSD->lpSurface, pitch))) { /* No need for a trace here, wined3d does that for us */ switch(hr) @@ -5843,8 +5844,15 @@ HRESULT ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, } if (desc->dwFlags & DDSD_LPSURFACE) { - hr = wined3d_surface_set_mem(surface->wined3d_surface, desc->lpSurface); - if (FAILED(hr)) + UINT pitch = 0; + + if (desc->dwFlags & DDSD_PITCH) + { + pitch = desc->u1.lPitch; + surface->surface_desc.u1.lPitch = pitch; + } + + if (FAILED(hr = wined3d_surface_set_mem(surface->wined3d_surface, desc->lpSurface, pitch))) { ERR("Failed to set surface memory, hr %#x.\n", hr); wined3d_surface_decref(surface->wined3d_surface); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 773424a..a325ac0 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -101,7 +101,7 @@ static void surface_cleanup(struct wined3d_surface *surface) } if (surface->flags & SFLAG_USERPTR) - wined3d_surface_set_mem(surface, NULL); + wined3d_surface_set_mem(surface, NULL, 0); if (surface->overlay_dest) list_remove(&surface->overlay_entry); @@ -3202,6 +3202,9 @@ DWORD CDECL wined3d_surface_get_pitch(const struct wined3d_surface *surface) TRACE("surface %p.\n", surface); + if (surface->pitch) + return surface->pitch; + if (format->flags & WINED3DFMT_FLAG_BLOCKS) { /* Since compressed formats are block based, pitch means the amount of @@ -3221,7 +3224,7 @@ DWORD CDECL wined3d_surface_get_pitch(const struct wined3d_surface *surface) return pitch; } -HRESULT CDECL wined3d_surface_set_mem(struct wined3d_surface *surface, void *mem) +HRESULT CDECL wined3d_surface_set_mem(struct wined3d_surface *surface, void *mem, UINT pitch) { TRACE("surface %p, mem %p.\n", surface, mem); @@ -3290,6 +3293,8 @@ HRESULT CDECL wined3d_surface_set_mem(struct wined3d_surface *surface, void *mem surface_modify_location(surface, SFLAG_INSYSMEM, TRUE); } + surface->pitch = pitch; + return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 8357d2b..f451b7a 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -226,7 +226,7 @@ @ cdecl wined3d_surface_releasedc(ptr ptr) @ cdecl wined3d_surface_restore(ptr) @ cdecl wined3d_surface_set_color_key(ptr long ptr) -@ cdecl wined3d_surface_set_mem(ptr ptr) +@ cdecl wined3d_surface_set_mem(ptr ptr long) @ cdecl wined3d_surface_set_overlay_position(ptr long long) @ cdecl wined3d_surface_set_palette(ptr ptr) @ cdecl wined3d_surface_set_priority(ptr long) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4ac9098..82a4584 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2095,8 +2095,9 @@ struct wined3d_surface DWORD flags; - UINT pow2Width; - UINT pow2Height; + UINT pitch; + UINT pow2Width; + UINT pow2Height; /* A method to retrieve the drawable size. Not in the Vtable to make it changeable */ void (*get_drawable_size)(const struct wined3d_context *context, UINT *width, UINT *height); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index a7a53f1..86e8b5b 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2332,7 +2332,7 @@ HRESULT __cdecl wined3d_surface_releasedc(struct wined3d_surface *surface, HDC d HRESULT __cdecl wined3d_surface_restore(struct wined3d_surface *surface); HRESULT __cdecl wined3d_surface_set_color_key(struct wined3d_surface *surface, DWORD flags, const struct wined3d_color_key *color_key); -HRESULT __cdecl wined3d_surface_set_mem(struct wined3d_surface *surface, void *mem); +HRESULT __cdecl wined3d_surface_set_mem(struct wined3d_surface *surface, void *mem, UINT pitch); HRESULT __cdecl wined3d_surface_set_overlay_position(struct wined3d_surface *surface, LONG x, LONG y); void __cdecl wined3d_surface_set_palette(struct wined3d_surface *surface, struct wined3d_palette *palette); DWORD __cdecl wined3d_surface_set_priority(struct wined3d_surface *surface, DWORD new_priority);

1 0