wine-commits November 2012

wine-commits@winehq.org

2 participants
708 discussions

Hans Leidekker : msi: Fix use of uninitialized variables.
by Alexandre Julliard 09 Nov '12

09 Nov '12

Module: wine Branch: master Commit: e15121771cd667083e4325a560440e407851e6cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=e15121771cd667083e4325a56… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Nov 9 16:46:52 2012 +0100 msi: Fix use of uninitialized variables. --- dlls/msi/action.c | 2 +- dlls/msi/automation.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index f9ab550..833bc67 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2884,7 +2884,7 @@ static UINT ITERATE_WriteRegistryValues(MSIRECORD *row, LPVOID param) if (type == REG_MULTI_SZ) { BYTE *new; - if (old_type != REG_MULTI_SZ) + if (old_value && old_type != REG_MULTI_SZ) { msi_free( old_value ); old_value = NULL; diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index e55717a..5df6b95 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -846,7 +846,7 @@ static HRESULT RecordImpl_Invoke( UINT* puArgErr) { WCHAR *szString; - DWORD dwLen; + DWORD dwLen = 0; UINT ret; VARIANTARG varg0, varg1; HRESULT hr;

1 0

Matteo Bruni : d3dcompiler: Put data type name of constants on the heap.
by Alexandre Julliard 09 Nov '12

09 Nov '12

Module: wine Branch: master Commit: f6b22a7570b3a13e1423537c70b65ab09a0b2c32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6b22a7570b3a13e1423537c7… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Nov 9 15:20:39 2012 +0100 d3dcompiler: Put data type name of constants on the heap. --- dlls/d3dcompiler_43/hlsl.y | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 6c360ec..777fb4e 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -1770,7 +1770,7 @@ primary_expr: C_FLOAT } c->node.type = HLSL_IR_CONSTANT; set_location(&c->node.loc, &yylloc); - c->node.data_type = new_hlsl_type("float", HLSL_CLASS_SCALAR, HLSL_TYPE_FLOAT, 1, 1); + c->node.data_type = new_hlsl_type(d3dcompiler_strdup("float"), HLSL_CLASS_SCALAR, HLSL_TYPE_FLOAT, 1, 1); c->v.value.f[0] = $1; $$ = &c->node; } @@ -1784,7 +1784,7 @@ primary_expr: C_FLOAT } c->node.type = HLSL_IR_CONSTANT; set_location(&c->node.loc, &yylloc); - c->node.data_type = new_hlsl_type("int", HLSL_CLASS_SCALAR, HLSL_TYPE_INT, 1, 1); + c->node.data_type = new_hlsl_type(d3dcompiler_strdup("int"), HLSL_CLASS_SCALAR, HLSL_TYPE_INT, 1, 1); c->v.value.i[0] = $1; $$ = &c->node; } @@ -1798,7 +1798,7 @@ primary_expr: C_FLOAT } c->node.type = HLSL_IR_CONSTANT; set_location(&c->node.loc, &yylloc); - c->node.data_type = new_hlsl_type("bool", HLSL_CLASS_SCALAR, HLSL_TYPE_BOOL, 1, 1); + c->node.data_type = new_hlsl_type(d3dcompiler_strdup("bool"), HLSL_CLASS_SCALAR, HLSL_TYPE_BOOL, 1, 1); c->v.value.b[0] = $1; $$ = &c->node; }

1 0

Matteo Bruni : d3dcompiler: Skip stray semicolons outside of functions.
by Alexandre Julliard 09 Nov '12

09 Nov '12

Module: wine Branch: master Commit: feda13db337aceacb6f61bccb2b560f3cc094e21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=feda13db337aceacb6f61bccb… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Nov 9 15:20:38 2012 +0100 d3dcompiler: Skip stray semicolons outside of functions. --- dlls/d3dcompiler_43/hlsl.y | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index b2740f6..6c360ec 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -1065,6 +1065,10 @@ hlsl_prog: /* empty */ | hlsl_prog preproc_directive { } + | hlsl_prog ';' + { + TRACE("Skipping stray semicolon.\n"); + } preproc_directive: PRE_LINE STRING {

1 0

Matteo Bruni : d3dcompiler: Allow a comma at the end of an initializer.
by Alexandre Julliard 09 Nov '12

09 Nov '12

Module: wine Branch: master Commit: 0d2a27af40137ced1fc4e441295d27b00498af28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d2a27af40137ced1fc4e4412… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Nov 9 15:20:37 2012 +0100 d3dcompiler: Allow a comma at the end of an initializer. --- dlls/d3dcompiler_43/hlsl.y | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 6200b96..b2740f6 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -1585,6 +1585,10 @@ complex_initializer: initializer_expr { $$ = $2; } + | '{' initializer_expr_list ',' '}' + { + $$ = $2; + } initializer_expr: assignment_expr {

1 0

Matteo Bruni : d3dcompiler: Don' t take the sign as part of the numeric token.
by Alexandre Julliard 09 Nov '12

09 Nov '12

Module: wine Branch: master Commit: a5203e1a79d49cb363cbe90bf33a3f274e96443a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5203e1a79d49cb363cbe90bf… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Nov 9 15:20:36 2012 +0100 d3dcompiler: Don't take the sign as part of the numeric token. --- dlls/d3dcompiler_43/hlsl.l | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.l b/dlls/d3dcompiler_43/hlsl.l index 49fb042..f40e3c9 100644 --- a/dlls/d3dcompiler_43/hlsl.l +++ b/dlls/d3dcompiler_43/hlsl.l @@ -184,15 +184,15 @@ row_major {return KW_ROW_MAJOR; } return NEW_IDENTIFIER; } -[+-]?[0-9]*\.[0-9]+([eE][+-]?[0-9]+)?[h|H|f|F]? { +[0-9]*\.[0-9]+([eE][+-]?[0-9]+)?[h|H|f|F]? { hlsl_lval.floatval = atof(yytext); return C_FLOAT; } -[+-]?[0-9]+\.([eE][+-]?[0-9]+)?[h|H|f|F]? { +[0-9]+\.([eE][+-]?[0-9]+)?[h|H|f|F]? { hlsl_lval.floatval = atof(yytext); return C_FLOAT; } -[+-]?[0-9]+([eE][+-]?[0-9]+)?[h|H|f|F] { +[0-9]+([eE][+-]?[0-9]+)?[h|H|f|F] { hlsl_lval.floatval = atof(yytext); return C_FLOAT; } @@ -204,7 +204,7 @@ row_major {return KW_ROW_MAJOR; } sscanf(yytext, "0%o", &hlsl_lval.intval); return C_INTEGER; } -\-?[0-9]+ { +[0-9]+ { hlsl_lval.intval = (atoi(yytext)); return C_INTEGER; }

1 0

Matteo Bruni : wined3d: Pop control frames in disabled if branches ( ARB shader backend).
by Alexandre Julliard 09 Nov '12

09 Nov '12

Module: wine Branch: master Commit: a7956c4c4f8f2abd673f9e5cbb159419e1d003be URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7956c4c4f8f2abd673f9e5cb… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Nov 9 15:20:35 2012 +0100 wined3d: Pop control frames in disabled if branches (ARB shader backend). --- dlls/wined3d/arb_program_shader.c | 52 ++++++++++++++++++++++++------------- 1 files changed, 34 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 6328fdf..6ea73c0 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5395,6 +5395,29 @@ static void free_recorded_instruction(struct list *list) } } +static void pop_control_frame(const struct wined3d_shader_instruction *ins) +{ + struct shader_arb_ctx_priv *priv = ins->ctx->backend_data; + struct control_frame *control_frame; + + if (ins->handler_idx == WINED3DSIH_ENDLOOP || ins->handler_idx == WINED3DSIH_ENDREP) + { + struct list *e = list_head(&priv->control_frames); + control_frame = LIST_ENTRY(e, struct control_frame, entry); + list_remove(&control_frame->entry); + HeapFree(GetProcessHeap(), 0, control_frame); + priv->loop_depth--; + } + else if (ins->handler_idx == WINED3DSIH_ENDIF) + { + /* Non-ifc ENDIFs were already handled previously. */ + struct list *e = list_head(&priv->control_frames); + control_frame = LIST_ENTRY(e, struct control_frame, entry); + list_remove(&control_frame->entry); + HeapFree(GetProcessHeap(), 0, control_frame); + } +} + static void shader_arb_handle_instruction(const struct wined3d_shader_instruction *ins) { SHADER_HANDLER hw_fct; struct shader_arb_ctx_priv *priv = ins->ctx->backend_data; @@ -5564,6 +5587,8 @@ static void shader_arb_handle_instruction(const struct wined3d_shader_instructio return; /* Instruction is handled. */ } /* In case of an ifc, generate a HW shader instruction */ + if (control_frame->type != IFC) + ERR("Control frame does not match.\n"); } else if(ins->handler_idx == WINED3DSIH_ENDIF) { @@ -5578,9 +5603,16 @@ static void shader_arb_handle_instruction(const struct wined3d_shader_instructio HeapFree(GetProcessHeap(), 0, control_frame); return; /* Instruction is handled */ } + /* In case of an ifc, generate a HW shader instruction */ + if (control_frame->type != IFC) + ERR("Control frame does not match.\n"); } - if(priv->muted) return; + if(priv->muted) + { + pop_control_frame(ins); + return; + } /* Select handler */ hw_fct = shader_arb_instruction_handler_table[ins->handler_idx]; @@ -5593,23 +5625,7 @@ static void shader_arb_handle_instruction(const struct wined3d_shader_instructio } hw_fct(ins); - if(ins->handler_idx == WINED3DSIH_ENDLOOP || ins->handler_idx == WINED3DSIH_ENDREP) - { - struct list *e = list_head(&priv->control_frames); - control_frame = LIST_ENTRY(e, struct control_frame, entry); - list_remove(&control_frame->entry); - HeapFree(GetProcessHeap(), 0, control_frame); - priv->loop_depth--; - } - else if(ins->handler_idx == WINED3DSIH_ENDIF) - { - /* Non-ifc ENDIFs don't reach that place because of the return in the if block above */ - struct list *e = list_head(&priv->control_frames); - control_frame = LIST_ENTRY(e, struct control_frame, entry); - list_remove(&control_frame->entry); - HeapFree(GetProcessHeap(), 0, control_frame); - } - + pop_control_frame(ins); shader_arb_add_instruction_modifiers(ins); }

1 0

Matteo Bruni : wined3d: Ensure GL_FRAGMENT_PROGRAM_ARB is enabled when using ARB shaders.
by Alexandre Julliard 09 Nov '12

09 Nov '12

Module: wine Branch: master Commit: b532284a9ec23cd3663761e3dd83d355754cc2cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b532284a9ec23cd3663761e3d… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Nov 9 15:20:34 2012 +0100 wined3d: Ensure GL_FRAGMENT_PROGRAM_ARB is enabled when using ARB shaders. --- dlls/wined3d/arb_program_shader.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index aa89d59..6328fdf 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4676,13 +4676,12 @@ static void shader_arb_select(const struct wined3d_context *context, enum wined3 checkGLcall("glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, priv->current_fprogram_id);"); if (!priv->use_arbfp_fixed_func) - { priv->fragment_pipe->enable_extension(gl_info, FALSE); - /* Enable OpenGL fragment programs. */ - gl_info->gl_ops.gl.p_glEnable(GL_FRAGMENT_PROGRAM_ARB); - checkGLcall("glEnable(GL_FRAGMENT_PROGRAM_ARB);"); - } + /* Enable OpenGL fragment programs. */ + gl_info->gl_ops.gl.p_glEnable(GL_FRAGMENT_PROGRAM_ARB); + checkGLcall("glEnable(GL_FRAGMENT_PROGRAM_ARB);"); + TRACE("(%p) : Bound fragment program %u and enabled GL_FRAGMENT_PROGRAM_ARB\n", device, priv->current_fprogram_id);

1 0

Jacek Caban : jscript: Fixed leak in disp_propget.
by Alexandre Julliard 09 Nov '12

09 Nov '12

Module: wine Branch: master Commit: 74a83150aba9dee39eba7a3013560d2d8bc839f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74a83150aba9dee39eba7a301… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 9 11:48:34 2012 +0100 jscript: Fixed leak in disp_propget. --- dlls/jscript/dispex.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index f68a031..8bc4d1d 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1413,7 +1413,9 @@ HRESULT disp_propget(script_ctx_t *ctx, IDispatch *disp, DISPID id, jsval_t *val if(FAILED(hres)) return hres; - return variant_to_jsval(&var, val); + hres = variant_to_jsval(&var, val); + VariantClear(&var); + return hres; } HRESULT jsdisp_delete_idx(jsdisp_t *obj, DWORD idx)

1 0

Frédéric Delanoy : ole32: Fix some leaks ( coverity).
by Alexandre Julliard 09 Nov '12

09 Nov '12

Module: wine Branch: master Commit: 780228b6cac5bd3bcc1afd1901924b27283b10b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=780228b6cac5bd3bcc1afd190… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Nov 9 10:17:41 2012 +0100 ole32: Fix some leaks (coverity). --- dlls/ole32/storage32.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index d2e9f69..8498eaf 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -8769,13 +8769,14 @@ HRESULT WINAPI ReadFmtUserTypeStg (LPSTORAGE pstg, CLIPFORMAT* pcf, LPOLESTR* lp /* ok, success... now we just need to store what we found */ if( pcf ) *pcf = RegisterClipboardFormatW( szOleTypeName ); - CoTaskMemFree( szOleTypeName ); if( lplpszUserType ) *lplpszUserType = szCLSIDName; - CoTaskMemFree( szProgIDName ); end: + CoTaskMemFree( szCLSIDName ); + CoTaskMemFree( szOleTypeName ); + CoTaskMemFree( szProgIDName ); IStream_Release( stm ); return r;

1 0

Jörg Höhle : winmm: Call IsFormatSupported for WAVE_FORMAT_QUERY only.
by Alexandre Julliard 09 Nov '12

09 Nov '12

Module: wine Branch: master Commit: f5628373e5102ebda7be9df8482f743206dfac77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5628373e5102ebda7be9df84… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Thu Jan 12 22:29:42 2012 +0100 winmm: Call IsFormatSupported for WAVE_FORMAT_QUERY only. --- dlls/winmm/waveform.c | 26 ++++++++++---------------- 1 files changed, 10 insertions(+), 16 deletions(-) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 48f53a5..9dd2c20 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -920,7 +920,7 @@ static MMRESULT WINMM_MapDevice(WINMM_OpenInfo *info, BOOL is_out) static LRESULT WINMM_OpenDevice(WINMM_Device *device, WINMM_MMDevice *mmdevice, WINMM_OpenInfo *info) { - WAVEFORMATEX *closer_fmt = NULL, fmt, *passed_fmt; + WAVEFORMATEX fmt, *passed_fmt; LRESULT ret = MMSYSERR_NOMEM; HRESULT hr; @@ -967,21 +967,14 @@ static LRESULT WINMM_OpenDevice(WINMM_Device *device, WINMM_MMDevice *mmdevice, }else passed_fmt = info->format; - hr = IAudioClient_IsFormatSupported(device->client, - AUDCLNT_SHAREMODE_SHARED, passed_fmt, &closer_fmt); - if(closer_fmt) - CoTaskMemFree(closer_fmt); - if(FAILED(hr) && hr != AUDCLNT_E_UNSUPPORTED_FORMAT){ - WARN("IsFormatSupported failed: %08x\n", hr); - ret = hr2mmr(hr); - goto error; - } - if(hr == S_FALSE || hr == AUDCLNT_E_UNSUPPORTED_FORMAT){ - ret = WAVERR_BADFORMAT; - goto error; - } if(info->flags & WAVE_FORMAT_QUERY){ - ret = MMSYSERR_NOERROR; + WAVEFORMATEX *closer_fmt = NULL; + + hr = IAudioClient_IsFormatSupported(device->client, + AUDCLNT_SHAREMODE_SHARED, passed_fmt, &closer_fmt); + if(closer_fmt) + CoTaskMemFree(closer_fmt); + ret = hr == S_FALSE ? WAVERR_BADFORMAT : hr2mmr(hr); goto error; } @@ -990,7 +983,8 @@ static LRESULT WINMM_OpenDevice(WINMM_Device *device, WINMM_MMDevice *mmdevice, AUDCLNT_STREAMFLAGS_EVENTCALLBACK | AUDCLNT_STREAMFLAGS_NOPERSIST, 10 * 100000, 50000, passed_fmt, &device->parent->session); if(FAILED(hr)){ - WARN("Initialize failed: %08x\n", hr); + if(hr != AUDCLNT_E_UNSUPPORTED_FORMAT) + WARN("Initialize failed: %08x\n", hr); ret = hr2mmr(hr); goto error; }

1 0

Jörg Höhle : winmm: Avoid generic MMSYSERR_ERROR during initialisation.
by Alexandre Julliard 09 Nov '12

09 Nov '12

Module: wine Branch: master Commit: e3e0bfca204e601cc8e82653950c314739d32b9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3e0bfca204e601cc8e826539… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Thu Jan 12 17:02:46 2012 +0100 winmm: Avoid generic MMSYSERR_ERROR during initialisation. --- dlls/winmm/waveform.c | 60 ++++++++++++++++++++++++++++++++++++------------ 1 files changed, 45 insertions(+), 15 deletions(-) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 37d1d4f..48f53a5 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -379,6 +379,29 @@ static inline void WINMM_NotifyClient(WINMM_CBInfo *info, WORD msg, DWORD_PTR pa msg, info->user, param1, param2); } +static MMRESULT hr2mmr(HRESULT hr) +{ + switch(hr){ + case S_OK: + case AUDCLNT_E_NOT_STOPPED: + return MMSYSERR_NOERROR; + case AUDCLNT_E_UNSUPPORTED_FORMAT: + return WAVERR_BADFORMAT; + case AUDCLNT_E_DEVICE_IN_USE: + return MMSYSERR_ALLOCATED; + case AUDCLNT_E_ENDPOINT_CREATE_FAILED: + return MMSYSERR_NOTENABLED; + case E_OUTOFMEMORY: + return MMSYSERR_NOMEM; + case E_POINTER: + case E_INVALIDARG: + return MMSYSERR_INVALPARAM; + case AUDCLNT_E_DEVICE_INVALIDATED: /* DSERR_BUFFERLOST */ + default: + return FAILED(hr) ? MMSYSERR_ERROR : MMSYSERR_NOERROR; + } +} + static HRESULT WINMM_GetFriendlyName(IMMDevice *device, WCHAR *out, UINT outlen) { @@ -898,7 +921,7 @@ static LRESULT WINMM_OpenDevice(WINMM_Device *device, WINMM_MMDevice *mmdevice, WINMM_OpenInfo *info) { WAVEFORMATEX *closer_fmt = NULL, fmt, *passed_fmt; - LRESULT ret = MMSYSERR_ERROR; + LRESULT ret = MMSYSERR_NOMEM; HRESULT hr; hr = IMMDeviceEnumerator_GetDevice(g_devenum, mmdevice->dev_id, @@ -907,13 +930,18 @@ static LRESULT WINMM_OpenDevice(WINMM_Device *device, WINMM_MMDevice *mmdevice, WARN("Device %s (%s) unavailable: %08x\n", wine_dbgstr_w(mmdevice->dev_id), wine_dbgstr_w(mmdevice->out_caps.szPname), hr); + ret = MMSYSERR_NODRIVER; goto error; } + /* this is where winexyz.drv opens the audio device */ hr = IMMDevice_Activate(device->device, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&device->client); if(FAILED(hr)){ WARN("Activate failed: %08x\n", hr); + ret = hr2mmr(hr); + if(ret == MMSYSERR_ERROR) + ret = MMSYSERR_NOTENABLED; goto error; } @@ -945,6 +973,7 @@ static LRESULT WINMM_OpenDevice(WINMM_Device *device, WINMM_MMDevice *mmdevice, CoTaskMemFree(closer_fmt); if(FAILED(hr) && hr != AUDCLNT_E_UNSUPPORTED_FORMAT){ WARN("IsFormatSupported failed: %08x\n", hr); + ret = hr2mmr(hr); goto error; } if(hr == S_FALSE || hr == AUDCLNT_E_UNSUPPORTED_FORMAT){ @@ -962,6 +991,7 @@ static LRESULT WINMM_OpenDevice(WINMM_Device *device, WINMM_MMDevice *mmdevice, 10 * 100000, 50000, passed_fmt, &device->parent->session); if(FAILED(hr)){ WARN("Initialize failed: %08x\n", hr); + ret = hr2mmr(hr); goto error; } @@ -1038,7 +1068,7 @@ static LRESULT WOD_Open(WINMM_OpenInfo *info) { WINMM_MMDevice *mmdevice; WINMM_Device *device = NULL; - LRESULT ret = MMSYSERR_ERROR; + LRESULT ret; HRESULT hr; TRACE("(%u, %p, %08x)\n", info->req_device, info, info->flags); @@ -1111,7 +1141,7 @@ static LRESULT WID_Open(WINMM_OpenInfo *info) { WINMM_MMDevice *mmdevice; WINMM_Device *device = NULL; - LRESULT ret = MMSYSERR_ERROR; + LRESULT ret; HRESULT hr; TRACE("(%u, %p, %08x)\n", info->req_device, info, info->flags); @@ -2378,7 +2408,7 @@ UINT WINAPI waveOutGetDevCapsW(UINT_PTR uDeviceID, LPWAVEOUTCAPSW lpCaps, hr = WINMM_InitMMDevices(); if(FAILED(hr)) - return MMSYSERR_ERROR; + return MMSYSERR_NODRIVER; if (lpCaps == NULL) return MMSYSERR_INVALPARAM; @@ -2474,7 +2504,7 @@ MMRESULT WINAPI waveOutOpen(LPHWAVEOUT lphWaveOut, UINT uDeviceID, dwCallback, dwInstance, dwFlags); if(!WINMM_StartDevicesThread()) - return MMSYSERR_ERROR; + return MMSYSERR_NODRIVER; if(!lphWaveOut && !(dwFlags & WAVE_FORMAT_QUERY)) return MMSYSERR_INVALPARAM; @@ -2939,7 +2969,7 @@ static UINT get_device_interface(UINT msg, BOOL is_out, UINT index, WCHAR *out, WINMM_QueryInterfaceInfo info; if(!WINMM_StartDevicesThread()) - return MMSYSERR_ERROR; + return MMSYSERR_NODRIVER; info.is_out = is_out; info.index = index; @@ -3021,7 +3051,7 @@ UINT WINAPI waveInGetDevCapsW(UINT_PTR uDeviceID, LPWAVEINCAPSW lpCaps, UINT uSi hr = WINMM_InitMMDevices(); if(FAILED(hr)) - return MMSYSERR_ERROR; + return MMSYSERR_NODRIVER; if(!lpCaps) return MMSYSERR_INVALPARAM; @@ -3096,7 +3126,7 @@ MMRESULT WINAPI waveInOpen(HWAVEIN* lphWaveIn, UINT uDeviceID, dwCallback, dwInstance, dwFlags); if(!WINMM_StartDevicesThread()) - return MMSYSERR_ERROR; + return MMSYSERR_NODRIVER; if(!lphWaveIn && !(dwFlags & WAVE_FORMAT_QUERY)) return MMSYSERR_INVALPARAM; @@ -3445,7 +3475,7 @@ UINT WINAPI mixerGetDevCapsW(UINT_PTR uDeviceID, LPMIXERCAPSW lpCaps, UINT uSize hr = WINMM_InitMMDevices(); if(FAILED(hr)) - return MMSYSERR_ERROR; + return MMSYSERR_NODRIVER; if(!lpCaps) return MMSYSERR_INVALPARAM; @@ -3490,7 +3520,7 @@ UINT WINAPI mixerOpen(LPHMIXER lphMix, UINT uDeviceID, DWORD_PTR dwCallback, hr = WINMM_InitMMDevices(); if(FAILED(hr)) - return MMSYSERR_ERROR; + return MMSYSERR_NODRIVER; if(!lphMix) return MMSYSERR_INVALPARAM; @@ -3539,7 +3569,7 @@ UINT WINAPI mixerGetID(HMIXEROBJ hmix, LPUINT lpid, DWORD fdwID) hr = WINMM_InitMMDevices(); if(FAILED(hr)) - return MMSYSERR_ERROR; + return MMSYSERR_NODRIVER; if(!lpid) return MMSYSERR_INVALPARAM; @@ -3567,7 +3597,7 @@ UINT WINAPI mixerGetControlDetailsW(HMIXEROBJ hmix, LPMIXERCONTROLDETAILS lpmcdW hr = WINMM_InitMMDevices(); if(FAILED(hr)) - return MMSYSERR_ERROR; + return MMSYSERR_NODRIVER; if(!lpmcdW) return MMSYSERR_INVALPARAM; @@ -3754,7 +3784,7 @@ UINT WINAPI mixerGetLineControlsW(HMIXEROBJ hmix, LPMIXERLINECONTROLSW lpmlcW, hr = WINMM_InitMMDevices(); if(FAILED(hr)) - return MMSYSERR_ERROR; + return MMSYSERR_NODRIVER; if(fdwControls & ~(MIXER_GETLINECONTROLSF_ALL | MIXER_GETLINECONTROLSF_ONEBYID | @@ -3972,7 +4002,7 @@ UINT WINAPI mixerGetLineInfoW(HMIXEROBJ hmix, LPMIXERLINEW lpmliW, DWORD fdwInfo hr = WINMM_InitMMDevices(); if(FAILED(hr)) - return MMSYSERR_ERROR; + return MMSYSERR_NODRIVER; if(!lpmliW || lpmliW->cbStruct < sizeof(MIXERLINEW)) return MMSYSERR_INVALPARAM; @@ -4098,7 +4128,7 @@ UINT WINAPI mixerSetControlDetails(HMIXEROBJ hmix, LPMIXERCONTROLDETAILS lpmcd, TRACE("(%p, %p, %x)\n", hmix, lpmcd, fdwDetails); if(!WINMM_StartDevicesThread()) - return MMSYSERR_ERROR; + return MMSYSERR_NODRIVER; if((fdwDetails & MIXER_SETCONTROLDETAILSF_QUERYMASK) == MIXER_SETCONTROLDETAILSF_CUSTOM)

1 0

Jörg Höhle : winmm: Prefer using MMSYSERR_* over AUDCLNT_E_* from mmdevapi.
by Alexandre Julliard 09 Nov '12

09 Nov '12

Module: wine Branch: master Commit: 6086c7be194ddfbff1d588640994bce3a051e4b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6086c7be194ddfbff1d588640… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Jan 10 18:47:17 2012 +0100 winmm: Prefer using MMSYSERR_* over AUDCLNT_E_* from mmdevapi. --- dlls/winmm/waveform.c | 37 ++++++++++++------------------------- 1 files changed, 12 insertions(+), 25 deletions(-) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 9bcabe2..37d1d4f 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -1702,7 +1702,7 @@ exit: } } -static HRESULT WINMM_BeginPlaying(WINMM_Device *device) +static MMRESULT WINMM_BeginPlaying(WINMM_Device *device) { HRESULT hr; @@ -1719,11 +1719,11 @@ static HRESULT WINMM_BeginPlaying(WINMM_Device *device) if(FAILED(hr) && hr != AUDCLNT_E_NOT_STOPPED){ device->stopped = TRUE; WARN("Start failed: %08x\n", hr); - return hr; + return MMSYSERR_ERROR; } } - return S_OK; + return MMSYSERR_NOERROR; } static LRESULT WINMM_Pause(HWAVE hwave) @@ -2577,7 +2577,7 @@ UINT WINAPI waveOutUnprepareHeader(HWAVEOUT hWaveOut, UINT WINAPI waveOutWrite(HWAVEOUT hWaveOut, WAVEHDR *header, UINT uSize) { WINMM_Device *device; - HRESULT hr; + MMRESULT mr; TRACE("(%p, %p, %u)\n", hWaveOut, header, uSize); @@ -2598,7 +2598,6 @@ UINT WINAPI waveOutWrite(HWAVEOUT hWaveOut, WAVEHDR *header, UINT uSize) if(device->acm_handle){ ACMSTREAMHEADER *ash = (ACMSTREAMHEADER*)header->reserved; - MMRESULT mr; ash->cbSrcLength = header->dwBufferLength; mr = acmStreamConvert(device->acm_handle, ash, 0); @@ -2625,15 +2624,11 @@ UINT WINAPI waveOutWrite(HWAVEOUT hWaveOut, WAVEHDR *header, UINT uSize) header->dwFlags &= ~WHDR_DONE; header->dwFlags |= WHDR_INQUEUE; - hr = WINMM_BeginPlaying(device); - if(FAILED(hr)){ - LeaveCriticalSection(&device->lock); - return MMSYSERR_ERROR; - } + mr = WINMM_BeginPlaying(device); LeaveCriticalSection(&device->lock); - return MMSYSERR_NOERROR; + return mr; } /************************************************************************** @@ -2683,7 +2678,7 @@ UINT WINAPI waveOutReset(HWAVEOUT hWaveOut) UINT WINAPI waveOutRestart(HWAVEOUT hWaveOut) { WINMM_Device *device; - HRESULT hr; + MMRESULT mr; TRACE("(%p)\n", hWaveOut); @@ -2694,15 +2689,11 @@ UINT WINAPI waveOutRestart(HWAVEOUT hWaveOut) device->stopped = TRUE; - hr = WINMM_BeginPlaying(device); - if(FAILED(hr)){ - LeaveCriticalSection(&device->lock); - return MMSYSERR_ERROR; - } + mr = WINMM_BeginPlaying(device); LeaveCriticalSection(&device->lock); - return MMSYSERR_NOERROR; + return mr; } /************************************************************************** @@ -3255,7 +3246,7 @@ UINT WINAPI waveInReset(HWAVEIN hWaveIn) UINT WINAPI waveInStart(HWAVEIN hWaveIn) { WINMM_Device *device; - HRESULT hr; + MMRESULT mr; TRACE("(%p)\n", hWaveIn); @@ -3264,15 +3255,11 @@ UINT WINAPI waveInStart(HWAVEIN hWaveIn) if(!WINMM_ValidateAndLock(device)) return MMSYSERR_INVALHANDLE; - hr = WINMM_BeginPlaying(device); - if(FAILED(hr)){ - LeaveCriticalSection(&device->lock); - return MMSYSERR_ERROR; - } + mr = WINMM_BeginPlaying(device); LeaveCriticalSection(&device->lock); - return MMSYSERR_NOERROR; + return mr; } /**************************************************************************

1 0

Daniel Lehman : msvcp90/tests: Add fstream<>::tellg tests.
by Alexandre Julliard 09 Nov '12

09 Nov '12

Module: wine Branch: master Commit: 23cbfff4b646b58ec608d3d1c1a170513b294c68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23cbfff4b646b58ec608d3d1c… Author: Daniel Lehman <dlehman(a)esri.com> Date: Thu Nov 8 07:56:09 2012 -0800 msvcp90/tests: Add fstream<>::tellg tests. --- dlls/msvcp90/tests/ios.c | 207 +++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 187 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=23cbfff4b646b58ec608d…

1 0

Jacek Caban : mshtml: Added IPersistStream::LoadHistory implementation.
by Alexandre Julliard 09 Nov '12

09 Nov '12

Module: wine Branch: master Commit: 26d396252823aa215c29db9ea68e123c29a83a1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=26d396252823aa215c29db9ea… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 8 18:17:55 2012 +0100 mshtml: Added IPersistStream::LoadHistory implementation. --- dlls/mshtml/binding.h | 2 + dlls/mshtml/navigate.c | 20 ++++++++++++++- dlls/mshtml/persist.c | 60 ++++++++++++++++++++++++++++++++++++++++++----- 3 files changed, 73 insertions(+), 9 deletions(-) diff --git a/dlls/mshtml/binding.h b/dlls/mshtml/binding.h index fda318b..1eee469 100644 --- a/dlls/mshtml/binding.h +++ b/dlls/mshtml/binding.h @@ -100,6 +100,7 @@ typedef struct { #define BINDING_NAVIGATED 0x0001 #define BINDING_REPLACE 0x0002 +#define BINDING_FROMHIST 0x0004 HRESULT set_http_header(struct list*,const WCHAR*,int,const WCHAR*,int) DECLSPEC_HIDDEN; HRESULT create_redirect_nschannel(const WCHAR*,nsChannel*,nsChannel**) DECLSPEC_HIDDEN; @@ -111,6 +112,7 @@ HRESULT load_nsuri(HTMLOuterWindow*,nsWineURI*,nsChannelBSC*,DWORD) DECLSPEC_HID HRESULT set_moniker(HTMLDocument*,IMoniker*,IBindCtx*,nsChannelBSC*,BOOL) DECLSPEC_HIDDEN; void prepare_for_binding(HTMLDocument*,IMoniker*,DWORD) DECLSPEC_HIDDEN; HRESULT super_navigate(HTMLOuterWindow*,IUri*,DWORD,const WCHAR*,BYTE*,DWORD) DECLSPEC_HIDDEN; +HRESULT load_uri(HTMLOuterWindow*,IUri*,DWORD) DECLSPEC_HIDDEN; HRESULT navigate_new_window(HTMLOuterWindow*,IUri*,const WCHAR*,IHTMLWindow2**) DECLSPEC_HIDDEN; HRESULT create_channelbsc(IMoniker*,const WCHAR*,BYTE*,DWORD,BOOL,nsChannelBSC**) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index e92440e..33ebbca 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -2119,7 +2119,8 @@ HRESULT super_navigate(HTMLOuterWindow *window, IUri *uri, DWORD flags, const WC /* Silently and repeated when real loading starts? */ window->readystate = READYSTATE_LOADING; - call_docview_84(window->doc_obj); + if(!(flags & BINDING_FROMHIST)) + call_docview_84(window->doc_obj); task->window = window; task->bscallback = bsc; @@ -2140,7 +2141,8 @@ HRESULT super_navigate(HTMLOuterWindow *window, IUri *uri, DWORD flags, const WC /* Why silently? */ window->readystate = READYSTATE_COMPLETE; - call_docview_84(window->doc_obj); + if(!(flags & BINDING_FROMHIST)) + call_docview_84(window->doc_obj); IUri_AddRef(uri); task->window = window; @@ -2301,6 +2303,20 @@ static HRESULT navigate_uri(HTMLOuterWindow *window, IUri *uri, const WCHAR *dis return hres; } +HRESULT load_uri(HTMLOuterWindow *window, IUri *uri, DWORD flags) +{ + BSTR display_uri; + HRESULT hres; + + hres = IUri_GetDisplayUri(uri, &display_uri); + if(FAILED(hres)) + return hres; + + hres = navigate_uri(window, uri, display_uri, flags); + SysFreeString(display_uri); + return hres; +} + HRESULT navigate_url(HTMLOuterWindow *window, const WCHAR *new_url, IUri *base_uri) { BSTR display_uri; diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 2fe1cfe..649c906 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -48,6 +48,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); /* Undocumented notification, see tests */ #define CMDID_EXPLORER_UPDATEHISTORY 38 +static const WCHAR about_blankW[] = {'a','b','o','u','t',':','b','l','a','n','k',0}; + typedef struct { task_t header; HTMLDocumentObj *doc; @@ -339,7 +341,7 @@ void prepare_for_binding(HTMLDocument *This, IMoniker *mon, DWORD flags) hres = IOleCommandTarget_Exec(cmdtrg, &CGID_ShellDocView, 63, 0, &var, &out); if(SUCCEEDED(hres)) VariantClear(&out); - }else { + }else if(!(flags & BINDING_FROMHIST)) { V_VT(&var) = VT_I4; V_I4(&var) = 0; IOleCommandTarget_Exec(cmdtrg, &CGID_ShellDocView, 37, 0, &var, NULL); @@ -810,8 +812,6 @@ static HRESULT WINAPI PersistStreamInit_Load(IPersistStreamInit *iface, LPSTREAM IMoniker *mon; HRESULT hres; - static const WCHAR about_blankW[] = {'a','b','o','u','t',':','b','l','a','n','k',0}; - TRACE("(%p)->(%p)\n", This, pStm); hres = CreateURLMoniker(NULL, about_blankW, &mon); @@ -869,8 +869,6 @@ static HRESULT WINAPI PersistStreamInit_InitNew(IPersistStreamInit *iface) IMoniker *mon; HRESULT hres; - static const WCHAR about_blankW[] = {'a','b','o','u','t',':','b','l','a','n','k',0}; - TRACE("(%p)\n", This); hres = CreateURLMoniker(NULL, about_blankW, &mon); @@ -936,8 +934,56 @@ static HRESULT WINAPI PersistHistory_GetClassID(IPersistHistory *iface, CLSID *p static HRESULT WINAPI PersistHistory_LoadHistory(IPersistHistory *iface, IStream *pStream, IBindCtx *pbc) { HTMLDocument *This = impl_from_IPersistHistory(iface); - FIXME("(%p)->(%p %p)\n", This, pStream, pbc); - return E_NOTIMPL; + ULONG str_len, read; + WCHAR *uri_str; + IUri *uri; + HRESULT hres; + + TRACE("(%p)->(%p %p)\n", This, pStream, pbc); + + if(!This->window) { + FIXME("No current window\n"); + return E_UNEXPECTED; + } + + if(pbc) + FIXME("pbc not supported\n"); + + if(This->doc_obj->client) { + IOleCommandTarget *cmdtrg = NULL; + + hres = IOleClientSite_QueryInterface(This->doc_obj->client, &IID_IOleCommandTarget, + (void**)&cmdtrg); + if(SUCCEEDED(hres)) { + IOleCommandTarget_Exec(cmdtrg, &CGID_ShellDocView, 138, 0, NULL, NULL); + IOleCommandTarget_Release(cmdtrg); + } + } + + hres = IStream_Read(pStream, &str_len, sizeof(str_len), &read); + if(FAILED(hres)) + return hres; + if(read != sizeof(str_len)) + return E_FAIL; + + uri_str = heap_alloc((str_len+1)*sizeof(WCHAR)); + if(!uri_str) + return E_OUTOFMEMORY; + + hres = IStream_Read(pStream, uri_str, str_len*sizeof(WCHAR), &read); + if(SUCCEEDED(hres) && read != str_len*sizeof(WCHAR)) + hres = E_FAIL; + if(SUCCEEDED(hres)) { + uri_str[str_len] = 0; + hres = CreateUri(uri_str, 0, 0, &uri); + } + heap_free(uri_str); + if(FAILED(hres)) + return hres; + + hres = load_uri(This->window, uri, BINDING_FROMHIST); + IUri_Release(uri); + return hres; } static HRESULT WINAPI PersistHistory_SaveHistory(IPersistHistory *iface, IStream *pStream)

1 0

Jacek Caban : mshtml: Use flags in navigation functions.
by Alexandre Julliard 09 Nov '12

09 Nov '12

Module: wine Branch: master Commit: cfa0a3accdf3794c12a80b6a28460fa1d4c3312b URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfa0a3accdf3794c12a80b6a2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 8 18:17:35 2012 +0100 mshtml: Use flags in navigation functions. --- dlls/mshtml/binding.h | 7 +++++-- dlls/mshtml/htmlwindow.c | 2 +- dlls/mshtml/navigate.c | 12 ++++++------ dlls/mshtml/persist.c | 12 ++++++------ 4 files changed, 18 insertions(+), 15 deletions(-) diff --git a/dlls/mshtml/binding.h b/dlls/mshtml/binding.h index f0e1cd5..fda318b 100644 --- a/dlls/mshtml/binding.h +++ b/dlls/mshtml/binding.h @@ -98,6 +98,9 @@ typedef struct { WCHAR *data; } http_header_t; +#define BINDING_NAVIGATED 0x0001 +#define BINDING_REPLACE 0x0002 + HRESULT set_http_header(struct list*,const WCHAR*,int,const WCHAR*,int) DECLSPEC_HIDDEN; HRESULT create_redirect_nschannel(const WCHAR*,nsChannel*,nsChannel**) DECLSPEC_HIDDEN; @@ -106,8 +109,8 @@ HRESULT hlink_frame_navigate(HTMLDocument*,LPCWSTR,nsChannel*,DWORD,BOOL*) DECLS HRESULT create_doc_uri(HTMLOuterWindow*,const WCHAR*,nsWineURI**) DECLSPEC_HIDDEN; HRESULT load_nsuri(HTMLOuterWindow*,nsWineURI*,nsChannelBSC*,DWORD) DECLSPEC_HIDDEN; HRESULT set_moniker(HTMLDocument*,IMoniker*,IBindCtx*,nsChannelBSC*,BOOL) DECLSPEC_HIDDEN; -void prepare_for_binding(HTMLDocument*,IMoniker*,BOOL) DECLSPEC_HIDDEN; -HRESULT super_navigate(HTMLOuterWindow*,IUri*,const WCHAR*,BYTE*,DWORD) DECLSPEC_HIDDEN; +void prepare_for_binding(HTMLDocument*,IMoniker*,DWORD) DECLSPEC_HIDDEN; +HRESULT super_navigate(HTMLOuterWindow*,IUri*,DWORD,const WCHAR*,BYTE*,DWORD) DECLSPEC_HIDDEN; HRESULT navigate_new_window(HTMLOuterWindow*,IUri*,const WCHAR*,IHTMLWindow2**) DECLSPEC_HIDDEN; HRESULT create_channelbsc(IMoniker*,const WCHAR*,BYTE*,DWORD,BOOL,nsChannelBSC**) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 0c3d7df..1696ed5 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -2098,7 +2098,7 @@ static HRESULT WINAPI HTMLPrivateWindow_SuperNavigate(IHTMLPrivateWindow *iface, headers = V_BSTR(headers_var); } - hres = super_navigate(window, uri, headers, post_data, post_data_size); + hres = super_navigate(window, uri, BINDING_NAVIGATED, headers, post_data, post_data_size); IUri_Release(uri); if(post_data) SafeArrayUnaccessData(V_ARRAY(post_data_var)); diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 18961f6..e92440e 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -2044,7 +2044,7 @@ static HRESULT navigate_fragment(HTMLOuterWindow *window, IUri *uri) return S_OK; } -HRESULT super_navigate(HTMLOuterWindow *window, IUri *uri, const WCHAR *headers, BYTE *post_data, DWORD post_data_size) +HRESULT super_navigate(HTMLOuterWindow *window, IUri *uri, DWORD flags, const WCHAR *headers, BYTE *post_data, DWORD post_data_size) { nsChannelBSC *bsc; IUri *uri_nofrag; @@ -2104,7 +2104,7 @@ HRESULT super_navigate(HTMLOuterWindow *window, IUri *uri, const WCHAR *headers, return hres; } - prepare_for_binding(&window->doc_obj->basedoc, mon, TRUE); + prepare_for_binding(&window->doc_obj->basedoc, mon, flags); hres = IUri_GetScheme(uri, &scheme); if(SUCCEEDED(hres) && scheme != URL_SCHEME_JAVASCRIPT) { @@ -2234,7 +2234,7 @@ HRESULT hlink_frame_navigate(HTMLDocument *doc, LPCWSTR url, nsChannel *nschanne hres = CreateAsyncBindCtx(0, &callback->bsc.IBindStatusCallback_iface, NULL, &bindctx); if(SUCCEEDED(hres)) - hres = CoCreateInstance(&CLSID_StdHlink, NULL, CLSCTX_INPROC_SERVER, + hres = CoCreateInstance(&CLSID_StdHlink, NULL, CLSCTX_INPROC_SERVER, &IID_IHlink, (LPVOID*)&hlink); if(SUCCEEDED(hres)) @@ -2261,7 +2261,7 @@ HRESULT hlink_frame_navigate(HTMLDocument *doc, LPCWSTR url, nsChannel *nschanne return hres; } -static HRESULT navigate_uri(HTMLOuterWindow *window, IUri *uri, const WCHAR *display_uri) +static HRESULT navigate_uri(HTMLOuterWindow *window, IUri *uri, const WCHAR *display_uri, DWORD flags) { nsWineURI *nsuri; HRESULT hres; @@ -2276,7 +2276,7 @@ static HRESULT navigate_uri(HTMLOuterWindow *window, IUri *uri, const WCHAR *dis return S_OK; } - return super_navigate(window, uri, NULL, NULL, 0); + return super_navigate(window, uri, flags, NULL, NULL, 0); } if(window->doc_obj && window == window->doc_obj->basedoc.window) { @@ -2343,7 +2343,7 @@ HRESULT navigate_url(HTMLOuterWindow *window, const WCHAR *new_url, IUri *base_u } } - hres = navigate_uri(window, uri, display_uri); + hres = navigate_uri(window, uri, display_uri, BINDING_NAVIGATED); IUri_Release(uri); SysFreeString(display_uri); diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index aa31067..2fe1cfe 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -292,7 +292,7 @@ static void set_downloading_task_destr(task_t *_task) heap_free(task); } -void prepare_for_binding(HTMLDocument *This, IMoniker *mon, BOOL navigated_binding) +void prepare_for_binding(HTMLDocument *This, IMoniker *mon, DWORD flags) { HRESULT hres; @@ -332,17 +332,17 @@ void prepare_for_binding(HTMLDocument *This, IMoniker *mon, BOOL navigated_bindi if(SUCCEEDED(hres)) { VARIANT var, out; - if(!navigated_binding) { - V_VT(&var) = VT_I4; - V_I4(&var) = 0; - IOleCommandTarget_Exec(cmdtrg, &CGID_ShellDocView, 37, 0, &var, NULL); - }else { + if(flags & BINDING_NAVIGATED) { V_VT(&var) = VT_UNKNOWN; V_UNKNOWN(&var) = (IUnknown*)&This->window->base.IHTMLWindow2_iface; V_VT(&out) = VT_EMPTY; hres = IOleCommandTarget_Exec(cmdtrg, &CGID_ShellDocView, 63, 0, &var, &out); if(SUCCEEDED(hres)) VariantClear(&out); + }else { + V_VT(&var) = VT_I4; + V_I4(&var) = 0; + IOleCommandTarget_Exec(cmdtrg, &CGID_ShellDocView, 37, 0, &var, NULL); } IOleCommandTarget_Release(cmdtrg);

1 0

Jacek Caban : mshtml: Added IPersistHistory::SaveHistory implementation.
by Alexandre Julliard 09 Nov '12

09 Nov '12

Module: wine Branch: master Commit: 92443dca0210741359493d151020b178e4f51e58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92443dca0210741359493d151… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 8 18:17:24 2012 +0100 mshtml: Added IPersistHistory::SaveHistory implementation. --- dlls/mshtml/persist.c | 25 +++++++++++++++++++++++-- 1 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 0c279c0..aa31067 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -943,8 +943,29 @@ static HRESULT WINAPI PersistHistory_LoadHistory(IPersistHistory *iface, IStream static HRESULT WINAPI PersistHistory_SaveHistory(IPersistHistory *iface, IStream *pStream) { HTMLDocument *This = impl_from_IPersistHistory(iface); - FIXME("(%p)->(%p)\n", This, pStream); - return E_NOTIMPL; + ULONG len, written; + BSTR display_uri; + HRESULT hres; + + TRACE("(%p)->(%p)\n", This, pStream); + + if(!This->window || !This->window->uri) { + FIXME("No current URI\n"); + return E_FAIL; + } + + /* NOTE: The format we store is *not* compatible with native MSHTML. We currently + * store only URI of the page (as a length followed by a string) */ + hres = IUri_GetDisplayUri(This->window->uri, &display_uri); + if(FAILED(hres)) + return hres; + + len = SysStringLen(display_uri); + hres = IStream_Write(pStream, &len, sizeof(len), &written); + if(SUCCEEDED(hres)) + hres = IStream_Write(pStream, display_uri, len*sizeof(WCHAR), &written); + SysFreeString(display_uri); + return hres; } static HRESULT WINAPI PersistHistory_SetPositionCookie(IPersistHistory *iface, DWORD dwPositioncookie)

1 0

Jacek Caban : mshtml: Use fregment-less URI in super_navigate.
by Alexandre Julliard 09 Nov '12

09 Nov '12

Module: wine Branch: master Commit: 99c34aa9d9bac71a2054fbae467d498d343e50b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99c34aa9d9bac71a2054fbae4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 8 18:17:12 2012 +0100 mshtml: Use fregment-less URI in super_navigate. --- dlls/mshtml/mshtml_private.h | 1 - dlls/mshtml/navigate.c | 22 +++++++++++++++++----- dlls/mshtml/nsio.c | 2 +- dlls/mshtml/tests/htmldoc.c | 6 ++---- 4 files changed, 20 insertions(+), 11 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 97cd165..f24354d 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -780,7 +780,6 @@ BOOL is_gecko_path(const char*) DECLSPEC_HIDDEN; void init_node_cc(void); HRESULT nsuri_to_url(LPCWSTR,BOOL,BSTR*) DECLSPEC_HIDDEN; -BOOL compare_ignoring_frag(IUri*,IUri*) DECLSPEC_HIDDEN; HRESULT navigate_url(HTMLOuterWindow*,const WCHAR*,IUri*) DECLSPEC_HIDDEN; HRESULT set_frame_doc(HTMLFrameBase*,nsIDOMDocument*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index e2eecef..18961f6 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -2047,10 +2047,15 @@ static HRESULT navigate_fragment(HTMLOuterWindow *window, IUri *uri) HRESULT super_navigate(HTMLOuterWindow *window, IUri *uri, const WCHAR *headers, BYTE *post_data, DWORD post_data_size) { nsChannelBSC *bsc; + IUri *uri_nofrag; IMoniker *mon; DWORD scheme; HRESULT hres; + uri_nofrag = get_uri_nofrag(uri); + if(!uri_nofrag) + return E_FAIL; + if(window->doc_obj->client) { IOleCommandTarget *cmdtrg; @@ -2059,7 +2064,7 @@ HRESULT super_navigate(HTMLOuterWindow *window, IUri *uri, const WCHAR *headers, VARIANT in, out; BSTR url_str; - hres = IUri_GetDisplayUri(uri, &url_str); + hres = IUri_GetDisplayUri(uri_nofrag, &url_str); if(SUCCEEDED(hres)) { V_VT(&in) = VT_BSTR; V_BSTR(&in) = url_str; @@ -2074,12 +2079,19 @@ HRESULT super_navigate(HTMLOuterWindow *window, IUri *uri, const WCHAR *headers, } } - if(window->uri && !post_data_size && compare_ignoring_frag(window->uri, uri)) { - TRACE("fragment navigate\n"); - return navigate_fragment(window, uri); + if(window->uri_nofrag && !post_data_size) { + BOOL eq; + + hres = IUri_IsEqual(uri_nofrag, window->uri_nofrag, &eq); + if(SUCCEEDED(hres) && eq) { + IUri_Release(uri_nofrag); + TRACE("fragment navigate\n"); + return navigate_fragment(window, uri); + } } - hres = CreateURLMonikerEx2(NULL, uri, &mon, URL_MK_UNIFORM); + hres = CreateURLMonikerEx2(NULL, uri_nofrag, &mon, URL_MK_UNIFORM); + IUri_Release(uri_nofrag); if(FAILED(hres)) return hres; diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 204879f..5ce6648 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -121,7 +121,7 @@ IUri *get_uri_nofrag(IUri *uri) return ret; } -BOOL compare_ignoring_frag(IUri *uri1, IUri *uri2) +static BOOL compare_ignoring_frag(IUri *uri1, IUri *uri2) { IUri *uri_nofrag1, *uri_nofrag2; BOOL ret = FALSE; diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 849b517..0e8e0bb 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -2835,10 +2835,8 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID CHECK_EXPECT(Exec_ShellDocView_67); ok(pvaIn != NULL, "pvaIn == NULL\n"); ok(V_VT(pvaIn) == VT_BSTR, "V_VT(pvaIn) = %d\n", V_VT(pvaIn)); - if(!loading_hash) - ok(!strcmp_wa(V_BSTR(pvaIn), nav_serv_url), "V_BSTR(pvaIn) = %s, expected %s\n", wine_dbgstr_w(V_BSTR(pvaIn)), nav_serv_url); - else - todo_wine ok(!strcmp_wa(V_BSTR(pvaIn), nav_serv_url), "V_BSTR(pvaIn) = %s, expected %s\n", wine_dbgstr_w(V_BSTR(pvaIn)), nav_serv_url); + ok(!strcmp_wa(V_BSTR(pvaIn), nav_serv_url), "V_BSTR(pvaIn) = %s, expected %s\n", + wine_dbgstr_w(V_BSTR(pvaIn)), nav_serv_url); ok(pvaOut != NULL, "pvaOut == NULL\n"); ok(V_VT(pvaOut) == VT_BOOL, "V_VT(pvaOut) = %d\n", V_VT(pvaOut)); ok(V_BOOL(pvaOut) == VARIANT_TRUE, "V_BOOL(pvaOut) = %x\n", V_BOOL(pvaOut));

1 0

Jacek Caban : mshtml: Call set_current_uri in navigate_proc.
by Alexandre Julliard 09 Nov '12

09 Nov '12

Module: wine Branch: master Commit: 01949aead45a4062e6b2acc6d1bcf109ab70718e URL: http://source.winehq.org/git/wine.git/?a=commit;h=01949aead45a4062e6b2acc6d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 8 18:16:59 2012 +0100 mshtml: Call set_current_uri in navigate_proc. --- dlls/mshtml/navigate.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 06d1207..e2eecef 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1949,6 +1949,7 @@ typedef struct { HTMLOuterWindow *window; nsChannelBSC *bscallback; IMoniker *mon; + IUri *uri; } navigate_task_t; static void navigate_proc(task_t *_task) @@ -1959,6 +1960,7 @@ static void navigate_proc(task_t *_task) hres = set_moniker(&task->window->doc_obj->basedoc, task->mon, NULL, task->bscallback, TRUE); if(SUCCEEDED(hres)) { set_current_mon(task->window, task->bscallback->bsc.mon); + set_current_uri(task->window, task->uri); start_binding(task->window->pending_window, &task->bscallback->bsc, NULL); } } @@ -1969,6 +1971,7 @@ static void navigate_task_destr(task_t *_task) IBindStatusCallback_Release(&task->bscallback->bsc.IBindStatusCallback_iface); IMoniker_Release(task->mon); + IUri_Release(task->uri); heap_free(task); } @@ -2109,6 +2112,9 @@ HRESULT super_navigate(HTMLOuterWindow *window, IUri *uri, const WCHAR *headers, task->window = window; task->bscallback = bsc; task->mon = mon; + + IUri_AddRef(uri); + task->uri = uri; hres = push_task(&task->header, navigate_proc, navigate_task_destr, window->task_magic); }else { navigate_javascript_task_t *task;

1 0

Jacek Caban : mshtml: Don't pass hash part of URI to EvaluateNewWindow.
by Alexandre Julliard 09 Nov '12

09 Nov '12

Module: wine Branch: master Commit: e0a33d0480145f198a6204d980710d087027f597 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0a33d0480145f198a6204d98… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 8 18:16:42 2012 +0100 mshtml: Don't pass hash part of URI to EvaluateNewWindow. --- dlls/mshtml/binding.h | 2 ++ dlls/mshtml/htmlwindow.c | 13 +++++++++---- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/nsio.c | 2 +- dlls/mshtml/persist.c | 12 ++++++++++++ 5 files changed, 25 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/binding.h b/dlls/mshtml/binding.h index 4d19c46..f0e1cd5 100644 --- a/dlls/mshtml/binding.h +++ b/dlls/mshtml/binding.h @@ -116,4 +116,6 @@ void channelbsc_set_channel(nsChannelBSC*,nsChannel*,nsIStreamListener*,nsISuppo IUri *nsuri_get_uri(nsWineURI*) DECLSPEC_HIDDEN; HRESULT create_relative_uri(HTMLOuterWindow*,const WCHAR*,IUri**) DECLSPEC_HIDDEN; +IUri *get_uri_nofrag(IUri*) DECLSPEC_HIDDEN; + HRESULT bind_mon_to_wstr(HTMLInnerWindow*,IMoniker*,WCHAR**) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 28b3b7f..0c3d7df 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -857,13 +857,14 @@ static HRESULT WINAPI HTMLWindow2_open(IHTMLWindow2 *iface, BSTR url, BSTR name, HTMLWindow *This = impl_from_IHTMLWindow2(iface); HTMLOuterWindow *window = This->outer_window; INewWindowManager *new_window_mgr; + BSTR uri_str; IUri *uri; HRESULT hres; TRACE("(%p)->(%s %s %s %x %p)\n", This, debugstr_w(url), debugstr_w(name), debugstr_w(features), replace, pomWindowResult); - if(!window->doc_obj) + if(!window->doc_obj || !window->uri_nofrag) return E_UNEXPECTED; if(name && *name == '_') { @@ -878,10 +879,14 @@ static HRESULT WINAPI HTMLWindow2_open(IHTMLWindow2 *iface, BSTR url, BSTR name, return E_NOTIMPL; } - hres = INewWindowManager_EvaluateNewWindow(new_window_mgr, url, name, window->url, - features, !!replace, window->doc_obj->has_popup ? 0 : NWMF_FIRST, 0); + hres = IUri_GetDisplayUri(window->uri_nofrag, &uri_str); + if(SUCCEEDED(hres)) { + hres = INewWindowManager_EvaluateNewWindow(new_window_mgr, url, name, uri_str, + features, !!replace, window->doc_obj->has_popup ? 0 : NWMF_FIRST, 0); + window->doc_obj->has_popup = TRUE; + SysFreeString(uri_str); + } INewWindowManager_Release(new_window_mgr); - window->doc_obj->has_popup = TRUE; if(FAILED(hres)) { *pomWindowResult = NULL; return S_OK; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index f94f226..97cd165 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -372,6 +372,7 @@ struct HTMLOuterWindow { HTMLInnerWindow *pending_window; IMoniker *mon; IUri *uri; + IUri *uri_nofrag; BSTR url; SCRIPTMODE scriptmode; diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 7fc2a3a..204879f 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -94,7 +94,7 @@ IUri *nsuri_get_uri(nsWineURI *nsuri) return nsuri->uri; } -static IUri *get_uri_nofrag(IUri *uri) +IUri *get_uri_nofrag(IUri *uri) { IUriBuilder *uri_builder; IUri *ret; diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index e29bb25..0c279c0 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -106,6 +106,11 @@ void set_current_uri(HTMLOuterWindow *window, IUri *uri) window->uri = NULL; } + if(window->uri_nofrag) { + IUri_Release(window->uri_nofrag); + window->uri_nofrag = NULL; + } + SysFreeString(window->url); window->url = NULL; @@ -115,6 +120,13 @@ void set_current_uri(HTMLOuterWindow *window, IUri *uri) IUri_AddRef(uri); window->uri = uri; + window->uri_nofrag = get_uri_nofrag(uri); + if(!window->uri_nofrag) { + FIXME("get_uri_nofrag failed\n"); + IUri_AddRef(uri); + window->uri_nofrag = uri; + } + IUri_GetDisplayUri(uri, &window->url); }

1 0

Henri Verbeet : wined3d: Introduce a separate function for generating the sRGB write GLSL code.
by Alexandre Julliard 09 Nov '12

09 Nov '12

Module: wine Branch: master Commit: 986f4cb9b16853377206e223efb5ef8c1d5efc4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=986f4cb9b16853377206e223e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 8 23:29:17 2012 +0100 wined3d: Introduce a separate function for generating the sRGB write GLSL code. --- dlls/wined3d/glsl_shader.c | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ed9fc80..20aeffc 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4360,6 +4360,16 @@ static GLhandleARB generate_param_reorder_function(struct wined3d_shader_buffer return ret; } +static void shader_glsl_generate_srgb_write_correction(struct wined3d_shader_buffer *buffer) +{ + shader_addline(buffer, "tmp0.xyz = pow(gl_FragData[0].xyz, vec3(srgb_const0.x));\n"); + shader_addline(buffer, "tmp0.xyz = tmp0.xyz * vec3(srgb_const0.y) - vec3(srgb_const0.z);\n"); + shader_addline(buffer, "tmp1.xyz = gl_FragData[0].xyz * vec3(srgb_const0.w);\n"); + shader_addline(buffer, "bvec3 srgb_compare = lessThan(gl_FragData[0].xyz, vec3(srgb_const1.x));\n"); + shader_addline(buffer, "gl_FragData[0].xyz = mix(tmp0.xyz, tmp1.xyz, vec3(srgb_compare));\n"); + shader_addline(buffer, "gl_FragData[0] = clamp(gl_FragData[0], 0.0, 1.0);\n"); +} + static void shader_glsl_generate_fog_code(struct wined3d_shader_buffer *buffer, enum fogmode mode) { switch (mode) @@ -4457,14 +4467,7 @@ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context } if (args->srgb_correction) - { - shader_addline(buffer, "tmp0.xyz = pow(gl_FragData[0].xyz, vec3(srgb_const0.x));\n"); - shader_addline(buffer, "tmp0.xyz = tmp0.xyz * vec3(srgb_const0.y) - vec3(srgb_const0.z);\n"); - shader_addline(buffer, "tmp1.xyz = gl_FragData[0].xyz * vec3(srgb_const0.w);\n"); - shader_addline(buffer, "bvec3 srgb_compare = lessThan(gl_FragData[0].xyz, vec3(srgb_const1.x));\n"); - shader_addline(buffer, "gl_FragData[0].xyz = mix(tmp0.xyz, tmp1.xyz, vec3(srgb_compare));\n"); - shader_addline(buffer, "gl_FragData[0] = clamp(gl_FragData[0], 0.0, 1.0);\n"); - } + shader_glsl_generate_srgb_write_correction(buffer); /* SM < 3 does not replace the fog stage. */ if (reg_maps->shader_version.major < 3)

1 0

Henri Verbeet : wined3d: Introduce a separate function for generating the fixed function fog GLSL code .
by Alexandre Julliard 09 Nov '12

09 Nov '12

Module: wine Branch: master Commit: f6d05fbae6a0d5eda3fdd1cc2c4530b0e343891e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6d05fbae6a0d5eda3fdd1cc2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 8 23:29:16 2012 +0100 wined3d: Introduce a separate function for generating the fixed function fog GLSL code. --- dlls/wined3d/glsl_shader.c | 62 +++++++++++++++++++++++-------------------- 1 files changed, 33 insertions(+), 29 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index dc0e328..ed9fc80 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4360,6 +4360,36 @@ static GLhandleARB generate_param_reorder_function(struct wined3d_shader_buffer return ret; } +static void shader_glsl_generate_fog_code(struct wined3d_shader_buffer *buffer, enum fogmode mode) +{ + switch (mode) + { + case FOG_OFF: + return; + + case FOG_LINEAR: + /* Fog = (gl_Fog.end - gl_FogFragCoord) / (gl_Fog.end - gl_Fog.start) */ + shader_addline(buffer, "float Fog = (gl_Fog.end - gl_FogFragCoord) / (gl_Fog.end - gl_Fog.start);\n"); + break; + + case FOG_EXP: + /* Fog = e^-(gl_Fog.density * gl_FogFragCoord) */ + shader_addline(buffer, "float Fog = exp(-gl_Fog.density * gl_FogFragCoord);\n"); + break; + + case FOG_EXP2: + /* Fog = e^-((gl_Fog.density * gl_FogFragCoord)^2) */ + shader_addline(buffer, "float Fog = exp(-gl_Fog.density * gl_Fog.density * gl_FogFragCoord * gl_FogFragCoord);\n"); + break; + + default: + ERR("Invalid fog mode %#x.\n", mode); + return; + } + + shader_addline(buffer, "gl_FragData[0].xyz = mix(gl_Fog.color.xyz, gl_FragData[0].xyz, clamp(Fog, 0.0, 1.0));\n"); +} + /* GL locking is done by the caller */ static void hardcode_local_constants(const struct wined3d_shader *shader, const struct wined3d_gl_info *gl_info, GLhandleARB programId, const char *prefix) @@ -4435,36 +4465,10 @@ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context shader_addline(buffer, "gl_FragData[0].xyz = mix(tmp0.xyz, tmp1.xyz, vec3(srgb_compare));\n"); shader_addline(buffer, "gl_FragData[0] = clamp(gl_FragData[0], 0.0, 1.0);\n"); } - /* Pixel shader < 3.0 do not replace the fog stage. - * This implements linear fog computation and blending. - * TODO: non linear fog - * NOTE: gl_Fog.start and gl_Fog.end don't hold fog start s and end e but - * -1/(e-s) and e/(e-s) respectively. - */ + + /* SM < 3 does not replace the fog stage. */ if (reg_maps->shader_version.major < 3) - { - switch(args->fog) { - case FOG_OFF: break; - case FOG_LINEAR: - shader_addline(buffer, "float fogstart = -1.0 / (gl_Fog.end - gl_Fog.start);\n"); - shader_addline(buffer, "float fogend = gl_Fog.end * -fogstart;\n"); - shader_addline(buffer, "float Fog = clamp(gl_FogFragCoord * fogstart + fogend, 0.0, 1.0);\n"); - shader_addline(buffer, "gl_FragData[0].xyz = mix(gl_Fog.color.xyz, gl_FragData[0].xyz, Fog);\n"); - break; - case FOG_EXP: - /* Fog = e^(-gl_Fog.density * gl_FogFragCoord) */ - shader_addline(buffer, "float Fog = exp(-gl_Fog.density * gl_FogFragCoord);\n"); - shader_addline(buffer, "Fog = clamp(Fog, 0.0, 1.0);\n"); - shader_addline(buffer, "gl_FragData[0].xyz = mix(gl_Fog.color.xyz, gl_FragData[0].xyz, Fog);\n"); - break; - case FOG_EXP2: - /* Fog = e^(-(gl_Fog.density * gl_FogFragCoord)^2) */ - shader_addline(buffer, "float Fog = exp(-gl_Fog.density * gl_Fog.density * gl_FogFragCoord * gl_FogFragCoord);\n"); - shader_addline(buffer, "Fog = clamp(Fog, 0.0, 1.0);\n"); - shader_addline(buffer, "gl_FragData[0].xyz = mix(gl_Fog.color.xyz, gl_FragData[0].xyz, Fog);\n"); - break; - } - } + shader_glsl_generate_fog_code(buffer, args->fog); shader_addline(buffer, "}\n");

1 0

Henri Verbeet : ddraw: Avoid LPDIRECT3DTEXTURE2.
by Alexandre Julliard 09 Nov '12

09 Nov '12

Module: wine Branch: master Commit: 1b9dcb16ced5a61301c358bab9749abd7c87d1dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b9dcb16ced5a61301c358bab… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 8 23:29:15 2012 +0100 ddraw: Avoid LPDIRECT3DTEXTURE2. --- include/d3d.h | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/d3d.h b/include/d3d.h index a139481..fe79711 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -616,7 +616,7 @@ DECLARE_INTERFACE_(IDirect3DTexture2,IUnknown) /*** IDirect3DTexture2 methods ***/ STDMETHOD(GetHandle)(THIS_ LPDIRECT3DDEVICE2 lpDirect3DDevice2, LPD3DTEXTUREHANDLE lpHandle) PURE; STDMETHOD(PaletteChanged)(THIS_ DWORD dwStart, DWORD dwCount) PURE; - STDMETHOD(Load)(THIS_ LPDIRECT3DTEXTURE2 lpD3DTexture2) PURE; + STDMETHOD(Load)(THIS_ IDirect3DTexture2 *texture) PURE; }; #undef INTERFACE @@ -1026,7 +1026,7 @@ DECLARE_INTERFACE_(IDirect3DDevice2,IUnknown) STDMETHOD_(ULONG,Release)(THIS) PURE; /*** IDirect3DDevice2 methods ***/ STDMETHOD(GetCaps)(THIS_ LPD3DDEVICEDESC lpD3DHWDevDesc, LPD3DDEVICEDESC lpD3DHELDevDesc) PURE; - STDMETHOD(SwapTextureHandles)(THIS_ LPDIRECT3DTEXTURE2 lpD3DTex1, LPDIRECT3DTEXTURE2 lpD3DTex2) PURE; + STDMETHOD(SwapTextureHandles)(THIS_ IDirect3DTexture2 *tex1, IDirect3DTexture2 *tex2) PURE; STDMETHOD(GetStats)(THIS_ LPD3DSTATS lpD3DStats) PURE; STDMETHOD(AddViewport)(THIS_ LPDIRECT3DVIEWPORT2 lpDirect3DViewport2) PURE; STDMETHOD(DeleteViewport)(THIS_ LPDIRECT3DVIEWPORT2 lpDirect3DViewport2) PURE; @@ -1181,8 +1181,8 @@ DECLARE_INTERFACE_(IDirect3DDevice3,IUnknown) STDMETHOD(DrawIndexedPrimitiveVB)(THIS_ D3DPRIMITIVETYPE primitive_type, struct IDirect3DVertexBuffer *vb, WORD *indices, DWORD index_count, DWORD flags) PURE; STDMETHOD(ComputeSphereVisibility)(THIS_ LPD3DVECTOR lpCenters,LPD3DVALUE lpRadii,DWORD dwNumSpheres,DWORD dwFlags,LPDWORD lpdwReturnValues) PURE; - STDMETHOD(GetTexture)(THIS_ DWORD dwStage,LPDIRECT3DTEXTURE2 *lplpTexture2) PURE; - STDMETHOD(SetTexture)(THIS_ DWORD dwStage,LPDIRECT3DTEXTURE2 lpTexture2) PURE; + STDMETHOD(GetTexture)(THIS_ DWORD stage, IDirect3DTexture2 **texture) PURE; + STDMETHOD(SetTexture)(THIS_ DWORD stage, IDirect3DTexture2 *texture) PURE; STDMETHOD(GetTextureStageState)(THIS_ DWORD dwStage,D3DTEXTURESTAGESTATETYPE d3dTexStageStateType,LPDWORD lpdwState) PURE; STDMETHOD(SetTextureStageState)(THIS_ DWORD dwStage,D3DTEXTURESTAGESTATETYPE d3dTexStageStateType,DWORD dwState) PURE; STDMETHOD(ValidateDevice)(THIS_ LPDWORD lpdwPasses) PURE;

1 0

Henri Verbeet : ddraw: Avoid LPDIRECT3DEXECUTEBUFFER.
by Alexandre Julliard 09 Nov '12

09 Nov '12

Module: wine Branch: master Commit: 261a6c30b6f8b843d2e6f8a61916767ece9cc146 URL: http://source.winehq.org/git/wine.git/?a=commit;h=261a6c30b6f8b843d2e6f8a61… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 8 23:29:14 2012 +0100 ddraw: Avoid LPDIRECT3DEXECUTEBUFFER. --- include/d3d.h | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/include/d3d.h b/include/d3d.h index 26afbda..a139481 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -939,13 +939,16 @@ DECLARE_INTERFACE_(IDirect3DDevice,IUnknown) STDMETHOD(Initialize)(THIS_ LPDIRECT3D lpDirect3D, LPGUID lpGUID, LPD3DDEVICEDESC lpD3DDVDesc) PURE; STDMETHOD(GetCaps)(THIS_ LPD3DDEVICEDESC lpD3DHWDevDesc, LPD3DDEVICEDESC lpD3DHELDevDesc) PURE; STDMETHOD(SwapTextureHandles)(THIS_ LPDIRECT3DTEXTURE lpD3Dtex1, LPDIRECT3DTEXTURE lpD3DTex2) PURE; - STDMETHOD(CreateExecuteBuffer)(THIS_ LPD3DEXECUTEBUFFERDESC lpDesc, LPDIRECT3DEXECUTEBUFFER *lplpDirect3DExecuteBuffer, IUnknown *pUnkOuter) PURE; + STDMETHOD(CreateExecuteBuffer)(THIS_ D3DEXECUTEBUFFERDESC *desc, + IDirect3DExecuteBuffer **buffer, IUnknown *outer) PURE; STDMETHOD(GetStats)(THIS_ LPD3DSTATS lpD3DStats) PURE; - STDMETHOD(Execute)(THIS_ LPDIRECT3DEXECUTEBUFFER lpDirect3DExecuteBuffer, LPDIRECT3DVIEWPORT lpDirect3DViewport, DWORD dwFlags) PURE; + STDMETHOD(Execute)(THIS_ IDirect3DExecuteBuffer *buffer, IDirect3DViewport *viewport, + DWORD flags) PURE; STDMETHOD(AddViewport)(THIS_ LPDIRECT3DVIEWPORT lpDirect3DViewport) PURE; STDMETHOD(DeleteViewport)(THIS_ LPDIRECT3DVIEWPORT lpDirect3DViewport) PURE; STDMETHOD(NextViewport)(THIS_ LPDIRECT3DVIEWPORT lpDirect3DViewport, LPDIRECT3DVIEWPORT *lplpDirect3DViewport, DWORD dwFlags) PURE; - STDMETHOD(Pick)(THIS_ LPDIRECT3DEXECUTEBUFFER lpDirect3DExecuteBuffer, LPDIRECT3DVIEWPORT lpDirect3DViewport, DWORD dwFlags, LPD3DRECT lpRect) PURE; + STDMETHOD(Pick)(THIS_ IDirect3DExecuteBuffer *buffer, IDirect3DViewport *viewport, + DWORD flags, D3DRECT *rect) PURE; STDMETHOD(GetPickRecords)(THIS_ LPDWORD lpCount, LPD3DPICKRECORD lpD3DPickRec) PURE; STDMETHOD(EnumTextureFormats)(THIS_ LPD3DENUMTEXTUREFORMATSCALLBACK lpD3DEnumTextureProc, LPVOID lpArg) PURE; STDMETHOD(CreateMatrix)(THIS_ LPD3DMATRIXHANDLE lpD3DMatHandle) PURE;

1 0

Henri Verbeet : ddraw: Avoid LPDIRECT3DVERTEXBUFFER.
by Alexandre Julliard 09 Nov '12

09 Nov '12

Module: wine Branch: master Commit: f088901c94f565bfb15a36821a4a8209867fda4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f088901c94f565bfb15a36821… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 8 23:29:13 2012 +0100 ddraw: Avoid LPDIRECT3DVERTEXBUFFER. --- include/d3d.h | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/include/d3d.h b/include/d3d.h index d47df27..26afbda 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -313,7 +313,8 @@ DECLARE_INTERFACE_(IDirect3D3,IUnknown) STDMETHOD(FindDevice)(THIS_ LPD3DFINDDEVICESEARCH lpD3DDFS, LPD3DFINDDEVICERESULT lpD3DFDR) PURE; STDMETHOD(CreateDevice)(THIS_ REFCLSID rclsid, IDirectDrawSurface4 *surface, struct IDirect3DDevice3 **device, IUnknown *outer) PURE; - STDMETHOD(CreateVertexBuffer)(THIS_ LPD3DVERTEXBUFFERDESC lpD3DVertBufDesc,LPDIRECT3DVERTEXBUFFER *lplpD3DVertBuf,DWORD dwFlags,LPUNKNOWN lpUnk) PURE; + STDMETHOD(CreateVertexBuffer)(THIS_ D3DVERTEXBUFFERDESC *desc, struct IDirect3DVertexBuffer **buffer, + DWORD flags, IUnknown *outer) PURE; STDMETHOD(EnumZBufferFormats)(THIS_ REFCLSID riidDevice,LPD3DENUMPIXELFORMATSCALLBACK lpEnumCallback,LPVOID lpContext) PURE; STDMETHOD(EvictManagedTextures)(THIS) PURE; }; @@ -1172,8 +1173,10 @@ DECLARE_INTERFACE_(IDirect3DDevice3,IUnknown) STDMETHOD(GetClipStatus)(THIS_ LPD3DCLIPSTATUS lpD3DClipStatus) PURE; STDMETHOD(DrawPrimitiveStrided)(THIS_ D3DPRIMITIVETYPE d3dptPrimitiveType,DWORD dwVertexType,LPD3DDRAWPRIMITIVESTRIDEDDATA lpD3DDrawPrimStrideData,DWORD dwVertexCount,DWORD dwFlags) PURE; STDMETHOD(DrawIndexedPrimitiveStrided)(THIS_ D3DPRIMITIVETYPE d3dptPrimitiveType,DWORD dwVertexType,LPD3DDRAWPRIMITIVESTRIDEDDATA lpD3DDrawPrimStrideData,DWORD dwVertexCount,LPWORD lpIndex,DWORD dwIndexCount,DWORD dwFlags) PURE; - STDMETHOD(DrawPrimitiveVB)(THIS_ D3DPRIMITIVETYPE d3dptPrimitiveType,LPDIRECT3DVERTEXBUFFER lpD3DVertexBuf,DWORD dwStartVertex,DWORD dwNumVertices,DWORD dwFlags) PURE; - STDMETHOD(DrawIndexedPrimitiveVB)(THIS_ D3DPRIMITIVETYPE d3dptPrimitiveType,LPDIRECT3DVERTEXBUFFER lpD3DVertexBuf,LPWORD lpwIndices,DWORD dwIndexCount,DWORD dwFlags) PURE; + STDMETHOD(DrawPrimitiveVB)(THIS_ D3DPRIMITIVETYPE primitive_type, struct IDirect3DVertexBuffer *vb, + DWORD start_vertex, DWORD vertex_count, DWORD flags) PURE; + STDMETHOD(DrawIndexedPrimitiveVB)(THIS_ D3DPRIMITIVETYPE primitive_type, struct IDirect3DVertexBuffer *vb, + WORD *indices, DWORD index_count, DWORD flags) PURE; STDMETHOD(ComputeSphereVisibility)(THIS_ LPD3DVECTOR lpCenters,LPD3DVALUE lpRadii,DWORD dwNumSpheres,DWORD dwFlags,LPDWORD lpdwReturnValues) PURE; STDMETHOD(GetTexture)(THIS_ DWORD dwStage,LPDIRECT3DTEXTURE2 *lplpTexture2) PURE; STDMETHOD(SetTexture)(THIS_ DWORD dwStage,LPDIRECT3DTEXTURE2 lpTexture2) PURE; @@ -1459,7 +1462,9 @@ DECLARE_INTERFACE_(IDirect3DVertexBuffer,IUnknown) /*** IDirect3DVertexBuffer methods ***/ STDMETHOD(Lock)(THIS_ DWORD dwFlags,LPVOID *lplpData,LPDWORD lpdwSize) PURE; STDMETHOD(Unlock)(THIS) PURE; - STDMETHOD(ProcessVertices)(THIS_ DWORD dwVertexOp,DWORD dwDestIndex,DWORD dwCount,LPDIRECT3DVERTEXBUFFER lpSrcBuffer,DWORD dwSrcIndex,LPDIRECT3DDEVICE3 lpD3DDevice,DWORD dwFlags) PURE; + STDMETHOD(ProcessVertices)(THIS_ DWORD vertex_op, DWORD dst_idx, DWORD count, + IDirect3DVertexBuffer *src_buffer, DWORD src_idx, + IDirect3DDevice3 *device, DWORD flags) PURE; STDMETHOD(GetVertexBufferDesc)(THIS_ LPD3DVERTEXBUFFERDESC lpD3DVertexBufferDesc) PURE; STDMETHOD(Optimize)(THIS_ LPDIRECT3DDEVICE3 lpD3DDevice,DWORD dwFlags) PURE; };

1 0

Józef Kucia : d3dx9: Handle NULL arguments in D3DXVec3Unproject.
by Alexandre Julliard 08 Nov '12

08 Nov '12

Module: wine Branch: master Commit: 3e264ced0f2502093940ddda21ecbd024b7dd815 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e264ced0f2502093940ddda2… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Thu Nov 8 13:45:55 2012 +0100 d3dx9: Handle NULL arguments in D3DXVec3Unproject. --- dlls/d3dx9_36/math.c | 14 +++++--------- dlls/d3dx9_36/tests/math.c | 12 ++++++++++++ 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index 78317e8..0aebff0 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -1936,16 +1936,12 @@ D3DXVECTOR3* WINAPI D3DXVec3Unproject(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv, TRACE("(%p, %p, %p, %p, %p, %p)\n", pout, pv, pviewport, pprojection, pview, pworld); - if (pworld) - { - D3DXMatrixMultiply(&m, pworld, pview); - D3DXMatrixMultiply(&m, &m, pprojection); - } - else - { - D3DXMatrixMultiply(&m, pview, pprojection); - } + D3DXMatrixIdentity(&m); + if (pworld) D3DXMatrixMultiply(&m, &m, pworld); + if (pview) D3DXMatrixMultiply(&m, &m, pview); + if (pprojection) D3DXMatrixMultiply(&m, &m, pprojection); D3DXMatrixInverse(&m, NULL, &m); + *pout = *pv; if (pviewport) { diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 9bcd42c..53262b7 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -1401,6 +1401,18 @@ static void D3DXVector3Test(void) D3DXMatrixMultiply(&mat,&world,&view); D3DXVec3Unproject(&gotvec,&u,&viewport,&projection,&mat,NULL); expect_vec3(expectedvec,gotvec); + /* Projection matrix can be omitted */ + D3DXMatrixMultiply(&mat,&view,&projection); + D3DXVec3Unproject(&gotvec,&u,&viewport,NULL,&mat,&world); + expect_vec3(expectedvec,gotvec); + /* View matrix can be omitted */ + D3DXMatrixMultiply(&mat,&world,&view); + D3DXVec3Unproject(&gotvec,&u,&viewport,&projection,NULL,&mat); + expect_vec3(expectedvec,gotvec); + /* All matrices can be omitted */ + expectedvec.x = -1.002500f; expectedvec.y = 0.997059f; expectedvec.z = 2.571429f; + D3DXVec3Unproject(&gotvec,&u,&viewport,NULL,NULL,NULL); + expect_vec3(expectedvec,gotvec); /* Viewport can be omitted */ expectedvec.x = -11.018396f; expectedvec.y = 3.218991f; expectedvec.z = 1.380329f; D3DXVec3Unproject(&gotvec,&u,NULL,&projection,&view,&world);

1 0

← Newer
1
...
18
19
20
21
22
23
24
...
29
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2012