September 2012 - Wine-commits

Dmitry Timoshkov : windowscodecs: Create Graphic Control Extension metadata block for a GIF frame.
by Alexandre Julliard 13 Sep '12

13 Sep '12

Module: wine Branch: master Commit: 664f1c477060e417ea5706391135507f652f98b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=664f1c477060e417ea5706391… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Sep 13 10:27:03 2012 +0900 windowscodecs: Create Graphic Control Extension metadata block for a GIF frame. --- dlls/windowscodecs/gifformat.c | 70 +++++++++++++++++++++++++++++++++- dlls/windowscodecs/tests/metadata.c | 2 - 2 files changed, 67 insertions(+), 5 deletions(-) diff --git a/dlls/windowscodecs/gifformat.c b/dlls/windowscodecs/gifformat.c index 62bdc6f..4414f36 100644 --- a/dlls/windowscodecs/gifformat.c +++ b/dlls/windowscodecs/gifformat.c @@ -646,14 +646,30 @@ static HRESULT WINAPI GifFrameDecode_Block_GetContainerFormat(IWICMetadataBlockR return S_OK; } +static const void *get_GCE_data(GifFrameDecode *This) +{ + int i; + + for (i = 0; i < This->frame->ExtensionBlockCount; i++) + { + if (This->frame->ExtensionBlocks[i].Function == GRAPHICS_EXT_FUNC_CODE && + This->frame->ExtensionBlocks[i].ByteCount == 4) + return This->frame->ExtensionBlocks[i].Bytes; + } + return NULL; +} + static HRESULT WINAPI GifFrameDecode_Block_GetCount(IWICMetadataBlockReader *iface, UINT *count) { + GifFrameDecode *This = frame_from_IWICMetadataBlockReader(iface); + TRACE("%p,%p\n", iface, count); if (!count) return E_INVALIDARG; *count = 1; + if (get_GCE_data(This)) *count += 1; return S_OK; } @@ -705,16 +721,64 @@ static HRESULT create_IMD_metadata_reader(GifFrameDecode *This, IWICMetadataRead return S_OK; } +static HRESULT create_GCE_metadata_reader(const void *GCE_data, IWICMetadataReader **reader) +{ + HRESULT hr; + IWICMetadataReader *metadata_reader; + IWICPersistStream *persist; + IStream *stream; + + /* FIXME: Use IWICComponentFactory_CreateMetadataReader once it's implemented */ + + hr = CoCreateInstance(&CLSID_WICGCEMetadataReader, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICMetadataReader, (void **)&metadata_reader); + if (FAILED(hr)) return hr; + + hr = IWICMetadataReader_QueryInterface(metadata_reader, &IID_IWICPersistStream, (void **)&persist); + if (FAILED(hr)) + { + IWICMetadataReader_Release(metadata_reader); + return hr; + } + + stream = create_stream(GCE_data, 4); + IWICPersistStream_LoadEx(persist, stream, NULL, WICPersistOptionsDefault); + IStream_Release(stream); + + IWICPersistStream_Release(persist); + + *reader = metadata_reader; + return S_OK; +} + static HRESULT WINAPI GifFrameDecode_Block_GetReaderByIndex(IWICMetadataBlockReader *iface, UINT index, IWICMetadataReader **reader) { GifFrameDecode *This = frame_from_IWICMetadataBlockReader(iface); + UINT block_count = 1; + const void *GCE_data; TRACE("(%p,%u,%p)\n", iface, index, reader); - if (!reader || index != 0) return E_INVALIDARG; - - return create_IMD_metadata_reader(This, reader); + GCE_data = get_GCE_data(This); + if (GCE_data) block_count++; + /* FIXME: add support for Application Extension metadata block + APE_data = get_APE_data(This); + if (APE_data) block_count++; + */ + if (!reader || index >= block_count) return E_INVALIDARG; + + if (index == 0) + return create_IMD_metadata_reader(This, reader); + + if (index == 1 && GCE_data) + return create_GCE_metadata_reader(GCE_data, reader); + + /* FIXME: add support for Application Extension metadata block + if (APE_data) + return create_APE_metadata_reader(APE_data, reader); + */ + return E_INVALIDARG; } static HRESULT WINAPI GifFrameDecode_Block_GetEnumerator(IWICMetadataBlockReader *iface, diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index 39c5144..11db5cb 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -1206,7 +1206,6 @@ static void test_metadata_gif(void) hr = IWICMetadataBlockReader_GetCount(blockreader, &count); ok(hr == S_OK, "GetCount error %#x\n", hr); -todo_wine ok(count == 2, "expected 2, got %u\n", count); hr = IWICMetadataBlockReader_GetReaderByIndex(blockreader, 0, &reader); @@ -1228,7 +1227,6 @@ todo_wine } hr = IWICMetadataBlockReader_GetReaderByIndex(blockreader, 1, &reader); -todo_wine ok(hr == S_OK, "GetReaderByIndex error %#x\n", hr); if (SUCCEEDED(hr))

1 0

Piotr Caban : msvcp90: Added ios_base flags manipulators implementation.
by Alexandre Julliard 13 Sep '12

13 Sep '12

Module: wine Branch: master Commit: 905752e0f4363acff031a2d503bc6def8b033683 URL: http://source.winehq.org/git/wine.git/?a=commit;h=905752e0f4363acff031a2d50… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Sep 13 14:34:02 2012 +0200 msvcp90: Added ios_base flags manipulators implementation. --- dlls/msvcp90/ios.c | 59 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 6 ++-- 2 files changed, 62 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 39e9a9f..1816884 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -50,6 +50,11 @@ typedef struct { streamsize arg; } manip_streamsize; +typedef struct { + void (__cdecl *pfunc)(ios_base*, int); + int arg; +} manip_int; + typedef enum { INITFL_new = 0, INITFL_open = 1, @@ -12877,6 +12882,60 @@ manip_streamsize* __cdecl setw(manip_streamsize *ret, streamsize width) return ret; } +static void __cdecl resetioflags_func(ios_base *base, int mask) +{ + ios_base_setf_mask(base, 0, mask); +} + +/* ?resetiosflags(a)std@@YA?AU?$_Smanip(a)H@1(a)H@Z */ +manip_int* __cdecl resetiosflags(manip_int *ret, int mask) +{ + TRACE("(%p %d)\n", ret, mask); + + ret->pfunc = resetioflags_func; + ret->arg = mask; + return ret; +} + +static void __cdecl setiosflags_func(ios_base *base, int mask) +{ + ios_base_setf_mask(base, FMTFLAG_mask, mask); +} + +/* ?setiosflags(a)std@@YA?AU?$_Smanip(a)H@1(a)H@Z */ +manip_int* __cdecl setiosflags(manip_int *ret, int mask) +{ + TRACE("(%p %d)\n", ret, mask); + + ret->pfunc = setiosflags_func; + ret->arg = mask; + return ret; +} + +static void __cdecl setbase_func(ios_base *base, int set_base) +{ + if(set_base == 10) + set_base = FMTFLAG_dec; + else if(set_base == 8) + set_base = FMTFLAG_oct; + else if(set_base == 16) + set_base = FMTFLAG_hex; + else + set_base = 0; + + ios_base_setf_mask(base, set_base, FMTFLAG_basefield); +} + +/* ?setbase(a)std@@YA?AU?$_Smanip(a)H@1(a)H@Z */ +manip_int* __cdecl setbase(manip_int *ret, int base) +{ + TRACE("(%p %d)\n", ret, base); + + ret->pfunc = setbase_func; + ret->arg = base; + return ret; +} + static basic_filebuf_char filebuf_char_stdin; /* ?cin(a)std@@3V?$basic_istream(a)DU?$char_traits(a)D@std@@@1(a)A */ struct { diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index b70fd27..576541c 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -5173,7 +5173,7 @@ @ cdecl -arch=win64 ?reserve@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEAAX_K(a)Z(ptr long) MSVCP_basic_string_wchar_reserve @ thiscall -arch=win32 ?reserve@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEXI(a)Z(ptr long) MSVCP_basic_string_wchar_reserve @ cdecl -arch=win64 ?reserve@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAX_K(a)Z(ptr long) MSVCP_basic_string_wchar_reserve -@ stub ?resetiosflags(a)std@@YA?AU?$_Smanip(a)H@1(a)H@Z +@ cdecl ?resetiosflags(a)std@@YA?AU?$_Smanip(a)H@1(a)H@Z(ptr long) resetiosflags @ thiscall -arch=win32 ?resize@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEXI(a)Z(ptr long) MSVCP_basic_string_char_resize @ cdecl -arch=win64 ?resize@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAX_K(a)Z(ptr long) MSVCP_basic_string_char_resize @ thiscall -arch=win32 ?resize@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEXID(a)Z(ptr long long) MSVCP_basic_string_char_resize_ch @@ -5312,7 +5312,7 @@ @ cdecl -arch=win64 ?seekpos(a)strstreambuf@std@@MEAA?AV?$fpos(a)H@2(a)V32@H(a)Z(ptr ptr ptr long) strstreambuf_seekpos @ cdecl ?set_new_handler(a)std@@YAP6AXXZH(a)Z(long) set_new_handler_reset @ cdecl ?set_new_handler(a)std@@YAP6AXXZP6AXXZ(a)Z(ptr) set_new_handler -@ stub ?setbase(a)std@@YA?AU?$_Smanip(a)H@1(a)H@Z +@ cdecl ?setbase(a)std@@YA?AU?$_Smanip(a)H@1(a)H@Z(ptr long) setbase @ thiscall -arch=win32 ?setbuf@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@MAEPAV?$basic_streambuf(a)DU?$char_traits(a)D@std@@@2(a)PADH@Z(ptr ptr long) basic_filebuf_char_setbuf @ cdecl -arch=win64 ?setbuf@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@MEAAPEAV?$basic_streambuf(a)DU?$char_traits(a)D@std@@@2(a)PEAD_J@Z(ptr ptr long) basic_filebuf_char_setbuf @ thiscall -arch=win32 ?setbuf@?$basic_filebuf(a)GU?$char_traits(a)G@std@@@std@@MAEPAV?$basic_streambuf(a)GU?$char_traits(a)G@std@@@2(a)PAGH@Z(ptr ptr long) basic_filebuf_char_setbuf @@ -5335,7 +5335,7 @@ @ cdecl -arch=win64 ?setg@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@IEAAXPEAG00(a)Z(ptr ptr ptr ptr) basic_streambuf_wchar_setg @ thiscall -arch=win32 ?setg@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@IAEXPA_W00(a)Z(ptr ptr ptr ptr) basic_streambuf_wchar_setg @ cdecl -arch=win64 ?setg@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@IEAAXPEA_W00(a)Z(ptr ptr ptr ptr) basic_streambuf_wchar_setg -@ stub ?setiosflags(a)std@@YA?AU?$_Smanip(a)H@1(a)H@Z +@ cdecl ?setiosflags(a)std@@YA?AU?$_Smanip(a)H@1(a)H@Z(ptr long) setiosflags @ thiscall -arch=win32 ?setp@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@IAEXPAD00(a)Z(ptr ptr ptr ptr) basic_streambuf_char_setp_next @ cdecl -arch=win64 ?setp@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@IEAAXPEAD00(a)Z(ptr ptr ptr ptr) basic_streambuf_char_setp_next @ thiscall -arch=win32 ?setp@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@IAEXPAD0(a)Z(ptr ptr ptr) basic_streambuf_char_setp

1 0

Piotr Caban : msvcp: Sync spec files and implementations.
by Alexandre Julliard 13 Sep '12

13 Sep '12

Module: wine Branch: master Commit: d28174b765e72304a0945ac18ee7d2c34b902818 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d28174b765e72304a0945ac18… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Sep 13 14:34:26 2012 +0200 msvcp: Sync spec files and implementations. --- dlls/msvcp100/ios.c | 59 +++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp100/msvcp100.spec | 6 ++-- dlls/msvcp70/msvcp70.spec | 6 ++-- dlls/msvcp71/msvcp71.spec | 6 ++-- dlls/msvcp80/msvcp80.spec | 6 ++-- 5 files changed, 71 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d28174b765e72304a0945…

1 0

Henri Verbeet : d3d10core/tests: Add a small test for ID3D10Device_CreateDepthStencilView().
by Alexandre Julliard 13 Sep '12

13 Sep '12

Module: wine Branch: master Commit: 9235336894bc05f119a7738bf42789894bb0a31d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9235336894bc05f119a7738bf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 13 09:18:15 2012 +0200 d3d10core/tests: Add a small test for ID3D10Device_CreateDepthStencilView(). --- dlls/d3d10core/tests/device.c | 37 +++++++++++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index e9ade68..6b40d73 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -202,6 +202,42 @@ static void test_create_texture3d(ID3D10Device *device) ID3D10Texture3D_Release(texture); } +static void test_create_depthstencil_view(ID3D10Device *device) +{ + D3D10_DEPTH_STENCIL_VIEW_DESC dsv_desc; + D3D10_TEXTURE2D_DESC texture_desc; + ID3D10DepthStencilView *dsview; + ID3D10Texture2D *texture; + HRESULT hr; + + texture_desc.Width = 512; + texture_desc.Height = 512; + texture_desc.MipLevels = 1; + texture_desc.ArraySize = 1; + texture_desc.Format = DXGI_FORMAT_D24_UNORM_S8_UINT; + texture_desc.SampleDesc.Count = 1; + texture_desc.SampleDesc.Quality = 0; + texture_desc.Usage = D3D10_USAGE_DEFAULT; + texture_desc.BindFlags = D3D10_BIND_DEPTH_STENCIL; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create a 2d texture, hr %#x\n", hr); + + hr = ID3D10Device_CreateDepthStencilView(device, (ID3D10Resource *)texture, NULL, &dsview); + ok(SUCCEEDED(hr), "Failed to create a depthstencil view, hr %#x\n", hr); + + ID3D10DepthStencilView_GetDesc(dsview, &dsv_desc); + ok(dsv_desc.Format == texture_desc.Format, "Got unexpected format %#x.\n", dsv_desc.Format); + ok(dsv_desc.ViewDimension == D3D10_DSV_DIMENSION_TEXTURE2D, + "Got unexpected view dimension %#x.\n", dsv_desc.ViewDimension); + ok(U(dsv_desc).Texture2D.MipSlice == 0, "Got Unexpected mip slice %u.\n", U(dsv_desc).Texture2D.MipSlice); + + ID3D10DepthStencilView_Release(dsview); + ID3D10Texture2D_Release(texture); +} + static void test_create_rendertarget_view(ID3D10Device *device) { D3D10_RENDER_TARGET_VIEW_DESC rtv_desc; @@ -409,6 +445,7 @@ START_TEST(device) test_device_interfaces(device); test_create_texture2d(device); test_create_texture3d(device); + test_create_depthstencil_view(device); test_create_rendertarget_view(device); test_create_shader(device);

1 0

Henri Verbeet : wined3d: wined3d_device_set_base_vertex_index() never fails .
by Alexandre Julliard 13 Sep '12

13 Sep '12

Module: wine Branch: master Commit: b8feef883375d973b48d31b0f421619113d0749f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8feef883375d973b48d31b0f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 13 09:18:16 2012 +0200 wined3d: wined3d_device_set_base_vertex_index() never fails. --- dlls/wined3d/device.c | 16 +--------------- include/wine/wined3d.h | 2 +- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b0ce4c4..e5cf69b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2260,25 +2260,11 @@ struct wined3d_buffer * CDECL wined3d_device_get_index_buffer(const struct wined return device->stateBlock->state.index_buffer; } -/* Method to offer d3d9 a simple way to set the base vertex index without messing with the index buffer */ -HRESULT CDECL wined3d_device_set_base_vertex_index(struct wined3d_device *device, INT base_index) +void CDECL wined3d_device_set_base_vertex_index(struct wined3d_device *device, INT base_index) { TRACE("device %p, base_index %d.\n", device, base_index); - if (device->updateStateBlock->state.base_vertex_index == base_index) - { - TRACE("Application is setting the old value over, nothing to do\n"); - return WINED3D_OK; - } - device->updateStateBlock->state.base_vertex_index = base_index; - - if (device->isRecordingState) - { - TRACE("Recording... not performing anything\n"); - return WINED3D_OK; - } - return WINED3D_OK; } INT CDECL wined3d_device_get_base_vertex_index(const struct wined3d_device *device) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 15aeb57..478abe0 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2189,7 +2189,7 @@ HRESULT __cdecl wined3d_device_reset(struct wined3d_device *device, const struct wined3d_swapchain_desc *swapchain_desc, const struct wined3d_display_mode *mode, wined3d_device_reset_cb callback); void __cdecl wined3d_device_restore_fullscreen_window(struct wined3d_device *device, HWND window); -HRESULT __cdecl wined3d_device_set_base_vertex_index(struct wined3d_device *device, INT base_index); +void __cdecl wined3d_device_set_base_vertex_index(struct wined3d_device *device, INT base_index); HRESULT __cdecl wined3d_device_set_clip_plane(struct wined3d_device *device, UINT plane_idx, const struct wined3d_vec4 *plane); HRESULT __cdecl wined3d_device_set_clip_status(struct wined3d_device *device,

1 0

Henri Verbeet : server: Only remove WM_INPUT messages from the queue if PM_REMOVE is set.
by Alexandre Julliard 13 Sep '12

13 Sep '12

Module: wine Branch: master Commit: 54efd8a430e52d6fd8977d169bfc01df0385f845 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54efd8a430e52d6fd8977d169… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 13 09:18:17 2012 +0200 server: Only remove WM_INPUT messages from the queue if PM_REMOVE is set. --- server/queue.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/server/queue.c b/server/queue.c index f290c0b..7aa9b14 100644 --- a/server/queue.c +++ b/server/queue.c @@ -1888,7 +1888,8 @@ static int check_hw_message_filter( user_handle_t win, unsigned int msg_code, /* find a hardware message for the given queue */ static int get_hardware_message( struct thread *thread, unsigned int hw_id, user_handle_t filter_win, - unsigned int first, unsigned int last, struct get_message_reply *reply ) + unsigned int first, unsigned int last, unsigned int flags, + struct get_message_reply *reply ) { struct thread_input *input = thread->queue->input; struct thread *win_thread; @@ -1968,7 +1969,8 @@ static int get_hardware_message( struct thread *thread, unsigned int hw_id, user data->hw_id = msg->unique_id; set_reply_data( msg->data, msg->data_size ); - if (msg->msg == WM_INPUT) release_hardware_message( current->queue, data->hw_id, 1, 0 ); + if (msg->msg == WM_INPUT && (flags & PM_REMOVE)) + release_hardware_message( current->queue, data->hw_id, 1, 0 ); return 1; } /* nothing found, clear the hardware queue bits */ @@ -2405,7 +2407,7 @@ DECL_HANDLER(get_message) /* then check for any raw hardware message */ if ((filter & QS_INPUT) && filter_contains_hw_range( req->get_first, req->get_last ) && - get_hardware_message( current, req->hw_id, get_win, req->get_first, req->get_last, reply )) + get_hardware_message( current, req->hw_id, get_win, req->get_first, req->get_last, req->flags, reply )) return; /* now check for WM_PAINT */

1 0

Jacek Caban : oaidl.idl: Added REFVARIANT declaration.
by Alexandre Julliard 13 Sep '12

13 Sep '12

Module: wine Branch: master Commit: 22bcb1a7f437d2e26a1bcd6a8cc7420b85bf78c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22bcb1a7f437d2e26a1bcd6a8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 13 09:37:59 2012 +0200 oaidl.idl: Added REFVARIANT declaration. --- include/oaidl.idl | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/include/oaidl.idl b/include/oaidl.idl index 0dc4c05..37da734 100644 --- a/include/oaidl.idl +++ b/include/oaidl.idl @@ -230,6 +230,17 @@ typedef VARIANT *LPVARIANT; typedef VARIANT VARIANTARG; typedef VARIANTARG *LPVARIANTARG; +cpp_quote("#if 0") +typedef const VARIANT *REFVARIANT; +cpp_quote("#elif !defined(_REFVARIANT_DEFINED)") +cpp_quote("#define _REFVARIANT_DEFINED") +cpp_quote("#ifdef __cplusplus") +cpp_quote("#define REFVARIANT const VARIANT &") +cpp_quote("#else") +cpp_quote("#define REFVARIANT const VARIANT *__MIDL_CONST") +cpp_quote("#endif") +cpp_quote("#endif") + struct _wireBRECORD { ULONG fFlags; ULONG clSize;

1 0

Alexandre Julliard : winex11: Don' t use a window surface for embedded windows.
by Alexandre Julliard 13 Sep '12

13 Sep '12

Module: wine Branch: master Commit: 0682355af23f2f7c6939f491ccd48c8cb1aeb2d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0682355af23f2f7c6939f491c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 13 10:31:52 2012 +0200 winex11: Don't use a window surface for embedded windows. --- dlls/winex11.drv/window.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 00c86b9..3f94758 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1992,6 +1992,7 @@ void CDECL X11DRV_WindowPosChanging( HWND hwnd, HWND insert_after, UINT swp_flag /* create the window surface if necessary */ if (!data->whole_window) return; + if (data->embedded) return; if (swp_flags & SWP_HIDEWINDOW) return; if (data->whole_window == root_window) return; if (has_gl_drawable( hwnd )) return;

1 0

Alexandre Julliard : server: Don' t trigger repaints on position changes for layered windows.
by Alexandre Julliard 13 Sep '12

13 Sep '12

Module: wine Branch: master Commit: 84fd7de0f7c0146b73f7b8d9cd364c9e6a7f3096 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84fd7de0f7c0146b73f7b8d9c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 13 13:47:03 2012 +0200 server: Don't trigger repaints on position changes for layered windows. --- server/window.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/server/window.c b/server/window.c index 47b94e2..a5a8853 100644 --- a/server/window.c +++ b/server/window.c @@ -2136,6 +2136,9 @@ DECL_HANDLER(set_window_pos) if (previous == win) flags |= SWP_NOZORDER; /* nothing to do */ } + /* windows that use UpdateLayeredWindow don't trigger repaints */ + if ((win->ex_style & WS_EX_LAYERED) && !win->is_layered) flags |= SWP_NOREDRAW; + /* window rectangle must be ordered properly */ if (req->window.right < req->window.left || req->window.bottom < req->window.top) {

1 0

Alexandre Julliard : user32: Don' t send messages on position changes in UpdateLayeredWindow.
by Alexandre Julliard 13 Sep '12

13 Sep '12

Module: wine Branch: master Commit: 9f29dcdc2e39368870873eee62e5c8da95096734 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f29dcdc2e39368870873eee6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 13 13:50:15 2012 +0200 user32: Don't send messages on position changes in UpdateLayeredWindow. --- dlls/user32/win.c | 31 +++++++++++++++++++++++-------- 1 files changed, 23 insertions(+), 8 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 2a0848e..95c5c4e 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -3594,23 +3594,38 @@ BOOL WINAPI UpdateLayeredWindowIndirect( HWND hwnd, const UPDATELAYEREDWINDOWINF if (!(info->dwFlags & ULW_EX_NORESIZE) && (info->pptDst || info->psize)) { - int x = 0, y = 0, cx = 0, cy = 0; - DWORD flags = SWP_NOSIZE | SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREDRAW | SWP_NOSENDCHANGING; + DWORD flags = SWP_NOSIZE | SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE; + RECT window_rect, client_rect; + SIZE offset; + + WIN_GetRectangles( hwnd, COORDS_PARENT, &window_rect, &client_rect ); if (info->pptDst) { - x = info->pptDst->x; - y = info->pptDst->y; + offset.cx = info->pptDst->x - window_rect.left; + offset.cy = info->pptDst->y - window_rect.top; + OffsetRect( &client_rect, offset.cx, offset.cy ); + OffsetRect( &window_rect, offset.cx, offset.cy ); flags &= ~SWP_NOMOVE; } if (info->psize) { - cx = info->psize->cx; - cy = info->psize->cy; + if (info->psize->cx <= 0 || info->psize->cy <= 0) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + offset.cx = info->psize->cx - (window_rect.right - window_rect.left); + offset.cy = info->psize->cy - (window_rect.bottom - window_rect.top); + client_rect.right += offset.cx; + client_rect.bottom += offset.cy; + window_rect.right += offset.cx; + window_rect.bottom += offset.cy; flags &= ~SWP_NOSIZE; } - TRACE( "moving window %p pos %d,%d %dx%d\n", hwnd, x, y, cx, cy ); - SetWindowPos( hwnd, 0, x, y, cx, cy, flags ); + TRACE( "moving window %p win %s client %s\n", hwnd, + wine_dbgstr_rect(&window_rect), wine_dbgstr_rect(&client_rect) ); + set_window_pos( hwnd, 0, flags, &window_rect, &client_rect, NULL ); } if (info->hdcSrc)

1 0