February 2013 - Wine-commits

André Hentschel : winedbg: Add PState to cpu_register_map for ARM64.
by Alexandre Julliard 13 Feb '13

13 Feb '13

Module: wine Branch: master Commit: dd8ec9994b0ee8487d4c7afb9073c9f50957832b URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd8ec9994b0ee8487d4c7afb9… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Feb 12 23:02:17 2013 +0100 winedbg: Add PState to cpu_register_map for ARM64. --- programs/winedbg/gdbproxy.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 0caed37..bbd3898 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -423,6 +423,7 @@ static struct cpu_register cpu_register_map[] = { REG(X30, 8), REG(Sp, 8), REG(Pc, 8), + REG(PState, 8), }; #else # error Define the registers map for your CPU

1 0

Jeff Latimer : wmvcore: Add stub implementation for WMCreateEditor.
by Alexandre Julliard 13 Feb '13

13 Feb '13

Module: wine Branch: master Commit: 9f3ff9240df477ff8b674bcfc1c4ab69989a2b9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f3ff9240df477ff8b674bcfc… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Wed Feb 13 13:58:41 2013 +1100 wmvcore: Add stub implementation for WMCreateEditor. --- dlls/wmvcore/wmvcore.spec | 2 +- dlls/wmvcore/wmvcore_main.c | 9 +++++++++ include/wmsdkidl.idl | 16 ++++++++++++++++ 3 files changed, 26 insertions(+), 1 deletions(-) diff --git a/dlls/wmvcore/wmvcore.spec b/dlls/wmvcore/wmvcore.spec index 5b7e4f1..4893001 100644 --- a/dlls/wmvcore/wmvcore.spec +++ b/dlls/wmvcore/wmvcore.spec @@ -6,7 +6,7 @@ @ stub WMValidateData @ stdcall -private DllRegisterServer() @ stub WMCreateBackupRestorer -@ stub WMCreateEditor +@ stdcall WMCreateEditor(ptr) @ stub WMCreateIndexer @ stub WMCreateProfileManager @ stdcall WMCreateReader(ptr long ptr) diff --git a/dlls/wmvcore/wmvcore_main.c b/dlls/wmvcore/wmvcore_main.c index 846b8d6..8d928ca 100644 --- a/dlls/wmvcore/wmvcore_main.c +++ b/dlls/wmvcore/wmvcore_main.c @@ -52,6 +52,15 @@ HRESULT WINAPI DllRegisterServer(void) return S_OK; } +HRESULT WINAPI WMCreateEditor(IWMMetadataEditor **editor) +{ + FIXME("(%p): stub\n", editor); + + *editor = NULL; + + return E_NOTIMPL; +} + HRESULT WINAPI WMCreateReader(IUnknown *reserved, DWORD rights, IWMSyncReader **reader) { FIXME("(%p, %x, %p): stub\n", reserved, rights, reader); diff --git a/include/wmsdkidl.idl b/include/wmsdkidl.idl index 589d6ae..4cb1db7 100644 --- a/include/wmsdkidl.idl +++ b/include/wmsdkidl.idl @@ -182,6 +182,22 @@ interface IWMOutputMediaProps : IWMMediaProps [ object, + uuid(96406bd9-2b2b-11d3-b36b-00c04f6108ff), + pointer_default(unique), + local +] +interface IWMMetadataEditor : IUnknown +{ + HRESULT Open( + [in] const WCHAR *pwszFilename); + + HRESULT Close(); + + HRESULT Flush(); +}; + +[ + object, uuid(96406bd6-2b2b-11d3-b36b-00c04f6108ff), pointer_default(unique), local

1 0

Austin English : d3d11: Add a stub for D3D11CreateDevice.
by Alexandre Julliard 13 Feb '13

13 Feb '13

Module: wine Branch: master Commit: 0130eca6a0d6a2cd5d98ac3a008fcf0c224e9f7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0130eca6a0d6a2cd5d98ac3a0… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Feb 12 15:44:15 2013 -0800 d3d11: Add a stub for D3D11CreateDevice. --- dlls/d3d11/Makefile.in | 3 ++ dlls/d3d11/d3d11.spec | 2 +- dlls/d3d11/d3d11_main.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 60 insertions(+), 1 deletions(-) diff --git a/dlls/d3d11/Makefile.in b/dlls/d3d11/Makefile.in index ef3c5a0..da7bbe6 100644 --- a/dlls/d3d11/Makefile.in +++ b/dlls/d3d11/Makefile.in @@ -1,3 +1,6 @@ MODULE = d3d11.dll +C_SRCS = \ + d3d11_main.c + @MAKE_DLL_RULES@ diff --git a/dlls/d3d11/d3d11.spec b/dlls/d3d11/d3d11.spec index 0ff00d2..ffe0712 100644 --- a/dlls/d3d11/d3d11.spec +++ b/dlls/d3d11/d3d11.spec @@ -2,7 +2,7 @@ @ stub D3D11CoreCreateLayeredDevice @ stub D3D11CoreGetLayeredDeviceSize @ stub D3D11CoreRegisterLayers -@ stub D3D11CreateDevice +@ stdcall D3D11CreateDevice(ptr long ptr long long long long ptr ptr ptr) @ stub D3D11CreateDeviceAndSwapChain @ stub D3DKMTCloseAdapter @ stub D3DKMTCreateAllocation diff --git a/dlls/d3d11/d3d11_main.c b/dlls/d3d11/d3d11_main.c new file mode 100644 index 0000000..4091bca --- /dev/null +++ b/dlls/d3d11/d3d11_main.c @@ -0,0 +1,56 @@ +/* + * Direct3D 11 + * + * Copyright 2013 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "d3d11.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d3d11); + +const char *debug_d3d_driver_type(D3D_DRIVER_TYPE driver_type) +{ + switch(driver_type) + { +#define D3D11_TO_STR(x) case x: return #x + D3D11_TO_STR(D3D_DRIVER_TYPE_UNKNOWN); + D3D11_TO_STR(D3D_DRIVER_TYPE_HARDWARE); + D3D11_TO_STR(D3D_DRIVER_TYPE_REFERENCE); + D3D11_TO_STR(D3D_DRIVER_TYPE_NULL); + D3D11_TO_STR(D3D_DRIVER_TYPE_SOFTWARE); + D3D11_TO_STR(D3D_DRIVER_TYPE_WARP); +#undef D3D11_TO_STR + default: + return wine_dbg_sprintf("Unrecognized D3D_DRIVER_TYPE %#x\n", driver_type); + } +} + +HRESULT WINAPI D3D11CreateDevice(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver_type, HMODULE swrast, UINT flags, + const D3D_FEATURE_LEVEL feature_levels, UINT levels, UINT sdk_version, + ID3D11Device **device, D3D_FEATURE_LEVEL *feature_level, ID3D11DeviceContext **context) +{ + FIXME("stub: adapter %p, driver_type %s, swrast %p, flags %#x, feature_levels %d, levels %#x, sdk_version %d, " + "device %p, feature_level %p, context %p\n", adapter, debug_d3d_driver_type(driver_type), swrast, + flags, feature_levels, levels, sdk_version, device, feature_level, context); + return E_OUTOFMEMORY; +}

1 0

Dmitry Timoshkov : gdi32: Make sure that actual clipping region is updated for a EMF DC.
by Alexandre Julliard 13 Feb '13

13 Feb '13

Module: wine Branch: master Commit: 9a2688e690866f20602a3daf517bb2b9f74b87e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a2688e690866f20602a3daf5… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Feb 13 16:47:13 2013 +0800 gdi32: Make sure that actual clipping region is updated for a EMF DC. --- dlls/gdi32/enhmfdrv/dc.c | 3 ++- dlls/gdi32/tests/metafile.c | 11 +++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index 817872c..44dc741 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -191,6 +191,7 @@ INT EMFDRV_OffsetClipRgn( PHYSDEV dev, INT x, INT y ) INT EMFDRV_ExtSelectClipRgn( PHYSDEV dev, HRGN hrgn, INT mode ) { + PHYSDEV next = GET_NEXT_PHYSDEV( dev, pExtSelectClipRgn ); EMREXTSELECTCLIPRGN *emr; DWORD size, rgnsize; BOOL ret; @@ -213,7 +214,7 @@ INT EMFDRV_ExtSelectClipRgn( PHYSDEV dev, HRGN hrgn, INT mode ) ret = EMFDRV_WriteRecord( dev, &emr->emr ); HeapFree( GetProcessHeap(), 0, emr ); - return ret ? SIMPLEREGION : ERROR; + return ret ? next->funcs->pExtSelectClipRgn( next, hrgn, mode ) : ERROR; } INT EMFDRV_SetMapMode( PHYSDEV dev, INT mode ) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index e4413db..2623847 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -2477,14 +2477,13 @@ static void test_emf_clipping(void) SetRect(&rc_sclip, 100, 100, GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN)); hrgn = CreateRectRgn(rc_sclip.left, rc_sclip.top, rc_sclip.right, rc_sclip.bottom); SelectClipRgn(hdc, hrgn); + SetRect(&rc_res, -1, -1, -1, -1); ret = GetClipBox(hdc, &rc_res); -todo_wine ok(ret == SIMPLEREGION, "got %d\n", ret); - if(ret == SIMPLEREGION) - ok(EqualRect(&rc_res, &rc_sclip), - "expected rc_res (%d, %d) - (%d, %d), got (%d, %d) - (%d, %d)\n", - rc_sclip.left, rc_sclip.top, rc_sclip.right, rc_sclip.bottom, - rc_res.left, rc_res.top, rc_res.right, rc_res.bottom); + ok(EqualRect(&rc_res, &rc_sclip), + "expected rc_res (%d,%d)-(%d,%d), got (%d,%d)-(%d,%d)\n", + rc_sclip.left, rc_sclip.top, rc_sclip.right, rc_sclip.bottom, + rc_res.left, rc_res.top, rc_res.right, rc_res.bottom); hemf = CloseEnhMetaFile(hdc); DeleteEnhMetaFile(hemf);

1 0

Hans Leidekker : msi/tests: Move a couple of tests from install.c to msi.c.
by Alexandre Julliard 13 Feb '13

13 Feb '13

Module: wine Branch: master Commit: 9779c4b5eaf15e14168675677875fd8145d1c143 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9779c4b5eaf15e14168675677… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 13 12:06:14 2013 +0100 msi/tests: Move a couple of tests from install.c to msi.c. --- dlls/msi/tests/install.c | 565 +----------------------------- dlls/msi/tests/msi.c | 886 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 895 insertions(+), 556 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9779c4b5eaf15e1416867…

1 0

Alexandre Julliard : winex11: Preserve the client window when changing the window visual.
by Alexandre Julliard 13 Feb '13

13 Feb '13

Module: wine Branch: master Commit: 76b8612c3e5879f396756d9be9f3efb3964e1d5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=76b8612c3e5879f396756d9be… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 13 14:51:00 2013 +0100 winex11: Preserve the client window when changing the window visual. --- dlls/winex11.drv/window.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 7f97330..ec15afc 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1525,12 +1525,23 @@ static void destroy_whole_window( struct x11drv_win_data *data, BOOL already_des */ void set_window_visual( struct x11drv_win_data *data, const XVisualInfo *vis ) { + Window client_window = data->client_window; + Window whole_window = data->whole_window; + if (data->vis.visualid == vis->visualid) return; - destroy_whole_window( data, FALSE ); + data->client_window = 0; + destroy_whole_window( data, client_window != 0 /* don't destroy whole_window until reparented */ ); if (data->surface) window_surface_release( data->surface ); data->surface = NULL; data->vis = *vis; create_whole_window( data ); + if (!client_window) return; + /* move the client to the new parent */ + XReparentWindow( data->display, client_window, data->whole_window, + data->client_rect.left - data->whole_rect.left, + data->client_rect.top - data->whole_rect.top ); + data->client_window = client_window; + XDestroyWindow( data->display, whole_window ); }

1 0

Alexandre Julliard : server: Don't support debug registers in ptrace if sys /user.h is missing.
by Alexandre Julliard 13 Feb '13

13 Feb '13

Module: wine Branch: master Commit: fc7e81be158370e1ffb3253593ceb7fef89b2748 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc7e81be158370e1ffb325359… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 13 16:26:17 2013 +0100 server: Don't support debug registers in ptrace if sys/user.h is missing. --- server/ptrace.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/server/ptrace.c b/server/ptrace.c index db2804a..9788339 100644 --- a/server/ptrace.c +++ b/server/ptrace.c @@ -528,11 +528,9 @@ void get_selector_entry( struct thread *thread, int entry, unsigned int *base, } -#if defined(linux) && (defined(__i386__) || defined(__x86_64__)) +#if defined(linux) && defined(HAVE_SYS_USER_H) && (defined(__i386__) || defined(__x86_64__)) -#ifdef HAVE_SYS_USER_H -# include <sys/user.h> -#endif +#include <sys/user.h> /* debug register offset in struct user */ #define DR_OFFSET(dr) ((((struct user *)0)->u_debugreg) + (dr))

1 0

Alexandre Julliard : loader: Define our own auxv structure.
by Alexandre Julliard 13 Feb '13

13 Feb '13

Module: wine Branch: master Commit: 3b8ab28c40f44350dd0228858cb6ccd8f1df384d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b8ab28c40f44350dd0228858… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 13 16:26:39 2013 +0100 loader: Define our own auxv structure. --- loader/preloader.c | 24 ++++++++++++++++-------- 1 files changed, 16 insertions(+), 8 deletions(-) diff --git a/loader/preloader.c b/loader/preloader.c index ba43f0a..92fae74 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -158,6 +158,14 @@ struct wld_link_map { ElfW(Addr) l_interp; }; +struct wld_auxv +{ + ElfW(Addr) a_type; + union + { + ElfW(Addr) a_val; + } a_un; +}; /* * The __bb_init_func is an empty function only called when file is @@ -540,7 +548,7 @@ static __attribute__((noreturn,format(printf,1,2))) void fatal_error(const char * Dump interesting bits of the ELF auxv_t structure that is passed * as the 4th parameter to the _start function */ -static void dump_auxiliary( ElfW(auxv_t) *av ) +static void dump_auxiliary( struct wld_auxv *av ) { #define NAME(at) { at, #at } static const struct { int val; const char *name; } names[] = @@ -581,8 +589,8 @@ static void dump_auxiliary( ElfW(auxv_t) *av ) * * Set the new auxiliary values */ -static void set_auxiliary_values( ElfW(auxv_t) *av, const ElfW(auxv_t) *new_av, - const ElfW(auxv_t) *delete_av, void **stack ) +static void set_auxiliary_values( struct wld_auxv *av, const struct wld_auxv *new_av, + const struct wld_auxv *delete_av, void **stack ) { int i, j, av_count = 0, new_count = 0, delete_count = 0; char *src, *dst; @@ -624,7 +632,7 @@ static void set_auxiliary_values( ElfW(auxv_t) *av, const ElfW(auxv_t) *new_av, for (i = len - 1; i >= 0; i--) dst[i] = src[i]; } *stack = dst; - av = (ElfW(auxv_t) *)((char *)av + (dst - src)); + av = (struct wld_auxv *)((char *)av + (dst - src)); /* now set the values */ for (j = 0; new_av[j].a_type != AT_NULL; j++) @@ -650,7 +658,7 @@ static void set_auxiliary_values( ElfW(auxv_t) *av, const ElfW(auxv_t) *new_av, * * Get a field of the auxiliary structure */ -static int get_auxiliary( ElfW(auxv_t) *av, int type, int def_val ) +static int get_auxiliary( struct wld_auxv *av, int type, int def_val ) { for ( ; av->a_type != AT_NULL; av++) if( av->a_type == type ) return av->a_un.a_val; @@ -1110,7 +1118,7 @@ static void remove_preload_range( int i ) * * Check if address of the given aux value is in one of the reserved ranges */ -static int is_in_preload_range( const ElfW(auxv_t) *av, int type ) +static int is_in_preload_range( const struct wld_auxv *av, int type ) { while (av->a_type != AT_NULL) { @@ -1153,7 +1161,7 @@ void* wld_start( void **stack ) long i, *pargc; char **argv, **p; char *interp, *reserve = NULL; - ElfW(auxv_t) new_av[12], delete_av[3], *av; + struct wld_auxv new_av[12], delete_av[3], *av; struct wld_link_map main_binary_map, ld_so_map; struct wine_preload_info **wine_main_preload_info; @@ -1172,7 +1180,7 @@ void* wld_start( void **stack ) p++; } - av = (ElfW(auxv_t)*) (p+1); + av = (struct wld_auxv *)(p+1); page_size = get_auxiliary( av, AT_PAGESZ, 4096 ); page_mask = page_size - 1;

1 0

Alexandre Julliard : loader: Rename the elf_hash function to avoid conflicts.
by Alexandre Julliard 13 Feb '13

13 Feb '13

Module: wine Branch: master Commit: 097867debd1f7f1229d8393754353a9b992574d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=097867debd1f7f1229d839375… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 13 16:58:23 2013 +0100 loader: Rename the elf_hash function to avoid conflicts. --- loader/preloader.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/loader/preloader.c b/loader/preloader.c index 92fae74..e2f9c3f 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -912,7 +912,7 @@ static void map_so_lib( const char *name, struct wld_link_map *l) } -static unsigned int elf_hash( const char *name ) +static unsigned int wld_elf_hash( const char *name ) { unsigned int hi, hash = 0; while (*name) @@ -1006,7 +1006,7 @@ static void *find_symbol( const ElfW(Phdr) *phdr, int num, const char *var, int } else if (hashtab) /* old style hash table */ { - const unsigned int hash = elf_hash(var); + const unsigned int hash = wld_elf_hash(var); const Elf_Symndx nbuckets = hashtab[0]; const Elf_Symndx *buckets = hashtab + 2; const Elf_Symndx *chains = buckets + nbuckets;

1 0

Jörg Höhle : winmm: More compatible midiIn/Out[Un ]Prepare MHDR_* flag handling.
by Alexandre Julliard 13 Feb '13

13 Feb '13

Module: wine Branch: master Commit: b95910ccbc21f731874c11198b930ee6f91be737 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b95910ccbc21f731874c11198… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sat Jan 26 23:29:31 2013 +0100 winmm: More compatible midiIn/Out[Un]Prepare MHDR_* flag handling. --- dlls/midimap/midimap.c | 17 +++++--- dlls/winealsa.drv/midi.c | 58 ++++++++++------------------ dlls/winecoreaudio.drv/midi.c | 61 ++++++++--------------------- dlls/wineoss.drv/midi.c | 59 ++++++++++------------------ dlls/winmm/tests/midi.c | 85 ++++++++++++++++++++++++++++++++++++++-- dlls/winmm/winmm.c | 24 +----------- 6 files changed, 151 insertions(+), 153 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b95910ccbc21f731874c1…

1 0