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

Stefan Dösinger : wined3d: Fix a few more hardcoded pixel shader registers.
by Alexandre Julliard May 14, 2009

May 14, 2009

Module: wine Branch: master Commit: bcb20ae96c0b19918c5a13ebb851f92aecf8b014 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcb20ae96c0b19918c5a13ebb… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu May 7 18:42:18 2009 +0200 wined3d: Fix a few more hardcoded pixel shader registers. --- dlls/wined3d/arb_program_shader.c | 22 ++++++++++------------ 1 files changed, 10 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 5fa4193..1e1c702 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1266,10 +1266,10 @@ static void pshader_hw_texm3x2tex(const struct wined3d_shader_instruction *ins) DWORD flags; DWORD reg = ins->dst[0].reg.idx; SHADER_BUFFER *buffer = ins->ctx->buffer; - char dst_str[8]; + char dst_str[50]; char src0_name[50]; - sprintf(dst_str, "T%u", reg); + shader_arb_get_dst_param(ins, &ins->dst[0], dst_str); shader_arb_get_src_param(ins, &ins->src[0], 0, src0_name); shader_addline(buffer, "DP3 TMP.y, fragment.texcoord[%u], %s;\n", reg, src0_name); flags = reg < MAX_TEXTURES ? deviceImpl->stateBlock->textureState[reg][WINED3DTSS_TEXTURETRANSFORMFLAGS] : 0; @@ -1297,14 +1297,14 @@ static void pshader_hw_texm3x3tex(const struct wined3d_shader_instruction *ins) DWORD reg = ins->dst[0].reg.idx; SHADER_BUFFER *buffer = ins->ctx->buffer; SHADER_PARSE_STATE* current_state = &This->baseShader.parse_state; - char dst_str[8]; + char dst_str[50]; char src0_name[50]; shader_arb_get_src_param(ins, &ins->src[0], 0, src0_name); shader_addline(buffer, "DP3 TMP.z, fragment.texcoord[%u], %s;\n", reg, src0_name); /* Sample the texture using the calculated coordinates */ - sprintf(dst_str, "T%u", reg); + shader_arb_get_dst_param(ins, &ins->dst[0], dst_str); flags = reg < MAX_TEXTURES ? deviceImpl->stateBlock->textureState[reg][WINED3DTSS_TEXTURETRANSFORMFLAGS] : 0; shader_hw_sample(ins, reg, dst_str, "TMP", flags & WINED3DTTFF_PROJECTED, FALSE); current_state->current_row = 0; @@ -1318,7 +1318,7 @@ static void pshader_hw_texm3x3vspec(const struct wined3d_shader_instruction *ins DWORD reg = ins->dst[0].reg.idx; SHADER_BUFFER *buffer = ins->ctx->buffer; SHADER_PARSE_STATE* current_state = &This->baseShader.parse_state; - char dst_str[8]; + char dst_str[50]; char src0_name[50]; shader_arb_get_src_param(ins, &ins->src[0], 0, src0_name); @@ -1340,7 +1340,7 @@ static void pshader_hw_texm3x3vspec(const struct wined3d_shader_instruction *ins shader_addline(buffer, "MAD TMP, coefmul.x, TMP, -TMP2;\n"); /* Sample the texture using the calculated coordinates */ - sprintf(dst_str, "T%u", reg); + shader_arb_get_dst_param(ins, &ins->dst[0], dst_str); flags = reg < MAX_TEXTURES ? deviceImpl->stateBlock->textureState[reg][WINED3DTSS_TEXTURETRANSFORMFLAGS] : 0; shader_hw_sample(ins, reg, dst_str, "TMP", flags & WINED3DTTFF_PROJECTED, FALSE); current_state->current_row = 0; @@ -1354,7 +1354,7 @@ static void pshader_hw_texm3x3spec(const struct wined3d_shader_instruction *ins) DWORD reg = ins->dst[0].reg.idx; SHADER_PARSE_STATE* current_state = &This->baseShader.parse_state; SHADER_BUFFER *buffer = ins->ctx->buffer; - char dst_str[8]; + char dst_str[50]; char src0_name[50]; char src1_name[50]; @@ -1378,7 +1378,7 @@ static void pshader_hw_texm3x3spec(const struct wined3d_shader_instruction *ins) shader_addline(buffer, "MAD TMP, coefmul.x, TMP, -%s;\n", src1_name); /* Sample the texture using the calculated coordinates */ - sprintf(dst_str, "T%u", reg); + shader_arb_get_dst_param(ins, &ins->dst[0], dst_str); flags = reg < MAX_TEXTURES ? deviceImpl->stateBlock->textureState[reg][WINED3DTSS_TEXTURETRANSFORMFLAGS] : 0; shader_hw_sample(ins, reg, dst_str, "TMP", flags & WINED3DTTFF_PROJECTED, FALSE); current_state->current_row = 0; @@ -1421,13 +1421,13 @@ static void pshader_hw_texdp3tex(const struct wined3d_shader_instruction *ins) SHADER_BUFFER *buffer = ins->ctx->buffer; DWORD sampler_idx = ins->dst[0].reg.idx; char src0[50]; - char dst_str[8]; + char dst_str[50]; shader_arb_get_src_param(ins, &ins->src[0], 0, src0); shader_addline(buffer, "MOV TMP, 0.0;\n"); shader_addline(buffer, "DP3 TMP.x, fragment.texcoord[%u], %s;\n", sampler_idx, src0); - sprintf(dst_str, "T%u", sampler_idx); + shader_arb_get_dst_param(ins, &ins->dst[0], dst_str); shader_hw_sample(ins, sampler_idx, dst_str, "TMP", FALSE /* Only one coord, can't be projected */, FALSE); } @@ -1469,8 +1469,6 @@ static void pshader_hw_texm3x3(const struct wined3d_shader_instruction *ins) shader_arb_get_src_param(ins, &ins->src[0], 0, src0); shader_addline(buffer, "DP3 TMP.z, fragment.texcoord[%u], %s;\n", dst->reg.idx, src0); shader_addline(buffer, "MOV %s%s, TMP;\n", dst_str, dst_mask); - - /* TODO: Handle output modifiers */ } /** Process the WINED3DSIO_TEXM3X2DEPTH instruction in ARB:

1 0

Stefan Dösinger : wined3d: Fix remaining incorrect dst register getters.
by Alexandre Julliard May 14, 2009

May 14, 2009

Module: wine Branch: master Commit: aeddd2da635751050ce0355ddfd690fcb50daa2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=aeddd2da635751050ce0355dd… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu May 7 18:46:14 2009 +0200 wined3d: Fix remaining incorrect dst register getters. --- dlls/wined3d/arb_program_shader.c | 45 ++++++++---------------------------- 1 files changed, 10 insertions(+), 35 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 1e1c702..bab6b27 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -792,10 +792,8 @@ static void pshader_hw_bem(const struct wined3d_shader_instruction *ins) SHADER_BUFFER *buffer = ins->ctx->buffer; char dst_name[50]; char src_name[2][50]; - char dst_wmask[20]; DWORD sampler_code = dst->reg.idx; BOOL has_bumpmat = FALSE; - BOOL is_color; int i; for(i = 0; i < This->numbumpenvmatconsts; i++) { @@ -807,10 +805,6 @@ static void pshader_hw_bem(const struct wined3d_shader_instruction *ins) } } - shader_arb_get_register_name(ins->ctx->shader, &dst->reg, dst_name, &is_color); - shader_arb_get_write_mask(ins, dst, dst_wmask); - strcat(dst_name, dst_wmask); - shader_arb_get_src_param(ins, &ins->src[0], 0, src_name[0]); shader_arb_get_src_param(ins, &ins->src[1], 1, src_name[1]); @@ -1389,14 +1383,13 @@ static void pshader_hw_texdepth(const struct wined3d_shader_instruction *ins) const struct wined3d_shader_dst_param *dst = &ins->dst[0]; SHADER_BUFFER *buffer = ins->ctx->buffer; char dst_name[50]; - BOOL is_color; /* texdepth has an implicit destination, the fragment depth value. It's only parameter, * which is essentially an input, is the destination register because it is the first * parameter. According to the msdn, this must be register r5, but let's keep it more flexible - * here + * here(writemasks/swizzles are not valid on texdepth) */ - shader_arb_get_register_name(ins->ctx->shader, &dst->reg, dst_name, &is_color); + shader_arb_get_dst_param(ins, dst, dst_name); /* According to the msdn, the source register(must be r5) is unusable after * the texdepth instruction, so we're free to modify it @@ -1438,18 +1431,12 @@ static void pshader_hw_texdp3(const struct wined3d_shader_instruction *ins) const struct wined3d_shader_dst_param *dst = &ins->dst[0]; char src0[50]; char dst_str[50]; - char dst_mask[6]; SHADER_BUFFER *buffer = ins->ctx->buffer; - BOOL is_color; /* Handle output register */ - shader_arb_get_register_name(ins->ctx->shader, &dst->reg, dst_str, &is_color); - shader_arb_get_write_mask(ins, dst, dst_mask); - + shader_arb_get_dst_param(ins, dst, dst_str); shader_arb_get_src_param(ins, &ins->src[0], 0, src0); - shader_addline(buffer, "DP3 %s%s, fragment.texcoord[%u], %s;\n", dst_str, dst_mask, dst->reg.idx, src0); - - /* TODO: Handle output modifiers */ + shader_addline(buffer, "DP3 %s, fragment.texcoord[%u], %s;\n", dst_str, dst->reg.idx, src0); } /** Process the WINED3DSIO_TEXM3X3 instruction in ARB @@ -1459,16 +1446,12 @@ static void pshader_hw_texm3x3(const struct wined3d_shader_instruction *ins) const struct wined3d_shader_dst_param *dst = &ins->dst[0]; SHADER_BUFFER *buffer = ins->ctx->buffer; char dst_str[50]; - char dst_mask[6]; char src0[50]; - BOOL is_color; - - shader_arb_get_register_name(ins->ctx->shader, &dst->reg, dst_str, &is_color); - shader_arb_get_write_mask(ins, dst, dst_mask); + shader_arb_get_dst_param(ins, dst, dst_str); shader_arb_get_src_param(ins, &ins->src[0], 0, src0); shader_addline(buffer, "DP3 TMP.z, fragment.texcoord[%u], %s;\n", dst->reg.idx, src0); - shader_addline(buffer, "MOV %s%s, TMP;\n", dst_str, dst_mask); + shader_addline(buffer, "MOV %s, TMP;\n", dst_str); } /** Process the WINED3DSIO_TEXM3X2DEPTH instruction in ARB: @@ -1590,18 +1573,14 @@ static void shader_hw_nrm(const struct wined3d_shader_instruction *ins) SHADER_BUFFER *buffer = ins->ctx->buffer; char dst_name[50]; char src_name[50]; - char dst_wmask[20]; BOOL sat = dst->modifiers & WINED3DSPDM_SATURATE; - BOOL is_color; - - shader_arb_get_register_name(ins->ctx->shader, &dst->reg, dst_name, &is_color); - shader_arb_get_write_mask(ins, dst, dst_wmask); + shader_arb_get_dst_param(ins, &ins->dst[0], dst_name); shader_arb_get_src_param(ins, &ins->src[0], 0, src_name); shader_addline(buffer, "DP3 TMP, %s, %s;\n", src_name, src_name); shader_addline(buffer, "RSQ TMP, TMP.x;\n"); /* dst.w = src[0].w * 1 / (src.x^2 + src.y^2 + src.z^2)^(1/2) according to msdn*/ - shader_addline(buffer, "MUL%s %s%s, %s, TMP;\n", sat ? "_SAT" : "", dst_name, dst_wmask, + shader_addline(buffer, "MUL%s %s, %s, TMP;\n", sat ? "_SAT" : "", dst_name, src_name); } @@ -1615,15 +1594,11 @@ static void shader_hw_sincos(const struct wined3d_shader_instruction *ins) SHADER_BUFFER *buffer = ins->ctx->buffer; char dst_name[50]; char src_name[50]; - char dst_wmask[20]; BOOL sat = dst->modifiers & WINED3DSPDM_SATURATE; - BOOL is_color; - - shader_arb_get_register_name(ins->ctx->shader, &dst->reg, dst_name, &is_color); - shader_arb_get_write_mask(ins, dst, dst_wmask); + shader_arb_get_dst_param(ins, &ins->dst[0], dst_name); shader_arb_get_src_param(ins, &ins->src[0], 0, src_name); - shader_addline(buffer, "SCS%s %s%s, %s;\n", sat ? "_SAT" : "", dst_name, dst_wmask, + shader_addline(buffer, "SCS%s %s, %s;\n", sat ? "_SAT" : "", dst_name, src_name); }

1 0

Paul Vriens : inetcomm: Prevent possible dereferences (Coverity).
by Alexandre Julliard May 14, 2009

May 14, 2009

Module: wine Branch: master Commit: e7f4f3b69cbf9a5e248fbf696f11c281f9f20a70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7f4f3b69cbf9a5e248fbf696… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu May 14 09:18:08 2009 +0200 inetcomm: Prevent possible dereferences (Coverity). --- dlls/inetcomm/smtptransport.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/inetcomm/smtptransport.c b/dlls/inetcomm/smtptransport.c index 91070b6..d17419f 100644 --- a/dlls/inetcomm/smtptransport.c +++ b/dlls/inetcomm/smtptransport.c @@ -732,7 +732,7 @@ static HRESULT WINAPI SMTPTransport_CommandMAIL(ISMTPTransport2 *iface, LPSTR ps SMTPTransport *This = (SMTPTransport *)iface; const char szCommandFormat[] = "MAIL FROM: <%s>\n"; char *szCommand; - int len = sizeof(szCommandFormat) - 2 /* "%s" */ + strlen(pszEmailFrom); + int len; HRESULT hr; TRACE("(%s)\n", debugstr_a(pszEmailFrom)); @@ -740,6 +740,7 @@ static HRESULT WINAPI SMTPTransport_CommandMAIL(ISMTPTransport2 *iface, LPSTR ps if (!pszEmailFrom) return E_INVALIDARG; + len = sizeof(szCommandFormat) - 2 /* "%s" */ + strlen(pszEmailFrom); szCommand = HeapAlloc(GetProcessHeap(), 0, len); if (!szCommand) return E_OUTOFMEMORY; @@ -758,7 +759,7 @@ static HRESULT WINAPI SMTPTransport_CommandRCPT(ISMTPTransport2 *iface, LPSTR ps SMTPTransport *This = (SMTPTransport *)iface; const char szCommandFormat[] = "RCPT TO: <%s>\n"; char *szCommand; - int len = sizeof(szCommandFormat) - 2 /* "%s" */ + strlen(pszEmailTo); + int len; HRESULT hr; TRACE("(%s)\n", debugstr_a(pszEmailTo)); @@ -766,6 +767,7 @@ static HRESULT WINAPI SMTPTransport_CommandRCPT(ISMTPTransport2 *iface, LPSTR ps if (!pszEmailTo) return E_INVALIDARG; + len = sizeof(szCommandFormat) - 2 /* "%s" */ + strlen(pszEmailTo); szCommand = HeapAlloc(GetProcessHeap(), 0, len); if (!szCommand) return E_OUTOFMEMORY; @@ -833,7 +835,7 @@ static HRESULT WINAPI SMTPTransport_CommandAUTH(ISMTPTransport2 *iface, SMTPTransport *This = (SMTPTransport *)iface; const char szCommandFormat[] = "AUTH %s\n"; char *szCommand; - int len = sizeof(szCommandFormat) - 2 /* "%s" */ + strlen(pszAuthType); + int len; HRESULT hr; TRACE("(%s)\n", debugstr_a(pszAuthType)); @@ -841,6 +843,7 @@ static HRESULT WINAPI SMTPTransport_CommandAUTH(ISMTPTransport2 *iface, if (!pszAuthType) return E_INVALIDARG; + len = sizeof(szCommandFormat) - 2 /* "%s" */ + strlen(pszAuthType); szCommand = HeapAlloc(GetProcessHeap(), 0, len); if (!szCommand) return E_OUTOFMEMORY;

1 0

Jacek Caban : urlmon: Added PI_MIMEVERIFICATION support.
by Alexandre Julliard May 14, 2009

May 14, 2009

Module: wine Branch: master Commit: 299ce6c18eb7dfaf8f339658b2f5e606936fb8bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=299ce6c18eb7dfaf8f339658b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 14 00:49:01 2009 +0200 urlmon: Added PI_MIMEVERIFICATION support. --- dlls/urlmon/bindprot.c | 163 ++++++++++++++++++++++++++++++++++++----------- 1 files changed, 125 insertions(+), 38 deletions(-) diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index 7235b63..d431095 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -50,6 +50,7 @@ struct BindProtocol { LONG priority; BOOL reported_result; + BOOL reported_mime; BOOL from_urlmon; DWORD pi; @@ -59,6 +60,11 @@ struct BindProtocol { CRITICAL_SECTION section; task_header_t *task_queue_head, *task_queue_tail; + + BYTE *buf; + DWORD buf_size; + LPWSTR mime; + LPWSTR url; }; #define PROTOCOL(x) ((IInternetProtocol*) &(x)->lpInternetProtocolVtbl) @@ -67,6 +73,9 @@ struct BindProtocol { #define SERVPROV(x) ((IServiceProvider*) &(x)->lpServiceProviderVtbl) #define PROTSINK(x) ((IInternetProtocolSink*) &(x)->lpInternetProtocolSinkVtbl) +#define BUFFER_SIZE 2048 +#define MIME_TEST_SIZE 255 + #define WM_MK_CONTINUE (WM_USER+101) #define WM_MK_RELEASE (WM_USER+102) @@ -272,6 +281,9 @@ static ULONG WINAPI BindProtocol_Release(IInternetProtocol *iface) if(This->notif_hwnd) release_notif_hwnd(This->notif_hwnd); DeleteCriticalSection(&This->section); + + heap_free(This->mime); + heap_free(This->url); heap_free(This); URLMON_UnlockModule(); @@ -300,6 +312,7 @@ static HRESULT WINAPI BindProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl return E_INVALIDARG; This->pi = grfPI; + This->url = heap_strdupW(szUrl); hres = IInternetProtocolSink_QueryInterface(pOIProtSink, &IID_IServiceProvider, (void**)&service_provider); @@ -417,11 +430,30 @@ static HRESULT WINAPI BindProtocol_Read(IInternetProtocol *iface, void *pv, { BindProtocol *This = PROTOCOL_THIS(iface); ULONG read = 0; - HRESULT hres; + HRESULT hres = S_OK; TRACE("(%p)->(%p %u %p)\n", This, pv, cb, pcbRead); - hres = IInternetProtocol_Read(This->protocol, pv, cb, &read); + if(This->buf) { + read = min(cb, This->buf_size); + memcpy(pv, This->buf, read); + + if(read == This->buf_size) { + heap_free(This->buf); + This->buf = NULL; + }else { + memmove(This->buf, This->buf+cb, This->buf_size-cb); + } + + This->buf_size -= read; + } + + if(read < cb) { + ULONG cread = 0; + + hres = IInternetProtocol_Read(This->protocol, (BYTE*)pv+read, cb, &cread); + read += cread; + } *pcbRead = read; return hres; @@ -674,6 +706,47 @@ static HRESULT WINAPI BPInternetProtocolSink_Switch(IInternetProtocolSink *iface return IInternetProtocolSink_Switch(This->protocol_sink, pProtocolData); } +static void report_progress(BindProtocol *This, ULONG status_code, LPCWSTR status_text) +{ + switch(status_code) { + case BINDSTATUS_FINDINGRESOURCE: + case BINDSTATUS_CONNECTING: + case BINDSTATUS_BEGINDOWNLOADDATA: + case BINDSTATUS_SENDINGREQUEST: + case BINDSTATUS_CACHEFILENAMEAVAILABLE: + case BINDSTATUS_DIRECTBIND: + case BINDSTATUS_ACCEPTRANGES: + if(This->protocol_sink) + IInternetProtocolSink_ReportProgress(This->protocol_sink, status_code, status_text); + break; + + case BINDSTATUS_MIMETYPEAVAILABLE: + if(!This->reported_mime) { + heap_free(This->mime); + This->mime = heap_strdupW(status_text); + } + + if(This->protocol_sink && !(This->pi & PI_MIMEVERIFICATION)) + IInternetProtocolSink_ReportProgress(This->protocol_sink, status_code, status_text); + break; + + case BINDSTATUS_VERIFIEDMIMETYPEAVAILABLE: + if(!This->reported_mime) { + heap_free(This->mime); + This->mime = heap_strdupW(status_text); + } + + if(This->protocol_sink) { + This->reported_mime = TRUE; + IInternetProtocolSink_ReportProgress(This->protocol_sink, BINDSTATUS_MIMETYPEAVAILABLE, status_text); + } + break; + + default: + FIXME("unsupported ulStatusCode %u\n", status_code); + } +} + typedef struct { task_header_t header; @@ -685,63 +758,79 @@ static void on_progress_proc(BindProtocol *This, task_header_t *t) { on_progress_task_t *task = (on_progress_task_t*)t; - IInternetProtocolSink_ReportProgress(This->protocol_sink, task->status_code, task->status_text); + report_progress(This, task->status_code, task->status_text); heap_free(task->status_text); heap_free(task); } -static void report_progress(BindProtocol *This, ULONG status_code, LPCWSTR status_text) +static HRESULT WINAPI BPInternetProtocolSink_ReportProgress(IInternetProtocolSink *iface, + ULONG ulStatusCode, LPCWSTR szStatusText) { + BindProtocol *This = PROTSINK_THIS(iface); + + TRACE("(%p)->(%u %s)\n", This, ulStatusCode, debugstr_w(szStatusText)); + if(do_direct_notif(This)) { - IInternetProtocolSink_ReportProgress(This->protocol_sink, status_code, status_text); + report_progress(This, ulStatusCode, szStatusText); }else { on_progress_task_t *task; task = heap_alloc(sizeof(on_progress_task_t)); - task->status_code = status_code; - task->status_text = heap_strdupW(status_text); + task->status_code = ulStatusCode; + task->status_text = heap_strdupW(szStatusText); push_task(This, &task->header, on_progress_proc); } + + return S_OK; } -static HRESULT WINAPI BPInternetProtocolSink_ReportProgress(IInternetProtocolSink *iface, - ULONG ulStatusCode, LPCWSTR szStatusText) +static HRESULT report_data(BindProtocol *This, DWORD bscf, ULONG progress, ULONG progress_max) { - BindProtocol *This = PROTSINK_THIS(iface); + if(!This->protocol_sink) + return S_OK; - TRACE("(%p)->(%u %s)\n", This, ulStatusCode, debugstr_w(szStatusText)); + if((This->pi & PI_MIMEVERIFICATION) && !This->reported_mime) { + DWORD read = 0; + LPWSTR mime; + HRESULT hres; - switch(ulStatusCode) { - case BINDSTATUS_FINDINGRESOURCE: - case BINDSTATUS_CONNECTING: - case BINDSTATUS_BEGINDOWNLOADDATA: - case BINDSTATUS_SENDINGREQUEST: - case BINDSTATUS_CACHEFILENAMEAVAILABLE: - case BINDSTATUS_DIRECTBIND: - case BINDSTATUS_ACCEPTRANGES: - case BINDSTATUS_MIMETYPEAVAILABLE: - if(!This->protocol_sink) - return S_OK; - report_progress(This, ulStatusCode, szStatusText); - break; + if(!This->buf) { + This->buf = heap_alloc(BUFFER_SIZE); + if(!This->buf) + return E_OUTOFMEMORY; + } - case BINDSTATUS_VERIFIEDMIMETYPEAVAILABLE: - if(!This->protocol_sink) + do { + read = 0; + hres = IInternetProtocol_Read(This->protocol, This->buf+This->buf_size, BUFFER_SIZE-This->buf_size, &read); + if(hres != S_OK) + break; + This->buf_size += read; + }while(This->buf_size < MIME_TEST_SIZE); + if(FAILED(hres) && hres != E_PENDING) + return hres; + + This->buf_size += read; + if(This->buf_size < MIME_TEST_SIZE && hres != S_FALSE) return S_OK; - report_progress(This, - This->from_urlmon ? BINDSTATUS_VERIFIEDMIMETYPEAVAILABLE : BINDSTATUS_MIMETYPEAVAILABLE, - szStatusText); - break; - default: - FIXME("unsupported ulStatusCode %u\n", ulStatusCode); - return E_NOTIMPL; + + hres = FindMimeFromData(NULL, This->url, This->buf, min(This->buf_size, MIME_TEST_SIZE), This->mime, 0, &mime, 0); + if(FAILED(hres)) + return hres; + + heap_free(This->mime); + This->mime = heap_strdupW(mime); + CoTaskMemFree(mime); + + This->reported_mime = TRUE; + IInternetProtocolSink_ReportProgress(This->protocol_sink, BINDSTATUS_MIMETYPEAVAILABLE, This->mime); } - return S_OK; + return IInternetProtocolSink_ReportData(This->protocol_sink, bscf, progress, progress_max); } typedef struct { @@ -755,9 +844,7 @@ static void report_data_proc(BindProtocol *This, task_header_t *t) { report_data_task_t *task = (report_data_task_t*)t; - if(This->protocol_sink) - IInternetProtocolSink_ReportData(This->protocol_sink, task->bscf, task->progress, task->progress_max); - + report_data(This, task->bscf, task->progress, task->progress_max); heap_free(task); } @@ -786,7 +873,7 @@ static HRESULT WINAPI BPInternetProtocolSink_ReportData(IInternetProtocolSink *i return S_OK; } - return IInternetProtocolSink_ReportData(This->protocol_sink, grfBSCF, ulProgress, ulProgressMax); + return report_data(This, grfBSCF, ulProgress, ulProgressMax); } typedef struct {

1 0

Vincent Povirk : gdiplus: Add string format traces.
by Alexandre Julliard May 14, 2009

May 14, 2009

Module: wine Branch: master Commit: abae88a825fac79a5210411966828dc94c78c063 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abae88a825fac79a521041196… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed May 13 15:30:24 2009 -0500 gdiplus: Add string format traces. --- dlls/gdiplus/stringformat.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/stringformat.c b/dlls/gdiplus/stringformat.c index 21053b7..bfe7d34 100644 --- a/dlls/gdiplus/stringformat.c +++ b/dlls/gdiplus/stringformat.c @@ -35,6 +35,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); GpStatus WINGDIPAPI GdipCreateStringFormat(INT attr, LANGID lang, GpStringFormat **format) { + TRACE("(%i, %x, %p)\n", attr, lang, format); + if(!format) return InvalidParameter; @@ -189,6 +191,8 @@ GpStatus WINGDIPAPI GdipGetStringFormatTrimming(GpStringFormat *format, GpStatus WINGDIPAPI GdipSetStringFormatAlign(GpStringFormat *format, StringAlignment align) { + TRACE("(%p, %i)\n", format, align); + if(!format) return InvalidParameter; @@ -201,6 +205,8 @@ GpStatus WINGDIPAPI GdipSetStringFormatAlign(GpStringFormat *format, GpStatus WINGDIPAPI GdipSetStringFormatDigitSubstitution(GpStringFormat *format, LANGID language, StringDigitSubstitute substitute) { + TRACE("(%p, %x, %i)\n", format, language, substitute); + if(!format) return InvalidParameter; @@ -213,6 +219,8 @@ GpStatus WINGDIPAPI GdipSetStringFormatDigitSubstitution(GpStringFormat *format, GpStatus WINGDIPAPI GdipSetStringFormatHotkeyPrefix(GpStringFormat *format, INT hkpx) { + TRACE("(%p, %i)\n", format, hkpx); + if(!format || hkpx < 0 || hkpx > 2) return InvalidParameter; @@ -224,6 +232,8 @@ GpStatus WINGDIPAPI GdipSetStringFormatHotkeyPrefix(GpStringFormat *format, GpStatus WINGDIPAPI GdipSetStringFormatLineAlign(GpStringFormat *format, StringAlignment align) { + TRACE("(%p, %i)\n", format, align); + if(!format) return InvalidParameter; @@ -246,6 +256,8 @@ GpStatus WINGDIPAPI GdipSetStringFormatMeasurableCharacterRanges(GpStringFormat* GpStatus WINGDIPAPI GdipSetStringFormatTabStops(GpStringFormat *format, REAL firsttab, INT count, GDIPCONST REAL *tabs) { + TRACE("(%p, %0.2f, %i, %p)\n", format, firsttab, count, tabs); + if(!format || !tabs) return InvalidParameter; @@ -276,6 +288,8 @@ GpStatus WINGDIPAPI GdipSetStringFormatTabStops(GpStringFormat *format, REAL fir GpStatus WINGDIPAPI GdipSetStringFormatTrimming(GpStringFormat *format, StringTrimming trimming) { + TRACE("(%p, %i)\n", format, trimming); + if(!format) return InvalidParameter; @@ -286,6 +300,8 @@ GpStatus WINGDIPAPI GdipSetStringFormatTrimming(GpStringFormat *format, GpStatus WINGDIPAPI GdipSetStringFormatFlags(GpStringFormat *format, INT flags) { + TRACE("(%p, %x)\n", format, flags); + if(!format) return InvalidParameter;

1 0

Henri Verbeet : wined3d: Add missing GL locking to test_pbo_functionality() .
by Alexandre Julliard May 14, 2009

May 14, 2009

Module: wine Branch: master Commit: 318fb7036b08e02c132cca1927cbde23a6fb350c URL: http://source.winehq.org/git/wine.git/?a=commit;h=318fb7036b08e02c132cca192… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 13 18:22:55 2009 +0200 wined3d: Add missing GL locking to test_pbo_functionality(). --- dlls/wined3d/directx.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index f5d4d3e..8e3c807 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3907,6 +3907,8 @@ static void test_pbo_functionality(WineD3D_GL_Info *gl_info) { return; } + ENTER_GL(); + while(glGetError()); glGenTextures(1, &texture); glBindTexture(GL_TEXTURE_2D, texture); @@ -3934,6 +3936,8 @@ static void test_pbo_functionality(WineD3D_GL_Info *gl_info) { GL_EXTCALL(glDeleteBuffersARB(1, &pbo)); checkGLcall("PBO test cleanup\n"); + LEAVE_GL(); + if(memcmp(check, pattern, sizeof(check)) != 0) { WARN_(d3d_caps)("PBO test failed, read back data doesn't match original\n"); WARN_(d3d_caps)("Disabling PBOs. This may result in slower performance\n");

1 0

Henri Verbeet : wined3d: Add missing GL locking to set_blit_dimension() calls.
by Alexandre Julliard May 14, 2009

May 14, 2009

Module: wine Branch: master Commit: e26013270120a1cd3ee30e3250416a7f676e308e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e26013270120a1cd3ee30e325… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 13 18:22:54 2009 +0200 wined3d: Add missing GL locking to set_blit_dimension() calls. --- dlls/wined3d/context.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index a25d5ea..7e06b87 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1109,7 +1109,9 @@ static inline void SetupForBlit(IWineD3DDeviceImpl *This, WineD3DContext *contex TRACE("Setting up context %p for blitting\n", context); if(context->last_was_blit) { if(context->blit_w != width || context->blit_h != height) { + ENTER_GL(); set_blit_dimension(width, height); + LEAVE_GL(); context->blit_w = width; context->blit_h = height; /* No need to dirtify here, the states are still dirtified because they weren't * applied since the last SetupForBlit call. Otherwise last_was_blit would not @@ -1268,9 +1270,11 @@ static inline void SetupForBlit(IWineD3DDeviceImpl *This, WineD3DContext *contex glDisable(GL_CLIP_PLANE4); checkGLcall("glDisable(clip plane 4)"); glDisable(GL_CLIP_PLANE5); checkGLcall("glDisable(clip plane 5)"); Context_MarkStateDirty(context, STATE_RENDER(WINED3DRS_CLIPPING), StateTable); - LEAVE_GL(); set_blit_dimension(width, height); + + LEAVE_GL(); + context->blit_w = width; context->blit_h = height; Context_MarkStateDirty(context, STATE_VIEWPORT, StateTable); Context_MarkStateDirty(context, STATE_TRANSFORM(WINED3DTS_PROJECTION), StateTable);

1 0

Henri Verbeet : wined3d: Add missing GL locking to delete_glsl_program_entry() calls.
by Alexandre Julliard May 14, 2009

May 14, 2009

Module: wine Branch: master Commit: 12c4af8dd8de539c346c7af77c370b30a9478ece URL: http://source.winehq.org/git/wine.git/?a=commit;h=12c4af8dd8de539c346c7af77… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 13 18:22:53 2009 +0200 wined3d: Add missing GL locking to delete_glsl_program_entry() calls. --- dlls/wined3d/glsl_shader.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 44e0eea..7905492 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3911,6 +3911,7 @@ static void shader_glsl_destroy(IWineD3DBaseShader *iface) { if (linked_programs->next) { struct glsl_shader_prog_link *entry, *entry2; + ENTER_GL(); if(pshader) { LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, linked_programs, struct glsl_shader_prog_link, pshader_entry) { delete_glsl_program_entry(priv, gl_info, entry); @@ -3920,6 +3921,7 @@ static void shader_glsl_destroy(IWineD3DBaseShader *iface) { delete_glsl_program_entry(priv, gl_info, entry); } } + LEAVE_GL(); } if(pshader) {

1 0

Henri Verbeet : wined3d: Add missing GL locking to IWineD3DDeviceImpl_Uninit3D().
by Alexandre Julliard May 14, 2009

May 14, 2009

Module: wine Branch: master Commit: 639b2582006cbfdc1102ac64a57b516ab07b1fe4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=639b2582006cbfdc1102ac64a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 13 18:22:55 2009 +0200 wined3d: Add missing GL locking to IWineD3DDeviceImpl_Uninit3D(). --- dlls/wined3d/device.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ec6d3f0..83af654 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2834,11 +2834,15 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Uninit3D(IWineD3DDevice *iface, D3DCB_D * private data, it might contain opengl pointers */ if(This->depth_blt_texture) { + ENTER_GL(); glDeleteTextures(1, &This->depth_blt_texture); + LEAVE_GL(); This->depth_blt_texture = 0; } if (This->depth_blt_rb) { + ENTER_GL(); GL_EXTCALL(glDeleteRenderbuffersEXT(1, &This->depth_blt_rb)); + LEAVE_GL(); This->depth_blt_rb = 0; This->depth_blt_rb_w = 0; This->depth_blt_rb_h = 0;

1 0

Paul Vriens : wininet/tests: Fix some test failures on systems with IE6 or older.
by Alexandre Julliard May 14, 2009

May 14, 2009

Module: wine Branch: master Commit: 82f22bbaee5cd4d2b486a27c2112d6e9338fd0b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82f22bbaee5cd4d2b486a27c2… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed May 13 20:50:36 2009 +0200 wininet/tests: Fix some test failures on systems with IE6 or older. --- dlls/wininet/tests/urlcache.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/tests/urlcache.c b/dlls/wininet/tests/urlcache.c index 62e4bd2..b7df03e 100644 --- a/dlls/wininet/tests/urlcache.c +++ b/dlls/wininet/tests/urlcache.c @@ -249,8 +249,12 @@ static void test_GetDiskInfoA(void) strcpy(p, "\\non\\existing\\path"); ret = GetDiskInfoA(path, NULL, NULL, NULL); error = GetLastError(); - ok(!ret, "GetDiskInfoA succeeded\n"); - ok(error == ERROR_PATH_NOT_FOUND, "got %u expected ERROR_PATH_NOT_FOUND\n", error); + ok(!ret || + broken(ret), /* < IE7 */ + "GetDiskInfoA succeeded\n"); + ok(error == ERROR_PATH_NOT_FOUND || + broken(error == 0xdeadbeef), /* < IE7 */ + "got %u expected ERROR_PATH_NOT_FOUND\n", error); SetLastError(0xdeadbeef); ret = GetDiskInfoA(NULL, NULL, NULL, NULL);

1 0