October 2010 - Wine-Commits

Alexandre Julliard : server: Try to use /proc/pid/ mem to read process memory since it should be faster.
by Alexandre Julliard Oct. 5, 2010

Oct. 5, 2010

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

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

Oct. 5, 2010

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 : include: Don't install tlb files, they are platform-dependent.
by Alexandre Julliard Oct. 5, 2010

Oct. 5, 2010

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

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 Oct. 5, 2010

Oct. 5, 2010

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 : configure: Send the flex error output to config.log.
by Alexandre Julliard Oct. 5, 2010

Oct. 5, 2010

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 Oct. 5, 2010

Oct. 5, 2010

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

Francois Gouget : wine.inf: Let winebrowser handle the ftp URLs.
by Alexandre Julliard Oct. 5, 2010

Oct. 5, 2010

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 Oct. 5, 2010

Oct. 5, 2010

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

Austin English : Remove references to wineprefixcreate.
by Alexandre Julliard Oct. 5, 2010

Oct. 5, 2010

Module: wine Branch: stable Commit: 6f2893ed77a52004ae947c472a3e4031d4bfbfdc URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f2893ed77a52004ae947c472… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Jul 19 18:38:04 2010 -0500 Remove references to wineprefixcreate. (cherry picked from commit 82868174bcf2460d3692bad3b48050a82018cabd) --- dlls/dinput8/dinput8_main.c | 2 +- dlls/hlink/tests/hlink.c | 2 +- programs/winecfg/drivedetect.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dinput8/dinput8_main.c b/dlls/dinput8/dinput8_main.c index 87dd07b..9d426fb 100644 --- a/dlls/dinput8/dinput8_main.c +++ b/dlls/dinput8/dinput8_main.c @@ -66,7 +66,7 @@ HRESULT WINAPI DECLSPEC_HOTPATCH DirectInput8Create(HINSTANCE hinst, DWORD dwVer hr = CoCreateInstance( &CLSID_DirectInput8, punkOuter, CLSCTX_INPROC_SERVER, riid, ppDI); if(FAILED(hr)) { - ERR("CoCreateInstance failed with hr = %d; Try running wineprefixcreate to fix it.\n", hr); + ERR("CoCreateInstance failed with hr = %d\n", hr); return DIERR_INVALIDPARAM; } diff --git a/dlls/hlink/tests/hlink.c b/dlls/hlink/tests/hlink.c index cf031f5..3db2e81 100644 --- a/dlls/hlink/tests/hlink.c +++ b/dlls/hlink/tests/hlink.c @@ -439,7 +439,7 @@ static void test_persist(void) 0, NULL, &IID_IHlink, (LPVOID*) &lnk); ok(hr == S_OK, "IHlinkCreateFromString failed with error 0x%08x\n", hr); if (!lnk) { - skip("Can't create lnk, skipping test_persist. Was wineprefixcreate run properly?\n"); + skip("Can't create lnk, skipping test_persist.\n"); return; } test_persist_save_data("url only", lnk, diff --git a/programs/winecfg/drivedetect.c b/programs/winecfg/drivedetect.c index 75bce53..b20b97c 100644 --- a/programs/winecfg/drivedetect.c +++ b/programs/winecfg/drivedetect.c @@ -204,7 +204,7 @@ static void report_error(int code) case NO_DRIVE_C: if (gui_mode) - MessageBox(NULL, "No virtual drive C mapped\n\nTry running wineprefixcreate", "", MB_OK | MB_ICONEXCLAMATION); + MessageBox(NULL, "No virtual drive C mapped!\n", "", MB_OK | MB_ICONEXCLAMATION); else fprintf(stderr, "winecfg: no drive_c directory\n");

1 0

Alexandre Julliard : comctl32: Fix positioning of toolbars that have the WS_BORDER style.
by Alexandre Julliard Oct. 5, 2010

Oct. 5, 2010

Module: wine Branch: stable Commit: 985770e0ac9c53a8a08050bdfd231733496f084f URL: http://source.winehq.org/git/wine.git/?a=commit;h=985770e0ac9c53a8a08050bdf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 20 14:29:24 2010 +0200 comctl32: Fix positioning of toolbars that have the WS_BORDER style. (cherry picked from commit af6fb4712fd841f17583f1fb32a50089d70f9820) --- dlls/comctl32/toolbar.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index fe782c3..9b41732 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -3028,7 +3028,7 @@ TOOLBAR_AutoSize (TOOLBAR_INFO *infoPtr) if (!(infoPtr->dwStyle & CCS_NORESIZE)) { RECT window_rect; - UINT uPosFlags = SWP_NOZORDER; + UINT uPosFlags = SWP_NOZORDER | SWP_NOACTIVATE; if ((infoPtr->dwStyle & CCS_BOTTOM) == CCS_NOMOVEY) { @@ -3050,9 +3050,8 @@ TOOLBAR_AutoSize (TOOLBAR_INFO *infoPtr) if (infoPtr->dwStyle & WS_BORDER) { - x = y = 1; /* FIXME: this looks wrong */ - cy += GetSystemMetrics(SM_CYEDGE); - cx += GetSystemMetrics(SM_CXEDGE); + cy += 2 * GetSystemMetrics(SM_CXBORDER); + cx += 2 * GetSystemMetrics(SM_CYBORDER); } SetWindowPos(infoPtr->hwndSelf, NULL, x, y, cx, cy, uPosFlags); @@ -4842,7 +4841,7 @@ TOOLBAR_SetRows (TOOLBAR_INFO *infoPtr, WPARAM wParam, LPRECT lprc) SetWindowPos(infoPtr->hwndSelf, NULL, 0, 0, infoPtr->rcBound.right - infoPtr->rcBound.left, infoPtr->rcBound.bottom - infoPtr->rcBound.top, - SWP_NOMOVE); + SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE); } /* repaint toolbar */ @@ -6007,7 +6006,7 @@ TOOLBAR_NCPaint (HWND hwnd, WPARAM wParam, LPARAM lParam) GetWindowRect (hwnd, &rcWindow); OffsetRect (&rcWindow, -rcWindow.left, -rcWindow.top); if( dwStyle & WS_BORDER ) - OffsetRect (&rcWindow, 1, 1); + InflateRect (&rcWindow, -1, -1); DrawEdge (hdc, &rcWindow, EDGE_ETCHED, BF_TOP); }

1 0