January 2012 - Wine-Commits

Alexandre Julliard : gdi32/tests: Remove device capabilities test that fails on XP.
by Alexandre Julliard Jan. 9, 2012

Jan. 9, 2012

Module: wine Branch: master Commit: 62eaaa796b43aee366c47f00c8f9c6b229d95cb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62eaaa796b43aee366c47f00c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 9 16:27:41 2012 +0100 gdi32/tests: Remove device capabilities test that fails on XP. --- dlls/gdi32/tests/dc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 922907a..25d6982 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -284,7 +284,7 @@ static void test_device_caps( HDC hdc, HDC ref_dc, const char *descr ) CURVECAPS, LINECAPS, POLYGONALCAPS, - TEXTCAPS, + /* TEXTCAPS broken on printer DC on winxp */ CLIPCAPS, RASTERCAPS, ASPECTX,

1 0

Jörg Höhle : mmdevapi: Round buffer size like native in shared mode.
by Alexandre Julliard Jan. 9, 2012

Jan. 9, 2012

Module: wine Branch: master Commit: fcc9b74cb2c3d6433c20527b4c8b487fdd5cd6f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcc9b74cb2c3d6433c20527b4… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Thu Jan 5 18:56:46 2012 +0100 mmdevapi: Round buffer size like native in shared mode. --- dlls/winecoreaudio.drv/mmdevdrv.c | 2 +- dlls/wineoss.drv/mmdevdrv.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 93ff3d6..19a505c 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -1006,7 +1006,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, This->period_ms = period / 10000; - This->bufsize_frames = ceil(fmt->nSamplesPerSec * (duration / 10000000.)); + This->bufsize_frames = MulDiv(duration, fmt->nSamplesPerSec, 10000000); if(This->dataflow == eCapture){ int i; diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 15bda6a..bc4d952 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -956,7 +956,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, This->period_us = period / 10; - This->bufsize_frames = ceil(fmt->nSamplesPerSec * (duration / 10000000.)); + This->bufsize_frames = MulDiv(duration, fmt->nSamplesPerSec, 10000000); This->local_buffer = HeapAlloc(GetProcessHeap(), 0, This->bufsize_frames * fmt->nBlockAlign); if(!This->local_buffer){

1 0

Jacek Caban : ieframe: Added implementation of AggregatedNavigation2.
by Alexandre Julliard Jan. 9, 2012

Jan. 9, 2012

Module: wine Branch: master Commit: 5fb52f2db0875d3faf0c7b36757d575f48ba3a5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fb52f2db0875d3faf0c7b367… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 9 17:56:41 2012 +0100 ieframe: Added implementation of AggregatedNavigation2. --- dlls/ieframe/navigate.c | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/ieframe/navigate.c b/dlls/ieframe/navigate.c index 6a74d2e..8d2636b 100644 --- a/dlls/ieframe/navigate.c +++ b/dlls/ieframe/navigate.c @@ -1302,9 +1302,25 @@ static HRESULT WINAPI TargetFramePriv2_AggregatedNavigation2(ITargetFramePriv2 * IBindStatusCallback *pibsc, LPCWSTR pszTargetName, IUri *pUri, LPCWSTR pszLocation) { HlinkFrame *This = impl_from_ITargetFramePriv2(iface); - FIXME("(%p)->(%x %p %p %s %p %s)\n", This, grfHLNF, pbc, pibsc, debugstr_w(pszTargetName), + IMoniker *mon; + HRESULT hres; + + TRACE("(%p)->(%x %p %p %s %p %s)\n", This, grfHLNF, pbc, pibsc, debugstr_w(pszTargetName), pUri, debugstr_w(pszLocation)); - return E_NOTIMPL; + + /* + * NOTE: This is an undocumented function. It seems to be working the way it's implemented, + * but I couldn't get its tests working. It's used by mshtml to load content in a new + * instance of browser. + */ + + hres = CreateURLMonikerEx2(NULL, pUri, &mon, 0); + if(FAILED(hres)) + return hres; + + hres = navigate_hlink(This->doc_host, mon, pbc, pibsc); + IMoniker_Release(mon); + return hres; } static const ITargetFramePriv2Vtbl TargetFramePriv2Vtbl = {

1 0

Jacek Caban : mshtml: Added more IHTMLWindow2::open tests.
by Alexandre Julliard Jan. 9, 2012

Jan. 9, 2012

Module: wine Branch: master Commit: c7cc9a1a5d1b57b2fd9a4c09d4bec28e9763c759 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7cc9a1a5d1b57b2fd9a4c09d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 9 17:57:07 2012 +0100 mshtml: Added more IHTMLWindow2::open tests. --- dlls/mshtml/tests/htmldoc.c | 26 ++++++++++++++++++++------ 1 files changed, 20 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 174b448..fb615fb 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -41,6 +41,7 @@ #include "shdeprecated.h" #include "perhist.h" #include "shobjidl.h" +#include "htiface.h" #include "mshtml_test.h" DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); @@ -199,7 +200,7 @@ static BOOL inplace_deactivated, open_call; static BOOL complete, loading_js, loading_hash; static DWORD status_code = HTTP_STATUS_OK; static BOOL asynchronous_binding = FALSE; -static BOOL support_wbapp; +static BOOL support_wbapp, allow_new_window; static int stream_read, protocol_read; static enum load_state_t { LD_DOLOAD, @@ -828,10 +829,10 @@ static HRESULT WINAPI NewWindowManager_EvaluateNewWindow(INewWindowManager *ifac ok(!strcmp_wa(pszUrlContext, "about:replace"), "pszUrlContext = %s\n", wine_dbgstr_w(pszUrlContext)); ok(!pszFeatures, "pszFeatures = %s\n", wine_dbgstr_w(pszFeatures)); ok(!fReplace, "fReplace = %x\n", fReplace); - ok(dwFlags == NWMF_FIRST, "dwFlags = %x\n", dwFlags); + ok(dwFlags == (allow_new_window ? 0 : NWMF_FIRST), "dwFlags = %x\n", dwFlags); ok(!dwUserActionTime, "dwUserActionime = %d\n", dwUserActionTime); - return E_FAIL; + return allow_new_window ? S_OK : E_FAIL; } static const INewWindowManagerVtbl NewWindowManagerVtbl = { @@ -5162,12 +5163,14 @@ static void test_put_href(IHTMLDocument2 *doc, BOOL use_replace, const char *hre nav_url = prev_nav_url; } -static void test_open_window(IHTMLDocument2 *doc) +static void test_open_window(IHTMLDocument2 *doc, BOOL do_block) { IHTMLWindow2 *window, *new_window; BSTR name, url; HRESULT hres; + allow_new_window = !do_block; + hres = IHTMLDocument2_get_parentWindow(doc, &window); ok(hres == S_OK, "get_parentWindow failed: %08x\n", hres); @@ -5203,7 +5206,16 @@ static void test_open_window(IHTMLDocument2 *doc) CHECK_CALLED(EvaluateNewWindow); ok(hres == S_OK, "open failed: %08x\n", hres); - ok(new_window == NULL, "new_window != NULL\n"); + + if(do_block) { + ok(!new_window, "new_window != NULL\n"); + }else { + ok(new_window != NULL, "new_window == NULL\n"); + + trace("WINDOW %p\n", new_window); + hres = IHTMLWindow2_close(new_window); + ok(hres == S_OK, "close failed: %08x\n", hres); + } IHTMLWindow2_Release(window); } @@ -6535,7 +6547,9 @@ static void test_HTMLDocument_http(BOOL with_wbapp) test_put_href(doc, FALSE, NULL, "about:blank", FALSE, FALSE); test_put_href(doc, TRUE, NULL, "about:replace", FALSE, FALSE); - test_open_window(doc); + test_open_window(doc, TRUE); + if(!support_wbapp) /* FIXME */ + test_open_window(doc, FALSE); test_InPlaceDeactivate(doc, TRUE); test_Close(doc, FALSE);

1 0

Alexandre Julliard : user32/tests: Fix some test failures on Windows.
by Alexandre Julliard Jan. 9, 2012

Jan. 9, 2012

Module: wine Branch: master Commit: 0702d31c81b2cd9267d68b003670a6fe2791386e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0702d31c81b2cd9267d68b003… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 9 16:40:28 2012 +0100 user32/tests: Fix some test failures on Windows. --- dlls/user32/tests/msg.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 6f40a0b..42f4c4f 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -13497,7 +13497,7 @@ static const struct message WmSetFocus_1[] = { { WM_QUERYNEWPALETTE, sent|wparam|lparam|parent|optional, 0, 0 }, { WM_WINDOWPOSCHANGING, sent|parent, 0, SWP_NOSIZE|SWP_NOMOVE }, { WM_ACTIVATEAPP, sent|wparam|parent, 1 }, - { WM_NCACTIVATE, sent|wparam|parent, 1 }, + { WM_NCACTIVATE, sent|parent }, { WM_GETTEXT, sent|defwinproc|parent|optional }, { WM_GETTEXT, sent|defwinproc|parent|optional }, { WM_ACTIVATE, sent|wparam|parent, 1 }, @@ -13573,7 +13573,8 @@ static void test_SetFocus(void) SetLastError(0xdeadbeef); old_focus = SetFocus((HWND)0xdeadbeef); - ok(GetLastError() == ERROR_INVALID_WINDOW_HANDLE, "expected ERROR_INVALID_WINDOW_HANDLE, got %d\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_WINDOW_HANDLE || broken(GetLastError() == 0xdeadbeef), + "expected ERROR_INVALID_WINDOW_HANDLE, got %d\n", GetLastError()); while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) DispatchMessage(&msg); ok_sequence(WmEmptySeq, "SetFocus on an invalid window", FALSE); ok(old_focus == 0, "expected old focus 0, got %p\n", old_focus); @@ -13602,7 +13603,8 @@ static void test_SetFocus(void) SetLastError(0xdeadbeef); old_active = SetActiveWindow((HWND)0xdeadbeef); - ok(GetLastError() == ERROR_INVALID_WINDOW_HANDLE, "expected ERROR_INVALID_WINDOW_HANDLE, got %d\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_WINDOW_HANDLE || broken(GetLastError() == 0xdeadbeef), + "expected ERROR_INVALID_WINDOW_HANDLE, got %d\n", GetLastError()); while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) DispatchMessage(&msg); ok_sequence(WmEmptySeq, "SetActiveWindow on an invalid window", FALSE); ok(old_active == 0, "expected old focus 0, got %p\n", old_active);

1 0

Jacek Caban : ieframe: Added support for SID_SHTMLWindow in WebBrowser:: QueryService.
by Alexandre Julliard Jan. 9, 2012

Jan. 9, 2012

Module: wine Branch: master Commit: 39c1298958dd38fe98931d9e0e2dbb98ca7a4a78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39c1298958dd38fe98931d9e0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 9 17:55:52 2012 +0100 ieframe: Added support for SID_SHTMLWindow in WebBrowser::QueryService. --- dlls/ieframe/tests/webbrowser.c | 16 ++++++++++------ dlls/ieframe/webbrowser.c | 9 ++++++--- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 8c12d39..516e0b8 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -2697,21 +2697,25 @@ static void test_olecmd(IUnknown *unk, BOOL loaded) static void test_IServiceProvider(IUnknown *unk) { IServiceProvider *servprov = (void*)0xdeadbeef; + IUnknown *iface; HRESULT hres; - IUnknown *ret = NULL; hres = IUnknown_QueryInterface(unk, &IID_IServiceProvider, (void**)&servprov); ok(hres == S_OK, "QueryInterface returned %08x, expected S_OK\n", hres); if(FAILED(hres)) return; - hres = IServiceProvider_QueryService(servprov, &SID_STopLevelBrowser, &IID_IBrowserService2, (LPVOID*)&ret); + hres = IServiceProvider_QueryService(servprov, &SID_STopLevelBrowser, &IID_IBrowserService2, (LPVOID*)&iface); ok(hres == E_FAIL, "QueryService returned %08x, expected E_FAIL\n", hres); - ok(ret == NULL, "ret returned %p, expected NULL\n", ret); + ok(!iface, "QueryService returned %p, expected NULL\n", iface); if(hres == S_OK) - { - IUnknown_Release(ret); - } + IUnknown_Release(iface); + + hres = IServiceProvider_QueryService(servprov, &SID_SHTMLWindow, &IID_IHTMLWindow2, (LPVOID*)&iface); + ok(hres == S_OK, "QueryService returned %08x, expected S_OK\n", hres); + ok(iface != NULL, "QueryService returned NULL\n"); + if(hres == S_OK) + IUnknown_Release(iface); IServiceProvider_Release(servprov); } diff --git a/dlls/ieframe/webbrowser.c b/dlls/ieframe/webbrowser.c index 706600d..ff026db 100644 --- a/dlls/ieframe/webbrowser.c +++ b/dlls/ieframe/webbrowser.c @@ -1143,16 +1143,19 @@ static HRESULT STDMETHODCALLTYPE WBServiceProvider_QueryService(IServiceProvider { WebBrowser *This = impl_from_IServiceProvider(iface); - if(*ppv) - ppv = NULL; + if(IsEqualGUID(&SID_SHTMLWindow, riid)) { + TRACE("(%p)->(SID_SHTMLWindow)\n", This); + return IHTMLWindow2_QueryInterface(&This->doc_host.html_window.IHTMLWindow2_iface, riid, ppv); + } if(IsEqualGUID(&IID_IBrowserService2, riid)) { TRACE("(%p)->(IID_IBrowserService2 return E_FAIL)\n", This); + *ppv = NULL; return E_FAIL; } FIXME("(%p)->(%s, %s %p)\n", This, debugstr_guid(guidService), debugstr_guid(riid), ppv); - + *ppv = NULL; return E_NOINTERFACE; }

1 0

Daniel Lehman : kernel32: If string arg to FormatMessage is NULL, use "( null)" instead of crashing.
by Alexandre Julliard Jan. 9, 2012

Jan. 9, 2012

Module: wine Branch: master Commit: b1f04e23bf361e06d239e03693c904a597b9a32d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1f04e23bf361e06d239e0369… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Jan 6 10:48:44 2012 -0800 kernel32: If string arg to FormatMessage is NULL, use "(null)" instead of crashing. --- dlls/kernel32/format_msg.c | 9 ++++++--- dlls/kernel32/tests/format_msg.c | 13 +++++++++++++ 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/format_msg.c b/dlls/kernel32/format_msg.c index d6d19ff..b9e471f 100644 --- a/dlls/kernel32/format_msg.c +++ b/dlls/kernel32/format_msg.c @@ -135,15 +135,18 @@ static LPCWSTR format_insert( BOOL unicode_caller, int insert, LPCWSTR format, if (*format != '!') /* simple string */ { arg = get_arg( insert, flags, args ); - if (unicode_caller) + if (unicode_caller || !arg) { - WCHAR *str = (WCHAR *)arg; + static const WCHAR nullW[] = {'(','n','u','l','l',')',0}; + const WCHAR *str = (const WCHAR *)arg; + + if (!str) str = nullW; *result = HeapAlloc( GetProcessHeap(), 0, (strlenW(str) + 1) * sizeof(WCHAR) ); strcpyW( *result, str ); } else { - char *str = (char *)arg; + const char *str = (const char *)arg; DWORD length = MultiByteToWideChar( CP_ACP, 0, str, -1, NULL, 0 ); *result = HeapAlloc( GetProcessHeap(), 0, length * sizeof(WCHAR) ); MultiByteToWideChar( CP_ACP, 0, str, -1, *result, length ); diff --git a/dlls/kernel32/tests/format_msg.c b/dlls/kernel32/tests/format_msg.c index 37ea3e9..1f56440 100644 --- a/dlls/kernel32/tests/format_msg.c +++ b/dlls/kernel32/tests/format_msg.c @@ -125,6 +125,7 @@ static void test_message_from_string_wide(void) static const WCHAR s_sp002sp001[] = {' ',' ','0','0','0','2',',',' ',' ','0','0','1',0}; static const WCHAR s_sp002sp003[] = {' ',' ','0','0','0','2',',',' ','0','0','0','0','3',0}; static const WCHAR s_sp001004[] = {' ',' ','0','0','1',',','0','0','0','0','0','4',0}; + static const WCHAR s_null[] = {'(','n','u','l','l',')',0}; static const WCHAR init_buf[] = {'x', 'x', 'x', 'x', 'x', 'x'}; static const WCHAR broken_buf[] = {'t','e','s','t','x','x'}; @@ -381,6 +382,12 @@ static void test_message_from_string_wide(void) ok(!lstrcmpW(s_crlfcrlf, out), "failed out=%s\n", wine_dbgstr_w(out)); ok(r==4,"failed: r=%d\n", r); + /* null string as argument */ + r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_1, 0, + 0, out, sizeof(out)/sizeof(WCHAR), NULL); + ok(!lstrcmpW(s_null, out),"failed out=[%s]\n", wine_dbgstr_w(out)); + ok(r==6,"failed: r=%d\n",r); + /* precision and width */ r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_13s, @@ -700,6 +707,12 @@ static void test_message_from_string(void) ok(!strcmp("\r\n\r\n", out),"failed out=[%s]\n",out); ok(r==4,"failed: r=%d\n",r); + /* null string as argument */ + r = doit(FORMAT_MESSAGE_FROM_STRING, "%1", 0, + 0, out, sizeof(out)/sizeof(CHAR), NULL); + ok(!strcmp("(null)", out),"failed out=[%s]\n",out); + ok(r==6,"failed: r=%d\n",r); + /* precision and width */ r = doit(FORMAT_MESSAGE_FROM_STRING, "%1!3s!",

1 0

Nikolay Sivov : shell32: Remove redundant loop to count already known value .
by Alexandre Julliard Jan. 9, 2012

Jan. 9, 2012

Module: wine Branch: master Commit: 1e864366284065ffcb0fae7a10512c6059f95a33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e864366284065ffcb0fae7a1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 8 03:14:36 2012 +0300 shell32: Remove redundant loop to count already known value. --- dlls/shell32/shv_item_cmenu.c | 25 +++++++++++-------------- 1 files changed, 11 insertions(+), 14 deletions(-) diff --git a/dlls/shell32/shv_item_cmenu.c b/dlls/shell32/shv_item_cmenu.c index 8a97a6e..f1a96cf 100644 --- a/dlls/shell32/shv_item_cmenu.c +++ b/dlls/shell32/shv_item_cmenu.c @@ -73,20 +73,17 @@ static inline ItemCmImpl *impl_from_IContextMenu2(IContextMenu2 *iface) * ISvItemCm_CanRenameItems() */ static BOOL ISvItemCm_CanRenameItems(ItemCmImpl *This) -{ UINT i; - DWORD dwAttributes; +{ + DWORD attr; - TRACE("(%p)->()\n",This); + TRACE("(%p)\n", This); - if(This->apidl) - { - for(i = 0; i < This->cidl; i++){} - if(i > 1) return FALSE; /* can't rename more than one item at a time*/ - dwAttributes = SFGAO_CANRENAME; - IShellFolder_GetAttributesOf(This->menu.parent, 1, (LPCITEMIDLIST*)This->apidl, &dwAttributes); - return dwAttributes & SFGAO_CANRENAME; - } - return FALSE; + /* can't rename more than one item at a time*/ + if (!This->apidl || This->cidl > 1) return FALSE; + + attr = SFGAO_CANRENAME; + IShellFolder_GetAttributesOf(This->menu.parent, 1, (LPCITEMIDLIST*)This->apidl, &attr); + return attr & SFGAO_CANRENAME; } /**************************************************************************

1 0

Pablo Saratxaga : kernel32: Corrections to Walloon locale.
by Alexandre Julliard Jan. 9, 2012

Jan. 9, 2012

Module: wine Branch: master Commit: 7c34c4d23995f8fed7fcb9a4556662d953c9e51b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c34c4d23995f8fed7fcb9a45… Author: Pablo Saratxaga <pablo(a)walon.org> Date: Sun Jan 8 00:05:01 2012 +0100 kernel32: Corrections to Walloon locale. --- dlls/kernel32/nls/wal.nls | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/kernel32/nls/wal.nls b/dlls/kernel32/nls/wal.nls index be1f6f7..f4c2878 100644 --- a/dlls/kernel32/nls/wal.nls +++ b/dlls/kernel32/nls/wal.nls @@ -67,9 +67,9 @@ STRINGTABLE LANGUAGE LANG_WALON, SUBLANG_DEFAULT LOCALE_SABBREVCTRYNAME "BEL" LOCALE_SABBREVDAYNAME1 "lon" LOCALE_SABBREVDAYNAME2 "m�r" - LOCALE_SABBREVDAYNAME3 "mer" + LOCALE_SABBREVDAYNAME3 "mie" LOCALE_SABBREVDAYNAME4 "dju" - LOCALE_SABBREVDAYNAME5 "vin" + LOCALE_SABBREVDAYNAME5 "v�n" LOCALE_SABBREVDAYNAME6 "sem" LOCALE_SABBREVDAYNAME7 "dim" LOCALE_SABBREVLANGNAME "WAL" @@ -77,7 +77,7 @@ STRINGTABLE LANGUAGE LANG_WALON, SUBLANG_DEFAULT LOCALE_SABBREVMONTHNAME2 "fev" LOCALE_SABBREVMONTHNAME3 "m�s" LOCALE_SABBREVMONTHNAME4 "avr" - LOCALE_SABBREVMONTHNAME5 "mae" + LOCALE_SABBREVMONTHNAME5 "may" LOCALE_SABBREVMONTHNAME6 "djn" LOCALE_SABBREVMONTHNAME7 "djl" LOCALE_SABBREVMONTHNAME8 "awo" @@ -86,14 +86,14 @@ STRINGTABLE LANGUAGE LANG_WALON, SUBLANG_DEFAULT LOCALE_SABBREVMONTHNAME11 "n�v" LOCALE_SABBREVMONTHNAME12 "dec" LOCALE_SABBREVMONTHNAME13 "" - LOCALE_SCOUNTRY "Beljike" + LOCALE_SCOUNTRY "Beldjike" LOCALE_SCURRENCY "�" LOCALE_SDATE "/" LOCALE_SDAYNAME1 "londi" LOCALE_SDAYNAME2 "m�rdi" - LOCALE_SDAYNAME3 "merkidi" + LOCALE_SDAYNAME3 "mierkidi" LOCALE_SDAYNAME4 "djudi" - LOCALE_SDAYNAME5 "vinrdi" + LOCALE_SDAYNAME5 "v�nrdi" LOCALE_SDAYNAME6 "semdi" LOCALE_SDAYNAME7 "dimegne" LOCALE_SDECIMAL "," @@ -110,12 +110,12 @@ STRINGTABLE LANGUAGE LANG_WALON, SUBLANG_DEFAULT LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;0" LOCALE_SMONTHNAME1 "djanv�" - LOCALE_SMONTHNAME2 "f�vr�" - LOCALE_SMONTHNAME3 "m�s" + LOCALE_SMONTHNAME2 "fevr�" + LOCALE_SMONTHNAME3 "m�ss" LOCALE_SMONTHNAME4 "avri" - LOCALE_SMONTHNAME5 "maey" + LOCALE_SMONTHNAME5 "may" LOCALE_SMONTHNAME6 "djun" - LOCALE_SMONTHNAME7 "djulet" + LOCALE_SMONTHNAME7 "djulete" LOCALE_SMONTHNAME8 "awousse" LOCALE_SMONTHNAME9 "setimbe" LOCALE_SMONTHNAME10 "oct�be" @@ -124,10 +124,10 @@ STRINGTABLE LANGUAGE LANG_WALON, SUBLANG_DEFAULT LOCALE_SMONTHNAME13 "" LOCALE_SMONTHOUSANDSEP "." LOCALE_SNAME "wa-BE" - LOCALE_SNATIVECTRYNAME "Beljike" + LOCALE_SNATIVECTRYNAME "Beldjike" LOCALE_SNATIVECURRNAME "euro" LOCALE_SNATIVEDIGITS "0123456789" - LOCALE_SNATIVEDISPLAYNAME "Walon (Beljike)" + LOCALE_SNATIVEDISPLAYNAME "Walon (Beldjike)" LOCALE_SNATIVELANGNAME "Walon" LOCALE_SNEGATIVESIGN "-" LOCALE_SPOSITIVESIGN ""

1 0

Daniel Lehman : libwine: Use larger buffer in vsnprintfW for large numbers.
by Alexandre Julliard Jan. 9, 2012

Jan. 9, 2012

Module: wine Branch: master Commit: 8bed3b6f2cb96d884c6f181d1a2e3c79ab77dbdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bed3b6f2cb96d884c6f181d1… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Jan 6 12:25:40 2012 -0800 libwine: Use larger buffer in vsnprintfW for large numbers. --- libs/wine/string.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libs/wine/string.c b/libs/wine/string.c index 8f85c63..0b42ea8 100644 --- a/libs/wine/string.c +++ b/libs/wine/string.c @@ -351,7 +351,7 @@ int vsnprintfW(WCHAR *str, size_t len, const WCHAR *format, va_list valist) { unsigned int written = 0; const WCHAR *iter = format; - char bufa[256], fmtbufa[64], *fmta; + char bufa[512], fmtbufa[64], *fmta; while (*iter) {

1 0