May 2006 - Wine-Commits - list.winehq.org

Jacek Caban : urlmon: Call OnProgress in apartment thread.
by Alexandre Julliard May 25, 2006

May 25, 2006

Module: wine Branch: refs/heads/master Commit: 10acd23b2cc89dc353677ef7abd11265dfe98a0e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=10acd23b2cc89dc353677ef… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 25 18:35:35 2006 +0200 urlmon: Call OnProgress in apartment thread. --- dlls/urlmon/binding.c | 115 +++++++++++++++++++++++++++++++++++++++++++-- dlls/urlmon/urlmon_main.c | 4 ++ dlls/urlmon/urlmon_main.h | 2 + 3 files changed, 117 insertions(+), 4 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index 2a59b80..7de0847 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -53,6 +53,9 @@ typedef struct { DWORD bindf; LPWSTR mime; LPWSTR url; + + DWORD apartment_thread; + HWND notif_hwnd; } Binding; struct ProtocolStream { @@ -74,6 +77,110 @@ #define SERVPROV(x) ((IServiceProvider* #define STREAM(x) ((IStream*) &(x)->lpStreamVtbl) +#define WM_MK_ONPROGRESS (WM_USER+100) + +typedef struct { + Binding *binding; + ULONG progress; + ULONG progress_max; + ULONG status_code; + LPWSTR status_text; +} on_progress_data; + +static LRESULT WINAPI notif_wnd_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + switch(msg) { + case WM_MK_ONPROGRESS: { + on_progress_data *data = (on_progress_data*)lParam; + + TRACE("WM_MK_PROGRESS %p\n", data); + + IBindStatusCallback_OnProgress(data->binding->callback, data->progress, + data->progress_max, data->status_code, data->status_text); + + IBinding_Release(BINDING(data->binding)); + HeapFree(GetProcessHeap(), 0, data->status_text); + HeapFree(GetProcessHeap(), 0, data); + + return 0; + } + } + + return DefWindowProcW(hwnd, msg, wParam, lParam); +} + +static HWND get_notif_hwnd(void) +{ + static ATOM wnd_class = 0; + HWND hwnd; + + static const WCHAR wszURLMonikerNotificationWindow[] = + {'U','R','L',' ','M','o','n','i','k','e','r',' ', + 'N','o','t','i','f','i','c','a','t','i','o','n',' ','W','i','n','d','o','w',0}; + + if(!wnd_class) { + static WNDCLASSEXW wndclass = { + sizeof(wndclass), 0, + notif_wnd_proc, 0, 0, + NULL, NULL, NULL, NULL, NULL, + wszURLMonikerNotificationWindow, + NULL + }; + + wndclass.hInstance = URLMON_hInstance; + + wnd_class = RegisterClassExW(&wndclass); + } + + if(!urlmon_tls) + urlmon_tls = TlsAlloc(); + + hwnd = TlsGetValue(urlmon_tls); + if(hwnd) + return hwnd; + + hwnd = CreateWindowExW(0, MAKEINTATOMW(wnd_class), + wszURLMonikerNotificationWindow, 0, 0, 0, 0, 0, HWND_MESSAGE, + NULL, URLMON_hInstance, NULL); + TlsSetValue(urlmon_tls, hwnd); + + TRACE("hwnd = %p\n", hwnd); + + return hwnd; +} + +static void on_progress(Binding *This, ULONG progress, ULONG progress_max, + ULONG status_code, LPCWSTR status_text) +{ + on_progress_data *data; + + if(GetCurrentThreadId() == This->apartment_thread) { + IBindStatusCallback_OnProgress(This->callback, progress, progress_max, + status_code, status_text); + return; + } + + data = HeapAlloc(GetProcessHeap(), 0, sizeof(*data)); + + IBinding_AddRef(BINDING(This)); + + data->binding = This; + data->progress = progress; + data->progress_max = progress_max; + data->status_code = status_code; + + if(status_text) { + DWORD size = (strlenW(status_text)+1)*sizeof(WCHAR); + + data->status_text = HeapAlloc(GetProcessHeap(), 0, size); + memcpy(data->status_text, status_text, size); + }else { + data->status_text = NULL; + } + + PostMessageW(This->notif_hwnd, WM_MK_ONPROGRESS, 0, (LPARAM)data); +} + static HRESULT WINAPI HttpNegotiate_QueryInterface(IHttpNegotiate2 *iface, REFIID riid, void **ppv) { @@ -543,12 +650,10 @@ static HRESULT WINAPI InternetProtocolSi break; } case BINDSTATUS_SENDINGREQUEST: - IBindStatusCallback_OnProgress(This->callback, 0, 0, BINDSTATUS_SENDINGREQUEST, - szStatusText); + on_progress(This, 0, 0, BINDSTATUS_SENDINGREQUEST, szStatusText); break; case BINDSTATUS_VERIFIEDMIMETYPEAVAILABLE: - IBindStatusCallback_OnProgress(This->callback, 0, 0, - BINDSTATUS_MIMETYPEAVAILABLE, szStatusText); + on_progress(This, 0, 0, BINDSTATUS_MIMETYPEAVAILABLE, szStatusText); break; case BINDSTATUS_CACHEFILENAMEAVAILABLE: break; @@ -847,6 +952,8 @@ static HRESULT Binding_Create(LPCWSTR ur ret->stream = NULL; ret->mime = NULL; ret->url = NULL; + ret->apartment_thread = GetCurrentThreadId(); + ret->notif_hwnd = get_notif_hwnd(); memset(&ret->bindinfo, 0, sizeof(BINDINFO)); ret->bindinfo.cbSize = sizeof(BINDINFO); diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index fa62409..edec353 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -42,6 +42,8 @@ LONG URLMON_refCount = 0; HINSTANCE URLMON_hInstance = 0; +DWORD urlmon_tls = 0; + /*********************************************************************** * DllMain (URLMON.init) */ @@ -56,6 +58,8 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, break; case DLL_PROCESS_DETACH: + if(urlmon_tls) + TlsFree(urlmon_tls); URLMON_hInstance = 0; break; } diff --git a/dlls/urlmon/urlmon_main.h b/dlls/urlmon/urlmon_main.h index 0eb7db6..9b9f149 100644 --- a/dlls/urlmon/urlmon_main.h +++ b/dlls/urlmon/urlmon_main.h @@ -59,4 +59,6 @@ HRESULT get_protocol_handler(LPCWSTR url HRESULT start_binding(LPCWSTR url, IBindCtx *pbc, REFIID riid, void **ppv); +extern DWORD urlmon_tls; + #endif /* __WINE_URLMON_MAIN_H */

1 0

Jacek Caban : urlmon: Return MK_S_ASYNCHRONOUS if bindindg is asynchronous.
by Alexandre Julliard May 25, 2006

May 25, 2006

Module: wine Branch: refs/heads/master Commit: cef354a2165d74a422a6baee2e41035cd67762b9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cef354a2165d74a422a6bae… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 25 18:34:15 2006 +0200 urlmon: Return MK_S_ASYNCHRONOUS if bindindg is asynchronous. --- dlls/urlmon/binding.c | 33 +++++++++++++++++++++++++-------- 1 files changed, 25 insertions(+), 8 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index 04d2f7f..2a59b80 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -64,6 +64,7 @@ struct ProtocolStream { BYTE buf[1024*8]; DWORD buf_size; + BOOL init_buf; }; #define BINDING(x) ((IBinding*) &(x)->lpBindingVtbl) @@ -347,6 +348,7 @@ static ProtocolStream *create_stream(IIn ret->lpStreamVtbl = &ProtocolStreamVtbl; ret->ref = 1; ret->buf_size = 0; + ret->init_buf = FALSE; IInternetProtocol_AddRef(protocol); ret->protocol = protocol; @@ -359,10 +361,14 @@ static ProtocolStream *create_stream(IIn static void fill_stream_buffer(ProtocolStream *This) { DWORD read = 0; + HRESULT hres; - IInternetProtocol_Read(This->protocol, This->buf+This->buf_size, - sizeof(This->buf)-This->buf_size, &read); - This->buf_size += read; + hres = IInternetProtocol_Read(This->protocol, This->buf+This->buf_size, + sizeof(This->buf)-This->buf_size, &read); + if(SUCCEEDED(hres)) { + This->buf_size += read; + This->init_buf = TRUE; + } } static HRESULT WINAPI Binding_QueryInterface(IBinding *iface, REFIID riid, void **ppv) @@ -908,15 +914,26 @@ HRESULT start_binding(LPCWSTR url, IBind hres = IInternetProtocol_Start(binding->protocol, url, PROTSINK(binding), BINDINF(binding), 0, 0); - if(SUCCEEDED(hres)) { - IInternetProtocol_UnlockRequest(binding->protocol); - }else { + if(FAILED(hres)) { WARN("Start failed: %08lx\n", hres); + + IInternetProtocol_Terminate(binding->protocol, 0); IBindStatusCallback_OnStopBinding(binding->callback, S_OK, NULL); + IBinding_Release(BINDING(binding)); + + return hres; } - IStream_AddRef(STREAM(binding->stream)); - *ppv = binding->stream; + if(binding->stream->init_buf) { + IInternetProtocol_UnlockRequest(binding->protocol); + + IStream_AddRef(STREAM(binding->stream)); + *ppv = binding->stream; + + hres = S_OK; + }else { + hres = MK_S_ASYNCHRONOUS; + } IBinding_Release(BINDING(binding));

1 0

Jacek Caban : urlmon: Added ReportResult implementation.
by Alexandre Julliard May 25, 2006

May 25, 2006

Module: wine Branch: refs/heads/master Commit: 6155a67782e356d3068028d78731fc67fc7a581a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6155a67782e356d3068028d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 25 18:33:21 2006 +0200 urlmon: Added ReportResult implementation. --- dlls/urlmon/binding.c | 8 +++++--- dlls/urlmon/tests/url.c | 7 ++++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index f88d1c3..04d2f7f 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -602,8 +602,11 @@ static HRESULT WINAPI InternetProtocolSi HRESULT hrResult, DWORD dwError, LPCWSTR szResult) { Binding *This = PROTSINK_THIS(iface); - FIXME("(%p)->(%08lx %ld %s)\n", This, hrResult, dwError, debugstr_w(szResult)); - return E_NOTIMPL; + + TRACE("(%p)->(%08lx %ld %s)\n", This, hrResult, dwError, debugstr_w(szResult)); + + IInternetProtocol_Terminate(This->protocol, 0); + return S_OK; } #undef PROTSINK_THIS @@ -904,7 +907,6 @@ HRESULT start_binding(LPCWSTR url, IBind hres = IInternetProtocol_Start(binding->protocol, url, PROTSINK(binding), BINDINF(binding), 0, 0); - IInternetProtocol_Terminate(binding->protocol, 0); if(SUCCEEDED(hres)) { IInternetProtocol_UnlockRequest(binding->protocol); diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 7c1c5ff..1c6129e 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -226,7 +226,10 @@ static HRESULT WINAPI Protocol_Start(IIn CHECK_CALLED(OnDataAvailable); CHECK_CALLED(OnStopBinding); - IInternetProtocolSink_ReportResult(pOIProtSink, S_OK, 0, NULL); + SET_EXPECT(Terminate); + hres = IInternetProtocolSink_ReportResult(pOIProtSink, S_OK, 0, NULL); + ok(hres == S_OK, "ReportResult failed: %08lx\n", hres); + CHECK_CALLED(Terminate); return S_OK; } @@ -620,7 +623,6 @@ static void test_BindToStorage(void) SET_EXPECT(OnStartBinding); if(emulate_protocol) { SET_EXPECT(Start); - SET_EXPECT(Terminate); SET_EXPECT(UnlockRequest); }else { if(test_protocol == HTTP_TEST) { @@ -661,7 +663,6 @@ static void test_BindToStorage(void) CHECK_CALLED(OnStartBinding); if(emulate_protocol) { CHECK_CALLED(Start); - CHECK_CALLED(Terminate); CHECK_CALLED(UnlockRequest); }else { if(test_protocol == HTTP_TEST) {

1 0

Jacek Caban : urlmon: Added GetRootSecurityId and BeginningTransaction implementation.
by Alexandre Julliard May 25, 2006

May 25, 2006

Module: wine Branch: refs/heads/master Commit: 225333d79bf982b281fb6dc689ac6730ff62a54e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=225333d79bf982b281fb6dc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 25 18:32:54 2006 +0200 urlmon: Added GetRootSecurityId and BeginningTransaction implementation. --- dlls/urlmon/binding.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index efbd12f..f88d1c3 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -113,9 +113,11 @@ static ULONG WINAPI HttpNegotiate_Releas static HRESULT WINAPI HttpNegotiate_BeginningTransaction(IHttpNegotiate2 *iface, LPCWSTR szURL, LPCWSTR szHeaders, DWORD dwReserved, LPWSTR *pszAdditionalHeaders) { - FIXME("(%s %s %ld %p)\n", debugstr_w(szURL), debugstr_w(szHeaders), dwReserved, + TRACE("(%s %s %ld %p)\n", debugstr_w(szURL), debugstr_w(szHeaders), dwReserved, pszAdditionalHeaders); - return E_NOTIMPL; + + *pszAdditionalHeaders = NULL; + return S_OK; } static HRESULT WINAPI HttpNegotiate_OnResponse(IHttpNegotiate2 *iface, DWORD dwResponseCode, @@ -130,8 +132,10 @@ static HRESULT WINAPI HttpNegotiate_OnRe static HRESULT WINAPI HttpNegotiate_GetRootSecurityId(IHttpNegotiate2 *iface, BYTE *pbSecurityId, DWORD *pcbSecurityId, DWORD_PTR dwReserved) { - FIXME("(%p %p %ld)\n", pbSecurityId, pcbSecurityId, dwReserved); - return E_NOTIMPL; + TRACE("(%p %p %ld)\n", pbSecurityId, pcbSecurityId, dwReserved); + + /* That's all we have to do here */ + return E_FAIL; } static const IHttpNegotiate2Vtbl HttpNegotiate2Vtbl = {

1 0

Juan Lang : crypt32: Add support for CRLs.
by Alexandre Julliard May 25, 2006

May 25, 2006

Module: wine Branch: refs/heads/master Commit: c4f2bcf3d1e1b96eb04efe6d87595897596c18fc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c4f2bcf3d1e1b96eb04efe6… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Thu May 25 09:01:03 2006 -0700 crypt32: Add support for CRLs. --- dlls/crypt32/Makefile.in | 1 dlls/crypt32/crl.c | 445 ++++++++++++++++++++++++++++++++++++ dlls/crypt32/crypt32.spec | 3 dlls/crypt32/store.c | 537 +++++++++++++++++++++++++++++++++++--------- dlls/crypt32/tests/store.c | 311 +++++++++++++++++++++++++ include/wincrypt.h | 16 + 6 files changed, 1208 insertions(+), 105 deletions(-) create mode 100644 dlls/crypt32/crl.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=c4f2bcf3d1e1b96eb04…

1 0

Juan Lang : crypt32: Use public functions when finding certificates.
by Alexandre Julliard May 25, 2006

May 25, 2006

Module: wine Branch: refs/heads/master Commit: 3be75cebe8f2d098cd0e0aebf3f15ee0570d561a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3be75cebe8f2d098cd0e0ae… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Thu May 25 08:51:37 2006 -0700 crypt32: Use public functions when finding certificates. --- dlls/crypt32/cert.c | 26 ++++++++++++-------------- 1 files changed, 12 insertions(+), 14 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 6dc9468..f529668 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -553,7 +553,12 @@ BOOL WINAPI CertCompareIntegerBlob(PCRYP cb1 = CRYPT_significantBytes(pInt1); cb2 = CRYPT_significantBytes(pInt2); if (cb1 == cb2) - ret = !memcmp(pInt1->pbData, pInt1->pbData, cb1); + { + if (cb1) + ret = !memcmp(pInt1->pbData, pInt1->pbData, cb1); + else + ret = TRUE; + } else ret = FALSE; return ret; @@ -634,32 +639,25 @@ static BOOL compare_cert_by_sha1_hash(PC static BOOL compare_cert_by_name(PCCERT_CONTEXT pCertContext, DWORD dwType, DWORD dwFlags, const void *pvPara) { - const CERT_NAME_BLOB *blob = (const CERT_NAME_BLOB *)pvPara, *toCompare; + CERT_NAME_BLOB *blob = (CERT_NAME_BLOB *)pvPara, *toCompare; BOOL ret; if (dwType & CERT_INFO_SUBJECT_FLAG) toCompare = &pCertContext->pCertInfo->Subject; else toCompare = &pCertContext->pCertInfo->Issuer; - if (toCompare->cbData == blob->cbData) - ret = !memcmp(toCompare->pbData, blob->pbData, blob->cbData); - else - ret = FALSE; + ret = CertCompareCertificateName(pCertContext->dwCertEncodingType, + toCompare, blob); return ret; } static BOOL compare_cert_by_subject_cert(PCCERT_CONTEXT pCertContext, DWORD dwType, DWORD dwFlags, const void *pvPara) { - const CERT_INFO *pCertInfo = (const CERT_INFO *)pvPara; - BOOL ret; + CERT_INFO *pCertInfo = (CERT_INFO *)pvPara; - if (pCertInfo->Issuer.cbData == pCertContext->pCertInfo->Subject.cbData) - ret = !memcmp(pCertInfo->Issuer.pbData, - pCertContext->pCertInfo->Subject.pbData, pCertInfo->Issuer.cbData); - else - ret = FALSE; - return ret; + return CertCompareCertificateName(pCertContext->dwCertEncodingType, + &pCertInfo->Issuer, &pCertContext->pCertInfo->Subject); } static BOOL compare_cert_by_issuer(PCCERT_CONTEXT pCertContext,

1 0

Phil Costin : wined3d: Shader caps fix - code relocation.
by Alexandre Julliard May 25, 2006

May 25, 2006

Module: wine Branch: refs/heads/master Commit: 163ee765920d80cbb32e31f1ade976b5c45c5722 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=163ee765920d80cbb32e31f… Author: Phil Costin <philcostin(a)hotmail.com> Date: Thu May 25 13:31:14 2006 +0100 wined3d: Shader caps fix - code relocation. --- dlls/wined3d/directx.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c27e75c..0bb5589 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1696,6 +1696,16 @@ #endif *pCaps->MaxStreams = MAX_STREAMS; *pCaps->MaxStreamStride = 1024; + /* Determine shader mode to use based on GL caps */ + if (GL_SUPPORT(ARB_SHADING_LANGUAGE_100) && wined3d_settings.glslRequested + && (wined3d_settings.vs_mode == VS_HW || wined3d_settings.ps_mode == PS_HW)) + wined3d_settings.shader_mode = SHADER_GLSL; + else if ((GL_SUPPORT(ARB_VERTEX_PROGRAM) && wined3d_settings.vs_mode == VS_HW) || + (GL_SUPPORT(ARB_FRAGMENT_PROGRAM) && wined3d_settings.ps_mode == PS_HW)) + wined3d_settings.shader_mode = SHADER_ARB; + else + wined3d_settings.shader_mode = SHADER_SW; + if (wined3d_settings.vs_mode == VS_HW && wined3d_settings.shader_mode == SHADER_GLSL && DeviceType != WINED3DDEVTYPE_REF) { *pCaps->VertexShaderVersion = D3DVS_VERSION(3,0); @@ -1846,16 +1856,6 @@ HRESULT WINAPI IWineD3DImpl_CreateDevi IWineD3DImpl_FillGLCaps(&This->gl_info, IWineD3DImpl_GetAdapterDisplay(iface, Adapter)); LEAVE_GL(); - /* Determine shader mode to use based on GL caps */ - if (GL_SUPPORT(ARB_SHADING_LANGUAGE_100) && wined3d_settings.glslRequested - && (wined3d_settings.vs_mode == VS_HW || wined3d_settings.ps_mode == PS_HW)) - wined3d_settings.shader_mode = SHADER_GLSL; - else if ((GL_SUPPORT(ARB_VERTEX_PROGRAM) && wined3d_settings.vs_mode == VS_HW) || - (GL_SUPPORT(ARB_FRAGMENT_PROGRAM) && wined3d_settings.ps_mode == PS_HW)) - wined3d_settings.shader_mode = SHADER_ARB; - else - wined3d_settings.shader_mode = SHADER_SW; - /* set the state of the device to valid */ object->state = WINED3D_OK;

1 0

Roderick Colenbrander : wined3d: Dynamicly load GL_ARB_multitexture functions.
by Alexandre Julliard May 25, 2006

May 25, 2006

Module: wine Branch: refs/heads/master Commit: 54e5f9c4653211c7f2c25c8aad90af938dc6361e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=54e5f9c4653211c7f2c25c8… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Thu May 25 13:54:03 2006 +0200 wined3d: Dynamicly load GL_ARB_multitexture functions. --- dlls/wined3d/device.c | 6 +++-- dlls/wined3d/drawprim.c | 31 ++++++++++++------------ dlls/wined3d/stateblock.c | 3 ++ dlls/wined3d/surface.c | 7 +++++ dlls/wined3d/wined3d_private.h | 33 +------------------------ include/wine/wined3d_gl.h | 52 ++++++++++++++++++++++++++++++++++++++++ 6 files changed, 81 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=54e5f9c4653211c7f2c…

1 0

Stefan Dösinger : wined3d: Small rhw vertex fix.
by Alexandre Julliard May 25, 2006

May 25, 2006

Module: wine Branch: refs/heads/master Commit: 5b8b776431d34ffc18ac02123bb58bd31fc54f9a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5b8b776431d34ffc18ac021… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu May 25 11:40:36 2006 +0200 wined3d: Small rhw vertex fix. Fix the one pixel displacement and move the glOrtho code in a common function. --- dlls/wined3d/drawprim.c | 86 ++++++++++++++++++++-------------------- dlls/wined3d/surface.c | 71 +-------------------------------- dlls/wined3d/wined3d_private.h | 3 - 3 files changed, 47 insertions(+), 113 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index b78e3d6..6e703eb 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -180,6 +180,49 @@ static GLfloat invymat[16] = { 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f}; +void d3ddevice_set_ortho(IWineD3DDeviceImpl *This) { + /* If the last draw was transformed as well, no need to reapply all the matrixes */ + if ( (!This->last_was_rhw) || (This->viewport_changed) ) { + + double X, Y, height, width, minZ, maxZ; + This->last_was_rhw = TRUE; + This->viewport_changed = FALSE; + + /* Transformed already into viewport coordinates, so we do not need transform + matrices. Reset all matrices to identity and leave the default matrix in world + mode. */ + glMatrixMode(GL_MODELVIEW); + checkGLcall("glMatrixMode(GL_MODELVIEW)"); + glLoadIdentity(); + checkGLcall("glLoadIdentity"); + + glMatrixMode(GL_PROJECTION); + checkGLcall("glMatrixMode(GL_PROJECTION)"); + glLoadIdentity(); + checkGLcall("glLoadIdentity"); + + /* Set up the viewport to be full viewport */ + X = This->stateBlock->viewport.X; + Y = This->stateBlock->viewport.Y; + height = This->stateBlock->viewport.Height; + width = This->stateBlock->viewport.Width; + minZ = This->stateBlock->viewport.MinZ; + maxZ = This->stateBlock->viewport.MaxZ; + TRACE("Calling glOrtho with %f, %f, %f, %f\n", width, height, -minZ, -maxZ); + glOrtho(X, X + width, Y + height, Y, -minZ, -maxZ); + checkGLcall("glOrtho"); + + /* Window Coord 0 is the middle of the first pixel, so translate by half + a pixel (See comment above glTranslate below) */ + glTranslatef(0.375, 0.375, 0); + checkGLcall("glTranslatef(0.375, 0.375, 0)"); + if (This->renderUpsideDown) { + glMultMatrixf(invymat); + checkGLcall("glMultMatrixf(invymat)"); + } + } + +} /* Setup views - Transformed & lit if RHW, else untransformed. Only unlit if Normals are supplied Returns: Whether to restore lighting afterwards */ @@ -198,48 +241,7 @@ static BOOL primitiveInitState(IWineD3DD } if (!useVS && vtx_transformed) { - - /* If the last draw was transformed as well, no need to reapply all the matrixes */ - if ( (!This->last_was_rhw) || (This->viewport_changed) ) { - - double X, Y, height, width, minZ, maxZ; - This->last_was_rhw = TRUE; - This->viewport_changed = FALSE; - - /* Transformed already into viewport coordinates, so we do not need transform - matrices. Reset all matrices to identity and leave the default matrix in world - mode. */ - glMatrixMode(GL_MODELVIEW); - checkGLcall("glMatrixMode(GL_MODELVIEW)"); - glLoadIdentity(); - checkGLcall("glLoadIdentity"); - - glMatrixMode(GL_PROJECTION); - checkGLcall("glMatrixMode(GL_PROJECTION)"); - glLoadIdentity(); - checkGLcall("glLoadIdentity"); - - /* Set up the viewport to be full viewport */ - X = This->stateBlock->viewport.X; - Y = This->stateBlock->viewport.Y; - height = This->stateBlock->viewport.Height; - width = This->stateBlock->viewport.Width; - minZ = This->stateBlock->viewport.MinZ; - maxZ = This->stateBlock->viewport.MaxZ; - TRACE("Calling glOrtho with %f, %f, %f, %f\n", width, height, -minZ, -maxZ); - glOrtho(X, X + width, Y + height, Y, -minZ, -maxZ); - checkGLcall("glOrtho"); - - /* Window Coord 0 is the middle of the first pixel, so translate by half - a pixel (See comment above glTranslate below) */ - glTranslatef(0.5, 0.5, 0); - checkGLcall("glTranslatef(0.5, 0.5, 0)"); - if (This->renderUpsideDown) { - glMultMatrixf(invymat); - checkGLcall("glMultMatrixf(invymat)"); - } - } - + d3ddevice_set_ortho(This); } else { /* Untransformed, so relies on the view and projection matrices */ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 301f7df..7932667 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -780,41 +780,7 @@ HRESULT WINAPI IWineD3DSurfaceImpl_Unloc /* glDrawPixels transforms the raster position as though it was a vertex - we want to draw at screen position 0,0 - Set up ortho (rhw) mode as per drawprim (and leave set - it will sort itself out due to last_was_rhw */ - if ( (!myDevice->last_was_rhw) || (myDevice->viewport_changed) ) { - - double X, Y, height, width, minZ, maxZ; - myDevice->last_was_rhw = TRUE; - myDevice->viewport_changed = FALSE; - - /* Transformed already into viewport coordinates, so we do not need transform - matrices. Reset all matrices to identity and leave the default matrix in world - mode. */ - glMatrixMode(GL_MODELVIEW); - checkGLcall("glMatrixMode"); - glLoadIdentity(); - checkGLcall("glLoadIdentity"); - - glMatrixMode(GL_PROJECTION); - checkGLcall("glMatrixMode"); - glLoadIdentity(); - checkGLcall("glLoadIdentity"); - - /* Set up the viewport to be full viewport */ - X = myDevice->stateBlock->viewport.X; - Y = myDevice->stateBlock->viewport.Y; - height = myDevice->stateBlock->viewport.Height; - width = myDevice->stateBlock->viewport.Width; - minZ = myDevice->stateBlock->viewport.MinZ; - maxZ = myDevice->stateBlock->viewport.MaxZ; - TRACE("Calling glOrtho with %f, %f, %f, %f\n", width, height, -minZ, -maxZ); - glOrtho(X, X + width, Y + height, Y, -minZ, -maxZ); - checkGLcall("glOrtho"); - - /* Window Coord 0 is the middle of the first pixel, so translate by half - a pixel (See comment above glTranslate below) */ - glTranslatef(0.5, 0.5, 0); - checkGLcall("glTranslatef(0.5, 0.5, 0)"); - } + d3ddevice_set_ortho(This->resource.wineD3DDevice); if (iface == implSwapChain->backBuffer || iface == myDevice->renderTarget) { glDrawBuffer(GL_BACK); @@ -2192,40 +2158,7 @@ HRESULT WINAPI IWineD3DSurfaceImpl_BltOv /* Draw a textured quad */ - if ( TRUE ) { - double X, Y, height, width, minZ, maxZ; - myDevice->last_was_rhw = FALSE; - myDevice->viewport_changed = FALSE; - - /* Transformed already into viewport coordinates, so we do not need transform - matrices. Reset all matrices to identity and leave the default matrix in world - mode. */ - glMatrixMode(GL_MODELVIEW); - checkGLcall("glMatrixMode"); - glLoadIdentity(); - checkGLcall("glLoadIdentity"); - - glMatrixMode(GL_PROJECTION); - checkGLcall("glMatrixMode"); - glLoadIdentity(); - checkGLcall("glLoadIdentity"); - - /* Set up the viewport to be full viewport */ - X = myDevice->stateBlock->viewport.X; - Y = myDevice->stateBlock->viewport.Y; - height = myDevice->stateBlock->viewport.Height; - width = myDevice->stateBlock->viewport.Width; - minZ = myDevice->stateBlock->viewport.MinZ; - maxZ = myDevice->stateBlock->viewport.MaxZ; - TRACE("Calling glOrtho with %f, %f, %f, %f\n", width, height, -minZ, -maxZ); - glOrtho(X, X + width, Y + height, Y, -minZ, -maxZ); - checkGLcall("glOrtho"); - - /* Window Coord 0 is the middle of the first pixel, so translate by half - a pixel (See comment above glTranslate below) */ - glTranslatef(0.375, 0.375, 0); - checkGLcall("glTranslatef(0.375, 0.375, 0)"); - } + d3ddevice_set_ortho(This->resource.wineD3DDevice); glBegin(GL_QUADS); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a0a4414..7e53955 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -597,8 +597,7 @@ typedef struct PrivateData DWORD size; } PrivateData; -/* OpenGL ortho matrix setup */ -void d3ddevice_set_ortho(IWineD3DDeviceImpl *This, BOOL dontclip); +void d3ddevice_set_ortho(IWineD3DDeviceImpl *This); /***************************************************************************** * IWineD3DResource implementation structure

1 0

Alexandre Julliard : configure: Regenerated with autoconf 2.59d.
by Alexandre Julliard May 25, 2006

May 25, 2006

Module: wine Branch: refs/heads/master Commit: fc6ffb29e46216c9b7bce6ecd9f57615d638f4fd URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fc6ffb29e46216c9b7bce6e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 25 20:08:12 2006 +0200 configure: Regenerated with autoconf 2.59d. --- configure | 8735 ++++++++++++++++++++++++++++++++++--------------------------- 1 files changed, 4807 insertions(+), 3928 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=fc6ffb29e46216c9b7b…

1 0