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

Jacek Caban : textstor.idl: Added more error code declarations.
by Alexandre Julliard 20 Jul '09

20 Jul '09

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 20 Jul '09

20 Jul '09

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 20 Jul '09

20 Jul '09

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 20 Jul '09

20 Jul '09

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 20 Jul '09

20 Jul '09

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 20 Jul '09

20 Jul '09

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

Davide Pizzetti : clock: Updated Italian translation.
by Alexandre Julliard 20 Jul '09

20 Jul '09

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

Marcus Meissner : wmc: Duplicate wine_cp_wcstombs check here too (Coverity) .
by Alexandre Julliard 20 Jul '09

20 Jul '09

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

Frédéric Delanoy : kernel32: Update French translation of error messages.
by Alexandre Julliard 20 Jul '09

20 Jul '09

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 20 Jul '09

20 Jul '09

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