March 2013 - Wine-Commits - list.winehq.org

Jacek Caban : jscript: Use jsstr_flush in variant_change_type.
by Alexandre Julliard March 5, 2013

March 5, 2013

Module: wine Branch: master Commit: 88e78eb16e8b7e4f02090435e0fda4178a5a5f4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=88e78eb16e8b7e4f02090435e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 5 11:50:03 2013 +0100 jscript: Use jsstr_flush in variant_change_type. --- dlls/jscript/jsutils.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 50c0f26..5900d81 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -903,8 +903,10 @@ HRESULT variant_change_type(script_ctx_t *ctx, VARIANT *dst, VARIANT *src, VARTY break; } - V_BSTR(dst) = SysAllocStringLen(str->str, jsstr_length(str)); - if(!V_BSTR(dst)) + V_BSTR(dst) = SysAllocStringLen(NULL, jsstr_length(str)); + if(V_BSTR(dst)) + jsstr_flush(str, V_BSTR(dst)); + else hres = E_OUTOFMEMORY; break; }

1 0

Jacek Caban : jscript: Added jsstr_flush helper and use it in array_join.
by Alexandre Julliard March 5, 2013

March 5, 2013

Module: wine Branch: master Commit: 29ff14493ddfe80989974f46233c0c934ce0f7ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=29ff14493ddfe80989974f462… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 5 11:48:55 2013 +0100 jscript: Added jsstr_flush helper and use it in array_join. --- dlls/jscript/array.c | 17 ++++------------- dlls/jscript/jsstr.h | 7 +++++++ 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index fef37e6..5987ef1 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -286,15 +286,10 @@ static HRESULT array_join(script_ctx_t *ctx, jsdisp_t *array, DWORD length, cons if(SUCCEEDED(hres)) ret = jsstr_alloc_buf(len); if(ret) { - unsigned tmplen; - ptr = ret->str; - if(str_tab[0]) { - tmplen = jsstr_length(str_tab[0]); - memcpy(ptr, str_tab[0]->str, tmplen*sizeof(WCHAR)); - ptr += tmplen; - } + if(str_tab[0]) + ptr += jsstr_flush(str_tab[0], ptr); for(i=1; i < length; i++) { if(seplen) { @@ -302,13 +297,9 @@ static HRESULT array_join(script_ctx_t *ctx, jsdisp_t *array, DWORD length, cons ptr += seplen; } - if(str_tab[i]) { - tmplen = jsstr_length(str_tab[i]); - memcpy(ptr, str_tab[i]->str, tmplen*sizeof(WCHAR)); - ptr += tmplen; - } + if(str_tab[i]) + ptr += jsstr_flush(str_tab[i], ptr); } - *ptr=0; }else { hres = E_OUTOFMEMORY; } diff --git a/dlls/jscript/jsstr.h b/dlls/jscript/jsstr.h index 8883dcb..cbe68ef 100644 --- a/dlls/jscript/jsstr.h +++ b/dlls/jscript/jsstr.h @@ -59,6 +59,13 @@ static inline BOOL jsstr_eq(jsstr_t *str1, jsstr_t *str2) return len == jsstr_length(str2) && !memcmp(str1->str, str2->str, len*sizeof(WCHAR)); } +static inline unsigned jsstr_flush(jsstr_t *str, WCHAR *buf) +{ + unsigned len = jsstr_length(str); + memcpy(buf, str->str, len*sizeof(WCHAR)); + return len; +} + static inline jsstr_t *jsstr_substr(jsstr_t *str, unsigned off, unsigned len) { return jsstr_alloc_len(str->str+off, len);

1 0

André Hentschel : ntdll: Remove SPARC support.
by Alexandre Julliard March 5, 2013

March 5, 2013

Module: wine Branch: master Commit: 6c02f66075b87351ffacbe959554528250c38c95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c02f66075b87351ffacbe959… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Feb 20 21:10:06 2013 +0100 ntdll: Remove SPARC support. --- dlls/ntdll/Makefile.in | 1 - dlls/ntdll/nt.c | 7 - dlls/ntdll/signal_sparc.c | 936 --------------------------------------------- dlls/ntdll/virtual.c | 1 - 4 files changed, 0 insertions(+), 945 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6c02f66075b87351ffacb…

1 0

Andrew Talbot : wined3d: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard March 5, 2013

March 5, 2013

Module: wine Branch: master Commit: e6f5829ae128c210cdafad3e748003cce3b16c37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6f5829ae128c210cdafad3e7… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Mar 4 23:01:12 2013 +0000 wined3d: Avoid signed-unsigned integer comparisons. --- dlls/wined3d/directx.c | 4 ++-- dlls/wined3d/surface.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index acdcc57..4093f7a 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2247,7 +2247,7 @@ static enum wined3d_pci_device wined3d_guess_card(const struct wined3d_gl_info * * memory behind our backs if really needed. Note that the amount of video * memory can be overruled using a registry setting. */ - int i; + unsigned int i; enum wined3d_pci_device device; for (i = 0; i < (sizeof(card_vendor_table) / sizeof(*card_vendor_table)); ++i) @@ -5014,7 +5014,7 @@ static void fillGLAttribFuncs(const struct wined3d_gl_info *gl_info) static void wined3d_adapter_init_fb_cfgs(struct wined3d_adapter *adapter, HDC dc) { const struct wined3d_gl_info *gl_info = &adapter->gl_info; - unsigned int i; + int i; if (gl_info->supported[WGL_ARB_PIXEL_FORMAT]) { diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 51a7578..a3589b1 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3763,7 +3763,7 @@ static HRESULT _Blt_ColorFill(BYTE *buf, unsigned int width, unsigned int height unsigned int bpp, UINT pitch, DWORD color) { BYTE *first; - int x, y; + unsigned int x, y; /* Do first row */ @@ -4842,7 +4842,6 @@ static void fb_copy_to_texture_direct(struct wined3d_surface *dst_surface, struc struct wined3d_device *device = dst_surface->resource.device; const struct wined3d_gl_info *gl_info; float xrel, yrel; - UINT row; struct wined3d_context *context; BOOL upsidedown = FALSE; RECT dst_rect = *dst_rect_in; @@ -4910,6 +4909,7 @@ static void fb_copy_to_texture_direct(struct wined3d_surface *dst_surface, struc } else { + LONG row; UINT yoffset = src_surface->resource.height - src_rect->top + dst_rect.top - 1; /* I have to process this row by row to swap the image, * otherwise it would be upside down, so stretching in y direction @@ -4923,7 +4923,7 @@ static void fb_copy_to_texture_direct(struct wined3d_surface *dst_surface, struc /* Well, that stuff works, but it's very slow. * find a better way instead */ - UINT col; + LONG col; for (col = dst_rect.left; col < dst_rect.right; ++col) {

1 0

Alessandro Pignotti : quartz: The filter graph manager should handle GetCurrentPosition itself.
by Alexandre Julliard March 5, 2013

March 5, 2013

Module: wine Branch: master Commit: 4910121972cc2efa3a2b031987c4b7b613b79900 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4910121972cc2efa3a2b03198… Author: Alessandro Pignotti <a.pignotti(a)sssup.it> Date: Tue Feb 26 14:13:57 2013 +0100 quartz: The filter graph manager should handle GetCurrentPosition itself. --- dlls/quartz/filtergraph.c | 40 ++++++++++------------------------------ 1 files changed, 10 insertions(+), 30 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 53556cf..0a0beba 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -2451,49 +2451,29 @@ static HRESULT WINAPI MediaSeeking_GetStopPosition(IMediaSeeking *iface, LONGLON return hr; } -static HRESULT WINAPI FoundCurrentPosition(IFilterGraphImpl *This, IMediaSeeking *seek, DWORD_PTR pposition) -{ - HRESULT hr; - LONGLONG pos = 0, *ppos = (LONGLONG*)pposition; - - hr = IMediaSeeking_GetCurrentPosition(seek, &pos); - if (FAILED(hr)) - return hr; - - if (*ppos < 0 || pos < *ppos) - *ppos = pos; - return hr; -} - static HRESULT WINAPI MediaSeeking_GetCurrentPosition(IMediaSeeking *iface, LONGLONG *pCurrent) { IFilterGraphImpl *This = impl_from_IMediaSeeking(iface); - HRESULT hr; + LONGLONG time = 0; if (!pCurrent) return E_POINTER; EnterCriticalSection(&This->cs); - *pCurrent = -1; - hr = all_renderers_seek(This, FoundCurrentPosition, (DWORD_PTR)pCurrent); - if (hr == E_NOTIMPL) { - LONGLONG time = 0; - if (This->state == State_Running && This->refClock && This->start_time >= 0) - { - IReferenceClock_GetTime(This->refClock, &time); - if (time) - time -= This->start_time; - } - if (This->pause_time > 0) - time += This->pause_time; - *pCurrent = time; - hr = S_OK; + if (This->state == State_Running && This->refClock && This->start_time >= 0) + { + IReferenceClock_GetTime(This->refClock, &time); + if (time) + time -= This->start_time; } + if (This->pause_time > 0) + time += This->pause_time; + *pCurrent = time; LeaveCriticalSection(&This->cs); TRACE("Time: %u.%03u\n", (DWORD)(*pCurrent / 10000000), (DWORD)((*pCurrent / 10000)%1000)); - return hr; + return S_OK; } static HRESULT WINAPI MediaSeeking_ConvertTimeFormat(IMediaSeeking *iface, LONGLONG *pTarget,

1 0

Ken Thomases : winemac: Fail gracefully and early when run from a non-GUI session.
by Alexandre Julliard March 5, 2013

March 5, 2013

Module: wine Branch: master Commit: c76f0beeab7e463841830843297af3734792f8ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=c76f0beeab7e4638418308432… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Mar 4 14:46:46 2013 -0600 winemac: Fail gracefully and early when run from a non-GUI session. --- dlls/winemac.drv/Makefile.in | 2 +- dlls/winemac.drv/macdrv_main.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/winemac.drv/Makefile.in b/dlls/winemac.drv/Makefile.in index 5b9def0..fcd41b4 100644 --- a/dlls/winemac.drv/Makefile.in +++ b/dlls/winemac.drv/Makefile.in @@ -1,6 +1,6 @@ MODULE = winemac.drv IMPORTS = user32 gdi32 advapi32 -EXTRALIBS = -framework AppKit -framework Carbon +EXTRALIBS = -framework AppKit -framework Carbon -framework Security C_SRCS = \ display.c \ diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index abd5522..cd1cc0c 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -21,6 +21,8 @@ */ #include "config.h" +#include <Security/AuthSession.h> + #include "macdrv.h" #include "wine/server.h" @@ -69,8 +71,15 @@ const char* debugstr_cf(CFTypeRef t) */ static BOOL process_attach(void) { + SessionAttributeBits attributes; + OSStatus status; + assert(NUM_EVENT_TYPES <= sizeof(macdrv_event_mask) * 8); + status = SessionGetInfo(callerSecuritySession, NULL, &attributes); + if (status != noErr || !(attributes & sessionHasGraphicAccess)) + return FALSE; + if ((thread_data_tls_index = TlsAlloc()) == TLS_OUT_OF_INDEXES) return FALSE; macdrv_err_on = ERR_ON(macdrv);

1 0

Tijl Coosemans : winebuild: Don' t register cleanup function when --save-temps is passed after --output.
by Alexandre Julliard March 5, 2013

March 5, 2013

Module: wine Branch: master Commit: afd7dc5947abe6d8387d2e4a38f397366c81a8ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=afd7dc5947abe6d8387d2e4a3… Author: Tijl Coosemans <tijl(a)coosemans.org> Date: Mon Mar 4 17:21:16 2013 +0100 winebuild: Don't register cleanup function when --save-temps is passed after --output. --- tools/winebuild/build.h | 2 +- tools/winebuild/main.c | 4 +++- tools/winebuild/utils.c | 4 +--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index 3fbf89d..359428f 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -250,6 +250,7 @@ extern char *find_tool( const char *name, const char * const *names ); extern struct strarray *get_as_command(void); extern struct strarray *get_ld_command(void); extern const char *get_nm_command(void); +extern void cleanup_tmp_files(void); extern char *get_temp_file_name( const char *prefix, const char *suffix ); extern void output_standard_file_header(void); extern FILE *open_input_file( const char *srcdir, const char *name ); @@ -347,7 +348,6 @@ extern int nb_errors; extern int display_warnings; extern int kill_at; extern int verbose; -extern int save_temps; extern int link_ext_symbols; extern int force_pointer_size; extern int unwind_tables; diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index 594b31b..39dbe62 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -44,7 +44,6 @@ int nb_errors = 0; int display_warnings = 0; int kill_at = 0; int verbose = 0; -int save_temps = 0; int link_ext_symbols = 0; int force_pointer_size = 0; int unwind_tables = 0; @@ -358,6 +357,7 @@ static char **parse_options( int argc, char **argv, DLLSPEC *spec ) { char *p; int optc; + int save_temps = 0; while ((optc = getopt_long( argc, argv, short_options, long_options, NULL )) != -1) { @@ -515,6 +515,8 @@ static char **parse_options( int argc, char **argv, DLLSPEC *spec ) } } + if (!save_temps) atexit( cleanup_tmp_files ); + if (spec->file_name && !strchr( spec->file_name, '.' )) strcat( spec->file_name, exec_mode == MODE_EXE ? ".exe" : ".dll" ); init_dll_name( spec ); diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 262ff3a..bab2b85 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -64,7 +64,7 @@ static const struct }; /* atexit handler to clean tmp files */ -static void cleanup_tmp_files(void) +void cleanup_tmp_files(void) { unsigned int i; for (i = 0; i < nb_tmp_files; i++) if (tmp_files[i]) unlink( tmp_files[i] ); @@ -461,8 +461,6 @@ char *get_temp_file_name( const char *prefix, const char *suffix ) const char *ext, *basename; int fd; - if (!nb_tmp_files && !save_temps) atexit( cleanup_tmp_files ); - if (!prefix || !prefix[0]) prefix = "winebuild"; if (!suffix) suffix = ""; if ((basename = strrchr( prefix, '/' ))) basename++;

1 0

André Hentschel : winetest: Remove SPARC support.
by Alexandre Julliard March 5, 2013

March 5, 2013

Module: wine Branch: master Commit: e7bdde360156dd0bd1ca37f589f2e7481763e11b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7bdde360156dd0bd1ca37f58… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Feb 20 21:09:33 2013 +0100 winetest: Remove SPARC support. --- programs/winetest/main.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 6c8e327..f4ebee6 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -313,8 +313,6 @@ static void print_version (void) static const char platform[] = "i386"; #elif defined(__x86_64__) static const char platform[] = "x86_64"; -#elif defined(__sparc__) - static const char platform[] = "sparc"; #elif defined(__powerpc__) static const char platform[] = "powerpc"; #elif defined(__arm__)

1 0

Jacek Caban : jscript: Use jsstr_flush in String_concat.
by Alexandre Julliard March 5, 2013

March 5, 2013

Module: wine Branch: master Commit: 895d059ebe8f58a1ce2b2526a63cb6b29d9d1606 URL: http://source.winehq.org/git/wine.git/?a=commit;h=895d059ebe8f58a1ce2b2526a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 5 11:50:18 2013 +0100 jscript: Use jsstr_flush in String_concat. --- dlls/jscript/string.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 70be13a..1d4a188 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -331,8 +331,8 @@ static HRESULT String_charCodeAt(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, static HRESULT String_concat(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { + unsigned len = 0, i, str_cnt; jsstr_t **strs, *ret = NULL; - DWORD len = 0, i, l, str_cnt; WCHAR *ptr; HRESULT hres; @@ -364,11 +364,8 @@ static HRESULT String_concat(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, uns ret = jsstr_alloc_buf(len); if(ret) { ptr = ret->str; - for(i=0; i < str_cnt; i++) { - l = jsstr_length(strs[i]); - memcpy(ptr, strs[i]->str, l*sizeof(WCHAR)); - ptr += l; - } + for(i=0; i < str_cnt; i++) + ptr += jsstr_flush(strs[i], ptr); }else { hres = E_OUTOFMEMORY; }

1 0

Jacek Caban : jscript: Use jsstr_flush in jsval_to_variant.
by Alexandre Julliard March 5, 2013

March 5, 2013

Module: wine Branch: master Commit: 0eeb5c17b4a5cdda76d788c92b7b1b34a47c8c79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0eeb5c17b4a5cdda76d788c92… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 5 11:49:48 2013 +0100 jscript: Use jsstr_flush in jsval_to_variant. --- dlls/jscript/jsutils.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index dd04186..50c0f26 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -354,8 +354,10 @@ HRESULT jsval_to_variant(jsval_t val, VARIANT *retv) if(str->length_flags & JSSTR_FLAG_NULLBSTR) { V_BSTR(retv) = NULL; }else { - V_BSTR(retv) = SysAllocStringLen(str->str, jsstr_length(str)); - if(!V_BSTR(retv)) + V_BSTR(retv) = SysAllocStringLen(NULL, jsstr_length(str)); + if(V_BSTR(retv)) + jsstr_flush(str, V_BSTR(retv)); + else return E_OUTOFMEMORY; } return S_OK;

1 0