winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
February 2011
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
2 participants
674 discussions
Start a n
N
ew thread
Austin English : advapi32/tests: Make sure to use return value (LLVM/Clang) .
by Alexandre Julliard
04 Feb '11
04 Feb '11
Module: wine Branch: master Commit: d10a4dce8eeae52dd72cfc2d5d66a275e52405e8 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=d10a4dce8eeae52dd72cfc2d5…
Author: Austin English <austinenglish(a)gmail.com> Date: Thu Feb 3 18:28:15 2011 -0800 advapi32/tests: Make sure to use return value (LLVM/Clang). --- dlls/advapi32/tests/crypt.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/crypt.c b/dlls/advapi32/tests/crypt.c index 2ffc62e..865ffa4 100644 --- a/dlls/advapi32/tests/crypt.c +++ b/dlls/advapi32/tests/crypt.c @@ -414,6 +414,7 @@ static void test_verify_sig(void) CRYPT_NEWKEYSET); if (!ret && GetLastError() == NTE_EXISTS) ret = pCryptAcquireContextA(&prov, szKeySet, NULL, PROV_RSA_FULL, 0); + ok(ret, "CryptAcquireContextA failed: %08x\n", GetLastError()); ret = pCryptImportKey(prov, (LPBYTE)privKey, sizeof(privKey), 0, 0, &key); ok(ret, "CryptImportKey failed: %08x\n", GetLastError()); ret = pCryptCreateHash(prov, CALG_MD5, 0, 0, &hash); @@ -898,6 +899,7 @@ static void test_set_provider_ex(void) /* call CryptGetDefaultProvider to see if they match */ result = pCryptGetDefaultProviderA(PROV_RSA_FULL, NULL, CRYPT_MACHINE_DEFAULT, NULL, &cbProvName); + ok(result, "%d\n", GetLastError()); if (!(pszProvName = LocalAlloc(LMEM_ZEROINIT, cbProvName))) goto reset;
1
0
0
0
Austin English : wintrust: Remove a dead assignment (LLVM/Clang).
by Alexandre Julliard
04 Feb '11
04 Feb '11
Module: wine Branch: master Commit: 1f10a78cb04cca39019116b548552983810c00c0 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=1f10a78cb04cca39019116b54…
Author: Austin English <austinenglish(a)gmail.com> Date: Thu Feb 3 17:48:12 2011 -0800 wintrust: Remove a dead assignment (LLVM/Clang). --- dlls/wintrust/crypt.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/wintrust/crypt.c b/dlls/wintrust/crypt.c index c41a56b..be93543 100644 --- a/dlls/wintrust/crypt.c +++ b/dlls/wintrust/crypt.c @@ -858,7 +858,6 @@ HANDLE WINAPI CryptCATOpen(LPWSTR pwszFileName, DWORD fdwOpenFlags, HCRYPTPROV h return INVALID_HANDLE_VALUE; } - if (!dwPublicVersion) dwPublicVersion = 0x00000100; if (!dwEncodingType) dwEncodingType = X509_ASN_ENCODING | PKCS_7_ASN_ENCODING; if (fdwOpenFlags & CRYPTCAT_OPEN_ALWAYS) flags |= OPEN_ALWAYS;
1
0
0
0
Austin English : wintrust/tests: Make sure return values are used (LLVM/ Clang).
by Alexandre Julliard
04 Feb '11
04 Feb '11
Module: wine Branch: master Commit: 4d6caaebbd2a1b086b71928b3d0475b3af9b545a URL:
http://source.winehq.org/git/wine.git/?a=commit;h=4d6caaebbd2a1b086b71928b3…
Author: Austin English <austinenglish(a)gmail.com> Date: Thu Feb 3 17:47:15 2011 -0800 wintrust/tests: Make sure return values are used (LLVM/Clang). --- dlls/wintrust/tests/crypt.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wintrust/tests/crypt.c b/dlls/wintrust/tests/crypt.c index 68a9ebc..bb561a2 100644 --- a/dlls/wintrust/tests/crypt.c +++ b/dlls/wintrust/tests/crypt.c @@ -616,6 +616,7 @@ static void test_CryptCATAdminAddRemoveCatalog(void) /* Set the attributes so we can delete the file */ attrs = FILE_ATTRIBUTE_NORMAL; ret = SetFileAttributesA(tmpfile, attrs); + ok(ret, "SetFileAttributesA failed %u\n", GetLastError()); DeleteFileA(tmpfile); } @@ -784,7 +785,7 @@ static void test_create_catalog_file(void) /* Only enumerate the members */ trace("Only members\n"); - attrcount = membercount = 0; + membercount = 0; catcdf = pCryptCATCDFOpen(cdffileW, NULL); catmember = NULL;
1
0
0
0
Austin English : wintrust/tests: Make sure return values are used (LLVM/ Clang).
by Alexandre Julliard
04 Feb '11
04 Feb '11
Module: wine Branch: master Commit: 855c5e848d3ea5dc9f25b8b88fdb543d7490416c URL:
http://source.winehq.org/git/wine.git/?a=commit;h=855c5e848d3ea5dc9f25b8b88…
Author: Austin English <austinenglish(a)gmail.com> Date: Fri Feb 4 00:48:58 2011 -0800 wintrust/tests: Make sure return values are used (LLVM/Clang). --- dlls/wintrust/tests/softpub.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wintrust/tests/softpub.c b/dlls/wintrust/tests/softpub.c index 9b308ac..c602705 100644 --- a/dlls/wintrust/tests/softpub.c +++ b/dlls/wintrust/tests/softpub.c @@ -378,6 +378,7 @@ static void testObjTrust(SAFE_PROVIDER_FUNCTIONS *funcs, GUID *actionID) { fileInfo.pgKnownSubject = (GUID *)0xdeadbeef; ret = funcs->pfnObjectTrust(&data); + ok(ret == S_FALSE, "Expected S_FALSE, got %08x\n", ret); } funcs->pfnFree(data.padwTrustStepErrors); } @@ -447,6 +448,8 @@ static void testCertTrust(SAFE_PROVIDER_FUNCTIONS *funcs, GUID *actionID) WINTRUST_DATA wintrust_data = { 0 }; ret = funcs->pfnAddCert2Chain(&data, 0, FALSE, 0, cert); + ok(ret == S_FALSE, "Expected S_FALSE, got %08x\n", ret); + /* If pWintrustData isn't set, crashes attempting to access * pWintrustData->fdwRevocationChecks */
1
0
0
0
Austin English : wintrust/tests: Make sure return values are used (LLVM/ Clang).
by Alexandre Julliard
04 Feb '11
04 Feb '11
Module: wine Branch: master Commit: 0fed8b0fe2b54add259178186fe2c8954269f398 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=0fed8b0fe2b54add259178186…
Author: Austin English <austinenglish(a)gmail.com> Date: Fri Feb 4 00:46:13 2011 -0800 wintrust/tests: Make sure return values are used (LLVM/Clang). --- dlls/wintrust/tests/register.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wintrust/tests/register.c b/dlls/wintrust/tests/register.c index dd266bd..42c5de6 100644 --- a/dlls/wintrust/tests/register.c +++ b/dlls/wintrust/tests/register.c @@ -299,6 +299,7 @@ static void test_RegPolicyFlags(void) ok(ret, "WintrustSetRegPolicyFlags failed: %d\n", GetLastError()); size = sizeof(flags1); r = RegQueryValueExA(key, State, NULL, NULL, (LPBYTE)&flags1, &size); + ok(!r, "RegQueryValueEx failed: %d\n", r); ok(flags1 == flags3, "Got %08x flags instead of %08x\n", flags1, flags3); pWintrustSetRegPolicyFlags(flags2);
1
0
0
0
Austin English : advapi32/tests: Make sure to use return value (LLVM/Clang) .
by Alexandre Julliard
04 Feb '11
04 Feb '11
Module: wine Branch: master Commit: 2951007d18b2337874353565e680cbc4d9f8dd65 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=2951007d18b2337874353565e…
Author: Austin English <austinenglish(a)gmail.com> Date: Thu Feb 3 18:28:47 2011 -0800 advapi32/tests: Make sure to use return value (LLVM/Clang). --- dlls/advapi32/tests/crypt_lmhash.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/advapi32/tests/crypt_lmhash.c b/dlls/advapi32/tests/crypt_lmhash.c index 384221f..a6e812e 100644 --- a/dlls/advapi32/tests/crypt_lmhash.c +++ b/dlls/advapi32/tests/crypt_lmhash.c @@ -211,6 +211,7 @@ static void test_SystemFunction003(void) memset(output, 0, sizeof output); r = pSystemFunction002(data, key, output); + ok(r == STATUS_SUCCESS, "function failed\n"); ok( !memcmp(exp2, output, sizeof output), "decrypted message wrong\n"); } @@ -284,16 +285,19 @@ static void test_SystemFunction004(void) memset(output, 0, sizeof output); r = pSystemFunction002(out.Buffer, key.Buffer, output); + ok(r == STATUS_SUCCESS, "function failed\n"); ok(((unsigned int*)output)[0] == in.Length, "crypted length wrong\n"); ok(((unsigned int*)output)[1] == 1, "crypted value wrong\n"); memset(output, 0, sizeof output); r = pSystemFunction002(out.Buffer+8, key.Buffer, output); + ok(r == STATUS_SUCCESS, "function failed\n"); ok(!memcmp(output, inbuf, sizeof output), "crypted data wrong\n"); memset(output, 0, sizeof output); r = pSystemFunction002(out.Buffer+16, key.Buffer, output); + ok(r == STATUS_SUCCESS, "function failed\n"); ok(!memcmp(output, inbuf, sizeof output), "crypted data wrong\n"); } @@ -496,12 +500,6 @@ static void test_memcmpfunc(memcmpfunc fn) return; } - if (0) - { - /* crashes */ - r = fn(NULL, NULL); - } - memset(arg1, 0, sizeof arg1); memset(arg2, 0, sizeof arg2); arg1[0x10] = 1;
1
0
0
0
Jacek Caban : mshtml: Added nsIURI::SetSpec implementation.
by Alexandre Julliard
04 Feb '11
04 Feb '11
Module: wine Branch: master Commit: a1205c6adce3a4c5f17af32da7e4366e73cd13f9 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=a1205c6adce3a4c5f17af32da…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 3 20:47:58 2011 +0100 mshtml: Added nsIURI::SetSpec implementation. --- dlls/mshtml/nsio.c | 30 ++++++++++++++++++++++++------ 1 files changed, 24 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index dec00aa..d08908f 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1654,16 +1654,34 @@ static nsresult NSAPI nsURI_GetSpec(nsIURL *iface, nsACString *aSpec) static nsresult NSAPI nsURI_SetSpec(nsIURL *iface, const nsACString *aSpec) { nsWineURI *This = impl_from_nsIURL(iface); + const char *speca; + WCHAR *spec; + IUri *uri; + HRESULT hres; - TRACE("(%p)->(%p)\n", This, debugstr_nsacstr(aSpec)); + TRACE("(%p)->(%s)\n", This, debugstr_nsacstr(aSpec)); - if(This->nsuri) { - invalidate_uri(This); - return nsIURI_SetSpec(This->nsuri, aSpec); + nsACString_GetData(aSpec, &speca); + spec = heap_strdupAtoW(speca); + if(!spec) + return NS_ERROR_OUT_OF_MEMORY; + + hres = CreateUri(spec, 0, 0, &uri); + heap_free(spec); + if(FAILED(hres)) { + WARN("CreateUri failed: %08x\n", hres); + return NS_ERROR_FAILURE; } - FIXME("default action not implemented\n"); - return NS_ERROR_NOT_IMPLEMENTED; + invalidate_uri(This); + if(This->uri_builder) { + IUriBuilder_Release(This->uri_builder); + This->uri_builder = NULL; + } + + This->uri = uri; + sync_wine_url(This); + return NS_OK; } static nsresult NSAPI nsURI_GetPrePath(nsIURL *iface, nsACString *aPrePath)
1
0
0
0
Jacek Caban : wininet: status_string clean up.
by Alexandre Julliard
04 Feb '11
04 Feb '11
Module: wine Branch: master Commit: 680f251220189d325b099049843b2e38d23717ff URL:
http://source.winehq.org/git/wine.git/?a=commit;h=680f251220189d325b0990498…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 3 20:46:05 2011 +0100 wininet: status_string clean up. --- dlls/wininet/tests/http.c | 18 +++++++----------- 1 files changed, 7 insertions(+), 11 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 5ff3258..a8c843a 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -62,14 +62,14 @@ static BOOL first_connection_to_test_url = TRUE; if (!expect[status] && !optional[status] && wine_allow[status]) \ { \ todo_wine ok(expect[status], "unexpected status %d (%s)\n", status, \ - status < MAX_INTERNET_STATUS && status_string[status][0] != 0 ? \ + status < MAX_INTERNET_STATUS && status_string[status] ? \ status_string[status] : "unknown"); \ wine_allow[status]--; \ } \ else \ { \ ok(expect[status] || optional[status], "unexpected status %d (%s)\n", status, \ - status < MAX_INTERNET_STATUS && status_string[status][0] != 0 ? \ + status < MAX_INTERNET_STATUS && status_string[status] ? \ status_string[status] : "unknown"); \ if (expect[status]) expect[status]--; \ else optional[status]--; \ @@ -86,7 +86,7 @@ static BOOL first_connection_to_test_url = TRUE; do { \ ok(notified[status] + optional[status] == (num), \ "expected status %d (%s) %d times, received %d times\n", \ - status, status < MAX_INTERNET_STATUS && status_string[status][0] != 0 ? \ + status, status < MAX_INTERNET_STATUS && status_string[status] ? \ status_string[status] : "unknown", (num), notified[status]); \ CLEAR_NOTIFIED(status); \ }while(0) @@ -98,10 +98,9 @@ static BOOL first_connection_to_test_url = TRUE; CHECK_NOTIFIED2(status, 0) #define MAX_INTERNET_STATUS (INTERNET_STATUS_COOKIE_HISTORY+1) -#define MAX_STATUS_NAME 50 static int expect[MAX_INTERNET_STATUS], optional[MAX_INTERNET_STATUS], wine_allow[MAX_INTERNET_STATUS], notified[MAX_INTERNET_STATUS]; -static CHAR status_string[MAX_INTERNET_STATUS][MAX_STATUS_NAME]; +static const char *status_string[MAX_INTERNET_STATUS]; static HANDLE hCompleteEvent; @@ -3246,11 +3245,6 @@ static void test_InternetCloseHandle(void) closetest_req, res, GetLastError()); } -#define STATUS_STRING(status) \ - memcpy(status_string[status], #status, sizeof(CHAR) * \ - (strlen(#status) < MAX_STATUS_NAME ? \ - strlen(#status) : \ - MAX_STATUS_NAME - 1)) static void init_status_tests(void) { memset(expect, 0, sizeof(expect)); @@ -3258,6 +3252,8 @@ static void init_status_tests(void) memset(wine_allow, 0, sizeof(wine_allow)); memset(notified, 0, sizeof(notified)); memset(status_string, 0, sizeof(status_string)); + +#define STATUS_STRING(status) status_string[status] = #status STATUS_STRING(INTERNET_STATUS_RESOLVING_NAME); STATUS_STRING(INTERNET_STATUS_NAME_RESOLVED); STATUS_STRING(INTERNET_STATUS_CONNECTING_TO_SERVER); @@ -3284,8 +3280,8 @@ static void init_status_tests(void) STATUS_STRING(INTERNET_STATUS_P3P_HEADER); STATUS_STRING(INTERNET_STATUS_P3P_POLICYREF); STATUS_STRING(INTERNET_STATUS_COOKIE_HISTORY); -} #undef STATUS_STRING +} START_TEST(http) {
1
0
0
0
Jacek Caban : wininet: Moved freeing object to WININET_Release.
by Alexandre Julliard
04 Feb '11
04 Feb '11
Module: wine Branch: master Commit: 923498da03859ea0840e905c25fe35c15e6327cf URL:
http://source.winehq.org/git/wine.git/?a=commit;h=923498da03859ea0840e905c2…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 3 20:45:12 2011 +0100 wininet: Moved freeing object to WININET_Release. --- dlls/wininet/ftp.c | 4 ---- dlls/wininet/http.c | 2 -- dlls/wininet/internet.c | 3 ++- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 41537b8..e57f356 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -1127,8 +1127,6 @@ static void FTPFILE_Destroy(object_header_t *hdr) if (nResCode > 0 && nResCode != 226) WARN("server reports failed transfer\n"); WININET_Release(&lpwh->lpFtpSession->hdr); - - HeapFree(GetProcessHeap(), 0, lpwh); } static DWORD FTPFILE_QueryOption(object_header_t *hdr, DWORD option, void *buffer, DWORD *size, BOOL unicode) @@ -2346,7 +2344,6 @@ static void FTPSESSION_Destroy(object_header_t *hdr) HeapFree(GetProcessHeap(), 0, lpwfs->lpszPassword); HeapFree(GetProcessHeap(), 0, lpwfs->lpszUserName); HeapFree(GetProcessHeap(), 0, lpwfs->servername); - HeapFree(GetProcessHeap(), 0, lpwfs); } static void FTPSESSION_CloseConnection(object_header_t *hdr) @@ -3399,7 +3396,6 @@ static void FTPFINDNEXT_Destroy(object_header_t *hdr) } HeapFree(GetProcessHeap(), 0, lpwfn->lpafp); - HeapFree(GetProcessHeap(), 0, lpwfn); } static DWORD FTPFINDNEXT_FindNextFileProc(WININETFTPFINDNEXTW *find, LPVOID data) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 9215c34..0b723c3 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1601,7 +1601,6 @@ static void HTTPREQ_Destroy(object_header_t *hdr) #endif HeapFree(GetProcessHeap(), 0, lpwhr->pCustHeaders); - HeapFree(GetProcessHeap(), 0, lpwhr); } static void HTTPREQ_CloseConnection(object_header_t *hdr) @@ -4358,7 +4357,6 @@ static void HTTPSESSION_Destroy(object_header_t *hdr) HeapFree(GetProcessHeap(), 0, lpwhs->lpszServerName); HeapFree(GetProcessHeap(), 0, lpwhs->lpszPassword); HeapFree(GetProcessHeap(), 0, lpwhs->lpszUserName); - HeapFree(GetProcessHeap(), 0, lpwhs); } static DWORD HTTPSESSION_QueryOption(object_header_t *hdr, DWORD option, void *buffer, DWORD *size, BOOL unicode) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 0df56a6..5b42d98 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -261,6 +261,8 @@ BOOL WININET_Release( object_header_t *info ) LeaveCriticalSection( &WININET_cs ); } + + heap_free(info); } return TRUE; } @@ -684,7 +686,6 @@ static VOID APPINFO_Destroy(object_header_t *hdr) HeapFree(GetProcessHeap(), 0, lpwai->lpszProxyBypass); HeapFree(GetProcessHeap(), 0, lpwai->lpszProxyUsername); HeapFree(GetProcessHeap(), 0, lpwai->lpszProxyPassword); - HeapFree(GetProcessHeap(), 0, lpwai); } static DWORD APPINFO_QueryOption(object_header_t *hdr, DWORD option, void *buffer, DWORD *size, BOOL unicode)
1
0
0
0
Henri Verbeet : wined3d: Get rid of the IWineD3DQuery typedefs.
by Alexandre Julliard
04 Feb '11
04 Feb '11
Module: wine Branch: master Commit: 14c3387fc206f602546cc58091cee8828f859806 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=14c3387fc206f602546cc5809…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 3 20:14:07 2011 +0100 wined3d: Get rid of the IWineD3DQuery typedefs. --- dlls/wined3d/device.c | 6 +++--- dlls/wined3d/query.c | 4 ++-- dlls/wined3d/wined3d_private.h | 4 +--- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 61a9e94..e2e4b86 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1236,10 +1236,10 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateCubeTexture(IWineD3DDevice *iface } static HRESULT WINAPI IWineD3DDeviceImpl_CreateQuery(IWineD3DDevice *iface, - WINED3DQUERYTYPE type, IWineD3DQuery **query) + WINED3DQUERYTYPE type, struct wined3d_query **query) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - IWineD3DQueryImpl *object; + struct wined3d_query *object; HRESULT hr; TRACE("iface %p, type %#x, query %p.\n", iface, type, query); @@ -1260,7 +1260,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateQuery(IWineD3DDevice *iface, } TRACE("Created query %p.\n", object); - *query = (IWineD3DQuery *)object; + *query = object; return WINED3D_OK; } diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 9f7b948..368b030 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -370,7 +370,7 @@ static HRESULT wined3d_occlusion_query_ops_get_data(struct wined3d_query *query, return res; } -static HRESULT wined3d_event_query_ops_get_data(IWineD3DQueryImpl *query, +static HRESULT wined3d_event_query_ops_get_data(struct wined3d_query *query, void *pData, DWORD dwSize, DWORD flags) { struct wined3d_event_query *event_query = query->extendedData; @@ -547,7 +547,7 @@ static const struct wined3d_query_ops occlusion_query_ops = wined3d_occlusion_query_ops_issue, }; -HRESULT query_init(IWineD3DQueryImpl *query, IWineD3DDeviceImpl *device, WINED3DQUERYTYPE type) +HRESULT query_init(struct wined3d_query *query, IWineD3DDeviceImpl *device, WINED3DQUERYTYPE type) { const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1ef4340..a262cca 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -58,8 +58,6 @@ typedef struct IWineD3DSwapChainImpl IWineD3DSwapChainImpl; struct IWineD3DBaseShaderImpl; struct IWineD3DBaseTextureImpl; struct IWineD3DResourceImpl; -typedef struct wined3d_query IWineD3DQueryImpl; -typedef struct wined3d_query IWineD3DQuery; /* Texture format fixups */ @@ -2487,7 +2485,7 @@ struct wined3d_query void *extendedData; }; -HRESULT query_init(IWineD3DQueryImpl *query, IWineD3DDeviceImpl *device, WINED3DQUERYTYPE type) DECLSPEC_HIDDEN; +HRESULT query_init(struct wined3d_query *query, IWineD3DDeviceImpl *device, WINED3DQUERYTYPE type) DECLSPEC_HIDDEN; /* IWineD3DBuffer */
1
0
0
0
← Newer
1
...
55
56
57
58
59
60
61
...
68
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
Results per page:
10
25
50
100
200