January 2013 - Wine-Commits

Hans Leidekker : wbemprox: Don' t fail if there are less objects than asked for in IEnumWbemClassObject:: Next.
by Alexandre Julliard Jan. 29, 2013

Jan. 29, 2013

Module: wine Branch: master Commit: 375dcf799d27ec9d925dab1ad7ba41dadcedaf9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=375dcf799d27ec9d925dab1ad… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jan 29 15:31:42 2013 +0100 wbemprox: Don't fail if there are less objects than asked for in IEnumWbemClassObject::Next. --- dlls/wbemprox/class.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index 5205515..a398c95 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -123,7 +123,7 @@ static HRESULT WINAPI enum_class_object_Next( if (lTimeout != WBEM_INFINITE) FIXME("timeout not supported\n"); *puReturned = 0; - if (ec->index + uCount > view->count) return WBEM_S_FALSE; + if (ec->index >= view->count) return WBEM_S_FALSE; hr = create_class_object( view->table->name, iface, ec->index, NULL, apObjects ); if (hr != S_OK) return hr;

1 0

Alexandre Julliard : urlmon/tests: Avoid infinite timeouts in tests.
by Alexandre Julliard Jan. 29, 2013

Jan. 29, 2013

Module: wine Branch: master Commit: 9d8e5651eb74044ae8a243723e8e074859e9fa7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d8e5651eb74044ae8a243723… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 29 16:01:23 2013 +0100 urlmon/tests: Avoid infinite timeouts in tests. --- dlls/urlmon/tests/protocol.c | 22 +++++++++++++--------- dlls/urlmon/tests/url.c | 20 ++++++++++---------- 2 files changed, 23 insertions(+), 19 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index 89c2a0c..5133ec8 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -668,12 +668,12 @@ static HRESULT WINAPI ProtocolSink_Switch(IInternetProtocolSink *iface, PROTOCOL if(binding_test) { SetEvent(event_complete); - WaitForSingleObject(event_complete2, INFINITE); + ok( WaitForSingleObject(event_complete2, 90000) == WAIT_OBJECT_0, "wait timed out\n" ); return S_OK; }if(direct_read) { continue_protdata = *pProtocolData; SetEvent(event_continue); - WaitForSingleObject(event_continue_done, INFINITE); + ok( WaitForSingleObject(event_continue_done, 90000) == WAIT_OBJECT_0, "wait timed out\n" ); }else { call_continue(pProtocolData); SetEvent(event_complete); @@ -2935,7 +2935,7 @@ static void test_http_protocol_url(LPCWSTR url, int prot, DWORD flags, DWORD tym if(direct_read) { SET_EXPECT(Switch); while(wait_for_switch) { - WaitForSingleObject(event_continue, INFINITE); + ok( WaitForSingleObject(event_continue, 90000) == WAIT_OBJECT_0, "wait timed out\n" ); CHECK_CALLED(Switch); /* Set in ReportData */ call_continue(&continue_protdata); SetEvent(event_continue_done); @@ -2945,7 +2945,7 @@ static void test_http_protocol_url(LPCWSTR url, int prot, DWORD flags, DWORD tym ok((hres == E_PENDING && cb==0) || (hres == S_OK && cb==1), "Read failed: %08x (%d bytes)\n", hres, cb); - WaitForSingleObject(event_complete, INFINITE); + ok( WaitForSingleObject(event_complete, 90000) == WAIT_OBJECT_0, "wait timed out\n" ); if(bindf & BINDF_FROMURLMON) CHECK_CALLED(Switch); else @@ -2963,7 +2963,7 @@ static void test_http_protocol_url(LPCWSTR url, int prot, DWORD flags, DWORD tym hres = IInternetProtocol_Read(async_protocol, buf, 1, &cb); ok((hres == E_PENDING && cb==0) || (hres == S_OK && cb==1), "Read failed: %08x (%d bytes)\n", hres, cb); - WaitForSingleObject(event_complete, INFINITE); + ok( WaitForSingleObject(event_complete, 90000) == WAIT_OBJECT_0, "wait timed out\n" ); if(bindf & BINDF_FROMURLMON) CHECK_CALLED(Switch); else @@ -3139,12 +3139,16 @@ static void test_ftp_protocol(void) ok((hres == E_PENDING && cb==0) || (hres == S_OK && cb==1), "Read failed: %08x (%d bytes)\n", hres, cb); - WaitForSingleObject(event_complete, INFINITE); + ok( WaitForSingleObject(event_complete, 90000) == WAIT_OBJECT_0, "wait timed out\n" ); while(1) { hres = IInternetProtocol_Read(async_protocol, buf, sizeof(buf), &cb); if(hres == E_PENDING) - WaitForSingleObject(event_complete, INFINITE); + { + DWORD ret = WaitForSingleObject(event_complete, 90000); + ok( ret == WAIT_OBJECT_0, "wait timed out\n" ); + if (ret != WAIT_OBJECT_0) break; + } else if(cb == 0) break; } @@ -3522,7 +3526,7 @@ static void test_binding(int prot, DWORD grf_pi, DWORD test_flags) if(prot == HTTP_TEST || prot == HTTPS_TEST) { while(prot_state < 4) { - WaitForSingleObject(event_complete, INFINITE); + ok( WaitForSingleObject(event_complete, 90000) == WAIT_OBJECT_0, "wait timed out\n" ); if(mimefilter_test && filtered_protocol) { SET_EXPECT(Continue); IInternetProtocol_Continue(filtered_protocol, pdata); @@ -3547,7 +3551,7 @@ static void test_binding(int prot, DWORD grf_pi, DWORD test_flags) } if(direct_read) CHECK_CALLED(ReportData); /* Set in ReportResult */ - WaitForSingleObject(event_complete, INFINITE); + ok( WaitForSingleObject(event_complete, 90000) == WAIT_OBJECT_0, "wait timed out\n" ); }else { if(mimefilter_test) SET_EXPECT(MimeFilter_LockRequest); diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index a929ace..c030597 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -474,7 +474,7 @@ static DWORD WINAPI thread_proc(PVOID arg) BINDSTATUS_FINDINGRESOURCE, wszWineHQSite); ok(hres == S_OK, "ReportProgress failed: %08x\n", hres); if(!no_callback) { - WaitForSingleObject(complete_event, INFINITE); + ok( WaitForSingleObject(complete_event, 90000) == WAIT_OBJECT_0, "wait timed out\n" ); if(bind_to_object) CHECK_CALLED(Obj_OnProgress_FINDINGRESOURCE); else @@ -491,7 +491,7 @@ static DWORD WINAPI thread_proc(PVOID arg) BINDSTATUS_CONNECTING, wszWineHQIP); ok(hres == S_OK, "ReportProgress failed: %08x\n", hres); if(!no_callback) { - WaitForSingleObject(complete_event, INFINITE); + ok( WaitForSingleObject(complete_event, 90000) == WAIT_OBJECT_0, "wait timed out\n" ); if(bind_to_object) CHECK_CALLED(Obj_OnProgress_CONNECTING); else @@ -508,7 +508,7 @@ static DWORD WINAPI thread_proc(PVOID arg) BINDSTATUS_SENDINGREQUEST, NULL); ok(hres == S_OK, "ReportProgress failed: %08x\n", hres); if(!no_callback) { - WaitForSingleObject(complete_event, INFINITE); + ok( WaitForSingleObject(complete_event, 90000) == WAIT_OBJECT_0, "wait timed out\n" ); if(bind_to_object) CHECK_CALLED(Obj_OnProgress_SENDINGREQUEST); else @@ -522,7 +522,7 @@ static DWORD WINAPI thread_proc(PVOID arg) SET_EXPECT(OnProgress_REDIRECTING); hres = IInternetProtocolSink_ReportProgress(protocol_sink, BINDSTATUS_REDIRECTING, winetest_data_urlW); ok(hres == S_OK, "ReportProgress(BINDSTATUS_REFIRECTING) failed: %08x\n", hres); - WaitForSingleObject(complete_event, INFINITE); + ok( WaitForSingleObject(complete_event, 90000) == WAIT_OBJECT_0, "wait timed out\n" ); if(bind_to_object) CHECK_CALLED(Obj_OnProgress_REDIRECTING); else @@ -535,7 +535,7 @@ static DWORD WINAPI thread_proc(PVOID arg) prot_state = 1; hres = IInternetProtocolSink_Switch(protocol_sink, &protocoldata); ok(hres == S_OK, "Switch failed: %08x\n", hres); - WaitForSingleObject(complete_event, INFINITE); + ok( WaitForSingleObject(complete_event, 90000) == WAIT_OBJECT_0, "wait timed out\n" ); CHECK_CALLED(Continue); CHECK_CALLED(Read); @@ -563,7 +563,7 @@ static DWORD WINAPI thread_proc(PVOID arg) prot_state = 2; hres = IInternetProtocolSink_Switch(protocol_sink, &protocoldata); ok(hres == S_OK, "Switch failed: %08x\n", hres); - WaitForSingleObject(complete_event, INFINITE); + ok( WaitForSingleObject(complete_event, 90000) == WAIT_OBJECT_0, "wait timed out\n" ); CHECK_CALLED(Continue); if(test_abort) { CHECK_CALLED(OnProgress_DOWNLOADINGDATA); @@ -582,7 +582,7 @@ static DWORD WINAPI thread_proc(PVOID arg) prot_state = 2; hres = IInternetProtocolSink_Switch(protocol_sink, &protocoldata); ok(hres == S_OK, "Switch failed: %08x\n", hres); - WaitForSingleObject(complete_event, INFINITE); + ok( WaitForSingleObject(complete_event, 90000) == WAIT_OBJECT_0, "wait timed out\n" ); CHECK_CALLED(Continue); CHECK_CALLED(Read); if(!no_callback) { @@ -594,7 +594,7 @@ static DWORD WINAPI thread_proc(PVOID arg) prot_state = 3; hres = IInternetProtocolSink_Switch(protocol_sink, &protocoldata); ok(hres == S_OK, "Switch failed: %08x\n", hres); - WaitForSingleObject(complete_event, INFINITE); + ok( WaitForSingleObject(complete_event, 90000) == WAIT_OBJECT_0, "wait timed out\n" ); CHECK_CALLED(Continue); CHECK_CALLED(Read); if(!no_callback) { @@ -1947,7 +1947,7 @@ static HRESULT WINAPI statusclb_OnStopBinding(IBindStatusCallbackEx *iface, HRES if((test_protocol == HTTP_TEST || test_protocol == HTTPS_TEST || test_protocol == WINETEST_TEST) && emulate_protocol) { SetEvent(complete_event); if(iface != &objbsc) - WaitForSingleObject(complete_event2, INFINITE); + ok( WaitForSingleObject(complete_event2, 90000) == WAIT_OBJECT_0, "wait timed out\n" ); } return S_OK; @@ -3008,7 +3008,7 @@ static void test_BindToStorage(int protocol, DWORD flags, DWORD t) ok(hres == MK_S_ASYNCHRONOUS, "IMoniker_BindToStorage failed: %08x\n", hres); else if(no_callback) { if(emulate_protocol) - WaitForSingleObject(complete_event2, INFINITE); + ok( WaitForSingleObject(complete_event2, 90000) == WAIT_OBJECT_0, "wait timed out\n" ); ok(hres == S_OK, "IMoniker_BindToStorage failed: %08x\n", hres); ok(unk != NULL, "unk == NULL\n"); }else if(!(bindf & BINDF_ASYNCHRONOUS) && tymed == TYMED_FILE) {

1 0

Ludger Sprenker : windowscodecs: Add tests for IPropertyBag2.
by Alexandre Julliard Jan. 29, 2013

Jan. 29, 2013

Module: wine Branch: master Commit: cf0334b65426314da14c6ccc3f0871637663710f URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf0334b65426314da14c6ccc3… Author: Ludger Sprenker <ludger(a)sprenker.net> Date: Fri Jan 25 00:04:46 2013 +0100 windowscodecs: Add tests for IPropertyBag2. --- dlls/windowscodecs/tests/Makefile.in | 3 +- dlls/windowscodecs/tests/propertybag.c | 298 ++++++++++++++++++++++++++++++++ include/wincodec.idl | 1 + 3 files changed, 301 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cf0334b65426314da14c6…

1 0

Huw Davies : riched20: Move undo handling to a different set of structs as the display item structs are not a good fit .
by Alexandre Julliard Jan. 29, 2013

Jan. 29, 2013

Module: wine Branch: master Commit: dee40e90ced1fd8814ad828529edc82dbd68b47c URL: http://source.winehq.org/git/wine.git/?a=commit;h=dee40e90ced1fd8814ad82852… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jan 29 13:41:48 2013 +0000 riched20: Move undo handling to a different set of structs as the display item structs are not a good fit. --- dlls/riched20/caret.c | 12 +- dlls/riched20/editor.c | 10 +- dlls/riched20/editor.h | 7 +- dlls/riched20/editstr.h | 90 +++++++-- dlls/riched20/list.c | 31 +-- dlls/riched20/para.c | 31 +--- dlls/riched20/run.c | 24 +-- dlls/riched20/undo.c | 533 +++++++++++++++++++++++++---------------------- 8 files changed, 396 insertions(+), 342 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dee40e90ced1fd8814ad8…

1 0

Jacek Caban : wininet: Moved WORKREQ_FTPCREATEDIRECTORYW out of WORKREQUEST .
by Alexandre Julliard Jan. 29, 2013

Jan. 29, 2013

Module: wine Branch: master Commit: d816de27fbeb24c4de14aa056d3694b6b846dff3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d816de27fbeb24c4de14aa056… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 29 12:05:03 2013 +0100 wininet: Moved WORKREQ_FTPCREATEDIRECTORYW out of WORKREQUEST. --- dlls/wininet/ftp.c | 20 +++++++++----------- dlls/wininet/internet.h | 6 ------ 2 files changed, 9 insertions(+), 17 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 9007d56..21163d5 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -589,15 +589,15 @@ BOOL WINAPI FtpCreateDirectoryA(HINTERNET hConnect, LPCSTR lpszDirectory) } -static void AsyncFtpCreateDirectoryProc(WORKREQUEST *workRequest) +static void AsyncFtpCreateDirectoryProc(task_header_t *hdr) { - struct WORKREQ_FTPCREATEDIRECTORYW const *req = &workRequest->u.FtpCreateDirectoryW; - ftp_session_t *lpwfs = (ftp_session_t*) workRequest->hdr; + directory_task_t *task = (directory_task_t*)hdr; + ftp_session_t *session = (ftp_session_t*)task->hdr.hdr; - TRACE(" %p\n", lpwfs); + TRACE(" %p\n", session); - FTP_FtpCreateDirectoryW(lpwfs, req->lpszDirectory); - heap_free(req->lpszDirectory); + FTP_FtpCreateDirectoryW(session, task->directory); + heap_free(task->directory); } /*********************************************************************** @@ -644,14 +644,12 @@ BOOL WINAPI FtpCreateDirectoryW(HINTERNET hConnect, LPCWSTR lpszDirectory) hIC = lpwfs->lpAppInfo; if (hIC->hdr.dwFlags & INTERNET_FLAG_ASYNC) { - WORKREQUEST *task; - struct WORKREQ_FTPCREATEDIRECTORYW *req; + directory_task_t *task; task = alloc_async_task(&lpwfs->hdr, AsyncFtpCreateDirectoryProc, sizeof(*task)); - req = &task->u.FtpCreateDirectoryW; - req->lpszDirectory = heap_strdupW(lpszDirectory); + task->directory = heap_strdupW(lpszDirectory); - r = res_to_le(INTERNET_AsyncCall(task)); + r = res_to_le(INTERNET_AsyncCall(&task->hdr)); } else { diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 83cc750..01bf5b3 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -355,11 +355,6 @@ typedef struct } http_request_t; -struct WORKREQ_FTPCREATEDIRECTORYW -{ - LPWSTR lpszDirectory; -}; - struct WORKREQ_FTPFINDFIRSTFILEW { LPWSTR lpszSearchFile; @@ -422,7 +417,6 @@ typedef struct WORKREQ object_header_t *hdr; union { - struct WORKREQ_FTPCREATEDIRECTORYW FtpCreateDirectoryW; struct WORKREQ_FTPFINDFIRSTFILEW FtpFindFirstFileW; struct WORKREQ_FTPGETCURRENTDIRECTORYW FtpGetCurrentDirectoryW; struct WORKREQ_FTPOPENFILEW FtpOpenFileW;

1 0

Hans Leidekker : wbemprox: Implement Win32_VideoController.PNPDeviceID.
by Alexandre Julliard Jan. 29, 2013

Jan. 29, 2013

Module: wine Branch: master Commit: 22f820533595568daaff773ef21ca7e66f0f12b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22f820533595568daaff773ef… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jan 29 15:32:06 2013 +0100 wbemprox: Implement Win32_VideoController.PNPDeviceID. --- dlls/wbemprox/builtin.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 5f6e62f..699d051 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -342,7 +342,8 @@ static const struct column col_videocontroller[] = { prop_currentverticalresW, CIM_UINT32 }, { prop_descriptionW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_deviceidW, CIM_STRING|COL_FLAG_KEY }, - { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC } + { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_pnpdeviceidW, CIM_STRING } }; static const WCHAR baseboard_manufacturerW[] = @@ -394,6 +395,10 @@ static const WCHAR sounddevice_productnameW[] = {'W','i','n','e',' ','A','u','d','i','o',' ','D','e','v','i','c','e',0}; static const WCHAR videocontroller_deviceidW[] = {'V','i','d','e','o','C','o','n','t','r','o','l','l','e','r','1',0}; +static const WCHAR videocontroller_pnpdeviceidW[] = + {'P','C','I','\\','V','E','N','_','1','0','0','2','&','D','E','V','_','6','7','1','8','&', + 'S','U','B','S','Y','S','_','2','2','0','1','1','4','5','8','&','R','E','V','_','0','0','\\', + '4','&','3','8','A','C','1','8','A','C','&','0','&','0','0','0','9',0}; #include "pshpack1.h" struct record_baseboard @@ -540,6 +545,7 @@ struct record_videocontroller const WCHAR *description; const WCHAR *device_id; const WCHAR *name; + const WCHAR *pnpdevice_id; }; #include "poppack.h" @@ -1235,6 +1241,7 @@ done: rec->description = heap_strdupW( name ); rec->device_id = videocontroller_deviceidW; rec->name = heap_strdupW( name ); + rec->pnpdevice_id = videocontroller_pnpdeviceidW; TRACE("created 1 row\n"); table->num_rows = 1;

1 0

Matteo Bruni : wined3d: Rebind texture before checking for its content in check_fbo_compat().
by Alexandre Julliard Jan. 29, 2013

Jan. 29, 2013

Module: wine Branch: master Commit: 59171c06ceadcd0138c025a9fbe3d756ba8fdbc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59171c06ceadcd0138c025a9f… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Sat Jan 26 23:48:54 2013 +0100 wined3d: Rebind texture before checking for its content in check_fbo_compat(). --- dlls/wined3d/utils.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index bcdc8c8..e395bee 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1171,6 +1171,8 @@ static void check_fbo_compat(const struct wined3d_gl_info *gl_info, struct wined gl_info->gl_ops.gl.p_glDisable(GL_BLEND); + /* Rebinding texture to workaround a fglrx bug. */ + gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_2D, tex); gl_info->gl_ops.gl.p_glGetTexImage(GL_TEXTURE_2D, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, readback); checkGLcall("Post-pixelshader blending check");

1 0

Stefan Dösinger : ddraw: AddViewport holds a reference to the viewport.
by Alexandre Julliard Jan. 29, 2013

Jan. 29, 2013

Module: wine Branch: master Commit: 0209b0a96cd21cd8d9f0812d0756514555bc2b3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0209b0a96cd21cd8d9f0812d0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jan 26 13:39:46 2013 +0100 ddraw: AddViewport holds a reference to the viewport. --- dlls/ddraw/device.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index a65df42..ace6a12 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -765,6 +765,7 @@ static HRESULT WINAPI d3d_device3_AddViewport(IDirect3DDevice3 *iface, IDirect3D return DDERR_INVALIDPARAMS; wined3d_mutex_lock(); + IDirect3DViewport3_AddRef(viewport); list_add_head(&device->viewport_list, &vp->entry); /* Viewport must be usable for Clear() after AddViewport, so set active_device here. */ vp->active_device = device; @@ -835,6 +836,8 @@ static HRESULT WINAPI d3d_device3_DeleteViewport(IDirect3DDevice3 *iface, IDirec vp->active_device = NULL; list_remove(&vp->entry); + IDirect3DViewport3_Release(viewport); + wined3d_mutex_unlock(); return D3D_OK;

1 0

Stefan Dösinger : ddraw: Check for NULL pointers in SetCurrentViewport.
by Alexandre Julliard Jan. 29, 2013

Jan. 29, 2013

Module: wine Branch: master Commit: 351730e2d681e57fb2e32447ebf9bf9f4acedcc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=351730e2d681e57fb2e32447e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jan 26 13:39:45 2013 +0100 ddraw: Check for NULL pointers in SetCurrentViewport. --- dlls/ddraw/device.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 92828aa..a65df42 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -1703,9 +1703,15 @@ static HRESULT WINAPI d3d_device3_SetCurrentViewport(IDirect3DDevice3 *iface, ID TRACE("iface %p, viewport %p.\n", iface, Direct3DViewport3); + if (!vp) + { + WARN("Direct3DViewport3 is NULL, returning DDERR_INVALIDPARAMS\n"); + return DDERR_INVALIDPARAMS; + } + wined3d_mutex_lock(); /* Do nothing if the specified viewport is the same as the current one */ - if (This->current_viewport == vp ) + if (This->current_viewport == vp) { wined3d_mutex_unlock(); return D3D_OK; @@ -1745,7 +1751,8 @@ static HRESULT WINAPI d3d_device2_SetCurrentViewport(IDirect3DDevice2 *iface, ID TRACE("iface %p, viewport %p.\n", iface, viewport); - return d3d_device3_SetCurrentViewport(&device->IDirect3DDevice3_iface, &vp->IDirect3DViewport3_iface); + return d3d_device3_SetCurrentViewport(&device->IDirect3DDevice3_iface, + vp ? &vp->IDirect3DViewport3_iface : NULL); } /*****************************************************************************

1 0

Stefan Dösinger : ddraw: device:: GetCurrentViewport returns an error if no viewport is set.
by Alexandre Julliard Jan. 29, 2013

Jan. 29, 2013

Module: wine Branch: master Commit: 9a0b2a510046309708a629acfd51e2ce6be13e08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a0b2a510046309708a629acf… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jan 26 13:39:42 2013 +0100 ddraw: device::GetCurrentViewport returns an error if no viewport is set. --- dlls/ddraw/device.c | 14 ++++++++------ dlls/ddraw/viewport.c | 18 ++++++++---------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 5d30994..c604c6a 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -1758,16 +1758,18 @@ static HRESULT WINAPI d3d_device3_GetCurrentViewport(IDirect3DDevice3 *iface, ID return DDERR_INVALIDPARAMS; wined3d_mutex_lock(); - *viewport = &device->current_viewport->IDirect3DViewport3_iface; + if (!device->current_viewport) + { + wined3d_mutex_unlock(); + WARN("No current viewport, returning D3DERR_NOCURRENTVIEWPORT\n"); + return D3DERR_NOCURRENTVIEWPORT; + } - /* AddRef the returned viewport */ - if (*viewport) - IDirect3DViewport3_AddRef(*viewport); + *viewport = &device->current_viewport->IDirect3DViewport3_iface; + IDirect3DViewport3_AddRef(*viewport); TRACE("Returning interface %p.\n", *viewport); - wined3d_mutex_unlock(); - return D3D_OK; } diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index 9231c19..f9eddda 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -342,10 +342,10 @@ static HRESULT WINAPI d3d_viewport_SetViewport(IDirect3DViewport3 *iface, D3DVIE This->viewports.vp1.dvMinZ = 0.0; This->viewports.vp1.dvMaxZ = 1.0; - if (This->active_device) { + if (This->active_device) + { IDirect3DDevice3 *d3d_device3 = &This->active_device->IDirect3DDevice3_iface; - IDirect3DDevice3_GetCurrentViewport(d3d_device3, &current_viewport); - if (current_viewport) + if (SUCCEEDED(IDirect3DDevice3_GetCurrentViewport(d3d_device3, &current_viewport))) { if (current_viewport == iface) viewport_activate(This, FALSE); IDirect3DViewport3_Release(current_viewport); @@ -705,8 +705,7 @@ static HRESULT WINAPI d3d_viewport_Clear(IDirect3DViewport3 *iface, hr = IDirect3DDevice7_Clear(&This->active_device->IDirect3DDevice7_iface, rect_count, rects, flags & (D3DCLEAR_ZBUFFER | D3DCLEAR_TARGET), color, 1.0, 0x00000000); - IDirect3DDevice3_GetCurrentViewport(d3d_device3, &current_viewport); - if (current_viewport) + if (SUCCEEDED(IDirect3DDevice3_GetCurrentViewport(d3d_device3, &current_viewport))) { struct d3d_viewport *vp = impl_from_IDirect3DViewport3(current_viewport); viewport_activate(vp, TRUE); @@ -979,10 +978,10 @@ static HRESULT WINAPI d3d_viewport_SetViewport2(IDirect3DViewport3 *iface, D3DVI memset(&(This->viewports.vp2), 0, sizeof(This->viewports.vp2)); memcpy(&(This->viewports.vp2), lpData, lpData->dwSize); - if (This->active_device) { + if (This->active_device) + { IDirect3DDevice3 *d3d_device3 = &This->active_device->IDirect3DDevice3_iface; - IDirect3DDevice3_GetCurrentViewport(d3d_device3, &current_viewport); - if (current_viewport) + if (SUCCEEDED(IDirect3DDevice3_GetCurrentViewport(d3d_device3, &current_viewport))) { if (current_viewport == iface) viewport_activate(This, FALSE); IDirect3DViewport3_Release(current_viewport); @@ -1087,8 +1086,7 @@ static HRESULT WINAPI d3d_viewport_Clear2(IDirect3DViewport3 *iface, DWORD rect_ hr = IDirect3DDevice7_Clear(&viewport->active_device->IDirect3DDevice7_iface, rect_count, rects, flags, color, depth, stencil); - IDirect3DDevice3_GetCurrentViewport(d3d_device3, &current_viewport); - if (current_viewport) + if (SUCCEEDED(IDirect3DDevice3_GetCurrentViewport(d3d_device3, &current_viewport))) { struct d3d_viewport *vp = impl_from_IDirect3DViewport3(current_viewport); viewport_activate(vp, TRUE);

1 0