February 2013 - Wine-Commits

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

Feb. 13, 2013

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

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

Feb. 13, 2013

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 : winex11: Preserve the client window when changing the window visual.
by Alexandre Julliard Feb. 13, 2013

Feb. 13, 2013

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

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

Feb. 13, 2013

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

Andrew Talbot : mlang: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard Feb. 13, 2013

Feb. 13, 2013

Module: wine Branch: master Commit: ce41fc04413b369d532dad1ddf3e8125f8863c02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce41fc04413b369d532dad1dd… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Feb 12 22:20:04 2013 +0000 mlang: Avoid signed-unsigned integer comparisons. --- dlls/mlang/mlang.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index c3287f9..63e35e9 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -3008,7 +3008,7 @@ static HRESULT WINAPI fnIMultiLanguage3_ValidateCodePageEx( HWND hwnd, DWORD dwfIODControl) { - int i; + unsigned int i; MLang_impl *This = impl_from_IMultiLanguage3( iface ); TRACE("%p %u %p %08x\n", This, uiCodePage, hwnd, dwfIODControl); @@ -3020,7 +3020,7 @@ static HRESULT WINAPI fnIMultiLanguage3_ValidateCodePageEx( /* check for mlang supported code pages */ for (i = 0; i < sizeof(mlang_data)/sizeof(mlang_data[0]); i++) { - int n; + UINT n; for (n = 0; n < mlang_data[i].number_of_cp; n++) { if (mlang_data[i].mime_cp_info[n].cp == uiCodePage) @@ -3139,7 +3139,7 @@ static HRESULT WINAPI fnIMLangFontLink2_GetCharCodePages( IMLangFontLink2* iface WCHAR ch_src, DWORD *ret_codepages) { MLang_impl *This = impl_from_IMLangFontLink2(iface); - int i; + unsigned int i; TRACE("(%p)->(%s %p)\n", This, debugstr_wn(&ch_src, 1), ret_codepages);

1 0

André Hentschel : ntdll: Implement RtlUnwind for ARM.
by Alexandre Julliard Feb. 13, 2013

Feb. 13, 2013

Module: wine Branch: master Commit: 22c39932263a32989d80c5efa145ba12d722d048 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22c39932263a32989d80c5efa… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Feb 13 16:36:41 2013 +0100 ntdll: Implement RtlUnwind for ARM. --- dlls/ntdll/signal_arm.c | 55 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 53 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 6abd76b..bf94b17 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -916,9 +916,60 @@ void __wine_enter_vm86( CONTEXT *context ) /*********************************************************************** * RtlUnwind (NTDLL.@) */ -void WINAPI RtlUnwind( PVOID pEndFrame, PVOID targetIp, PEXCEPTION_RECORD pRecord, PVOID retval ) +void WINAPI RtlUnwind( void *endframe, void *target_ip, EXCEPTION_RECORD *rec, void *retval ) { - FIXME( "Not implemented on ARM\n" ); + CONTEXT context; + EXCEPTION_RECORD record; + EXCEPTION_REGISTRATION_RECORD *frame, *dispatch; + DWORD res; + + RtlCaptureContext( &context ); + context.R0 = (DWORD)retval; + + /* build an exception record, if we do not have one */ + if (!rec) + { + record.ExceptionCode = STATUS_UNWIND; + record.ExceptionFlags = 0; + record.ExceptionRecord = NULL; + record.ExceptionAddress = (void *)context.Pc; + record.NumberParameters = 0; + rec = &record; + } + + rec->ExceptionFlags |= EH_UNWINDING | (endframe ? 0 : EH_EXIT_UNWIND); + + TRACE( "code=%x flags=%x\n", rec->ExceptionCode, rec->ExceptionFlags ); + + /* get chain of exception frames */ + frame = NtCurrentTeb()->Tib.ExceptionList; + while ((frame != (EXCEPTION_REGISTRATION_RECORD*)~0UL) && (frame != endframe)) + { + /* Check frame address */ + if (endframe && ((void*)frame > endframe)) + raise_status( STATUS_INVALID_UNWIND_TARGET, rec ); + + if (!is_valid_frame( frame )) raise_status( STATUS_BAD_STACK, rec ); + + /* Call handler */ + TRACE( "calling handler at %p code=%x flags=%x\n", + frame->Handler, rec->ExceptionCode, rec->ExceptionFlags ); + res = frame->Handler(rec, frame, &context, &dispatch); + TRACE( "handler at %p returned %x\n", frame->Handler, res ); + + switch(res) + { + case ExceptionContinueSearch: + break; + case ExceptionCollidedUnwind: + frame = dispatch; + break; + default: + raise_status( STATUS_INVALID_DISPOSITION, rec ); + break; + } + frame = __wine_pop_frame( frame ); + } } /*******************************************************************

1 0

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

Feb. 13, 2013

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

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

Feb. 13, 2013

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

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

Feb. 13, 2013

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

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

Feb. 13, 2013

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

Andrew Talbot : mmdevapi: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard Feb. 13, 2013

Feb. 13, 2013

Module: wine Branch: master Commit: b6717dd3b1c88d5cb6cba510e4d7a79dcb2ec9b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6717dd3b1c88d5cb6cba510e… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Feb 12 22:20:09 2013 +0000 mmdevapi: Avoid signed-unsigned integer comparisons. --- dlls/mmdevapi/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mmdevapi/main.c b/dlls/mmdevapi/main.c index 1518b02..e19f27d 100644 --- a/dlls/mmdevapi/main.c +++ b/dlls/mmdevapi/main.c @@ -271,7 +271,7 @@ static IClassFactoryImpl MMDEVAPI_CF[] = { HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { - int i = 0; + unsigned int i = 0; TRACE("(%s, %s, %p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); if(!init_driver()){

1 0

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

Feb. 13, 2013

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

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

Feb. 13, 2013

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

Andrew Talbot : mscoree: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard Feb. 13, 2013

Feb. 13, 2013

Module: wine Branch: master Commit: 14afcb8ccd72609973520937011b17205f89c724 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14afcb8ccd726099735209370… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Feb 12 22:20:14 2013 +0000 mscoree: Avoid signed-unsigned integer comparisons. --- dlls/mscoree/metahost.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 66dde5d..eb3bc93 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -871,7 +871,7 @@ static HRESULT WINAPI InstalledRuntimeEnum_Next(IEnumUnknown *iface, ULONG celt, IUnknown **rgelt, ULONG *pceltFetched) { struct InstalledRuntimeEnum *This = impl_from_IEnumUnknown(iface); - int num_fetched = 0; + ULONG num_fetched = 0; HRESULT hr=S_OK; IUnknown *item; @@ -903,7 +903,7 @@ static HRESULT WINAPI InstalledRuntimeEnum_Next(IEnumUnknown *iface, ULONG celt, static HRESULT WINAPI InstalledRuntimeEnum_Skip(IEnumUnknown *iface, ULONG celt) { struct InstalledRuntimeEnum *This = impl_from_IEnumUnknown(iface); - int num_fetched = 0; + ULONG num_fetched = 0; HRESULT hr=S_OK; TRACE("(%p,%u)\n", iface, celt);

1 0

Hans Leidekker : wininet/tests: Fix a test failure.
by Alexandre Julliard Feb. 12, 2013

Feb. 12, 2013

Module: wine Branch: master Commit: c68bb8da7fad5d519a363b640254500d7deefb80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c68bb8da7fad5d519a363b640… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Feb 12 17:42:40 2013 +0100 wininet/tests: Fix a test failure. --- dlls/wininet/tests/ftp.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/tests/ftp.c b/dlls/wininet/tests/ftp.c index 7fbbe41..9d0cf3e 100644 --- a/dlls/wininet/tests/ftp.c +++ b/dlls/wininet/tests/ftp.c @@ -257,10 +257,8 @@ static void test_getfile(HINTERNET hFtp, HINTERNET hConnect) "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); /* Zero attributes */ - SetLastError(0xdeadbeef); bRet = FtpGetFileA(hFtp, "welcome.msg", "should_be_existing_non_deadbeef", FALSE, 0, FTP_TRANSFER_TYPE_UNKNOWN, 0); ok ( bRet == TRUE, "Expected FtpGetFileA to succeed\n"); - ok (GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", GetLastError()); ok (GetFileAttributesA("should_be_existing_non_deadbeef") != INVALID_FILE_ATTRIBUTES, "Local file should have been created\n"); DeleteFileA("should_be_existing_non_deadbeef");

1 0

Jacek Caban : urlmon: Fixed QueryInfo tests during BINDSTATUS_PROXYDETECTING notification.
by Alexandre Julliard Feb. 12, 2013

Feb. 12, 2013

Module: wine Branch: master Commit: 76997f1a38ec7157890c07154e40d00d8fcb3cb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76997f1a38ec7157890c07154… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 12 17:17:47 2013 +0100 urlmon: Fixed QueryInfo tests during BINDSTATUS_PROXYDETECTING notification. --- dlls/urlmon/tests/url.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 11d04c3..a7d0603 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -1463,8 +1463,8 @@ static void test_WinInetHttpInfo(IWinInetHttpInfo *http_info, DWORD progress) size = sizeof(DWORD); hres = IWinInetHttpInfo_QueryInfo(http_info, HTTP_QUERY_STATUS_CODE|HTTP_QUERY_FLAG_NUMBER, &status, &size, NULL, NULL); - ok(hres == expect || (progress == BINDSTATUS_COOKIE_SENT && hres == S_FALSE), - "hres = %x, expected %x\n", hres, expect); + ok(hres == expect || ((progress == BINDSTATUS_COOKIE_SENT || progress == BINDSTATUS_PROXYDETECTING) && hres == S_FALSE), + "progress %u: hres = %x, expected %x\n", progress, hres, expect); if(hres == S_OK) { if(download_state==BEFORE_DOWNLOAD && progress!=BINDSTATUS_MIMETYPEAVAILABLE) ok(status == 0, "status = %d\n", status);

1 0

Jacek Caban : urlmon: Clean up handling tested URLs.
by Alexandre Julliard Feb. 12, 2013

Feb. 12, 2013

Module: wine Branch: master Commit: c8a4ce89d0b5e67c37a70a48c75db2027e596869 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8a4ce89d0b5e67c37a70a48c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 12 17:17:02 2013 +0100 urlmon: Clean up handling tested URLs. --- dlls/urlmon/tests/url.c | 142 ++++++++++++++++++++++------------------------- 1 files changed, 67 insertions(+), 75 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c8a4ce89d0b5e67c37a70…

1 0

Jacek Caban : urlmon: Fixed tests on IEs that report BINDSTATUS_DECODING.
by Alexandre Julliard Feb. 12, 2013

Feb. 12, 2013

Module: wine Branch: master Commit: abf8d628881281716924cddb0fa31deb50be6786 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abf8d628881281716924cddb0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 12 17:22:15 2013 +0100 urlmon: Fixed tests on IEs that report BINDSTATUS_DECODING. This seems to happen on some IE versions that decode gzip streams in urlmon (as opposed to wininet). --- dlls/urlmon/tests/url.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index d00ebfe..a31a8a0 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -1468,10 +1468,10 @@ static void test_WinInetHttpInfo(IWinInetHttpInfo *http_info, DWORD progress) ok(hres == expect || ((progress == BINDSTATUS_COOKIE_SENT || progress == BINDSTATUS_PROXYDETECTING) && hres == S_FALSE), "progress %u: hres = %x, expected %x\n", progress, hres, expect); if(hres == S_OK) { - if(download_state==BEFORE_DOWNLOAD && progress!=BINDSTATUS_MIMETYPEAVAILABLE) - ok(status == 0, "status = %d\n", status); + if(download_state == BEFORE_DOWNLOAD && progress != BINDSTATUS_MIMETYPEAVAILABLE && progress != BINDSTATUS_DECODING) + ok(status == 0, "progress %u: status = %d\n", progress, status); else - ok(status == HTTP_STATUS_OK, "status = %d\n", status); + ok(status == HTTP_STATUS_OK, "progress %u: status = %d\n", progress, status); ok(size == sizeof(DWORD), "size = %d\n", size); } @@ -1816,6 +1816,9 @@ static HRESULT WINAPI statusclb_OnProgress(IBindStatusCallbackEx *iface, ULONG u case BINDSTATUS_COOKIE_SENT: trace("BINDSTATUS_COOKIE_SENT\n"); break; + case BINDSTATUS_DECODING: + trace("BINDSTATUS_DECODING\n"); + break; default: ok(0, "unexpected code %d\n", ulStatusCode); };

1 0

Jacek Caban : urlmon: Skip reported_url tests when binding to object.
by Alexandre Julliard Feb. 12, 2013

Feb. 12, 2013

Module: wine Branch: master Commit: c1a15b75aa7ee783e1ae3a6c817710004ae0c145 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1a15b75aa7ee783e1ae3a6c8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 12 17:21:16 2013 +0100 urlmon: Skip reported_url tests when binding to object. This limits the scope of http://source.winehq.org/git/wine.git/commitdiff/259cd7933612abdef0f88f4465… to fix random test failures. This makes the original test questionable, so if we ever see it failing again, we should simply revert it. --- dlls/urlmon/tests/url.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index a7d0603..d00ebfe 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -933,7 +933,9 @@ static HRESULT WINAPI Protocol_Continue(IInternetProtocol *iface, CHECK_EXPECT(Continue); ok(GetCurrentThreadId() == thread_id, "wrong thread %d\n", GetCurrentThreadId()); - ok(reported_url && !lstrcmpW(reported_url, current_url), "wrong url %s\n", wine_dbgstr_w(reported_url)); + + if(!bind_to_object) + ok(reported_url && !lstrcmpW(reported_url, current_url), "wrong url %s\n", wine_dbgstr_w(reported_url)); ok(pProtocolData != NULL, "pProtocolData == NULL\n"); if(!pProtocolData)

1 0

Huw Davies : riched20: Move run extent calculation to wrap.c.
by Alexandre Julliard Feb. 12, 2013

Feb. 12, 2013

Module: wine Branch: master Commit: c07212b3d080cf7df18c5bdb4c0e61c37bac618d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c07212b3d080cf7df18c5bdb4… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Feb 12 15:48:14 2013 +0000 riched20: Move run extent calculation to wrap.c. --- dlls/riched20/editor.h | 3 ++- dlls/riched20/run.c | 26 ++------------------------ dlls/riched20/wrap.c | 29 +++++++++++++++++++++++------ 3 files changed, 27 insertions(+), 31 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 4401498..5383f82 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -147,7 +147,8 @@ int ME_CanJoinRuns(const ME_Run *run1, const ME_Run *run2) DECLSPEC_HIDDEN; void ME_JoinRuns(ME_TextEditor *editor, ME_DisplayItem *p) DECLSPEC_HIDDEN; ME_DisplayItem *ME_SplitRunSimple(ME_TextEditor *editor, ME_Cursor *cursor) DECLSPEC_HIDDEN; void ME_UpdateRunFlags(ME_TextEditor *editor, ME_Run *run) DECLSPEC_HIDDEN; -void ME_CalcRunExtent(ME_Context *c, const ME_Paragraph *para, int startx, ME_Run *run) DECLSPEC_HIDDEN; +SIZE ME_GetRunSizeCommon(ME_Context *c, const ME_Paragraph *para, ME_Run *run, int nLen, + int startx, int *pAscent, int *pDescent) DECLSPEC_HIDDEN; SIZE ME_GetRunSize(ME_Context *c, const ME_Paragraph *para, ME_Run *run, int nLen, int startx) DECLSPEC_HIDDEN; void ME_CursorFromCharOfs(ME_TextEditor *editor, int nCharOfs, ME_Cursor *pCursor) DECLSPEC_HIDDEN; void ME_RunOfsFromCharOfs(ME_TextEditor *editor, int nCharOfs, ME_DisplayItem **ppPara, ME_DisplayItem **ppRun, int *pOfs) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index 6f9d5b5..37445a1 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -530,8 +530,8 @@ int ME_PointFromChar(ME_TextEditor *editor, ME_Run *pRun, int nOffset) * Finds width, height, ascent and descent of a run, up to given character * (nLen). */ -static SIZE ME_GetRunSizeCommon(ME_Context *c, const ME_Paragraph *para, ME_Run *run, int nLen, - int startx, int *pAscent, int *pDescent) +SIZE ME_GetRunSizeCommon(ME_Context *c, const ME_Paragraph *para, ME_Run *run, int nLen, + int startx, int *pAscent, int *pDescent) { SIZE size; int nMaxLen = run->len; @@ -615,28 +615,6 @@ SIZE ME_GetRunSize(ME_Context *c, const ME_Paragraph *para, } /****************************************************************************** - * ME_CalcRunExtent - * - * Updates the size of the run (fills width, ascent and descent). The height - * is calculated based on whole row's ascent and descent anyway, so no need - * to use it here. - */ -void ME_CalcRunExtent(ME_Context *c, const ME_Paragraph *para, int startx, ME_Run *run) -{ - if (run->nFlags & MERF_HIDDEN) - run->nWidth = 0; - else - { - int nEnd = run->len; - SIZE size = ME_GetRunSizeCommon(c, para, run, nEnd, startx, - &run->nAscent, &run->nDescent); - run->nWidth = size.cx; - if (!size.cx) - WARN("size.cx == 0\n"); - } -} - -/****************************************************************************** * ME_SetSelectionCharFormat * * Applies a style change, either to a current selection, or to insert cursor diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index 0531c97..aed04806 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -33,6 +33,23 @@ WINE_DEFAULT_DEBUG_CHANNEL(richedit); */ /****************************************************************************** + * calc_run_extent + * + * Updates the size of the run (fills width, ascent and descent). The height + * is calculated based on whole row's ascent and descent anyway, so no need + * to use it here. + */ +static void calc_run_extent(ME_Context *c, const ME_Paragraph *para, int startx, ME_Run *run) +{ + if (run->nFlags & MERF_HIDDEN) run->nWidth = 0; + else + { + SIZE size = ME_GetRunSizeCommon( c, para, run, run->len, startx, &run->nAscent, &run->nDescent ); + run->nWidth = size.cx; + } +} + +/****************************************************************************** * split_run_extents * * Splits a run into two in a given place. It also updates the screen position @@ -62,7 +79,7 @@ static ME_DisplayItem *split_run_extents(ME_WrapContext *wc, ME_DisplayItem *ite run2 = &cursor.pRun->member.run; - ME_CalcRunExtent(wc->context, para, wc->nRow ? wc->nLeftMargin : wc->nFirstMargin, run); + calc_run_extent(wc->context, para, wc->nRow ? wc->nLeftMargin : wc->nFirstMargin, run); run2->pt.x = run->pt.x+run->nWidth; run2->pt.y = run->pt.y; @@ -296,8 +313,8 @@ static void ME_WrapSizeRun(ME_WrapContext *wc, ME_DisplayItem *p) ME_UpdateRunFlags(wc->context->editor, &p->member.run); - ME_CalcRunExtent(wc->context, &wc->pPara->member.para, - wc->nRow ? wc->nLeftMargin : wc->nFirstMargin, &p->member.run); + calc_run_extent(wc->context, &wc->pPara->member.para, + wc->nRow ? wc->nLeftMargin : wc->nFirstMargin, &p->member.run); } @@ -488,9 +505,9 @@ static ME_DisplayItem *ME_WrapHandleRun(ME_WrapContext *wc, ME_DisplayItem *p) if (black) { wc->bOverflown = FALSE; pp = split_run_extents(wc, p, black); - ME_CalcRunExtent(wc->context, &wc->pPara->member.para, - wc->nRow ? wc->nLeftMargin : wc->nFirstMargin, - &pp->member.run); + calc_run_extent(wc->context, &wc->pPara->member.para, + wc->nRow ? wc->nLeftMargin : wc->nFirstMargin, + &pp->member.run); ME_InsertRowStart(wc, pp); return pp; }

1 0

Austin English : shlwapi: Add a stub for IsInternetESCEnabled.
by Alexandre Julliard Feb. 12, 2013

Feb. 12, 2013

Module: wine Branch: master Commit: b8f072e910b34eebebf1eae3a978839880b7571d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8f072e910b34eebebf1eae3a… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Feb 11 11:52:27 2013 -0800 shlwapi: Add a stub for IsInternetESCEnabled. --- dlls/shlwapi/shlwapi.spec | 1 + dlls/shlwapi/url.c | 9 +++++++++ include/shlwapi.h | 2 ++ 3 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index bf33e62..aad095e 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -567,6 +567,7 @@ @ stdcall IntlStrEqWorkerA(long str str long) StrIsIntlEqualA @ stdcall IntlStrEqWorkerW(long wstr wstr long) StrIsIntlEqualW @ stdcall IsCharSpaceA(long) +@ stdcall IsInternetESCEnabled() @ stdcall PathAddBackslashA (str) @ stdcall PathAddBackslashW (wstr) @ stdcall PathAddExtensionA (str str) diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index 70a0b87..102faf5 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -2621,3 +2621,12 @@ HRESULT WINAPI UrlFixupW(LPCWSTR url, LPWSTR translatedUrl, DWORD maxChars) return S_OK; } + +/************************************************************************* + * IsInternetESCEnabled [SHLWAPI.@] + */ +BOOL WINAPI IsInternetESCEnabled(void) +{ + FIXME(": stub\n"); + return FALSE; +} diff --git a/include/shlwapi.h b/include/shlwapi.h index a1436fa..f3d6ca0 100644 --- a/include/shlwapi.h +++ b/include/shlwapi.h @@ -955,6 +955,8 @@ VOID WINAPI ColorRGBToHLS(COLORREF,LPWORD,LPWORD,LPWORD); #endif /* NO_SHLWAPI_GDI */ +/* Security functions */ +BOOL WINAPI IsInternetESCEnabled(void); /* Stream functions */ #ifndef NO_SHLWAPI_STREAM

1 0

Alexandre Julliard : ntdll: Check for invalid %gs value in 32-bit code.
by Alexandre Julliard Feb. 12, 2013

Feb. 12, 2013

Module: wine Branch: master Commit: 64ddb263d25dfceeeae8457a0131f1a2af292383 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64ddb263d25dfceeeae8457a0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 12 15:21:15 2013 +0100 ntdll: Check for invalid %gs value in 32-bit code. Suggested by Alessandro Pignotti. --- dlls/ntdll/signal_i386.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 43 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 18fe3da..05ede34 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -1507,6 +1507,47 @@ static inline DWORD is_privileged_instr( CONTEXT *context ) } } +/*********************************************************************** + * check_invalid_gs + * + * Check for fault caused by invalid %gs value (some copy protection schemes mess with it). + */ +static inline BOOL check_invalid_gs( CONTEXT *context ) +{ + unsigned int prefix_count = 0; + const BYTE *instr = (BYTE *)context->Eip; + WORD system_gs = ntdll_get_thread_data()->gs; + + if (context->SegGs == system_gs) return FALSE; + if (!wine_ldt_is_system( context->SegCs )) return FALSE; + /* only handle faults in system libraries */ + if (virtual_is_valid_code_address( instr, 1 )) return FALSE; + + for (;;) switch(*instr) + { + /* instruction prefixes */ + case 0x2e: /* %cs: */ + case 0x36: /* %ss: */ + case 0x3e: /* %ds: */ + case 0x26: /* %es: */ + case 0x64: /* %fs: */ + case 0x66: /* opcode size */ + case 0x67: /* addr size */ + case 0xf0: /* lock */ + case 0xf2: /* repne */ + case 0xf3: /* repe */ + if (++prefix_count >= 15) return FALSE; + instr++; + continue; + case 0x65: /* %gs: */ + TRACE( "%04x/%04x at %p, fixing up\n", context->SegGs, system_gs, instr ); + context->SegGs = system_gs; + return TRUE; + default: + return FALSE; + } +} + #include "pshpack1.h" struct atl_thunk @@ -1716,6 +1757,8 @@ static void WINAPI raise_segv_exception( EXCEPTION_RECORD *rec, CONTEXT *context { if (rec->ExceptionInformation[0] == EXCEPTION_EXECUTE_FAULT && check_atl_thunk( rec, context )) goto done; + if (rec->ExceptionInformation[1] == 0xffffffff && check_invalid_gs( context )) + goto done; if (!(rec->ExceptionCode = virtual_handle_fault( (void *)rec->ExceptionInformation[1], rec->ExceptionInformation[0] ))) goto done;

1 0

Alexandre Julliard : ntdll: Add a helper function to check that a fault address lies in a known virtual memory view .
by Alexandre Julliard Feb. 12, 2013

Feb. 12, 2013

Module: wine Branch: master Commit: 99d89b347fd3cf6281817ff6fe884be8b359f944 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99d89b347fd3cf6281817ff6f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 12 19:56:08 2013 +0100 ntdll: Add a helper function to check that a fault address lies in a known virtual memory view. --- dlls/ntdll/ntdll_misc.h | 1 + dlls/ntdll/signal_i386.c | 2 ++ dlls/ntdll/virtual.c | 17 +++++++++++++++++ 3 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index e56d4b4..b4f7dbd 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -166,6 +166,7 @@ extern NTSTATUS virtual_create_builtin_view( void *base ) DECLSPEC_HIDDEN; extern NTSTATUS virtual_alloc_thread_stack( TEB *teb, SIZE_T reserve_size, SIZE_T commit_size ) DECLSPEC_HIDDEN; extern void virtual_clear_thread_stack(void) DECLSPEC_HIDDEN; extern BOOL virtual_handle_stack_fault( void *addr ) DECLSPEC_HIDDEN; +extern BOOL virtual_is_valid_code_address( const void *addr, SIZE_T size ) DECLSPEC_HIDDEN; extern NTSTATUS virtual_handle_fault( LPCVOID addr, DWORD err ) DECLSPEC_HIDDEN; extern BOOL virtual_check_buffer_for_read( const void *ptr, SIZE_T size ) DECLSPEC_HIDDEN; extern BOOL virtual_check_buffer_for_write( void *ptr, SIZE_T size ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 4a83a70..18fe3da 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -1528,6 +1528,8 @@ static BOOL check_atl_thunk( EXCEPTION_RECORD *rec, CONTEXT *context ) const struct atl_thunk *thunk = (const struct atl_thunk *)rec->ExceptionInformation[1]; BOOL ret = FALSE; + if (!virtual_is_valid_code_address( thunk, sizeof(thunk) )) return FALSE; + __TRY { if (thunk->movl == 0x042444c7 && thunk->jmp == 0xe9) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 4f8b3c9..924ec46 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1617,6 +1617,23 @@ NTSTATUS virtual_handle_fault( LPCVOID addr, DWORD err ) /*********************************************************************** + * virtual_is_valid_code_address + */ +BOOL virtual_is_valid_code_address( const void *addr, SIZE_T size ) +{ + struct file_view *view; + BOOL ret = FALSE; + sigset_t sigset; + + server_enter_uninterrupted_section( &csVirtual, &sigset ); + if ((view = VIRTUAL_FindView( addr, size ))) + ret = !(view->protect & VPROT_SYSTEM); /* system views are not visible to the app */ + server_leave_uninterrupted_section( &csVirtual, &sigset ); + return ret; +} + + +/*********************************************************************** * virtual_handle_stack_fault * * Handle an access fault inside the current thread stack.

1 0

Jacek Caban : oleaut32: COM clean up of ITypeLib2 interface implementation.
by Alexandre Julliard Feb. 12, 2013

Feb. 12, 2013

Module: wine Branch: master Commit: 253fdf157413a8752bf8007d2b6014f5d34103d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=253fdf157413a8752bf8007d2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 12 14:36:36 2013 +0100 oleaut32: COM clean up of ITypeLib2 interface implementation. --- dlls/oleaut32/typelib.c | 107 +++++++++++++++++++++------------------------- 1 files changed, 49 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=253fdf157413a8752bf80…

1 0

Alexandre Julliard : user32: Prefer loading color cursors in LoadImage.
by Alexandre Julliard Feb. 12, 2013

Feb. 12, 2013

Module: wine Branch: master Commit: 550e53b6bb685e806ccce392c6c6acb52cd17a2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=550e53b6bb685e806ccce392c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 12 13:56:41 2013 +0100 user32: Prefer loading color cursors in LoadImage. --- dlls/user32/cursoricon.c | 18 ++++++++---------- 1 files changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 5b21101..df11f56 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -2619,6 +2619,8 @@ HANDLE WINAPI LoadImageA( HINSTANCE hinst, LPCSTR name, UINT type, HANDLE WINAPI LoadImageW( HINSTANCE hinst, LPCWSTR name, UINT type, INT desiredx, INT desiredy, UINT loadflags ) { + int depth; + TRACE_(resource)("(%p,%s,%d,%d,%d,0x%08x)\n", hinst,debugstr_w(name),type,desiredx,desiredy,loadflags); @@ -2628,18 +2630,14 @@ HANDLE WINAPI LoadImageW( HINSTANCE hinst, LPCWSTR name, UINT type, return BITMAP_Load( hinst, name, desiredx, desiredy, loadflags ); case IMAGE_ICON: - if (!screen_dc) screen_dc = CreateDCW( DISPLAYW, NULL, NULL, NULL ); - if (screen_dc) + case IMAGE_CURSOR: + depth = 1; + if (!(loadflags & LR_MONOCHROME)) { - return CURSORICON_Load(hinst, name, desiredx, desiredy, - GetDeviceCaps(screen_dc, BITSPIXEL), - FALSE, loadflags); + if (!screen_dc) screen_dc = CreateDCW( DISPLAYW, NULL, NULL, NULL ); + if (screen_dc) depth = GetDeviceCaps( screen_dc, BITSPIXEL ); } - break; - - case IMAGE_CURSOR: - return CURSORICON_Load(hinst, name, desiredx, desiredy, - 1, TRUE, loadflags); + return CURSORICON_Load(hinst, name, desiredx, desiredy, depth, (type == IMAGE_CURSOR), loadflags); } return 0; }

1 0