July 2009 - Wine-Commits - list.winehq.org

Jacek Caban : textstor.idl: Added more error code declarations.
by Alexandre Julliard July 20, 2009

July 20, 2009

Module: wine Branch: master Commit: b3ecc6e64a15f38352ecb9a397ee974e0883cb59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3ecc6e64a15f38352ecb9a39… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jul 19 18:20:45 2009 +0200 textstor.idl: Added more error code declarations. --- include/textstor.idl | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) diff --git a/include/textstor.idl b/include/textstor.idl index 2e79e3c..25f7749 100644 --- a/include/textstor.idl +++ b/include/textstor.idl @@ -20,8 +20,19 @@ import "oaidl.idl"; #endif -cpp_quote("#define TS_E_READONLY MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x0209)") +cpp_quote("#define TS_E_INVALIDPOS MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x0200)") cpp_quote("#define TS_E_NOLOCK MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x0201)") +cpp_quote("#define TS_E_NOOBJECT MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x0202)") +cpp_quote("#define TS_E_NOSERVICE MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x0203)") +cpp_quote("#define TS_E_NOINTERFACE MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x0204)") +cpp_quote("#define TS_E_NOSELECTION MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x0205)") +cpp_quote("#define TS_E_NOLAYOUT MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x0206)") +cpp_quote("#define TS_E_INVALIDPOINT MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x0207)") +cpp_quote("#define TS_E_SYNCHRONOUS MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x0208)") +cpp_quote("#define TS_E_READONLY MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x0209)") +cpp_quote("#define TS_E_FORMAT MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x020a)") + +cpp_quote("#define TS_S_ASYNC MAKE_HRESULT(SEVERITY_SUCCESS, FACILITY_ITF, 0x0300)") const ULONG TS_DEFAULT_SELECTION = ~0u; @@ -50,6 +61,9 @@ const WCHAR TS_CHAR_EMBEDDED = 0xfffc; const WCHAR TS_CHAR_REGION = 0x0000; const WCHAR TS_CHAR_REPLACEMENT = 0xfffd; +const DWORD TS_IAS_NOQUERY = 0x1; +const DWORD TS_IAS_QUERYONLY = 0x2; + typedef [uuid(05fcf85b-5e9c-4c3e-ab71-29471d4f38e7)] enum { TS_AE_NONE, TS_AE_START, TS_AE_END } TsActiveSelEnd; typedef [uuid(033b0df0-f193-4170-b47b-141afc247878)] enum { TS_RT_PLAIN, TS_RT_HIDDEN, TS_RT_OPAQUE } TsRunType; typedef [uuid(ef3457d9-8446-49a7-a9e6-b50d9d5f3fd9)] GUID TS_ATTRID;

1 0

Jacek Caban : wininet: Code clean up by using heap_strdup* functions.
by Alexandre Julliard July 20, 2009

July 20, 2009

Module: wine Branch: master Commit: 1c46be7a76bbebb1cbac7828ec752b6b9b91df33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c46be7a76bbebb1cbac7828e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jul 19 18:10:14 2009 +0200 wininet: Code clean up by using heap_strdup* functions. --- dlls/wininet/dialogs.c | 8 +--- dlls/wininet/urlcache.c | 93 ++++++++++++++--------------------------------- 2 files changed, 30 insertions(+), 71 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1c46be7a76bbebb1cbac7…

1 0

Jacek Caban : wininet: Code clean up by using heap_strdup* functions.
by Alexandre Julliard July 20, 2009

July 20, 2009

Module: wine Branch: master Commit: 0055cfedc2a95893e6667b558a967134c0a83aa3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0055cfedc2a95893e6667b558… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jul 19 18:09:10 2009 +0200 wininet: Code clean up by using heap_strdup* functions. --- dlls/wininet/cookie.c | 98 ++++++++++++------------------------------------- 1 files changed, 24 insertions(+), 74 deletions(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index c9bcad0..30e0b99 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -95,17 +95,8 @@ static cookie *COOKIE_addCookie(cookie_domain *domain, LPCWSTR name, LPCWSTR dat newCookie->lpCookieName = NULL; newCookie->lpCookieData = NULL; newCookie->expiry = expiry; - - if (name) - { - newCookie->lpCookieName = HeapAlloc(GetProcessHeap(), 0, (strlenW(name) + 1)*sizeof(WCHAR)); - lstrcpyW(newCookie->lpCookieName, name); - } - if (data) - { - newCookie->lpCookieData = HeapAlloc(GetProcessHeap(), 0, (strlenW(data) + 1)*sizeof(WCHAR)); - lstrcpyW(newCookie->lpCookieData, data); - } + newCookie->lpCookieName = heap_strdupW(name); + newCookie->lpCookieData = heap_strdupW(data); TRACE("added cookie %p (data is %s)\n", newCookie, debugstr_w(data) ); @@ -160,17 +151,8 @@ static cookie_domain *COOKIE_addDomain(LPCWSTR domain, LPCWSTR path) list_init(&newDomain->cookie_list); newDomain->lpCookieDomain = NULL; newDomain->lpCookiePath = NULL; - - if (domain) - { - newDomain->lpCookieDomain = HeapAlloc(GetProcessHeap(), 0, (strlenW(domain) + 1)*sizeof(WCHAR)); - strcpyW(newDomain->lpCookieDomain, domain); - } - if (path) - { - newDomain->lpCookiePath = HeapAlloc(GetProcessHeap(), 0, (strlenW(path) + 1)*sizeof(WCHAR)); - lstrcpyW(newDomain->lpCookiePath, path); - } + newDomain->lpCookieDomain = heap_strdupW(domain); + newDomain->lpCookiePath = heap_strdupW(path); list_add_tail(&domain_list, &newDomain->entry); @@ -398,27 +380,16 @@ BOOL WINAPI InternetGetCookieA(LPCSTR lpszUrl, LPCSTR lpszCookieName, LPSTR lpCookieData, LPDWORD lpdwSize) { DWORD len; - LPWSTR szCookieData = NULL, szUrl = NULL, szCookieName = NULL; + LPWSTR szCookieData = NULL, url, name; BOOL r; TRACE("(%s,%s,%p)\n", debugstr_a(lpszUrl), debugstr_a(lpszCookieName), lpCookieData); - if( lpszUrl ) - { - len = MultiByteToWideChar( CP_ACP, 0, lpszUrl, -1, NULL, 0 ); - szUrl = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); - MultiByteToWideChar( CP_ACP, 0, lpszUrl, -1, szUrl, len ); - } - - if( lpszCookieName ) - { - len = MultiByteToWideChar( CP_ACP, 0, lpszCookieName, -1, NULL, 0 ); - szCookieName = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); - MultiByteToWideChar( CP_ACP, 0, lpszCookieName, -1, szCookieName, len ); - } + url = heap_strdupAtoW(lpszUrl); + name = heap_strdupAtoW(lpszCookieName); - r = InternetGetCookieW( szUrl, szCookieName, NULL, &len ); + r = InternetGetCookieW( url, name, NULL, &len ); if( r ) { szCookieData = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); @@ -428,7 +399,7 @@ BOOL WINAPI InternetGetCookieA(LPCSTR lpszUrl, LPCSTR lpszCookieName, } else { - r = InternetGetCookieW( szUrl, szCookieName, szCookieData, &len ); + r = InternetGetCookieW( url, name, szCookieData, &len ); *lpdwSize = WideCharToMultiByte( CP_ACP, 0, szCookieData, len, lpCookieData, *lpdwSize, NULL, NULL ); @@ -436,8 +407,8 @@ BOOL WINAPI InternetGetCookieA(LPCSTR lpszUrl, LPCSTR lpszCookieName, } HeapFree( GetProcessHeap(), 0, szCookieData ); - HeapFree( GetProcessHeap(), 0, szCookieName ); - HeapFree( GetProcessHeap(), 0, szUrl ); + HeapFree( GetProcessHeap(), 0, name ); + HeapFree( GetProcessHeap(), 0, url ); return r; } @@ -452,14 +423,13 @@ static BOOL set_cookie(LPCWSTR domain, LPCWSTR path, LPCWSTR cookie_name, LPCWST FILETIME expiry; BOOL expired = FALSE; - value = data = HeapAlloc(GetProcessHeap(), 0, (strlenW(cookie_data) + 1) * sizeof(WCHAR)); - if (data == NULL) + value = data = heap_strdupW(cookie_data); + if (!data) { ERR("could not allocate %zu bytes for the cookie data buffer\n", (strlenW(cookie_data) + 1) * sizeof(WCHAR)); return FALSE; } - strcpyW(data,cookie_data); memset(&expiry,0,sizeof(expiry)); /* lots of information can be parsed out of the cookie value */ @@ -605,21 +575,19 @@ BOOL WINAPI InternetSetCookieW(LPCWSTR lpszUrl, LPCWSTR lpszCookieName, if (!lpszCookieName) { - unsigned int len; WCHAR *cookie, *data; - len = strlenW(lpCookieData); - if (!(cookie = HeapAlloc(GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR)))) + cookie = heap_strdupW(lpCookieData); + if (!cookie) { SetLastError(ERROR_OUTOFMEMORY); return FALSE; } - strcpyW(cookie, lpCookieData); /* some apps (or is it us??) try to add a cookie with no cookie name, but * the cookie data in the form of name[=data]. */ - if (!(data = strchrW(cookie, '='))) data = cookie + len; + if (!(data = strchrW(cookie, '='))) data = cookie + strlenW(cookie); else *data++ = 0; ret = set_cookie(hostName, path, cookie, data); @@ -644,39 +612,21 @@ BOOL WINAPI InternetSetCookieW(LPCWSTR lpszUrl, LPCWSTR lpszCookieName, BOOL WINAPI InternetSetCookieA(LPCSTR lpszUrl, LPCSTR lpszCookieName, LPCSTR lpCookieData) { - DWORD len; - LPWSTR szCookieData = NULL, szUrl = NULL, szCookieName = NULL; + LPWSTR data, url, name; BOOL r; TRACE("(%s,%s,%s)\n", debugstr_a(lpszUrl), debugstr_a(lpszCookieName), debugstr_a(lpCookieData)); - if( lpszUrl ) - { - len = MultiByteToWideChar( CP_ACP, 0, lpszUrl, -1, NULL, 0 ); - szUrl = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); - MultiByteToWideChar( CP_ACP, 0, lpszUrl, -1, szUrl, len ); - } + url = heap_strdupAtoW(lpszUrl); + name = heap_strdupAtoW(lpszCookieName); + data = heap_strdupAtoW(lpCookieData); - if( lpszCookieName ) - { - len = MultiByteToWideChar( CP_ACP, 0, lpszCookieName, -1, NULL, 0 ); - szCookieName = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); - MultiByteToWideChar( CP_ACP, 0, lpszCookieName, -1, szCookieName, len ); - } + r = InternetSetCookieW( url, name, data ); - if( lpCookieData ) - { - len = MultiByteToWideChar( CP_ACP, 0, lpCookieData, -1, NULL, 0 ); - szCookieData = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); - MultiByteToWideChar( CP_ACP, 0, lpCookieData, -1, szCookieData, len ); - } - - r = InternetSetCookieW( szUrl, szCookieName, szCookieData ); - - HeapFree( GetProcessHeap(), 0, szCookieData ); - HeapFree( GetProcessHeap(), 0, szCookieName ); - HeapFree( GetProcessHeap(), 0, szUrl ); + HeapFree( GetProcessHeap(), 0, data ); + HeapFree( GetProcessHeap(), 0, name ); + HeapFree( GetProcessHeap(), 0, url ); return r; }

1 0

Marcus Meissner : ws2_32: Fixed buffer size to MultiByteToWideChar.
by Alexandre Julliard July 20, 2009

July 20, 2009

Module: wine Branch: master Commit: f8600c706d31864e543777583beb2a76f584c2f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8600c706d31864e543777583… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Jul 19 15:31:28 2009 +0200 ws2_32: Fixed buffer size to MultiByteToWideChar. --- dlls/ws2_32/socket.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 96be7ca..1492640 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -5007,7 +5007,7 @@ INT WINAPI WSAAddressToStringW( LPSOCKADDR sockaddr, DWORD len, LPDWORD lenstr ) { INT ret; - DWORD size, sizew; + DWORD size; WCHAR buffer[54]; /* 32 digits + 7':' + '[' + '%" + 5 digits + ']:' + 5 digits + '\0' */ CHAR bufAddr[54]; @@ -5018,8 +5018,7 @@ INT WINAPI WSAAddressToStringW( LPSOCKADDR sockaddr, DWORD len, if (ret) return ret; - sizew = sizeof( buffer ); - MultiByteToWideChar( CP_ACP, 0, bufAddr, size, buffer, sizew ); + MultiByteToWideChar( CP_ACP, 0, bufAddr, size, buffer, sizeof( buffer )/sizeof(WCHAR)); if (*lenstr < size) {

1 0

Erich Hoover : winealsa.drv: Re-allow fallback to waveout ( regression in dsound).
by Alexandre Julliard July 20, 2009

July 20, 2009

Module: wine Branch: master Commit: 0addd3ba5a7c1de970d1829f77969e5331ad2be0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0addd3ba5a7c1de970d1829f7… Author: Erich Hoover <ehoover(a)mines.edu> Date: Sat Jul 18 23:51:33 2009 -0600 winealsa.drv: Re-allow fallback to waveout (regression in dsound). --- dlls/winealsa.drv/dsoutput.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/winealsa.drv/dsoutput.c b/dlls/winealsa.drv/dsoutput.c index 9c6d7fd..dd95ad0 100644 --- a/dlls/winealsa.drv/dsoutput.c +++ b/dlls/winealsa.drv/dsoutput.c @@ -927,6 +927,13 @@ DWORD wodDsCreate(UINT wDevID, PIDSDRIVER* drv) TRACE("driver created\n"); + /* the HAL isn't much better than the HEL if we can't do mmap() */ + if (!(WOutDev[wDevID].outcaps.dwSupport & WAVECAPS_DIRECTSOUND)) + { + WARN("MMAP not supported for this device, falling back to waveout, should be harmless\n"); + return MMSYSERR_NOTSUPPORTED; + } + *idrv = HeapAlloc(GetProcessHeap(),0,sizeof(IDsDriverImpl)); if (!*idrv) return MMSYSERR_NOMEM;

1 0

Marcus Meissner : jscript: Initialize val_str to NULL (Coverity).
by Alexandre Julliard July 20, 2009

July 20, 2009

Module: wine Branch: master Commit: bd2b6bda6be96a9e438fc5c213c42b52724e4e88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd2b6bda6be96a9e438fc5c21… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Jul 18 22:45:32 2009 +0200 jscript: Initialize val_str to NULL (Coverity). --- dlls/jscript/string.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index cf3c5be..a0ca268 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -592,7 +592,7 @@ static HRESULT String_match(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAM DispatchEx *array; VARIANT var, *arg_var; DWORD length, match_cnt, i; - BSTR val_str; + BSTR val_str = NULL; HRESULT hres = S_OK; TRACE("\n");

1 0

Marcus Meissner : wmc: Duplicate wine_cp_wcstombs check here too (Coverity) .
by Alexandre Julliard July 20, 2009

July 20, 2009

Module: wine Branch: master Commit: 29bdb32592ffcff1500b6b14e714e5fc1ad7ec05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29bdb32592ffcff1500b6b14e… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Jul 18 22:23:45 2009 +0200 wmc: Duplicate wine_cp_wcstombs check here too (Coverity). --- tools/wmc/write.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/tools/wmc/write.c b/tools/wmc/write.c index 22858b8..7f9784f 100644 --- a/tools/wmc/write.c +++ b/tools/wmc/write.c @@ -396,8 +396,13 @@ static char *make_string(WCHAR *uc, int len, int codepage) else mlen = wine_utf8_wcstombs(0, uc, unistrlen(uc)+1, NULL, 0); cc = tmp = xmalloc(mlen); - if((i = wine_cp_wcstombs(cpdef, 0, uc, unistrlen(uc)+1, tmp, mlen, NULL, NULL)) < 0) - internal_error(__FILE__, __LINE__, "Buffer overflow? code %d\n", i); + if (cpdef) { + if((i = wine_cp_wcstombs(cpdef, 0, uc, unistrlen(uc)+1, tmp, mlen, NULL, NULL)) < 0) + internal_error(__FILE__, __LINE__, "Buffer overflow? code %d\n", i); + } else { + if((i = wine_utf8_wcstombs(0, uc, unistrlen(uc)+1, tmp, mlen)) < 0) + internal_error(__FILE__, __LINE__, "Buffer overflow? code %d\n", i); + } *cptr++ = ' '; *cptr++ = '"'; for(i = b = 0; i < len; i++, cc++)

1 0

Davide Pizzetti : clock: Updated Italian translation.
by Alexandre Julliard July 20, 2009

July 20, 2009

Module: wine Branch: master Commit: 0f6591af9dc5d9aafd207f944277ae0018ce3e31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f6591af9dc5d9aafd207f944… Author: Davide Pizzetti <erpizzo(a)alice.it> Date: Sat Jul 18 19:14:14 2009 +0200 clock: Updated Italian translation. --- programs/clock/It.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/clock/It.rc b/programs/clock/It.rc index 91970b3..8f59768 100644 --- a/programs/clock/It.rc +++ b/programs/clock/It.rc @@ -30,7 +30,7 @@ MAIN_MENU MENU MENUITEM "Ana&logico", IDM_ANALOG MENUITEM "Digi&tale", IDM_DIGITAL MENUITEM SEPARATOR - MENUITEM "&Font...", IDM_FONT + MENUITEM "&Carattere...", IDM_FONT MENUITEM SEPARATOR MENUITEM "&Nascondi la barra del titolo", IDM_NOTITLE MENUITEM SEPARATOR

1 0

Frédéric Delanoy : kernel32: Update French translation of error messages.
by Alexandre Julliard July 20, 2009

July 20, 2009

Module: wine Branch: master Commit: 010cbc028c092974305a530e859023646191f316 URL: http://source.winehq.org/git/wine.git/?a=commit;h=010cbc028c092974305a530e8… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Jul 17 14:43:11 2009 +0200 kernel32: Update French translation of error messages. --- dlls/kernel32/nls/winerr_fra.mc | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/nls/winerr_fra.mc b/dlls/kernel32/nls/winerr_fra.mc index c68146a..7b3e6b6 100644 --- a/dlls/kernel32/nls/winerr_fra.mc +++ b/dlls/kernel32/nls/winerr_fra.mc @@ -3730,3 +3730,8 @@ SymbolicName=RPC_S_GRP_ELT_NOT_REMOVED Language=FRA RPC_S_GRP_ELT_NOT_REMOVED . +MessageId=2221 +SymbolicName=NERR_UserNotFound +Language=FRA +Nom d'utilisateur introuvable +.

1 0

Dylan Smith : richedit: Properly restore style after end of rtf group.
by Alexandre Julliard July 20, 2009

July 20, 2009

Module: wine Branch: master Commit: c6cf5677065e9d7aaf6495e26120120d40e3a2a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6cf5677065e9d7aaf6495e26… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Fri Jul 17 13:24:13 2009 -0400 richedit: Properly restore style after end of rtf group. Rich text files have groupings of text, where styles are pushed onto the stack when encountering a start of the group, then popped at the end of the group. This was being handled improperly before, because a single styleChanged flag was being stored to keep track of whether the style needed to be restored at the end of a group. This fails to work properly since the single flag isn't keeping track of all the levels of the stack, so some styles are not restored properly. --- dlls/riched20/editor.c | 19 ++++++++----------- dlls/riched20/reader.c | 4 ++++ dlls/riched20/rtf.h | 2 +- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 14a7246..c3cd187 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1345,7 +1345,8 @@ static void ME_RTFReadHook(RTF_Info *info) { case rtfBeginGroup: if (info->stackTop < maxStack) { - info->stack[info->stackTop].fmt = info->style->fmt; + info->stack[info->stackTop].style = info->style; + ME_AddRefStyle(info->style); info->stack[info->stackTop].codePage = info->codePage; info->stack[info->stackTop].unicodeLength = info->unicodeLength; } @@ -1354,7 +1355,6 @@ static void ME_RTFReadHook(RTF_Info *info) break; case rtfEndGroup: { - ME_Style *s; RTFFlushOutputBuffer(info); info->stackTop--; if (info->stackTop<=0) { @@ -1362,15 +1362,12 @@ static void ME_RTFReadHook(RTF_Info *info) return; } assert(info->stackTop >= 0); - if (info->styleChanged) - { - /* FIXME too slow ? how come ? */ - s = ME_ApplyStyle(info->style, &info->stack[info->stackTop].fmt); - ME_ReleaseStyle(info->style); - info->style = s; - info->codePage = info->stack[info->stackTop].codePage; - info->unicodeLength = info->stack[info->stackTop].unicodeLength; - } + + ME_ReleaseStyle(info->style); + info->style = info->stack[info->stackTop].style; + ME_AddRefStyle(info->style); + info->codePage = info->stack[info->stackTop].codePage; + info->unicodeLength = info->stack[info->stackTop].unicodeLength; break; } } diff --git a/dlls/riched20/reader.c b/dlls/riched20/reader.c index 0462f71..a589a8e 100644 --- a/dlls/riched20/reader.c +++ b/dlls/riched20/reader.c @@ -442,7 +442,11 @@ static void RTFUngetToken(RTF_Info *info) * increment the value to compensate for it being decremented * twice due to the RTFUngetToken. */ if(RTFCheckCM (info, rtfGroup, rtfEndGroup)) + { + info->stack[info->stackTop].style = info->style; + ME_AddRefStyle(info->style); info->stackTop++; + } } diff --git a/dlls/riched20/rtf.h b/dlls/riched20/rtf.h index 3277301..d8ac323 100644 --- a/dlls/riched20/rtf.h +++ b/dlls/riched20/rtf.h @@ -1095,7 +1095,7 @@ typedef void (*RTFFuncPtr) (RTF_Info *); /* generic function pointer */ /* RTF parser stack element */ struct tagRTFState { - CHARFORMAT2W fmt; + ME_Style *style; int codePage; int unicodeLength; };

1 0

David Adam : d3dx9: Fix D3DXMatrixStack_RotateAxisLocal to make tests pass in Windows.
by Alexandre Julliard July 20, 2009

July 20, 2009

Module: wine Branch: master Commit: 94c7ab72f5cac262141923194d730df07c1d77e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94c7ab72f5cac262141923194… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Fri Jul 17 18:01:03 2009 +0200 d3dx9: Fix D3DXMatrixStack_RotateAxisLocal to make tests pass in Windows. --- dlls/d3dx9_36/math.c | 1 - dlls/d3dx9_36/tests/math.c | 3 --- 2 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index 925674a..c2193c8 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -946,7 +946,6 @@ static HRESULT WINAPI ID3DXMatrixStackImpl_RotateAxisLocal(ID3DXMatrixStack *ifa TRACE("iface %p\n", iface); - if (!pv) return D3DERR_INVALIDCALL; D3DXMatrixRotationAxis(&temp, pv, angle); D3DXMatrixMultiply(&This->stack[This->current], &temp, &This->stack[This->current]); diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 4c1a21d..610aa23 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -1519,9 +1519,6 @@ static void test_matrix_stack(void) ok(SUCCEEDED(hr), "Pop failed, hr %#x\n", hr); ok(D3DXMatrixIsIdentity(ID3DXMatrixStack_GetTop(stack)), "The top should be an identity matrix\n"); - hr = ID3DXMatrixStack_RotateAxisLocal(stack, NULL, 2.0f); - ok(hr == D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, got %#x\n", hr); - refcount = ID3DXMatrixStack_Release(stack); ok(!refcount, "Matrix stack has %u references left.\n", refcount); }

1 0

David Adam : d3dx9: Fix D3DXMatrixStack_RotateAxis to make tests pass in Windows.
by Alexandre Julliard July 20, 2009

July 20, 2009

Module: wine Branch: master Commit: 02758ea8f8071be16b16d9c79c16eb8e64e63005 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02758ea8f8071be16b16d9c79… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Fri Jul 17 17:58:36 2009 +0200 d3dx9: Fix D3DXMatrixStack_RotateAxis to make tests pass in Windows. --- dlls/d3dx9_36/math.c | 1 - dlls/d3dx9_36/tests/math.c | 3 --- 2 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index a4135da..925674a 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -933,7 +933,6 @@ static HRESULT WINAPI ID3DXMatrixStackImpl_RotateAxis(ID3DXMatrixStack *iface, C TRACE("iface %p\n", iface); - if (!pv) return D3DERR_INVALIDCALL; D3DXMatrixRotationAxis(&temp, pv, angle); D3DXMatrixMultiply(&This->stack[This->current], &This->stack[This->current], &temp); diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index bfeed05..4c1a21d 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -1519,9 +1519,6 @@ static void test_matrix_stack(void) ok(SUCCEEDED(hr), "Pop failed, hr %#x\n", hr); ok(D3DXMatrixIsIdentity(ID3DXMatrixStack_GetTop(stack)), "The top should be an identity matrix\n"); - hr = ID3DXMatrixStack_RotateAxis(stack, NULL, 2.0f); - ok(hr == D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, got %#x\n", hr); - hr = ID3DXMatrixStack_RotateAxisLocal(stack, NULL, 2.0f); ok(hr == D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, got %#x\n", hr);

1 0

David Adam : d3dx9: Fix D3DXMatrixStack_MultMatrixLocal to make tests pass in Windows.
by Alexandre Julliard July 20, 2009

July 20, 2009

Module: wine Branch: master Commit: 0729e91e2119d8b51d0e03e2c39597798acea277 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0729e91e2119d8b51d0e03e2c… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Fri Jul 17 17:56:30 2009 +0200 d3dx9: Fix D3DXMatrixStack_MultMatrixLocal to make tests pass in Windows. --- dlls/d3dx9_36/math.c | 1 - dlls/d3dx9_36/tests/math.c | 3 --- 2 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index c540b21..a4135da 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -866,7 +866,6 @@ static HRESULT WINAPI ID3DXMatrixStackImpl_MultMatrixLocal(ID3DXMatrixStack *ifa TRACE("iface %p\n", iface); - if (!pm) return D3DERR_INVALIDCALL; D3DXMatrixMultiply(&This->stack[This->current], pm, &This->stack[This->current]); return D3D_OK; diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index fa2f857..bfeed05 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -1519,9 +1519,6 @@ static void test_matrix_stack(void) ok(SUCCEEDED(hr), "Pop failed, hr %#x\n", hr); ok(D3DXMatrixIsIdentity(ID3DXMatrixStack_GetTop(stack)), "The top should be an identity matrix\n"); - hr = ID3DXMatrixStack_MultMatrixLocal(stack, NULL); - ok(hr == D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, got %#x\n", hr); - hr = ID3DXMatrixStack_RotateAxis(stack, NULL, 2.0f); ok(hr == D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, got %#x\n", hr);

1 0

David Adam : d3dx9: Fix D3DXMatrixStack_MultMatrix to make tests pass in Windows.
by Alexandre Julliard July 20, 2009

July 20, 2009

Module: wine Branch: master Commit: 3b6cbaeb038e59b9b7d7fc705bbb401c00d1ec7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b6cbaeb038e59b9b7d7fc705… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Fri Jul 17 17:54:22 2009 +0200 d3dx9: Fix D3DXMatrixStack_MultMatrix to make tests pass in Windows. --- dlls/d3dx9_36/math.c | 1 - dlls/d3dx9_36/tests/math.c | 3 --- 2 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index 941f205..c540b21 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -855,7 +855,6 @@ static HRESULT WINAPI ID3DXMatrixStackImpl_MultMatrix(ID3DXMatrixStack *iface, C TRACE("iface %p\n", iface); - if (!pm) return D3DERR_INVALIDCALL; D3DXMatrixMultiply(&This->stack[This->current], &This->stack[This->current], pm); return D3D_OK; diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 7b513da..fa2f857 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -1519,9 +1519,6 @@ static void test_matrix_stack(void) ok(SUCCEEDED(hr), "Pop failed, hr %#x\n", hr); ok(D3DXMatrixIsIdentity(ID3DXMatrixStack_GetTop(stack)), "The top should be an identity matrix\n"); - hr = ID3DXMatrixStack_MultMatrix(stack, NULL); - ok(hr == D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, got %#x\n", hr); - hr = ID3DXMatrixStack_MultMatrixLocal(stack, NULL); ok(hr == D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, got %#x\n", hr);

1 0

David Adam : d3dx9: Fix D3DXMatrixStack_LoadMatrix to make tests pass in Windows.
by Alexandre Julliard July 20, 2009

July 20, 2009

Module: wine Branch: master Commit: c88860a221b3d7aa7b2d8b72ea0b43acc5423d96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c88860a221b3d7aa7b2d8b72e… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Fri Jul 17 17:51:50 2009 +0200 d3dx9: Fix D3DXMatrixStack_LoadMatrix to make tests pass in Windows. --- dlls/d3dx9_36/math.c | 1 - dlls/d3dx9_36/tests/math.c | 3 --- 2 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index ff19369..941f205 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -844,7 +844,6 @@ static HRESULT WINAPI ID3DXMatrixStackImpl_LoadMatrix(ID3DXMatrixStack *iface, C TRACE("iface %p\n", iface); - if (!pm) return D3DERR_INVALIDCALL; This->stack[This->current] = *pm; return D3D_OK; diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index d2bdac0..7b513da 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -1483,9 +1483,6 @@ static void test_matrix_stack(void) hr = ID3DXMatrixStack_Push(stack); ok(SUCCEEDED(hr), "Push failed, hr %#x\n", hr); - hr = ID3DXMatrixStack_LoadMatrix(stack, NULL); - ok(hr == D3DERR_INVALIDCALL, "LoadMatrix returned %#x, expected D3DERR_INVALIDCALL\n", hr); - hr = ID3DXMatrixStack_LoadMatrix(stack, &mat1); ok(SUCCEEDED(hr), "LoadMatrix failed, hr %#x\n", hr); expect_mat(&mat1, ID3DXMatrixStack_GetTop(stack));

1 0

David Adam : d3dx9: Fix D3DXVec4Normalize to make tests pass in Windows.
by Alexandre Julliard July 20, 2009

July 20, 2009

Module: wine Branch: master Commit: 8823decbd4b1fdcc3285ac4a3817bbd3ded4d653 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8823decbd4b1fdcc3285ac4a3… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Fri Jul 17 18:19:45 2009 +0200 d3dx9: Fix D3DXVec4Normalize to make tests pass in Windows. --- dlls/d3dx9_36/math.c | 20 ++++++-------------- dlls/d3dx9_36/tests/math.c | 4 ---- 2 files changed, 6 insertions(+), 18 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index 1367884..ff19369 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -1725,20 +1725,12 @@ D3DXVECTOR4* WINAPI D3DXVec4Normalize(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 *pv) FLOAT norm; norm = D3DXVec4Length(pv); - if ( !norm ) - { - out.x = 0.0f; - out.y = 0.0f; - out.z = 0.0f; - out.w = 0.0f; - } - else - { - out.x = pv->x / norm; - out.y = pv->y / norm; - out.z = pv->z / norm; - out.w = pv->w / norm; - } + + out.x = pv->x / norm; + out.y = pv->y / norm; + out.z = pv->z / norm; + out.w = pv->w / norm; + *pout = out; return pout; } diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 4b764cf..d2bdac0 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -1419,10 +1419,6 @@ static void D3DXVector4Test(void) expectedvec.x = 1.0f/11.0f; expectedvec.y = 2.0f/11.0f; expectedvec.z = 4.0f/11.0f; expectedvec.w = 10.0f/11.0f; D3DXVec4Normalize(&gotvec,&u); expect_vec4(expectedvec,gotvec); - /* Test the nul vector */ - expectedvec.x = 0.0f; expectedvec.y = 0.0f; expectedvec.z = 0.0f; expectedvec.w = 0.0f; - D3DXVec4Normalize(&gotvec,&nul); - expect_vec4(expectedvec,gotvec); /*_______________D3DXVec4Scale____________________________*/ expectedvec.x = -6.5f; expectedvec.y = -13.0f; expectedvec.z = -26.0f; expectedvec.w = -65.0f;

1 0

David Adam : d3dx9: Fix D3DXVec3TransformCoord to make tests pass in Windows.
by Alexandre Julliard July 20, 2009

July 20, 2009

Module: wine Branch: master Commit: 878bcb519c4b87a4c751effd60135f965e1648e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=878bcb519c4b87a4c751effd6… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Fri Jul 17 18:18:32 2009 +0200 d3dx9: Fix D3DXVec3TransformCoord to make tests pass in Windows. --- dlls/d3dx9_36/math.c | 18 +++++------------- dlls/d3dx9_36/tests/math.c | 7 +------ 2 files changed, 6 insertions(+), 19 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index 31078e5..1367884 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -1598,20 +1598,12 @@ D3DXVECTOR3* WINAPI D3DXVec3TransformCoord(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 norm = pm->u.m[0][3] * pv->x + pm->u.m[1][3] * pv->y + pm->u.m[2][3] *pv->z + pm->u.m[3][3]; - if ( norm ) - { - CONST D3DXVECTOR3 v = *pv; - out.x = (pm->u.m[0][0] * v.x + pm->u.m[1][0] * v.y + pm->u.m[2][0] * v.z + pm->u.m[3][0]) / norm; - out.y = (pm->u.m[0][1] * v.x + pm->u.m[1][1] * v.y + pm->u.m[2][1] * v.z + pm->u.m[3][1]) / norm; - out.z = (pm->u.m[0][2] * v.x + pm->u.m[1][2] * v.y + pm->u.m[2][2] * v.z + pm->u.m[3][2]) / norm; - } - else - { - out.x = 0.0f; - out.y = 0.0f; - out.z = 0.0f; - } + out.x = (pm->u.m[0][0] * pv->x + pm->u.m[1][0] * pv->y + pm->u.m[2][0] * pv->z + pm->u.m[3][0]) / norm; + out.y = (pm->u.m[0][1] * pv->x + pm->u.m[1][1] * pv->y + pm->u.m[2][1] * pv->z + pm->u.m[3][1]) / norm; + out.z = (pm->u.m[0][2] * pv->x + pm->u.m[1][2] * pv->y + pm->u.m[2][2] * pv->z + pm->u.m[3][2]) / norm; + *pout = out; + return pout; } diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 8879e1c..4b764cf 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -1115,7 +1115,7 @@ static void D3DXVector2Test(void) static void D3DXVector3Test(void) { D3DVIEWPORT9 viewport; - D3DXVECTOR3 expectedvec, gotvec, nul, nulproj, u, v, w, x; + D3DXVECTOR3 expectedvec, gotvec, nul, u, v, w, x; LPD3DXVECTOR3 funcpointer; D3DXVECTOR4 expectedtrans, gottrans; D3DXMATRIX mat, projection, view, world; @@ -1290,11 +1290,6 @@ static void D3DXVector3Test(void) expectedvec.x = 70.0f/124.0f; expectedvec.y = 88.0f/124.0f; expectedvec.z = 106.0f/124.0f; D3DXVec3TransformCoord(&gotvec,&u,&mat); expect_vec3(expectedvec,gotvec); - /* Test the nul projected vector */ - nulproj.x = 1.0f; nulproj.y = -1.0f, nulproj.z = -1.0f; - expectedvec.x = 0.0f; expectedvec.y = 0.0f; expectedvec.z = 0.0f; - D3DXVec3TransformCoord(&gotvec,&nulproj,&mat); - expect_vec3(expectedvec,gotvec); /*_______________D3DXVec3TransformNormal______________________*/ expectedvec.x = 57.0f; expectedvec.y = 74.0f; expectedvec.z = 91.0f;

1 0

David Adam : d3dx9: Fix D3DXVec2TransformCoord to make tests pass in Windows.
by Alexandre Julliard July 20, 2009

July 20, 2009

Module: wine Branch: master Commit: e37aff31b460fde0219a75d5057f8db91fd2e0a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e37aff31b460fde0219a75d50… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Fri Jul 17 18:14:32 2009 +0200 d3dx9: Fix D3DXVec2TransformCoord to make tests pass in Windows. --- dlls/d3dx9_36/math.c | 17 ++++++----------- dlls/d3dx9_36/tests/math.c | 7 +------ 2 files changed, 7 insertions(+), 17 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index 30f7ec9..31078e5 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -1440,20 +1440,15 @@ D3DXVECTOR4* WINAPI D3DXVec2TransformArray(D3DXVECTOR4* out, UINT outstride, CON D3DXVECTOR2* WINAPI D3DXVec2TransformCoord(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv, CONST D3DXMATRIX *pm) { + D3DXVECTOR2 v; FLOAT norm; + v = *pv; norm = pm->u.m[0][3] * pv->x + pm->u.m[1][3] * pv->y + pm->u.m[3][3]; - if ( norm ) - { - CONST D3DXVECTOR2 v = *pv; - pout->x = (pm->u.m[0][0] * v.x + pm->u.m[1][0] * v.y + pm->u.m[3][0]) / norm; - pout->y = (pm->u.m[0][1] * v.x + pm->u.m[1][1] * v.y + pm->u.m[3][1]) / norm; - } - else - { - pout->x = 0.0f; - pout->y = 0.0f; - } + + pout->x = (pm->u.m[0][0] * v.x + pm->u.m[1][0] * v.y + pm->u.m[3][0]) / norm; + pout->y = (pm->u.m[0][1] * v.x + pm->u.m[1][1] * v.y + pm->u.m[3][1]) / norm; + return pout; } diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 6e9f25d..8879e1c 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -950,7 +950,7 @@ static void D3DXQuaternionTest(void) static void D3DXVector2Test(void) { - D3DXVECTOR2 expectedvec, gotvec, nul, nulproj, u, v, w, x; + D3DXVECTOR2 expectedvec, gotvec, nul, u, v, w, x; LPD3DXVECTOR2 funcpointer; D3DXVECTOR4 expectedtrans, gottrans; D3DXMATRIX mat; @@ -1105,11 +1105,6 @@ static void D3DXVector2Test(void) expectedvec.x = 0.6f; expectedvec.y = 11.0f/15.0f; D3DXVec2TransformCoord(&gotvec,&u,&mat); expect_vec(expectedvec,gotvec); - /* Test the nul projected vector */ - nulproj.x = -2.0f; nulproj.y = -1.0f; - expectedvec.x = 0.0f; expectedvec.y = 0.0f; - D3DXVec2TransformCoord(&gotvec,&nulproj,&mat); - expect_vec(expectedvec,gotvec); /*_______________D3DXVec2TransformNormal______________________*/ expectedvec.x = 23.0f; expectedvec.y = 30.0f;

1 0

Vincent Povirk : mapi32: Add version numbers to version resource.
by Alexandre Julliard July 20, 2009

July 20, 2009

Module: wine Branch: master Commit: eff5de1231560c13055c03f1f1f95fa396a2f286 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eff5de1231560c13055c03f1f… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Jul 17 10:40:07 2009 -0500 mapi32: Add version numbers to version resource. --- dlls/mapi32/version.rc | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/mapi32/version.rc b/dlls/mapi32/version.rc index 0f95516..d3a620b 100644 --- a/dlls/mapi32/version.rc +++ b/dlls/mapi32/version.rc @@ -18,5 +18,9 @@ #define WINE_FILEDESCRIPTION_STR "Wine Messaging API" #define WINE_FILENAME_STR "mapi32.dll" +#define WINE_FILEVERSION 1,0,0,0 +#define WINE_FILEVERSION_STR "1.0.0.0" +#define WINE_PRODUCTVERSION 1,0,0,0 +#define WINE_PRODUCTVERSION_STR "1.0.0.0" #include "wine/wine_common_ver.rc"

1 0

Ricardo Filipe : winhlp32: Update Portuguese translation and convert to UTF8.
by Alexandre Julliard July 20, 2009

July 20, 2009

Module: wine Branch: master Commit: f0f54890e3b33176edbc3b4e2bfe301d4586b5f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0f54890e3b33176edbc3b4e2… Author: Ricardo Filipe <ricardojdfilipe(a)gmail.com> Date: Thu Jul 16 12:22:18 2009 -0700 winhlp32: Update Portuguese translation and convert to UTF8. --- programs/winhlp32/Pt.rc | 92 ++++++++++++++++++++++++++++++++++------------- 1 files changed, 67 insertions(+), 25 deletions(-) diff --git a/programs/winhlp32/Pt.rc b/programs/winhlp32/Pt.rc index 9a12e58..28933a2 100644 --- a/programs/winhlp32/Pt.rc +++ b/programs/winhlp32/Pt.rc @@ -6,7 +6,8 @@ * Portuguese translation by Gustavo Junior Alves <alves(a)correionet.com.br> * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> * Copyright 2003 Marcelo Duarte - * Copyright 2004,2007 Am�rico Jos� Melo + * Copyright 2004,2007 Américo José Melo + * Copyright 2009 Ricardo Filipe * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -25,6 +26,8 @@ #include "winhelp_res.h" +#pragma code_page(65001) + /* Menu */ LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN @@ -65,9 +68,9 @@ MAIN_MENU MENU } POPUP "Aj&uda" { MENUITEM "Ajuda &na ajuda", MNID_HELP_HELPON - MENUITEM "Sempre &vis�vel", MNID_HELP_HELPTOP + MENUITEM "Sempre &visível", MNID_HELP_HELPTOP MENUITEM SEPARATOR - MENUITEM "&Informa��es...", MNID_HELP_ABOUT + MENUITEM "&Informações...", MNID_HELP_ABOUT #ifdef WINELIB MENUITEM "&Sobre WINE", MNID_HELP_WINE #endif @@ -94,33 +97,49 @@ MAIN_MENU MENU POPUP "In&dicador" { MENUITEM "&Definir...", MNID_BKMK_DEFINE } - POPUP "&Options" { - POPUP "Help always visible" + POPUP "&Opções" { + POPUP "Ajuda sempre visível" BEGIN - MENUITEM "Default", MNID_OPTS_HELP_DEFAULT - MENUITEM "Visible", MNID_OPTS_HELP_VISIBLE - MENUITEM "Non visible", MNID_OPTS_HELP_NONVISIBLE + MENUITEM "Omissão", MNID_OPTS_HELP_DEFAULT + MENUITEM "Visível", MNID_OPTS_HELP_VISIBLE + MENUITEM "Invisível", MNID_OPTS_HELP_NONVISIBLE END - MENUITEM "History", MNID_OPTS_HISTORY - POPUP "Fonts" + MENUITEM "Histórico", MNID_OPTS_HISTORY + POPUP "Tipos de Letra" BEGIN - MENUITEM "Small", MNID_OPTS_FONTS_SMALL + MENUITEM "Pequeno", MNID_OPTS_FONTS_SMALL MENUITEM "Normal", MNID_OPTS_FONTS_NORMAL - MENUITEM "Large", MNID_OPTS_FONTS_LARGE + MENUITEM "Grande", MNID_OPTS_FONTS_LARGE END - MENUITEM "Use system colors", MNID_OPTS_SYSTEM_COLORS + MENUITEM "Usar cores do sistema", MNID_OPTS_SYSTEM_COLORS } POPUP "Aj&uda" { MENUITEM "Ajuda &na ajuda", MNID_HELP_HELPON - MENUITEM "Sempre &vis�vel", MNID_HELP_HELPTOP + MENUITEM "Sempre &visível", MNID_HELP_HELPTOP MENUITEM SEPARATOR - MENUITEM "&Informa��es...", MNID_HELP_ABOUT + MENUITEM "&Informações...", MNID_HELP_ABOUT #ifdef WINELIB MENUITEM "&Acerca do WINE", MNID_HELP_WINE #endif } } +IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Índice" +{ + LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER +} + +IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Procura" +{ + LTEXT "Ainda não implementado", -1, 10, 10, 180, 150 +} + /* Strings */ LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN @@ -130,10 +149,10 @@ STRINGTABLE DISCARDABLE STID_WINE_HELP, "Ajuda WINE" STID_WHERROR, "ERRO" STID_WARNING, "AVISO" -STID_INFO, "Informa��o" -STID_NOT_IMPLEMENTED, "N�o implementado" +STID_INFO, "Informação" +STID_NOT_IMPLEMENTED, "Não implementado" STID_HLPFILE_ERROR_s, "Erro encontrado na leitura do arquivo de ajuda '%s'" -STID_INDEX, "&Conte�do" +STID_INDEX, "&Conteúdo" STID_CONTENTS, "Summary" STID_BACK, "&Voltar" STID_ALL_FILES, "Todos os arquivos (*.*)" @@ -150,15 +169,38 @@ STRINGTABLE DISCARDABLE STID_WINE_HELP, "Ajuda WINE" STID_WHERROR, "ERRO" STID_WARNING, "AVISO" -STID_INFO, "Informa��o" -STID_NOT_IMPLEMENTED, "N�o implementado" +STID_INFO, "Informação" +STID_NOT_IMPLEMENTED, "Não implementado" STID_HLPFILE_ERROR_s, "Erro encontrado na leitura do ficheiro de ajuda '%s'" -STID_INDEX, "&Conte�do" -STID_CONTENTS, "Summary" +STID_INDEX, "&Conteúdo" +STID_CONTENTS, "Sumário" STID_BACK, "&Voltar" STID_ALL_FILES, "Todos os ficheiros (*.*)" STID_HELP_FILES_HLP, "Ficheiros de ajuda (*.hlp)" -STID_FILE_NOT_FOUND_s "N�o � poss�vel encontrar '%s'. Deseja procurar este ficheiro voc� mesmo?" -STID_NO_RICHEDIT "Cannot find a richedit implementation... Aborting" -STID_PSH_INDEX, "Help topics: " +STID_FILE_NOT_FOUND_s "Não é possível encontrar '%s'. Deseja procurar este ficheiro você mesmo?" +STID_NO_RICHEDIT "Não foi possível encontrar uma implementação do richedit... A abortar" +STID_PSH_INDEX, "Tópicos de ajuda: " } + +CONTEXT_MENU MENU LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE +BEGIN + POPUP "" + BEGIN + MENUITEM "Anotação...", MNID_CTXT_ANNOTATE + MENUITEM "Copiar", MNID_CTXT_COPY + MENUITEM "Imprimir...", MNID_CTXT_PRINT + POPUP "Tipos de letra" + BEGIN + MENUITEM "Pequeno", MNID_CTXT_FONTS_SMALL + MENUITEM "Normal", MNID_CTXT_FONTS_NORMAL + MENUITEM "Grande", MNID_CTXT_FONTS_LARGE + END + POPUP "Ajuda sempre visível" + BEGIN + MENUITEM "Omissão", MNID_CTXT_HELP_DEFAULT + MENUITEM "Visível", MNID_CTXT_HELP_VISIBLE + MENUITEM "Invisível", MNID_CTXT_HELP_NONVISIBLE + END + MENUITEM "Usar cores do sistema", MNID_CTXT_SYSTEM_COLORS + END +END

1 0

Ricardo Filipe : winedbg: Add Portuguese translation.
by Alexandre Julliard July 20, 2009

July 20, 2009

Module: wine Branch: master Commit: 1156221c3f255216e477c8f5098bc512cc0f7f2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1156221c3f255216e477c8f50… Author: Ricardo Filipe <ricardojdfilipe(a)gmail.com> Date: Fri Jul 17 06:57:49 2009 -0700 winedbg: Add Portuguese translation. --- programs/winedbg/Makefile.in | 1 + programs/winedbg/rsrc_Pt.rc | 57 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 0 deletions(-) diff --git a/programs/winedbg/Makefile.in b/programs/winedbg/Makefile.in index fa13abf..f23298c 100644 --- a/programs/winedbg/Makefile.in +++ b/programs/winedbg/Makefile.in @@ -37,6 +37,7 @@ RC_SRCS = \ rsrc_Ko.rc \ rsrc_Lt.rc \ rsrc_Nl.rc \ + rsrc_Pt.rc \ rsrc_Ru.rc \ rsrc_Sv.rc diff --git a/programs/winedbg/rsrc_Pt.rc b/programs/winedbg/rsrc_Pt.rc new file mode 100644 index 0000000..c00c3c1 --- /dev/null +++ b/programs/winedbg/rsrc_Pt.rc @@ -0,0 +1,57 @@ +/* + * Portuguese Language Support + * + * Copyright 2009 Ricardo Filipe + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "resource.h" + +#pragma code_page(65001) + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE + +IDM_DEBUG_POPUP MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Depuração", ID_DEBUG + END +END + +IDD_CRASH_DLG DIALOGEX 100, 100, 273, 175 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Erro no programa" +FONT 8, "Tahoma" +BEGIN + LTEXT "",IDC_STATIC_BG,0,0,273,52,WS_BORDER,0 + LTEXT "O programa %s encontrou um problema sério e precisa \ + ser encerrado. Pedimos desculpa pelo incómodo.", + IDC_STATIC_TXT1,27,10,224,30 + LTEXT "Isto pode ter sido causado por um problema no programa ou no Wine. \ + Pode querer visitar http://appdb.winehq.org para dicas de como correr \ + esta aplicação.\n\n\ + Se este problema não existe no Windows e não foi reportado ainda \ + você pode fazê-lo em http://bugs.winehq.org.",IDC_STATIC_TXT2,27,60,224,100 + DEFPUSHBUTTON "Fechar", IDOK, 205, 151, 60, 16, WS_TABSTOP +END + +STRINGTABLE +BEGIN + IDS_AUTO_CAPTION "Erro num programa no Wine" + IDS_INVALID_PARAMS "Erros Internos - recebidos parâmetros inválidos" + IDS_UNIDENTIFIED "(não identificado)" +END

1 0

Ricardo Filipe : oleacc: Add Portuguese translation.
by Alexandre Julliard July 20, 2009

July 20, 2009

Module: wine Branch: master Commit: f7dbd0aa7e2effcaa59e6da7b04f5de98a964cea URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7dbd0aa7e2effcaa59e6da7b… Author: Ricardo Filipe <ricardojdfilipe(a)gmail.com> Date: Fri Jul 17 06:49:07 2009 -0700 oleacc: Add Portuguese translation. --- dlls/oleacc/Makefile.in | 3 +- dlls/oleacc/oleacc_Pt.rc | 94 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 96 insertions(+), 1 deletions(-) diff --git a/dlls/oleacc/Makefile.in b/dlls/oleacc/Makefile.in index 3a2b0b7..1f961fa 100644 --- a/dlls/oleacc/Makefile.in +++ b/dlls/oleacc/Makefile.in @@ -16,7 +16,8 @@ RC_SRCS = \ oleacc_Ko.rc \ oleacc_Lt.rc \ oleacc_Nl.rc \ - oleacc_Pl.rc + oleacc_Pl.rc \ + oleacc_Pt.rc @MAKE_DLL_RULES@ diff --git a/dlls/oleacc/oleacc_Pt.rc b/dlls/oleacc/oleacc_Pt.rc new file mode 100644 index 0000000..395324a --- /dev/null +++ b/dlls/oleacc/oleacc_Pt.rc @@ -0,0 +1,94 @@ +/* + * Portuguese resources for oleacc + * + * Copyright 2009 Ricardo Filipe + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "oleacc.h" + +#pragma code_page(65001) + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE + +STRINGTABLE DISCARDABLE +{ + 0 "objecto desconhecido" /* undocumented */ + ROLE_SYSTEM_TITLEBAR "barra de título" + ROLE_SYSTEM_MENUBAR "barra de menu" + ROLE_SYSTEM_SCROLLBAR "barra de scroll" + ROLE_SYSTEM_GRIP "grip" + ROLE_SYSTEM_SOUND "som" + ROLE_SYSTEM_CURSOR "cursor" + ROLE_SYSTEM_CARET "caret" + ROLE_SYSTEM_ALERT "alerta" + ROLE_SYSTEM_WINDOW "janela" + ROLE_SYSTEM_CLIENT "cliente" + ROLE_SYSTEM_MENUPOPUP "popup menu" + ROLE_SYSTEM_MENUITEM "item do menu" + ROLE_SYSTEM_TOOLTIP "dica" + ROLE_SYSTEM_APPLICATION "aplicação" + ROLE_SYSTEM_DOCUMENT "documento" + ROLE_SYSTEM_PANE "painel" + ROLE_SYSTEM_CHART "gráfico" + ROLE_SYSTEM_DIALOG "diálogo" + ROLE_SYSTEM_BORDER "margem" + ROLE_SYSTEM_GROUPING "agrupamento" + ROLE_SYSTEM_SEPARATOR "separador" + ROLE_SYSTEM_TOOLBAR "barra de ferramentas" + ROLE_SYSTEM_STATUSBAR "barra de estado" + ROLE_SYSTEM_TABLE "tabela" + ROLE_SYSTEM_COLUMNHEADER "cabeçalho da coluna" + ROLE_SYSTEM_ROWHEADER "cabeçalho da linha" + ROLE_SYSTEM_COLUMN "coluna" + ROLE_SYSTEM_ROW "linha" + ROLE_SYSTEM_CELL "célula" + ROLE_SYSTEM_LINK "ligação" + ROLE_SYSTEM_HELPBALLOON "balão de ajuda" + ROLE_SYSTEM_CHARACTER "caracter" + ROLE_SYSTEM_LIST "lista" + ROLE_SYSTEM_LISTITEM "item da lista" + ROLE_SYSTEM_OUTLINE "delinear" + ROLE_SYSTEM_OUTLINEITEM "item delinear" + ROLE_SYSTEM_PAGETAB "tab de página" + ROLE_SYSTEM_PROPERTYPAGE "página de propriedades" + ROLE_SYSTEM_INDICATOR "indicador" + ROLE_SYSTEM_GRAPHIC "gráfico" + ROLE_SYSTEM_STATICTEXT "texto estático" + ROLE_SYSTEM_TEXT "texto" + ROLE_SYSTEM_PUSHBUTTON "push button" + ROLE_SYSTEM_CHECKBUTTON "check button" + ROLE_SYSTEM_RADIOBUTTON "radio button" + ROLE_SYSTEM_COMBOBOX "combo box" + ROLE_SYSTEM_DROPLIST "drop down" + ROLE_SYSTEM_PROGRESSBAR "barra de progresso" + ROLE_SYSTEM_DIAL "dial" + ROLE_SYSTEM_HOTKEYFIELD "hot key field" + ROLE_SYSTEM_SLIDER "slider" + ROLE_SYSTEM_SPINBUTTON "spin box" + ROLE_SYSTEM_DIAGRAM "diagrama" + ROLE_SYSTEM_ANIMATION "animação" + ROLE_SYSTEM_EQUATION "equação" + ROLE_SYSTEM_BUTTONDROPDOWN "drop down button" + ROLE_SYSTEM_BUTTONMENU "menu button" + ROLE_SYSTEM_BUTTONDROPDOWNGRID "grid drop down button" + ROLE_SYSTEM_WHITESPACE "espaço em branco" + ROLE_SYSTEM_PAGETABLIST "page tab list" + ROLE_SYSTEM_CLOCK "relógio" + ROLE_SYSTEM_SPLITBUTTON "split button" + ROLE_SYSTEM_IPADDRESS "endereço IP" + ROLE_SYSTEM_OUTLINEBUTTON "outline button" +}

1 0

Alexander Nicolaysen Sørnes : Implement objectMakeUrl() for app/version queue classes
by Alexander Nicolaysen Sørnes July 19, 2009

July 19, 2009

Module: appdb Branch: master Commit: f4f2ce234b9464e57fbd78b6241e6f67ca91654f URL: http://source.winehq.org/git/appdb.git/?a=commit;h=f4f2ce234b9464e57fbd78b6… Author: Alexander Nicolaysen Sørnes <alexander(a)linux-xqqm.site> Date: Sat Jul 18 23:00:10 2009 +0200 Implement objectMakeUrl() for app/version queue classes --- include/application_queue.php | 2 +- include/version_queue.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/application_queue.php b/include/application_queue.php index 7bf1d1b..a3de51b 100644 --- a/include/application_queue.php +++ b/include/application_queue.php @@ -383,7 +383,7 @@ class application_queue function objectMakeUrl() { - return TRUE; + return $this->oApp->objectMakeUrl(); } function objectMakeLink() diff --git a/include/version_queue.php b/include/version_queue.php index ab12c5e..6dd5fe5 100644 --- a/include/version_queue.php +++ b/include/version_queue.php @@ -280,7 +280,7 @@ class version_queue function objectMakeUrl() { - return TRUE; + return $this->oVersion->objectMakeUrl(); } function objectMakeLink()

1 0

Maik Schulz : Website: german translation of Jeremy's devel.template update
by Maik Schulz July 17, 2009

July 17, 2009

Module: website Branch: master Commit: 292b18fe60037f2047598094e75d3c2f1f2fdc95 URL: http://source.winehq.org/git/website.git/?a=commit;h=292b18fe60037f20475980… Author: Maik Schulz <maik.schulz(a)gmail.com> Date: Sat Jul 18 01:02:00 2009 +0200 Website: german translation of Jeremy's devel.template update --- templates/de/devel.template | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git a/templates/de/devel.template b/templates/de/devel.template index 4957064..096ba13 100644 --- a/templates/de/devel.template +++ b/templates/de/devel.template @@ -18,9 +18,19 @@ Hilfsmittel, die wir unseren Entwicklern zur Verfügung stellen. <a href="http://wiki.winehq.org/Developers">Wine Wiki Entwicklerdokumentation (en)</a> </td> <td valign="top"> - Die Wine Wiki Entwicklerseiten haben normalerweise aktuellere Informationen als diese Seite. - Eine tolle Aufgabe für Freiwillige wäre es, diese Seite abzuspecken und hauptsächlich - auf die Wiki-Seiten zu verlinken. + Die <a href="http://wiki.winehq.org/Developers">Wine Wiki Developer</a>-Seiten werden aktuellere + Informationen haben, als diese Seite. Sie sollten das Erste sein, was sich neue Entwickler ansehen. + </td> + </tr> + + <tr bgcolor="#ffffff"> + <td> + <a href="http://www.codeweavers.com/about/general/jobs/interns/">Praktika</a> + </td> + <td valign="top"> + Ab Herbst 2009 wird CodeWeavers jedes Quartal 1-2 Praktikumstellen im Wine-Entwicklungsbereich für + qualifizierende Studenten anbieten. Wir nehmen Bewerbungen für diese Stellen zu jedem Zeitpunkt + entgegen. Studenten sind gleichermaßen aus den USA wie auch aus Übersee willkommen. </td> </tr>

1 0

Maik Schulz : Website: german translation for 1.1.26 release news item
by Maik Schulz July 17, 2009

July 17, 2009

Module: website Branch: master Commit: 51119dfaad6d68dd9c202aad99cb06372af1b839 URL: http://source.winehq.org/git/website.git/?a=commit;h=51119dfaad6d68dd9c202a… Author: Maik Schulz <maik.schulz(a)gmail.com> Date: Sat Jul 18 00:48:25 2009 +0200 Website: german translation for 1.1.26 release news item --- news/de/2009071701.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/de/2009071701.xml b/news/de/2009071701.xml new file mode 100644 index 0000000..7e7454d --- /dev/null +++ b/news/de/2009071701.xml @@ -0,0 +1,16 @@ +<news> +<date>17. Juli 2009</date> +<title>Wine 1.1.26 Freigegeben</title> +<body> + Die Entwicklungsversion 1.1.26 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.1.26">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Noch mehr Übersetzungsaktualisierungen.</li> + <li>Schnelleres Strecken von Bitmaps via XRender.</li> + <li>Unterstützung von Proxies in WinHTTP.</li> + <li>Viele neue JScript-Funktionen.</li> + <li>Verschiedenste Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.1.26.tar.bz2">verfügbar</a>. +Binär-Downloads werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Download-Seiten</a> zur Verfügung. +</body></news>

1 0

Alexandre Julliard : Wine release 1.1.26
by Alexandre Julliard July 17, 2009

July 17, 2009

Module: website Branch: master Commit: 5262edd27a7dfe1a3effbe034442cc015b38b0f0 URL: http://source.winehq.org/git/website.git/?a=commit;h=5262edd27a7dfe1a3effbe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 17 18:46:54 2009 +0200 Wine release 1.1.26 --- news/en/2009071701.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/en/2009071701.xml b/news/en/2009071701.xml new file mode 100644 index 0000000..66f607d --- /dev/null +++ b/news/en/2009071701.xml @@ -0,0 +1,16 @@ +<news> +<date>July 17, 2009</date> +<title>Wine 1.1.26 Released</title> +<body> + The Wine development release 1.1.26 is now available. + <a href="{$root}/announce/1.1.26">What's new</a> in this release: +<ul> + <li>Still more translation updates.</li> + <li>Faster bitmap stretching using XRender.</li> + <li>Proxy support in WinHTTP.</li> + <li>Many more JScript functions.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.1.26.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-1.1.26 : Alexandre Julliard : Release 1.1.26
by Alexandre Julliard July 17, 2009

July 17, 2009

Module: wine Branch: refs/tags/wine-1.1.26 Tag: 2f8fea5c7eea11e6600aef93399d874236afa5d8 URL: http://source.winehq.org/git/wine.git/?a=tag;h=2f8fea5c7eea11e6600aef93399d… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 17 18:38:58 2009 +0200 Release 1.1.26

1 0

Alexandre Julliard : Release 1.1.26.
by Alexandre Julliard July 17, 2009

July 17, 2009

Module: wine Branch: master Commit: 578aeb87b59b04a85db6e8e545a6065cfab8a79b URL: http://source.winehq.org/git/wine.git/?a=commit;h=578aeb87b59b04a85db6e8e54… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 17 18:38:57 2009 +0200 Release 1.1.26. --- ANNOUNCE | 1441 +++++++++++++++++++++++++++++-------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 688 insertions(+), 773 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=578aeb87b59b04a85db6e…

1 0

Alexandre Julliard : Updated the authors list.
by Alexandre Julliard July 17, 2009

July 17, 2009

Module: wine Branch: master Commit: 09a3e0e7d4337298a7444d67d1f148ed6661e7c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09a3e0e7d4337298a7444d67d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 17 17:18:59 2009 +0200 Updated the authors list. --- AUTHORS | 98 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 97 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=09a3e0e7d4337298a7444…

1 0

Alexander Nicolaysen Sørnes : Implement objectMakeUrl() for the app/version queue classes
by Alexander Nicolaysen Sørnes July 17, 2009

July 17, 2009

Module: appdb Branch: master Commit: b89bd8988917b3040df2e2ba582fad0b477cf7ab URL: http://source.winehq.org/git/appdb.git/?a=commit;h=b89bd8988917b3040df2e2ba… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Fri Jul 17 16:50:49 2009 +0200 Implement objectMakeUrl() for the app/version queue classes --- include/application_queue.php | 2 +- include/version_queue.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/application_queue.php b/include/application_queue.php index 5710cba..7bf1d1b 100644 --- a/include/application_queue.php +++ b/include/application_queue.php @@ -388,7 +388,7 @@ class application_queue function objectMakeLink() { - return TRUE; + return $this->oApp->objectMakeLink(); } function objectGetItemsPerPage($sState = 'accepted') diff --git a/include/version_queue.php b/include/version_queue.php index e2bba12..ab12c5e 100644 --- a/include/version_queue.php +++ b/include/version_queue.php @@ -285,7 +285,7 @@ class version_queue function objectMakeLink() { - return TRUE; + return $this->oVersion->objectMakeLink(); } function displayMoveTestTable()

1 0

Paul Vriens : transl: Remove an unused parameter.
by Alexandre Julliard July 17, 2009

July 17, 2009

Module: tools Branch: master Commit: 03ae75ffd460c79da50cdd20efcf6c03f69ee252 URL: http://source.winehq.org/git/tools.git/?a=commit;h=03ae75ffd460c79da50cdd20… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Jul 17 12:14:41 2009 +0200 transl: Remove an unused parameter. --- transl/scripts/checkmakefile.pl | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/transl/scripts/checkmakefile.pl b/transl/scripts/checkmakefile.pl index c0294fd..ef83bdd 100755 --- a/transl/scripts/checkmakefile.pl +++ b/transl/scripts/checkmakefile.pl @@ -238,7 +238,6 @@ sub mycheck my %missing_rl; my %notes_rl; - my %warn_rl; my %missing_count; foreach $resource (@resources) @@ -339,11 +338,6 @@ sub mycheck print LANGOUT "$dir$suffix: Error: resource ".resource_name2($resource).": $msg\n"; } - foreach my $msg (@{$warn_rl{$resource}{$lang}}) - { - print LANGOUT "$dir$suffix: Warning: resource ".resource_name2($resource).": $msg\n"; - } - foreach my $msg (@{$missing_rl{$resource}{$lang}}) { print LANGOUT "$dir$suffix: Missing: resource ".resource_name2($resource).": $msg\n";

1 0

Paul Vriens : transl: Don't offer to compare English(US) with English(US).
by Alexandre Julliard July 17, 2009

July 17, 2009

Module: tools Branch: master Commit: 1f2a5c6b18c794b544b8d54c007f8f1e300cb060 URL: http://source.winehq.org/git/tools.git/?a=commit;h=1f2a5c6b18c794b544b8d54c… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Jul 17 11:33:48 2009 +0200 transl: Don't offer to compare English(US) with English(US). --- transl/php/resource.php | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/transl/php/resource.php b/transl/php/resource.php index 877c363..e86fe8c 100644 --- a/transl/php/resource.php +++ b/transl/php/resource.php @@ -68,10 +68,13 @@ if ($compare) if (!$compare) { - echo "<tr class=\"subheader\"><td colspan=\"3\" style=\"text-align: right\">"; - echo "".gen_resource_a($lang, $resfile, $type, $id, TRUE); - echo "Compare with ".$MASTER_LANGUAGE_NAME." >></a>"; - echo "</td></tr>"; + if ($lang != $MASTER_LANGUAGE) + { + echo "<tr class=\"subheader\"><td colspan=\"3\" style=\"text-align: right\">"; + echo "".gen_resource_a($lang, $resfile, $type, $id, TRUE); + echo "Compare with ".$MASTER_LANGUAGE_NAME." >></a>"; + echo "</td></tr>"; + } } else {

1 0

Paul Vriens : transl: Remove unused files.
by Alexandre Julliard July 17, 2009

July 17, 2009

Module: tools Branch: master Commit: 7a9b120a718e89559cb260a7667f6673e9deb5ab URL: http://source.winehq.org/git/tools.git/?a=commit;h=7a9b120a718e89559cb260a7… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Jul 17 11:18:28 2009 +0200 transl: Remove unused files. --- transl/php/devel/dump-locales.php | 40 --------- transl/php/dump_locales.php | 159 ------------------------------------- 2 files changed, 0 insertions(+), 199 deletions(-) diff --git a/transl/php/devel/dump-locales.php b/transl/php/devel/dump-locales.php deleted file mode 100644 index 8b27c78..0000000 --- a/transl/php/devel/dump-locales.php +++ /dev/null @@ -1,40 +0,0 @@ -<?php - -include("../lib.php"); -include("../lib_res.php"); - -$DATAROOT = ".."; - -function res_enum($header, $f) -{ -# echo "Checking ".$header["type"]." ".$header["name"]."\n"; - global $LOCALE_NAMES; - if ($header["type"] != 6) - return FALSE; - if ($header["name"] != 1) - return FALSE; -# echo "Found resource for locale ".$header["language"]." \n"; - $data = fread($f, $header["resSize"]); - $str = new StringTable($header, $data, 0); - $langid = sprintf("%03x:%02x", $header["language"] & 0x3ff, $header["language"] >> 10); - $LOCALE_NAMES[$langid] = $str->getString(2); -} - -$LOCALE_NAMES = array(); -$res = new ResFile("../dumps/res/dlls-kernel32.res"); -$res->enumResources("res_enum"); -ksort($LOCALE_NAMES); -echo "<?php # Generated by devel/dump-locales.php \$LOCALE_NAMES = array(); "; -foreach ($LOCALE_NAMES as $langid => $name) -{ - echo "\$LOCALE_NAMES[\"$langid\"] = "; - dump_unicode($name); - echo "; \n"; - - $baseid = get_lang_base($langid); - if (file_exists("$DATAROOT/conf/$baseid") && is_lang_ignore_sublang($baseid)) - echo "\$LOCALE_NAMES[\"".get_lang_base($baseid)."\"] = \$LOCALE_NAMES[\"$langid\"]; # ignore sublangs\n"; -} -echo "?>"; - -?> \ No newline at end of file diff --git a/transl/php/dump_locales.php b/transl/php/dump_locales.php deleted file mode 100644 index 8d1bb90..0000000 --- a/transl/php/dump_locales.php +++ /dev/null @@ -1,159 +0,0 @@ -<?php -# Generated by devel/dump-locales.php -$LOCALE_NAMES = array(); -$LOCALE_NAMES["001:01"] = "Arabic (Saudi Arabia)"; -$LOCALE_NAMES["001:02"] = "Arabic (Iraq)"; -$LOCALE_NAMES["001:03"] = "Arabic (Egypt)"; -$LOCALE_NAMES["001:04"] = "Arabic (Libya)"; -$LOCALE_NAMES["001:05"] = "Arabic (Algeria)"; -$LOCALE_NAMES["001:06"] = "Arabic (Morocco)"; -$LOCALE_NAMES["001:07"] = "Arabic (Tunisia)"; -$LOCALE_NAMES["001:08"] = "Arabic (Oman)"; -$LOCALE_NAMES["001:09"] = "Arabic (Yemen)"; -$LOCALE_NAMES["001:0a"] = "Arabic (Syria)"; -$LOCALE_NAMES["001:0b"] = "Arabic (Jordan)"; -$LOCALE_NAMES["001:0c"] = "Arabic (Lebanon)"; -$LOCALE_NAMES["001:0d"] = "Arabic (Kuwait)"; -$LOCALE_NAMES["001:0e"] = "Arabic (U.A.E.)"; -$LOCALE_NAMES["001:0f"] = "Arabic (Bahrain)"; -$LOCALE_NAMES["001:10"] = "Arabic (Qatar)"; -$LOCALE_NAMES["002:01"] = "Bulgarian"; -$LOCALE_NAMES["003:01"] = "Catalan"; -$LOCALE_NAMES["004:01"] = "Chinese (Taiwan)"; -$LOCALE_NAMES["004:02"] = "Chinese (PRC)"; -$LOCALE_NAMES["004:03"] = "Chinese (Hong Kong S.A.R.)"; -$LOCALE_NAMES["004:04"] = "Chinese (Singapore)"; -$LOCALE_NAMES["004:05"] = "Chinese (Macau S.A.R.)"; -$LOCALE_NAMES["005:01"] = "Czech"; -$LOCALE_NAMES["005:00"] = $LOCALE_NAMES["005:01"]; # ignore sublangs -$LOCALE_NAMES["006:01"] = "Danish"; -$LOCALE_NAMES["007:01"] = "German (Germany)"; -$LOCALE_NAMES["007:02"] = "German (Switzerland)"; -$LOCALE_NAMES["007:03"] = "German (Austria)"; -$LOCALE_NAMES["007:04"] = "German (Luxembourg)"; -$LOCALE_NAMES["007:05"] = "German (Liechtenstein)"; -$LOCALE_NAMES["008:01"] = "Greek"; -$LOCALE_NAMES["009:01"] = "English (United States)"; -$LOCALE_NAMES["009:02"] = "English (United Kingdom)"; -$LOCALE_NAMES["009:03"] = "English (Australia)"; -$LOCALE_NAMES["009:04"] = "English (Canada)"; -$LOCALE_NAMES["009:05"] = "English (New Zealand)"; -$LOCALE_NAMES["009:06"] = "English (Ireland)"; -$LOCALE_NAMES["009:07"] = "English (South Africa)"; -$LOCALE_NAMES["009:08"] = "English (Jamaica)"; -$LOCALE_NAMES["009:09"] = "English (Caribbean)"; -$LOCALE_NAMES["009:0a"] = "English (Belize)"; -$LOCALE_NAMES["009:0b"] = "English (Trinidad)"; -$LOCALE_NAMES["009:0c"] = "English (Zimbabwe)"; -$LOCALE_NAMES["009:0d"] = "English (Philippines)"; -$LOCALE_NAMES["00a:01"] = "Spanish (Traditional Sort)"; -$LOCALE_NAMES["00a:02"] = "Spanish (Mexico)"; -$LOCALE_NAMES["00a:03"] = "Spanish (International Sort)"; -$LOCALE_NAMES["00a:04"] = "Spanish (Guatemala)"; -$LOCALE_NAMES["00a:05"] = "Spanish (Costa Rica)"; -$LOCALE_NAMES["00a:06"] = "Spanish (Panama)"; -$LOCALE_NAMES["00a:07"] = "Spanish (Dominican Republic)"; -$LOCALE_NAMES["00a:08"] = "Spanish (Venezuela)"; -$LOCALE_NAMES["00a:09"] = "Spanish (Colombia)"; -$LOCALE_NAMES["00a:0a"] = "Spanish (Peru)"; -$LOCALE_NAMES["00a:0b"] = "Spanish (Argentina)"; -$LOCALE_NAMES["00a:0c"] = "Spanish (Ecuador)"; -$LOCALE_NAMES["00a:0d"] = "Spanish (Chile)"; -$LOCALE_NAMES["00a:0e"] = "Spanish (Uruguay)"; -$LOCALE_NAMES["00a:0f"] = "Spanish (Paraguay)"; -$LOCALE_NAMES["00a:10"] = "Spanish (Bolivia)"; -$LOCALE_NAMES["00a:11"] = "Spanish (El Salvador)"; -$LOCALE_NAMES["00a:12"] = "Spanish (Honduras)"; -$LOCALE_NAMES["00a:13"] = "Spanish (Nicaragua)"; -$LOCALE_NAMES["00a:14"] = "Spanish (Puerto Rico)"; -$LOCALE_NAMES["00b:01"] = "Finnish"; -$LOCALE_NAMES["00c:01"] = "French (France)"; -$LOCALE_NAMES["00c:02"] = "French (Belgium)"; -$LOCALE_NAMES["00c:03"] = "French (Canada)"; -$LOCALE_NAMES["00c:04"] = "French (Switzerland)"; -$LOCALE_NAMES["00c:05"] = "French (Luxembourg)"; -$LOCALE_NAMES["00c:06"] = "French (Monaco)"; -$LOCALE_NAMES["00d:01"] = "Hebrew"; -$LOCALE_NAMES["00e:01"] = "Hungarian"; -$LOCALE_NAMES["00e:00"] = $LOCALE_NAMES["00e:01"]; # ignore sublangs -$LOCALE_NAMES["00f:01"] = "Icelandic"; -$LOCALE_NAMES["010:01"] = "Italian (Italy)"; -$LOCALE_NAMES["010:02"] = "Italian (Switzerland)"; -$LOCALE_NAMES["011:01"] = "Japanese"; -$LOCALE_NAMES["011:00"] = $LOCALE_NAMES["011:01"]; # ignore sublangs -$LOCALE_NAMES["012:01"] = "Korean"; -$LOCALE_NAMES["012:00"] = $LOCALE_NAMES["012:01"]; # ignore sublangs -$LOCALE_NAMES["013:01"] = "Dutch (Netherlands)"; -$LOCALE_NAMES["013:02"] = "Dutch (Belgium)"; -$LOCALE_NAMES["013:03"] = "Dutch (Surinam)"; -$LOCALE_NAMES["014:01"] = "Norwegian (Bokmal)"; -$LOCALE_NAMES["014:02"] = "Norwegian (Nynorsk)"; -$LOCALE_NAMES["015:01"] = "Polish"; -$LOCALE_NAMES["015:00"] = $LOCALE_NAMES["015:01"]; # ignore sublangs -$LOCALE_NAMES["016:01"] = "Portuguese (Brazil)"; -$LOCALE_NAMES["016:02"] = "Portuguese (Portugal)"; -$LOCALE_NAMES["017:01"] = "Romansh (Switzerland)"; -$LOCALE_NAMES["018:01"] = "Romanian"; -$LOCALE_NAMES["018:00"] = $LOCALE_NAMES["018:01"]; # ignore sublangs -$LOCALE_NAMES["019:01"] = "Russian"; -$LOCALE_NAMES["019:00"] = $LOCALE_NAMES["019:01"]; # ignore sublangs -$LOCALE_NAMES["01a:01"] = "Croatian"; -$LOCALE_NAMES["01a:02"] = "Serbian (Latin)"; -$LOCALE_NAMES["01a:03"] = "Serbian (Cyrillic)"; -$LOCALE_NAMES["01b:01"] = "Slovak"; -$LOCALE_NAMES["01b:00"] = $LOCALE_NAMES["01b:01"]; # ignore sublangs -$LOCALE_NAMES["01c:01"] = "Albanian"; -$LOCALE_NAMES["01d:01"] = "Swedish"; -$LOCALE_NAMES["01d:02"] = "Swedish (Finland)"; -$LOCALE_NAMES["01e:01"] = "Thai"; -$LOCALE_NAMES["01f:01"] = "Turkish"; -$LOCALE_NAMES["020:01"] = "Urdu"; -$LOCALE_NAMES["021:01"] = "Indonesian"; -$LOCALE_NAMES["022:01"] = "Ukrainian"; -$LOCALE_NAMES["023:01"] = "Belarusian"; -$LOCALE_NAMES["024:01"] = "Slovenian"; -$LOCALE_NAMES["024:00"] = $LOCALE_NAMES["024:01"]; # ignore sublangs -$LOCALE_NAMES["025:01"] = "Estonian"; -$LOCALE_NAMES["026:01"] = "Latvian"; -$LOCALE_NAMES["027:01"] = "Lithuanian"; -$LOCALE_NAMES["029:01"] = "Farsi"; -$LOCALE_NAMES["02a:01"] = "Vietnamese"; -$LOCALE_NAMES["02b:01"] = "Armenian"; -$LOCALE_NAMES["02c:01"] = "Azeri (Latin)"; -$LOCALE_NAMES["02c:02"] = "Azeri (Cyrillic)"; -$LOCALE_NAMES["02d:01"] = "Basque"; -$LOCALE_NAMES["02f:01"] = "FYRO Macedonian"; -$LOCALE_NAMES["036:01"] = "Afrikaans"; -$LOCALE_NAMES["037:01"] = "Georgian"; -$LOCALE_NAMES["038:01"] = "Faeroese"; -$LOCALE_NAMES["039:01"] = "Hindi"; -$LOCALE_NAMES["03e:01"] = "Malay (Malaysia)"; -$LOCALE_NAMES["03e:02"] = "Malay (Brunei Darussalam)"; -$LOCALE_NAMES["03f:01"] = "Kazakh"; -$LOCALE_NAMES["040:01"] = "Kyrgyz (Cyrillic)"; -$LOCALE_NAMES["041:01"] = "Swahili"; -$LOCALE_NAMES["043:01"] = "Uzbek (Latin)"; -$LOCALE_NAMES["043:02"] = "Uzbek (Cyrillic)"; -$LOCALE_NAMES["044:01"] = "Tatar"; -$LOCALE_NAMES["046:01"] = "Punjabi"; -$LOCALE_NAMES["047:01"] = "Gujarati"; -$LOCALE_NAMES["049:01"] = "Tamil"; -$LOCALE_NAMES["04a:01"] = "Telugu"; -$LOCALE_NAMES["04b:01"] = "Kannada"; -$LOCALE_NAMES["04e:01"] = "Marathi"; -$LOCALE_NAMES["04f:01"] = "Sanskrit"; -$LOCALE_NAMES["050:01"] = "Mongolian (Cyrillic)"; -$LOCALE_NAMES["052:01"] = "Welsh (United Kingdom)"; -$LOCALE_NAMES["056:01"] = "Galician"; -$LOCALE_NAMES["057:01"] = "Konkani"; -$LOCALE_NAMES["05a:01"] = "Syriac"; -$LOCALE_NAMES["065:01"] = "Divehi"; -$LOCALE_NAMES["07e:01"] = "Brezhoneg"; -$LOCALE_NAMES["08f:01"] = "Esperanto"; -$LOCALE_NAMES["08f:00"] = $LOCALE_NAMES["08f:01"]; # ignore sublangs -$LOCALE_NAMES["090:01"] = "Walon"; -$LOCALE_NAMES["091:01"] = "Cornish (United Kingdom)"; -$LOCALE_NAMES["094:01"] = "Gaeilge (Éire)"; -$LOCALE_NAMES["094:02"] = "Gaidhlig (Breatainn Mhòr)"; -$LOCALE_NAMES["094:03"] = "Gaelg (Manninn)"; -?>

1 0

Paul Vriens : transl: Better highlight issues in Dialog resource when comparing to English(US).
by Alexandre Julliard July 17, 2009

July 17, 2009

Module: tools Branch: master Commit: 298f63b842913c784ed32c8b2dc1162cd496a48c URL: http://source.winehq.org/git/tools.git/?a=commit;h=298f63b842913c784ed32c8b… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Jul 17 10:59:15 2009 +0200 transl: Better highlight issues in Dialog resource when comparing to English(US). --- transl/php/lib_res.php | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/transl/php/lib_res.php b/transl/php/lib_res.php index 534e16d..cbb60a8 100644 --- a/transl/php/lib_res.php +++ b/transl/php/lib_res.php @@ -890,7 +890,18 @@ class DialogResource extends Resource return ($this_ctrl['id'] != $other_ctrl['id']) || (($this_ctrl['style'] | $ignore_style) != ($other_ctrl['style'] | $ignore_style)) || ($this_ctrl['exStyle'] != $other_ctrl['exStyle']) || - !is_equal_unicode_or_id($this_ctrl['className'], $other_ctrl['className']); + (!is_equal_unicode_or_id($this_ctrl['className'], $other_ctrl['className'])) || + // We should have either id's or text in both + (is_int($this_ctrl['text']) ^ is_int($other_ctrl['text'])) || + // If it's an id they should be equal + (is_int($this_ctrl['text']) && + !is_equal_unicode_or_id($this_ctrl['text'], $other_ctrl['text'])) || + // If either text is empty they should be equal + (!is_int($this_ctrl['text']) && ((count($this_ctrl['text']) == 0) || (count($other_ctrl['text']) == 0)) && + !is_equal_unicode_or_id($this_ctrl['text'], $other_ctrl['text'])) || + // If we have text in both they should not be equal + (!is_int($this_ctrl['text']) && ((count($this_ctrl['text']) != 0) && (count($other_ctrl['text']) != 0)) && + is_equal_unicode_or_id($this_ctrl['text'], $other_ctrl['text'])); } function dump($master_res = NULL)

1 0

Paul Vriens : transl: Sort the languages by translations and locale name.
by Alexandre Julliard July 17, 2009

July 17, 2009

Module: tools Branch: master Commit: eb71250f257a58d30abe88d7df7d0fb3bdff485f URL: http://source.winehq.org/git/tools.git/?a=commit;h=eb71250f257a58d30abe88d7… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Jul 17 09:44:52 2009 +0200 transl: Sort the languages by translations and locale name. --- transl/php/index.php | 45 +++++++++++++++++++++++++++++---------------- 1 files changed, 29 insertions(+), 16 deletions(-) diff --git a/transl/php/index.php b/transl/php/index.php index 94ee569..a000d70 100644 --- a/transl/php/index.php +++ b/transl/php/index.php @@ -3,6 +3,8 @@ include_once("config.php"); include_once("lib.php"); $summary = fopen("$DATAROOT/langs/summary", "r"); +$transl = array(); +$sum = 0; while ($line = fgets($summary, 1024)) { if (!preg_match("/LANG ([0-9a-f]+:[0-9a-f]+) ([0-9]+) ([0-9]+) ([0-9]+) ([0-9]+)/", $line, $m)) @@ -13,10 +15,9 @@ while ($line = fgets($summary, 1024)) if ($m[3] == 0) continue; - $sum = $m[2]+0; - $transl[$m[1]] = $m[3]; - $missing[$m[1]] = $m[4]; - $errors[$m[1]] = $m[5]; + $sum = $m[2]; + $transl[] = array('langid' => $m[1], 'name' => get_locale_name($m[1]), 'translated' => $m[3], + 'missing' => $m[4], 'errors' => $m[5]); } ?> <html> @@ -59,36 +60,48 @@ function draw_bar($tr, $err, $sum) echo "</td></tr>"; } -arsort($transl, SORT_NUMERIC); +function nicesort($a, $b) +{ + if ($a['translated'] != $b['translated']) + return ($a['translated'] < $b['translated']); + + // English (Unites States) always on top + if ($a['langid'] == "009:01") + return 0; + if ($b['langid'] == "009:01") + return 1; + return strcasecmp($a['name'], $b['name']); +} + +usort($transl, 'nicesort'); $nr = 1; $missing_sum = 0; $errors_sum = 0; $transl_sum = 0; $serial = 0; -$transl_keys = array_keys($transl); for ($i = 0; $i < count($transl); $i++) { - $langid = $transl_keys[$i]; - $value = $transl[$langid]; + extract($transl[$i]); + echo "<tr>"; if ($serial == 0) { for ($j = $i; $j < count($transl); $j++) - if ($transl[$langid] != $transl[$transl_keys[$j]]) + if ($translated != $transl[$j]['translated']) break; $serial = $j - $i; echo "<td rowspan=\"$serial\" style=\"text-align: center\">$nr"; echo "</td>"; } - echo "<td>".gen_lang_a($langid).get_lang_name($langid)."</a></td>"; - printf("<td>%d (%.1f%%)</td>", $value, ($value*100)/$sum); - echo "<td>".$missing[$langid]."</td><td>".$errors[$langid]."</td>\n"; - draw_bar($value, $errors[$langid], $sum); + echo "<td>".gen_lang_a($langid).$name."</a></td>"; + printf("<td>%d (%.1f%%)</td>", $translated, ($translated*100)/$sum); + echo "<td>".$missing."</td><td>".$errors."</td>\n"; + draw_bar($translated, $errors, $sum); $nr++; - $missing_sum += $missing[$langid]; - $errors_sum += $errors[$langid]; - $transl_sum += $value; + $transl_sum += $translated; + $missing_sum += $missing; + $errors_sum += $errors; $serial--; } ?>

1 0

Frédéric Delanoy : kernel32: Update French translation of error messages.
by Alexandre Julliard July 17, 2009

July 17, 2009

Module: wine Branch: master Commit: ba74403918fc5fc0235fc98362cd600064ec9619 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba74403918fc5fc0235fc9836… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Jul 17 14:43:11 2009 +0200 kernel32: Update French translation of error messages. --- dlls/kernel32/nls/winerr_fra.mc | 1119 ++++++++++++++++++++------------------- 1 files changed, 560 insertions(+), 559 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ba74403918fc5fc0235fc…

1 0

Dylan Smith : richedit: Handle missing colours in rtf colour table.
by Alexandre Julliard July 17, 2009

July 17, 2009

Module: wine Branch: master Commit: dde41d5c13e5efdb9607c6ce063e0105a9de12e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dde41d5c13e5efdb9607c6ce0… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Fri Jul 17 09:17:20 2009 -0400 richedit: Handle missing colours in rtf colour table. When a colour table entry is empty, then the default colour is used. For an incomplete colour table entry 0 is used for the missing colours. Previously the -1 value used internally for missing colours was being converted into white, where it should be using the default colour that is normally black. This bug could be seen by loading the following rich text into wordpad: {\rtf{\colortbl;;}\cf1 text} --- dlls/riched20/editor.c | 12 ++++++++---- dlls/riched20/reader.c | 23 +++++++++++++---------- 2 files changed, 21 insertions(+), 14 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 7ffb7cb..14a7246 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -422,7 +422,10 @@ void ME_RTFCharAttrHook(RTF_Info *info) else if (info->rtfParam != rtfNoParam) { RTFColor *c = RTFGetColor(info, info->rtfParam); - fmt.crTextColor = (c->rtfCBlue<<16)|(c->rtfCGreen<<8)|(c->rtfCRed); + if (c && c->rtfCBlue >= 0) + fmt.crTextColor = (c->rtfCBlue<<16)|(c->rtfCGreen<<8)|(c->rtfCRed); + else + fmt.dwEffects = CFE_AUTOBACKCOLOR; } break; case rtfForeColor: @@ -433,10 +436,11 @@ void ME_RTFCharAttrHook(RTF_Info *info) else if (info->rtfParam != rtfNoParam) { RTFColor *c = RTFGetColor(info, info->rtfParam); - if (c) + if (c && c->rtfCBlue >= 0) fmt.crTextColor = (c->rtfCBlue<<16)|(c->rtfCGreen<<8)|(c->rtfCRed); - else - fmt.crTextColor = 0; + else { + fmt.dwEffects = CFE_AUTOCOLOR; + } } break; case rtfFontNum: diff --git a/dlls/riched20/reader.c b/dlls/riched20/reader.c index b6a6f44..0462f71 100644 --- a/dlls/riched20/reader.c +++ b/dlls/riched20/reader.c @@ -990,18 +990,21 @@ static void ReadColorTbl(RTF_Info *info) break; } cp->rtfCNum = cnum++; - cp->rtfCRed = cp->rtfCGreen = cp->rtfCBlue = -1; cp->rtfNextColor = info->colorList; info->colorList = cp; - while (RTFCheckCM (info, rtfControl, rtfColorName)) - { - switch (info->rtfMinor) - { - case rtfRed: cp->rtfCRed = info->rtfParam; break; - case rtfGreen: cp->rtfCGreen = info->rtfParam; break; - case rtfBlue: cp->rtfCBlue = info->rtfParam; break; - } - RTFGetToken (info); + if (!RTFCheckCM (info, rtfControl, rtfColorName)) + cp->rtfCRed = cp->rtfCGreen = cp->rtfCBlue = -1; + else { + cp->rtfCRed = cp->rtfCGreen = cp->rtfCBlue = 0; + do { + switch (info->rtfMinor) + { + case rtfRed: cp->rtfCRed = info->rtfParam & 0xFF; break; + case rtfGreen: cp->rtfCGreen = info->rtfParam & 0xFF; break; + case rtfBlue: cp->rtfCBlue = info->rtfParam & 0xFF; break; + } + RTFGetToken (info); + } while (RTFCheckCM (info, rtfControl, rtfColorName)); } if (info->rtfClass == rtfEOF) break;

1 0

Ricardo Filipe : devenum: Update Portuguese translation.
by Alexandre Julliard July 17, 2009

July 17, 2009

Module: wine Branch: master Commit: 1e5d72a630ddc484446fe4203356e0755d608794 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e5d72a630ddc484446fe4203… Author: Ricardo Filipe <ricardojdfilipe(a)gmail.com> Date: Fri Jul 17 04:45:32 2009 -0700 devenum: Update Portuguese translation. --- dlls/devenum/devenum.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/devenum/devenum.rc b/dlls/devenum/devenum.rc index 60dd59b..01f76b4 100644 --- a/dlls/devenum/devenum.rc +++ b/dlls/devenum/devenum.rc @@ -72,7 +72,7 @@ LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL } STRINGTABLE DISCARDABLE -LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN +LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL { 7 "DirectSound padrão" 8 "DirectSound: %s"

1 0

Ricardo Filipe : cryptdlg: Add Portuguese translation.
by Alexandre Julliard July 17, 2009

July 17, 2009

Module: wine Branch: master Commit: 3eb5da4b6ecf664f6568d033758e91cacb5c9444 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3eb5da4b6ecf664f6568d0337… Author: Ricardo Filipe <ricardojdfilipe(a)gmail.com> Date: Fri Jul 17 04:21:13 2009 -0700 cryptdlg: Add Portuguese translation. --- dlls/cryptdlg/Makefile.in | 1 + dlls/cryptdlg/cryptdlg_Pt.rc | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 0 deletions(-) diff --git a/dlls/cryptdlg/Makefile.in b/dlls/cryptdlg/Makefile.in index 311e805..0cc2d3f 100644 --- a/dlls/cryptdlg/Makefile.in +++ b/dlls/cryptdlg/Makefile.in @@ -15,6 +15,7 @@ RC_SRCS = \ cryptdlg_Ko.rc \ cryptdlg_Lt.rc \ cryptdlg_Nl.rc \ + cryptdlg_Pt.rc \ cryptdlg_Ro.rc @MAKE_DLL_RULES@ diff --git a/dlls/cryptdlg/cryptdlg_Pt.rc b/dlls/cryptdlg/cryptdlg_Pt.rc new file mode 100644 index 0000000..92d179c --- /dev/null +++ b/dlls/cryptdlg/cryptdlg_Pt.rc @@ -0,0 +1,40 @@ +/* + * cryptdlg dll Portuguese resources + * + * Copyright 2008 Ricardo Filipe + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "cryptres.h" + +#pragma code_page(65001) + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE + +STRINGTABLE DISCARDABLE +{ + IDS_CERT_POLICY "Política de Certificados" + IDS_POLICY_ID "Identificador da Política: " + IDS_POLICY_QUALIFIER_INFO "Informação do Qualificador da Política" + IDS_POLICY_QUALIFIER_ID "ID do Qualificador da Política=" + IDS_CPS "CPS" /* Certification Practice Statement */ + IDS_USER_NOTICE "Aviso ao Utilizador" + IDS_QUALIFIER "Qualificador" + IDS_NOTICE_REF "Referência do Aviso" + IDS_ORGANIZATION "Organização=" + IDS_NOTICE_NUM "Número do Aviso=" + IDS_NOTICE_TEXT "Texto do Aviso=" +}

1 0

Ricardo Filipe : wordpad: Update Portuguese translation and convert to UTF8 .
by Alexandre Julliard July 17, 2009

July 17, 2009

Module: wine Branch: master Commit: 87d5d882b321bbc67dcfd4219a69a2b9d7c480f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87d5d882b321bbc67dcfd4219… Author: Ricardo Filipe <ricardojdfilipe(a)gmail.com> Date: Fri Jul 17 03:30:55 2009 -0700 wordpad: Update Portuguese translation and convert to UTF8. --- programs/wordpad/Pt.rc | 71 +++++++++++++++++++++++++----------------------- 1 files changed, 37 insertions(+), 34 deletions(-) diff --git a/programs/wordpad/Pt.rc b/programs/wordpad/Pt.rc index f8d7df2..fd512c9 100644 --- a/programs/wordpad/Pt.rc +++ b/programs/wordpad/Pt.rc @@ -20,7 +20,9 @@ #include "wordpad.h" -LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL +#pragma code_page(65001) + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE IDM_MAINMENU MENU DISCARDABLE BEGIN @@ -32,8 +34,8 @@ BEGIN MENUITEM "Guardar &como...", ID_FILE_SAVEAS MENUITEM SEPARATOR MENUITEM "&Imprimir...\tCtrl+P", ID_PRINT - MENUITEM "&Pr� visualizar...", ID_PREVIEW - MENUITEM "C&onfigurar p�gina...", ID_PRINTSETUP + MENUITEM "&Pré visualizar...", ID_PREVIEW + MENUITEM "C&onfigurar página...", ID_PRINTSETUP MENUITEM SEPARATOR MENUITEM "&Sair", ID_FILE_EXIT END @@ -57,21 +59,21 @@ BEGIN MENUITEM SEPARATOR POPUP "E&xtras" BEGIN - MENUITEM "&Informa��o da selec��o", ID_EDIT_SELECTIONINFO + MENUITEM "&Informação da selecção", ID_EDIT_SELECTIONINFO MENUITEM "&Formato dos caracteres", ID_EDIT_CHARFORMAT MENUITEM "&Definir formato dos caracteres", ID_EDIT_DEFCHARFORMAT - MENUITEM "F&ormato dos par�grafos", ID_EDIT_PARAFORMAT + MENUITEM "F&ormato dos parágrafos", ID_EDIT_PARAFORMAT MENUITEM "&Buscar texto", ID_EDIT_GETTEXT END END POPUP "&Ver" BEGIN MENUITEM "&Barra de Ferramentas", ID_TOGGLE_TOOLBAR - MENUITEM "Barra de &Formata��o", ID_TOGGLE_FORMATBAR - MENUITEM "&R�gua", ID_TOGGLE_RULER + MENUITEM "Barra de &Formatação", ID_TOGGLE_FORMATBAR + MENUITEM "&Régua", ID_TOGGLE_RULER MENUITEM "Barra de &Estado", ID_TOGGLE_STATUSBAR MENUITEM SEPARATOR - MENUITEM "&Op��es...", ID_VIEWPROPERTIES + MENUITEM "&Opções...", ID_VIEWPROPERTIES END POPUP "&Inserir" BEGIN @@ -81,8 +83,8 @@ BEGIN BEGIN MENUITEM "&Tipo de Letra...", ID_FONTSETTINGS MENUITEM "&Lista de marcas" ID_BULLET - MENUITEM "&Par�grafo..." ID_PARAFORMAT - MENUITEM "T&abula��es..." ID_TABSTOPS + MENUITEM "&Parágrafo..." ID_PARAFORMAT + MENUITEM "T&abulações..." ID_TABSTOPS POPUP "&Fundo" BEGIN MENUITEM "&Sistema\tCtrl+1", ID_BACK_1 @@ -104,7 +106,7 @@ BEGIN MENUITEM "Co&lar", ID_EDIT_PASTE MENUITEM SEPARATOR MENUITEM "&Lista de marcas" ID_BULLET - MENUITEM "&Par�grafo..." ID_PARAFORMAT + MENUITEM "&Parágrafo..." ID_PARAFORMAT END END @@ -113,7 +115,7 @@ STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Data e hora" FONT 10, "MS Sans Serif" BEGIN - LTEXT "Formatos Dispon�veis",-1,3,2,100,15 + LTEXT "Formatos Disponíveis",-1,3,2,100,15 LISTBOX IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT | LBS_NOTIFY PUSHBUTTON "&OK",IDOK,87,12,40,12 PUSHBUTTON "&Cancelar",IDCANCEL,87,26,40,12 @@ -132,10 +134,10 @@ END IDD_PARAFORMAT DIALOG DISCARDABLE 30, 20, 200, 110 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -Caption "Par�grafo" +Caption "Parágrafo" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Identa��o", -1, 10, 10, 120, 68 + GROUPBOX "Identação", -1, 10, 10, 120, 68 LTEXT "Esquerda", -1, 15, 22, 40, 13 EDITTEXT IDC_PARA_LEFT, 55, 20, 60, 13 LTEXT "Direita", -1, 15, 40, 40, 13 @@ -150,10 +152,10 @@ END IDD_TABSTOPS DIALOG DISCARDABLE 30, 20, 200, 110 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -Caption "Tabula��es" +Caption "Tabulações" FONT 8, "MS SHell DLg" BEGIN - GROUPBOX "Marca de tabula��o", -1, 10, 10, 120, 90 + GROUPBOX "Marca de tabulação", -1, 10, 10, 120, 90 COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE DEFPUSHBUTTON "&Adicionar", ID_TAB_ADD, 20, 80, 45, 15 PUSHBUTTON "&Remover", ID_TAB_DEL, 72, 80, 45, 15 @@ -169,12 +171,12 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Moldar o texto", -1, 10, 10, 130, 85 RADIOBUTTON "&Sem moldagem", IDC_PAGEFMT_WN, 18, 25, 117, 15 - RADIOBUTTON "&Moldar � janela", IDC_PAGEFMT_WW, 18, 45, 117, 15 - RADIOBUTTON "Moldar pela &r�gua", IDC_PAGEFMT_WM, 18, 65, 117, 15 + RADIOBUTTON "&Moldar à janela", IDC_PAGEFMT_WW, 18, 45, 117, 15 + RADIOBUTTON "Moldar pela &régua", IDC_PAGEFMT_WM, 18, 65, 117, 15 GROUPBOX "Barras de Ferramentas", -1, 150, 10, 120, 85 CHECKBOX "&Barra de Ferramentas", IDC_PAGEFMT_TB, 160, 20, 90, 15 - CHECKBOX "Barra de &Formata��o", IDC_PAGEFMT_FB, 160, 38, 90, 15 - CHECKBOX "&R�gua", IDC_PAGEFMT_RU, 160, 56, 90, 15 + CHECKBOX "Barra de &Formatação", IDC_PAGEFMT_FB, 160, 38, 90, 15 + CHECKBOX "&Régua", IDC_PAGEFMT_RU, 160, 56, 90, 15 CHECKBOX "Barra de &Estado", IDC_PAGEFMT_SB, 160, 74, 90, 15 LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0 END @@ -208,7 +210,7 @@ END STRINGTABLE DISCARDABLE BEGIN - STRING_VIEWPROPS_TITLE, "Op��es" + STRING_VIEWPROPS_TITLE, "Opções" STRING_VIEWPROPS_TEXT, "Texto" STRING_VIEWPROPS_RICHTEXT, "Rich text" END @@ -216,10 +218,10 @@ END STRINGTABLE DISCARDABLE BEGIN STRING_PREVIEW_PRINT, "Imprimir" - STRING_PREVIEW_NEXTPAGE, "Pr�xima p�gina" - STRING_PREVIEW_PREVPAGE, "P�gina anterior" - STRING_PREVIEW_TWOPAGES, "Duas p�ginas" - STRING_PREVIEW_ONEPAGE, "Uma p�gina" + STRING_PREVIEW_NEXTPAGE, "Próxima página" + STRING_PREVIEW_PREVPAGE, "Página anterior" + STRING_PREVIEW_TWOPAGES, "Duas páginas" + STRING_PREVIEW_ONEPAGE, "Uma página" STRING_PREVIEW_CLOSE, "Fechar" END @@ -231,17 +233,18 @@ END STRINGTABLE DISCARDABLE BEGIN STRING_DEFAULT_FILENAME, "Documento" - STRING_PROMPT_SAVE_CHANGES, "Guardar altera��es a '%s'?" + STRING_PROMPT_SAVE_CHANGES, "Guardar alterações a '%s'?" STRING_SEARCH_FINISHED, "Acabou a pesquisa do documento." STRING_LOAD_RICHED_FAILED, "Falhou o carregamento da biblioteca RichEdit." STRING_SAVE_LOSEFORMATTING, "Escolheu guardar em formato de texto simples, " \ - "o que vai anular todas as formata��es. " \ + "o que vai anular todas as formatações. " \ "Tem a certeza que quer fazer isto?" - STRING_INVALID_NUMBER, "Formato de n�mero inv�lido" - STRING_OLE_STORAGE_NOT_SUPPORTED, "Documentos OLE n�o s�o suportados" - STRING_WRITE_FAILED, "N�o foi poss�vel guardar o ficheiro." - STRING_WRITE_ACCESS_DENIED, "N�o tem permiss�es para guardar o ficheiro." - STRING_OPEN_FAILED, "N�o foi poss�vel abrir o ficheiro." - STRING_OPEN_ACCESS_DENIED, "N�o tem permiss�es para abrir o ficheiro." - STRING_PRINTING_NOT_IMPLEMENTED, "Impress�o n�o implementada" + STRING_INVALID_NUMBER, "Formato de número inválido" + STRING_OLE_STORAGE_NOT_SUPPORTED, "Documentos OLE não são suportados" + STRING_WRITE_FAILED, "Não foi possível guardar o ficheiro." + STRING_WRITE_ACCESS_DENIED, "Não tem permissões para guardar o ficheiro." + STRING_OPEN_FAILED, "Não foi possível abrir o ficheiro." + STRING_OPEN_ACCESS_DENIED, "Não tem permissões para abrir o ficheiro." + STRING_PRINTING_NOT_IMPLEMENTED, "Impressão não implementada" + STRING_MAX_TAB_STOPS, "Não pode adicionar mais de 32 tabs." END

1 0

Rein Klazes : user32/tests: Show that Windows avoids creating loops in a menu tree, probably by limiting the depth of such tree.
by Alexandre Julliard July 17, 2009

July 17, 2009

Module: wine Branch: master Commit: 5b4b1e6a67474317181e689aa0d6587758d5dcf2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b4b1e6a67474317181e689aa… Author: Rein Klazes <wijn(a)online.nl> Date: Thu Jul 16 12:30:29 2009 +0200 user32/tests: Show that Windows avoids creating loops in a menu tree, probably by limiting the depth of such tree. --- dlls/user32/tests/menu.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 59 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index 0948f69..868fd9a 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -2932,6 +2932,63 @@ static void test_menu_cancelmode(void) DestroyWindow( hwnd); } +/* show menu trees have a maximum depth */ +static void test_menu_maxdepth(void) +{ +#define NR_MENUS 100 + HMENU hmenus[ NR_MENUS]; + int i; + DWORD ret; + + for( i = 0; i < NR_MENUS; i++) { + hmenus[i] = CreatePopupMenu(); + if( !hmenus[i]) break; + } + ok( i == NR_MENUS, "could not create more then %d menu's\n", i); + for( i = 1; i < NR_MENUS; i++) { + ret = AppendMenuA( hmenus[i], MF_POPUP, (UINT_PTR)hmenus[i-1],"test"); + if( !ret) break; + } + trace("Maximum depth is %d\n", i); +todo_wine + ok( i < NR_MENUS || + broken( i == NR_MENUS), /* win98, NT */ + "no ( or very large) limit on menu depth!\n"); + + for( i = 0; i < NR_MENUS; i++) + DestroyMenu( hmenus[i]); +} + +/* bug #12171 */ +static void test_menu_circref(void) +{ + HMENU menu1, menu2; + DWORD ret; + + menu1 = CreatePopupMenu(); + menu2 = CreatePopupMenu(); + ok( menu1 && menu2, "error creating menus.\n"); + ret = AppendMenuA( menu1, MF_POPUP, (UINT_PTR)menu2, "winetest"); + ok( ret, "AppendMenu failed, error is %d\n", GetLastError()); + ret = AppendMenuA( menu1, MF_STRING | MF_HILITE, 123, "winetest"); + ok( ret, "AppendMenu failed, error is %d\n", GetLastError()); + /* app chooses an id that happens to clash with its own hmenu */ + ret = AppendMenuA( menu2, MF_STRING, (UINT_PTR)menu2, "winetest"); + ok( ret, "AppendMenu failed, error is %d\n", GetLastError()); + /* now attempt to change the string of the first item of menu1 */ + ret = ModifyMenuA( menu1, (UINT_PTR)menu2, MF_POPUP, (UINT_PTR)menu2, "menu 2"); +todo_wine + ok( !ret || + broken( 0), /* win98, NT */ + "ModifyMenu should have failed.\n"); + if( !ret) { /* will probably stack fault if the ModifyMenu succeeded */ + ret = GetMenuState( menu1, 123, 0); + ok( ret == MF_HILITE, "GetMenuState returned %x\n",ret); + } + DestroyMenu( menu2); + DestroyMenu( menu1); +} + START_TEST(menu) { init_function_pointers(); @@ -2970,4 +3027,6 @@ START_TEST(menu) test_menu_hilitemenuitem(); test_menu_trackpopupmenu(); test_menu_cancelmode(); + test_menu_maxdepth(); + test_menu_circref(); }

1 0

Jeff Latimer : ws2_32: IPv6 functionality for WSAAddressToStringW.
by Alexandre Julliard July 17, 2009

July 17, 2009

Module: wine Branch: master Commit: 4a8e36548dfb503bc0536f2dfd0d61be9b0b1dd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a8e36548dfb503bc0536f2df… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Fri Jul 17 20:25:59 2009 +1000 ws2_32: IPv6 functionality for WSAAddressToStringW. --- dlls/ws2_32/socket.c | 34 +++++++++++----------------------- dlls/ws2_32/tests/sock.c | 15 +++------------ 2 files changed, 14 insertions(+), 35 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 0df61c7..96be7ca 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -5001,42 +5001,30 @@ INT WINAPI WSAAddressToStringA( LPSOCKADDR sockaddr, DWORD len, * * NOTES * The 'info' parameter is ignored. - * - * BUGS - * Only supports AF_INET addresses. */ INT WINAPI WSAAddressToStringW( LPSOCKADDR sockaddr, DWORD len, LPWSAPROTOCOL_INFOW info, LPWSTR string, LPDWORD lenstr ) { - DWORD size; - WCHAR buffer[22]; /* 12 digits + 3 dots + ':' + 5 digits + '\0' */ - static const WCHAR format[] = { '%','u','.','%','u','.','%','u','.','%','u',':','%','u',0 }; - WCHAR *p; + INT ret; + DWORD size, sizew; + WCHAR buffer[54]; /* 32 digits + 7':' + '[' + '%" + 5 digits + ']:' + 5 digits + '\0' */ + CHAR bufAddr[54]; - TRACE( "(%p, %x, %p, %p, %p)\n", sockaddr, len, info, string, lenstr ); - - if (!sockaddr || len < sizeof(SOCKADDR_IN)) return SOCKET_ERROR; - if (!string || !lenstr) return SOCKET_ERROR; - - /* sin_family is guaranteed to be the first u_short */ - if (((SOCKADDR_IN *)sockaddr)->sin_family != AF_INET) return SOCKET_ERROR; + TRACE( "(%p, %d, %p, %p, %p)\n", sockaddr, len, info, string, lenstr ); - sprintfW( buffer, format, - (unsigned int)(ntohl( ((SOCKADDR_IN *)sockaddr)->sin_addr.WS_s_addr ) >> 24 & 0xff), - (unsigned int)(ntohl( ((SOCKADDR_IN *)sockaddr)->sin_addr.WS_s_addr ) >> 16 & 0xff), - (unsigned int)(ntohl( ((SOCKADDR_IN *)sockaddr)->sin_addr.WS_s_addr ) >> 8 & 0xff), - (unsigned int)(ntohl( ((SOCKADDR_IN *)sockaddr)->sin_addr.WS_s_addr ) & 0xff), - ntohs( ((SOCKADDR_IN *)sockaddr)->sin_port ) ); + size = *lenstr; + ret = WSAAddressToStringA(sockaddr, len, NULL, bufAddr, &size); - p = strchrW( buffer, ':' ); - if (!((SOCKADDR_IN *)sockaddr)->sin_port) *p = 0; + if (ret) return ret; - size = strlenW( buffer ) + 1; + sizew = sizeof( buffer ); + MultiByteToWideChar( CP_ACP, 0, bufAddr, size, buffer, sizew ); if (*lenstr < size) { *lenstr = size; + WSASetLastError(WSAEFAULT); return SOCKET_ERROR; } diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 2e3729d..b1db361 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1575,13 +1575,9 @@ static void test_WSAAddressToStringW(void) memcpy (sockaddr6.sin6_addr.s6_addr, addr6_1, sizeof(addr6_1)); ret = WSAAddressToStringW( (SOCKADDR*)&sockaddr6, sizeof(sockaddr6), NULL, address6, &len ); - todo_wine - { ok( !ret, "WSAAddressToStringW() failed unexpectedly: %d\n", WSAGetLastError() ); - ok( !lstrcmpW( address6, expect6_1 ), "Wrong string returned\n" ); ok( len == sizeof(expect6_1)/sizeof(WCHAR), "Got %d\n", len); - } /* Test a longer IPv6 address */ len = sizeof(address6)/sizeof(WCHAR); @@ -1592,13 +1588,10 @@ static void test_WSAAddressToStringW(void) memcpy (sockaddr6.sin6_addr.s6_addr, addr6_2, sizeof(addr6_2)); ret = WSAAddressToStringW( (SOCKADDR*)&sockaddr6, sizeof(sockaddr6), NULL, address6, &len ); - todo_wine - { ok( !ret, "WSAAddressToStringW() failed unexpectedly: %d\n", WSAGetLastError() ); ok( !lstrcmpW( address6, expect6_2 ), "Wrong string returned\n" ); ok( len == sizeof(expect6_2)/sizeof(WCHAR), "Got %d\n", len); - } /* Test IPv6 address and port number */ len = sizeof(address6)/sizeof(WCHAR); @@ -1609,10 +1602,9 @@ static void test_WSAAddressToStringW(void) memcpy (sockaddr6.sin6_addr.s6_addr, addr6_3, sizeof(addr6_3)); ret = WSAAddressToStringW( (SOCKADDR*)&sockaddr6, sizeof(sockaddr6), NULL, address6, &len ); + ok( !ret, "WSAAddressToStringW() failed unexpectedly: %d\n", WSAGetLastError() ); todo_wine { - ok( !ret, "WSAAddressToStringW() failed unexpectedly: %d\n", WSAGetLastError() ); - ok( !lstrcmpW( address6, expect6_3 ), "Wrong string returned\n" ); ok( len == sizeof(expect6_3)/sizeof(WCHAR), "Got %d\n", len); } @@ -1626,9 +1618,9 @@ static void test_WSAAddressToStringW(void) memcpy (sockaddr6.sin6_addr.s6_addr, addr6_3, sizeof(addr6_3)); ret = WSAAddressToStringW( (SOCKADDR*)&sockaddr6, sizeof(sockaddr6), NULL, address6, &len ); + ok( !ret, "WSAAddressToStringW() failed unexpectedly: %d\n", WSAGetLastError() ); todo_wine { - ok( !ret, "WSAAddressToStringW() failed unexpectedly: %d\n", WSAGetLastError() ); ok( !lstrcmpW( address6, expect6_3_2 ), "Wrong string returned\n" ); ok( len == sizeof(expect6_3_2)/sizeof(WCHAR), "Got %d\n", len); } @@ -1642,10 +1634,9 @@ static void test_WSAAddressToStringW(void) memcpy (sockaddr6.sin6_addr.s6_addr, addr6_3, sizeof(addr6_3)); ret = WSAAddressToStringW( (SOCKADDR*)&sockaddr6, sizeof(sockaddr6), NULL, address6, &len ); + ok( !ret, "WSAAddressToStringW() failed unexpectedly: %d\n", WSAGetLastError() ); todo_wine { - ok( !ret, "WSAAddressToStringW() failed unexpectedly: %d\n", WSAGetLastError() ); - ok( !lstrcmpW( address6, expect6_3_3 ), "Wrong string returned\n" ); ok( len == sizeof(expect6_3_3)/sizeof(WCHAR), "Got %d\n", len); }

1 0

Jeff Latimer : ws2_32/tests: IPv6 tests for WSAAddressToStringW.
by Alexandre Julliard July 17, 2009

July 17, 2009

Module: wine Branch: master Commit: c620ec8f725cb750f601787ad115c616ddc436c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c620ec8f725cb750f601787ad… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Fri Jul 17 20:25:07 2009 +1000 ws2_32/tests: IPv6 tests for WSAAddressToStringW. --- dlls/ws2_32/tests/sock.c | 112 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 111 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 672c96e..2e3729d 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1474,6 +1474,7 @@ end: static void test_WSAAddressToStringW(void) { + SOCKET v6 = INVALID_SOCKET; INT ret; DWORD len; int GLE; @@ -1486,6 +1487,19 @@ static void test_WSAAddressToStringW(void) WCHAR expect4[] = { '2','5','5','.','2','5','5','.','2','5','5','.','2','5','5', ':', '6', '5', '5', '3', '5', 0 }; + SOCKADDR_IN6 sockaddr6; + WCHAR address6[54]; /* 32 digits + 7':' + '[' + '%" + 5 digits + ']:' + 5 digits + '\0' */ + + CHAR addr6_1[] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}; + CHAR addr6_2[] = {0x20,0xab,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}; + CHAR addr6_3[] = {0x20,0xab,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x20,0x01}; + + WCHAR expect6_1[] = {':',':','1',0}; + WCHAR expect6_2[] = {'2','0','a','b',':',':','1',0}; + WCHAR expect6_3[] = {'[','2','0','a','b',':',':','2','0','0','1',']',':','3','3','2','7','4',0}; + WCHAR expect6_3_2[] = {'[','2','0','a','b',':',':','2','0','0','1','%','4','6','6','0',']',':','3','3','2','7','4',0}; + WCHAR expect6_3_3[] = {'2','0','a','b',':',':','2','0','0','1','%','6','5','5','3','4',0}; + len = 0; sockaddr.sin_family = AF_INET; @@ -1542,7 +1556,103 @@ static void test_WSAAddressToStringW(void) ok( !ret, "WSAAddressToStringW() failed unexpectedly: %d\n", WSAGetLastError() ); ok( !lstrcmpW( address, expect4 ), "Expected different address string\n" ); - ok( len == sizeof( expect4 )/sizeof( WCHAR ), "Got size %d\n", len); + ok( len == sizeof( expect4 )/sizeof( WCHAR ), "Got %d\n", len); + + /*check to see it IPv6 is available */ + v6 = socket(AF_INET6, SOCK_STREAM, IPPROTO_TCP); + if (v6 == INVALID_SOCKET) { + skip("Could not create IPv6 socket (LastError: %d; %d expected if IPv6 not available).\n", + WSAGetLastError(), WSAEAFNOSUPPORT); + goto end; + } + + /* Test a short IPv6 address */ + len = sizeof(address6)/sizeof(WCHAR); + + sockaddr6.sin6_family = AF_INET6; + sockaddr6.sin6_port = 0x0000; + sockaddr6.sin6_scope_id = 0; + memcpy (sockaddr6.sin6_addr.s6_addr, addr6_1, sizeof(addr6_1)); + + ret = WSAAddressToStringW( (SOCKADDR*)&sockaddr6, sizeof(sockaddr6), NULL, address6, &len ); + todo_wine + { + ok( !ret, "WSAAddressToStringW() failed unexpectedly: %d\n", WSAGetLastError() ); + + ok( !lstrcmpW( address6, expect6_1 ), "Wrong string returned\n" ); + ok( len == sizeof(expect6_1)/sizeof(WCHAR), "Got %d\n", len); + } + + /* Test a longer IPv6 address */ + len = sizeof(address6)/sizeof(WCHAR); + + sockaddr6.sin6_family = AF_INET6; + sockaddr6.sin6_port = 0x0000; + sockaddr6.sin6_scope_id = 0; + memcpy (sockaddr6.sin6_addr.s6_addr, addr6_2, sizeof(addr6_2)); + + ret = WSAAddressToStringW( (SOCKADDR*)&sockaddr6, sizeof(sockaddr6), NULL, address6, &len ); + todo_wine + { + ok( !ret, "WSAAddressToStringW() failed unexpectedly: %d\n", WSAGetLastError() ); + + ok( !lstrcmpW( address6, expect6_2 ), "Wrong string returned\n" ); + ok( len == sizeof(expect6_2)/sizeof(WCHAR), "Got %d\n", len); + } + + /* Test IPv6 address and port number */ + len = sizeof(address6)/sizeof(WCHAR); + + sockaddr6.sin6_family = AF_INET6; + sockaddr6.sin6_port = 0xfa81; + sockaddr6.sin6_scope_id = 0; + memcpy (sockaddr6.sin6_addr.s6_addr, addr6_3, sizeof(addr6_3)); + + ret = WSAAddressToStringW( (SOCKADDR*)&sockaddr6, sizeof(sockaddr6), NULL, address6, &len ); + todo_wine + { + ok( !ret, "WSAAddressToStringW() failed unexpectedly: %d\n", WSAGetLastError() ); + + ok( !lstrcmpW( address6, expect6_3 ), "Wrong string returned\n" ); + ok( len == sizeof(expect6_3)/sizeof(WCHAR), "Got %d\n", len); + } + + /* Test IPv6 address, port number and scope_id */ + len = sizeof(address6)/sizeof(WCHAR); + + sockaddr6.sin6_family = AF_INET6; + sockaddr6.sin6_port = 0xfa81; + sockaddr6.sin6_scope_id = 0x1234; + memcpy (sockaddr6.sin6_addr.s6_addr, addr6_3, sizeof(addr6_3)); + + ret = WSAAddressToStringW( (SOCKADDR*)&sockaddr6, sizeof(sockaddr6), NULL, address6, &len ); + todo_wine + { + ok( !ret, "WSAAddressToStringW() failed unexpectedly: %d\n", WSAGetLastError() ); + ok( !lstrcmpW( address6, expect6_3_2 ), "Wrong string returned\n" ); + ok( len == sizeof(expect6_3_2)/sizeof(WCHAR), "Got %d\n", len); + } + + /* Test IPv6 address and scope_id */ + len = sizeof(address6)/sizeof(WCHAR); + + sockaddr6.sin6_family = AF_INET6; + sockaddr6.sin6_port = 0x0000; + sockaddr6.sin6_scope_id = 0xfffe; + memcpy (sockaddr6.sin6_addr.s6_addr, addr6_3, sizeof(addr6_3)); + + ret = WSAAddressToStringW( (SOCKADDR*)&sockaddr6, sizeof(sockaddr6), NULL, address6, &len ); + todo_wine + { + ok( !ret, "WSAAddressToStringW() failed unexpectedly: %d\n", WSAGetLastError() ); + + ok( !lstrcmpW( address6, expect6_3_3 ), "Wrong string returned\n" ); + ok( len == sizeof(expect6_3_3)/sizeof(WCHAR), "Got %d\n", len); + } + +end: + if (v6 != INVALID_SOCKET) + closesocket(v6); } static void test_WSAStringToAddressA(void)

1 0

André Hentschel : winecfg: Add the codepage pragma for German translation.
by Alexandre Julliard July 17, 2009

July 17, 2009

Module: wine Branch: master Commit: cb7c72f8f1825b49580d7ea07e5c78ea8c50d9f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb7c72f8f1825b49580d7ea07… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Jul 17 12:22:10 2009 +0200 winecfg: Add the codepage pragma for German translation. --- programs/winecfg/De.rc | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/programs/winecfg/De.rc b/programs/winecfg/De.rc index f3ba328..53c412c 100644 --- a/programs/winecfg/De.rc +++ b/programs/winecfg/De.rc @@ -23,6 +23,8 @@ #include "config.h" /* Needed for the PACKAGE_STRING definition */ #include "resource.h" +#pragma code_page(65001) + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL IDR_WINECFG MENU DISCARDABLE

1 0

André Hentschel : appwiz.cpl: Fix German translation.
by Alexandre Julliard July 17, 2009

July 17, 2009

Module: wine Branch: master Commit: 58cabeea2bb533b7e8b1fa7696cabc00df56a567 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58cabeea2bb533b7e8b1fa769… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Jul 17 12:16:41 2009 +0200 appwiz.cpl: Fix German translation. --- dlls/appwiz.cpl/De.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/appwiz.cpl/De.rc b/dlls/appwiz.cpl/De.rc index c851d46..c266d8f 100644 --- a/dlls/appwiz.cpl/De.rc +++ b/dlls/appwiz.cpl/De.rc @@ -28,7 +28,7 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL STRINGTABLE { IDS_CPL_TITLE, "Software" - IDS_CPL_DESC, "Erlaubt ihnen neue Software hinzuzufügen, oder vorhandene zu entfernen." + IDS_CPL_DESC, "Erlaubt ihnen neue Software hinzuzufügen oder zu entfernen." IDS_TAB1_TITLE, "Anwendungen" IDS_UNINSTALL_FAILED, "Der Uninstaller konnte nicht gestartet werden, '%s'. Möchten Sie den Uninstall-Eintrag für dieses Programm aus der Registrierung entfernen?"

1 0

Huw Davies : gdi32/tests: Add a broken case for some versions of winxp.
by Alexandre Julliard July 17, 2009

July 17, 2009

Module: wine Branch: master Commit: 1d66e20ead4c106fde9a7e126ba2b1de15dc9ff2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d66e20ead4c106fde9a7e126… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jul 17 10:57:03 2009 +0100 gdi32/tests: Add a broken case for some versions of winxp. --- dlls/gdi32/tests/metafile.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 4a081d6..15a2c63 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -2357,7 +2357,9 @@ static void getwinmetafilebits(UINT mode, int scale, RECT *rc) ok(EqualRect((RECT*)&enh_header->rclFrame, rc), "Frame rectangles differ\n"); size = GetWinMetaFileBits(emf, 0, NULL, mode, display_dc); - ok(size, "GetWinMetaFileBits returns 0\n"); + ok(size || + broken(size == 0), /* some versions of winxp fail for some reason */ + "GetWinMetaFileBits returns 0\n"); if(!size) goto end; mh = HeapAlloc(GetProcessHeap(), 0, size); GetWinMetaFileBits(emf, size, (BYTE*)mh, mode, display_dc);

1 0

David Adam : d3dx9: Fix D3DXQuaternionNormalize to make tests pass in Windows.
by Alexandre Julliard July 17, 2009

July 17, 2009

Module: wine Branch: master Commit: 0788ac38ab10b44278ab8da5432b3ffb44089f98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0788ac38ab10b44278ab8da54… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Fri Jul 17 11:32:38 2009 +0200 d3dx9: Fix D3DXQuaternionNormalize to make tests pass in Windows. --- dlls/d3dx9_36/math.c | 21 +++++++-------------- dlls/d3dx9_36/tests/math.c | 4 ---- 2 files changed, 7 insertions(+), 18 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index bcb2006..30f7ec9 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -1241,21 +1241,14 @@ D3DXQUATERNION* WINAPI D3DXQuaternionNormalize(D3DXQUATERNION *pout, CONST D3DXQ FLOAT norm; norm = D3DXQuaternionLength(pq); - if ( !norm ) - { - out.x = 0.0f; - out.y = 0.0f; - out.z = 0.0f; - out.w = 0.0f; - } - else - { - out.x = pq->x / norm; - out.y = pq->y / norm; - out.z = pq->z / norm; - out.w = pq->w / norm; - } + + out.x = pq->x / norm; + out.y = pq->y / norm; + out.z = pq->z / norm; + out.w = pq->w / norm; + *pout=out; + return pout; } diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index cdbfc1d..6e9f25d 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -762,10 +762,6 @@ static void D3DXQuaternionTest(void) expectedquat.x = 1.0f/11.0f; expectedquat.y = 2.0f/11.0f; expectedquat.z = 4.0f/11.0f; expectedquat.w = 10.0f/11.0f; D3DXQuaternionNormalize(&gotquat,&q); expect_vec4(expectedquat,gotquat); - /* Test the nul quaternion */ - expectedquat.x = 0.0f; expectedquat.y = 0.0f; expectedquat.z = 0.0f; expectedquat.w = 0.0f; - D3DXQuaternionNormalize(&gotquat,&nul); - expect_vec4(expectedquat,gotquat); /*_______________D3DXQuaternionRotationAxis___________________*/ axis.x = 2.0f; axis.y = 7.0; axis.z = 13.0f;

1 0

David Adam : d3dx9: Fix D3DXQuaternionInverse to make tests pass in Windows .
by Alexandre Julliard July 17, 2009

July 17, 2009

Module: wine Branch: master Commit: 831d6b588663b355ccbefcffc239f818d85b98e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=831d6b588663b355ccbefcffc… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Fri Jul 17 11:30:29 2009 +0200 d3dx9: Fix D3DXQuaternionInverse to make tests pass in Windows. --- dlls/d3dx9_36/math.c | 22 ++++++++-------------- dlls/d3dx9_36/tests/math.c | 7 ++++--- 2 files changed, 12 insertions(+), 17 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index f80a5db..bcb2006 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -1182,23 +1182,17 @@ D3DXQUATERNION* WINAPI D3DXQuaternionExp(D3DXQUATERNION *pout, CONST D3DXQUATERN D3DXQUATERNION* WINAPI D3DXQuaternionInverse(D3DXQUATERNION *pout, CONST D3DXQUATERNION *pq) { + D3DXQUATERNION out; FLOAT norm; norm = D3DXQuaternionLengthSq(pq); - if ( !norm ) - { - pout->x = 0.0f; - pout->y = 0.0f; - pout->z = 0.0f; - pout->w = 0.0f; - } - else - { - pout->x = -pq->x / norm; - pout->y = -pq->y / norm; - pout->z = -pq->z / norm; - pout->w = pq->w / norm; - } + + out.x = -pq->x / norm; + out.y = -pq->y / norm; + out.z = -pq->z / norm; + out.w = pq->w / norm; + + *pout =out; return pout; } diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 722198a..cdbfc1d 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -699,11 +699,12 @@ static void D3DXQuaternionTest(void) expectedquat.x = -1.0f/121.0f; expectedquat.y = -2.0f/121.0f; expectedquat.z = -4.0f/121.0f; expectedquat.w = 10.0f/121.0f; D3DXQuaternionInverse(&gotquat,&q); expect_vec4(expectedquat,gotquat); - /* test the null quaternion */ - expectedquat.x = 0.0f; expectedquat.y = 0.0f; expectedquat.z = 0.0f; expectedquat.w = 0.0f; - D3DXQuaternionInverse(&gotquat,&nul); + + expectedquat.x = 1.0f; expectedquat.y = 2.0f; expectedquat.z = 4.0f; expectedquat.w = 10.0f; + D3DXQuaternionInverse(&gotquat,&gotquat); expect_vec4(expectedquat,gotquat); + /*_______________D3DXQuaternionIsIdentity________________*/ s.x = 0.0f; s.y = 0.0f; s.z = 0.0f; s.w = 1.0f; expectedbool = TRUE;

1 0

Dylan Smith : richedit: Keep scrollbars hidden without WS_HSCROLL & WS_VSCROLL.
by Alexandre Julliard July 17, 2009

July 17, 2009

Module: wine Branch: master Commit: f59e41e8d5ea18c4190c983d4a5e85cd1c96f2cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=f59e41e8d5ea18c4190c983d4… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu Jul 16 18:46:04 2009 -0400 richedit: Keep scrollbars hidden without WS_HSCROLL & WS_VSCROLL. --- dlls/riched20/paint.c | 90 +++++++++++++++++++++++++++--------------------- 1 files changed, 51 insertions(+), 39 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index bc62bdb..2c1c9b9 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -1061,22 +1061,28 @@ void ME_ScrollAbs(ME_TextEditor *editor, int x, int y) if (editor->hWnd) { LONG winStyle = GetWindowLongW(editor->hWnd, GWL_STYLE); - bScrollBarIsVisible = (winStyle & WS_HSCROLL) != 0; - bScrollBarWillBeVisible = (editor->nTotalWidth > editor->sizeWindow.cx - && (editor->styleFlags & WS_HSCROLL)) - || (editor->styleFlags & ES_DISABLENOSCROLL); - if (bScrollBarIsVisible != bScrollBarWillBeVisible) - ITextHost_TxShowScrollBar(editor->texthost, SB_HORZ, - bScrollBarWillBeVisible); + if (editor->styleFlags & WS_HSCROLL) + { + bScrollBarIsVisible = (winStyle & WS_HSCROLL) != 0; + bScrollBarWillBeVisible = (editor->nTotalWidth > editor->sizeWindow.cx + && (editor->styleFlags & WS_HSCROLL)) + || (editor->styleFlags & ES_DISABLENOSCROLL); + if (bScrollBarIsVisible != bScrollBarWillBeVisible) + ITextHost_TxShowScrollBar(editor->texthost, SB_HORZ, + bScrollBarWillBeVisible); + } - bScrollBarIsVisible = (winStyle & WS_VSCROLL) != 0; - bScrollBarWillBeVisible = (editor->nTotalLength > editor->sizeWindow.cy - && (editor->styleFlags & WS_VSCROLL) - && (editor->styleFlags & ES_MULTILINE)) - || (editor->styleFlags & ES_DISABLENOSCROLL); - if (bScrollBarIsVisible != bScrollBarWillBeVisible) - ITextHost_TxShowScrollBar(editor->texthost, SB_VERT, - bScrollBarWillBeVisible); + if (editor->styleFlags & WS_VSCROLL) + { + bScrollBarIsVisible = (winStyle & WS_VSCROLL) != 0; + bScrollBarWillBeVisible = (editor->nTotalLength > editor->sizeWindow.cy + && (editor->styleFlags & WS_VSCROLL) + && (editor->styleFlags & ES_MULTILINE)) + || (editor->styleFlags & ES_DISABLENOSCROLL); + if (bScrollBarIsVisible != bScrollBarWillBeVisible) + ITextHost_TxShowScrollBar(editor->texthost, SB_VERT, + bScrollBarWillBeVisible); + } } ME_UpdateScrollBar(editor); } @@ -1136,6 +1142,7 @@ void ME_UpdateScrollBar(ME_TextEditor *editor) si.cbSize = sizeof(si); si.fMask = SIF_PAGE | SIF_RANGE | SIF_POS; + si.nMin = 0; if (editor->styleFlags & ES_DISABLENOSCROLL) si.fMask |= SIF_DISABLENOSCROLL; @@ -1150,20 +1157,19 @@ void ME_UpdateScrollBar(ME_TextEditor *editor) return; } - si.nMin = 0; si.nMax = editor->nTotalWidth; si.nPos = editor->horz_si.nPos; si.nPage = editor->sizeWindow.cx; - if (si.nMin != editor->horz_si.nMin || - si.nMax != editor->horz_si.nMax || + if (si.nMax != editor->horz_si.nMax || si.nPage != editor->horz_si.nPage) { TRACE("min=%d max=%d page=%d\n", si.nMin, si.nMax, si.nPage); - editor->horz_si.nMin = si.nMin; editor->horz_si.nMax = si.nMax; editor->horz_si.nPage = si.nPage; - if (bScrollBarWillBeVisible || bScrollBarWasVisible) { + if ((bScrollBarWillBeVisible || bScrollBarWasVisible) && + editor->styleFlags & WS_HSCROLL) + { if (editor->hWnd) { SetScrollInfo(editor->hWnd, SB_HORZ, &si, TRUE); } else { @@ -1175,14 +1181,17 @@ void ME_UpdateScrollBar(ME_TextEditor *editor) } } - if (si.fMask & SIF_DISABLENOSCROLL) { - bScrollBarWillBeVisible = TRUE; - } else if (!(editor->styleFlags & WS_HSCROLL)) { - bScrollBarWillBeVisible = FALSE; - } + if (editor->styleFlags & WS_HSCROLL) + { + if (si.fMask & SIF_DISABLENOSCROLL) { + bScrollBarWillBeVisible = TRUE; + } else if (!(editor->styleFlags & WS_HSCROLL)) { + bScrollBarWillBeVisible = FALSE; + } - if (bScrollBarWasVisible != bScrollBarWillBeVisible) - ITextHost_TxShowScrollBar(editor->texthost, SB_HORZ, bScrollBarWillBeVisible); + if (bScrollBarWasVisible != bScrollBarWillBeVisible) + ITextHost_TxShowScrollBar(editor->texthost, SB_HORZ, bScrollBarWillBeVisible); + } /* Update vertical scrollbar */ bScrollBarWasVisible = editor->vert_si.nMax > editor->vert_si.nPage; @@ -1201,15 +1210,15 @@ void ME_UpdateScrollBar(ME_TextEditor *editor) si.nPos = editor->vert_si.nPos; si.nPage = editor->sizeWindow.cy; - if (si.nMin != editor->vert_si.nMin || - si.nMax != editor->vert_si.nMax || + if (si.nMax != editor->vert_si.nMax || si.nPage != editor->vert_si.nPage) { TRACE("min=%d max=%d page=%d\n", si.nMin, si.nMax, si.nPage); - editor->vert_si.nMin = si.nMin; editor->vert_si.nMax = si.nMax; editor->vert_si.nPage = si.nPage; - if (bScrollBarWillBeVisible || bScrollBarWasVisible) { + if ((bScrollBarWillBeVisible || bScrollBarWasVisible) && + editor->styleFlags & WS_VSCROLL) + { if (editor->hWnd) { SetScrollInfo(editor->hWnd, SB_VERT, &si, TRUE); } else { @@ -1221,15 +1230,18 @@ void ME_UpdateScrollBar(ME_TextEditor *editor) } } - if (si.fMask & SIF_DISABLENOSCROLL) { - bScrollBarWillBeVisible = TRUE; - } else if (!(editor->styleFlags & WS_VSCROLL)) { - bScrollBarWillBeVisible = FALSE; - } + if (editor->styleFlags & WS_VSCROLL) + { + if (si.fMask & SIF_DISABLENOSCROLL) { + bScrollBarWillBeVisible = TRUE; + } else if (!(editor->styleFlags & WS_VSCROLL)) { + bScrollBarWillBeVisible = FALSE; + } - if (bScrollBarWasVisible != bScrollBarWillBeVisible) - ITextHost_TxShowScrollBar(editor->texthost, SB_VERT, - bScrollBarWillBeVisible); + if (bScrollBarWasVisible != bScrollBarWillBeVisible) + ITextHost_TxShowScrollBar(editor->texthost, SB_VERT, + bScrollBarWillBeVisible); + } } void ME_EnsureVisible(ME_TextEditor *editor, ME_Cursor *pCursor)

1 0

Dylan Smith : richedit: Initially disable scrollbars for ES_DISABLENOSCROLL .
by Alexandre Julliard July 17, 2009

July 17, 2009

Module: wine Branch: master Commit: eddccdd1f2f5bff7bd5105e64ce4795653fc9786 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eddccdd1f2f5bff7bd5105e64… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu Jul 16 18:45:59 2009 -0400 richedit: Initially disable scrollbars for ES_DISABLENOSCROLL. Previously after initial window creation of a richedit control with the ES_DISABLENOSCROLL window style flag the scrollbar would be shown but not disabled. This patch fixes this issue by explicitly disabling and showing the scrollbar. --- dlls/riched20/editor.c | 32 +++++++++++++++++++------------- 1 files changed, 19 insertions(+), 13 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 4cd72c8..7ffb7cb 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3842,23 +3842,29 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, } case WM_CREATE: { - SCROLLINFO si; + INT max; ME_SetDefaultFormatRect(editor); - si.cbSize = sizeof(si); - si.fMask = SIF_PAGE | SIF_RANGE; + max = (editor->styleFlags & ES_DISABLENOSCROLL) ? 1 : 0; + if (~editor->styleFlags & ES_DISABLENOSCROLL || editor->styleFlags & WS_VSCROLL) + ITextHost_TxSetScrollRange(editor->texthost, SB_VERT, 0, max, TRUE); + + if (~editor->styleFlags & ES_DISABLENOSCROLL || editor->styleFlags & WS_HSCROLL) + ITextHost_TxSetScrollRange(editor->texthost, SB_HORZ, 0, max, TRUE); + if (editor->styleFlags & ES_DISABLENOSCROLL) - si.fMask |= SIF_DISABLENOSCROLL; - si.nMax = (si.fMask & SIF_DISABLENOSCROLL) ? 1 : 0; - si.nMin = 0; - si.nPage = 0; - if (editor->hWnd) { - SetScrollInfo(editor->hWnd, SB_VERT, &si, TRUE); - SetScrollInfo(editor->hWnd, SB_HORZ, &si, TRUE); - } else { - ITextHost_TxSetScrollRange(editor->texthost, SB_VERT, si.nMin, si.nMax, TRUE); - ITextHost_TxSetScrollRange(editor->texthost, SB_HORZ, si.nMin, si.nMax, TRUE); + { + if (editor->styleFlags & WS_VSCROLL) + { + ITextHost_TxEnableScrollBar(editor->texthost, SB_VERT, ESB_DISABLE_BOTH); + ITextHost_TxShowScrollBar(editor->texthost, SB_VERT, TRUE); + } + if (editor->styleFlags & WS_HSCROLL) + { + ITextHost_TxEnableScrollBar(editor->texthost, SB_HORZ, ESB_DISABLE_BOTH); + ITextHost_TxShowScrollBar(editor->texthost, SB_HORZ, TRUE); + } } ME_CommitUndo(editor);

1 0