June 2011 - Wine-commits - list.winehq.org

Jacek Caban : urlmon: Use proper IUri in BindToStorage implementation.
by Alexandre Julliard 24 Jun '11

24 Jun '11

Module: wine Branch: master Commit: cca52128bd679dba71b65d6878bd8fbd447c3ec5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cca52128bd679dba71b65d687… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 23 13:44:38 2011 +0200 urlmon: Use proper IUri in BindToStorage implementation. --- dlls/urlmon/tests/url.c | 12 ++++++++++++ dlls/urlmon/umon.c | 12 +++--------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 8766b1d..4924154 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -3582,6 +3582,8 @@ static void test_StdURLMoniker(void) { IMoniker *mon, *async_mon; LPOLESTR display_name; + IBindCtx *bctx; + IUnknown *unk; HRESULT hres; hres = CoCreateInstance(&IID_IInternet, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, @@ -3614,6 +3616,16 @@ static void test_StdURLMoniker(void) IUriContainer_Release(uri_container); } + SET_EXPECT(QueryInterface_IServiceProvider); + hres = CreateAsyncBindCtx(0, (IBindStatusCallback*)&bsc, NULL, &bctx); + ok(hres == S_OK, "CreateAsyncBindCtx failed: %08x\n\n", hres); + CHECK_CALLED(QueryInterface_IServiceProvider); + + unk = (void*)0xdeadbeef; + hres = IMoniker_BindToStorage(mon, bctx, NULL, &IID_IStream, (void**)&unk); + ok(hres == MK_E_SYNTAX, "BindToStorage failed: %08x, expected MK_E_SYNTAX\n", hres); + ok(!unk, "unk = %p\n", unk); + IMoniker_Release(mon); } diff --git a/dlls/urlmon/umon.c b/dlls/urlmon/umon.c index cff4190..0e6c764 100644 --- a/dlls/urlmon/umon.c +++ b/dlls/urlmon/umon.c @@ -252,8 +252,6 @@ static HRESULT WINAPI URLMoniker_BindToStorage(IMoniker* iface, IBindCtx* pbc, IMoniker* pmkToLeft, REFIID riid, void **ppvObject) { URLMoniker *This = impl_from_IMoniker(iface); - IUri *uri; - HRESULT hres; TRACE("(%p)->(%p %p %s %p)\n", This, pbc, pmkToLeft, debugstr_guid(riid), ppvObject); @@ -264,14 +262,10 @@ static HRESULT WINAPI URLMoniker_BindToStorage(IMoniker* iface, IBindCtx* pbc, if(pmkToLeft) FIXME("Unsupported pmkToLeft\n"); - hres = CreateUri(This->URLName, Uri_CREATE_FILE_USE_DOS_PATH, 0, &uri); - if(FAILED(hres)) - return hres; - - hres = bind_to_storage(uri, pbc, riid, ppvObject); + if(!This->uri) + return MK_E_SYNTAX; - IUri_Release(uri); - return hres; + return bind_to_storage(This->uri, pbc, riid, ppvObject); } static HRESULT WINAPI URLMoniker_Reduce(IMoniker *iface, IBindCtx *pbc,

1 0

Henri Verbeet : wined3d: Make the surface parameter to surface_is_offscreen () const.
by Alexandre Julliard 24 Jun '11

24 Jun '11

Module: wine Branch: master Commit: 0ce282edf7b56ab2b82d61b7370558f9a627a0ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ce282edf7b56ab2b82d61b73… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 23 11:43:37 2011 +0200 wined3d: Make the surface parameter to surface_is_offscreen() const. --- dlls/wined3d/surface.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 945640f..3682e10 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -6207,7 +6207,7 @@ HRESULT surface_load_location(struct wined3d_surface *surface, DWORD flag, const return WINED3D_OK; } -BOOL surface_is_offscreen(struct wined3d_surface *surface) +BOOL surface_is_offscreen(const struct wined3d_surface *surface) { struct wined3d_swapchain *swapchain = surface->container.u.swapchain; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ed8ae0d..e23b917 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2110,7 +2110,7 @@ HRESULT surface_color_fill(struct wined3d_surface *s, const RECT *rect, const WI GLenum surface_get_gl_buffer(struct wined3d_surface *surface) DECLSPEC_HIDDEN; BOOL surface_init_sysmem(struct wined3d_surface *surface) DECLSPEC_HIDDEN; void surface_internal_preload(struct wined3d_surface *surface, enum WINED3DSRGB srgb) DECLSPEC_HIDDEN; -BOOL surface_is_offscreen(struct wined3d_surface *surface) DECLSPEC_HIDDEN; +BOOL surface_is_offscreen(const struct wined3d_surface *surface) DECLSPEC_HIDDEN; HRESULT surface_load(struct wined3d_surface *surface, BOOL srgb) DECLSPEC_HIDDEN; void surface_load_ds_location(struct wined3d_surface *surface, struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Make the surface parameter to surface_get_gl_buffer() const.
by Alexandre Julliard 24 Jun '11

24 Jun '11

Module: wine Branch: master Commit: fd8dbf0847e1127137b315a9716a7249a6a56896 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd8dbf0847e1127137b315a97… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 23 11:43:38 2011 +0200 wined3d: Make the surface parameter to surface_get_gl_buffer() const. --- dlls/wined3d/surface.c | 4 ++-- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 3682e10..247d413 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2412,9 +2412,9 @@ void surface_set_compatible_renderbuffer(struct wined3d_surface *surface, struct checkGLcall("set_compatible_renderbuffer"); } -GLenum surface_get_gl_buffer(struct wined3d_surface *surface) +GLenum surface_get_gl_buffer(const struct wined3d_surface *surface) { - struct wined3d_swapchain *swapchain = surface->container.u.swapchain; + const struct wined3d_swapchain *swapchain = surface->container.u.swapchain; TRACE("surface %p.\n", surface); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e23b917..ebe627f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2107,7 +2107,7 @@ static inline GLuint surface_get_texture_name(struct wined3d_surface *surface, void surface_add_dirty_rect(struct wined3d_surface *surface, const WINED3DBOX *dirty_rect) DECLSPEC_HIDDEN; void surface_bind(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info, BOOL srgb) DECLSPEC_HIDDEN; HRESULT surface_color_fill(struct wined3d_surface *s, const RECT *rect, const WINED3DCOLORVALUE *color) DECLSPEC_HIDDEN; -GLenum surface_get_gl_buffer(struct wined3d_surface *surface) DECLSPEC_HIDDEN; +GLenum surface_get_gl_buffer(const struct wined3d_surface *surface) DECLSPEC_HIDDEN; BOOL surface_init_sysmem(struct wined3d_surface *surface) DECLSPEC_HIDDEN; void surface_internal_preload(struct wined3d_surface *surface, enum WINED3DSRGB srgb) DECLSPEC_HIDDEN; BOOL surface_is_offscreen(const struct wined3d_surface *surface) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Explicitly set surface alignment in the client libs.
by Alexandre Julliard 24 Jun '11

24 Jun '11

Module: wine Branch: master Commit: b296f181dd65cdd64718673013efeb538d9c112c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b296f181dd65cdd6471867301… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 23 11:43:39 2011 +0200 wined3d: Explicitly set surface alignment in the client libs. Instead of using dxVersion. --- dlls/d3d8/device.c | 2 +- dlls/d3d9/device.c | 2 +- dlls/ddraw/ddraw.c | 2 +- dlls/dxgi/device.c | 2 +- dlls/wined3d/device.c | 5 ++--- dlls/wined3d/directx.c | 6 ++++-- dlls/wined3d/wined3d.spec | 2 +- dlls/wined3d/wined3d_private.h | 2 +- include/wine/wined3d.h | 2 +- 9 files changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 902c56b..ebab791 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -3100,7 +3100,7 @@ HRESULT device_init(IDirect3DDevice8Impl *device, IDirect3D8Impl *parent, struct if (!(flags & D3DCREATE_FPU_PRESERVE)) setup_fpu(); wined3d_mutex_lock(); - hr = wined3d_device_create(wined3d, adapter, device_type, focus_window, flags, + hr = wined3d_device_create(wined3d, adapter, device_type, focus_window, flags, 4, &device->device_parent, &device->wined3d_device); if (FAILED(hr)) { diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 2e4ca5d..5aa324e 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3348,7 +3348,7 @@ HRESULT device_init(IDirect3DDevice9Impl *device, IDirect3D9Impl *parent, struct if (!(flags & D3DCREATE_FPU_PRESERVE)) setup_fpu(); wined3d_mutex_lock(); - hr = wined3d_device_create(wined3d, adapter, device_type, focus_window, flags, + hr = wined3d_device_create(wined3d, adapter, device_type, focus_window, flags, 4, &device->device_parent, &device->wined3d_device); if (FAILED(hr)) { diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index ca91b45..7014ee8 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -6042,7 +6042,7 @@ HRESULT ddraw_init(IDirectDrawImpl *ddraw, WINED3DDEVTYPE device_type) } hr = wined3d_device_create(ddraw->wineD3D, WINED3DADAPTER_DEFAULT, device_type, - NULL, 0, &ddraw->device_parent, &ddraw->wined3d_device); + NULL, 0, 8, &ddraw->device_parent, &ddraw->wined3d_device); if (FAILED(hr)) { WARN("Failed to create a wined3d device, hr %#x.\n", hr); diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index f7ad811..9c94434 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -399,7 +399,7 @@ HRESULT dxgi_device_init(struct dxgi_device *device, struct dxgi_device_layer *l FIXME("Ignoring adapter type.\n"); EnterCriticalSection(&dxgi_cs); - hr = wined3d_device_create(wined3d, adapter_ordinal, WINED3DDEVTYPE_HAL, NULL, 0, + hr = wined3d_device_create(wined3d, adapter_ordinal, WINED3DDEVTYPE_HAL, NULL, 0, 4, wined3d_device_parent, &device->wined3d_device); IWineDXGIDeviceParent_Release(dxgi_device_parent); wined3d_decref(wined3d); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 20e9508..6314372 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6102,7 +6102,7 @@ HRESULT CDECL wined3d_device_get_surface_from_dc(struct wined3d_device *device, HRESULT device_init(struct wined3d_device *device, struct wined3d *wined3d, UINT adapter_idx, WINED3DDEVTYPE device_type, HWND focus_window, DWORD flags, - struct wined3d_device_parent *device_parent) + BYTE surface_alignment, struct wined3d_device_parent *device_parent) { struct wined3d_adapter *adapter = &wined3d->adapters[adapter_idx]; const struct fragment_pipeline *fragment_pipeline; @@ -6119,8 +6119,7 @@ HRESULT device_init(struct wined3d_device *device, struct wined3d *wined3d, device->device_parent = device_parent; list_init(&device->resources); list_init(&device->shaders); - - device->surface_alignment = wined3d->dxVersion == 7 ? DDRAW_PITCH_ALIGNMENT : D3D8_PITCH_ALIGNMENT; + device->surface_alignment = surface_alignment; /* Get the initial screen setup for ddraw. */ hr = wined3d_get_adapter_display_mode(wined3d, adapter_idx, &mode); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 34eea82..ceaef32 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4841,7 +4841,8 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte } HRESULT CDECL wined3d_device_create(struct wined3d *wined3d, UINT adapter_idx, WINED3DDEVTYPE device_type, - HWND focus_window, DWORD flags, struct wined3d_device_parent *device_parent, struct wined3d_device **device) + HWND focus_window, DWORD flags, BYTE surface_alignment, struct wined3d_device_parent *device_parent, + struct wined3d_device **device) { struct wined3d_device *object; HRESULT hr; @@ -4861,7 +4862,8 @@ HRESULT CDECL wined3d_device_create(struct wined3d *wined3d, UINT adapter_idx, W return E_OUTOFMEMORY; } - hr = device_init(object, wined3d, adapter_idx, device_type, focus_window, flags, device_parent); + hr = device_init(object, wined3d, adapter_idx, device_type, + focus_window, flags, surface_alignment, device_parent); if (FAILED(hr)) { WARN("Failed to initialize device, hr %#x.\n", hr); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 4483ba8..2cbd57c 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -47,7 +47,7 @@ @ cdecl wined3d_device_clear(ptr long ptr long long float long) @ cdecl wined3d_device_clear_rendertarget_view(ptr ptr ptr) @ cdecl wined3d_device_color_fill(ptr ptr ptr ptr) -@ cdecl wined3d_device_create(ptr long long ptr long ptr ptr) +@ cdecl wined3d_device_create(ptr long long ptr long long ptr ptr) @ cdecl wined3d_device_decref(ptr) @ cdecl wined3d_device_delete_patch(ptr long) @ cdecl wined3d_device_draw_indexed_primitive(ptr long long) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ebe627f..cc75cde 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1791,7 +1791,7 @@ void device_context_remove(struct wined3d_device *device, struct wined3d_context void device_get_draw_rect(struct wined3d_device *device, RECT *rect) DECLSPEC_HIDDEN; HRESULT device_init(struct wined3d_device *device, struct wined3d *wined3d, UINT adapter_idx, WINED3DDEVTYPE device_type, HWND focus_window, DWORD flags, - struct wined3d_device_parent *device_parent) DECLSPEC_HIDDEN; + BYTE surface_alignment, struct wined3d_device_parent *device_parent) DECLSPEC_HIDDEN; void device_preload_textures(struct wined3d_device *device) DECLSPEC_HIDDEN; LRESULT device_process_message(struct wined3d_device *device, HWND window, BOOL unicode, UINT message, WPARAM wparam, LPARAM lparam, WNDPROC proc) DECLSPEC_HIDDEN; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 99dcc37..0065441 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2179,7 +2179,7 @@ void __cdecl wined3d_device_clear_rendertarget_view(struct wined3d_device *devic HRESULT __cdecl wined3d_device_color_fill(struct wined3d_device *device, struct wined3d_surface *surface, const RECT *rect, const WINED3DCOLORVALUE *color); HRESULT __cdecl wined3d_device_create(struct wined3d *wined3d, UINT adapter_idx, - WINED3DDEVTYPE device_type, HWND focus_window, DWORD behaviour_flags, + WINED3DDEVTYPE device_type, HWND focus_window, DWORD behaviour_flags, BYTE surface_alignment, struct wined3d_device_parent *device_parent, struct wined3d_device **device); ULONG __cdecl wined3d_device_decref(struct wined3d_device *device); HRESULT __cdecl wined3d_device_delete_patch(struct wined3d_device *device, UINT handle);

1 0

Henri Verbeet : wined3d: Request per-surface palettes in the client libs.
by Alexandre Julliard 24 Jun '11

24 Jun '11

Module: wine Branch: master Commit: c461d312ba73e4b19dcf88d76bd039e756aeddf0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c461d312ba73e4b19dcf88d76… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 23 11:43:40 2011 +0200 wined3d: Request per-surface palettes in the client libs. --- dlls/d3d8/d3d8_main.c | 2 +- dlls/d3d9/d3d9_main.c | 2 +- dlls/ddraw/ddraw.c | 2 +- dlls/dxgi/factory.c | 2 +- dlls/wined3d/directx.c | 3 ++- dlls/wined3d/surface.c | 4 +--- dlls/wined3d/wined3d.spec | 2 +- dlls/wined3d/wined3d_main.c | 4 ++-- dlls/wined3d/wined3d_private.h | 3 ++- include/wine/wined3d.h | 4 +++- 10 files changed, 15 insertions(+), 13 deletions(-) diff --git a/dlls/d3d8/d3d8_main.c b/dlls/d3d8/d3d8_main.c index 7a25a93..9b1ad37 100644 --- a/dlls/d3d8/d3d8_main.c +++ b/dlls/d3d8/d3d8_main.c @@ -45,7 +45,7 @@ IDirect3D8* WINAPI DECLSPEC_HOTPATCH Direct3DCreate8(UINT SDKVersion) { object->IDirect3D8_iface.lpVtbl = &Direct3D8_Vtbl; object->ref = 1; - object->WineD3D = wined3d_create(8, &object->IDirect3D8_iface); + object->WineD3D = wined3d_create(8, 0, &object->IDirect3D8_iface); TRACE("Created Direct3D object @ %p, WineObj @ %p\n", object, object->WineD3D); diff --git a/dlls/d3d9/d3d9_main.c b/dlls/d3d9/d3d9_main.c index 0d3ecec..abb98f3 100644 --- a/dlls/d3d9/d3d9_main.c +++ b/dlls/d3d9/d3d9_main.c @@ -40,7 +40,7 @@ IDirect3D9* WINAPI DECLSPEC_HOTPATCH Direct3DCreate9(UINT SDKVersion) { object->ref = 1; wined3d_mutex_lock(); - object->WineD3D = wined3d_create(9, object); + object->WineD3D = wined3d_create(9, 0, object); wined3d_mutex_unlock(); TRACE("SDKVersion = %x, Created Direct3D object @ %p, WineObj @ %p\n", SDKVersion, object, object->WineD3D); diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 7014ee8..c3e1a38 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -6034,7 +6034,7 @@ HRESULT ddraw_init(IDirectDrawImpl *ddraw, WINED3DDEVTYPE device_type) ddraw->orig_width = GetSystemMetrics(SM_CXSCREEN); ddraw->orig_height = GetSystemMetrics(SM_CYSCREEN); - ddraw->wineD3D = wined3d_create(7, &ddraw->IDirectDraw7_iface); + ddraw->wineD3D = wined3d_create(7, WINED3D_PALETTE_PER_SURFACE, &ddraw->IDirectDraw7_iface); if (!ddraw->wineD3D) { WARN("Failed to create a wined3d object.\n"); diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index dd1ec5e..c7a11cf 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -303,7 +303,7 @@ HRESULT dxgi_factory_init(struct dxgi_factory *factory) factory->refcount = 1; EnterCriticalSection(&dxgi_cs); - factory->wined3d = wined3d_create(10, factory); + factory->wined3d = wined3d_create(10, 0, factory); if (!factory->wined3d) { LeaveCriticalSection(&dxgi_cs); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index ceaef32..f45ff04 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -5370,11 +5370,12 @@ const struct wined3d_parent_ops wined3d_null_parent_ops = }; /* Do not call while under the GL lock. */ -HRESULT wined3d_init(struct wined3d *wined3d, UINT version, void *parent) +HRESULT wined3d_init(struct wined3d *wined3d, UINT version, DWORD flags, void *parent) { wined3d->dxVersion = version; wined3d->ref = 1; wined3d->parent = parent; + wined3d->flags = flags; if (!InitAdapters(wined3d)) { diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 247d413..114be69 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4260,10 +4260,8 @@ void d3dfmt_p8_init_palette(struct wined3d_surface *surface, BYTE table[256][4], if (!pal) { - UINT dxVersion = device->wined3d->dxVersion; - /* In DirectDraw the palette is a property of the surface, there are no such things as device palettes. */ - if (dxVersion <= 7) + if (device->wined3d->flags & WINED3D_PALETTE_PER_SURFACE) { ERR("This code should never get entered for DirectDraw!, expect problems\n"); if (index_in_alpha) diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 2cbd57c..62efc26 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -6,7 +6,7 @@ @ cdecl wined3d_check_device_format_conversion(ptr long long long long) @ cdecl wined3d_check_device_multisample_type(ptr long long long long long ptr) @ cdecl wined3d_check_device_type(ptr long long long long long) -@ cdecl wined3d_create(long ptr) +@ cdecl wined3d_create(long long ptr) @ cdecl wined3d_decref(ptr) @ cdecl wined3d_enum_adapter_modes(ptr long long long ptr) @ cdecl wined3d_get_adapter_count(ptr) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index ad3643d..5976c83 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -88,7 +88,7 @@ struct wined3d_settings wined3d_settings = }; /* Do not call while under the GL lock. */ -struct wined3d * CDECL wined3d_create(UINT version, void *parent) +struct wined3d * CDECL wined3d_create(UINT version, DWORD flags, void *parent) { struct wined3d *object; HRESULT hr; @@ -100,7 +100,7 @@ struct wined3d * CDECL wined3d_create(UINT version, void *parent) return NULL; } - hr = wined3d_init(object, version, parent); + hr = wined3d_init(object, version, flags, parent); if (FAILED(hr)) { WARN("Failed to initialize wined3d object, hr %#x.\n", hr); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index cc75cde..e96b7ad 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1634,12 +1634,13 @@ struct wined3d { LONG ref; void *parent; + DWORD flags; UINT dxVersion; UINT adapter_count; struct wined3d_adapter adapters[1]; }; -HRESULT wined3d_init(struct wined3d *wined3d, UINT version, void *parent) DECLSPEC_HIDDEN; +HRESULT wined3d_init(struct wined3d *wined3d, UINT version, DWORD flags, void *parent) DECLSPEC_HIDDEN; BOOL wined3d_register_window(HWND window, struct wined3d_device *device) DECLSPEC_HIDDEN; void wined3d_unregister_window(HWND window) DECLSPEC_HIDDEN; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 0065441..6a01f87 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1235,6 +1235,8 @@ enum wined3d_sysval_semantic #define WINED3DDEVCAPS_RTPATCHHANDLEZERO 0x00800000 #define WINED3DDEVCAPS_NPATCHES 0x01000000 +#define WINED3D_PALETTE_PER_SURFACE 0x00000001 + /* dwDDFX */ /* arithmetic stretching along y axis */ #define WINEDDBLTFX_ARITHSTRETCHY 0x00000001 @@ -2125,7 +2127,7 @@ HRESULT __cdecl wined3d_check_device_multisample_type(const struct wined3d *wine HRESULT __cdecl wined3d_check_device_type(const struct wined3d *wined3d, UINT adapter_idx, WINED3DDEVTYPE device_type, enum wined3d_format_id display_format_id, enum wined3d_format_id backbuffer_format_id, BOOL windowed); -struct wined3d * __cdecl wined3d_create(UINT dxVersion, void *parent); +struct wined3d * __cdecl wined3d_create(UINT dxVersion, DWORD flags, void *parent); ULONG __cdecl wined3d_decref(struct wined3d *wined3d); HRESULT __cdecl wined3d_enum_adapter_modes(const struct wined3d *wined3d, UINT adapter_idx, enum wined3d_format_id format_id, UINT mode_idx, WINED3DDISPLAYMODE *mode);

1 0

Jacek Caban : urlmon: Reimplement CreateURLMonikerEx on top of IUri APIs.
by Alexandre Julliard 24 Jun '11

24 Jun '11

Module: wine Branch: master Commit: c9f821ef6f7bae3760436021589183a45b50f886 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9f821ef6f7bae37604360215… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 23 13:43:11 2011 +0200 urlmon: Reimplement CreateURLMonikerEx on top of IUri APIs. --- dlls/urlmon/umon.c | 115 ++++++++++++++++++++++++++++------------------------ 1 files changed, 62 insertions(+), 53 deletions(-) diff --git a/dlls/urlmon/umon.c b/dlls/urlmon/umon.c index 8811718..fbb2287 100644 --- a/dlls/urlmon/umon.c +++ b/dlls/urlmon/umon.c @@ -37,6 +37,7 @@ typedef struct { LONG ref; + IUri *uri; BSTR URLName; } URLMoniker; @@ -98,6 +99,8 @@ static ULONG WINAPI URLMoniker_Release(IMoniker *iface) TRACE("(%p) ref=%u\n",This, refCount); if (!refCount) { + if(This->uri) + IUri_Release(This->uri); SysFreeString(This->URLName); heap_free(This); @@ -504,55 +507,52 @@ static const IUriContainerVtbl UriContainerVtbl = { UriContainer_GetIUri }; -static URLMoniker *alloc_moniker(void) +static HRESULT create_moniker(IUri *uri, URLMoniker **ret) { - URLMoniker *ret; - - ret = heap_alloc(sizeof(URLMoniker)); - if(!ret) - return NULL; - - ret->IMoniker_iface.lpVtbl = &URLMonikerVtbl; - ret->IUriContainer_iface.lpVtbl = &UriContainerVtbl; - ret->ref = 1; - ret->URLName = NULL; - - return ret; -} - -static HRESULT URLMoniker_Init(URLMoniker *This, LPCOLESTR lpszLeftURLName, LPCOLESTR lpszURLName) -{ - WCHAR url[INTERNET_MAX_URL_LENGTH]; + URLMoniker *mon; HRESULT hres; - DWORD sizeStr = 0; - TRACE("(%p,%s,%s)\n",This,debugstr_w(lpszLeftURLName),debugstr_w(lpszURLName)); + mon = heap_alloc(sizeof(*mon)); + if(!mon) + return E_OUTOFMEMORY; - if(lpszLeftURLName) - hres = CoInternetCombineUrl(lpszLeftURLName, lpszURLName, URL_FILE_USE_PATHURL, - url, INTERNET_MAX_URL_LENGTH, &sizeStr, 0); - else - hres = CoInternetParseUrl(lpszURLName, PARSE_CANONICALIZE, URL_FILE_USE_PATHURL, - url, INTERNET_MAX_URL_LENGTH, &sizeStr, 0); + mon->IMoniker_iface.lpVtbl = &URLMonikerVtbl; + mon->IUriContainer_iface.lpVtbl = &UriContainerVtbl; + mon->ref = 1; - if(FAILED(hres)) - return hres; + if(uri) { + /* FIXME: try to avoid it */ + hres = IUri_GetDisplayUri(uri, &mon->URLName); + if(FAILED(hres)) { + heap_free(mon); + return hres; + } - This->URLName = SysAllocString(url); + IUri_AddRef(uri); + mon->uri = uri; + }else { + mon->URLName = NULL; + mon->uri = NULL; + } URLMON_LockModule(); - - TRACE("URLName = %s\n", debugstr_w(This->URLName)); - + *ret = mon; return S_OK; } HRESULT StdURLMoniker_Construct(IUnknown *outer, void **ppv) { + URLMoniker *mon; + HRESULT hres; + TRACE("(%p %p)\n", outer, ppv); - *ppv = alloc_moniker(); - return *ppv ? S_OK : E_OUTOFMEMORY; + hres = create_moniker(NULL, &mon); + if(FAILED(hres)) + return hres; + + *ppv = &mon->IMoniker_iface; + return S_OK; } /*********************************************************************** @@ -573,9 +573,9 @@ HRESULT StdURLMoniker_Construct(IUnknown *outer, void **ppv) */ HRESULT WINAPI CreateURLMonikerEx(IMoniker *pmkContext, LPCWSTR szURL, IMoniker **ppmk, DWORD dwFlags) { + IUri *uri, *base_uri = NULL; URLMoniker *obj; HRESULT hres; - LPOLESTR lefturl = NULL; TRACE("(%p, %s, %p, %08x)\n", pmkContext, debugstr_w(szURL), ppmk, dwFlags); @@ -585,28 +585,37 @@ HRESULT WINAPI CreateURLMonikerEx(IMoniker *pmkContext, LPCWSTR szURL, IMoniker if (!szURL || !ppmk) return E_INVALIDARG; - if (dwFlags & URL_MK_UNIFORM) FIXME("ignoring flag URL_MK_UNIFORM\n"); - - if(!(obj = alloc_moniker())) - return E_OUTOFMEMORY; + if(dwFlags != URL_MK_LEGACY) + FIXME("Unsupported flags %x\n", dwFlags); if(pmkContext) { - IBindCtx* bind; - DWORD dwMksys = 0; - IMoniker_IsSystemMoniker(pmkContext, &dwMksys); - if(dwMksys == MKSYS_URLMONIKER && SUCCEEDED(CreateBindCtx(0, &bind))) { - IMoniker_GetDisplayName(pmkContext, bind, NULL, &lefturl); - TRACE("lefturl = %s\n", debugstr_w(lefturl)); - IBindCtx_Release(bind); + IUriContainer *uri_container; + + hres = IMoniker_QueryInterface(pmkContext, &IID_IUriContainer, (void**)&uri_container); + if(SUCCEEDED(hres)) { + hres = IUriContainer_GetIUri(uri_container, &base_uri); + IUriContainer_Release(uri_container); + if(FAILED(hres)) + return hres; } } - - hres = URLMoniker_Init(obj, lefturl, szURL); - CoTaskMemFree(lefturl); - if(SUCCEEDED(hres)) - hres = URLMoniker_QueryInterface(&obj->IMoniker_iface, &IID_IMoniker, (void**)ppmk); - IMoniker_Release(&obj->IMoniker_iface); - return hres; + + if(base_uri) { + hres = CoInternetCombineUrlEx(base_uri, szURL, URL_FILE_USE_PATHURL, &uri, 0); + IUri_Release(base_uri); + }else { + hres = CreateUri(szURL, Uri_CREATE_FILE_USE_DOS_PATH|Uri_CREATE_ALLOW_RELATIVE|Uri_CREATE_ALLOW_IMPLICIT_FILE_SCHEME, 0, &uri); + } + if(FAILED(hres)) + return hres; + + hres = create_moniker(uri, &obj); + IUri_Release(uri); + if(FAILED(hres)) + return hres; + + *ppmk = &obj->IMoniker_iface; + return S_OK; } /**********************************************************************

1 0

Hans Leidekker : msi: Don' t subscribe more than once to the same control event.
by Alexandre Julliard 23 Jun '11

23 Jun '11

Module: wine Branch: master Commit: d1ae506e4084ba3f8ec923a61e91a4d6f9d9ddc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1ae506e4084ba3f8ec923a61… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jun 23 09:07:48 2011 +0200 msi: Don't subscribe more than once to the same control event. --- dlls/msi/events.c | 24 ++++++++++++++++-------- 1 files changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/msi/events.c b/dlls/msi/events.c index 88b84ff..3047d1d 100644 --- a/dlls/msi/events.c +++ b/dlls/msi/events.c @@ -254,9 +254,19 @@ VOID ControlEvent_SubscribeToEvent( MSIPACKAGE *package, msi_dialog *dialog, { struct subscriber *sub; - sub = msi_alloc(sizeof (*sub)); - if( !sub ) - return; + TRACE("event %s control %s attribute %s\n", debugstr_w(event), debugstr_w(control), debugstr_w(attribute)); + + LIST_FOR_EACH_ENTRY( sub, &package->subscriptions, struct subscriber, entry ) + { + if (!strcmpiW( sub->event, event ) && + !strcmpiW( sub->control, control ) && + !strcmpiW( sub->attribute, attribute )) + { + TRACE("already subscribed\n"); + return; + }; + } + if (!(sub = msi_alloc( sizeof(*sub) ))) return; sub->dialog = dialog; sub->event = strdupW(event); sub->control = strdupW(control); @@ -264,17 +274,15 @@ VOID ControlEvent_SubscribeToEvent( MSIPACKAGE *package, msi_dialog *dialog, list_add_tail( &package->subscriptions, &sub->entry ); } -VOID ControlEvent_FireSubscribedEvent( MSIPACKAGE *package, LPCWSTR event, - MSIRECORD *rec ) +VOID ControlEvent_FireSubscribedEvent( MSIPACKAGE *package, LPCWSTR event, MSIRECORD *rec ) { struct subscriber *sub; - TRACE("Firing Event %s\n",debugstr_w(event)); + TRACE("Firing event %s\n", debugstr_w(event)); LIST_FOR_EACH_ENTRY( sub, &package->subscriptions, struct subscriber, entry ) { - if (strcmpiW( sub->event, event )) - continue; + if (strcmpiW( sub->event, event )) continue; msi_dialog_handle_event( sub->dialog, sub->control, sub->attribute, rec ); } }

1 0

Hans Leidekker : msi: Add support for running the progress bar backwards.
by Alexandre Julliard 23 Jun '11

23 Jun '11

Module: wine Branch: master Commit: ebf323cfcb00376e0133255aecb563851d5ae150 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebf323cfcb00376e0133255ae… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jun 23 09:08:04 2011 +0200 msi: Add support for running the progress bar backwards. --- dlls/msi/dialog.c | 46 ++++++++++++++++++++++++++++++++++------------ 1 files changed, 34 insertions(+), 12 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 08694bc..a6e33e2 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -66,6 +66,7 @@ struct msi_control_tag HMODULE hDll; float progress_current; float progress_max; + BOOL progress_backwards; DWORD attributes; WCHAR name[1]; }; @@ -431,6 +432,7 @@ static msi_control *msi_dialog_create_window( msi_dialog *dialog, control->type = strdupW( MSI_RecordGetString( rec, 3 ) ); control->progress_current = 0; control->progress_max = 100; + control->progress_backwards = FALSE; x = MSI_RecordGetInteger( rec, 4 ); y = MSI_RecordGetInteger( rec, 5 ); @@ -635,28 +637,47 @@ void msi_dialog_handle_event( msi_dialog* dialog, LPCWSTR control, } else if( !strcmpW( attribute, szProgress ) ) { - DWORD func, val; + DWORD func, val1, val2; - func = MSI_RecordGetInteger( rec , 1 ); - val = MSI_RecordGetInteger( rec , 2 ); + func = MSI_RecordGetInteger( rec, 1 ); + val1 = MSI_RecordGetInteger( rec, 2 ); + val2 = MSI_RecordGetInteger( rec, 3 ); - TRACE("progress: func %u, val %u\n", func, val); + TRACE("progress: func %u val1 %u val2 %u\n", func, val1, val2); switch (func) { case 0: /* init */ - ctrl->progress_max = val; - ctrl->progress_current = 0; - SendMessageW(ctrl->hwnd, PBM_SETRANGE, 0, MAKELPARAM(0,100)); - SendMessageW(ctrl->hwnd, PBM_SETPOS, 0, 0); + SendMessageW( ctrl->hwnd, PBM_SETRANGE, 0, MAKELPARAM(0,100) ); + if (val2) + { + ctrl->progress_max = val1 ? val1 : 100; + ctrl->progress_current = val1; + ctrl->progress_backwards = TRUE; + SendMessageW( ctrl->hwnd, PBM_SETPOS, 100, 0 ); + } + else + { + ctrl->progress_max = val1 ? val1 : 100; + ctrl->progress_current = 0; + ctrl->progress_backwards = FALSE; + SendMessageW( ctrl->hwnd, PBM_SETPOS, 0, 0 ); + } break; case 1: /* FIXME: not sure what this is supposed to do */ break; case 2: /* move */ - ctrl->progress_current += val; - if (ctrl->progress_current > ctrl->progress_max) - ctrl->progress_current = ctrl->progress_max; - SendMessageW(ctrl->hwnd, PBM_SETPOS, MulDiv(100, ctrl->progress_current, ctrl->progress_max), 0); + if (ctrl->progress_backwards) + { + if (val1 >= ctrl->progress_current) ctrl->progress_current -= val1; + else ctrl->progress_current = 0; + } + else + { + if (ctrl->progress_current + val1 < ctrl->progress_max) ctrl->progress_current += val1; + else ctrl->progress_current = ctrl->progress_max; + } + SendMessageW( ctrl->hwnd, PBM_SETPOS, MulDiv(100, ctrl->progress_current, ctrl->progress_max), 0 ); break; default: FIXME("Unknown progress message %u\n", func); @@ -1128,6 +1149,7 @@ static UINT msi_dialog_line_control( msi_dialog *dialog, MSIRECORD *rec ) control->type = strdupW( MSI_RecordGetString( rec, 3 ) ); control->progress_current = 0; control->progress_max = 100; + control->progress_backwards = FALSE; x = MSI_RecordGetInteger( rec, 4 ); y = MSI_RecordGetInteger( rec, 5 );

1 0

Hans Leidekker : msi: Make sure reported progress adds up to projected progress.
by Alexandre Julliard 23 Jun '11

23 Jun '11

Module: wine Branch: master Commit: ac994860afe2e695254e1a9531f6678c81551667 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac994860afe2e695254e1a953… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jun 23 09:08:21 2011 +0200 msi: Make sure reported progress adds up to projected progress. --- dlls/msi/action.c | 26 ++++++-------------------- dlls/msi/files.c | 18 ++++-------------- 2 files changed, 10 insertions(+), 34 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 437c8d9..260fbd6 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2565,7 +2565,7 @@ static UINT ITERATE_WriteRegistryValues(MSIRECORD *row, LPVOID param) BOOL check_first = FALSE; UINT rc; - msi_ui_progress( package, 2, 0, 0, 0 ); + msi_ui_progress( package, 2, REG_PROGRESS_VALUE, 0, 0 ); component = MSI_RecordGetString(row, 6); comp = msi_get_loaded_component(package,component); @@ -2679,9 +2679,6 @@ static UINT ACTION_WriteRegistryValues(MSIPACKAGE *package) if (rc != ERROR_SUCCESS) return ERROR_SUCCESS; - /* increment progress bar each time action data is sent */ - msi_ui_progress( package, 1, REG_PROGRESS_VALUE, 1, 0 ); - rc = MSI_IterateRecords(view, NULL, ITERATE_WriteRegistryValues, package); msiobj_release(&view->hdr); return rc; @@ -2734,7 +2731,7 @@ static UINT ITERATE_RemoveRegistryValuesOnUninstall( MSIRECORD *row, LPVOID para UINT size; INT root; - msi_ui_progress( package, 2, 0, 0, 0 ); + msi_ui_progress( package, 2, REG_PROGRESS_VALUE, 0, 0 ); component = MSI_RecordGetString( row, 6 ); comp = msi_get_loaded_component( package, component ); @@ -2783,7 +2780,6 @@ static UINT ITERATE_RemoveRegistryValuesOnUninstall( MSIRECORD *row, LPVOID para uirow = MSI_CreateRecord( 2 ); MSI_RecordSetStringW( uirow, 1, ui_key_str ); MSI_RecordSetStringW( uirow, 2, deformated_name ); - msi_ui_actiondata( package, szRemoveRegistryValues, uirow ); msiobj_release( &uirow->hdr ); @@ -2804,8 +2800,6 @@ static UINT ITERATE_RemoveRegistryValuesOnInstall( MSIRECORD *row, LPVOID param UINT size; INT root; - msi_ui_progress( package, 2, 0, 0, 0 ); - component = MSI_RecordGetString( row, 5 ); comp = msi_get_loaded_component( package, component ); if (!comp) @@ -2850,7 +2844,6 @@ static UINT ITERATE_RemoveRegistryValuesOnInstall( MSIRECORD *row, LPVOID param uirow = MSI_CreateRecord( 2 ); MSI_RecordSetStringW( uirow, 1, ui_key_str ); MSI_RecordSetStringW( uirow, 2, deformated_name ); - msi_ui_actiondata( package, szRemoveRegistryValues, uirow ); msiobj_release( &uirow->hdr ); @@ -2870,9 +2863,6 @@ static UINT ACTION_RemoveRegistryValues( MSIPACKAGE *package ) {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', '`','R','e','m','o','v','e','R','e','g','i','s','t','r','y','`',0 }; - /* increment progress bar each time action data is sent */ - msi_ui_progress( package, 1, REG_PROGRESS_VALUE, 1, 0 ); - rc = MSI_DatabaseOpenViewW( package->db, registry_query, &view ); if (rc == ERROR_SUCCESS) { @@ -2905,8 +2895,7 @@ static UINT ACTION_InstallInitialize(MSIPACKAGE *package) static UINT ACTION_InstallValidate(MSIPACKAGE *package) { MSICOMPONENT *comp; - DWORD progress = 0; - DWORD total = 0; + DWORD total = 0, count = 0; static const WCHAR q1[]= {'S','E','L','E','C','T',' ','*',' ', 'F','R','O','M',' ', '`','R','e','g','i','s','t','r','y','`',0}; @@ -2920,11 +2909,10 @@ static UINT ACTION_InstallValidate(MSIPACKAGE *package) rc = MSI_DatabaseOpenViewW(package->db, q1, &view); if (rc == ERROR_SUCCESS) { - MSI_IterateRecords( view, &progress, NULL, package ); + MSI_IterateRecords( view, &count, NULL, package ); msiobj_release( &view->hdr ); - total += progress * REG_PROGRESS_VALUE; + total += count * REG_PROGRESS_VALUE; } - LIST_FOR_EACH_ENTRY( comp, &package->components, MSICOMPONENT, entry ) total += COMPONENT_PROGRESS_VALUE; @@ -3200,8 +3188,6 @@ static UINT ACTION_ProcessComponents(MSIPACKAGE *package) TRACE("\n"); squash_guid(package->ProductCode,squished_pc); - msi_ui_progress( package, 1, COMPONENT_PROGRESS_VALUE, 1, 0 ); - msi_set_sourcedir_props(package, FALSE); LIST_FOR_EACH_ENTRY( comp, &package->components, MSICOMPONENT, entry ) @@ -3209,7 +3195,7 @@ static UINT ACTION_ProcessComponents(MSIPACKAGE *package) MSIRECORD *uirow; INSTALLSTATE action; - msi_ui_progress( package, 2, 0, 0, 0 ); + msi_ui_progress( package, 2, COMPONENT_PROGRESS_VALUE, 0, 0 ); if (!comp->ComponentId) continue; diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 7ff84cf..d1bd615 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -261,11 +261,9 @@ static BOOL installfiles_cb(MSIPACKAGE *package, LPCWSTR file, DWORD action, TRACE("unknown file in cabinet (%s)\n", debugstr_w(file)); return FALSE; } - if (f->disk_id != disk_id || (f->state != msifs_missing && f->state != msifs_overwrite)) return FALSE; - msi_file_update_ui(package, f, szInstallFiles); if (!f->Component->assembly || f->Component->assembly->application) { msi_create_directory(package, f->Component->Directory); @@ -317,14 +315,13 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package) UINT rc = ERROR_SUCCESS; MSIFILE *file; - /* increment progress bar each time action data is sent */ - msi_ui_progress( package, 1, 1, 0, 0 ); - schedule_install_files(package); mi = msi_alloc_zero( sizeof(MSIMEDIAINFO) ); LIST_FOR_EACH_ENTRY( file, &package->files, MSIFILE, entry ) { + msi_file_update_ui( package, file, szInstallFiles ); + rc = msi_load_media_info( package, file->Sequence, mi ); if (rc != ERROR_SUCCESS) { @@ -368,7 +365,6 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package) TRACE("copying %s to %s\n", debugstr_w(source), debugstr_w(file->TargetPath)); - msi_file_update_ui(package, file, szInstallFiles); if (!file->Component->assembly || file->Component->assembly->application) { msi_create_directory(package, file->Component->Directory); @@ -455,9 +451,6 @@ static BOOL patchfiles_cb(MSIPACKAGE *package, LPCWSTR file, DWORD action, TRACE("unknown file in cabinet (%s)\n", debugstr_w(file)); return FALSE; } - - msi_file_update_ui(package, p->File, szPatchFiles); - GetTempFileNameW(temp_folder, NULL, 0, patch_path); *path = strdupW(patch_path); @@ -499,9 +492,6 @@ UINT ACTION_PatchFiles( MSIPACKAGE *package ) TRACE("%p\n", package); - /* increment progress bar each time action data is sent */ - msi_ui_progress( package, 1, 1, 0, 0 ); - mi = msi_alloc_zero( sizeof(MSIMEDIAINFO) ); LIST_FOR_EACH_ENTRY( patch, &package->filepatches, MSIFILEPATCH, entry ) @@ -1273,6 +1263,8 @@ UINT ACTION_RemoveFiles( MSIPACKAGE *package ) VS_FIXEDFILEINFO *ver; MSICOMPONENT *comp = file->Component; + msi_file_update_ui( package, file, szRemoveFiles ); + comp->Action = msi_get_component_action( package, comp ); if (comp->Action != INSTALLSTATE_ABSENT || comp->Installed == INSTALLSTATE_SOURCE) continue; @@ -1324,8 +1316,6 @@ UINT ACTION_RemoveFiles( MSIPACKAGE *package ) MSI_RecordSetStringW( uirow, 9, comp->Directory ); msi_ui_actiondata( package, szRemoveFiles, uirow ); msiobj_release( &uirow->hdr ); - /* FIXME: call msi_ui_progress here? */ } - return ERROR_SUCCESS; }

1 0

Hans Leidekker : msi: Count progress in units of 512 bytes.
by Alexandre Julliard 23 Jun '11

23 Jun '11

Module: wine Branch: master Commit: 0b2bd0c903517952526378e30e7b957adb28c625 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b2bd0c903517952526378e30… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jun 23 09:08:38 2011 +0200 msi: Count progress in units of 512 bytes. --- dlls/msi/dialog.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index a6e33e2..2eb7983 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -637,7 +637,7 @@ void msi_dialog_handle_event( msi_dialog* dialog, LPCWSTR control, } else if( !strcmpW( attribute, szProgress ) ) { - DWORD func, val1, val2; + DWORD func, val1, val2, units; func = MSI_RecordGetInteger( rec, 1 ); val1 = MSI_RecordGetInteger( rec, 2 ); @@ -649,16 +649,17 @@ void msi_dialog_handle_event( msi_dialog* dialog, LPCWSTR control, { case 0: /* init */ SendMessageW( ctrl->hwnd, PBM_SETRANGE, 0, MAKELPARAM(0,100) ); + units = val1 / 512; if (val2) { - ctrl->progress_max = val1 ? val1 : 100; - ctrl->progress_current = val1; + ctrl->progress_max = units ? units : 100; + ctrl->progress_current = units; ctrl->progress_backwards = TRUE; SendMessageW( ctrl->hwnd, PBM_SETPOS, 100, 0 ); } else { - ctrl->progress_max = val1 ? val1 : 100; + ctrl->progress_max = units ? units : 100; ctrl->progress_current = 0; ctrl->progress_backwards = FALSE; SendMessageW( ctrl->hwnd, PBM_SETPOS, 0, 0 ); @@ -667,14 +668,15 @@ void msi_dialog_handle_event( msi_dialog* dialog, LPCWSTR control, case 1: /* FIXME: not sure what this is supposed to do */ break; case 2: /* move */ + units = val1 / 512; if (ctrl->progress_backwards) { - if (val1 >= ctrl->progress_current) ctrl->progress_current -= val1; + if (units >= ctrl->progress_current) ctrl->progress_current -= units; else ctrl->progress_current = 0; } else { - if (ctrl->progress_current + val1 < ctrl->progress_max) ctrl->progress_current += val1; + if (ctrl->progress_current + units < ctrl->progress_max) ctrl->progress_current += units; else ctrl->progress_current = ctrl->progress_max; } SendMessageW( ctrl->hwnd, PBM_SETPOS, MulDiv(100, ctrl->progress_current, ctrl->progress_max), 0 );

1 0