February 2012 - Wine-Commits

Francois Gouget : po: Remove or fuzzy invalid Turkish shell folder translations.
by Alexandre Julliard Feb. 6, 2012

Feb. 6, 2012

Module: wine Branch: master Commit: 0cd8c8f24a191cdd2d0ee9c086242df5c9f0d45d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cd8c8f24a191cdd2d0ee9c08… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Feb 6 14:56:21 2012 +0100 po: Remove or fuzzy invalid Turkish shell folder translations. --- po/tr.po | 33 +++++++++++++++++++-------------- 1 files changed, 19 insertions(+), 14 deletions(-) diff --git a/po/tr.po b/po/tr.po index 1880f39..e7f464b 100644 --- a/po/tr.po +++ b/po/tr.po @@ -8152,15 +8152,17 @@ msgstr "" #: shell32.rc:204 msgid "Start Menu" -msgstr "Start Menu" +msgstr "" #: shell32.rc:205 +#, fuzzy msgid "My Music" -msgstr "Belgelerim\\Müziğim" +msgstr "Müziğim" #: shell32.rc:206 +#, fuzzy msgid "My Videos" -msgstr "Belgelerim\\Vidyolarım" +msgstr "Vidyolarım" #: shell32.rc:207 #, fuzzy @@ -8170,15 +8172,15 @@ msgstr "Masaüstü" #: shell32.rc:208 msgid "NetHood" -msgstr "NetHood" +msgstr "" #: shell32.rc:209 msgid "Templates" -msgstr "Templates" +msgstr "" #: shell32.rc:210 msgid "PrintHood" -msgstr "PrintHood" +msgstr "" #: shell32.rc:211 winhlp32.rc:45 msgid "History" @@ -8186,11 +8188,12 @@ msgstr "" #: shell32.rc:212 msgid "Program Files" -msgstr "Program Files" +msgstr "" #: shell32.rc:214 +#, fuzzy msgid "My Pictures" -msgstr "Belgelerim\\Resimlerim" +msgstr "Resimlerim" #: shell32.rc:215 #, fuzzy @@ -8204,24 +8207,26 @@ msgstr "Belgeler" #: shell32.rc:217 #, fuzzy msgid "Administrative Tools" -msgstr "Start Menu\\Programlar\\Yönetimsel Araçlar" +msgstr "Yönetimsel Araçlar" #: shell32.rc:218 +#, fuzzy msgid "Music" -msgstr "Belgeler\\Müziğim" +msgstr "Müziğim" #: shell32.rc:219 +#, fuzzy msgid "Pictures" -msgstr "Belgeler\\Resimlerim" +msgstr "Resimlerim" #: shell32.rc:220 +#, fuzzy msgid "Videos" -msgstr "Belgeler\\Videolarım" +msgstr "Videolarım" #: shell32.rc:213 -#, fuzzy msgid "Program Files (x86)" -msgstr "Program Files" +msgstr "" #: shell32.rc:221 #, fuzzy

1 0

Francois Gouget : po: Fix a typography issue in the Telugu translation.
by Alexandre Julliard Feb. 6, 2012

Feb. 6, 2012

Module: wine Branch: master Commit: 33afb7766bee016dd4483c827b144e7219d0c947 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33afb7766bee016dd4483c827… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Feb 6 14:38:43 2012 +0100 po: Fix a typography issue in the Telugu translation. --- po/te.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/po/te.po b/po/te.po index 6cd4cc4..3cf00f7 100644 --- a/po/te.po +++ b/po/te.po @@ -8930,7 +8930,7 @@ msgstr "డిజిటల్ (&t)" #: clock.rc:32 notepad.rc:50 winecfg.rc:289 winefile.rc:60 wordpad.rc:81 msgid "&Font..." -msgstr "ఫాంట్... (&F)" +msgstr "ఫాంట్ (&F)..." #: clock.rc:34 msgid "&Without Titlebar"

1 0

Andrew Eikum : wineoss.drv: Don' t call GETOSPACE immediately after device initialization.
by Alexandre Julliard Feb. 6, 2012

Feb. 6, 2012

Module: wine Branch: master Commit: bb1ca5811458f59297f1b82205f563e0c07b5ece URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb1ca5811458f59297f1b8220… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Feb 6 09:24:46 2012 -0600 wineoss.drv: Don't call GETOSPACE immediately after device initialization. --- dlls/wineoss.drv/mmdevdrv.c | 14 +------------- 1 files changed, 1 insertions(+), 13 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 22ee924..35ff7d7 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -875,7 +875,6 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, { ACImpl *This = impl_from_IAudioClient(iface); int i; - audio_buf_info bi; HRESULT hr; TRACE("(%p)->(%x, %x, %s, %s, %p, %s)\n", This, mode, flags, @@ -955,18 +954,6 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, return E_OUTOFMEMORY; } - if(This->dataflow == eRender){ - if(ioctl(This->fd, SNDCTL_DSP_GETOSPACE, &bi) < 0){ - WARN("GETOSPACE failed: %d (%s)\n", errno, strerror(errno)); - CoTaskMemFree(This->fmt); - This->fmt = NULL; - LeaveCriticalSection(&This->lock); - return E_FAIL; - } - - This->oss_bufsize_bytes = bi.bytes; - } - This->vols = HeapAlloc(GetProcessHeap(), 0, fmt->nChannels * sizeof(float)); if(!This->vols){ CoTaskMemFree(This->fmt); @@ -980,6 +967,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, This->share = mode; This->flags = flags; + This->oss_bufsize_bytes = 0; EnterCriticalSection(&g_sessions_lock);

1 0

Dmitry Timoshkov : user32: Add a bunch of RealChildWindowFromPoint tests.
by Alexandre Julliard Feb. 6, 2012

Feb. 6, 2012

Module: wine Branch: master Commit: 8c7f3964b5dc9ea667ac61ba9cbae6b043e2d322 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c7f3964b5dc9ea667ac61ba9… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Feb 6 19:58:45 2012 +0800 user32: Add a bunch of RealChildWindowFromPoint tests. --- dlls/user32/tests/win.c | 233 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 233 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8c7f3964b5dc9ea667ac6…

1 0

Dmitry Timoshkov : user32: RealChildWindowFromPoint should skip invisible windows.
by Alexandre Julliard Feb. 6, 2012

Feb. 6, 2012

Module: wine Branch: master Commit: ea7e9ed2eb7eff90599c578c085f35578c6593f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea7e9ed2eb7eff90599c578c0… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Feb 6 19:59:00 2012 +0800 user32: RealChildWindowFromPoint should skip invisible windows. --- dlls/user32/tests/win.c | 2 +- dlls/user32/winpos.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index e760b4a..7d753f7 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -7038,9 +7038,9 @@ static void test_child_window_from_point(void) DestroyWindow(parent); -todo_wine ok(!found_invisible, "found %d invisible windows\n", found_invisible); ok(found_disabled, "found %d disabled windows\n", found_disabled); +todo_wine ok(found_groupbox == 4, "found %d groupbox windows\n", found_groupbox); ok(found_httransparent, "found %d found_httransparent windows\n", found_httransparent); todo_wine diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 57ccb81..42f6b3e 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -376,7 +376,7 @@ HWND WINAPI ChildWindowFromPoint( HWND hwndParent, POINT pt ) */ HWND WINAPI RealChildWindowFromPoint( HWND hwndParent, POINT pt ) { - return ChildWindowFromPointEx( hwndParent, pt, CWP_SKIPTRANSPARENT ); + return ChildWindowFromPointEx( hwndParent, pt, CWP_SKIPTRANSPARENT | CWP_SKIPINVISIBLE ); } /*******************************************************************

1 0

Francois Gouget : ddraw/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard Feb. 6, 2012

Feb. 6, 2012

Module: wine Branch: master Commit: 527e1ae1ac1ebf5c02be3b8978d823d7d6eedb56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=527e1ae1ac1ebf5c02be3b897… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Feb 5 23:18:46 2012 +0100 ddraw/tests: Fix compilation on systems that don't support nameless unions. --- dlls/ddraw/tests/ddraw1.c | 2 +- dlls/ddraw/tests/ddraw2.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index c4820b1..bac4bd9 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -719,7 +719,7 @@ static void test_surface_interface_mismatch(void) surface_desc.dwSize = sizeof(surface_desc); surface_desc.dwFlags = DDSD_CAPS | DDSD_ZBUFFERBITDEPTH | DDSD_WIDTH | DDSD_HEIGHT; surface_desc.ddsCaps.dwCaps = DDSCAPS_ZBUFFER; - surface_desc.dwZBufferBitDepth = z_depth; + U2(surface_desc).dwZBufferBitDepth = z_depth; surface_desc.dwWidth = 640; surface_desc.dwHeight = 480; hr = IDirectDraw_CreateSurface(ddraw, &surface_desc, &ds, NULL); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 10c065a..005136c 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -758,7 +758,7 @@ static void test_surface_interface_mismatch(void) surface_desc.dwSize = sizeof(surface_desc); surface_desc.dwFlags = DDSD_CAPS | DDSD_ZBUFFERBITDEPTH | DDSD_WIDTH | DDSD_HEIGHT; surface_desc.ddsCaps.dwCaps = DDSCAPS_ZBUFFER; - surface_desc.dwZBufferBitDepth = z_depth; + U2(surface_desc).dwZBufferBitDepth = z_depth; surface_desc.dwWidth = 640; surface_desc.dwHeight = 480; hr = IDirectDraw2_CreateSurface(ddraw, &surface_desc, &ds, NULL); @@ -931,7 +931,7 @@ static void test_depth_blit(void) ddsd_new.ddsCaps.dwCaps = DDSCAPS_ZBUFFER; ddsd_new.dwWidth = ddsd_existing.dwWidth; ddsd_new.dwHeight = ddsd_existing.dwHeight; - U4(ddsd_new).ddpfPixelFormat = U4(ddsd_existing).ddpfPixelFormat; + ddsd_new.ddpfPixelFormat = ddsd_existing.ddpfPixelFormat; hr = IDirectDraw2_CreateSurface(ddraw, &ddsd_new, &ds2, NULL); ok(SUCCEEDED(hr), "Failed to create a surface, hr %#x.\n", hr); hr = IDirectDraw2_CreateSurface(ddraw, &ddsd_new, &ds3, NULL); @@ -1028,7 +1028,7 @@ static void test_depth_blit(void) * a reliable result(z = 0.0) */ memset(&fx, 0, sizeof(fx)); fx.dwSize = sizeof(fx); - fx.dwFillDepth = 0; + U5(fx).dwFillDepth = 0; hr = IDirectDrawSurface_Blt(ds2, NULL, NULL, NULL, DDBLT_DEPTHFILL | DDBLT_WAIT, &fx); ok(SUCCEEDED(hr), "Failed to clear the source z buffer, hr %#x.\n", hr);

1 0

Nikolay Sivov : shell32: Use string comparison as autocompletion check.
by Alexandre Julliard Feb. 6, 2012

Feb. 6, 2012

Module: wine Branch: master Commit: c91e9db0cc76ce82600553ac301a2b894cb802ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=c91e9db0cc76ce82600553ac3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 6 00:51:15 2012 +0300 shell32: Use string comparison as autocompletion check. --- dlls/shell32/autocomplete.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index 8823262..5381f13 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -121,6 +121,9 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, } return CallWindowProcW(This->wpOrigEditProc, hwnd, uMsg, wParam, lParam); case WM_KEYUP: + { + int len; + GetWindowTextW( hwnd, hwndText, sizeof(hwndText)/sizeof(WCHAR)); switch(wParam) { @@ -208,7 +211,8 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, SendMessageW(This->hwndListBox, LB_RESETCONTENT, 0, 0); HeapFree(GetProcessHeap(), 0, This->txtbackup); - This->txtbackup = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(hwndText)+1)*sizeof(WCHAR)); + len = strlenW(hwndText); + This->txtbackup = HeapAlloc(GetProcessHeap(), 0, (len + 1)*sizeof(WCHAR)); lstrcpyW(This->txtbackup, hwndText); /* Returns if there is no text to search and we doesn't want to display all the entries */ @@ -223,15 +227,14 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, if (hr != S_OK) break; - if (StrStrIW(strs, hwndText) == strs) { + if (!strncmpiW(hwndText, strs, len)) { if (!filled && (This->options & ACO_AUTOAPPEND)) { - INT typed_length = strlenW(hwndText); WCHAR buffW[255]; strcpyW(buffW, hwndText); - strcatW(buffW, &strs[typed_length]); + strcatW(buffW, &strs[len]); SetWindowTextW(hwnd, buffW); - SendMessageW(hwnd, EM_SETSEL, typed_length, strlenW(strs)); + SendMessageW(hwnd, EM_SETSEL, len, strlenW(strs)); if (!(This->options & ACO_AUTOSUGGEST)) break; } @@ -262,6 +265,7 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, } break; + } case WM_DESTROY: { WNDPROC proc = This->wpOrigEditProc;

1 0

Eric Pouech : msvcrt: Fix TRACE format modifier for wfreopen.
by Alexandre Julliard Feb. 6, 2012

Feb. 6, 2012

Module: wine Branch: master Commit: f8b29a06857e1bf5110648cafde1fe05e0dfd86a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8b29a06857e1bf5110648caf… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Feb 5 22:07:51 2012 +0100 msvcrt: Fix TRACE format modifier for wfreopen. --- dlls/msvcrt/file.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index cde8a81..b27a40f 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3232,7 +3232,7 @@ MSVCRT_FILE* CDECL MSVCRT__wfreopen(const MSVCRT_wchar_t *path, const MSVCRT_wch { int open_flags, stream_flags, fd; - TRACE(":path (%p) mode (%s) file (%p) fd (%d)\n", debugstr_w(path), debugstr_w(mode), file, file->_file); + TRACE(":path (%s) mode (%s) file (%p) fd (%d)\n", debugstr_w(path), debugstr_w(mode), file, file->_file); LOCK_FILES(); if (!file || ((fd = file->_file) < 0) || fd > MSVCRT_fdend)

1 0

Nikolay Sivov : msxml3: Fix element data leak on error.
by Alexandre Julliard Feb. 6, 2012

Feb. 6, 2012

Module: wine Branch: master Commit: f39209cd2e2fab6728b583f0d2651f4914f74b42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f39209cd2e2fab6728b583f0d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 5 22:44:44 2012 +0300 msxml3: Fix element data leak on error. --- dlls/msxml3/saxreader.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index fb41c10..d80c256 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -1346,6 +1346,7 @@ static void libxmlEndElementNS( if (sax_callback_failed(This, hr)) { format_error_message_from_id(This, hr); + free_element_entry(element); return; }

1 0

Hans Leidekker : msi: Use the return value of IXMLDOMNode_get_text (clang).
by Alexandre Julliard Feb. 6, 2012

Feb. 6, 2012

Module: wine Branch: master Commit: 98c621c1bf1a4af545802f2c2a0fcb955cbf38cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=98c621c1bf1a4af545802f2c2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Feb 6 13:05:14 2012 +0100 msi: Use the return value of IXMLDOMNode_get_text (clang). --- dlls/msi/msi.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index f34bfc9..4022b3a 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -613,8 +613,11 @@ static UINT MSI_ApplicablePatchXML( MSIPACKAGE *package, IXMLDOMDocument *desc ) { hr = IXMLDOMNode_get_text( node, &s ); IXMLDOMNode_Release( node ); - if (!strcmpW( s, product_code )) r = ERROR_SUCCESS; - SysFreeString(s); + if (hr == S_OK) + { + if (!strcmpW( s, product_code )) r = ERROR_SUCCESS; + SysFreeString( s ); + } } IXMLDOMNodeList_Release( list );

1 0