wine-commits March 2017

wine-commits@winehq.org

2 participants
717 discussions

Nikolay Sivov : xmllite/reader: Fix prefix returned after moving back to element.
by Alexandre Julliard 07 Mar '17

07 Mar '17

Module: wine Branch: master Commit: 3fe5f25b17525f7bb43c37b1746260f3d80f62ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fe5f25b17525f7bb43c37b17… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 7 06:50:57 2017 +0300 xmllite/reader: Fix prefix returned after moving back to element. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 2 ++ dlls/xmllite/tests/reader.c | 11 +++++++++++ 2 files changed, 13 insertions(+) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 84f38d5..7aaaebf 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -2890,12 +2890,14 @@ static HRESULT WINAPI xmlreader_MoveToElement(IXmlReader* iface) /* FIXME: support other node types with 'attributes' like DTD */ if (This->is_empty_element) { + reader_set_strvalue(This, StringValue_Prefix, &This->empty_element.prefix); reader_set_strvalue(This, StringValue_LocalName, &This->empty_element.localname); reader_set_strvalue(This, StringValue_QualifiedName, &This->empty_element.qname); } else { struct element *element = LIST_ENTRY(list_head(&This->elements), struct element, entry); if (element) { + reader_set_strvalue(This, StringValue_Prefix, &element->prefix); reader_set_strvalue(This, StringValue_LocalName, &element->localname); reader_set_strvalue(This, StringValue_QualifiedName, &element->qname); } diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 84316e4..8a736bf 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -2034,6 +2034,17 @@ static void test_prefix(void) wine_dbgstr_w(expected)); free_str(expected); + /* back to the element, check prefix */ + hr = IXmlReader_MoveToElement(reader); + ok(hr == S_OK, "MoveToElement() failed, %#x.\n", hr); + + expected = a2w(prefix_tests[i].prefix1); + hr = IXmlReader_GetPrefix(reader, &prefix, NULL); + ok(hr == S_OK, "GetPrefix() failed, %#x.\n", hr); + ok(!lstrcmpW(prefix, expected), "Unexpected prefix %s, expected %s.\n", wine_dbgstr_w(prefix), + wine_dbgstr_w(expected)); + free_str(expected); + IStream_Release(stream); }

1 0

Nikolay Sivov : xmllite/reader: Return empty value for elements.
by Alexandre Julliard 07 Mar '17

07 Mar '17

Module: wine Branch: master Commit: 70028b7d0a9bcd3d2e871e9364e4a588e6bc0882 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70028b7d0a9bcd3d2e871e936… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 7 06:50:56 2017 +0300 xmllite/reader: Return empty value for elements. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 2 ++ dlls/xmllite/tests/reader.c | 12 +++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 9e0d11e..84f38d5 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -2244,6 +2244,7 @@ static HRESULT reader_parse_element(xmlreader *reader) reader_set_strvalue(reader, StringValue_Prefix, &prefix); reader_set_strvalue(reader, StringValue_LocalName, &local); reader_set_strvalue(reader, StringValue_QualifiedName, &qname); + reader_set_strvalue(reader, StringValue_Value, &strval_empty); break; } default: @@ -2899,6 +2900,7 @@ static HRESULT WINAPI xmlreader_MoveToElement(IXmlReader* iface) reader_set_strvalue(This, StringValue_QualifiedName, &element->qname); } } + reader_set_strvalue(This, StringValue_Value, &strval_empty); return S_OK; } diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 7153474..84316e4 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -909,7 +909,6 @@ todo_wine { hr = IXmlReader_GetValue(reader, &val, NULL); ok(hr == S_OK, "expected S_OK, got %08x\n", hr); -todo_wine ok(*val == 0, "got %s\n", wine_dbgstr_w(val)); hr = IXmlReader_GetLocalName(reader, &val, NULL); @@ -1473,9 +1472,17 @@ static void test_read_element(void) /* moving to attributes increases depth */ if (count) { + const WCHAR *value; + + hr = IXmlReader_GetValue(reader, &value, NULL); + ok(*value == 0, "Unexpected value %s\n", wine_dbgstr_w(value)); + hr = IXmlReader_MoveToFirstAttribute(reader); ok(hr == S_OK, "got %08x\n", hr); + hr = IXmlReader_GetValue(reader, &value, NULL); + ok(*value != 0, "Unexpected value %s\n", wine_dbgstr_w(value)); + depth = 123; hr = IXmlReader_GetDepth(reader, &depth); ok(hr == S_OK, "got %08x\n", hr); @@ -1484,6 +1491,9 @@ static void test_read_element(void) hr = IXmlReader_MoveToElement(reader); ok(hr == S_OK, "got %08x\n", hr); + hr = IXmlReader_GetValue(reader, &value, NULL); + ok(*value == 0, "Unexpected value %s\n", wine_dbgstr_w(value)); + depth = 123; hr = IXmlReader_GetDepth(reader, &depth); ok(hr == S_OK, "got %08x\n", hr);

1 0

Nikolay Sivov : xmllite/reader: Return proper name for xml declaration PI.
by Alexandre Julliard 07 Mar '17

07 Mar '17

Module: wine Branch: master Commit: 7c44c65ebb28a0dbc68f874b0d22f482f6c2a04b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c44c65ebb28a0dbc68f874b0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 7 06:50:55 2017 +0300 xmllite/reader: Return proper name for xml declaration PI. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 4 ++-- dlls/xmllite/tests/reader.c | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 5f53d3f..9e0d11e 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -1299,8 +1299,8 @@ static HRESULT reader_parse_xmldecl(xmlreader *reader) reader_skipn(reader, 2); reader->nodetype = XmlNodeType_XmlDeclaration; - reader_set_strvalue(reader, StringValue_LocalName, &strval_empty); - reader_set_strvalue(reader, StringValue_QualifiedName, &strval_empty); + reader_set_strvalue(reader, StringValue_LocalName, &strval_xml); + reader_set_strvalue(reader, StringValue_QualifiedName, &strval_xml); reader_set_strvalue(reader, StringValue_Value, &strval_empty); return S_OK; diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 07e149f..7153474 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -869,9 +869,14 @@ todo_wine { ok(hr == S_OK, "expected S_OK, got %08x\n", hr); ok(*val == 0, "got %s\n", wine_dbgstr_w(val)); + val = NULL; hr = IXmlReader_GetLocalName(reader, &val, NULL); ok(hr == S_OK, "expected S_OK, got %08x\n", hr); -todo_wine + ok(!lstrcmpW(val, xmlW), "got %s\n", wine_dbgstr_w(val)); + + val = NULL; + hr = IXmlReader_GetQualifiedName(reader, &val, NULL); + ok(hr == S_OK, "expected S_OK, got %08x\n", hr); ok(!lstrcmpW(val, xmlW), "got %s\n", wine_dbgstr_w(val)); /* check attributes */

1 0

Alexandre Julliard : patches: Add a patch status for missing authorship information.
by Alexandre Julliard 07 Mar '17

07 Mar '17

Module: tools Branch: master Commit: 34dd20b4de6c0971813b930b718ebe33ee086f31 URL: http://source.winehq.org/git/tools.git/?a=commit;h=34dd20b4de6c0971813b930b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 7 10:49:32 2017 +0100 patches: Add a patch status for missing authorship information. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- patches/expire | 15 +++++++++++---- patches/patches.css | 1 + patches/update | 5 +++-- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/patches/expire b/patches/expire index 6bbd5c8..fd5ba22 100755 --- a/patches/expire +++ b/patches/expire @@ -31,6 +31,7 @@ my %status_expiry = "applyfail" => 7, "buildfail" => 7, "deferred" => 7, + "authorship" => 7, "formatting" => 7, "other" => 7, "nopatch" => 3, @@ -54,6 +55,7 @@ my %status_descr = "applyfail" => "Apply failure", "buildfail" => "Build failure", "deferred" => "Deferred", + "authorship" => "Authorship", "formatting" => "Formatting", "other" => "Other project", "nopatch" => "No patch", @@ -98,12 +100,17 @@ mode implies -Werror). You need to resend a fixed patch.", upcoming release. You need to either resend after the release, make the patch less intrusive, or make a convincing argument that it needs to be included in the release.", + "authorship" => +"This means that there are some authorship issues with your patch. The +author's full name, email address, or Signed-off-by headers are +missing or incorrectly formatted. You need to resend a patch with +corrected author information.", "formatting" => "This means that there are some formatting issues with your -patch. Either the author's full name, email address, or Signed-off-by -headers are missing, indentation is messed up (usually from editing -with a non-standard tab size), or there are gratuitous formatting -changes to the code. You need to resend a fixed patch.", +patch. Either the indentation is messed up (usually from editing with +a non-standard tab size), some characters got mangled in transit, or +there are gratuitous formatting changes to the code. You need to +resend a fixed patch.", "other" => "This means that the patch belongs to another WineHQ project (website, appdb, etc.) and will be applied by the respective maintainer.", diff --git a/patches/patches.css b/patches/patches.css index 020d48c..2799827 100644 --- a/patches/patches.css +++ b/patches/patches.css @@ -162,6 +162,7 @@ tr.odd { background-color: #f8e8e8; } .other, .other :link, .other :visited { color: #e08000; } .applyfail, .applyfail :link, .applyfail :visited { color: red; } .buildfail, .buildfail :link, .buildfail :visited { color: red; } +.authorship, .authorship :link, .authorship :visited { color: red; } .formatting, .formatting :link, .formatting :visited { color: red; } .nopatch, .nopatch :link, .nopatch :visited { color: red; } .rejected, .rejected :link, .rejected :visited { color: red; } diff --git a/patches/update b/patches/update index ddf1396..ad2b82a 100755 --- a/patches/update +++ b/patches/update @@ -31,6 +31,7 @@ my %status_descr = "applyfail" => "Apply failure", "buildfail" => "Build failure", "deferred" => "Deferred", + "authorship" => "Authorship", "formatting" => "Formatting", "other" => "Other project", "nopatch" => "No patch", @@ -66,8 +67,8 @@ my @legend = [ "buildfail", "<ul><li>Syntax error or other compile problem.</li>" . "<li>You forgot to include some changes or new files required for compilation.</li>" . "<li>The patch causes compiler warnings (maintainer mode implies -Werror).</li></ul>" ], - [ "formatting", "<ul><li>The patch author's full name, email address, or Signed-off-by headers are incorrect or missing.</li>" . - "<li>Whitespace got mangled in transit.</li>" . + [ "authorship", "<ul><li>The patch author's full name, email address, or Signed-off-by headers are incorrect or missing.</li></ul>" ], + [ "formatting", "<ul><li>Whitespace got mangled in transit.</li>" . "<li>Indentation is messed up (usually from editing with a non-standard tab size).</li>" . "<li>8-bit chars got mangled in transit (usually when sending patches to translation files).</li>" . "<li>You are making gratuitous formatting changes to the code.</li>" .

1 0

Louis Lenders : kernel32: Add stub for GetCurrentPackageFullName.
by Alexandre Julliard 06 Mar '17

06 Mar '17

Module: wine Branch: master Commit: 3f50319ec384730360d16dd79d703adafaa953fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f50319ec384730360d16dd79… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Sat Mar 4 10:56:06 2017 +0100 kernel32: Add stub for GetCurrentPackageFullName. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-appmodel-runtime-l1-1-1.spec | 2 +- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/version.c | 9 +++++++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/api-ms-win-appmodel-runtime-l1-1-1/api-ms-win-appmodel-runtime-l1-1-1.spec b/dlls/api-ms-win-appmodel-runtime-l1-1-1/api-ms-win-appmodel-runtime-l1-1-1.spec index 1eb8327..2c5cf9e 100644 --- a/dlls/api-ms-win-appmodel-runtime-l1-1-1/api-ms-win-appmodel-runtime-l1-1-1.spec +++ b/dlls/api-ms-win-appmodel-runtime-l1-1-1/api-ms-win-appmodel-runtime-l1-1-1.spec @@ -4,7 +4,7 @@ @ stub GetApplicationUserModelId @ stub GetCurrentApplicationUserModelId @ stub GetCurrentPackageFamilyName -@ stub GetCurrentPackageFullName +@ stdcall GetCurrentPackageFullName(ptr ptr) kernel32.GetCurrentPackageFullName @ stdcall GetCurrentPackageId(ptr ptr) kernel32.GetCurrentPackageId @ stub GetCurrentPackageInfo @ stub GetCurrentPackagePath diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 388f7c0..59e39a7 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -629,6 +629,7 @@ @ stdcall GetCurrentDirectoryA(long ptr) @ stdcall GetCurrentDirectoryW(long ptr) @ stdcall GetCurrentPackageId(ptr ptr) +@ stdcall GetCurrentPackageFullName(ptr ptr) @ stdcall -norelay GetCurrentProcess() @ stdcall -norelay GetCurrentProcessId() @ stdcall GetCurrentProcessorNumber() ntdll.NtGetCurrentProcessorNumber diff --git a/dlls/kernel32/version.c b/dlls/kernel32/version.c index b9d13e4..cf783af 100644 --- a/dlls/kernel32/version.c +++ b/dlls/kernel32/version.c @@ -207,3 +207,12 @@ LONG WINAPI GetCurrentPackageId(UINT32 *len, BYTE *buffer) FIXME("(%p %p): stub\n", len, buffer); return APPMODEL_ERROR_NO_PACKAGE; } + +/*********************************************************************** + * GetCurrentPackageFullName (KERNEL32.@) + */ +LONG WINAPI GetCurrentPackageFullName(UINT32 *length, PWSTR name) +{ + FIXME("(%p %p): stub\n", length, name); + return APPMODEL_ERROR_NO_PACKAGE; +}

1 0

Alistair Leslie-Hughes : dplayx/tests: Free IDirectPlayLobby objects.
by Alexandre Julliard 06 Mar '17

06 Mar '17

Module: wine Branch: master Commit: e16abdfad1395d3703e1886838ae5f7cc8cb74e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e16abdfad1395d3703e188683… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Mar 3 05:15:44 2017 +0000 dplayx/tests: Free IDirectPlayLobby objects. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dplayx/tests/dplayx.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index 27dc9ee..2b4fda3 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -700,7 +700,7 @@ static void init_TCPIP_provider( IDirectPlay4 *pDP, LPCSTR strIPAddressString, W checkHR( DP_OK, hr ); HeapFree( GetProcessHeap(), 0, pAddress ); - + IDirectPlayLobby_Release(pDPL); } static BOOL CALLBACK EnumSessions_cb_join( LPCDPSESSIONDESC2 lpThisSD, @@ -940,6 +940,8 @@ static BOOL CALLBACK EnumConnections_cb( LPCGUID lpguidSP, callbackData->dwCounter1++; + IDirectPlayLobby_Release(pDPL); + return TRUE; } @@ -3075,7 +3077,7 @@ static void test_GetPlayerAddress(void) if ( hr == DP_OK ) { todo_wine win_skip( "GetPlayerAddress not implemented\n" ); - return; + goto cleanup; } init_TCPIP_provider( pDP[0], "127.0.0.1", 0 ); @@ -3171,9 +3173,11 @@ static void test_GetPlayerAddress(void) HeapFree( GetProcessHeap(), 0, lpData ); + +cleanup: IDirectPlayX_Release( pDP[0] ); IDirectPlayX_Release( pDP[1] ); - + IDirectPlayLobby_Release(pDPL); } /* GetPlayerFlags */

1 0

Alistair Leslie-Hughes : dplayx: Skip over unknown DataTypes guids in EnumAddressTypes.
by Alexandre Julliard 06 Mar '17

06 Mar '17

Module: wine Branch: master Commit: 2bb3636a14d1d52f17ece4ece0d0df4f5cb4c1e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bb3636a14d1d52f17ece4ece… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Mar 3 05:15:32 2017 +0000 dplayx: Skip over unknown DataTypes guids in EnumAddressTypes. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dplayx/dplobby.c | 3 +-- dlls/dplayx/tests/dplayx.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 2 deletions(-) diff --git a/dlls/dplayx/dplobby.c b/dlls/dplayx/dplobby.c index 2cf342f..7f9c7a8 100644 --- a/dlls/dplayx/dplobby.c +++ b/dlls/dplayx/dplobby.c @@ -1726,8 +1726,7 @@ HRESULT DPL_CreateCompoundAddress } else { - ERR( "Unknown GUID %s\n", debugstr_guid(&lpElements->guidDataType) ); - return DPERR_INVALIDFLAGS; + WARN( "Skipping Unknown GUID %s\n", debugstr_guid(&lpElements->guidDataType) ); } } diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index 4c68873..27dc9ee 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -64,6 +64,7 @@ static HRESULT (WINAPI *pDirectPlayCreate)( GUID *GUID, LPDIRECTPLAY *lplpDP, IU DEFINE_GUID(appGuid, 0xbdcfe03e, 0xf0ec, 0x415b, 0x82, 0x11, 0x6f, 0x86, 0xd8, 0x19, 0x7f, 0xe1); DEFINE_GUID(appGuid2, 0x93417d3f, 0x7d26, 0x46ba, 0xb5, 0x76, 0xfe, 0x4b, 0x20, 0xbb, 0xad, 0x70); DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); +DEFINE_GUID(invalid_guid, 0x7b48b707, 0x0034, 0xc000, 0x02, 0x00, 0x00, 0x00, 0xec, 0xf6, 0x32, 0x00); typedef struct tagCallbackData @@ -1128,6 +1129,53 @@ static void test_GetCaps(void) IDirectPlayX_Release( pDP ); } +static void test_EnumAddressTypes(void) +{ + IDirectPlay4 *pDP; + HRESULT hr; + DPCOMPOUNDADDRESSELEMENT addressElements[2]; + LPVOID pAddress = NULL; + DWORD dwAddressSize = 0; + IDirectPlayLobby3 *pDPL; + WORD port = 6001; + + hr = CoCreateInstance( &CLSID_DirectPlay, NULL, CLSCTX_ALL, + &IID_IDirectPlay4A, (LPVOID*) &pDP ); + ok( SUCCEEDED(hr), "CCI of CLSID_DirectPlay / IID_IDirectPlay4A failed\n" ); + if (FAILED(hr)) + return; + + hr = CoCreateInstance( &CLSID_DirectPlayLobby, NULL, CLSCTX_ALL, + &IID_IDirectPlayLobby3A, (LPVOID*) &pDPL ); + ok (SUCCEEDED (hr), "CCI of CLSID_DirectPlayLobby / IID_IDirectPlayLobby3A failed\n"); + if (FAILED (hr)) return; + + addressElements[0].guidDataType = DPAID_ServiceProvider; + addressElements[0].dwDataSize = sizeof(GUID); + addressElements[0].lpData = (void*) &DPSPGUID_TCPIP; + + addressElements[1].guidDataType = invalid_guid; + addressElements[1].dwDataSize = sizeof(WORD); + addressElements[1].lpData = &port; + + hr = IDirectPlayLobby_CreateCompoundAddress( pDPL, addressElements, 2, NULL, &dwAddressSize ); + checkHR( DPERR_BUFFERTOOSMALL, hr ); + + if( hr == DPERR_BUFFERTOOSMALL ) + { + pAddress = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, dwAddressSize ); + hr = IDirectPlayLobby_CreateCompoundAddress( pDPL, addressElements, 2, + pAddress, &dwAddressSize ); + checkHR( DP_OK, hr ); + } + + IDirectPlayX_Close(pDP); + IDirectPlayX_Release(pDP); + IDirectPlayLobby_Release(pDPL); + + HeapFree( GetProcessHeap(), 0, pAddress ); +} + /* Open */ static BOOL CALLBACK EnumSessions_cb2( LPCDPSESSIONDESC2 lpThisSD, @@ -6894,6 +6942,7 @@ START_TEST(dplayx) test_EnumConnections(); test_InitializeConnection(); test_GetCaps(); + test_EnumAddressTypes(); if (!winetest_interactive) {

1 0

Akihiro Sagawa : Use CP 1200 (Unicode) for Win32/Win64 version info.
by Alexandre Julliard 06 Mar '17

06 Mar '17

Module: wine Branch: master Commit: b027a7db5079f4405eca4610ff2d095e53022d3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b027a7db5079f4405eca4610f… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Mar 6 23:49:43 2017 +0900 Use CP 1200 (Unicode) for Win32/Win64 version info. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/npmshtml/rsrc.rc | 1 + dlls/version/tests/info.c | 2 -- include/wine/wine_common_ver.rc | 24 ++++++++++++++++++++++-- 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/dlls/npmshtml/rsrc.rc b/dlls/npmshtml/rsrc.rc index d57e09c..0762266 100644 --- a/dlls/npmshtml/rsrc.rc +++ b/dlls/npmshtml/rsrc.rc @@ -18,6 +18,7 @@ #define WINE_FILEDESCRIPTION_STR "Wine ActiveX plugin" #define WINE_FILENAME_STR "npmshtml.dll" +#define WINE_CODEPAGE 04E4 /* need to set "Windows Multilingual" */ #define WINE_EXTRAVALUES \ VALUE "OLESelfRegister", "" \ VALUE "MIMEType", "application/x-oleobject" diff --git a/dlls/version/tests/info.c b/dlls/version/tests/info.c index d3420bc..c033aa9 100644 --- a/dlls/version/tests/info.c +++ b/dlls/version/tests/info.c @@ -664,7 +664,6 @@ static void test_GetFileVersionInfoEx(void) todo_wine_if(lang != english) ok(LOWORD(translation) == lang, "got %u, expected lang is %u\n", LOWORD(translation), lang); - todo_wine ok(HIWORD(translation) == unicode, "got %u, expected codepage is %u\n", HIWORD(translation), unicode); @@ -706,7 +705,6 @@ static void test_GetFileVersionInfoEx(void) else ok(LOWORD(translation) == english, "[%u] got %u, expected lang is %u\n", i, LOWORD(translation), english); - todo_wine ok(HIWORD(translation) == unicode, "[%u] got %u, expected codepage is %u\n", i, HIWORD(translation), unicode); diff --git a/include/wine/wine_common_ver.rc b/include/wine/wine_common_ver.rc index 76ddabf..50ba1cf 100644 --- a/include/wine/wine_common_ver.rc +++ b/include/wine/wine_common_ver.rc @@ -48,6 +48,8 @@ never complain. #define WINE_VER_STRINGIZE2(x) #x #define WINE_VER_STRINGIZE(x) WINE_VER_STRINGIZE2(x) +#define WINE_VER_HEXPREFIX2(x) 0x ## x +#define WINE_VER_HEXPREFIX(x) WINE_VER_HEXPREFIX2(x) #ifndef WINE_FILEVERSION_STR #define WINE_FILEVERSION_STR WINE_VER_STRINGIZE(WINE_FILEVERSION_MAJOR.WINE_FILEVERSION_MINOR.WINE_FILEVERSION_BUILD.WINE_FILEVERSION_PLATFORMID) @@ -93,6 +95,22 @@ never complain. #define WINE_EXTRAVALUES #endif +#ifndef WINE_CODEPAGE +#ifdef _WIN32 +#define WINE_CODEPAGE 04B0 /* CP1200 (Unicode) */ +#else +#define WINE_CODEPAGE 04E4 /* CP1252 for Win16 */ +#endif +#endif + +#ifndef WINE_CODEPAGE_STR +#define WINE_CODEPAGE_STR WINE_VER_STRINGIZE(WINE_CODEPAGE) +#endif + +#ifndef WINE_CODEPAGE_HEX +#define WINE_CODEPAGE_HEX WINE_VER_HEXPREFIX(WINE_CODEPAGE) +#endif + VS_VERSION_INFO VERSIONINFO FILEVERSION WINE_FILEVERSION PRODUCTVERSION WINE_PRODUCTVERSION @@ -104,7 +122,8 @@ FILESUBTYPE WINE_FILESUBTYPE { BLOCK "StringFileInfo" { - BLOCK "040904E4" /* LANG_ENGLISH/SUBLANG_DEFAULT, CP 1252 */ + /* LANG_ENGLISH/SUBLANG_DEFAULT, WINE_CODEPAGE */ + BLOCK "0409" WINE_CODEPAGE_STR { VALUE "CompanyName", "Microsoft Corporation" /* GameGuard depends on this */ VALUE "FileDescription", WINE_FILEDESCRIPTION_STR @@ -119,6 +138,7 @@ FILESUBTYPE WINE_FILESUBTYPE } BLOCK "VarFileInfo" { - VALUE "Translation", 0x0409, 0x04E4 /* LANG_ENGLISH/SUBLANG_DEFAULT, CP 1252 */ + /* LANG_ENGLISH/SUBLANG_DEFAULT, WINE_CODEPAGE */ + VALUE "Translation", 0x0409, WINE_CODEPAGE_HEX } }

1 0

Akihiro Sagawa : iexplore: Follow translation version info to detect native IE.
by Alexandre Julliard 06 Mar '17

06 Mar '17

Module: wine Branch: master Commit: 79d01be4361dcd999ca393239dc55849f2d235c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79d01be4361dcd999ca393239… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Mar 6 23:49:41 2017 +0900 iexplore: Follow translation version info to detect native IE. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/iexplore/Makefile.in | 2 +- programs/iexplore/main.c | 18 +++++++++++++----- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/programs/iexplore/Makefile.in b/programs/iexplore/Makefile.in index f3fd4c2..7e74867 100644 --- a/programs/iexplore/Makefile.in +++ b/programs/iexplore/Makefile.in @@ -1,7 +1,7 @@ MODULE = iexplore.exe APPMODE = -mwindows -municode -Wl,--large-address-aware IMPORTS = ieframe -DELAYIMPORTS = advpack version +DELAYIMPORTS = advpack version user32 C_SRCS = \ main.c diff --git a/programs/iexplore/main.c b/programs/iexplore/main.c index 73fec25..b881443 100644 --- a/programs/iexplore/main.c +++ b/programs/iexplore/main.c @@ -34,14 +34,19 @@ static BOOL check_native_ie(void) LPWSTR file_desc; UINT bytes; void* buf; - BOOL ret; + BOOL ret = TRUE; + LPWORD translation; static const WCHAR browseui_dllW[] = {'b','r','o','w','s','e','u','i','.','d','l','l',0}; static const WCHAR wineW[] = {'W','i','n','e',0}; - static const WCHAR file_desc_strW[] = + static const WCHAR translationW[] = + {'\\','V','a','r','F','i','l','e','I','n','f','o', + '\\','T','r','a','n','s','l','a','t','i','o','n',0}; + static const WCHAR file_desc_fmtW[] = {'\\','S','t','r','i','n','g','F','i','l','e','I','n','f','o', - '\\','0','4','0','9','0','4','e','4', + '\\','%','0','4','x','%','0','4','x', '\\','F','i','l','e','D','e','s','c','r','i','p','t','i','o','n',0}; + WCHAR file_desc_strW[48]; size = GetFileVersionInfoSizeW(browseui_dllW, &handle); if(!size) @@ -49,8 +54,11 @@ static BOOL check_native_ie(void) buf = HeapAlloc(GetProcessHeap(), 0, size); GetFileVersionInfoW(browseui_dllW, 0, size,buf); - - ret = !VerQueryValueW(buf, file_desc_strW, (void**)&file_desc, &bytes) || !strstrW(file_desc, wineW); + if (VerQueryValueW(buf, translationW, (void **)&translation, &bytes)) + { + wsprintfW(file_desc_strW, file_desc_fmtW, translation[0], translation[1]); + ret = !VerQueryValueW(buf, file_desc_strW, (void**)&file_desc, &bytes) || !strstrW(file_desc, wineW); + } HeapFree(GetProcessHeap(), 0, buf); return ret;

1 0

Vincent Povirk : mscoree: Update Wine Mono to 4.7.0.
by Alexandre Julliard 06 Mar '17

06 Mar '17

Module: wine Branch: master Commit: 6bf71998781afa4aa011e21cc817a29137ebbbc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bf71998781afa4aa011e21cc… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Mar 3 13:22:29 2017 -0600 mscoree: Update Wine Mono to 4.7.0. This contains upstream updates from the Mono project. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/appwiz.cpl/addons.c | 4 ++-- dlls/mscoree/mscoree_main.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index b4eb12f..c3847b5 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -64,8 +64,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); #define GECKO_SHA "???" #endif -#define MONO_VERSION "4.6.4" -#define MONO_SHA "d58509c3a4e5fa88c56c14e0413a803aa82f6118" +#define MONO_VERSION "4.7.0" +#define MONO_SHA "ff05e1d2a93c3a07672cefc7a8f3a087d75828ac" typedef struct { const char *version; diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 67f4259..49b319c 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -675,7 +675,7 @@ static BOOL install_wine_mono(void) LONG len; BOOL ret; - static const char* mono_version = "4.6.4"; + static const char* mono_version = "4.7.0"; static const char* mono_product_code = "{E45D8920-A758-4088-B6C6-31DBB276992E}"; static const WCHAR controlW[] = {'\\','c','o','n','t','r','o','l','.','e','x','e',0};

1 0

← Newer
1
...
58
59
60
61
62
63
64
...
72
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2017