wine-commits October 2010

wine-commits@winehq.org

2 participants
1174 discussions

Francois Gouget : wine.inf: Let winebrowser handle the ftp URLs.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: stable Commit: 8984522516a3ec68e6f0aa426810792485fe3e42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8984522516a3ec68e6f0aa426… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jul 28 09:46:13 2010 +0200 wine.inf: Let winebrowser handle the ftp URLs. (cherry picked from commit 0c7ead578ecd264e2559b5e6ecf964249122b71b) --- tools/wine.inf.in | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 63a78d2..9b90035 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -206,6 +206,11 @@ HKCR,xmlfile\shell\open\ddeexec,,2,"""%1"",,-1,0,,,," HKCR,xmlfile\shell\open\ddeexec,"NoActivateHandler",2,"" HKCR,xmlfile\shell\open\ddeexec\Application,,2,"IExplore" HKCR,xmlfile\shell\open\ddeexec\Topic,,2,"WWW_OpenURL" +HKCR,ftp\shell\open\command,,2,"%11%\winebrowser.exe -nohome" +HKCR,ftp\shell\open\ddeexec,,2,"""%1"",,-1,0,,,," +HKCR,ftp\shell\open\ddeexec,"NoActivateHandler",2,"" +HKCR,ftp\shell\open\ddeexec\Application,,2,"IExplore" +HKCR,ftp\shell\open\ddeexec\Topic,,2,"WWW_OpenURL" HKCR,http\shell\open\command,,2,"%11%\winebrowser.exe -nohome" HKCR,http\shell\open\ddeexec,,2,"""%1"",,-1,0,,,," HKCR,http\shell\open\ddeexec,"NoActivateHandler",2,""

1 0

Travis Athougies : wpp: Fixed bug in preventing add_text_to_macro from handling macros over 1 kb large .
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: stable Commit: 2619c628e205b9c5a9a2f36a1c931c4bb4caf5d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2619c628e205b9c5a9a2f36a1… Author: Travis Athougies <iammisc(a)gmail.com> Date: Mon Jul 26 17:55:29 2010 +0000 wpp: Fixed bug in preventing add_text_to_macro from handling macros over 1 kb large. (cherry picked from commit 4858654031d169e28ca848ae69878bab822436ac) --- libs/wpp/ppl.l | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libs/wpp/ppl.l b/libs/wpp/ppl.l index 6e0c7a1..0588e5d 100644 --- a/libs/wpp/ppl.l +++ b/libs/wpp/ppl.l @@ -1455,7 +1455,7 @@ static void add_text_to_macro(const char *text, int len) if(mep->curargalloc - mep->curargsize <= len+1) /* +1 for '\0' */ { char *new_curarg; - int new_alloc = mep->curargalloc + (ALLOCBLOCKSIZE > len+1) ? ALLOCBLOCKSIZE : len+1; + int new_alloc = mep->curargalloc + ((ALLOCBLOCKSIZE > len+1) ? ALLOCBLOCKSIZE : len+1); new_curarg = pp_xrealloc(mep->curarg, new_alloc * sizeof(mep->curarg[0])); if(!new_curarg) return;

1 0

Alexandre Julliard : configure: Send the flex error output to config.log.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: stable Commit: 74e3960f0eed4a2c3dfbe9a4246cd67ab79d4bda URL: http://source.winehq.org/git/wine.git/?a=commit;h=74e3960f0eed4a2c3dfbe9a42… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 28 11:04:46 2010 +0200 configure: Send the flex error output to config.log. (cherry picked from commit 27816c7c321536cbe4ece7b0432abd080344794f) --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index a57e048..942663a 100755 --- a/configure +++ b/configure @@ -4214,7 +4214,7 @@ cat >conftest.l <<EOF } %% EOF -if $FLEX -t conftest.l >/dev/null 2>&1 +if $FLEX -t conftest.l >/dev/null 2>&5 then { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } diff --git a/configure.ac b/configure.ac index 61f376e..76999c3 100644 --- a/configure.ac +++ b/configure.ac @@ -243,7 +243,7 @@ cat >conftest.l <<EOF } %% EOF -if $FLEX -t conftest.l >/dev/null 2>&1 +if $FLEX -t conftest.l >/dev/null 2>&AS_MESSAGE_LOG_FD then AC_MSG_RESULT([yes]) else

1 0

Maarten Lankhorst : mmdevapi: Blacklist portaudio.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: stable Commit: 5421b052e64ecffe47276250ceb57973c1b035f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5421b052e64ecffe47276250c… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sun May 30 19:18:35 2010 +0200 mmdevapi: Blacklist portaudio. (cherry picked from commit 47d28ace151390d102a34c51ce5d0ed3abad5e1a) --- dlls/mmdevapi/devenum.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index 85eeb5e..6fa637f 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -756,6 +756,8 @@ static int blacklist(const char *dev) { return 1; if (!strncmp(dev, "ALSA ", 5) && strstr(dev, "hw:")) return 1; + if (!strncmp(dev, "PortAudio ", 10)) + return 1; return 0; }

1 0

Dmitry Timoshkov : winex11: Remember last window that had the XIC focus and use it in ToUnicode() to make dead keys work more reliably.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: stable Commit: 1e73c66677f9fdff570624af367b09dce6358893 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e73c66677f9fdff570624af3… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Fri Jul 23 22:21:58 2010 +0900 winex11: Remember last window that had the XIC focus and use it in ToUnicode() to make dead keys work more reliably. (cherry picked from commit a56df96a0e6063a44c83ffd8fc330b1f92c02f10) --- dlls/winex11.drv/keyboard.c | 10 +++++++--- dlls/winex11.drv/window.c | 3 +++ dlls/winex11.drv/x11drv.h | 1 + 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index d9da4d2..02fd6bb 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -2541,9 +2541,13 @@ INT CDECL X11DRV_ToUnicodeEx(UINT virtKey, UINT scanCode, const BYTE *lpKeyState e.state = 0; e.type = KeyPress; - focus = GetFocus(); - if (focus) focus = GetAncestor( focus, GA_ROOT ); - if (!focus) focus = GetActiveWindow(); + focus = x11drv_thread_data()->last_xic_hwnd; + if (!focus) + { + focus = GetFocus(); + if (focus) focus = GetAncestor( focus, GA_ROOT ); + if (!focus) focus = GetActiveWindow(); + } e.window = X11DRV_get_whole_window( focus ); xic = X11DRV_get_ic( focus ); diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index eb6432e..b3118cc 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1862,6 +1862,7 @@ void CDECL X11DRV_DestroyWindow( HWND hwnd ) } if (thread_data->last_focus == hwnd) thread_data->last_focus = 0; + if (thread_data->last_xic_hwnd == hwnd) thread_data->last_xic_hwnd = 0; if (data->hWMIconBitmap) DeleteObject( data->hWMIconBitmap ); if (data->hWMIconMask) DeleteObject( data->hWMIconMask); wine_tsx11_lock(); @@ -2080,6 +2081,8 @@ XIC X11DRV_get_ic( HWND hwnd ) XIM xim; if (!data) return 0; + + x11drv_thread_data()->last_xic_hwnd = hwnd; if (data->xic) return data->xic; if (!(xim = x11drv_thread_data()->xim)) return 0; return X11DRV_CreateIC( xim, data ); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 1cd610d..0e82a65 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -549,6 +549,7 @@ struct x11drv_thread_data Window grab_window; /* window that currently grabs the mouse */ HWND last_focus; /* last window that had focus */ XIM xim; /* input method */ + HWND last_xic_hwnd; /* last xic window */ XFontSet font_set; /* international text drawing font set */ Window selection_wnd; /* window used for selection interactions */ HKL kbd_layout; /* active keyboard layout */

1 0

Alexandre Julliard : include: Don't install tlb files, they are platform-dependent.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: stable Commit: e20bb43bf14ba6fd05cb810c78ae9e569b6a0297 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e20bb43bf14ba6fd05cb810c7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 23 11:34:23 2010 +0200 include: Don't install tlb files, they are platform-dependent. (cherry picked from commit c1de11eee5a829ec83438719fae7f93690423f6c) --- include/Makefile.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index d1f653a..b228795 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -552,7 +552,7 @@ IDL_H_SRCS = $(PUBLIC_IDL_H_SRCS) $(PRIVATE_IDL_H_SRCS) @MAKE_RULES@ -OBJDIR_INCLUDES = $(PUBLIC_IDL_H_SRCS:.idl=.h) $(IDL_TLB_SRCS:.idl=.tlb) +OBJDIR_INCLUDES = $(PUBLIC_IDL_H_SRCS:.idl=.h) all: $(IDL_H_SRCS:.idl=.h) $(IDL_TLB_SRCS:.idl=.tlb)

1 0

Alexandre Julliard : rpcrt4: Don' t align the buffer after reading the conformance, we need to read the variance first.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: stable Commit: 2b6c55c4531a5c0859c52925012e95d6e1df85c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b6c55c4531a5c0859c529250… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 21 20:31:53 2010 +0200 rpcrt4: Don't align the buffer after reading the conformance, we need to read the variance first. (cherry picked from commit ee5cada23580f4df61c9e88cd209821c43f63865) --- dlls/rpcrt4/ndr_marshall.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 3ad55aa..db8be60 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -2062,7 +2062,6 @@ static inline ULONG array_read_conformance( unsigned char fc, PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat) { DWORD def, esize; - unsigned char alignment; switch (fc) { @@ -2087,7 +2086,6 @@ static inline ULONG array_read_conformance( ReadConformance(pStubMsg, NULL); return safe_multiply(esize, pStubMsg->MaxCount); case RPC_FC_BOGUS_ARRAY: - alignment = pFormat[1] + 1; def = *(const WORD *)(pFormat + 2); pFormat += 4; if (IsConformanceOrVariancePresent(pFormat)) pFormat = ReadConformance(pStubMsg, pFormat); @@ -2098,7 +2096,6 @@ static inline ULONG array_read_conformance( } pFormat = SkipVariance( pStubMsg, pFormat ); - align_pointer(&pStubMsg->Buffer, alignment); esize = ComplexStructSize(pStubMsg, pFormat); return safe_multiply(pStubMsg->MaxCount, esize); default:

1 0

Alexandre Julliard : server: Try to use /proc/pid/ mem to read process memory since it should be faster.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: stable Commit: ad521cac57d8be07b592f255ee5e802743e62a43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad521cac57d8be07b592f255e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 21 10:50:12 2010 +0200 server: Try to use /proc/pid/mem to read process memory since it should be faster. (cherry picked from commit 1a79912a10a6cded54d1f1de5f746bbffec3ffee) --- server/ptrace.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/server/ptrace.c b/server/ptrace.c index 1118048..111368b 100644 --- a/server/ptrace.c +++ b/server/ptrace.c @@ -19,9 +19,11 @@ */ #include "config.h" +#include "wine/port.h" #include <assert.h> #include <errno.h> +#include <fcntl.h> #include <stdio.h> #include <signal.h> #include <stdarg.h> @@ -377,6 +379,24 @@ int read_process_memory( struct process *process, client_ptr_t ptr, data_size_t if (suspend_for_ptrace( thread )) { + if (len > 3) /* /proc/pid/mem should be faster for large sizes */ + { + char procmem[24]; + int fd; + + sprintf( procmem, "/proc/%u/mem", process->unix_pid ); + if ((fd = open( procmem, O_RDONLY )) != -1) + { + ssize_t ret = pread( fd, dest, size, ptr ); + close( fd ); + if (ret == size) + { + len = 0; + goto done; + } + } + } + if (len > 1) { if (read_thread_long( thread, addr++, &data ) == -1) goto done;

1 0

Marcus Meissner : gdi32: Rebuild font hash after changing the matrix.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: stable Commit: c30e4b8d6b1ef885776412ecf50fcb94e8bc7494 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c30e4b8d6b1ef885776412ecf… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Jul 20 00:17:10 2010 +0200 gdi32: Rebuild font hash after changing the matrix. (cherry picked from commit 2f7ec73adde1a87f788eebcf66ec8dd16bf9109f) --- dlls/gdi32/freetype.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index ddb3d24..9d88211 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -3780,12 +3780,23 @@ found: if(!face->scalable) { /* Windows uses integer scaling factors for bitmap fonts */ INT scale, scaled_height; + GdiFont *cachedfont; /* FIXME: rotation of bitmap fonts is ignored */ height = abs(GDI_ROUND( (double)height * ret->font_desc.matrix.eM22 )); if (ret->aveWidth) ret->aveWidth = (double)ret->aveWidth * ret->font_desc.matrix.eM11; ret->font_desc.matrix.eM11 = ret->font_desc.matrix.eM22 = 1.0; + dcmat.eM11 = dcmat.eM22 = 1.0; + /* As we changed the matrix, we need to search the cache for the font again, + * otherwise we might explode the cache. */ + if((cachedfont = find_in_cache(hfont, &lf, &dcmat, can_use_bitmap)) != NULL) { + TRACE("Found cached font after non-scalable matrix rescale!\n"); + free_font( ret ); + LeaveCriticalSection( &freetype_cs ); + return cachedfont; + } + calc_hash(&ret->font_desc); if (height != 0) height = diff; height += face->size.height;

1 0

Owen Rudge : fusion: Implement IAssemblyNameImpl_GetDisplayName more completely.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: stable Commit: 8df789f0b81a9735dc6d602ac9acbc7511eb7ff9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8df789f0b81a9735dc6d602ac… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Tue Jul 20 18:02:36 2010 +0100 fusion: Implement IAssemblyNameImpl_GetDisplayName more completely. (cherry picked from commit 11dea57f692d1a3c24eebd5b393b05711301b5fa) --- dlls/fusion/Makefile.in | 2 +- dlls/fusion/asmname.c | 134 +++++++++++++++++++++++++++++++++++++++---- dlls/fusion/tests/asmname.c | 97 +++++++++++++++++++++++++++++-- 3 files changed, 216 insertions(+), 17 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8df789f0b81a9735dc6d6…

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2010