February 2011 - Wine-Commits

Jacek Caban : urlmon: Get rid of no longer needed buffering in stgmed_buf_t .
by Alexandre Julliard Feb. 15, 2011

Feb. 15, 2011

Module: wine Branch: master Commit: a124d74c7be762fc94d222f6d55c713b8915ceb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a124d74c7be762fc94d222f6d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 15 17:02:29 2011 +0100 urlmon: Get rid of no longer needed buffering in stgmed_buf_t. --- dlls/urlmon/binding.c | 61 ++++++------------------------------------------ 1 files changed, 8 insertions(+), 53 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index 67848b8..0d6043c 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -34,8 +34,6 @@ typedef struct { IInternetProtocolEx *protocol; - BYTE buf[1024*8]; - DWORD size; HANDLE file; HRESULT hres; @@ -103,28 +101,12 @@ typedef struct { CRITICAL_SECTION section; } Binding; -static void fill_stgmed_buffer(stgmed_buf_t *buf) -{ - DWORD read = 0; - - if(sizeof(buf->buf) == buf->size) - return; - - buf->hres = IInternetProtocol_Read(buf->protocol, buf->buf+buf->size, - sizeof(buf->buf)-buf->size, &read); - buf->size += read; -} - static void read_protocol_data(stgmed_buf_t *stgmed_buf) { BYTE buf[8192]; DWORD read; HRESULT hres; - fill_stgmed_buffer(stgmed_buf); - if(stgmed_buf->size < sizeof(stgmed_buf->buf)) - return; - do hres = IInternetProtocol_Read(stgmed_buf->protocol, buf, sizeof(buf), &read); while(hres == S_OK); } @@ -412,7 +394,6 @@ static stgmed_buf_t *create_stgmed_buf(IInternetProtocolEx *protocol) ret->IUnknown_iface.lpVtbl = &StgMedUnkVtbl; ret->ref = 1; - ret->size = 0; ret->file = INVALID_HANDLE_VALUE; ret->hres = S_OK; ret->cache_file = NULL; @@ -497,49 +478,26 @@ static HRESULT WINAPI ProtocolStream_Read(IStream *iface, void *pv, ULONG cb, ULONG *pcbRead) { ProtocolStream *This = impl_from_IStream(iface); - DWORD read = 0, pread = 0; + DWORD read = 0; HRESULT hres; TRACE("(%p)->(%p %d %p)\n", This, pv, cb, pcbRead); - if(This->buf->file != INVALID_HANDLE_VALUE) { - if (!ReadFile(This->buf->file, pv, cb, &read, NULL)) - return INET_E_DOWNLOAD_FAILURE; - - if(pcbRead) - *pcbRead = read; - return read ? S_OK : S_FALSE; - } - - if(This->buf->size) { - read = cb; - - if(read > This->buf->size) - read = This->buf->size; - - memcpy(pv, This->buf->buf, read); - - if(read < This->buf->size) - memmove(This->buf->buf, This->buf->buf+read, This->buf->size-read); - This->buf->size -= read; - } - - if(read == cb) { - if (pcbRead) - *pcbRead = read; - return S_OK; + if(This->buf->file == INVALID_HANDLE_VALUE) { + hres = This->buf->hres = IInternetProtocol_Read(This->buf->protocol, (PBYTE)pv, cb, &read); + }else { + hres = ReadFile(This->buf->file, pv, cb, &read, NULL) ? S_OK : INET_E_DOWNLOAD_FAILURE; } - hres = This->buf->hres = IInternetProtocol_Read(This->buf->protocol, (PBYTE)pv+read, cb-read, &pread); if (pcbRead) - *pcbRead = read + pread; + *pcbRead = read; if(hres == E_PENDING) return E_PENDING; else if(FAILED(hres)) FIXME("Read failed: %08x\n", hres); - return read || pread ? S_OK : S_FALSE; + return read ? S_OK : S_FALSE; } static HRESULT WINAPI ProtocolStream_Write(IStream *iface, const void *pv, @@ -685,7 +643,7 @@ static HRESULT stgmed_stream_get_result(stgmed_obj_t *obj, DWORD bindf, void **r ProtocolStream *stream = (ProtocolStream*)obj; if(!(bindf & BINDF_ASYNCHRONOUS) && stream->buf->file == INVALID_HANDLE_VALUE - && (stream->buf->hres != S_FALSE || stream->buf->size)) + && stream->buf->hres != S_FALSE) return INET_E_DATA_NOT_AVAILABLE; IStream_AddRef(&stream->IStream_iface); @@ -1028,7 +986,6 @@ static HRESULT WINAPI InternetProtocolSink_ReportProgress(IInternetProtocolSink on_progress(This, 0, 0, BINDSTATUS_REDIRECTING, szStatusText); break; case BINDSTATUS_BEGINDOWNLOADDATA: - fill_stgmed_buffer(This->stgmed_buf); break; case BINDSTATUS_SENDINGREQUEST: on_progress(This, 0, 0, BINDSTATUS_SENDINGREQUEST, szStatusText); @@ -1078,8 +1035,6 @@ static void report_data(Binding *This, DWORD bscf, ULONG progress, ULONG progres if(This->stgmed_buf->file != INVALID_HANDLE_VALUE) read_protocol_data(This->stgmed_buf); - else if(This->download_state == BEFORE_DOWNLOAD) - fill_stgmed_buffer(This->stgmed_buf); if(This->download_state == BEFORE_DOWNLOAD) { This->download_state = DOWNLOADING;

1 0

Jacek Caban : urlmon: Properly handle BINDSTATUS_BEGINDOWNLOADDATA.
by Alexandre Julliard Feb. 15, 2011

Feb. 15, 2011

Module: wine Branch: master Commit: 8bee20d85f0ac1d33f0a53c8960b878bf7073155 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bee20d85f0ac1d33f0a53c89… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 15 17:02:02 2011 +0100 urlmon: Properly handle BINDSTATUS_BEGINDOWNLOADDATA. --- dlls/urlmon/bindprot.c | 10 +++++++++- dlls/urlmon/tests/protocol.c | 32 ++++++++++++++++++++++++-------- dlls/urlmon/urlmon_main.h | 4 ++++ 3 files changed, 37 insertions(+), 9 deletions(-) diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index 095194e..01a1b90 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -962,7 +962,6 @@ static void report_progress(BindProtocol *This, ULONG status_code, LPCWSTR statu case BINDSTATUS_FINDINGRESOURCE: case BINDSTATUS_CONNECTING: case BINDSTATUS_REDIRECTING: - case BINDSTATUS_BEGINDOWNLOADDATA: case BINDSTATUS_SENDINGREQUEST: case BINDSTATUS_CACHEFILENAMEAVAILABLE: case BINDSTATUS_DIRECTBIND: @@ -971,6 +970,11 @@ static void report_progress(BindProtocol *This, ULONG status_code, LPCWSTR statu IInternetProtocolSink_ReportProgress(This->protocol_sink, status_code, status_text); break; + case BINDSTATUS_BEGINDOWNLOADDATA: + if(This->protocol_sink) + IInternetProtocolSink_ReportData(This->protocol_sink, This->bscf, This->progress, This->progress_max); + break; + case BINDSTATUS_MIMETYPEAVAILABLE: mime_available(This, status_text, FALSE); break; @@ -1026,6 +1030,10 @@ static HRESULT WINAPI BPInternetProtocolSink_ReportProgress(IInternetProtocolSin static HRESULT report_data(BindProtocol *This, DWORD bscf, ULONG progress, ULONG progress_max) { + This->bscf = bscf; + This->progress = progress; + This->progress_max = progress_max; + if(!This->protocol_sink) return S_OK; diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index dcfe20c..cacad26 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -1,5 +1,5 @@ /* - * Copyright 2005-2009 Jacek Caban for CodeWeavers + * Copyright 2005-2011 Jacek Caban for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -166,6 +166,7 @@ static enum { HTTPS_TEST, FTP_TEST, MK_TEST, + ITS_TEST, BIND_TEST } tested_protocol; @@ -175,6 +176,7 @@ static const WCHAR protocol_names[][10] = { {'h','t','t','p','s',0}, {'f','t','p',0}, {'m','k',0}, + {'i','t','s',0}, {'t','e','s','t',0} }; @@ -188,6 +190,7 @@ static const WCHAR binding_urls[][130] = { '/','p','u','b','/','o','t','h','e','r', '/','w','i','n','e','l','o','g','o','.','x','c','f','.','t','a','r','.','b','z','2',0}, {'m','k',':','t','e','s','t',0}, + {'i','t','s',':','t','e','s','t','.','c','h','m',':',':','/','b','l','a','n','k','.','h','t','m','l',0}, {'t','e','s','t',':','/','/','f','i','l','e','.','h','t','m','l',0} }; @@ -725,7 +728,7 @@ static HRESULT WINAPI ProtocolSink_ReportProgress(IInternetProtocolSink *iface, switch(ulStatusCode) { case BINDSTATUS_MIMETYPEAVAILABLE: CHECK_EXPECT(ReportProgress_MIMETYPEAVAILABLE); - if(tested_protocol != FILE_TEST && !mimefilter_test && (pi & PI_MIMEVERIFICATION)) { + if(tested_protocol != FILE_TEST && tested_protocol != ITS_TEST && !mimefilter_test && (pi & PI_MIMEVERIFICATION)) { if(!short_read || !direct_read) CHECK_CALLED(Read); /* set in Continue */ else if(short_read) @@ -779,7 +782,7 @@ static HRESULT WINAPI ProtocolSink_ReportProgress(IInternetProtocolSink *iface, break; case BINDSTATUS_SENDINGREQUEST: CHECK_EXPECT2(ReportProgress_SENDINGREQUEST); - if(tested_protocol == FILE_TEST) { + if(tested_protocol == FILE_TEST || tested_protocol == ITS_TEST) { ok(szStatusText != NULL, "szStatusText == NULL\n"); if(szStatusText) ok(!*szStatusText, "wrong szStatusText\n"); @@ -843,16 +846,19 @@ static HRESULT WINAPI ProtocolSink_ReportData(IInternetProtocolSink *iface, DWOR static int rec_depth; rec_depth++; - if(!mimefilter_test && tested_protocol == FILE_TEST) { + if(!mimefilter_test && (tested_protocol == FILE_TEST || tested_protocol == ITS_TEST)) { CHECK_EXPECT2(ReportData); ok(ulProgress == ulProgressMax, "ulProgress (%d) != ulProgressMax (%d)\n", ulProgress, ulProgressMax); ok(ulProgressMax == 13, "ulProgressMax=%d, expected 13\n", ulProgressMax); /* BSCF_SKIPDRAINDATAFORFILEURLS added in IE8 */ - ok((grfBSCF == (BSCF_FIRSTDATANOTIFICATION | BSCF_LASTDATANOTIFICATION)) || - (grfBSCF == (BSCF_FIRSTDATANOTIFICATION | BSCF_LASTDATANOTIFICATION | BSCF_SKIPDRAINDATAFORFILEURLS)), - "grcfBSCF = %08x\n", grfBSCF); + if(tested_protocol == FILE_TEST) + ok((grfBSCF == (BSCF_FIRSTDATANOTIFICATION | BSCF_LASTDATANOTIFICATION)) || + (grfBSCF == (BSCF_FIRSTDATANOTIFICATION | BSCF_LASTDATANOTIFICATION | BSCF_SKIPDRAINDATAFORFILEURLS)), + "grcfBSCF = %08x\n", grfBSCF); + else + ok(grfBSCF == (BSCF_FIRSTDATANOTIFICATION | BSCF_DATAFULLYAVAILABLE), "grcfBSCF = %08x\n", grfBSCF); }else if(direct_read) { BYTE buf[14096]; ULONG read; @@ -1634,13 +1640,21 @@ static void protocol_start(IInternetProtocolSink *pOIProtSink, IInternetBindInfo else SET_EXPECT(ReportData); hres = IInternetProtocolSink_ReportData(pOIProtSink, - BSCF_FIRSTDATANOTIFICATION | BSCF_LASTDATANOTIFICATION, 13, 13); + BSCF_FIRSTDATANOTIFICATION | (tested_protocol == ITS_TEST ? BSCF_DATAFULLYAVAILABLE : BSCF_LASTDATANOTIFICATION), + 13, 13); ok(hres == S_OK, "ReportData failed: %08x\n", hres); if(mimefilter_test) CHECK_CALLED(MimeFilter_ReportData); else CHECK_CALLED(ReportData); + if(tested_protocol == ITS_TEST) { + SET_EXPECT(ReportData); + hres = IInternetProtocolSink_ReportProgress(pOIProtSink, BINDSTATUS_BEGINDOWNLOADDATA, NULL); + ok(hres == S_OK, "ReportProgress(BINDSTATUS_BEGINDOWNLOADDATA) failed: %08x\n", hres); + CHECK_CALLED(ReportData); + } + if(tested_protocol == BIND_TEST) { hres = IInternetProtocol_Terminate(binding_protocol, 0); ok(hres == E_FAIL, "Termiante failed: %08x\n", hres); @@ -3503,6 +3517,8 @@ START_TEST(protocol) test_binding(FILE_TEST, PI_MIMEVERIFICATION, TEST_EMULATEPROT); trace("Testing http binding (mime verification, emulate prot)...\n"); test_binding(HTTP_TEST, PI_MIMEVERIFICATION, TEST_EMULATEPROT); + trace("Testing its binding (mime verification, emulate prot)...\n"); + test_binding(ITS_TEST, PI_MIMEVERIFICATION, TEST_EMULATEPROT); trace("Testing http binding (mime verification, emulate prot, short read, direct read)...\n"); test_binding(HTTP_TEST, PI_MIMEVERIFICATION, TEST_EMULATEPROT|TEST_SHORT_READ|TEST_DIRECT_READ); trace("Testing file binding (mime verification, emulate prot, mime filter)...\n"); diff --git a/dlls/urlmon/urlmon_main.h b/dlls/urlmon/urlmon_main.h index 8edb708..83b887e 100644 --- a/dlls/urlmon/urlmon_main.h +++ b/dlls/urlmon/urlmon_main.h @@ -191,6 +191,10 @@ typedef struct { BOOL from_urlmon; DWORD pi; + DWORD bscf; + ULONG progress; + ULONG progress_max; + DWORD apartment_thread; HWND notif_hwnd; DWORD continue_call;

1 0

Jacek Caban : mshtml: Fixed a leak (valgrind).
by Alexandre Julliard Feb. 15, 2011

Feb. 15, 2011

Module: wine Branch: master Commit: 8b861189e987ec511bb58c4213ebb23e23b54073 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b861189e987ec511bb58c421… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 15 17:33:27 2011 +0100 mshtml: Fixed a leak (valgrind). --- dlls/mshtml/protocol.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/protocol.c b/dlls/mshtml/protocol.c index 58f4dee..dad93ba 100644 --- a/dlls/mshtml/protocol.c +++ b/dlls/mshtml/protocol.c @@ -217,6 +217,8 @@ static HRESULT WINAPI AboutProtocol_Start(IInternetProtocol *iface, LPCWSTR szUr BINDINFO bindinfo; DWORD grfBINDF = 0; LPCWSTR text = NULL; + DWORD data_len; + BYTE *data; static const WCHAR html_begin[] = {0xfeff,'<','H','T','M','L','>',0}; static const WCHAR html_end[] = {'<','/','H','T','M','L','>',0}; @@ -247,9 +249,15 @@ static HRESULT WINAPI AboutProtocol_Start(IInternetProtocol *iface, LPCWSTR szUr text = NULL; } - This->data_len = sizeof(html_begin)+sizeof(html_end)-sizeof(WCHAR) + data_len = sizeof(html_begin)+sizeof(html_end)-sizeof(WCHAR) + (text ? strlenW(text)*sizeof(WCHAR) : 0); - This->data = heap_alloc(This->data_len); + data = heap_alloc(data_len); + if(!data) + return E_OUTOFMEMORY; + + heap_free(This->data); + This->data = data; + This->data_len = data_len; memcpy(This->data, html_begin, sizeof(html_begin)); if(text)

1 0

Jacek Caban : urlmon: Read remaining protocol data if report_data was called after binding finished .
by Alexandre Julliard Feb. 15, 2011

Feb. 15, 2011

Module: wine Branch: master Commit: 4499b4516ecf02475930eb6c20b678c79df03e65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4499b4516ecf02475930eb6c2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 15 17:01:44 2011 +0100 urlmon: Read remaining protocol data if report_data was called after binding finished. --- dlls/urlmon/binding.c | 7 ++++++- dlls/urlmon/tests/url.c | 5 +++++ 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index d617052..67848b8 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -1068,7 +1068,12 @@ static void report_data(Binding *This, DWORD bscf, ULONG progress, ULONG progres TRACE("(%p)->(%d %u %u)\n", This, bscf, progress, progress_max); - if(This->download_state == END_DOWNLOAD || (This->state & (BINDING_STOPPED|BINDING_ABORTED))) + if(This->download_state == END_DOWNLOAD || (This->state & BINDING_ABORTED)) { + read_protocol_data(This->stgmed_buf); + return; + } + + if(This->state & BINDING_STOPPED) return; if(This->stgmed_buf->file != INVALID_HANDLE_VALUE) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 21d5fd6..4469949 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -858,6 +858,11 @@ static HRESULT WINAPI Protocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, hres = IInternetProtocolSink_ReportProgress(pOIProtSink, BINDSTATUS_BEGINDOWNLOADDATA, NULL); ok(hres == S_OK, "ReportProgress(BINDSTATUS_BEGINDOWNLOADDATA) failed: %08x\n", hres); CHECK_CALLED(Read); + }else if(!bind_to_object && test_protocol == ABOUT_TEST) { + SET_EXPECT(Read); + hres = IInternetProtocolSink_ReportData(pOIProtSink, bscf, 13, 13); + ok(hres == S_OK, "ReportData failed: %08x\n", hres); + CHECK_CALLED(Read); } SET_EXPECT(Terminate);

1 0

Matteo Bruni : wined3d: Make clip planes independent from offscreen/ onscreen drawing.
by Alexandre Julliard Feb. 15, 2011

Feb. 15, 2011

Module: wine Branch: master Commit: 75386a99b4116745d6d07445c572013a4bb12af5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75386a99b4116745d6d07445c… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Feb 1 02:42:22 2011 +0100 wined3d: Make clip planes independent from offscreen/onscreen drawing. --- dlls/wined3d/arb_program_shader.c | 46 +++++++++++++++++++----------------- dlls/wined3d/glsl_shader.c | 14 +++++------ dlls/wined3d/state.c | 13 ++-------- 3 files changed, 33 insertions(+), 40 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 4efca9f..8770e05 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -3111,35 +3111,24 @@ static void vshader_add_footer(struct shader_arb_ctx_priv *priv_ctx, * the fog frag coord is thrown away. If the fog frag coord is used, but not written by * the shader, it is set to 0.0(fully fogged, since start = 1.0, end = 0.0) */ - if(args->super.fog_src == VS_FOG_Z) { + if (args->super.fog_src == VS_FOG_Z) shader_addline(buffer, "MOV result.fogcoord, TMP_OUT.z;\n"); - } else if (!reg_maps->fog) { - /* posFixup.x is always 1.0, so we can savely use it */ + else if (!reg_maps->fog) + /* posFixup.x is always 1.0, so we can safely use it */ shader_addline(buffer, "ADD result.fogcoord, posFixup.x, -posFixup.x;\n"); - } - - /* Write the final position. - * - * OpenGL coordinates specify the center of the pixel while d3d coords specify - * the corner. The offsets are stored in z and w in posFixup. posFixup.y contains - * 1.0 or -1.0 to turn the rendering upside down for offscreen rendering. PosFixup.x - * contains 1.0 to allow a mad, but arb vs swizzles are too restricted for that. - */ - shader_addline(buffer, "MUL TA, posFixup, TMP_OUT.w;\n"); - shader_addline(buffer, "ADD TMP_OUT.x, TMP_OUT.x, TA.z;\n"); - shader_addline(buffer, "MAD TMP_OUT.y, TMP_OUT.y, posFixup.y, TA.w;\n"); - if(use_nv_clip(gl_info) && priv_ctx->target_version >= NV2) + /* Clipplanes are always stored without y inversion */ + if (use_nv_clip(gl_info) && priv_ctx->target_version >= NV2) { - if(args->super.clip_enabled) + if (args->super.clip_enabled) { - for(i = 0; i < priv_ctx->vs_clipplanes; i++) + for (i = 0; i < priv_ctx->vs_clipplanes; i++) { shader_addline(buffer, "DP4 result.clip[%u].x, TMP_OUT, state.clip[%u].plane;\n", i, i); } } } - else if(args->clip.boolclip.clip_texcoord) + else if (args->clip.boolclip.clip_texcoord) { unsigned int cur_clip = 0; char component[4] = {'x', 'y', 'z', 'w'}; @@ -3147,13 +3136,13 @@ static void vshader_add_footer(struct shader_arb_ctx_priv *priv_ctx, for (i = 0; i < gl_info->limits.clipplanes; ++i) { - if(args->clip.boolclip.clipplane_mask & (1 << i)) + if (args->clip.boolclip.clipplane_mask & (1 << i)) { shader_addline(buffer, "DP4 TA.%c, TMP_OUT, state.clip[%u].plane;\n", component[cur_clip++], i); } } - switch(cur_clip) + switch (cur_clip) { case 0: shader_addline(buffer, "MOV TA, %s;\n", zero); @@ -3172,6 +3161,17 @@ static void vshader_add_footer(struct shader_arb_ctx_priv *priv_ctx, args->clip.boolclip.clip_texcoord - 1); } + /* Write the final position. + * + * OpenGL coordinates specify the center of the pixel while d3d coords specify + * the corner. The offsets are stored in z and w in posFixup. posFixup.y contains + * 1.0 or -1.0 to turn the rendering upside down for offscreen rendering. PosFixup.x + * contains 1.0 to allow a mad, but arb vs swizzles are too restricted for that. + */ + shader_addline(buffer, "MUL TA, posFixup, TMP_OUT.w;\n"); + shader_addline(buffer, "ADD TMP_OUT.x, TMP_OUT.x, TA.z;\n"); + shader_addline(buffer, "MAD TMP_OUT.y, TMP_OUT.y, posFixup.y, TA.w;\n"); + /* Z coord [0;1]->[-1;1] mapping, see comment in transform_projection in state.c * and the glsl equivalent */ @@ -3179,7 +3179,9 @@ static void vshader_add_footer(struct shader_arb_ctx_priv *priv_ctx, { const char *two = arb_get_helper_value(WINED3D_SHADER_TYPE_VERTEX, ARB_TWO); shader_addline(buffer, "MAD TMP_OUT.z, TMP_OUT.z, %s, -TMP_OUT.w;\n", two); - } else { + } + else + { shader_addline(buffer, "ADD TMP_OUT.z, TMP_OUT.z, TMP_OUT.z;\n"); shader_addline(buffer, "ADD TMP_OUT.z, TMP_OUT.z, -TMP_OUT.w;\n"); } diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e349e26..6d54871 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4079,9 +4079,7 @@ static GLuint shader_glsl_generate_vshader(const struct wined3d_context *context shader_addline(buffer, "#version 120\n"); if (gl_info->supported[EXT_GPU_SHADER4]) - { shader_addline(buffer, "#extension GL_EXT_gpu_shader4 : enable\n"); - } memset(&priv_ctx, 0, sizeof(priv_ctx)); priv_ctx.cur_vs_args = args; @@ -4100,11 +4098,14 @@ static GLuint shader_glsl_generate_vshader(const struct wined3d_context *context * the fog frag coord is thrown away. If the fog frag coord is used, but not written by * the shader, it is set to 0.0(fully fogged, since start = 1.0, end = 0.0) */ - if(args->fog_src == VS_FOG_Z) { + if (args->fog_src == VS_FOG_Z) shader_addline(buffer, "gl_FogFragCoord = gl_Position.z;\n"); - } else if (!reg_maps->fog) { + else if (!reg_maps->fog) shader_addline(buffer, "gl_FogFragCoord = 0.0;\n"); - } + + /* We always store the clipplanes without y inversion */ + if (args->clip_enabled) + shader_addline(buffer, "gl_ClipVertex = gl_Position;\n"); /* Write the final position. * @@ -4115,9 +4116,6 @@ static GLuint shader_glsl_generate_vshader(const struct wined3d_context *context */ shader_addline(buffer, "gl_Position.y = gl_Position.y * posFixup.y;\n"); shader_addline(buffer, "gl_Position.xy += posFixup.zw * gl_Position.ww;\n"); - if(args->clip_enabled) { - shader_addline(buffer, "gl_ClipVertex = gl_Position;\n"); - } /* Z coord [0;1]->[-1;1] mapping, see comment in transform_projection in state.c * diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 1c13413..2761ca4 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3798,24 +3798,17 @@ static void clipplane(DWORD state_id, struct wined3d_stateblock *stateblock, str return; } + glMatrixMode(GL_MODELVIEW); + glPushMatrix(); + /* Clip Plane settings are affected by the model view in OpenGL, the View transform in direct3d */ if (!use_vs(state)) - { - glMatrixMode(GL_MODELVIEW); - glPushMatrix(); glLoadMatrixf(&state->transforms[WINED3DTS_VIEW].u.m[0][0]); - } else - { /* with vertex shaders, clip planes are not transformed in direct3d, * in OpenGL they are still transformed by the model view. - * Use this to swap the y coordinate if necessary */ - glMatrixMode(GL_MODELVIEW); - glPushMatrix(); glLoadIdentity(); - if (context->render_offscreen) glScalef(1.0f, -1.0f, 1.0f); - } TRACE("Clipplane [%.8e, %.8e, %.8e, %.8e]\n", state->clip_planes[index][0],

1 0

Janne Hakonen : iphlpapi: Changed return value of NotifyAddrChange() stub and added test cases.
by Alexandre Julliard Feb. 15, 2011

Feb. 15, 2011

Module: wine Branch: master Commit: 82a2ec13f01b48e78d28d630914db311b55f4948 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82a2ec13f01b48e78d28d6309… Author: Janne Hakonen <joyer83(a)live.fi> Date: Tue Feb 8 20:43:59 2011 +0200 iphlpapi: Changed return value of NotifyAddrChange() stub and added test cases. --- dlls/iphlpapi/iphlpapi_main.c | 3 +- dlls/iphlpapi/tests/iphlpapi.c | 87 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 86 insertions(+), 4 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 2966640..87aa4ac 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -2032,7 +2032,8 @@ DWORD WINAPI IpRenewAddress(PIP_ADAPTER_INDEX_MAP AdapterInfo) DWORD WINAPI NotifyAddrChange(PHANDLE Handle, LPOVERLAPPED overlapped) { FIXME("(Handle %p, overlapped %p): stub\n", Handle, overlapped); - return ERROR_NOT_SUPPORTED; + if (Handle) *Handle = INVALID_HANDLE_VALUE; + return ERROR_IO_PENDING; } diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index a747423..3eedf30 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -64,6 +64,8 @@ typedef DWORD (WINAPI *GetTcpTableFunc)(PMIB_TCPTABLE,PDWORD,BOOL); typedef DWORD (WINAPI *GetUdpTableFunc)(PMIB_UDPTABLE,PDWORD,BOOL); typedef DWORD (WINAPI *GetPerAdapterInfoFunc)(ULONG,PIP_PER_ADAPTER_INFO,PULONG); typedef DWORD (WINAPI *GetAdaptersAddressesFunc)(ULONG,ULONG,PVOID,PIP_ADAPTER_ADDRESSES,PULONG); +typedef DWORD (WINAPI *NotifyAddrChangeFunc)(PHANDLE,LPOVERLAPPED); +typedef BOOL (WINAPI *CancelIPChangeNotifyFunc)(LPOVERLAPPED); static GetNumberOfInterfacesFunc gGetNumberOfInterfaces = NULL; static GetIpAddrTableFunc gGetIpAddrTable = NULL; @@ -83,6 +85,8 @@ static GetTcpTableFunc gGetTcpTable = NULL; static GetUdpTableFunc gGetUdpTable = NULL; static GetPerAdapterInfoFunc gGetPerAdapterInfo = NULL; static GetAdaptersAddressesFunc gGetAdaptersAddresses = NULL; +static NotifyAddrChangeFunc gNotifyAddrChange = NULL; +static CancelIPChangeNotifyFunc gCancelIPChangeNotify = NULL; static void loadIPHlpApi(void) { @@ -122,6 +126,10 @@ static void loadIPHlpApi(void) hLibrary, "GetUdpTable"); gGetPerAdapterInfo = (GetPerAdapterInfoFunc)GetProcAddress(hLibrary, "GetPerAdapterInfo"); gGetAdaptersAddresses = (GetAdaptersAddressesFunc)GetProcAddress(hLibrary, "GetAdaptersAddresses"); + gNotifyAddrChange = (NotifyAddrChangeFunc)GetProcAddress( + hLibrary, "NotifyAddrChange"); + gCancelIPChangeNotify = (CancelIPChangeNotifyFunc)GetProcAddress( + hLibrary, "CancelIPChangeNotify"); } } @@ -144,6 +152,8 @@ static void freeIPHlpApi(void) gGetUdpStatistics = NULL; gGetTcpTable = NULL; gGetUdpTable = NULL; + gNotifyAddrChange = NULL; + gCancelIPChangeNotify = NULL; FreeLibrary(hLibrary); hLibrary = NULL; } @@ -796,24 +806,95 @@ static void testGetPerAdapterInfo(void) HeapFree( GetProcessHeap(), 0, buffer ); } +static void testNotifyAddrChange(void) +{ + DWORD ret, bytes; + OVERLAPPED overlapped; + HANDLE handle; + BOOL success; + + if (!gNotifyAddrChange) + { + win_skip("NotifyAddrChange not present\n"); + return; + } + if (!gCancelIPChangeNotify) + { + win_skip("CancelIPChangeNotify not present\n"); + return; + } + + handle = NULL; + ZeroMemory(&overlapped, sizeof(overlapped)); + ret = gNotifyAddrChange(&handle, &overlapped); + if (ret == ERROR_NOT_SUPPORTED) + { + win_skip("NotifyAddrChange is not supported\n"); + return; + } + ok(ret == ERROR_IO_PENDING, "NotifyAddrChange returned %d, expected ERROR_IO_PENDING\n", ret); + ret = GetLastError(); + todo_wine ok(ret == ERROR_IO_PENDING, "GetLastError returned %d, excepted ERROR_IO_PENDING\n", ret); + success = gCancelIPChangeNotify(&overlapped); + todo_wine ok(success == TRUE, "CancelIPChangeNotify returned FALSE, expected TRUE\n"); + + ZeroMemory(&overlapped, sizeof(overlapped)); + success = gCancelIPChangeNotify(&overlapped); + ok(success == FALSE, "CancelIPChangeNotify returned TRUE, expected FALSE\n"); + + handle = NULL; + ZeroMemory(&overlapped, sizeof(overlapped)); + overlapped.hEvent = CreateEvent(NULL, FALSE, FALSE, NULL); + ret = gNotifyAddrChange(&handle, &overlapped); + ok(ret == ERROR_IO_PENDING, "NotifyAddrChange returned %d, expected ERROR_IO_PENDING\n", ret); + todo_wine ok(handle != INVALID_HANDLE_VALUE, "NotifyAddrChange returned invalid file handle\n"); + success = GetOverlappedResult(handle, &overlapped, &bytes, FALSE); + todo_wine ok(success == FALSE, "GetOverlappedResult returned TRUE, excepted FALSE\n"); + ret = GetLastError(); + todo_wine ok(ret == ERROR_IO_INCOMPLETE, "GetLastError returned %d, excepted ERROR_IO_INCOMPLETE\n", ret); + success = gCancelIPChangeNotify(&overlapped); + todo_wine ok(success == TRUE, "CancelIPChangeNotify returned FALSE, expected TRUE\n"); + + if (winetest_interactive) + { + handle = NULL; + ZeroMemory(&overlapped, sizeof(overlapped)); + overlapped.hEvent = CreateEvent(NULL, FALSE, FALSE, NULL); + trace("Testing asyncronous ipv4 address change notification. Please " + "change ipv4 address of one of your network interfaces\n"); + ret = gNotifyAddrChange(&handle, &overlapped); + ok(ret == ERROR_IO_PENDING, "NotifyAddrChange returned %d, expected NO_ERROR\n", ret); + success = GetOverlappedResult(handle, &overlapped, &bytes, TRUE); + ok(success == TRUE, "GetOverlappedResult returned FALSE, excepted TRUE\n"); + } + + /* test syncronous functionality */ + if (winetest_interactive) + { + trace("Testing syncronous ipv4 address change notification. Please " + "change ipv4 address of one of your network interfaces\n"); + ret = gNotifyAddrChange(NULL, NULL); + todo_wine ok(ret == NO_ERROR, "NotifyAddrChange returned %d, expected NO_ERROR\n", ret); + } +} + /* still-to-be-tested 2K-onward functions: AddIPAddress -CancelIPChangeNotify CreateProxyArpEntry DeleteIPAddress DeleteProxyArpEntry EnableRouter FlushIpNetTable GetAdapterIndex -NotifyAddrChange -NotifyRouteChange +NotifyRouteChange + CancelIPChangeNotify SendARP UnenableRouter */ static void testWin2KFunctions(void) { testGetPerAdapterInfo(); + testNotifyAddrChange(); } static void test_GetAdaptersAddresses(void)

1 0

Jacek Caban : urlmon: Get rid of init variable in stgmed_buf_t.
by Alexandre Julliard Feb. 15, 2011

Feb. 15, 2011

Module: wine Branch: master Commit: 0d01f2f4796ff2f1d78714748bf27e3c166c2a6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d01f2f4796ff2f1d78714748… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 15 17:01:14 2011 +0100 urlmon: Get rid of init variable in stgmed_buf_t. --- dlls/urlmon/binding.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index fa92a4d..d617052 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -36,7 +36,6 @@ typedef struct { BYTE buf[1024*8]; DWORD size; - BOOL init; HANDLE file; HRESULT hres; @@ -114,8 +113,6 @@ static void fill_stgmed_buffer(stgmed_buf_t *buf) buf->hres = IInternetProtocol_Read(buf->protocol, buf->buf+buf->size, sizeof(buf->buf)-buf->size, &read); buf->size += read; - if(read > 0) - buf->init = TRUE; } static void read_protocol_data(stgmed_buf_t *stgmed_buf) @@ -416,7 +413,6 @@ static stgmed_buf_t *create_stgmed_buf(IInternetProtocolEx *protocol) ret->IUnknown_iface.lpVtbl = &StgMedUnkVtbl; ret->ref = 1; ret->size = 0; - ret->init = FALSE; ret->file = INVALID_HANDLE_VALUE; ret->hres = S_OK; ret->cache_file = NULL; @@ -1591,7 +1587,7 @@ HRESULT bind_to_storage(IUri *uri, IBindCtx *pbc, REFIID riid, void **ppv) if(FAILED(hres)) return hres; - if(binding->hres == S_OK && binding->stgmed_buf->init) { + if(binding->hres == S_OK && binding->download_state != BEFORE_DOWNLOAD /* FIXME */) { if((binding->state & BINDING_STOPPED) && (binding->state & BINDING_LOCKED)) IInternetProtocolEx_UnlockRequest(&binding->protocol->IInternetProtocolEx_iface);

1 0

Detlef Riekenberg : shlwapi: Add stubs for SHWinHelpOnDemandA/W.
by Alexandre Julliard Feb. 15, 2011

Feb. 15, 2011

Module: wine Branch: master Commit: ebecd5a779888825723d4fae13b0e8322cb45a23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebecd5a779888825723d4fae1… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Feb 13 20:10:50 2011 +0100 shlwapi: Add stubs for SHWinHelpOnDemandA/W. --- dlls/shlwapi/ordinal.c | 22 ++++++++++++++++++++++ dlls/shlwapi/shlwapi.spec | 4 ++-- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index fbfed99..5b0626d 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -3845,6 +3845,28 @@ DWORD WINAPI SHGetMachineInfo(DWORD dwFlags) } /************************************************************************* + * @ [SHLWAPI.416] + * + */ +DWORD WINAPI SHWinHelpOnDemandW(HWND hwnd, LPCWSTR helpfile, DWORD flags1, VOID *ptr1, DWORD flags2) +{ + + FIXME("(%p, %s, 0x%x, %p, %d)\n", hwnd, debugstr_w(helpfile), flags1, ptr1, flags2); + return 0; +} + +/************************************************************************* + * @ [SHLWAPI.417] + * + */ +DWORD WINAPI SHWinHelpOnDemandA(HWND hwnd, LPCSTR helpfile, DWORD flags1, VOID *ptr1, DWORD flags2) +{ + + FIXME("(%p, %s, 0x%x, %p, %d)\n", hwnd, debugstr_a(helpfile), flags1, ptr1, flags2); + return 0; +} + +/************************************************************************* * @ [SHLWAPI.418] * * Function seems to do FreeLibrary plus other things. diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index 61bec8b..deb8a48 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -413,8 +413,8 @@ 413 stdcall -noname SHGetMachineInfo(long) 414 stub -noname SHHtmlHelpOnDemandW 415 stub -noname SHHtmlHelpOnDemandA -416 stub -noname SHWinHelpOnDemandW -417 stub -noname SHWinHelpOnDemandA +416 stdcall -noname SHWinHelpOnDemandW(long wstr long ptr long) +417 stdcall -noname SHWinHelpOnDemandA(long str long ptr long) 418 stdcall -ordinal MLFreeLibrary(long) 419 stdcall -noname SHFlushSFCacheWrap() 420 stub @ # CMemStream::Commit

1 0

Matteo Bruni : d3d9/tests: Add a test for clip planes.
by Alexandre Julliard Feb. 15, 2011

Feb. 15, 2011

Module: wine Branch: master Commit: c04f8ce05509c7372c70989442753314087a8b9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c04f8ce05509c7372c7098944… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Feb 1 03:05:57 2011 +0100 d3d9/tests: Add a test for clip planes. --- dlls/d3d9/tests/visual.c | 133 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 133 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index ca33fae..0800892 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -11207,6 +11207,138 @@ static void shadow_test(IDirect3DDevice9 *device) IDirect3D9_Release(d3d9); } +static void clip_planes(IDirect3DDevice9 *device, const char *test_name) +{ + const struct vertex quad1[] = + { + {-1.0f, -1.0f, 0.0f, 0xfff9e814}, + { 1.0f, -1.0f, 0.0f, 0xfff9e814}, + {-1.0f, 1.0f, 0.0f, 0xfff9e814}, + { 1.0f, 1.0f, 0.0f, 0xfff9e814}, + }; + const struct vertex quad2[] = + { + {-1.0f, -1.0f, 0.0f, 0xff002b7f}, + { 1.0f, -1.0f, 0.0f, 0xff002b7f}, + {-1.0f, 1.0f, 0.0f, 0xff002b7f}, + { 1.0f, 1.0f, 0.0f, 0xff002b7f}, + }; + D3DCOLOR color; + HRESULT hr; + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 1.0, 0); + ok(SUCCEEDED(hr), "Clear failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "BeginScene failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); + ok(SUCCEEDED(hr), "SetFVF failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_CLIPPLANEENABLE, 0); + ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad1, sizeof(*quad1)); + ok(SUCCEEDED(hr), "DrawPrimitiveUP failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_CLIPPLANEENABLE, 0x1); + ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad2, sizeof(*quad2)); + ok(SUCCEEDED(hr), "DrawPrimitiveUP failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "EndScene failed, hr %#x.\n", hr); + + color = getPixelColor(device, 1, 240); + ok(color_match(color, 0x00002b7f, 1), "%s test: color 0x%08x.\n", test_name, color); + color = getPixelColor(device, 638, 240); + ok(color_match(color, 0x00002b7f, 1), "%s test: color 0x%08x.\n", test_name, color); + + color = getPixelColor(device, 1, 241); + ok(color_match(color, 0x00f9e814, 1), "%s test: color 0x%08x.\n", test_name, color); + color = getPixelColor(device, 638, 241); + ok(color_match(color, 0x00f9e814, 1), "%s test: color 0x%08x.\n", test_name, color); +} + +static void clip_planes_test(IDirect3DDevice9 *device) +{ + const float plane0[4] = {0.0f, 1.0f, 0.0f, 0.5f / 480.0f}; /* a quarter-pixel offset */ + + const DWORD shader_code[] = { + 0xfffe0200, /* vs_2_0 */ + 0x0200001f, 0x80000000, 0x900f0000, /* dcl_position v0 */ + 0x0200001f, 0x8000000a, 0x900f0001, /* dcl_color0 v1 */ + 0x02000001, 0xc00f0000, 0x90e40000, /* mov oPos, v0 */ + 0x02000001, 0xd00f0000, 0x90e40001, /* mov oD0, v1 */ + 0x0000ffff /* end */ + }; + IDirect3DVertexShader9 *shader; + + IDirect3DTexture9 *offscreen = NULL; + IDirect3DSurface9 *offscreen_surface, *original_rt; + HRESULT hr; + + hr = IDirect3DDevice9_GetRenderTarget(device, 0, &original_rt); + ok(SUCCEEDED(hr), "GetRenderTarget failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZENABLE, FALSE); + ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZWRITEENABLE, FALSE); + ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_CLIPPING, TRUE); + ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetVertexShader(device, NULL); + hr = IDirect3DDevice9_SetPixelShader(device, NULL); + + IDirect3DDevice9_SetClipPlane(device, 0, plane0); + + clip_planes(device, "Onscreen FFP"); + + hr = IDirect3DDevice9_CreateTexture(device, 640, 480, 1, D3DUSAGE_RENDERTARGET, D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &offscreen, NULL); + ok(SUCCEEDED(hr), "CreateTexture failed, hr %#x.\n", hr); + hr = IDirect3DTexture9_GetSurfaceLevel(offscreen, 0, &offscreen_surface); + ok(SUCCEEDED(hr), "GetSurfaceLevel failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderTarget(device, 0, offscreen_surface); + ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderTarget failed, hr=%08x\n", hr); + + clip_planes(device, "Offscreen FFP"); + + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Present failed (0x%08x)\n", hr); + + hr = IDirect3DDevice9_CreateVertexShader(device, shader_code, &shader); + ok(hr == D3D_OK, "IDirect3DDevice9_CreateVertexShader returned %08x\n", hr); + IDirect3DDevice9_SetVertexShader(device, shader); + ok(hr == D3D_OK, "IDirect3DDevice9_SetVertexShader returned %08x\n", hr); + + hr = IDirect3DDevice9_SetRenderTarget(device, 0, original_rt); + ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderTarget failed, hr=%08x\n", hr); + + clip_planes(device, "Onscreen vertex shader"); + + hr = IDirect3DDevice9_SetRenderTarget(device, 0, offscreen_surface); + ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderTarget failed, hr=%08x\n", hr); + + clip_planes(device, "Offscreen vertex shader"); + + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Present failed (0x%08x)\n", hr); + + IDirect3DDevice9_SetRenderState(device, D3DRS_CLIPPLANEENABLE, 0); + hr = IDirect3DDevice9_SetVertexShader(device, NULL); + IDirect3DVertexShader9_Release(shader); + hr = IDirect3DDevice9_SetRenderTarget(device, 0, original_rt); + ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderTarget failed, hr=%08x\n", hr); + IDirect3DSurface9_Release(original_rt); + if (offscreen) + { + IDirect3DSurface9_Release(offscreen_surface); + IDirect3DTexture9_Release(offscreen); + } +} + static void fp_special_test(IDirect3DDevice9 *device) { static const DWORD vs_header[] = @@ -11694,6 +11826,7 @@ START_TEST(visual) fp_special_test(device_ptr); depth_bounds_test(device_ptr); srgbwrite_format_test(device_ptr); + clip_planes_test(device_ptr); cleanup: if(device_ptr) {

1 0

Igor Egorov : kernel32: Add stderr redirection for native Unix programs started from Windows program .
by Alexandre Julliard Feb. 15, 2011

Feb. 15, 2011

Module: wine Branch: master Commit: b970462825d52b333ca8a2be615777c2212f651b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b970462825d52b333ca8a2be6… Author: Igor Egorov <atohom(a)gmail.com> Date: Fri Feb 4 18:47:10 2011 -0800 kernel32: Add stderr redirection for native Unix programs started from Windows program. --- dlls/kernel32/process.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 0bc77c9..4ef8f2a 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -1449,7 +1449,7 @@ static char **build_envp( const WCHAR *envW ) static int fork_and_exec( const char *filename, const WCHAR *cmdline, const WCHAR *env, const char *newdir, DWORD flags, STARTUPINFOW *startup ) { - int fd[2], stdin_fd = -1, stdout_fd = -1; + int fd[2], stdin_fd = -1, stdout_fd = -1, stderr_fd = -1; int pid, err; char **argv, **envp; @@ -1470,25 +1470,30 @@ static int fork_and_exec( const char *filename, const WCHAR *cmdline, const WCHA if (!(flags & (CREATE_NEW_PROCESS_GROUP | CREATE_NEW_CONSOLE | DETACHED_PROCESS))) { - HANDLE hstdin, hstdout; + HANDLE hstdin, hstdout, hstderr; if (startup->dwFlags & STARTF_USESTDHANDLES) { hstdin = startup->hStdInput; hstdout = startup->hStdOutput; + hstderr = startup->hStdError; } else { hstdin = GetStdHandle(STD_INPUT_HANDLE); hstdout = GetStdHandle(STD_OUTPUT_HANDLE); + hstderr = GetStdHandle(STD_ERROR_HANDLE); } if (is_console_handle( hstdin )) hstdin = wine_server_ptr_handle( console_handle_unmap( hstdin )); if (is_console_handle( hstdout )) hstdout = wine_server_ptr_handle( console_handle_unmap( hstdout )); + if (is_console_handle( hstderr )) + hstderr = wine_server_ptr_handle( console_handle_unmap( hstderr )); wine_server_handle_to_fd( hstdin, FILE_READ_DATA, &stdin_fd, NULL ); wine_server_handle_to_fd( hstdout, FILE_WRITE_DATA, &stdout_fd, NULL ); + wine_server_handle_to_fd( hstderr, FILE_WRITE_DATA, &stderr_fd, NULL ); } argv = build_argv( cmdline, 0 ); @@ -1527,6 +1532,11 @@ static int fork_and_exec( const char *filename, const WCHAR *cmdline, const WCHA dup2( stdout_fd, 1 ); close( stdout_fd ); } + if (stderr_fd != -1) + { + dup2( stderr_fd, 2 ); + close( stderr_fd ); + } } /* Reset signals that we previously set to SIG_IGN */ @@ -1544,6 +1554,7 @@ static int fork_and_exec( const char *filename, const WCHAR *cmdline, const WCHA HeapFree( GetProcessHeap(), 0, envp ); if (stdin_fd != -1) close( stdin_fd ); if (stdout_fd != -1) close( stdout_fd ); + if (stderr_fd != -1) close( stderr_fd ); close( fd[1] ); if ((pid != -1) && (read( fd[0], &err, sizeof(err) ) > 0)) /* exec failed */ {

1 0