November 2012 - Wine-Commits

Jacek Caban : mshtml: Call set_current_uri in navigate_proc.
by Alexandre Julliard Nov. 9, 2012

Nov. 9, 2012

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

Henri Verbeet : wined3d: Introduce a separate function for generating the sRGB write GLSL code.
by Alexandre Julliard Nov. 9, 2012

Nov. 9, 2012

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 Nov. 9, 2012

Nov. 9, 2012

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

Jörg Höhle : winmm: Prefer using MMSYSERR_* over AUDCLNT_E_* from mmdevapi.
by Alexandre Julliard Nov. 9, 2012

Nov. 9, 2012

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

Henri Verbeet : ddraw: Avoid LPDIRECT3DVERTEXBUFFER.
by Alexandre Julliard Nov. 9, 2012

Nov. 9, 2012

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

Henri Verbeet : ddraw: Avoid LPDIRECT3DEXECUTEBUFFER.
by Alexandre Julliard Nov. 9, 2012

Nov. 9, 2012

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

Jacek Caban : mshtml: Don't pass hash part of URI to EvaluateNewWindow.
by Alexandre Julliard Nov. 9, 2012

Nov. 9, 2012

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

Daniel Lehman : msvcp90/tests: Add fstream<>::tellg tests.
by Alexandre Julliard Nov. 9, 2012

Nov. 9, 2012

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 IPersistHistory::SaveHistory implementation.
by Alexandre Julliard Nov. 9, 2012

Nov. 9, 2012

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

Michael Stefaniuc : msi: Use FIELD_OFFSET to calculate the size of structs with variable length array .
by Alexandre Julliard Nov. 9, 2012

Nov. 9, 2012

Module: wine Branch: master Commit: 51013ad27844de2a176287b6f3edbeccd972ee68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51013ad27844de2a176287b6f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Nov 9 16:47:44 2012 +0100 msi: Use FIELD_OFFSET to calculate the size of structs with variable length array. --- dlls/msi/dialog.c | 4 ++-- dlls/msi/table.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 85d5859..c0ff204 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -309,7 +309,7 @@ static UINT msi_dialog_add_font( MSIRECORD *rec, LPVOID param ) /* create a font and add it to the list */ name = MSI_RecordGetString( rec, 1 ); - font = msi_alloc( sizeof *font + strlenW( name )*sizeof (WCHAR) ); + font = msi_alloc( FIELD_OFFSET( msi_font, name[strlenW( name ) + 1] )); strcpyW( font->name, name ); list_add_head( &dialog->fonts, &font->entry ); @@ -414,7 +414,7 @@ static msi_control *msi_dialog_create_window( msi_dialog *dialog, style |= WS_CHILD; - control = msi_alloc( sizeof *control + strlenW(name)*sizeof(WCHAR) ); + control = msi_alloc( FIELD_OFFSET( msi_control, name[strlenW( name ) + 1] )); if (!control) return NULL; diff --git a/dlls/msi/table.c b/dlls/msi/table.c index c5aa685..e2186fc 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -2141,7 +2141,7 @@ UINT TABLE_CreateView( MSIDATABASE *db, LPCWSTR name, MSIVIEW **view ) else if ( !strcmpW( name, szStorages ) ) return STORAGES_CreateView( db, view ); - sz = sizeof *tv + lstrlenW(name)*sizeof name[0] ; + sz = FIELD_OFFSET( MSITABLEVIEW, name[lstrlenW( name ) + 1] ); tv = msi_alloc_zero( sz ); if( !tv ) return ERROR_FUNCTION_FAILED;

1 0