November 2014 - Wine-commits

Yifu Wang : msvcp120: Added VS2013 CPP runtime dll.
by Alexandre Julliard 13 Nov '14

13 Nov '14

Module: wine Branch: master Commit: c68e8243102d735907abd3299a294bd2393add4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c68e8243102d735907abd3299… Author: Yifu Wang <ywang(a)esri.com> Date: Tue Nov 11 09:35:39 2014 -0800 msvcp120: Added VS2013 CPP runtime dll. --- configure | 2 + configure.ac | 1 + dlls/msvcp120/Makefile.in | 14 + dlls/msvcp120/msvcp120.spec | 3846 +++++++++++++++++++++++++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 3864 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c68e8243102d735907abd…

1 0

Jacek Caban : mshtml: Properly handle errors in IHTMLStyleSheet:: get_rules now that Gecko part is fixed.
by Alexandre Julliard 13 Nov '14

13 Nov '14

Module: wine Branch: master Commit: 6fc5977241bd8e86ba71e1c5b0b07cd9d9c43b2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fc5977241bd8e86ba71e1c5b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 13 11:22:35 2014 +0100 mshtml: Properly handle errors in IHTMLStyleSheet::get_rules now that Gecko part is fixed. --- dlls/mshtml/htmlstylesheet.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstylesheet.c b/dlls/mshtml/htmlstylesheet.c index 8f48a07..6480975 100644 --- a/dlls/mshtml/htmlstylesheet.c +++ b/dlls/mshtml/htmlstylesheet.c @@ -649,11 +649,11 @@ static HRESULT WINAPI HTMLStyleSheet_get_rules(IHTMLStyleSheet *iface, TRACE("(%p)->(%p)\n", This, p); - /* Gecko has buggy security checks and GetCssRules will fail. We have a correct - * implementation and it will work when the bug will be fixed in Gecko. */ nsres = nsIDOMCSSStyleSheet_GetCssRules(This->nsstylesheet, &nslist); - if(NS_FAILED(nsres)) - WARN("GetCssRules failed: %08x\n", nsres); + if(NS_FAILED(nsres)) { + ERR("GetCssRules failed: %08x\n", nsres); + return E_FAIL; + } *p = HTMLStyleSheetRulesCollection_Create(nslist); return S_OK;

1 0

Jacek Caban : wpcapi.idl: Added WPCFLAG_RESTRICTION declaration.
by Alexandre Julliard 13 Nov '14

13 Nov '14

Module: wine Branch: master Commit: 949ecc51232b1d08be192f83624c3424d2473de5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=949ecc51232b1d08be192f836… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 13 11:50:23 2014 +0100 wpcapi.idl: Added WPCFLAG_RESTRICTION declaration. --- include/wpcapi.idl | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/include/wpcapi.idl b/include/wpcapi.idl index 19c5256..db2d991 100644 --- a/include/wpcapi.idl +++ b/include/wpcapi.idl @@ -19,6 +19,15 @@ import "oaidl.idl"; import "ocidl.idl"; +typedef [v1_enum] enum tagWPCFLAG_RESTRICTION { + WPCFLAG_NO_RESTRICTION = 0x0000, + WPCFLAG_LOGGING_REQUIRED = 0x0001, + WPCFLAG_WEB_FILTERED = 0x0002, + WPCFLAG_HOURS_RESTRICTED = 0x0004, + WPCFLAG_GAMES_BLOCKED = 0x0008, + WPCFLAG_APPS_RESTRICTED = 0x0010 +} WPCFLAG_RESTRICTION; + [ uuid(8fdf6ca1-0189-47e4-b670-1a8a4636e340), object

1 0

Jacek Caban : mshtml: Fixed tests on recent IEs.
by Alexandre Julliard 13 Nov '14

13 Nov '14

Module: wine Branch: master Commit: ffd313543f2f633dded1a7802ea6b567c03d8b7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffd313543f2f633dded1a7802… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 13 12:50:01 2014 +0100 mshtml: Fixed tests on recent IEs. --- dlls/mshtml/tests/protocol.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/tests/protocol.c b/dlls/mshtml/tests/protocol.c index 49743d5..00971be 100644 --- a/dlls/mshtml/tests/protocol.c +++ b/dlls/mshtml/tests/protocol.c @@ -137,13 +137,16 @@ static HRESULT WINAPI ProtocolSink_ReportResult(IInternetProtocolSink *iface, HR { CHECK_EXPECT(ReportResult); - if(expect_hr_win32err) + if(expect_hr_win32err) { ok((hrResult&0xffff0000) == ((FACILITY_WIN32 << 16)|0x80000000) || expect_hrResult, "expected win32 err or %08x got: %08x\n", expect_hrResult, hrResult); - else - ok(hrResult == expect_hrResult || ((expect_hrResult == E_INVALIDARG || - expect_hrResult == HRESULT_FROM_WIN32(ERROR_RESOURCE_TYPE_NOT_FOUND)) && - hrResult == MK_E_SYNTAX), "expected: %08x got: %08x\n", expect_hrResult, hrResult); + }else { + ok(hrResult == expect_hrResult || (expect_hrResult == E_INVALIDARG && hrResult == MK_E_SYNTAX) + || (expect_hrResult == HRESULT_FROM_WIN32(ERROR_RESOURCE_TYPE_NOT_FOUND) && + (hrResult == MK_E_SYNTAX || hrResult == HRESULT_FROM_WIN32(ERROR_DLL_NOT_FOUND))), + "expected: %08x got: %08x\n", expect_hrResult, hrResult); + expect_hrResult = hrResult; + } ok(dwError == 0, "dwError = %d\n", dwError); ok(!szResult, "szResult != NULL\n"); @@ -232,9 +235,7 @@ static void test_protocol_fail(IInternetProtocol *protocol, LPCWSTR url, HRESULT ok((hres&0xffff0000) == ((FACILITY_WIN32 << 16)|0x80000000) || hres == expect_hrResult, "expected win32 err or %08x got: %08x\n", expected_hres, hres); else - ok(hres == expected_hres || ((expected_hres == E_INVALIDARG || - expected_hres == HRESULT_FROM_WIN32(ERROR_RESOURCE_TYPE_NOT_FOUND)) && hres == MK_E_SYNTAX), - "expected: %08x got: %08x\n", expected_hres, hres); + ok(hres == expect_hrResult, "expected: %08x got: %08x\n", expect_hrResult, hres); CHECK_CALLED(GetBindInfo); CHECK_CALLED(ReportResult);

1 0

Michael Stefaniuc : gameux: Simplify the check for an empty string ( PVS-Studio).
by Alexandre Julliard 12 Nov '14

12 Nov '14

Module: wine Branch: master Commit: 35b24f1ab55f66f01ae402aaa8e18632a92cebef URL: http://source.winehq.org/git/wine.git/?a=commit;h=35b24f1ab55f66f01ae402aaa… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Nov 12 15:19:58 2014 +0100 gameux: Simplify the check for an empty string (PVS-Studio). --- dlls/gameux/gamestatistics.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gameux/gamestatistics.c b/dlls/gameux/gamestatistics.c index f49d73a..7c95065 100644 --- a/dlls/gameux/gamestatistics.c +++ b/dlls/gameux/gamestatistics.c @@ -180,7 +180,7 @@ static HRESULT GAMEUX_updateStatisticsFile(struct GAMEUX_STATS *stats) { IXMLDOMElement *categoryElement = NULL; - if(lstrlenW(stats->categories[i].sName)==0) + if(!stats->categories[i].sName[0]) continue; V_VT(&vValue) = VT_INT; @@ -218,7 +218,7 @@ static HRESULT GAMEUX_updateStatisticsFile(struct GAMEUX_STATS *stats) { for(j=0; j<MAX_STATS_PER_CATEGORY; ++j) { - if(lstrlenW(stats->categories[i].stats[j].sName)==0) + if(!stats->categories[i].stats[j].sName[0]) continue; V_VT(&vValue) = VT_INT;

1 0

Michael Stefaniuc : mciwave: Simplify the check for an empty string ( PVS-Studio).
by Alexandre Julliard 12 Nov '14

12 Nov '14

Module: wine Branch: master Commit: 2ab0bbafe0f8287fd7a77d9dd7cc6daa28d5441a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ab0bbafe0f8287fd7a77d9dd… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Nov 12 15:22:05 2014 +0100 mciwave: Simplify the check for an empty string (PVS-Studio). --- dlls/mciwave/mciwave.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mciwave/mciwave.c b/dlls/mciwave/mciwave.c index 4f24169..c7992fb 100644 --- a/dlls/mciwave/mciwave.c +++ b/dlls/mciwave/mciwave.c @@ -444,7 +444,7 @@ static DWORD create_tmp_file(HMMIO* hFile, LPWSTR* pszTmpFileName) TRACE("%s!\n", debugstr_w(*pszTmpFileName)); - if (*pszTmpFileName && (strlenW(*pszTmpFileName) > 0)) { + if (*pszTmpFileName && (*pszTmpFileName)[0]) { *hFile = mmioOpenW(*pszTmpFileName, NULL, MMIO_ALLOCBUF | MMIO_READWRITE | MMIO_CREATE); @@ -470,7 +470,7 @@ static LRESULT WAVE_mciOpenFile(WINE_MCIWAVE* wmw, LPCWSTR filename) HeapFree(GetProcessHeap(), 0, wmw->lpFileName); wmw->lpFileName = fn; - if (strlenW(filename) > 0) { + if (filename[0]) { /* FIXME : what should be done if wmw->hFile is already != 0, or the driver is playin' */ TRACE("MCI_OPEN_ELEMENT %s!\n", debugstr_w(filename));

1 0

Michael Stefaniuc : crypt32/tests: Remove an unused assignment (PVS-Studio ).
by Alexandre Julliard 12 Nov '14

12 Nov '14

Module: wine Branch: master Commit: f1786a206823f5ac4c45802e10d3f75c6532ed08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1786a206823f5ac4c45802e1… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Nov 12 15:28:45 2014 +0100 crypt32/tests: Remove an unused assignment (PVS-Studio). --- dlls/crypt32/tests/encode.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 9e1853f..e9b49e9 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -5762,7 +5762,6 @@ static void test_decodeCTL(DWORD dwEncoding) info.SubjectAlgorithm.Parameters.cbData = 0; info.ThisUpdate.dwLowDateTime = info.ThisUpdate.dwHighDateTime = 0; info.NextUpdate.dwLowDateTime = info.NextUpdate.dwHighDateTime = 0; - info.SubjectAlgorithm.pszObjId = oid2; info.SubjectAlgorithm.pszObjId = NULL; value1.cbData = sizeof(emptySequence); value1.pbData = (LPBYTE)emptySequence;

1 0

Austin English : shell32: Add a stub for RegenerateUserEnvironment.
by Alexandre Julliard 12 Nov '14

12 Nov '14

Module: wine Branch: master Commit: 66662a87c0deb4aaa605d6a6486b439072f5055f URL: http://source.winehq.org/git/wine.git/?a=commit;h=66662a87c0deb4aaa605d6a64… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Nov 11 19:41:03 2014 -0600 shell32: Add a stub for RegenerateUserEnvironment. --- dlls/shell32/shell32.spec | 2 +- dlls/shell32/shlexec.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index f219c8f..e6858c8 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -324,7 +324,7 @@ @ stub RealShellExecuteExA @ stub RealShellExecuteExW @ stub RealShellExecuteW -@ stub RegenerateUserEnvironment +@ stdcall RegenerateUserEnvironment(ptr long) @ stdcall SetCurrentProcessExplicitAppUserModelID(wstr) @ stdcall SHAddToRecentDocs (long ptr) @ stdcall SHAppBarMessage(long ptr) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index a6bc5c8..2d9690a 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -2097,3 +2097,12 @@ void WINAPI OpenAs_RunDLLW(HWND hwnd, HINSTANCE hinst, LPCWSTR cmdline, int cmds { FIXME("%p, %p, %s, %d\n", hwnd, hinst, debugstr_w(cmdline), cmdshow); } + +/************************************************************************* + * RegenerateUserEnvironment [SHELL32.@] + */ +BOOL WINAPI RegenerateUserEnvironment(WCHAR *wunknown, BOOL bunknown) +{ + FIXME("stub: %p, %d\n", wunknown, bunknown); + return FALSE; +}

1 0

Bruno Jesus : version: Handle NULL puLen parameter for VerQueryValueA/W.
by Alexandre Julliard 12 Nov '14

12 Nov '14

Module: wine Branch: master Commit: 395289a30a34608862be4617c979d43607c59e06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=395289a30a34608862be4617c… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Nov 12 00:03:59 2014 -0200 version: Handle NULL puLen parameter for VerQueryValueA/W. --- dlls/version/version.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/version/version.c b/dlls/version/version.c index 9bc6ad1..58fd029 100644 --- a/dlls/version/version.c +++ b/dlls/version/version.c @@ -976,7 +976,7 @@ BOOL WINAPI VerQueryValueA( LPCVOID pBlock, LPCSTR lpSubBlock, len = WideCharToMultiByte(CP_ACP, 0, *lplpBuffer, -1, lpBufferA + pos, info->wLength - pos, NULL, NULL); *lplpBuffer = lpBufferA + pos; - *puLen = len; + if (puLen) *puLen = len; } return ret; } @@ -1036,7 +1036,7 @@ BOOL WINAPI VerQueryValueW( LPCVOID pBlock, LPCWSTR lpSubBlock, len = MultiByteToWideChar(CP_ACP, 0, *lplpBuffer, -1, lpBufferW + pos, max/sizeof(WCHAR) - pos ); *lplpBuffer = lpBufferW + pos; - *puLen = len; + if (puLen) *puLen = len; } return ret; }

1 0

Bruno Jesus : server: Add a missing socket protocol attribution.
by Alexandre Julliard 12 Nov '14

12 Nov '14

Module: wine Branch: master Commit: 8821967bd6f96c9b2100c34b55ca10a52ece87b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8821967bd6f96c9b2100c34b5… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Nov 12 00:42:11 2014 -0200 server: Add a missing socket protocol attribution. The new socket has to inherit the information just like family and type. --- server/sock.c | 1 + 1 file changed, 1 insertion(+) diff --git a/server/sock.c b/server/sock.c index 4adad0f..e124ad6 100644 --- a/server/sock.c +++ b/server/sock.c @@ -773,6 +773,7 @@ static int accept_into_socket( struct sock *sock, struct sock *acceptsock ) acceptsock->hmask = 0; acceptsock->pmask = 0; acceptsock->polling = 0; + acceptsock->proto = sock->proto; acceptsock->type = sock->type; acceptsock->family = sock->family; acceptsock->wparam = 0;

1 0