July 2014 - Wine-Commits - list.winehq.org

Marcus Meissner : dmime: Remove useless NULL check (Coverity).
by Alexandre Julliard July 22, 2014

July 22, 2014

Module: wine Branch: master Commit: b20365ee29e67ea0f993eee927a1746836f4cef4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b20365ee29e67ea0f993eee92… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Jul 22 09:08:33 2014 +0200 dmime: Remove useless NULL check (Coverity). --- dlls/dmime/performance.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index 92e72fe..25e86f9 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -388,9 +388,6 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_SendPMsg(IDirectMusicPerforma return E_POINTER; } pItem = DMUS_PMSGToItem(pPMSG); - if (NULL == pItem) { - return E_POINTER; - } if (pItem->bInUse) { return DMUS_E_ALREADY_SENT; } @@ -512,9 +509,6 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_FreePMsg(IDirectMusicPerforma return E_POINTER; } pItem = DMUS_PMSGToItem(pPMSG); - if (NULL == pItem) { - return E_POINTER; - } if (pItem->bInUse) { /** prevent for freeing PMsg in queue (ie to be processed) */ return DMUS_E_CANNOT_FREE;

1 0

Jacek Caban : mshtml: Fixed tests on IE11.
by Alexandre Julliard July 22, 2014

July 22, 2014

Module: wine Branch: master Commit: 1e191e031c812f23901f4f08a2b14fc5a14b28ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e191e031c812f23901f4f08a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 22 12:57:56 2014 +0200 mshtml: Fixed tests on IE11. --- dlls/mshtml/tests/htmldoc.c | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 11015e7..84b8806 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -978,6 +978,7 @@ static HRESULT WINAPI PropertyNotifySink_OnChanged(IPropertyNotifySink *iface, D case 3000029: case 3000030: case 3000031: + case 3000032: /* TODO */ return S_OK; } @@ -2855,6 +2856,7 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID test_readyState(NULL); return S_OK; case OLECMDID_UPDATETRAVELENTRY_DATARECOVERY: + case OLECMDID_PAGEAVAILABLE: case 6058: return E_FAIL; /* FIXME */ default: @@ -2864,7 +2866,7 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID } if(IsEqualGUID(&CGID_ShellDocView, pguidCmdGroup)) { - if(nCmdID != 63 && (!is_refresh || nCmdID != 37)) + if(nCmdID != 63 && nCmdID != 178 && (!is_refresh || nCmdID != 37)) test_readyState(NULL); ok(nCmdexecopt == 0, "nCmdexecopts=%08x\n", nCmdexecopt); @@ -2976,9 +2978,11 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID case 83: case 102: + case 133: case 134: /* TODO */ case 135: case 136: /* TODO */ + case 137: case 139: /* TODO */ case 143: /* TODO */ case 144: /* TODO */ @@ -3293,13 +3297,15 @@ static HRESULT WINAPI TravelLog_QueryInterface(ITravelLog *iface, REFIID riid, v { static const IID IID_IIETravelLog2 = {0xb67cefd2,0xe3f1,0x478a,{0x9b,0xfa,0xd8,0x93,0x70,0x37,0x5e,0x94}}; static const IID IID_unk_travellog = {0x6afc8b7f,0xbc17,0x4a95,{0x90,0x2f,0x6f,0x5c,0xb5,0x54,0xc3,0xd8}}; + static const IID IID_unk_travellog2 = {0xf6d02767,0x9c80,0x428d,{0xb9,0x74,0x3f,0x17,0x29,0x45,0x3f,0xdb}}; if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_ITravelLog, riid)) { *ppv = iface; return S_OK; } - if(!IsEqualGUID(&IID_IIETravelLog2, riid) && !IsEqualGUID(&IID_unk_travellog, riid)) + if(!IsEqualGUID(&IID_IIETravelLog2, riid) && !IsEqualGUID(&IID_unk_travellog, riid) + && !IsEqualGUID(&IID_unk_travellog2, riid)) ok(0, "unexpected call %s\n", wine_dbgstr_guid(riid)); *ppv = NULL; @@ -3433,7 +3439,7 @@ static HRESULT WINAPI DocObjectService_FireBeforeNavigate2(IDocObjectService *i ok(!pDispatch, "pDispatch = %p\n", pDispatch); ok(!strcmp_wa(lpszUrl, nav_url), "lpszUrl = %s, expected %s\n", wine_dbgstr_w(lpszUrl), nav_url); - ok(dwFlags == 0x40 || !dwFlags || dwFlags == 0x50, "dwFlags = %x\n", dwFlags); + ok(dwFlags == 0x140 /* IE11*/ || dwFlags == 0x40 || !dwFlags || dwFlags == 0x50, "dwFlags = %x\n", dwFlags); ok(!lpszFrameName, "lpszFrameName = %s\n", wine_dbgstr_w(lpszFrameName)); if(!testing_submit) { ok(!pPostData, "pPostData = %p\n", pPostData); @@ -5294,7 +5300,7 @@ static void test_doscroll(IUnknown *unk) switch(load_state) { case LD_DOLOAD: case LD_NO: - if(!nav_url) + if(!nav_url && !editmode) ok(!elem, "elem != NULL\n"); default: break; @@ -5746,6 +5752,8 @@ static void test_download(DWORD flags) SET_EXPECT(NavigateWithBindCtx); SET_EXPECT(Exec_Explorer_38); /* todo_wine */ } + if(editmode || is_refresh) + SET_EXPECT(Exec_ShellDocView_138); expect_status_text = (LPWSTR)0xdeadbeef; /* TODO */ while(!*b && GetMessageW(&msg, NULL, 0, 0)) { @@ -5868,6 +5876,8 @@ static void test_download(DWORD flags) CHECK_CALLED(NavigateWithBindCtx); todo_wine CHECK_NOT_CALLED(Exec_Explorer_38); } + if(editmode || is_refresh) + CLEAR_CALLED(Exec_ShellDocView_138); /* IE11 */ if(!is_extern) load_state = LD_COMPLETE; @@ -5973,7 +5983,7 @@ static void test_put_href(IHTMLDocument2 *doc, BOOL use_replace, const char *hre CHECK_CALLED(TranslateUrl); if(support_wbapp) { CHECK_CALLED(FireBeforeNavigate2); - CHECK_CALLED(Exec_ShellDocView_67); + CLEAR_CALLED(Exec_ShellDocView_67); /* Not called by IE11 */ if(!is_hash) { CHECK_CALLED(Invoke_AMBIENT_SILENT); CHECK_CALLED(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); @@ -6039,7 +6049,7 @@ static void test_put_href(IHTMLDocument2 *doc, BOOL use_replace, const char *hre ok(hres == S_OK, "SuperNavigate failed: %08x\n", hres); CHECK_CALLED(TranslateUrl); - CHECK_CALLED(Exec_ShellDocView_67); + CLEAR_CALLED(Exec_ShellDocView_67); /* Not called by IE11 */ CHECK_CALLED(Invoke_AMBIENT_SILENT); CHECK_CALLED(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); CHECK_CALLED(Exec_ShellDocView_63); @@ -6110,8 +6120,8 @@ static void test_load_history(IHTMLDocument2 *doc) hres = IPersistHistory_LoadHistory(per_hist, history_stream, NULL); ok(hres == S_OK, "LoadHistory failed: %08x\n", hres); - CHECK_CALLED_BROKEN(Exec_ShellDocView_138); - CHECK_CALLED(Exec_ShellDocView_67); + CLEAR_CALLED(Exec_ShellDocView_138); /* Not called by IE11 */ + CLEAR_CALLED(Exec_ShellDocView_67); /* Not called by IE11 */ CHECK_CALLED(FireBeforeNavigate2); CHECK_CALLED(Invoke_AMBIENT_SILENT); CHECK_CALLED(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); @@ -7834,11 +7844,11 @@ static void test_submit(void) CHECK_CALLED(TranslateUrl); CHECK_CALLED(FireBeforeNavigate2); - CHECK_CALLED(Exec_ShellDocView_67); + CLEAR_CALLED(Exec_ShellDocView_67); /* Not called by IE11 */ CHECK_CALLED(Invoke_AMBIENT_SILENT); CHECK_CALLED(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); CHECK_CALLED(Exec_ShellDocView_63); - todo_wine CHECK_CALLED(Exec_ShellDocView_84); + CLEAR_CALLED(Exec_ShellDocView_84); /* Not called by IE11 */ CHECK_CALLED(CreateInstance); CHECK_CALLED(Start); CHECK_CALLED(Protocol_Read);

1 0

Bruno Jesus : crypt32: Fix conversion of multiple fields in CertStrToName.
by Alexandre Julliard July 22, 2014

July 22, 2014

Module: wine Branch: master Commit: 4a28977f38a33a99de9791e88366555dc1ff8ed2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a28977f38a33a99de9791e88… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Jul 22 03:43:35 2014 -0300 crypt32: Fix conversion of multiple fields in CertStrToName. --- dlls/crypt32/str.c | 10 ++++++++-- dlls/crypt32/tests/cert.c | 12 ++---------- dlls/crypt32/tests/str.c | 19 ++++++++++++++++++- 3 files changed, 28 insertions(+), 13 deletions(-) diff --git a/dlls/crypt32/str.c b/dlls/crypt32/str.c index cf29c6f..7b52731 100644 --- a/dlls/crypt32/str.c +++ b/dlls/crypt32/str.c @@ -840,13 +840,14 @@ static BOOL CRYPT_GetNextKeyW(LPCWSTR str, struct X500TokenW *token, /* Assumes separators are characters in the 0-255 range */ static BOOL CRYPT_GetNextValueW(LPCWSTR str, DWORD dwFlags, LPCWSTR separators, - struct X500TokenW *token, LPCWSTR *ppszError) + WCHAR *separator_used, struct X500TokenW *token, LPCWSTR *ppszError) { BOOL ret = TRUE; TRACE("(%s, %s, %p, %p)\n", debugstr_w(str), debugstr_w(separators), token, ppszError); + *separator_used = 0; while (*str && isspaceW(*str)) str++; if (*str) @@ -886,6 +887,7 @@ static BOOL CRYPT_GetNextValueW(LPCWSTR str, DWORD dwFlags, LPCWSTR separators, while (*str && (*str >= 0xff || !map[*str])) str++; token->end = str; + if (map[*str]) *separator_used = *str; } } else @@ -1077,6 +1079,7 @@ BOOL WINAPI CertStrToNameW(DWORD dwCertEncodingType, LPCWSTR pszX500, static const WCHAR allSepsWithoutPlus[] = { ',',';','\r','\n',0 }; static const WCHAR allSeps[] = { '+',',',';','\r','\n',0 }; LPCWSTR sep; + WCHAR sep_used; str++; if (dwStrType & CERT_NAME_STR_COMMA_FLAG) @@ -1089,11 +1092,14 @@ BOOL WINAPI CertStrToNameW(DWORD dwCertEncodingType, LPCWSTR pszX500, sep = allSepsWithoutPlus; else sep = allSeps; - ret = CRYPT_GetNextValueW(str, dwStrType, sep, &token, + ret = CRYPT_GetNextValueW(str, dwStrType, sep, &sep_used, &token, ppszError); if (ret) { str = token.end; + /* if token.end points to the separator, skip it */ + if (str && sep_used && *str == sep_used) str++; + ret = CRYPT_ValueToRDN(dwCertEncodingType, &info, keyOID, &token, dwStrType, ppszError); } diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index e16ca5d..a19ef1e 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -1711,23 +1711,14 @@ static void testGetIssuerCert(void) /* Self-sign a certificate, add to the store and test getting the issuer */ size = 0; -todo_wine ok(CertStrToNameW(X509_ASN_ENCODING, certname, CERT_X500_NAME_STR, NULL, NULL, &size, NULL), "CertStrToName should have worked\n"); certencoded = HeapAlloc(GetProcessHeap(), 0, size); -todo_wine ok(CertStrToNameW(X509_ASN_ENCODING, certname, CERT_X500_NAME_STR, NULL, certencoded, &size, NULL), "CertStrToName should have worked\n"); certsubject.pbData = certencoded; certsubject.cbData = size; cert3 = CertCreateSelfSignCertificate(0, &certsubject, 0, NULL, NULL, NULL, NULL, NULL); - /* wine fails to create the certificate, this makes it crash later. - * Remove IF when wine is fixed, all windows versions must work */ - if(cert3 == NULL) - { - todo_wine ok(0, "Must work on windows\n"); - goto skiptest; - } ok(cert3 != NULL, "CertCreateSelfSignCertificate should have worked\n"); ret = CertAddCertificateContextToStore(store, cert3, CERT_STORE_ADD_REPLACE_EXISTING, 0); ok(ret, "CertAddEncodedCertificateToStore failed: %08x\n", GetLastError()); @@ -1737,10 +1728,11 @@ todo_wine SetLastError(0xdeadbeef); flags = 0; parent = CertGetIssuerCertificateFromStore(store, cert3, NULL, &flags); +todo_wine ok(!parent, "Expected NULL\n"); +todo_wine ok(GetLastError() == CRYPT_E_SELF_SIGNED, "Expected CRYPT_E_SELF_SIGNED, got %08X\n", GetLastError()); -skiptest: CertFreeCertificateContext(child); CertFreeCertificateContext(cert1); CertFreeCertificateContext(cert2); diff --git a/dlls/crypt32/tests/str.c b/dlls/crypt32/tests/str.c index dd61888..cf7c2ef 100644 --- a/dlls/crypt32/tests/str.c +++ b/dlls/crypt32/tests/str.c @@ -450,6 +450,15 @@ static BYTE encodedSemiCN[] = { static BYTE encodedNewlineCN[] = { 0x30,0x11,0x31,0x0f,0x30,0x0d,0x06,0x03,0x55,0x04,0x03,0x1e,0x06,0x00,0x61, 0x00,0x0a,0x00,0x62 }; +static BYTE encodedDummyCN[] = { +0x30,0x1F,0x31,0x0E,0x30,0x0C,0x06,0x03,0x55,0x04,0x03,0x13,0x05,0x64,0x75, +0x6D,0x6D,0x79,0x31,0x0D,0x30,0x0B,0x06,0x03,0x55,0x04,0x0C,0x13,0x04,0x74, +0x65,0x73,0x74 }; +static BYTE encodedFields[] = { +0x30,0x2F,0x31,0x12,0x30,0x10,0x06,0x03,0x55,0x04,0x03,0x13,0x09,0x57,0x69, +0x6E,0x65,0x20,0x54,0x65,0x73,0x74,0x31,0x0C,0x30,0x0A,0x06,0x03,0x55,0x04, +0x0C,0x13,0x03,0x31,0x32,0x33,0x31,0x0B,0x30,0x09,0x06,0x03,0x55,0x04,0x06, +0x13,0x02,0x42,0x52 }; static void test_CertNameToStrA(void) { @@ -756,6 +765,8 @@ static const struct StrToNameA namesA[] = { { "CN=\">\"", sizeof(encodedGreaterThanCN), encodedGreaterThanCN }, { "CN=\"#\"", sizeof(encodedHashCN), encodedHashCN }, { "CN=\";\"", sizeof(encodedSemiCN), encodedSemiCN }, + { "CN=dummy,T=test", sizeof(encodedDummyCN), encodedDummyCN }, + { " CN = Wine Test,T = 123, C = BR", sizeof(encodedFields), encodedFields }, }; static void test_CertStrToNameA(void) @@ -849,6 +860,10 @@ static const WCHAR badlyQuotedCN_W[] = { 'C','N','=','"','"','1','"','"',0 }; static const WCHAR simpleCN2_W[] = { 'C','N','=','"','1','"',0 }; static const WCHAR simpleCN3_W[] = { 'C','N',' ','=',' ','"','1','"',0 }; static const WCHAR japaneseCN_W[] = { 'C','N','=',0x226f,0x575b,0 }; +static const WCHAR dummyCN_W[] = { 'C','N','=','d','u','m','m','y',',','T','=','t','e','s','t',0 }; +static const WCHAR encodedFields_W[] = { ' ','C','N',' ','=',' ',' ',' ','W','i','n','e',' ','T', + 'e','s','t',',','T',' ','=',' ','1','2','3',',',' ','C', + ' ','=',' ','B','R',0 }; static const BYTE encodedJapaneseCN[] = { 0x30,0x0f,0x31,0x0d,0x30,0x0b,0x06, 0x03,0x55,0x04,0x03,0x1e,0x04,0x22,0x6f,0x57,0x5b }; @@ -867,6 +882,8 @@ static const struct StrToNameW namesW[] = { { greaterThanCN_W, sizeof(encodedGreaterThanCN), encodedGreaterThanCN }, { hashCN_W, sizeof(encodedHashCN), encodedHashCN }, { semiCN_W, sizeof(encodedSemiCN), encodedSemiCN }, + { dummyCN_W, sizeof(encodedDummyCN), encodedDummyCN }, + { encodedFields_W, sizeof(encodedFields), encodedFields }, }; static void test_CertStrToNameW(void) @@ -922,7 +939,7 @@ static void test_CertStrToNameW(void) size); if (ret) ok(!memcmp(buf, namesW[i].encoded, size), - "Index %d: unexpected value\n", i); + "Index %d: unexpected value for string %s\n", i, wine_dbgstr_w(namesW[i].x500)); } }

1 0

Jacek Caban : atl: Added AtlAxCreateControlLic(Ex) stubs.
by Alexandre Julliard July 22, 2014

July 22, 2014

Module: wine Branch: master Commit: 062f92a99cd3ca3aa2c5cd73de018757fdb0e2c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=062f92a99cd3ca3aa2c5cd73d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 22 13:23:00 2014 +0200 atl: Added AtlAxCreateControlLic(Ex) stubs. --- dlls/atl/atl_ax.c | 26 ++++++++++++++++++++++++++ dlls/atl100/atl100.spec | 4 ++-- dlls/atl110/atl110.spec | 4 ++-- dlls/atl80/atl80.spec | 4 ++-- dlls/atl90/atl90.spec | 4 ++-- 5 files changed, 34 insertions(+), 8 deletions(-) diff --git a/dlls/atl/atl_ax.c b/dlls/atl/atl_ax.c index c77071d..5bafbf1 100644 --- a/dlls/atl/atl_ax.c +++ b/dlls/atl/atl_ax.c @@ -1382,3 +1382,29 @@ INT_PTR WINAPI AtlAxDialogBoxA(HINSTANCE hInstance, LPCSTR lpTemplateName, HWND FIXME("(%p %s %p %p %lx)\n", hInstance, debugstr_a(lpTemplateName), hWndParent, lpDialogProc, dwInitParam); return 0; } + +#if _ATL_VER >= _ATL_VER_80 + +/*********************************************************************** + * AtlAxCreateControlLic [atl100.59] + * + */ +HRESULT WINAPI AtlAxCreateControlLic(const WCHAR *lpTricsData, HWND hwnd, IStream *stream, IUnknown **container, BSTR lic) +{ + FIXME("(%s %p %p %p %s)\n", debugstr_w(lpTricsData), hwnd, stream, container, debugstr_w(lic)); + return E_NOTIMPL; +} + +/*********************************************************************** + * AtlAxCreateControlLicEx [atl100.60] + * + */ +HRESULT WINAPI AtlAxCreateControlLicEx(const WCHAR *lpTricsData, HWND hwnd, IStream *stream, + IUnknown **container, IUnknown **control, REFIID iidSink, IUnknown *punkSink, BSTR lic) +{ + FIXME("(%s %p %p %p %p %s %p %s)\n", debugstr_w(lpTricsData), hwnd, stream, container, control, + debugstr_guid(iidSink), punkSink, debugstr_w(lic)); + return E_NOTIMPL; +} + +#endif diff --git a/dlls/atl100/atl100.spec b/dlls/atl100/atl100.spec index 0d41c1e..25fad3d 100644 --- a/dlls/atl100/atl100.spec +++ b/dlls/atl100/atl100.spec @@ -40,8 +40,8 @@ 54 stdcall AtlGetObjectSourceInterface(ptr ptr ptr ptr ptr) 56 stdcall AtlLoadTypeLib(long wstr ptr ptr) 58 stdcall AtlModuleAddTermFunc(ptr ptr long) -59 stub AtlAxCreateControlLic -60 stub AtlAxCreateControlLicEx +59 stdcall AtlAxCreateControlLic(wstr long ptr ptr wstr) +60 stdcall AtlAxCreateControlLicEx(wstr long ptr ptr ptr ptr ptr wstr) 61 stdcall AtlCreateRegistrar(ptr) 62 stub AtlWinModuleRegisterClassExW 63 stub AtlWinModuleRegisterClassExA diff --git a/dlls/atl110/atl110.spec b/dlls/atl110/atl110.spec index 0d41c1e..25fad3d 100644 --- a/dlls/atl110/atl110.spec +++ b/dlls/atl110/atl110.spec @@ -40,8 +40,8 @@ 54 stdcall AtlGetObjectSourceInterface(ptr ptr ptr ptr ptr) 56 stdcall AtlLoadTypeLib(long wstr ptr ptr) 58 stdcall AtlModuleAddTermFunc(ptr ptr long) -59 stub AtlAxCreateControlLic -60 stub AtlAxCreateControlLicEx +59 stdcall AtlAxCreateControlLic(wstr long ptr ptr wstr) +60 stdcall AtlAxCreateControlLicEx(wstr long ptr ptr ptr ptr ptr wstr) 61 stdcall AtlCreateRegistrar(ptr) 62 stub AtlWinModuleRegisterClassExW 63 stub AtlWinModuleRegisterClassExA diff --git a/dlls/atl80/atl80.spec b/dlls/atl80/atl80.spec index fb5fae8..f313944 100644 --- a/dlls/atl80/atl80.spec +++ b/dlls/atl80/atl80.spec @@ -43,8 +43,8 @@ 55 stub AtlUnRegisterTypeLib 56 stdcall AtlLoadTypeLib(long wstr ptr ptr) 58 stdcall AtlModuleAddTermFunc(ptr ptr long) -59 stub AtlAxCreateControlLic -60 stub AtlAxCreateControlLicEx +59 stdcall AtlAxCreateControlLic(wstr long ptr ptr wstr) +60 stdcall AtlAxCreateControlLicEx(wstr long ptr ptr ptr ptr ptr wstr) 61 stdcall AtlCreateRegistrar(ptr) 62 stub AtlWinModuleRegisterClassExW 63 stub AtlWinModuleRegisterClassExA diff --git a/dlls/atl90/atl90.spec b/dlls/atl90/atl90.spec index 0d41c1e..25fad3d 100644 --- a/dlls/atl90/atl90.spec +++ b/dlls/atl90/atl90.spec @@ -40,8 +40,8 @@ 54 stdcall AtlGetObjectSourceInterface(ptr ptr ptr ptr ptr) 56 stdcall AtlLoadTypeLib(long wstr ptr ptr) 58 stdcall AtlModuleAddTermFunc(ptr ptr long) -59 stub AtlAxCreateControlLic -60 stub AtlAxCreateControlLicEx +59 stdcall AtlAxCreateControlLic(wstr long ptr ptr wstr) +60 stdcall AtlAxCreateControlLicEx(wstr long ptr ptr ptr ptr ptr wstr) 61 stdcall AtlCreateRegistrar(ptr) 62 stub AtlWinModuleRegisterClassExW 63 stub AtlWinModuleRegisterClassExA

1 0

David Hedberg : comdlg32: Populate psia_results before making any callbacks.
by Alexandre Julliard July 22, 2014

July 22, 2014

Module: wine Branch: master Commit: 7311a9fc6e866116056c020281cdcd6dd98aaf98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7311a9fc6e866116056c02028… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Mon Jul 21 23:56:46 2014 +0200 comdlg32: Populate psia_results before making any callbacks. --- dlls/comdlg32/itemdlg.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index 2313b0a..21cdf89 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -536,9 +536,6 @@ static HRESULT on_default_action(FileDialogImpl *This) break; case ONOPEN_OPEN: - if(events_OnFileOk(This) != S_OK) - break; - hr = SHGetDesktopFolder(&psf_desktop); if(SUCCEEDED(hr)) { @@ -547,10 +544,11 @@ static HRESULT on_default_action(FileDialogImpl *This) hr = SHCreateShellItemArray(NULL, psf_desktop, file_count, (PCUITEMID_CHILD_ARRAY)pidla, &This->psia_results); - if(SUCCEEDED(hr)) - ret = S_OK; IShellFolder_Release(psf_desktop); + + if(SUCCEEDED(hr) && events_OnFileOk(This) == S_OK) + ret = S_OK; } break;

1 0

Marcus Meissner : secur32: Removed superflous NULL check (Coverity).
by Alexandre Julliard July 22, 2014

July 22, 2014

Module: wine Branch: master Commit: 877f1a759e9c9ef92e808dc85445c5299e1074fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=877f1a759e9c9ef92e808dc85… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Jul 22 09:02:32 2014 +0200 secur32: Removed superflous NULL check (Coverity). --- dlls/secur32/ntlm.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index 5914fbc..0fe64ed 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -1171,12 +1171,6 @@ SECURITY_STATUS SEC_ENTRY ntlm_AcceptSecurityContext( goto asc_end; } - if(!phContext) - { - ret = SEC_E_INVALID_HANDLE; - goto asc_end; - } - helper = (PNegoHelper)phContext->dwLower; if(helper->mode != NTLM_SERVER)

1 0

Zhenbo Li : mshtml: Fixed get_target_window when no parent frame is found.
by Alexandre Julliard July 22, 2014

July 22, 2014

Module: wine Branch: master Commit: fbc4d3f1602e6ae28ae92e497f2e01ccbb9cb224 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbc4d3f1602e6ae28ae92e497… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Mon Jul 21 22:20:39 2014 +0800 mshtml: Fixed get_target_window when no parent frame is found. --- dlls/mshtml/htmlanchor.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index a9187a4..0de0585 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -98,8 +98,9 @@ HTMLOuterWindow *get_target_window(HTMLOuterWindow *window, nsAString *target_st if(!strcmpiW(target, _parentW)) { if(!window->parent) { - WARN("Window has no parent\n"); - return NULL; + WARN("Window has no parent, treat as self\n"); + IHTMLWindow2_AddRef(&window->base.IHTMLWindow2_iface); + return window; } IHTMLWindow2_AddRef(&window->parent->base.IHTMLWindow2_iface);

1 0

Henri Verbeet : wined3d: Avoid a compiler warning in context_stream_info_from_declaration().
by Alexandre Julliard July 22, 2014

July 22, 2014

Module: wine Branch: master Commit: 96d845aa468bf09f32c03fbee584201df52a3fef URL: http://source.winehq.org/git/wine.git/?a=commit;h=96d845aa468bf09f32c03fbee… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 22 08:44:24 2014 +0200 wined3d: Avoid a compiler warning in context_stream_info_from_declaration(). --- dlls/wined3d/context.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 622cca1..70b9b31 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2794,7 +2794,7 @@ void context_stream_info_from_declaration(struct wined3d_context *context, stream_info->elements[idx].format = element->format; stream_info->elements[idx].data.buffer_object = 0; - stream_info->elements[idx].data.addr = (BYTE *)stream->offset + element->offset; + stream_info->elements[idx].data.addr = (BYTE *)NULL + stream->offset + element->offset; stream_info->elements[idx].stride = stream->stride; stream_info->elements[idx].stream_idx = element->input_slot;

1 0

Henri Verbeet : dxgi: Implement dxgi_surface_GetDesc().
by Alexandre Julliard July 22, 2014

July 22, 2014

Module: wine Branch: master Commit: d17bd8d82136853867de39988dc9342d7afd5945 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d17bd8d82136853867de39988… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 22 08:44:20 2014 +0200 dxgi: Implement dxgi_surface_GetDesc(). --- dlls/d3d10core/texture.c | 8 +++++++- dlls/dxgi/device.c | 3 +-- dlls/dxgi/dxgi_private.h | 5 ++++- dlls/dxgi/surface.c | 12 +++++++++--- 4 files changed, 21 insertions(+), 7 deletions(-) diff --git a/dlls/d3d10core/texture.c b/dlls/d3d10core/texture.c index f169190..80ac899 100644 --- a/dlls/d3d10core/texture.c +++ b/dlls/d3d10core/texture.c @@ -253,6 +253,7 @@ HRESULT d3d10_texture2d_init(struct d3d10_texture2d *texture, struct d3d10_devic if (desc->MipLevels == 1 && desc->ArraySize == 1) { + DXGI_SURFACE_DESC surface_desc; IWineDXGIDevice *wine_device; if (FAILED(hr = ID3D10Device1_QueryInterface(&device->ID3D10Device1_iface, &IID_IWineDXGIDevice, @@ -262,7 +263,12 @@ HRESULT d3d10_texture2d_init(struct d3d10_texture2d *texture, struct d3d10_devic return E_FAIL; } - hr = IWineDXGIDevice_create_surface(wine_device, NULL, 0, NULL, + surface_desc.Width = desc->Width; + surface_desc.Height = desc->Height; + surface_desc.Format = desc->Format; + surface_desc.SampleDesc = desc->SampleDesc; + + hr = IWineDXGIDevice_create_surface(wine_device, &surface_desc, 0, NULL, (IUnknown *)&texture->ID3D10Texture2D_iface, (void **)&texture->dxgi_surface); IWineDXGIDevice_Release(wine_device); if (FAILED(hr)) diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index e98a2c0..837c57f 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -276,8 +276,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_create_surface(IWineDXGIDevice *ifa return E_OUTOFMEMORY; } - hr = dxgi_surface_init(object, (IDXGIDevice *)iface, outer); - if (FAILED(hr)) + if (FAILED(hr = dxgi_surface_init(object, (IDXGIDevice *)iface, outer, desc))) { WARN("Failed to initialize surface, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 24d9a26..75126cf 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -142,8 +142,11 @@ struct dxgi_surface IUnknown *outer_unknown; LONG refcount; IDXGIDevice *device; + + DXGI_SURFACE_DESC desc; }; -HRESULT dxgi_surface_init(struct dxgi_surface *surface, IDXGIDevice *device, IUnknown *outer) DECLSPEC_HIDDEN; +HRESULT dxgi_surface_init(struct dxgi_surface *surface, IDXGIDevice *device, + IUnknown *outer, const DXGI_SURFACE_DESC *desc) DECLSPEC_HIDDEN; #endif /* __WINE_DXGI_PRIVATE_H */ diff --git a/dlls/dxgi/surface.c b/dlls/dxgi/surface.c index 2814742..10daff7 100644 --- a/dlls/dxgi/surface.c +++ b/dlls/dxgi/surface.c @@ -154,9 +154,13 @@ static HRESULT STDMETHODCALLTYPE dxgi_surface_GetDevice(IDXGISurface *iface, REF /* IDXGISurface methods */ static HRESULT STDMETHODCALLTYPE dxgi_surface_GetDesc(IDXGISurface *iface, DXGI_SURFACE_DESC *desc) { - FIXME("iface %p, desc %p stub!\n", iface, desc); + struct dxgi_surface *surface = impl_from_IDXGISurface(iface); - return E_NOTIMPL; + TRACE("iface %p, desc %p.\n", iface, desc); + + *desc = surface->desc; + + return S_OK; } static HRESULT STDMETHODCALLTYPE dxgi_surface_Map(IDXGISurface *iface, DXGI_MAPPED_RECT *mapped_rect, UINT flags) @@ -200,13 +204,15 @@ static const struct IUnknownVtbl dxgi_surface_inner_unknown_vtbl = dxgi_surface_inner_Release, }; -HRESULT dxgi_surface_init(struct dxgi_surface *surface, IDXGIDevice *device, IUnknown *outer) +HRESULT dxgi_surface_init(struct dxgi_surface *surface, IDXGIDevice *device, + IUnknown *outer, const DXGI_SURFACE_DESC *desc) { surface->IDXGISurface_iface.lpVtbl = &dxgi_surface_vtbl; surface->IUnknown_iface.lpVtbl = &dxgi_surface_inner_unknown_vtbl; surface->refcount = 1; surface->outer_unknown = outer ? outer : &surface->IUnknown_iface; surface->device = device; + surface->desc = *desc; return S_OK; }

1 0

Marcus Meissner : d3dx9_36: Fixed typo in HeapAlloc return checking ( Coverity).
by Alexandre Julliard July 22, 2014

July 22, 2014

Module: wine Branch: master Commit: 20ef8d29911fdd6f63bdc95ff67482da2b0f9084 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20ef8d29911fdd6f63bdc95ff… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Jul 22 08:24:55 2014 +0200 d3dx9_36: Fixed typo in HeapAlloc return checking (Coverity). --- dlls/d3dx9_36/tests/mesh.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 4d11618..17c5d9c 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -3687,7 +3687,7 @@ static BOOL compute_text_mesh(struct mesh *mesh, HDC hdc, const char *text, } HeapFree(GetProcessHeap(), 0, raw_outline); raw_outline = HeapAlloc(GetProcessHeap(), 0, datasize); - if (!glyphs) { + if (!raw_outline) { hr = E_OUTOFMEMORY; goto error; }

1 0