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

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

Feb. 12, 2013

Module: wine Branch: master Commit: ac79a3f9d372949de74942cc3b7f368a23db9296 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac79a3f9d372949de74942cc3… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Feb 11 22:44:12 2013 +0000 kernel32: Avoid signed-unsigned integer comparisons. --- dlls/kernel32/debugger.c | 3 ++- dlls/kernel32/volume.c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/debugger.c b/dlls/kernel32/debugger.c index 528ba76..5300fb5 100644 --- a/dlls/kernel32/debugger.c +++ b/dlls/kernel32/debugger.c @@ -51,7 +51,8 @@ BOOL WINAPI WaitForDebugEvent( DWORD timeout) { BOOL ret; - DWORD i, res; + DWORD res; + int i; for (;;) { diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index 8ca4555..2e0cc8a 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -445,7 +445,7 @@ static enum fs_type VOLUME_ReadCDSuperblock( HANDLE handle, BYTE *buff ) */ static BOOL UDF_Find_PVD( HANDLE handle, BYTE pvd[] ) { - int i; + unsigned int i; DWORD offset; INT locations[] = { 256, -1, -257, 512 }; @@ -548,7 +548,7 @@ static void VOLUME_GetSuperblockLabel( const UNICODE_STRING *device, HANDLE hand } else { - int i; + unsigned int i; label_len = 1 + pvd[24+32-1]; for(i=0; i<label_len && i<len; i+=2)

1 0

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

Feb. 12, 2013

Module: wine Branch: master Commit: d24dc4b884c8524cb9ccd795959ab92e084b4b69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d24dc4b884c8524cb9ccd7959… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Feb 11 22:44:56 2013 +0000 mapi32: Avoid signed-unsigned integer comparisons. --- dlls/mapi32/sendmail.c | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/mapi32/sendmail.c b/dlls/mapi32/sendmail.c index da19259..9ebb220 100644 --- a/dlls/mapi32/sendmail.c +++ b/dlls/mapi32/sendmail.c @@ -269,7 +269,7 @@ static ULONG sendmail_extended_mapi(LHANDLE mapi_session, ULONG_PTR uiparam, lpM if (message->nFileCount > 0) { ULONG num_attach = 0; - int i, j; + unsigned int i; for (i = 0; i < message->nFileCount; i++) { @@ -294,6 +294,8 @@ static ULONG sendmail_extended_mapi(LHANDLE mapi_session, ULONG_PTR uiparam, lpM if (!filename) { + int j; + filename = message->lpFiles[i].lpszPathName; for (j = lstrlenW(message->lpFiles[i].lpszPathName)-1; j >= 0; j--) @@ -307,7 +309,7 @@ static ULONG sendmail_extended_mapi(LHANDLE mapi_session, ULONG_PTR uiparam, lpM } } - TRACE("Attachment %d path: '%s'; filename: '%s'\n", i, debugstr_w(message->lpFiles[i].lpszPathName), + TRACE("Attachment %u path: '%s'; filename: '%s'\n", i, debugstr_w(message->lpFiles[i].lpszPathName), debugstr_w(filename)); /* Create the attachment */ @@ -504,7 +506,7 @@ ULONG WINAPI MAPISendMail( LHANDLE session, ULONG_PTR uiparam, if (message->nFileCount && message->lpFiles) { lpMapiFileDescW filesW; - int i; + unsigned int i; filesW = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(MapiFileDescW) * message->nFileCount); @@ -522,7 +524,7 @@ ULONG WINAPI MAPISendMail( LHANDLE session, ULONG_PTR uiparam, /* Now free everything we allocated */ if (message->nFileCount && message->lpFiles) { - int i; + unsigned int i; for (i = 0; i < message->nFileCount; i++) { @@ -623,7 +625,7 @@ ULONG WINAPI MAPISendMailW(LHANDLE session, ULONG_PTR uiparam, if (message->nRecipCount && message->lpRecips) { lpMapiRecipDesc recipsA; - int i; + unsigned int i; recipsA = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(MapiRecipDesc) * message->nRecipCount); @@ -638,7 +640,7 @@ ULONG WINAPI MAPISendMailW(LHANDLE session, ULONG_PTR uiparam, if (message->nFileCount && message->lpFiles) { lpMapiFileDesc filesA; - int i; + unsigned int i; filesA = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(MapiFileDesc) * message->nFileCount); @@ -666,7 +668,7 @@ ULONG WINAPI MAPISendMailW(LHANDLE session, ULONG_PTR uiparam, if (message->nRecipCount && message->lpRecips) { - int i; + unsigned int i; for (i = 0; i < message->nRecipCount; i++) { @@ -679,7 +681,7 @@ ULONG WINAPI MAPISendMailW(LHANDLE session, ULONG_PTR uiparam, if (message->nFileCount && message->lpFiles) { - int i; + unsigned int i; for (i = 0; i < message->nFileCount; i++) {

1 0

Dmitry Timoshkov : winspool.drv: There is no need to speculate about wineps .drv default DEVMODE.
by Alexandre Julliard Feb. 12, 2013

Feb. 12, 2013

Module: wine Branch: master Commit: dc8d7e7d6248b0d89437fbf837bd9e886fdbca31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc8d7e7d6248b0d89437fbf83… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Feb 12 15:21:26 2013 +0800 winspool.drv: There is no need to speculate about wineps.drv default DEVMODE. --- dlls/winspool.drv/info.c | 71 ++++++++-------------------------------- dlls/winspool.drv/tests/info.c | 2 +- 2 files changed, 15 insertions(+), 58 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 60b621e..27a6edd 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -3986,63 +3986,20 @@ static BOOL WINSPOOL_GetStringFromReg(HKEY hkey, LPCWSTR ValueName, LPBYTE ptr, * WINSPOOL_GetDefaultDevMode * * Get a default DevMode values for wineps. - * FIXME - use ppd. - */ - -static void WINSPOOL_GetDefaultDevMode( - LPBYTE ptr, - DWORD buflen, DWORD *needed) -{ - DEVMODEW dm; - static const WCHAR szWwps[] = {'w', 'i', 'n', 'e', 'p', 's', '.', 'd', 'r', 'v', 0 }; - - /* fill default DEVMODE - should be read from ppd... */ - ZeroMemory( &dm, sizeof(dm) ); - memcpy(dm.dmDeviceName,szWwps,sizeof szWwps); - dm.dmSpecVersion = DM_SPECVERSION; - dm.dmDriverVersion = 1; - dm.dmSize = sizeof(DEVMODEW); - dm.dmDriverExtra = 0; - dm.dmFields = - DM_ORIENTATION | DM_PAPERSIZE | - DM_PAPERLENGTH | DM_PAPERWIDTH | - DM_SCALE | - DM_COPIES | - DM_DEFAULTSOURCE | DM_PRINTQUALITY | - DM_YRESOLUTION | DM_TTOPTION; - - dm.u1.s1.dmOrientation = DMORIENT_PORTRAIT; - dm.u1.s1.dmPaperSize = DMPAPER_A4; - dm.u1.s1.dmPaperLength = 2970; - dm.u1.s1.dmPaperWidth = 2100; - - dm.u1.s1.dmScale = 100; - dm.u1.s1.dmCopies = 1; - dm.u1.s1.dmDefaultSource = DMBIN_AUTO; - dm.u1.s1.dmPrintQuality = DMRES_MEDIUM; - /* dm.dmColor */ - /* dm.dmDuplex */ - dm.dmYResolution = 300; /* 300dpi */ - dm.dmTTOption = DMTT_BITMAP; - /* dm.dmCollate */ - /* dm.dmFormName */ - /* dm.dmLogPixels */ - /* dm.dmBitsPerPel */ - /* dm.dmPelsWidth */ - /* dm.dmPelsHeight */ - /* dm.u2.dmDisplayFlags */ - /* dm.dmDisplayFrequency */ - /* dm.dmICMMethod */ - /* dm.dmICMIntent */ - /* dm.dmMediaType */ - /* dm.dmDitherType */ - /* dm.dmReserved1 */ - /* dm.dmReserved2 */ - /* dm.dmPanningWidth */ - /* dm.dmPanningHeight */ - - if(buflen >= sizeof(DEVMODEW)) - memcpy(ptr, &dm, sizeof(DEVMODEW)); + */ +static void WINSPOOL_GetDefaultDevMode(LPBYTE ptr, DWORD buflen, DWORD *needed) +{ + static const WCHAR winepsW[] = { 'w','i','n','e','p','s','.','d','r','v',0 }; + + if (buflen >= sizeof(DEVMODEW)) + { + DEVMODEW *dm = (DEVMODEW *)ptr; + + /* the driver will update registry with real values */ + memset(dm, 0, sizeof(*dm)); + dm->dmSize = sizeof(*dm); + lstrcpyW(dm->dmDeviceName, winepsW); + } *needed = sizeof(DEVMODEW); } diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index 25ee9c4..1c98d4d 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -2989,7 +2989,7 @@ todo_wine START_TEST(info) { - hwinspool = GetModuleHandleA("winspool.drv"); + hwinspool = LoadLibrary("winspool.drv"); pAddPortExA = (void *) GetProcAddress(hwinspool, "AddPortExA"); pEnumPrinterDriversW = (void *) GetProcAddress(hwinspool, "EnumPrinterDriversW"); pGetDefaultPrinterA = (void *) GetProcAddress(hwinspool, "GetDefaultPrinterA");

1 0

Juan Lang : cryptui: Use add_usage_to_oid correctly.
by Alexandre Julliard Feb. 12, 2013

Feb. 12, 2013

Module: wine Branch: master Commit: ba7eebfd624666f35f4c4e95fd9ce8d860830f8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba7eebfd624666f35f4c4e95f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Feb 11 12:51:04 2013 -0800 cryptui: Use add_usage_to_oid correctly. Spotted by Marcus Meissner and Coverity. --- dlls/cryptui/main.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 6481c1f..c3b0a0e 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -295,7 +295,7 @@ static CERT_ENHKEY_USAGE *convert_usages_str_to_usage(LPSTR usageStr) { if (comma) *comma = 0; - add_oid_to_usage(usage, ptr); + usage = add_oid_to_usage(usage, ptr); } } return usage; @@ -323,7 +323,7 @@ static CERT_ENHKEY_USAGE *create_advanced_filter(void) { PCCRYPT_OID_INFO *ptr; - for (ptr = usages; *ptr; ptr++) + for (ptr = usages; advancedUsage && *ptr; ptr++) { DWORD i; BOOL disabled = FALSE; @@ -334,7 +334,7 @@ static CERT_ENHKEY_USAGE *create_advanced_filter(void) (*ptr)->pszOID)) disabled = TRUE; if (!disabled) - add_oid_to_usage(advancedUsage, + advancedUsage = add_oid_to_usage(advancedUsage, (LPSTR)(*ptr)->pszOID); } /* The individual strings are pointers to disabledUsagesStr,

1 0

Jacek Caban : oleaut32: Return error if VT_HRESULT is used as return type in DispCallFunc.
by Alexandre Julliard Feb. 12, 2013

Feb. 12, 2013

Module: wine Branch: master Commit: 88367a3c58df9993164124c3abd558d6e4ffb12c URL: http://source.winehq.org/git/wine.git/?a=commit;h=88367a3c58df9993164124c3a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 12 14:52:30 2013 +0100 oleaut32: Return error if VT_HRESULT is used as return type in DispCallFunc. --- dlls/oleaut32/tests/typelib.c | 16 ++++++++++++++++ dlls/oleaut32/typelib.c | 8 ++++++++ 2 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 1bcc584..077c59c 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -923,6 +923,11 @@ static int WINAPI inst_func( void *inst, int a ) return a * 2; } +static HRESULT WINAPI ret_false_func(void) +{ + return S_FALSE; +} + static const void *vtable[] = { NULL, NULL, NULL, inst_func }; static void test_DispCallFunc(void) @@ -1038,6 +1043,17 @@ static void test_DispCallFunc(void) ok( res == S_OK, "DispCallFunc failed %x\n", res ); ok( V_VT(&result) == VT_I4, "wrong result type %d\n", V_VT(&result) ); ok( V_I4(&result) == 6, "wrong result %08x\n", V_I4(&result) ); + + memset( &result, 0xcc, sizeof(result) ); + res = DispCallFunc(NULL, (ULONG_PTR)ret_false_func, CC_STDCALL, VT_ERROR, 0, NULL, NULL, &result); + ok(res == S_OK, "DispCallFunc failed: %08x\n", res); + ok(V_VT(&result) == VT_ERROR, "V_VT(result) = %u\n", V_VT(&result)); + ok(V_ERROR(&result) == S_FALSE, "V_ERROR(result) = %08x\n", V_ERROR(&result)); + + memset( &result, 0xcc, sizeof(result) ); + res = DispCallFunc(NULL, (ULONG_PTR)ret_false_func, CC_STDCALL, VT_HRESULT, 0, NULL, NULL, &result); + ok(res == E_INVALIDARG, "DispCallFunc failed: %08x\n", res); + ok(V_VT(&result) == 0xcccc, "V_VT(result) = %u\n", V_VT(&result)); } /* RegDeleteTreeW from dlls/advapi32/registry.c */ diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 97f07d2..0f3ca6b 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -6185,6 +6185,10 @@ DispCallFunc( case VT_CY: V_UI8(pvargResult) = call_method( func, argspos - 1, args + 1, &stack_offset ); break; + case VT_HRESULT: + WARN("invalid return type %u\n", vtReturn); + heap_free( args ); + return E_INVALIDARG; default: V_UI4(pvargResult) = call_method( func, argspos - 1, args + 1, &stack_offset ); break; @@ -6263,6 +6267,10 @@ DispCallFunc( args[0] = (DWORD_PTR)pvargResult; /* arg 0 is a pointer to the result */ call_method( func, argspos, args ); break; + case VT_HRESULT: + WARN("invalid return type %u\n", vtReturn); + heap_free( args ); + return E_INVALIDARG; default: V_UI8(pvargResult) = call_method( func, argspos - 1, args + 1 ); break;

1 0

Hans Leidekker : msiexec: Convert DoRegServer to Unicode.
by Alexandre Julliard Feb. 12, 2013

Feb. 12, 2013

Module: wine Branch: master Commit: 0800f29b25b1a4260bae82156f2832c4cafc232b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0800f29b25b1a4260bae82156… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Feb 12 14:33:23 2013 +0100 msiexec: Convert DoRegServer to Unicode. --- programs/msiexec/msiexec.c | 27 +++++++++++++-------------- 1 files changed, 13 insertions(+), 14 deletions(-) diff --git a/programs/msiexec/msiexec.c b/programs/msiexec/msiexec.c index 13a55c2..0944955 100644 --- a/programs/msiexec/msiexec.c +++ b/programs/msiexec/msiexec.c @@ -344,26 +344,25 @@ static DWORD DoDllUnregisterServer(LPCWSTR DllName) static DWORD DoRegServer(void) { + static const WCHAR msiserverW[] = {'M','S','I','S','e','r','v','e','r',0}; + static const WCHAR msiexecW[] = {'\\','m','s','i','e','x','e','c',' ','/','V',0}; SC_HANDLE scm, service; - CHAR path[MAX_PATH+12]; - DWORD ret = 0; + WCHAR path[MAX_PATH+12]; + DWORD len, ret = 0; - scm = OpenSCManagerA(NULL, SERVICES_ACTIVE_DATABASEA, SC_MANAGER_CREATE_SERVICE); - if (!scm) + if (!(scm = OpenSCManagerW(NULL, SERVICES_ACTIVE_DATABASEW, SC_MANAGER_CREATE_SERVICE))) { fprintf(stderr, "Failed to open the service control manager.\n"); return 1; } - - GetSystemDirectoryA(path, MAX_PATH); - lstrcatA(path, "\\msiexec.exe /V"); - - service = CreateServiceA(scm, "MSIServer", "MSIServer", GENERIC_ALL, - SERVICE_WIN32_SHARE_PROCESS, SERVICE_DEMAND_START, - SERVICE_ERROR_NORMAL, path, NULL, NULL, - NULL, NULL, NULL); - - if (service) CloseServiceHandle(service); + len = GetSystemDirectoryW(path, MAX_PATH); + lstrcpyW(path + len, msiexecW); + if ((service = CreateServiceW(scm, msiserverW, msiserverW, GENERIC_ALL, + SERVICE_WIN32_SHARE_PROCESS, SERVICE_DEMAND_START, + SERVICE_ERROR_NORMAL, path, NULL, NULL, NULL, NULL, NULL))) + { + CloseServiceHandle(service); + } else if (GetLastError() != ERROR_SERVICE_EXISTS) { fprintf(stderr, "Failed to create MSI service\n");

1 0

Hans Leidekker : msiexec: Add /unregserver support.
by Alexandre Julliard Feb. 12, 2013

Feb. 12, 2013

Module: wine Branch: master Commit: 6cd2ffae0220fe0d16d48d4534d623e9d951f71a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cd2ffae0220fe0d16d48d453… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Feb 12 14:32:45 2013 +0100 msiexec: Add /unregserver support. --- programs/msiexec/msiexec.c | 31 ++++++++++++++++++++++++++++++- 1 files changed, 30 insertions(+), 1 deletions(-) diff --git a/programs/msiexec/msiexec.c b/programs/msiexec/msiexec.c index 9b378c6..13a55c2 100644 --- a/programs/msiexec/msiexec.c +++ b/programs/msiexec/msiexec.c @@ -373,6 +373,35 @@ static DWORD DoRegServer(void) return ret; } +static DWORD DoUnregServer(void) +{ + static const WCHAR msiserverW[] = {'M','S','I','S','e','r','v','e','r',0}; + SC_HANDLE scm, service; + DWORD ret = 0; + + if (!(scm = OpenSCManagerW(NULL, SERVICES_ACTIVE_DATABASEW, SC_MANAGER_CONNECT))) + { + fprintf(stderr, "Failed to open service control manager\n"); + return 1; + } + if ((service = OpenServiceW(scm, msiserverW, DELETE))) + { + if (!DeleteService(service)) + { + fprintf(stderr, "Failed to delete MSI service\n"); + ret = 1; + } + CloseServiceHandle(service); + } + else if (GetLastError() != ERROR_SERVICE_DOES_NOT_EXIST) + { + fprintf(stderr, "Failed to open MSI service\n"); + ret = 1; + } + CloseServiceHandle(scm); + return ret; +} + static INT DoEmbedding( LPWSTR key ) { printf("Remote custom actions are not supported yet\n"); @@ -982,7 +1011,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine } else if (FunctionUnregServer) { - WINE_FIXME( "/unregserver not implemented yet, ignoring\n" ); + ReturnCode = DoUnregServer(); } else if (FunctionServer) {

1 0

Alexandre Julliard : wininet: Don' t reset the available size after the async has been queued.
by Alexandre Julliard Feb. 12, 2013

Feb. 12, 2013

Module: wine Branch: master Commit: dc82cf9d3873535698fe1b6d6f04c6ff6ec13b79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc82cf9d3873535698fe1b6d6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 12 10:19:26 2013 +0100 wininet: Don't reset the available size after the async has been queued. --- dlls/wininet/ftp.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index f0a6257..1b67211 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -1284,7 +1284,6 @@ static DWORD FTPFILE_QueryDataAvailable(object_header_t *hdr, DWORD *available, task = alloc_async_task(&file->hdr, FTPFILE_AsyncQueryDataAvailableProc, sizeof(*task)); INTERNET_AsyncCall(task); - *available = 0; return ERROR_IO_PENDING; } }

1 0

André Hentschel : make_xftmpl: Avoid comparing a char with EOF.
by Alexandre Julliard Feb. 12, 2013

Feb. 12, 2013

Module: wine Branch: master Commit: a32199b3f3b755cd21b7135db05962a67ac318d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a32199b3f3b755cd21b7135db… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Feb 12 16:21:04 2013 +0100 make_xftmpl: Avoid comparing a char with EOF. --- tools/make_xftmpl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/make_xftmpl.c b/tools/make_xftmpl.c index 85b373f..b5751ce 100644 --- a/tools/make_xftmpl.c +++ b/tools/make_xftmpl.c @@ -336,7 +336,7 @@ static BOOL parse_token(struct parser *parser) if (len + 1 < sizeof(buffer)) buffer[len++] = c; } - if (c == EOF) { + if (c != '"') { fprintf(stderr, "%s: Unterminated string (line %d).\n", program_name, parser->line_no); parser->error = TRUE;

1 0

Jacek Caban : mshtml: Use VT_ERROR as return type in DispCallFunc call.
by Alexandre Julliard Feb. 12, 2013

Feb. 12, 2013

Module: wine Branch: master Commit: 6b0e2c8fdff9dd316762e5f83ea5733f3eb8ae82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b0e2c8fdff9dd316762e5f83… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 12 14:36:48 2013 +0100 mshtml: Use VT_ERROR as return type in DispCallFunc call. --- dlls/mshtml/dispex.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index ed799d2..38d9df4 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -1066,7 +1066,7 @@ static HRESULT invoke_builtin_function(DispatchEx *This, func_info_t *func, DISP } V_VT(&vhres) = VT_ERROR; - hres = DispCallFunc(iface, func->call_vtbl_off*sizeof(void*), CC_STDCALL, VT_HRESULT, + hres = DispCallFunc(iface, func->call_vtbl_off*sizeof(void*), CC_STDCALL, VT_ERROR, func->argc + (func->prop_vt == VT_VOID ? 0 : 1), func->arg_types, arg_ptrs, &vhres); }

1 0

Francois Gouget : kernel32/tests: Reduce the size of the console buffer to speed up the tests.
by Alexandre Julliard Feb. 11, 2013

Feb. 11, 2013

Module: wine Branch: master Commit: c2a5b04d01882668f433e74bcaf4ff1c11be4167 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2a5b04d01882668f433e74bc… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 11 15:36:15 2013 +0100 kernel32/tests: Reduce the size of the console buffer to speed up the tests. --- dlls/kernel32/tests/console.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index b1907d7..df752f4 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -2608,6 +2608,18 @@ START_TEST(console) ok(ret, "Getting sb info\n"); if (!ret) return; + /* Reduce the size of the buffer to the visible area plus 3 lines to speed + * up the tests. + */ + trace("Visible area: %dx%d - %dx%d Buffer size: %dx%d\n", sbi.srWindow.Left, sbi.srWindow.Top, sbi.srWindow.Right, sbi.srWindow.Bottom, sbi.dwSize.X, sbi.dwSize.Y); + sbi.dwSize.Y = size = (sbi.srWindow.Bottom + 1) + 3; + ret = SetConsoleScreenBufferSize(hConOut, sbi.dwSize); + ok(ret, "Setting sb info\n"); + ret = GetConsoleScreenBufferInfo(hConOut, &sbi); + ok(ret, "Getting sb info\n"); + ok(sbi.dwSize.Y == size, "Unexpected buffer size: %d instead of %d\n", sbi.dwSize.Y, size); + if (!ret) return; + /* Non interactive tests */ testCursor(hConOut, sbi.dwSize); /* test parameters (FIXME: test functionality) */

1 0

Alexandre Julliard : server: Return the window paint flags in the get_visible_region request.
by Alexandre Julliard Feb. 11, 2013

Feb. 11, 2013

Module: wine Branch: master Commit: bc602c3060692f3c6e9b1cca2a3eaa9299f4d6b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc602c3060692f3c6e9b1cca2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 11 17:14:17 2013 +0100 server: Return the window paint flags in the get_visible_region request. --- include/wine/server_protocol.h | 4 +++- server/protocol.def | 1 + server/request.h | 5 +++-- server/trace.c | 1 + server/window.c | 1 + 5 files changed, 9 insertions(+), 3 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 99bcfae..8a8a0ed 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -3415,8 +3415,10 @@ struct get_visible_region_reply user_handle_t top_win; rectangle_t top_rect; rectangle_t win_rect; + unsigned int paint_flags; data_size_t total_size; /* VARARG(region,rectangles); */ + char __pad_52[4]; }; @@ -5715,6 +5717,6 @@ union generic_reply struct set_suspend_context_reply set_suspend_context_reply; }; -#define SERVER_PROTOCOL_VERSION 438 +#define SERVER_PROTOCOL_VERSION 439 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index 4038e48..7bb679a 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2460,6 +2460,7 @@ enum coords_relative user_handle_t top_win; /* top window to clip against */ rectangle_t top_rect; /* top window visible rect with screen coords */ rectangle_t win_rect; /* window rect in screen coords */ + unsigned int paint_flags; /* paint flags (from SET_WINPOS_* flags) */ data_size_t total_size; /* total size of the resulting region */ VARARG(region,rectangles); /* list of rectangles for the region (in screen coords) */ @END diff --git a/server/request.h b/server/request.h index f566e0d..b1b816f 100644 --- a/server/request.h +++ b/server/request.h @@ -1626,8 +1626,9 @@ C_ASSERT( sizeof(struct get_visible_region_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct get_visible_region_reply, top_win) == 8 ); C_ASSERT( FIELD_OFFSET(struct get_visible_region_reply, top_rect) == 12 ); C_ASSERT( FIELD_OFFSET(struct get_visible_region_reply, win_rect) == 28 ); -C_ASSERT( FIELD_OFFSET(struct get_visible_region_reply, total_size) == 44 ); -C_ASSERT( sizeof(struct get_visible_region_reply) == 48 ); +C_ASSERT( FIELD_OFFSET(struct get_visible_region_reply, paint_flags) == 44 ); +C_ASSERT( FIELD_OFFSET(struct get_visible_region_reply, total_size) == 48 ); +C_ASSERT( sizeof(struct get_visible_region_reply) == 56 ); C_ASSERT( FIELD_OFFSET(struct get_surface_region_request, window) == 12 ); C_ASSERT( sizeof(struct get_surface_region_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_surface_region_reply, visible_rect) == 8 ); diff --git a/server/trace.c b/server/trace.c index 41c5424..c7a13d8 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2926,6 +2926,7 @@ static void dump_get_visible_region_reply( const struct get_visible_region_reply fprintf( stderr, " top_win=%08x", req->top_win ); dump_rectangle( ", top_rect=", &req->top_rect ); dump_rectangle( ", win_rect=", &req->win_rect ); + fprintf( stderr, ", paint_flags=%08x", req->paint_flags ); fprintf( stderr, ", total_size=%u", req->total_size ); dump_varargs_rectangles( ", region=", cur_size ); } diff --git a/server/window.c b/server/window.c index fbe522a..e141f93 100644 --- a/server/window.c +++ b/server/window.c @@ -2434,6 +2434,7 @@ DECL_HANDLER(get_visible_region) reply->win_rect.right = win->client_rect.right - win->client_rect.left; reply->win_rect.bottom = win->client_rect.bottom - win->client_rect.top; } + reply->paint_flags = win->paint_flags & PAINT_CLIENT_FLAGS; }

1 0

Alexandre Julliard : server: Also exclude the top-level client rectangle for windows that have a pixel format .
by Alexandre Julliard Feb. 11, 2013

Feb. 11, 2013

Module: wine Branch: master Commit: ca5746ad1a99fde06a7309cc47031cc898c6ee69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca5746ad1a99fde06a7309cc4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 11 15:41:20 2013 +0100 server: Also exclude the top-level client rectangle for windows that have a pixel format. --- dlls/winex11.drv/bitblt.c | 1 + server/window.c | 5 ++++- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index e52fbc2..2fc7c94 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -2029,6 +2029,7 @@ struct window_surface *create_surface( Window window, const XVisualInfo *vis, co } surface->gc = XCreateGC( gdi_display, window, 0, NULL ); + XSetSubwindowMode( gdi_display, surface->gc, IncludeInferiors ); surface->byteswap = image_needs_byteswap( surface->image, is_r8g8b8(vis), format->bits_per_pixel ); if (surface->byteswap || format->bits_per_pixel == 4 || format->bits_per_pixel == 8) diff --git a/server/window.c b/server/window.c index a460a7c..fbe522a 100644 --- a/server/window.c +++ b/server/window.c @@ -1084,6 +1084,9 @@ static struct region *get_surface_region( struct window *win ) set_region_rect( clip, &win->client_rect ); if (win->win_region && !intersect_window_region( clip, win )) goto error; + if ((win->paint_flags & PAINT_HAS_PIXEL_FORMAT) && !subtract_region( region, region, clip )) + goto error; + /* clip children */ if (!is_desktop_window(win)) @@ -2264,7 +2267,7 @@ DECL_HANDLER(set_window_pos) top = get_top_clipping_window( win ); if (is_visible( top ) && (top->paint_flags & PAINT_HAS_SURFACE) && - (top->paint_flags & PAINT_PIXEL_FORMAT_CHILD)) + (top->paint_flags & (PAINT_HAS_PIXEL_FORMAT | PAINT_PIXEL_FORMAT_CHILD))) reply->surface_win = top->handle; }

1 0

Alexandre Julliard : winex11: Ignore color key and exposures when using the null surface.
by Alexandre Julliard Feb. 11, 2013

Feb. 11, 2013

Module: wine Branch: master Commit: bdfab8cd88b895612f9eab17a569c18736c9ae34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdfab8cd88b895612f9eab17a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 11 11:42:12 2013 +0100 winex11: Ignore color key and exposures when using the null surface. --- dlls/winex11.drv/bitblt.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index e91ca75..e52fbc2 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -2059,6 +2059,8 @@ void set_surface_color_key( struct window_surface *window_surface, COLORREF colo struct x11drv_window_surface *surface = get_x11_surface( window_surface ); COLORREF prev; + if (window_surface->funcs != &x11drv_surface_funcs) return; /* we may get the null surface */ + window_surface->funcs->lock( window_surface ); prev = surface->color_key; set_color_key( surface, color_key ); @@ -2074,6 +2076,8 @@ HRGN expose_surface( struct window_surface *window_surface, const RECT *rect ) struct x11drv_window_surface *surface = get_x11_surface( window_surface ); HRGN region = 0; + if (window_surface->funcs != &x11drv_surface_funcs) return 0; /* we may get the null surface */ + window_surface->funcs->lock( window_surface ); add_bounds_rect( &surface->bounds, rect ); if (surface->region)

1 0

Daniel Jelinski : comctl32/listview: Fix LVM_SETICONSPACING on 64bit machines.
by Alexandre Julliard Feb. 11, 2013

Feb. 11, 2013

Module: wine Branch: master Commit: 77874d7863dc92907452615823e8b038690ced5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=77874d7863dc9290745261582… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Mon Feb 4 20:57:58 2013 +0100 comctl32/listview: Fix LVM_SETICONSPACING on 64bit machines. --- dlls/comctl32/listview.c | 4 +++- dlls/comctl32/tests/listview.c | 21 ++++++++++++++++++--- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 1274d15..a22b2da 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -11468,7 +11468,9 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return LISTVIEW_SetHoverTime(infoPtr, (DWORD)lParam); case LVM_SETICONSPACING: - return LISTVIEW_SetIconSpacing(infoPtr, (short)LOWORD(lParam), (short)HIWORD(lParam)); + if(lParam == -1) + return LISTVIEW_SetIconSpacing(infoPtr, -1, -1); + return LISTVIEW_SetIconSpacing(infoPtr, LOWORD(lParam), HIWORD(lParam)); case LVM_SETIMAGELIST: return (LRESULT)LISTVIEW_SetImageList(infoPtr, (INT)wParam, (HIMAGELIST)lParam); diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 98ca495..fef3f60 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -4654,11 +4654,26 @@ static void test_getitemspacing(void) ret = SendMessage(hwnd, LVM_GETITEMSPACING, FALSE, 0); expect(100, LOWORD(ret)); - expect(0xFFFF, HIWORD(ret)); - ret = SendMessage(hwnd, LVM_SETICONSPACING, 0, -1); - expect(100, LOWORD(ret)); expect(0xFFFF, HIWORD(ret)); + + if (sizeof(void*) == 8) + { + /* NOTE: -1 is not treated the same as (DWORD)-1 by 64bit listview */ + ret = SendMessage(hwnd, LVM_SETICONSPACING, 0, (DWORD)-1); + expect(100, LOWORD(ret)); + expect(0xFFFF, HIWORD(ret)); + + ret = SendMessage(hwnd, LVM_SETICONSPACING, 0, -1); + expect(0xFFFF, LOWORD(ret)); + expect(0xFFFF, HIWORD(ret)); + } + else + { + ret = SendMessage(hwnd, LVM_SETICONSPACING, 0, -1); + expect(100, LOWORD(ret)); + expect(0xFFFF, HIWORD(ret)); + } ret = SendMessage(hwnd, LVM_GETITEMSPACING, FALSE, 0); /* spacing + icon size returned */ expect(cx + 40, LOWORD(ret));

1 0

Daniel Jelinski : comctl32/listview: Better handling of custom colors in report view.
by Alexandre Julliard Feb. 11, 2013

Feb. 11, 2013

Module: wine Branch: master Commit: 80f70b5d85a3965d73840590bb5b38920b22fdc2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80f70b5d85a3965d73840590b… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Sat Feb 9 23:52:51 2013 +0100 comctl32/listview: Better handling of custom colors in report view. --- dlls/comctl32/listview.c | 30 ++++++++++++++++-------------- 1 files changed, 16 insertions(+), 14 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 2d75f85..1274d15 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -4634,21 +4634,25 @@ static BOOL LISTVIEW_DrawItem(LISTVIEW_INFO *infoPtr, HDC hdc, INT nItem, INT nS else if ((infoPtr->dwLvExStyle & LVS_EX_FULLROWSELECT) == FALSE) prepaint_setup(infoPtr, hdc, &nmlvcd, TRUE); - /* in full row select, subitems, will just use main item's colors */ - if (nSubItem && infoPtr->uView == LV_VIEW_DETAILS && (infoPtr->dwLvExStyle & LVS_EX_FULLROWSELECT)) - nmlvcd.clrTextBk = CLR_NONE; - /* FIXME: temporary hack */ rcSelect.left = rcLabel.left; - /* draw the selection background, if we're drawing the main item */ - if (nSubItem == 0) - { - /* in icon mode, the label rect is really what we want to draw the - * background for */ - if (infoPtr->uView == LV_VIEW_ICON) - rcSelect = rcLabel; + /* in icon mode, the label rect is really what we want to draw the + * background for */ + /* in detail mode, we want to paint background for label rect when + * item is not selected or listview has full row select; otherwise paint + * background for text only */ + if (infoPtr->uView == LV_VIEW_ICON || + (infoPtr->uView == LV_VIEW_DETAILS && + (!(lvItem.state & LVIS_SELECTED) || + (infoPtr->dwLvExStyle & LVS_EX_FULLROWSELECT) != 0))) + rcSelect = rcLabel; + if (nmlvcd.clrTextBk != CLR_NONE) + ExtTextOutW(hdc, rcSelect.left, rcSelect.top, ETO_OPAQUE, &rcSelect, NULL, 0, NULL); + + if(nSubItem == 0 && infoPtr->nFocusedItem == nItem) + { if (infoPtr->uView == LV_VIEW_DETAILS && (infoPtr->dwLvExStyle & LVS_EX_FULLROWSELECT)) { /* we have to update left focus bound too if item isn't in leftmost column @@ -4671,10 +4675,8 @@ static BOOL LISTVIEW_DrawItem(LISTVIEW_INFO *infoPtr, HDC hdc, INT nItem, INT nS rcSelect.right = rcBox.right; } - if (nmlvcd.clrTextBk != CLR_NONE) - ExtTextOutW(hdc, rcSelect.left, rcSelect.top, ETO_OPAQUE, &rcSelect, NULL, 0, NULL); /* store new focus rectangle */ - if (infoPtr->nFocusedItem == nItem) infoPtr->rcFocus = rcSelect; + infoPtr->rcFocus = rcSelect; } /* state icons */

1 0

Hans Leidekker : windowscodecs: Implement IWICBitmapFrameDecode:: GetColorContexts for TIFF images.
by Alexandre Julliard Feb. 11, 2013

Feb. 11, 2013

Module: wine Branch: master Commit: d8c71dd5ed80111c401382dc9dd6c5a218148ecb URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8c71dd5ed80111c401382dc9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Feb 11 14:30:35 2013 +0100 windowscodecs: Implement IWICBitmapFrameDecode::GetColorContexts for TIFF images. --- dlls/windowscodecs/tiffformat.c | 30 ++++++++++++++++++++++++++++-- 1 files changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 8cebb0c..0fcb81a 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -1105,8 +1105,34 @@ static HRESULT WINAPI TiffFrameDecode_GetMetadataQueryReader(IWICBitmapFrameDeco static HRESULT WINAPI TiffFrameDecode_GetColorContexts(IWICBitmapFrameDecode *iface, UINT cCount, IWICColorContext **ppIColorContexts, UINT *pcActualCount) { - FIXME("(%p,%u,%p,%p): stub\n", iface, cCount, ppIColorContexts, pcActualCount); - return WINCODEC_ERR_UNSUPPORTEDOPERATION; + TiffFrameDecode *This = impl_from_IWICBitmapFrameDecode(iface); + const BYTE *profile; + UINT len; + HRESULT hr; + + TRACE("(%p,%u,%p,%p)\n", iface, cCount, ppIColorContexts, pcActualCount); + + EnterCriticalSection(&This->parent->lock); + + if (pTIFFGetField(This->parent->tiff, TIFFTAG_ICCPROFILE, &len, &profile)) + { + if (cCount && ppIColorContexts) + { + hr = IWICColorContext_InitializeFromMemory(*ppIColorContexts, profile, len); + if (FAILED(hr)) + { + LeaveCriticalSection(&This->parent->lock); + return hr; + } + } + *pcActualCount = 1; + } + else + *pcActualCount = 0; + + LeaveCriticalSection(&This->parent->lock); + + return S_OK; } static HRESULT WINAPI TiffFrameDecode_GetThumbnail(IWICBitmapFrameDecode *iface,

1 0

Hans Leidekker : windowscodecsext: Implement WICCreateColorTransform_Proxy and IWICColorTransform_Initialize_Proxy .
by Alexandre Julliard Feb. 11, 2013

Feb. 11, 2013

Module: wine Branch: master Commit: e002d2eacfc5371bc4a964515448c9ad2db52e76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e002d2eacfc5371bc4a964515… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Feb 11 14:30:10 2013 +0100 windowscodecsext: Implement WICCreateColorTransform_Proxy and IWICColorTransform_Initialize_Proxy. --- configure | 3 +- configure.ac | 3 +- dlls/windowscodecsext/Makefile.in | 2 + dlls/windowscodecsext/main.c | 40 +++++++++++++++++ dlls/windowscodecsext/tests/Makefile.in | 7 +++ dlls/windowscodecsext/tests/transform.c | 64 +++++++++++++++++++++++++++ dlls/windowscodecsext/windowscodecsext.spec | 4 +- 7 files changed, 119 insertions(+), 4 deletions(-) diff --git a/configure b/configure index c5fabba..2998c6a 100755 --- a/configure +++ b/configure @@ -16184,7 +16184,8 @@ wine_fn_config_dll winaspi.dll16 enable_win16 wine_fn_config_dll windebug.dll16 enable_win16 wine_fn_config_dll windowscodecs enable_windowscodecs implib wine_fn_config_test dlls/windowscodecs/tests windowscodecs_test -wine_fn_config_dll windowscodecsext enable_windowscodecsext +wine_fn_config_dll windowscodecsext enable_windowscodecsext implib +wine_fn_config_test dlls/windowscodecsext/tests windowscodecsext_test wine_fn_config_dll winealsa.drv enable_winealsa_drv wine_fn_config_dll winecoreaudio.drv enable_winecoreaudio_drv wine_fn_config_lib winecrt0 diff --git a/configure.ac b/configure.ac index 012228c..d6fccaa 100644 --- a/configure.ac +++ b/configure.ac @@ -3068,7 +3068,8 @@ WINE_CONFIG_DLL(winaspi.dll16,enable_win16) WINE_CONFIG_DLL(windebug.dll16,enable_win16) WINE_CONFIG_DLL(windowscodecs,,[implib]) WINE_CONFIG_TEST(dlls/windowscodecs/tests) -WINE_CONFIG_DLL(windowscodecsext) +WINE_CONFIG_DLL(windowscodecsext,,[implib]) +WINE_CONFIG_TEST(dlls/windowscodecsext/tests) WINE_CONFIG_DLL(winealsa.drv) WINE_CONFIG_DLL(winecoreaudio.drv) WINE_CONFIG_LIB(winecrt0) diff --git a/dlls/windowscodecsext/Makefile.in b/dlls/windowscodecsext/Makefile.in index de6d06c..edb9b7d 100644 --- a/dlls/windowscodecsext/Makefile.in +++ b/dlls/windowscodecsext/Makefile.in @@ -1,4 +1,6 @@ MODULE = windowscodecsext.dll +IMPORTLIB = windowscodecsext +IMPORTS = ole32 C_SRCS = \ main.c diff --git a/dlls/windowscodecsext/main.c b/dlls/windowscodecsext/main.c index 608096e..d7f74ff 100644 --- a/dlls/windowscodecsext/main.c +++ b/dlls/windowscodecsext/main.c @@ -22,8 +22,12 @@ #include <stdarg.h> +#define COBJMACROS + #include "windef.h" #include "winbase.h" +#include "initguid.h" +#include "wincodec.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); @@ -45,3 +49,39 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) return TRUE; } + +HRESULT WINAPI WICCreateColorTransform_Proxy(IWICColorTransform **ppIWICColorTransform) +{ + HRESULT hr, init; + IWICImagingFactory *factory; + + TRACE("(%p)\n", ppIWICColorTransform); + + if (!ppIWICColorTransform) return E_INVALIDARG; + + init = CoInitializeEx(NULL, COINIT_MULTITHREADED); + + hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICImagingFactory, (void **)&factory); + if (FAILED(hr)) + { + if (SUCCEEDED(init)) CoUninitialize(); + return hr; + } + hr = IWICImagingFactory_CreateColorTransformer(factory, ppIWICColorTransform); + IWICImagingFactory_Release(factory); + + if (SUCCEEDED(init)) CoUninitialize(); + return hr; +} + +HRESULT WINAPI IWICColorTransform_Initialize_Proxy_W(IWICColorTransform *iface, + IWICBitmapSource *pIBitmapSource, IWICColorContext *pIContextSource, + IWICColorContext *pIContextDest, REFWICPixelFormatGUID pixelFmtDest) +{ + TRACE("(%p,%p,%p,%p,%s)\n", iface, pIBitmapSource, pIContextSource, pIContextDest, + debugstr_guid(pixelFmtDest)); + + return IWICColorTransform_Initialize(iface, pIBitmapSource, pIContextSource, + pIContextDest, pixelFmtDest); +} diff --git a/dlls/windowscodecsext/tests/Makefile.in b/dlls/windowscodecsext/tests/Makefile.in new file mode 100644 index 0000000..9d005aa --- /dev/null +++ b/dlls/windowscodecsext/tests/Makefile.in @@ -0,0 +1,7 @@ +TESTDLL = windowscodecsext.dll +IMPORTS = windowscodecsext ole32 + +C_SRCS = \ + transform.c + +(a)MAKE_TEST_RULES@ diff --git a/dlls/windowscodecsext/tests/transform.c b/dlls/windowscodecsext/tests/transform.c new file mode 100644 index 0000000..e76f9fe --- /dev/null +++ b/dlls/windowscodecsext/tests/transform.c @@ -0,0 +1,64 @@ +/* + * Copyright 2013 Hans Leidekker for CodeWeavers + * + * 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 + */ + +#define COBJMACROS + +#include <stdio.h> +#include "windows.h" +#include "objbase.h" +#include "wincodec.h" +#include "wine/test.h" + +HRESULT WINAPI WICCreateColorTransform_Proxy(IWICColorTransform**); + +static void test_WICCreateColorTransform_Proxy(void) +{ + HRESULT hr; + IWICColorTransform *transform; + + hr = WICCreateColorTransform_Proxy( NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + transform = NULL; + hr = WICCreateColorTransform_Proxy( &transform ); + ok( hr == S_OK, "got %08x\n", hr ); + if (transform) IWICColorTransform_Release( transform ); + + hr = CoInitializeEx( NULL, COINIT_APARTMENTTHREADED ); + ok( hr == S_OK, "got %08x\n", hr ); + + transform = NULL; + hr = WICCreateColorTransform_Proxy( &transform ); + ok( hr == S_OK, "got %08x\n", hr ); + if (transform) IWICColorTransform_Release( transform ); + CoUninitialize(); + + hr = CoInitializeEx( NULL, COINIT_MULTITHREADED ); + ok( hr == S_OK, "got %08x\n", hr ); + + transform = NULL; + hr = WICCreateColorTransform_Proxy( &transform ); + ok( hr == S_OK, "got %08x\n", hr ); + if (transform) IWICColorTransform_Release( transform ); + CoUninitialize(); +} + +START_TEST(transform) +{ + test_WICCreateColorTransform_Proxy(); +} diff --git a/dlls/windowscodecsext/windowscodecsext.spec b/dlls/windowscodecsext/windowscodecsext.spec index d6b0e2b..02cfd9b 100644 --- a/dlls/windowscodecsext/windowscodecsext.spec +++ b/dlls/windowscodecsext/windowscodecsext.spec @@ -1,3 +1,3 @@ @ stub DllGetClassObject -@ stub IWICColorTransform_Initialize_Proxy -@ stub WICCreateColorTransform_Proxy +@ stdcall IWICColorTransform_Initialize_Proxy(ptr ptr ptr ptr ptr) IWICColorTransform_Initialize_Proxy_W +@ stdcall WICCreateColorTransform_Proxy(ptr)

1 0

Alexandre Julliard : user32: Don' t paint to the surface if the window has a pixel format, regardless of the state of the top parent.
by Alexandre Julliard Feb. 11, 2013

Feb. 11, 2013

Module: wine Branch: master Commit: 0cc78d97c15eb26c791c990f7e27dbe679989c32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cc78d97c15eb26c791c990f7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 11 17:49:22 2013 +0100 user32: Don't paint to the surface if the window has a pixel format, regardless of the state of the top parent. --- dlls/user32/painting.c | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index a6fb23f..ee84689 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -113,6 +113,7 @@ static void update_visible_region( struct dce *dce ) HRGN vis_rgn = 0; HWND top_win = 0; DWORD flags = dce->flags; + DWORD paint_flags = 0; size_t size = 256; RECT win_rect, top_rect; WND *win; @@ -149,6 +150,7 @@ static void update_visible_region( struct dce *dce ) top_rect.top = reply->top_rect.top; top_rect.right = reply->top_rect.right; top_rect.bottom = reply->top_rect.bottom; + paint_flags = reply->paint_flags; } else size = reply->total_size; } @@ -163,12 +165,16 @@ static void update_visible_region( struct dce *dce ) if (dce->clip_rgn) CombineRgn( vis_rgn, vis_rgn, dce->clip_rgn, (flags & DCX_INTERSECTRGN) ? RGN_AND : RGN_DIFF ); - if ((win = WIN_GetPtr( top_win )) && win != WND_DESKTOP && win != WND_OTHER_PROCESS) + /* don't use a surface to paint the client area of OpenGL windows */ + if (!(paint_flags & SET_WINPOS_PIXEL_FORMAT) || (flags & DCX_WINDOW)) { - /* don't use a surface to paint the client area of OpenGL windows */ - if (!win->pixel_format || (flags & DCX_WINDOW)) surface = win->surface; - if (surface) window_surface_add_ref( surface ); - WIN_ReleasePtr( win ); + win = WIN_GetPtr( top_win ); + if (win && win != WND_DESKTOP && win != WND_OTHER_PROCESS) + { + surface = win->surface; + if (surface) window_surface_add_ref( surface ); + WIN_ReleasePtr( win ); + } } if (!surface) top_rect = get_virtual_screen_rect();

1 0

Dmitry Timoshkov : wineps.drv: Add DEVMODE dumping to make debugging device state easier.
by Alexandre Julliard Feb. 11, 2013

Feb. 11, 2013

Module: wine Branch: master Commit: ced916b9e709f41a385b9f2e3893cc5aa8ba28ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=ced916b9e709f41a385b9f2e3… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Feb 11 14:03:50 2013 +0800 wineps.drv: Add DEVMODE dumping to make debugging device state easier. --- dlls/wineps.drv/init.c | 90 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 90 insertions(+), 0 deletions(-) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 76c1c38..4b5baed 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -148,12 +148,99 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) return TRUE; } +static void dump_fields(DWORD fields) +{ + int add_space = 0; + +#define CHECK_FIELD(flag) \ +do \ +{ \ + if (fields & flag) \ + { \ + if (add_space++) DPRINTF(" "); \ + TRACE(#flag); \ + fields &= ~flag; \ + } \ +} \ +while (0) + + CHECK_FIELD(DM_ORIENTATION); + CHECK_FIELD(DM_PAPERSIZE); + CHECK_FIELD(DM_PAPERLENGTH); + CHECK_FIELD(DM_PAPERWIDTH); + CHECK_FIELD(DM_SCALE); + CHECK_FIELD(DM_POSITION); + CHECK_FIELD(DM_NUP); + CHECK_FIELD(DM_DISPLAYORIENTATION); + CHECK_FIELD(DM_COPIES); + CHECK_FIELD(DM_DEFAULTSOURCE); + CHECK_FIELD(DM_PRINTQUALITY); + CHECK_FIELD(DM_COLOR); + CHECK_FIELD(DM_DUPLEX); + CHECK_FIELD(DM_YRESOLUTION); + CHECK_FIELD(DM_TTOPTION); + CHECK_FIELD(DM_COLLATE); + CHECK_FIELD(DM_FORMNAME); + CHECK_FIELD(DM_LOGPIXELS); + CHECK_FIELD(DM_BITSPERPEL); + CHECK_FIELD(DM_PELSWIDTH); + CHECK_FIELD(DM_PELSHEIGHT); + CHECK_FIELD(DM_DISPLAYFLAGS); + CHECK_FIELD(DM_DISPLAYFREQUENCY); + CHECK_FIELD(DM_ICMMETHOD); + CHECK_FIELD(DM_ICMINTENT); + CHECK_FIELD(DM_MEDIATYPE); + CHECK_FIELD(DM_DITHERTYPE); + CHECK_FIELD(DM_PANNINGWIDTH); + CHECK_FIELD(DM_PANNINGHEIGHT); + if (fields) TRACE(" %#x", fields); + TRACE("\n"); +#undef CHECK_FIELD +} + +/* Dump DEVMODE structure without a device specific part. + * Some applications and drivers fail to specify correct field + * flags (like DM_FORMNAME), so dump everything. + */ +static void dump_devmode(const DEVMODEW *dm) +{ + if (!TRACE_ON(psdrv)) return; + + TRACE("dmDeviceName: %s\n", debugstr_w(dm->dmDeviceName)); + TRACE("dmSpecVersion: 0x%04x\n", dm->dmSpecVersion); + TRACE("dmDriverVersion: 0x%04x\n", dm->dmDriverVersion); + TRACE("dmSize: 0x%04x\n", dm->dmSize); + TRACE("dmDriverExtra: 0x%04x\n", dm->dmDriverExtra); + TRACE("dmFields: 0x%04x\n", dm->dmFields); + dump_fields(dm->dmFields); + TRACE("dmOrientation: %d\n", dm->u1.s1.dmOrientation); + TRACE("dmPaperSize: %d\n", dm->u1.s1.dmPaperSize); + TRACE("dmPaperLength: %d\n", dm->u1.s1.dmPaperLength); + TRACE("dmPaperWidth: %d\n", dm->u1.s1.dmPaperWidth); + TRACE("dmScale: %d\n", dm->u1.s1.dmScale); + TRACE("dmCopies: %d\n", dm->u1.s1.dmCopies); + TRACE("dmDefaultSource: %d\n", dm->u1.s1.dmDefaultSource); + TRACE("dmPrintQuality: %d\n", dm->u1.s1.dmPrintQuality); + TRACE("dmColor: %d\n", dm->dmColor); + TRACE("dmDuplex: %d\n", dm->dmDuplex); + TRACE("dmYResolution: %d\n", dm->dmYResolution); + TRACE("dmTTOption: %d\n", dm->dmTTOption); + TRACE("dmCollate: %d\n", dm->dmCollate); + TRACE("dmFormName: %s\n", debugstr_w(dm->dmFormName)); + TRACE("dmLogPixels %u\n", dm->dmLogPixels); + TRACE("dmBitsPerPel %u\n", dm->dmBitsPerPel); + TRACE("dmPelsWidth %u\n", dm->dmPelsWidth); + TRACE("dmPelsHeight %u\n", dm->dmPelsHeight); +} + static void PSDRV_UpdateDevCaps( PSDRV_PDEVICE *physDev ) { PAGESIZE *page; RESOLUTION *res; INT width = 0, height = 0, resx = 0, resy = 0; + dump_devmode(&physDev->Devmode->dmPublic); + if (physDev->Devmode->dmPublic.dmFields & (DM_PRINTQUALITY | DM_YRESOLUTION | DM_LOGPIXELS)) { if (physDev->Devmode->dmPublic.dmFields & DM_PRINTQUALITY) @@ -324,7 +411,10 @@ static BOOL PSDRV_CreateDC( PHYSDEV *pdev, LPCWSTR driver, LPCWSTR device, if (output && *output) physDev->job.output = strdupW( output ); if(initData) + { + dump_devmode(initData); PSDRV_MergeDevmodes(physDev->Devmode, (const PSDRV_DEVMODE *)initData, pi); + } PSDRV_UpdateDevCaps(physDev); SelectObject( (*pdev)->hdc, PSDRV_DefaultFont );

1 0

Francois Gouget : rpcrt4/tests: Trace the GUID when it is wrong.
by Alexandre Julliard Feb. 11, 2013

Feb. 11, 2013

Module: wine Branch: master Commit: 138f119705597956d8a6d87c656bf34e70b3ce43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=138f119705597956d8a6d87c6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 11 15:36:36 2013 +0100 rpcrt4/tests: Trace the GUID when it is wrong. --- dlls/rpcrt4/tests/rpc.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/tests/rpc.c b/dlls/rpcrt4/tests/rpc.c index 739a00e..988b5c3 100644 --- a/dlls/rpcrt4/tests/rpc.c +++ b/dlls/rpcrt4/tests/rpc.c @@ -814,6 +814,7 @@ static void test_UuidCreateSequential(void) if (version == 1) { UUID guid2; + char buf[39]; if (!ret) { @@ -821,7 +822,8 @@ static void test_UuidCreateSequential(void) * address in the uuid: */ ok(!(guid1.Data4[2] & 0x01), - "GUID does not appear to contain a MAC address\n"); + "GUID does not appear to contain a MAC address: %s\n", + printGuid(buf, sizeof(buf), &guid1)); } else { @@ -829,7 +831,8 @@ static void test_UuidCreateSequential(void) * address in the uuid: */ ok((guid1.Data4[2] & 0x01), - "GUID does not appear to contain a multicast MAC address\n"); + "GUID does not appear to contain a multicast MAC address: %s\n", + printGuid(buf, sizeof(buf), &guid1)); } /* Generate another GUID, and make sure its MAC address matches the * first. @@ -840,7 +843,8 @@ static void test_UuidCreateSequential(void) version = (guid2.Data3 & 0xf000) >> 12; ok(version == 1, "unexpected version %d\n", version); ok(!memcmp(guid1.Data4, guid2.Data4, sizeof(guid2.Data4)), - "unexpected value in MAC address\n"); + "unexpected value in MAC address: %s\n", + printGuid(buf, sizeof(buf), &guid2)); } }

1 0

Dmitry Timoshkov : winspool.drv: Turn macros into helper functions.
by Alexandre Julliard Feb. 11, 2013

Feb. 11, 2013

Module: wine Branch: master Commit: da7c4ee1e59aa19ca32352e7c2156ea2669a803d URL: http://source.winehq.org/git/wine.git/?a=commit;h=da7c4ee1e59aa19ca32352e7c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Feb 11 16:47:35 2013 +0800 winspool.drv: Turn macros into helper functions. --- dlls/winspool.drv/tests/info.c | 120 +++++++++++++++++++--------------------- 1 files changed, 57 insertions(+), 63 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=da7c4ee1e59aa19ca3235…

1 0

Alexandre Julliard : user32: Avoid releasing a potentially null pointer.
by Alexandre Julliard Feb. 11, 2013

Feb. 11, 2013

Module: wine Branch: master Commit: b7bf7f01b35c2cb3e86dbc537b98aea7d7e427d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7bf7f01b35c2cb3e86dbc537… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 11 11:45:43 2013 +0100 user32: Avoid releasing a potentially null pointer. --- dlls/user32/win.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 645d563..db4881a 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -180,7 +180,7 @@ void *free_user_handle( HANDLE handle, enum user_obj_type type ) else InterlockedCompareExchangePointer( &user_handles[index], NULL, ptr ); } SERVER_END_REQ; - release_user_handle_ptr( ptr ); + USER_Unlock(); } return ptr; } @@ -290,7 +290,7 @@ static void free_window_handle( HWND hwnd ) else InterlockedCompareExchangePointer( &user_handles[index], NULL, ptr ); } SERVER_END_REQ; - release_user_handle_ptr( ptr ); + USER_Unlock(); HeapFree( GetProcessHeap(), 0, ptr ); } }

1 0

Alexandre Julliard : imm32: Retrieve the graphics driver module from gdi32.
by Alexandre Julliard Feb. 11, 2013

Feb. 11, 2013

Module: wine Branch: master Commit: a3b85a5a2ed615292f919638b52016aeff764ee4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3b85a5a2ed615292f919638b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 11 11:39:23 2013 +0100 imm32: Retrieve the graphics driver module from gdi32. --- dlls/imm32/imm.c | 39 +++++++-------------------------------- 1 files changed, 7 insertions(+), 32 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 1ade13a..fbb683f 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -32,6 +32,7 @@ #include "ddk/imm.h" #include "winnls.h" #include "winreg.h" +#include "wine/gdi_driver.h" #include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(imm); @@ -247,37 +248,6 @@ static void IMM_FreeThreadData(void) } } -static HMODULE LoadDefaultWineIME(void) -{ - char buffer[MAX_PATH], libname[32], *name, *next; - HMODULE module = 0; - HKEY hkey; - - TRACE("Attempting to fall back to wine default IME\n"); - - strcpy( buffer, "x11" ); /* default value */ - /* @@ Wine registry key: HKCU\Software\Wine\Drivers */ - if (!RegOpenKeyA( HKEY_CURRENT_USER, "Software\\Wine\\Drivers", &hkey )) - { - DWORD type, count = sizeof(buffer); - RegQueryValueExA( hkey, "Ime", 0, &type, (LPBYTE) buffer, &count ); - RegCloseKey( hkey ); - } - - name = buffer; - while (name) - { - next = strchr( name, ',' ); - if (next) *next++ = 0; - - snprintf( libname, sizeof(libname), "wine%s.drv", name ); - if ((module = LoadLibraryA( libname )) != 0) break; - name = next; - } - - return module; -} - /* ImmHkl loading and freeing */ #define LOAD_FUNCPTR(f) if((ptr->p##f = (LPVOID)GetProcAddress(ptr->hIME, #f)) == NULL){WARN("Can't find function %s in ime\n", #f);} static ImmHkl *IMM_GetImmHkl(HKL hkl) @@ -299,7 +269,12 @@ static ImmHkl *IMM_GetImmHkl(HKL hkl) ptr->hkl = hkl; if (ImmGetIMEFileNameW(hkl, filename, MAX_PATH)) ptr->hIME = LoadLibraryW(filename); if (!ptr->hIME) - ptr->hIME = LoadDefaultWineIME(); + { + HDC hdc = GetDC( 0 ); + GetModuleHandleExW( GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, + (LPCWSTR)__wine_get_driver_module( hdc ), &ptr->hIME ); + ReleaseDC( 0, hdc ); + } if (ptr->hIME) { LOAD_FUNCPTR(ImeInquire);

1 0

Ken Thomases : winemac: Prevent Cocoa from consuming certain key-down events.
by Alexandre Julliard Feb. 11, 2013

Feb. 11, 2013

Module: wine Branch: master Commit: a472d39b7dee82ae0cbf67112495d381cecbad5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a472d39b7dee82ae0cbf67112… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Feb 10 19:09:18 2013 -0600 winemac: Prevent Cocoa from consuming certain key-down events. --- dlls/winemac.drv/cocoa_window.m | 29 +++++++++++++++++++---------- 1 files changed, 19 insertions(+), 10 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 218ba3f..4371110 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -679,18 +679,27 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) - (void) sendEvent:(NSEvent*)event { - if ([event type] == NSLeftMouseDown) + /* NSWindow consumes certain key-down events as part of Cocoa's keyboard + interface control. For example, Control-Tab switches focus among + views. We want to bypass that feature, so directly route key-down + events to -keyDown:. */ + if ([event type] == NSKeyDown) + [[self firstResponder] keyDown:event]; + else { - /* Since our windows generally claim they can't be made key, clicks - in their title bars are swallowed by the theme frame stuff. So, - we hook directly into the event stream and assume that any click - in the window will activate it, if Wine and the Win32 program - accept. */ - if (![self isKeyWindow] && !self.disabled && !self.noActivate) - [NSApp windowGotFocus:self]; - } + if ([event type] == NSLeftMouseDown) + { + /* Since our windows generally claim they can't be made key, clicks + in their title bars are swallowed by the theme frame stuff. So, + we hook directly into the event stream and assume that any click + in the window will activate it, if Wine and the Win32 program + accept. */ + if (![self isKeyWindow] && !self.disabled && !self.noActivate) + [NSApp windowGotFocus:self]; + } - [super sendEvent:event]; + [super sendEvent:event]; + } }

1 0