December 2010 - Wine-Commits

Henri Verbeet : wined3d: Explicitly pass gl_info to shader_arb_generate_pshader().
by Alexandre Julliard Dec. 7, 2010

Dec. 7, 2010

Module: wine Branch: master Commit: cd30e9562cfba5eedb20b027415e3852e315df1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd30e9562cfba5eedb20b0274… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 6 20:33:04 2010 +0100 wined3d: Explicitly pass gl_info to shader_arb_generate_pshader(). --- dlls/wined3d/arb_program_shader.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 3a8f758..483d253 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -3488,12 +3488,12 @@ static void init_ps_input(const IWineD3DPixelShaderImpl *This, const struct arb_ } /* GL locking is done by the caller */ -static GLuint shader_arb_generate_pshader(IWineD3DPixelShaderImpl *This, struct wined3d_shader_buffer *buffer, +static GLuint shader_arb_generate_pshader(IWineD3DPixelShaderImpl *This, + const struct wined3d_gl_info *gl_info, struct wined3d_shader_buffer *buffer, const struct arb_ps_compile_args *args, struct arb_ps_compiled_shader *compiled) { const struct wined3d_shader_reg_maps *reg_maps = &This->baseShader.reg_maps; CONST DWORD *function = This->baseShader.function; - const struct wined3d_gl_info *gl_info = &((IWineD3DDeviceImpl *)This->baseShader.device)->adapter->gl_info; const local_constant *lconst; GLuint retval; char fragcolor[16]; @@ -4233,6 +4233,7 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShaderImpl *This, static struct arb_ps_compiled_shader *find_arb_pshader(IWineD3DPixelShaderImpl *shader, const struct arb_ps_compile_args *args) { IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *)shader->baseShader.device; + const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; UINT i; DWORD new_size; struct arb_ps_compiled_shader *new_array; @@ -4242,7 +4243,6 @@ static struct arb_ps_compiled_shader *find_arb_pshader(IWineD3DPixelShaderImpl * if (!shader->baseShader.backend_data) { - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; struct shader_arb_priv *priv = device->shader_priv; shader->baseShader.backend_data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*shader_data)); @@ -4304,8 +4304,8 @@ static struct arb_ps_compiled_shader *find_arb_pshader(IWineD3DPixelShaderImpl * return 0; } - ret = shader_arb_generate_pshader(shader, &buffer, args, - &shader_data->gl_shaders[shader_data->num_gl_shaders]); + ret = shader_arb_generate_pshader(shader, gl_info, &buffer, args, + &shader_data->gl_shaders[shader_data->num_gl_shaders]); shader_buffer_free(&buffer); shader_data->gl_shaders[shader_data->num_gl_shaders].prgId = ret;

1 0

Henri Verbeet : wined3d: Rename shader_reg_maps to wined3d_shader_reg_maps.
by Alexandre Julliard Dec. 7, 2010

Dec. 7, 2010

Module: wine Branch: master Commit: db164a990cb555a919b75a57c60ded034f8ffea8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db164a990cb555a919b75a57c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 6 20:33:02 2010 +0100 wined3d: Rename shader_reg_maps to wined3d_shader_reg_maps. For consistency with other shader translation structures. --- dlls/wined3d/arb_program_shader.c | 27 ++++++++++++++------------- dlls/wined3d/glsl_shader.c | 19 +++++++++++-------- dlls/wined3d/shader.c | 14 +++++++------- dlls/wined3d/wined3d_private.h | 15 ++++++++------- 4 files changed, 40 insertions(+), 35 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=db164a990cb555a919b75…

1 0

Andrew Bogott : winemenubuilder: Include icons in .url menus.
by Alexandre Julliard Dec. 7, 2010

Dec. 7, 2010

Module: wine Branch: master Commit: 6197866dc06f1c576b6cb652ba41ee6ad601aec4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6197866dc06f1c576b6cb652b… Author: Andrew Bogott <andrew(a)CodeWeavers.com> Date: Thu Nov 25 00:34:35 2010 -0600 winemenubuilder: Include icons in .url menus. --- programs/winemenubuilder/winemenubuilder.c | 34 +++++++++++++++++++++++++-- 1 files changed, 31 insertions(+), 3 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 324aab8..78d6bd6 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -2620,7 +2620,7 @@ cleanup: static BOOL InvokeShellLinkerForURL( IUniformResourceLocatorW *url, LPCWSTR link, BOOL bWait ) { - char *link_name = NULL; + char *link_name = NULL, *icon_name = NULL; DWORD csidl = -1; LPWSTR urlPath; char *escaped_urlPath = NULL; @@ -2629,6 +2629,10 @@ static BOOL InvokeShellLinkerForURL( IUniformResourceLocatorW *url, LPCWSTR link BOOL ret = TRUE; int r = -1; char *unix_link = NULL; + IPropertySetStorage *pPropSetStg; + IPropertyStorage *pPropStg; + PROPSPEC ps[2]; + PROPVARIANT pv[2]; if ( !link ) { @@ -2671,6 +2675,29 @@ static BOOL InvokeShellLinkerForURL( IUniformResourceLocatorW *url, LPCWSTR link goto cleanup; } + ps[0].ulKind = PRSPEC_PROPID; + ps[0].propid = PID_IS_ICONFILE; + ps[1].ulKind = PRSPEC_PROPID; + ps[1].propid = PID_IS_ICONINDEX; + + hr = url->lpVtbl->QueryInterface(url, &IID_IPropertySetStorage, (void **) &pPropSetStg); + if (SUCCEEDED(hr)) + { + hr = IPropertySetStorage_Open(pPropSetStg, &FMTID_Intshcut, STGM_READ | STGM_SHARE_EXCLUSIVE, &pPropStg); + if (SUCCEEDED(hr)) + { + hr = IPropertyStorage_ReadMultiple(pPropStg, 2, ps, pv); + if (SUCCEEDED(hr)) + { + icon_name = extract_icon( pv[0].pwszVal, pv[1].iVal, NULL, bWait ); + + WINE_TRACE("URL icon path: %s icon index: %d icon name: %s\n", wine_dbgstr_w(pv[0].pwszVal), pv[1].iVal, icon_name); + } + IPropertyStorage_Release(pPropStg); + } + IPropertySetStorage_Release(pPropSetStg); + } + hSem = CreateSemaphoreA( NULL, 1, 1, "winemenubuilder_semaphore"); if( WAIT_OBJECT_0 != MsgWaitForMultipleObjects( 1, &hSem, FALSE, INFINITE, QS_ALLINPUT ) ) { @@ -2689,20 +2716,21 @@ static BOOL InvokeShellLinkerForURL( IUniformResourceLocatorW *url, LPCWSTR link location = heap_printf("%s/%s.desktop", xdg_desktop_dir, lastEntry); if (location) { - r = !write_desktop_entry(NULL, location, lastEntry, "winebrowser", escaped_urlPath, NULL, NULL, NULL); + r = !write_desktop_entry(NULL, location, lastEntry, "winebrowser", escaped_urlPath, NULL, NULL, icon_name); if (r == 0) chmod(location, 0755); HeapFree(GetProcessHeap(), 0, location); } } else - r = !write_menu_entry(unix_link, link_name, "winebrowser", escaped_urlPath, NULL, NULL, NULL); + r = !write_menu_entry(unix_link, link_name, "winebrowser", escaped_urlPath, NULL, NULL, icon_name); ret = (r != 0); ReleaseSemaphore(hSem, 1, NULL); cleanup: if (hSem) CloseHandle(hSem); + HeapFree( GetProcessHeap(), 0, icon_name ); HeapFree(GetProcessHeap(), 0, link_name); CoTaskMemFree( urlPath ); HeapFree(GetProcessHeap(), 0, escaped_urlPath);

1 0

Henri Verbeet : wined3d: Explicitly pass gl_info to shader_arb_generate_vshader().
by Alexandre Julliard Dec. 7, 2010

Dec. 7, 2010

Module: wine Branch: master Commit: 202a60c489fff8c7b61081813ee4b64374de90a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=202a60c489fff8c7b61081813… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 6 20:33:03 2010 +0100 wined3d: Explicitly pass gl_info to shader_arb_generate_vshader(). --- dlls/wined3d/arb_program_shader.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index bc710e5..3a8f758 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4067,14 +4067,13 @@ static void init_output_registers(IWineD3DVertexShaderImpl *shader, DWORD sig_nu } /* GL locking is done by the caller */ -static GLuint shader_arb_generate_vshader(IWineD3DVertexShaderImpl *This, struct wined3d_shader_buffer *buffer, +static GLuint shader_arb_generate_vshader(IWineD3DVertexShaderImpl *This, + const struct wined3d_gl_info *gl_info, struct wined3d_shader_buffer *buffer, const struct arb_vs_compile_args *args, struct arb_vs_compiled_shader *compiled) { const struct arb_vshader_private *shader_data = This->baseShader.backend_data; const struct wined3d_shader_reg_maps *reg_maps = &This->baseShader.reg_maps; CONST DWORD *function = This->baseShader.function; - IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *)This->baseShader.device; - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; const local_constant *lconst; GLuint ret; DWORD next_local, *lconst_map = local_const_mapping((IWineD3DBaseShaderImpl *) This); @@ -4163,6 +4162,7 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShaderImpl *This, struct */ if (!gl_info->supported[NV_VERTEX_PROGRAM]) { + IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *)This->baseShader.device; const char *color_init = arb_get_helper_value(WINED3D_SHADER_TYPE_VERTEX, ARB_0001); shader_addline(buffer, "MOV result.color.secondary, %s;\n", color_init); @@ -4401,7 +4401,7 @@ static struct arb_vs_compiled_shader *find_arb_vshader(IWineD3DVertexShaderImpl return 0; } - ret = shader_arb_generate_vshader(shader, &buffer, args, + ret = shader_arb_generate_vshader(shader, gl_info, &buffer, args, &shader_data->gl_shaders[shader_data->num_gl_shaders]); shader_buffer_free(&buffer); shader_data->gl_shaders[shader_data->num_gl_shaders].prgId = ret;

1 0

Henri Verbeet : d3d9/tests: Don't draw undefined data in stream_test().
by Alexandre Julliard Dec. 7, 2010

Dec. 7, 2010

Module: wine Branch: master Commit: ac2afd08aee6e744b7b9ec59aabadae1e71dfbef URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac2afd08aee6e744b7b9ec59a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 6 20:33:01 2010 +0100 d3d9/tests: Don't draw undefined data in stream_test(). --- dlls/d3d9/tests/visual.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index d2c5df5..db67be3 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -9306,8 +9306,7 @@ static void stream_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_SetStreamSource(device, act.strInstance, vb3, 0, sizeof(instancepos[0])); ok(hr == D3D_OK, "IDirect3DIndexBuffer9_Unlock failed with %08x (case %i)\n", hr, i); - /* don't know if this is right (1*3 and 4*1)*/ - hr = IDirect3DDevice9_DrawIndexedPrimitive(device, D3DPT_TRIANGLELIST, 0, 0, 1 * 3 , 0, 4*1); + hr = IDirect3DDevice9_DrawIndexedPrimitive(device, D3DPT_TRIANGLELIST, 0, 0, 4, 0, 2); ok(hr == D3D_OK, "IDirect3DDevice9_DrawIndexedPrimitive failed with %08x (case %i)\n", hr, i); hr = IDirect3DDevice9_EndScene(device); ok(hr == D3D_OK, "IDirect3DDevice9_EndScene failed with %08x (case %i)\n", hr, i);

1 0

Michael Stefaniuc : mshtml: Use an iface instead of a vtbl pointer in HTMLEventObj.
by Alexandre Julliard Dec. 7, 2010

Dec. 7, 2010

Module: wine Branch: master Commit: 0d2f29a0105d3decd47ee97f63927e95f895e6c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d2f29a0105d3decd47ee97f6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 6 23:31:16 2010 +0100 mshtml: Use an iface instead of a vtbl pointer in HTMLEventObj. --- dlls/mshtml/htmlevent.c | 87 +++++++++++++++++++++++------------------------ 1 files changed, 43 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0d2f29a0105d3decd47ee…

1 0

Andrew Eikum : shell32: Correctly construct the PIDL given to SHChangeNotify in AddFolder.
by Alexandre Julliard Dec. 6, 2010

Dec. 6, 2010

Module: wine Branch: master Commit: 0a55ec2c9e1dc5fd0b99ad1202fd7849b0187808 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a55ec2c9e1dc5fd0b99ad120… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Dec 3 11:50:12 2010 -0600 shell32: Correctly construct the PIDL given to SHChangeNotify in AddFolder. --- dlls/shell32/shfldr_fs.c | 30 ++++++++++++++++++++++++++---- 1 files changed, 26 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index 850424d..084dffd 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -1232,12 +1232,34 @@ ISFHelper_fnAddFolder (ISFHelper * iface, HWND hwnd, LPCWSTR pwszName, bRes = CreateDirectoryW (wszNewDir, NULL); if (bRes) { - SHChangeNotify (SHCNE_MKDIR, SHCNF_PATHW, wszNewDir, NULL); + LPITEMIDLIST relPidl; - hres = S_OK; + lstrcpyW(wszNewDir, pwszName); + + hres = IShellFolder_ParseDisplayName((IShellFolder*)&This->lpvtblShellFolder, + hwnd, NULL, wszNewDir, NULL, &relPidl, NULL); + + if (SUCCEEDED(hres)) { + LPITEMIDLIST fullPidl; + + fullPidl = ILCombine(This->pidlRoot, relPidl); + + if (fullPidl) { + SHChangeNotify(SHCNE_MKDIR, SHCNF_IDLIST, fullPidl, NULL); + ILFree(fullPidl); + + if (ppidlOut) + *ppidlOut = relPidl; + else + ILFree(relPidl); + } else { + WARN("failed to combine %s into a full PIDL\n", wine_dbgstr_w(pwszName)); + ILFree(relPidl); + } + + } else + WARN("failed to parse %s into a PIDL\n", wine_dbgstr_w(pwszName)); - if (ppidlOut) - hres = _ILCreateFromPathW(wszNewDir, ppidlOut); } else { WCHAR wszText[128 + MAX_PATH]; WCHAR wszTempText[128];

1 0

Andrew Bogott : shdocvw: Add tests for IPersistFile on an internet shortcut .
by Alexandre Julliard Dec. 6, 2010

Dec. 6, 2010

Module: wine Branch: master Commit: 23aa460722f53c00d06a7eb0f581c4c46510e05b URL: http://source.winehq.org/git/wine.git/?a=commit;h=23aa460722f53c00d06a7eb0f… Author: Andrew Bogott <andrew(a)CodeWeavers.com> Date: Wed Nov 24 15:56:08 2010 -0600 shdocvw: Add tests for IPersistFile on an internet shortcut. --- dlls/shdocvw/tests/intshcut.c | 67 ++++++++++++++++++++++++++++++++++------- 1 files changed, 56 insertions(+), 11 deletions(-) diff --git a/dlls/shdocvw/tests/intshcut.c b/dlls/shdocvw/tests/intshcut.c index 5245d9f..56efdba 100644 --- a/dlls/shdocvw/tests/intshcut.c +++ b/dlls/shdocvw/tests/intshcut.c @@ -177,27 +177,28 @@ static void test_ReadAndWriteProperties(void) { HRESULT hr; IUniformResourceLocatorA *urlA; - IPropertySetStorage *pPropSetStg; + IUniformResourceLocatorA *urlAFromFile; + WCHAR fileNameW[] = {'C',':','/','w','i','n','d','o','w','s','/','t','e','m','p','/','t','e','s','t','s','h','o','r','t','c','u','t','.','u','r','l',0}; + WCHAR iconPath[] = {'f','i','l','e',':','/','/','/','C',':','/','a','r','b','i','t','r','a','r','y','/','i','c','o','n','/','p','a','t','h',0}; + int iconIndex = 7; + char testurl[] = "http://some/bogus/url.html"; + PROPSPEC ps[2]; + ps[0].ulKind = PRSPEC_PROPID; + ps[0].propid = PID_IS_ICONFILE; + ps[1].ulKind = PRSPEC_PROPID; + ps[1].propid = PID_IS_ICONINDEX; hr = CoCreateInstance(&CLSID_InternetShortcut, NULL, CLSCTX_ALL, &IID_IUniformResourceLocatorA, (void**)&urlA); if (hr == S_OK) { - WCHAR iconPath[] = {'f','i','l','e',':','/','/','/','C',':','/','a','r','b','i','t','r','a','r','y','/','i','c','o','n','/','p','a','t','h',0}; - int iconIndex = 7; + IPersistFile *pf; IPropertyStorage *pPropStgWrite; - IPropertyStorage *pPropStgRead; - PROPSPEC ps[2]; + IPropertySetStorage *pPropSetStg; PROPVARIANT pv[2]; - PROPVARIANT pvread[2]; - ps[0].ulKind = PRSPEC_PROPID; - ps[0].propid = PID_IS_ICONFILE; - ps[1].ulKind = PRSPEC_PROPID; - ps[1].propid = PID_IS_ICONINDEX; pv[0].vt = VT_LPWSTR; pv[0].pwszVal = (void *) iconPath; pv[1].vt = VT_I4; pv[1].iVal = iconIndex; - hr = urlA->lpVtbl->QueryInterface(urlA, &IID_IPropertySetStorage, (void **) &pPropSetStg); ok(hr == S_OK, "Unable to get an IPropertySetStorage, hr=0x%x\n", hr); @@ -212,6 +213,49 @@ static void test_ReadAndWriteProperties(void) pPropStgWrite->lpVtbl->Release(pPropStgWrite); + /* We need to set a URL -- IPersistFile refuses to save without one. */ + hr = urlA->lpVtbl->SetURL(urlA, testurl, 0); + ok(hr == S_OK, "Failed to set a URL. hr=0x%x\n", hr); + + /* Write this shortcut out to a file so that we can test reading it in again. */ + hr = urlA->lpVtbl->QueryInterface(urlA, &IID_IPersistFile, (void **) &pf); + ok(hr == S_OK, "Failed to get the IPersistFile for writing. hr=0x%x\n", hr); + + hr = IPersistFile_Save(pf, fileNameW, TRUE); + ok(hr == S_OK, "Failed to save via IPersistFile. hr=0x%x\n", hr); + + IPersistFile_Release(pf); + urlA->lpVtbl->Release(urlA); + IPropertySetStorage_Release(pPropSetStg); + } + else + skip("could not create a CLSID_InternetShortcut for property tests, hr=0x%x\n", hr); + + hr = CoCreateInstance(&CLSID_InternetShortcut, NULL, CLSCTX_ALL, &IID_IUniformResourceLocatorA, (void**)&urlAFromFile); + if (hr == S_OK) + { + IPropertySetStorage *pPropSetStg; + IPropertyStorage *pPropStgRead; + PROPVARIANT pvread[2]; + IPersistFile *pf; + LPSTR url = NULL; + + /* Now read that .url file back in. */ + hr = urlAFromFile->lpVtbl->QueryInterface(urlA, &IID_IPersistFile, (void **) &pf); + ok(hr == S_OK, "Failed to get the IPersistFile for reading. hr=0x%x\n", hr); + + hr = IPersistFile_Load(pf, fileNameW, 0); + ok(hr == S_OK, "Failed to load via IPersistFile. hr=0x%x\n", hr); + IPersistFile_Release(pf); + + + hr = urlA->lpVtbl->GetURL(urlAFromFile, &url); + ok(lstrcmp(url, testurl) == 0, "Wrong url read from file: %s\n",url); + + + hr = urlA->lpVtbl->QueryInterface(urlAFromFile, &IID_IPropertySetStorage, (void **) &pPropSetStg); + ok(hr == S_OK, "Unable to get an IPropertySetStorage, hr=0x%x\n", hr); + hr = IPropertySetStorage_Open(pPropSetStg, &FMTID_Intshcut, STGM_READ | STGM_SHARE_EXCLUSIVE, &pPropStgRead); ok(hr == S_OK, "Unable to get an IPropertyStorage for reading, hr=0x%x\n", hr); @@ -227,6 +271,7 @@ static void test_ReadAndWriteProperties(void) IPropertyStorage_Release(pPropStgRead); IPropertySetStorage_Release(pPropSetStg); urlA->lpVtbl->Release(urlA); + DeleteFileW(fileNameW); } else skip("could not create a CLSID_InternetShortcut for property tests, hr=0x%x\n", hr);

1 0

Maarten Lankhorst : winegstreamer: Always update time when Run is called.
by Alexandre Julliard Dec. 6, 2010

Dec. 6, 2010

Module: wine Branch: master Commit: feb716b423095d11e3af9a87643887c436bde7cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=feb716b423095d11e3af9a876… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Dec 6 14:16:43 2010 +0100 winegstreamer: Always update time when Run is called. --- dlls/winegstreamer/gstdemux.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 403f945..7b1c989 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1179,6 +1179,10 @@ static HRESULT WINAPI GST_Run(IBaseFilter *iface, REFERENCE_TIME tStart) { if (!This->gstfilter) return VFW_E_NOT_CONNECTED; + EnterCriticalSection(&This->filter.csFilter); + This->filter.rtStreamStart = tStart; + LeaveCriticalSection(&This->filter.csFilter); + gst_element_get_state(This->gstfilter, &now, NULL, -1); if (now == GST_STATE_PLAYING) return S_OK;

1 0

Andrew Bogott : shdocvw: Add reading of iconfile and iconframe via IPersistFile.
by Alexandre Julliard Dec. 6, 2010

Dec. 6, 2010

Module: wine Branch: master Commit: 3d5b3bef8bb0fe96f7977eabc60e7888499a2567 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d5b3bef8bb0fe96f7977eabc… Author: Andrew Bogott <andrew(a)CodeWeavers.com> Date: Wed Nov 24 16:47:50 2010 -0600 shdocvw: Add reading of iconfile and iconframe via IPersistFile. --- dlls/shdocvw/intshcut.c | 124 ++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 100 insertions(+), 24 deletions(-) diff --git a/dlls/shdocvw/intshcut.c b/dlls/shdocvw/intshcut.c index a335540..e400f0d 100644 --- a/dlls/shdocvw/intshcut.c +++ b/dlls/shdocvw/intshcut.c @@ -411,10 +411,37 @@ static HRESULT WINAPI PersistFile_IsDirty(IPersistFile *pFile) return This->isDirty ? S_OK : S_FALSE; } +/* A helper function: Allocate and fill rString. Return number of bytes read. */ +static DWORD get_profile_string(LPCWSTR lpAppName, LPCWSTR lpKeyName, + LPCWSTR lpFileName, WCHAR **rString ) +{ + DWORD r = 0; + DWORD len=128; + + *rString = CoTaskMemAlloc(len*sizeof(WCHAR)); + if (rString != NULL) + { + r = GetPrivateProfileStringW(lpAppName, lpKeyName, NULL, *rString, len, lpFileName); + while (r == len-1) + { + CoTaskMemFree(rString); + len *= 2; + rString = CoTaskMemAlloc(len*sizeof(WCHAR)); + if (rString == NULL) + break; + r = GetPrivateProfileStringW(lpAppName, lpKeyName, NULL, *rString, len, lpFileName); + } + } + + return r; +} + static HRESULT WINAPI PersistFile_Load(IPersistFile *pFile, LPCOLESTR pszFileName, DWORD dwMode) { WCHAR str_header[] = {'I','n','t','e','r','n','e','t','S','h','o','r','t','c','u','t',0}; WCHAR str_URL[] = {'U','R','L',0}; + WCHAR str_iconfile[] = {'i','c','o','n','f','i','l','e',0}; + WCHAR str_iconindex[] = {'i','c','o','n','i','n','d','e','x',0}; WCHAR *filename = NULL; HRESULT hr; InternetShortcut *This = impl_from_IPersistFile(pFile); @@ -424,39 +451,88 @@ static HRESULT WINAPI PersistFile_Load(IPersistFile *pFile, LPCOLESTR pszFileNam filename = co_strdupW(pszFileName); if (filename != NULL) { - DWORD len = 128; DWORD r; - WCHAR *url = CoTaskMemAlloc(len*sizeof(WCHAR)); - if (url != NULL) + WCHAR *url; + + r = get_profile_string(str_header, str_URL, pszFileName, &url); + + if (r == 0) + { + hr = E_FAIL; + CoTaskMemFree(filename); + } + else if (url != NULL) + { + hr = S_OK; + CoTaskMemFree(This->currentFile); + This->currentFile = filename; + CoTaskMemFree(This->url); + This->url = url; + This->isDirty = FALSE; + } + else { - r = GetPrivateProfileStringW(str_header, str_URL, NULL, url, len, pszFileName); - while (r == len-1) + hr = E_OUTOFMEMORY; + CoTaskMemFree(filename); + } + + /* Now we're going to read in the iconfile and iconindex. + If we don't find them, that's not a failure case -- it's possible + that they just aren't in there. */ + if (SUCCEEDED(hr)) + { + IPropertyStorage *pPropStg; + WCHAR *iconfile; + WCHAR *iconindexstring; + hr = IPropertySetStorage_Open(This->property_set_storage, &FMTID_Intshcut, + STGM_READWRITE | STGM_SHARE_EXCLUSIVE, + &pPropStg); + + r = get_profile_string(str_header, str_iconfile, pszFileName, &iconfile); + if (iconfile != NULL) { - CoTaskMemFree(url); - len *= 2; - url = CoTaskMemAlloc(len*sizeof(WCHAR)); - if (url == NULL) - break; - r = GetPrivateProfileStringW(str_header, str_URL, NULL, url, len, pszFileName); + PROPSPEC ps; + PROPVARIANT pv; + ps.ulKind = PRSPEC_PROPID; + ps.propid = PID_IS_ICONFILE; + pv.vt = VT_LPWSTR; + pv.pwszVal = iconfile; + hr = IPropertyStorage_WriteMultiple(pPropStg, 1, &ps, &pv, 0); + if (FAILED(hr)) + { + TRACE("Failed to store the iconfile to our property storage. hr = 0x%x\n", hr); + } + + CoTaskMemFree(iconfile); } - if (r == 0) - hr = E_FAIL; - else if (url != NULL) + + r = get_profile_string(str_header, str_iconindex, pszFileName, &iconindexstring); + + if (iconindexstring != NULL) { - CoTaskMemFree(This->currentFile); - This->currentFile = filename; - CoTaskMemFree(This->url); - This->url = url; - This->isDirty = FALSE; - return S_OK; + int iconindex; + PROPSPEC ps; + PROPVARIANT pv; + char *iconindexastring = co_strdupWtoA(iconindexstring); + sscanf(iconindexastring, "%d", &iconindex); + CoTaskMemFree(iconindexastring); + ps.ulKind = PRSPEC_PROPID; + ps.propid = PID_IS_ICONINDEX; + pv.vt = VT_I4; + pv.iVal = iconindex; + hr = IPropertyStorage_WriteMultiple(pPropStg, 1, &ps, &pv, 0); + if (FAILED(hr)) + { + TRACE("Failed to store the iconindex to our property storage. hr = 0x%x\n", hr); + } + + CoTaskMemFree(iconfile); } - else - hr = E_OUTOFMEMORY; - CoTaskMemFree(url); + + IPropertyStorage_Release(pPropStg); } else hr = E_OUTOFMEMORY; - CoTaskMemFree(filename); } else hr = E_OUTOFMEMORY;

1 0