May 2012 - Wine-commits - list.winehq.org

Christian Costa : dmusic: Cleanup IDirectMusic8Impl_QueryInterface.
by Alexandre Julliard 24 May '12

24 May '12

Module: wine Branch: master Commit: 2024e241ffa1bc7ad2c291b945ba1d61d6505710 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2024e241ffa1bc7ad2c291b94… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu May 24 08:50:32 2012 +0200 dmusic: Cleanup IDirectMusic8Impl_QueryInterface. --- dlls/dmusic/dmusic.c | 35 ++++++++++++++++++++--------------- 1 files changed, 20 insertions(+), 15 deletions(-) diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c index 8afe2cc..9c93ba8 100644 --- a/dlls/dmusic/dmusic.c +++ b/dlls/dmusic/dmusic.c @@ -31,22 +31,27 @@ static inline IDirectMusic8Impl *impl_from_IDirectMusic8(IDirectMusic8 *iface) } /* IDirectMusic8Impl IUnknown part: */ -static HRESULT WINAPI IDirectMusic8Impl_QueryInterface(LPDIRECTMUSIC8 iface, REFIID riid, LPVOID *ppobj) +static HRESULT WINAPI IDirectMusic8Impl_QueryInterface(LPDIRECTMUSIC8 iface, REFIID riid, LPVOID *ret_iface) { - IDirectMusic8Impl *This = impl_from_IDirectMusic8(iface); - TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); - - if (IsEqualIID (riid, &IID_IUnknown) || - IsEqualIID (riid, &IID_IDirectMusic) || - IsEqualIID (riid, &IID_IDirectMusic2) || - IsEqualIID (riid, &IID_IDirectMusic8)) { - IUnknown_AddRef(iface); - *ppobj = This; - return S_OK; - } + IDirectMusic8Impl *This = impl_from_IDirectMusic8(iface); - WARN("(%p, %s, %p): not found\n", This, debugstr_dmguid(riid), ppobj); - return E_NOINTERFACE; + TRACE("(%p)->(%s, %p)\n", iface, debugstr_dmguid(riid), ret_iface); + + if (IsEqualIID (riid, &IID_IUnknown) || + IsEqualIID (riid, &IID_IDirectMusic) || + IsEqualIID (riid, &IID_IDirectMusic2) || + IsEqualIID (riid, &IID_IDirectMusic8)) + { + IDirectMusic8_AddRef(iface); + *ret_iface = iface; + return S_OK; + } + + *ret_iface = NULL; + + WARN("(%p, %s, %p): not found\n", This, debugstr_dmguid(riid), ret_iface); + + return E_NOINTERFACE; } static ULONG WINAPI IDirectMusic8Impl_AddRef(LPDIRECTMUSIC8 iface)

1 0

Hans Leidekker : fusion: Add a stub implementation of InitializeFusion.
by Alexandre Julliard 24 May '12

24 May '12

Module: wine Branch: master Commit: 4f392d53e3aa9e59b825e1d5d5a2566772fc5b58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f392d53e3aa9e59b825e1d5d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 24 09:53:43 2012 +0200 fusion: Add a stub implementation of InitializeFusion. --- dlls/fusion/fusion.spec | 2 +- dlls/fusion/fusion_main.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/fusion/fusion.spec b/dlls/fusion/fusion.spec index 54e4ead..264aff7 100644 --- a/dlls/fusion/fusion.spec +++ b/dlls/fusion/fusion.spec @@ -8,7 +8,7 @@ @ stdcall CreateInstallReferenceEnum(ptr ptr long ptr) @ stdcall GetCachePath(long wstr ptr) @ stub GetHistoryFileDirectory -@ stub InitializeFusion +@ stdcall InitializeFusion() @ stub InstallCustomAssembly @ stub InstallCustomModule @ stub LookupHistoryAssembly diff --git a/dlls/fusion/fusion_main.c b/dlls/fusion/fusion_main.c index 5c9d776..8f0906b 100644 --- a/dlls/fusion/fusion_main.c +++ b/dlls/fusion/fusion_main.c @@ -47,3 +47,9 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return TRUE; } + +HRESULT WINAPI InitializeFusion(void) +{ + FIXME("\n"); + return E_NOTIMPL; +}

1 0

Dmitry Timoshkov : windowscodecs: Add a stubbed out IWICMetadataBlockReader interface.
by Alexandre Julliard 24 May '12

24 May '12

Module: wine Branch: master Commit: 882c1026a865a703711f2d78235075320b02f48c URL: http://source.winehq.org/git/wine.git/?a=commit;h=882c1026a865a703711f2d782… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu May 24 18:39:50 2012 +0900 windowscodecs: Add a stubbed out IWICMetadataBlockReader interface. --- dlls/windowscodecs/metadatahandler.c | 69 ++++++++++++++++++++++++++++++++++ 1 files changed, 69 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/metadatahandler.c b/dlls/windowscodecs/metadatahandler.c index afcff21..ffe6763 100644 --- a/dlls/windowscodecs/metadatahandler.c +++ b/dlls/windowscodecs/metadatahandler.c @@ -39,6 +39,7 @@ typedef struct MetadataHandler { IWICMetadataWriter IWICMetadataWriter_iface; LONG ref; IWICPersistStream IWICPersistStream_iface; + IWICMetadataBlockReader IWICMetadataBlockReader_iface; const MetadataHandlerVtbl *vtable; MetadataItem *items; DWORD item_count; @@ -55,6 +56,11 @@ static inline MetadataHandler *impl_from_IWICPersistStream(IWICPersistStream *if return CONTAINING_RECORD(iface, MetadataHandler, IWICPersistStream_iface); } +static inline MetadataHandler *impl_from_IWICMetadataBlockReader(IWICMetadataBlockReader *iface) +{ + return CONTAINING_RECORD(iface, MetadataHandler, IWICMetadataBlockReader_iface); +} + static void MetadataHandler_FreeItems(MetadataHandler *This) { int i; @@ -92,6 +98,10 @@ static HRESULT WINAPI MetadataHandler_QueryInterface(IWICMetadataWriter *iface, { *ppv = &This->IWICPersistStream_iface; } + else if (IsEqualIID(&IID_IWICMetadataBlockReader, iid)) + { + *ppv = &This->IWICMetadataBlockReader_iface; + } else { *ppv = NULL; @@ -317,6 +327,64 @@ static const IWICPersistStreamVtbl MetadataHandler_PersistStream_Vtbl = { MetadataHandler_SaveEx }; +static HRESULT WINAPI MetadataHandler_MetadataBlockReader_QueryInterface(IWICMetadataBlockReader *iface, + REFIID iid, void **ppv) +{ + MetadataHandler *This = impl_from_IWICMetadataBlockReader(iface); + return IWICMetadataWriter_QueryInterface(&This->IWICMetadataWriter_iface, iid, ppv); +} + +static ULONG WINAPI MetadataHandler_MetadataBlockReader_AddRef(IWICMetadataBlockReader *iface) +{ + MetadataHandler *This = impl_from_IWICMetadataBlockReader(iface); + return IWICMetadataWriter_AddRef(&This->IWICMetadataWriter_iface); +} + +static ULONG WINAPI MetadataHandler_MetadataBlockReader_Release(IWICMetadataBlockReader *iface) +{ + MetadataHandler *This = impl_from_IWICMetadataBlockReader(iface); + return IWICMetadataWriter_Release(&This->IWICMetadataWriter_iface); +} + +static HRESULT WINAPI MetadataHandler_MetadataBlockReader_GetContainerFormat( + IWICMetadataBlockReader *iface, GUID *guid) +{ + FIXME("(%p,%p): stub\n", iface, guid); + return E_NOTIMPL; +} + +static HRESULT WINAPI MetadataHandler_MetadataBlockReader_GetCount( + IWICMetadataBlockReader *iface, UINT *count) +{ + FIXME("(%p,%p): stub\n", iface, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI MetadataHandler_MetadataBlockReader_GetReaderByIndex( + IWICMetadataBlockReader *iface, UINT index, IWICMetadataReader **reader) +{ + FIXME("(%p,%u,%p): stub\n", iface, index, reader); + return E_NOTIMPL; +} + +static HRESULT WINAPI MetadataHandler_MetadataBlockReader_GetEnumerator( + IWICMetadataBlockReader *iface, IEnumUnknown **enum_metadata) +{ + FIXME("(%p,%p): stub\n", iface, enum_metadata); + return E_NOTIMPL; +} + +static const IWICMetadataBlockReaderVtbl MetadataHandler_MetadataBlockReader_Vtbl = +{ + MetadataHandler_MetadataBlockReader_QueryInterface, + MetadataHandler_MetadataBlockReader_AddRef, + MetadataHandler_MetadataBlockReader_Release, + MetadataHandler_MetadataBlockReader_GetContainerFormat, + MetadataHandler_MetadataBlockReader_GetCount, + MetadataHandler_MetadataBlockReader_GetReaderByIndex, + MetadataHandler_MetadataBlockReader_GetEnumerator +}; + HRESULT MetadataReader_Create(const MetadataHandlerVtbl *vtable, IUnknown *pUnkOuter, REFIID iid, void** ppv) { MetadataHandler *This; @@ -333,6 +401,7 @@ HRESULT MetadataReader_Create(const MetadataHandlerVtbl *vtable, IUnknown *pUnkO This->IWICMetadataWriter_iface.lpVtbl = &MetadataHandler_Vtbl; This->IWICPersistStream_iface.lpVtbl = &MetadataHandler_PersistStream_Vtbl; + This->IWICMetadataBlockReader_iface.lpVtbl = &MetadataHandler_MetadataBlockReader_Vtbl; This->ref = 1; This->vtable = vtable; This->items = NULL;

1 0

Michael Stefaniuc : urlmon/tests: Remove stray ok() call.
by Alexandre Julliard 24 May '12

24 May '12

Module: wine Branch: master Commit: afe73325f55c533c809596785b588ba963ff0950 URL: http://source.winehq.org/git/wine.git/?a=commit;h=afe73325f55c533c809596785… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu May 24 14:01:52 2012 +0200 urlmon/tests: Remove stray ok() call. --- dlls/urlmon/tests/protocol.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index ce383ee..889f3a9 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -941,7 +941,6 @@ static HRESULT WINAPI ProtocolSink_ReportData(IInternetProtocolSink *iface, DWOR if(!emulate_prot) CHECK_CALLED(ReportData2); CHECK_CALLED(ReportResult); - ok(hres == S_OK, "Read failed: %08x\n", hres); reported_all_data = TRUE; }else { if(!emulate_prot)

1 0

Jacek Caban : wininet: Added real implementation of InternetQueryOption( INTERNET_OPTION_REQUEST_FLAGS).
by Alexandre Julliard 24 May '12

24 May '12

Module: wine Branch: master Commit: 27af81972fd9d78a5b28a4a638aa189cacbe9375 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27af81972fd9d78a5b28a4a63… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 24 15:24:43 2012 +0200 wininet: Added real implementation of InternetQueryOption(INTERNET_OPTION_REQUEST_FLAGS). --- dlls/wininet/http.c | 20 ++++++++++++++++---- 1 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 0e3c1a3..2f64b03 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2159,17 +2159,29 @@ static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffe *size = sizeof(DWORD); *(DWORD *)buffer = req->connect_timeout; return ERROR_SUCCESS; - case INTERNET_OPTION_REQUEST_FLAGS: - TRACE("INTERNET_OPTION_REQUEST_FLAGS\n"); + case INTERNET_OPTION_REQUEST_FLAGS: { + DWORD flags = 0; if (*size < sizeof(DWORD)) return ERROR_INSUFFICIENT_BUFFER; - *(DWORD*)buffer = 4; - *size = sizeof(DWORD); + /* FIXME: Add support for: + * INTERNET_REQFLAG_FROM_CACHE + * INTERNET_REQFLAG_CACHE_WRITE_DISABLED + */ + + if(req->session->appInfo->proxy) + flags |= INTERNET_REQFLAG_VIA_PROXY; + if(!req->rawHeaders) + flags |= INTERNET_REQFLAG_NO_HEADERS; + TRACE("INTERNET_OPTION_REQUEST_FLAGS returning %x\n", flags); + + *size = sizeof(DWORD); + *(DWORD*)buffer = flags; return ERROR_SUCCESS; } + } return INET_QueryOption(hdr, option, buffer, size, unicode); }

1 0

Jacek Caban : wininet: Added INTERNET_OPTION_REQUEST_FLAGS tests.
by Alexandre Julliard 24 May '12

24 May '12

Module: wine Branch: master Commit: 17d683b0f410d11d2039b5ac7c6488a140d4ea80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17d683b0f410d11d2039b5ac7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 24 15:24:55 2012 +0200 wininet: Added INTERNET_OPTION_REQUEST_FLAGS tests. --- dlls/wininet/tests/http.c | 57 +++++++++++++++++++++++++++++++++++++-------- 1 files changed, 47 insertions(+), 10 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 2909df2..72ee56e 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -220,6 +220,26 @@ static void _test_status_code(unsigned line, HINTERNET req, DWORD excode) "[invalid 2] HttpQueryInfo failed: %x(%d)\n", res, GetLastError()); } +#define test_request_flags(a,b) _test_request_flags(__LINE__,a,b,FALSE) +#define test_request_flags_todo(a,b) _test_request_flags(__LINE__,a,b,TRUE) +static void _test_request_flags(unsigned line, HINTERNET req, DWORD exflags, BOOL is_todo) +{ + DWORD flags, size; + BOOL res; + + flags = 0xdeadbeef; + size = sizeof(flags); + res = InternetQueryOptionW(req, INTERNET_OPTION_REQUEST_FLAGS, &flags, &size); + ok_(__FILE__,line)(res, "InternetQueryOptionW(INTERNET_OPTION_REQUEST_FLAGS) failed: %u\n", GetLastError()); + + /* FIXME: Remove once we have INTERNET_REQFLAG_CACHE_WRITE_DISABLED implementation */ + flags &= ~INTERNET_REQFLAG_CACHE_WRITE_DISABLED; + if(!is_todo) + ok_(__FILE__,line)(flags == exflags, "flags = %x, expected %x\n", flags, exflags); + else + todo_wine ok_(__FILE__,line)(flags == exflags, "flags = %x, expected %x\n", flags, exflags); +} + static int close_handle_cnt; static VOID WINAPI callback( @@ -377,7 +397,6 @@ static void InternetReadFile_test(int flags, const test_data_t *test) BOOL res, on_async = TRUE; CHAR buffer[4000]; DWORD length, post_len = 0; - DWORD out; const char *types[2] = { "*", NULL }; HINTERNET hi, hic = 0, hor = 0; @@ -410,7 +429,7 @@ static void InternetReadFile_test(int flags, const test_data_t *test) trace("HttpOpenRequestA <--\n"); hor = HttpOpenRequestA(hic, test->post_data ? "POST" : "GET", test->path, NULL, NULL, types, - INTERNET_FLAG_KEEP_CONNECTION | INTERNET_FLAG_RESYNCHRONIZE, + INTERNET_FLAG_KEEP_CONNECTION | INTERNET_FLAG_RELOAD, 0xdeadbead); if (hor == 0x0 && GetLastError() == ERROR_INTERNET_NAME_NOT_RESOLVED) { /* @@ -426,6 +445,8 @@ static void InternetReadFile_test(int flags, const test_data_t *test) if (hor == 0x0) goto abort; + test_request_flags(hor, INTERNET_REQFLAG_NO_HEADERS); + length = sizeof(buffer); res = InternetQueryOptionA(hor, INTERNET_OPTION_URL, buffer, &length); ok(res, "InternetQueryOptionA(INTERNET_OPTION_URL) failed: %u\n", GetLastError()); @@ -529,9 +550,7 @@ static void InternetReadFile_test(int flags, const test_data_t *test) CLEAR_NOTIFIED(INTERNET_STATUS_CONNECTING_TO_SERVER); CLEAR_NOTIFIED(INTERNET_STATUS_CONNECTED_TO_SERVER); - length = 4; - res = InternetQueryOptionA(hor,INTERNET_OPTION_REQUEST_FLAGS,&out,&length); - ok(res, "InternetQueryOptionA(INTERNET_OPTION_REQUEST) failed with error %d\n", GetLastError()); + test_request_flags(hor, 0); length = 100; res = InternetQueryOptionA(hor,INTERNET_OPTION_URL,buffer,&length); @@ -662,7 +681,7 @@ static void InternetReadFile_chunked_test(void) trace("HttpOpenRequestA <--\n"); hor = HttpOpenRequestA(hic, "GET", "/tests/chunked", NULL, NULL, types, - INTERNET_FLAG_KEEP_CONNECTION | INTERNET_FLAG_RESYNCHRONIZE, + INTERNET_FLAG_KEEP_CONNECTION | INTERNET_FLAG_RELOAD, 0xdeadbead); if (hor == 0x0 && GetLastError() == ERROR_INTERNET_NAME_NOT_RESOLVED) { /* @@ -685,6 +704,8 @@ static void InternetReadFile_chunked_test(void) "Synchronous HttpSendRequest returning 0, error %u\n", GetLastError()); trace("HttpSendRequestA <--\n"); + test_request_flags(hor, 0); + length = 100; res = HttpQueryInfoA(hor,HTTP_QUERY_CONTENT_TYPE,buffer,&length,0x0); buffer[length]=0; @@ -781,7 +802,7 @@ static void InternetReadFileExA_test(int flags) trace("HttpOpenRequestA <--\n"); hor = HttpOpenRequestA(hic, "GET", "/tests/redirect", NULL, NULL, types, - INTERNET_FLAG_KEEP_CONNECTION | INTERNET_FLAG_RESYNCHRONIZE, + INTERNET_FLAG_KEEP_CONNECTION | INTERNET_FLAG_RELOAD, 0xdeadbead); if (hor == 0x0 && GetLastError() == ERROR_INTERNET_NAME_NOT_RESOLVED) { /* @@ -878,6 +899,8 @@ static void InternetReadFileExA_test(int flags) rc ? "TRUE" : "FALSE", GetLastError()); HeapFree(GetProcessHeap(), 0, inetbuffers.lpvBuffer); + test_request_flags(hor, 0); + /* tests to see whether lpcszHeader is used - it isn't */ inetbuffers.dwStructSize = sizeof(INTERNET_BUFFERS); inetbuffers.lpcszHeader = (LPCTSTR)0xdeadbeef; @@ -1039,6 +1062,7 @@ static void HttpSendRequestEx_test(void) } ok( hRequest != NULL, "Failed to open request handle err %u\n", GetLastError()); + test_request_flags(hRequest, INTERNET_REQFLAG_NO_HEADERS); BufferIn.dwStructSize = sizeof( INTERNET_BUFFERS); BufferIn.Next = (LPINTERNET_BUFFERS)0xdeadcab; @@ -1057,12 +1081,18 @@ static void HttpSendRequestEx_test(void) ok(ret, "HttpSendRequestEx Failed with error %u\n", error); ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error); + test_request_flags(hRequest, INTERNET_REQFLAG_NO_HEADERS); + for (i = 3; szPostData[i]; i++) ok(InternetWriteFile(hRequest, &szPostData[i], 1, &dwBytesWritten), "InternetWriteFile failed\n"); + test_request_flags(hRequest, INTERNET_REQFLAG_NO_HEADERS); + ok(HttpEndRequest(hRequest, NULL, 0, 0), "HttpEndRequest Failed\n"); + test_request_flags(hRequest, 0); + ok(InternetReadFile(hRequest, szBuffer, 255, &dwBytesRead), "Unable to read response\n"); szBuffer[dwBytesRead] = 0; @@ -1918,6 +1948,7 @@ static void test_proxy_indirect(int port) ok(!strcmp(buffer, "Basic realm=\"placebo\""), "proxy auth info wrong\n"); test_status_code(hr, 407); + test_request_flags(hr, 0); sz = sizeof buffer; r = HttpQueryInfo(hr, HTTP_QUERY_STATUS_TEXT, buffer, &sz, NULL); @@ -2019,6 +2050,7 @@ static void test_header_handling_order(int port) ok(ret, "HttpSendRequest failed\n"); test_status_code(request, 200); + test_request_flags(request, 0); InternetCloseHandle(request); @@ -2378,6 +2410,7 @@ static void test_basic_authentication(int port) ok(ret, "HttpSendRequest failed %u\n", GetLastError()); test_status_code(request, 200); + test_request_flags(request, 0); InternetCloseHandle(request); InternetCloseHandle(connect); @@ -2404,6 +2437,7 @@ static void test_invalid_response_headers(int port) ok(ret, "HttpSendRequest failed %u\n", GetLastError()); test_status_code(request, 401); + test_request_flags(request, 0); buffer[0] = 0; size = sizeof(buffer); @@ -2441,10 +2475,14 @@ static void test_response_without_headers(int port) hr = HttpOpenRequest(hc, NULL, "/testG", NULL, NULL, NULL, 0, 0); ok(hr != NULL, "HttpOpenRequest failed %u\n", GetLastError()); + test_request_flags(hr, INTERNET_REQFLAG_NO_HEADERS); + SetLastError(0xdeadbeef); r = HttpSendRequest(hr, NULL, 0, NULL, 0); ok(r, "HttpSendRequest failed %u\n", GetLastError()); + test_request_flags_todo(hr, INTERNET_REQFLAG_NO_HEADERS); + count = 0; memset(buffer, 0, sizeof buffer); SetLastError(0xdeadbeef); @@ -2454,6 +2492,7 @@ static void test_response_without_headers(int port) todo_wine ok(!memcmp(buffer, page1, sizeof page1), "http data wrong\n"); test_status_code(hr, 200); + test_request_flags_todo(hr, INTERNET_REQFLAG_NO_HEADERS); buffer[0] = 0; size = sizeof(buffer); @@ -3535,9 +3574,7 @@ static void test_InternetCloseHandle(void) ok(!res && (GetLastError() == ERROR_IO_PENDING), "Asynchronous HttpSendRequest NOT returning 0 with error ERROR_IO_PENDING\n"); - len = sizeof(flags); - res = InternetQueryOptionA(closetest_req, INTERNET_OPTION_REQUEST_FLAGS, &flags, &len); - ok(res, "InternetQueryOptionA(%p INTERNET_OPTION_URL) failed: %u\n", closetest_req, GetLastError()); + test_request_flags(closetest_req, INTERNET_REQFLAG_NO_HEADERS); res = InternetCloseHandle(closetest_session); ok(res, "InternetCloseHandle failed: %u\n", GetLastError());

1 0

Jacek Caban : wininet: Added better traces for status info in INTERNET_SendCallback.
by Alexandre Julliard 24 May '12

24 May '12

Module: wine Branch: master Commit: 23440d918b35ad7d2e596b7a05299701c73ad842 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23440d918b35ad7d2e596b7a0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 24 15:25:12 2012 +0200 wininet: Added better traces for status info in INTERNET_SendCallback. --- dlls/wininet/utility.c | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/utility.c b/dlls/wininet/utility.c index 9a70e62..68ea2c6 100644 --- a/dlls/wininet/utility.c +++ b/dlls/wininet/utility.c @@ -286,6 +286,18 @@ static const char *get_callback_name(DWORD dwInternetStatus) { return "Unknown"; } +static const char *debugstr_status_info(DWORD status, void *info) +{ + switch(status) { + case INTERNET_STATUS_REQUEST_COMPLETE: { + INTERNET_ASYNC_RESULT *iar = info; + return wine_dbg_sprintf("{%s, %d}", wine_dbgstr_longlong(iar->dwResult), iar->dwError); + } + default: + return wine_dbg_sprintf("%p", info); + } +} + VOID INTERNET_SendCallback(object_header_t *hdr, DWORD_PTR dwContext, DWORD dwInternetStatus, LPVOID lpvStatusInfo, DWORD dwStatusInfoLength) @@ -331,9 +343,9 @@ VOID INTERNET_SendCallback(object_header_t *hdr, DWORD_PTR dwContext, } } - TRACE(" callback(%p) (%p (%p), %08lx, %d (%s), %p, %d)\n", + TRACE(" callback(%p) (%p (%p), %08lx, %d (%s), %s, %d)\n", hdr->lpfnStatusCB, hdr->hInternet, hdr, dwContext, dwInternetStatus, get_callback_name(dwInternetStatus), - lpvNewInfo, dwStatusInfoLength); + debugstr_status_info(dwInternetStatus, lpvNewInfo), dwStatusInfoLength); hdr->lpfnStatusCB(hdr->hInternet, dwContext, dwInternetStatus, lpvNewInfo, dwStatusInfoLength);

1 0

Henri Verbeet : ddraw: Only initially enable color keying for version 1 devices.
by Alexandre Julliard 24 May '12

24 May '12

Module: wine Branch: master Commit: 4905773bafc63b748d2e780c7c331f46f39ecd44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4905773bafc63b748d2e780c7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 24 18:27:40 2012 +0200 ddraw: Only initially enable color keying for version 1 devices. --- dlls/ddraw/device.c | 2 ++ dlls/ddraw/executebuffer.c | 6 +----- dlls/ddraw/tests/ddraw1.c | 8 ++++---- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 37775ac..c79c6aa 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -6646,6 +6646,8 @@ static HRESULT d3d_device_init(struct d3d_device *device, struct ddraw *ddraw, wined3d_device_set_render_state(ddraw->wined3d_device, WINED3D_RS_ZENABLE, d3d_device_update_depth_stencil(device)); + if (version == 1) /* Color keying is initially enabled for version 1 devices. */ + wined3d_device_set_render_state(ddraw->wined3d_device, WINED3D_RS_COLORKEYENABLE, TRUE); return D3D_OK; } diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index a217d9a..85625c1 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -131,11 +131,7 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, buffer->indices[(i * 3) + 1] = ci->u2.v2; buffer->indices[(i * 3) + 2] = ci->u3.v3; instr += size; - } - /* IDirect3DDevices have color keying always enabled - - * enable it before drawing. This overwrites any ALPHA* - * render state. */ - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_COLORKEYENABLE, 1); + } IDirect3DDevice7_DrawIndexedPrimitive(&device->IDirect3DDevice7_iface, D3DPT_TRIANGLELIST, D3DFVF_TLVERTEX, tl_vx, 0, buffer->indices, count * 3, 0); } break; diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 6063220..132cc93 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -1244,7 +1244,7 @@ static void test_ck_rgba(void) ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); color = get_surface_color(rt, 320, 240); - if (i == 2 || i == 3) + if (i == 2) todo_wine ok(compare_color(color, tests[i].result1, 1), "Expected color 0x%08x for test %u, got 0x%08x.\n", tests[i].result1, i, color); else @@ -1266,7 +1266,7 @@ static void test_ck_rgba(void) /* This tests that fragments that are masked out by the color key are * discarded, instead of just fully transparent. */ color = get_surface_color(rt, 320, 240); - if (i == 2 || i == 3) + if (i == 2) todo_wine ok(compare_color(color, tests[i].result2, 1), "Expected color 0x%08x for test %u, got 0x%08x.\n", tests[i].result2, i, color); else @@ -1427,7 +1427,7 @@ static void test_ck_default(void) hr = IDirect3DDevice_EndScene(device); ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); color = get_surface_color(rt, 320, 240); - todo_wine ok(compare_color(color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", color); + ok(compare_color(color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", color); hr = IDirect3DViewport_Clear(viewport, 1, &clear_rect, D3DCLEAR_TARGET); ok(SUCCEEDED(hr), "Failed to clear viewport, hr %#x.\n", hr); @@ -1439,7 +1439,7 @@ static void test_ck_default(void) hr = IDirect3DDevice_EndScene(device); ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); color = get_surface_color(rt, 320, 240); - todo_wine ok(compare_color(color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", color); + ok(compare_color(color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", color); hr = IDirect3DViewport_Clear(viewport, 1, &clear_rect, D3DCLEAR_TARGET); ok(SUCCEEDED(hr), "Failed to clear viewport, hr %#x.\n", hr);

1 0

Henri Verbeet : ddraw/tests: Move test_wndproc() to ddraw7.c.
by Alexandre Julliard 24 May '12

24 May '12

Module: wine Branch: master Commit: ef03ac0005d0f4c4479424be57cef9d27f0839d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef03ac0005d0f4c4479424be5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 24 18:27:41 2012 +0200 ddraw/tests: Move test_wndproc() to ddraw7.c. --- dlls/ddraw/tests/d3d.c | 235 --------------------------------------------- dlls/ddraw/tests/ddraw7.c | 158 ++++++++++++++++++++++++++++++ 2 files changed, 158 insertions(+), 235 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ef03ac0005d0f4c447942…

1 0

Henri Verbeet : ddraw/tests: Add test_wndproc() for the other ddraw versions as well.
by Alexandre Julliard 24 May '12

24 May '12

Module: wine Branch: master Commit: 4bf45eca234b9ea62456e32b579b8f83f6f44784 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bf45eca234b9ea62456e32b5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 24 18:27:42 2012 +0200 ddraw/tests: Add test_wndproc() for the other ddraw versions as well. --- dlls/ddraw/tests/ddraw1.c | 158 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 158 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 158 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 474 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4bf45eca234b9ea62456e…

1 0