Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 39407: - Don't pass empty ServiceArgumentVector to StartService - Fixes a heap corruption
by janderwald＠svn.reactos.org 05 Feb '09

05 Feb '09

Author: janderwald Date: Thu Feb 5 07:30:24 2009 New Revision: 39407 URL: http://svn.reactos.org/svn/reactos?rev=39407&view=rev Log: - Don't pass empty ServiceArgumentVector to StartService - Fixes a heap corruption Modified: trunk/reactos/base/applications/sc/start.c Modified: trunk/reactos/base/applications/sc/start.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/start… ============================================================================== --- trunk/reactos/base/applications/sc/start.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/sc/start.c [iso-8859-1] Thu Feb 5 07:30:24 2009 @@ -45,6 +45,11 @@ if (hSc == NULL) goto fail; + if (!ArgCount) + { + ServiceArgs = NULL; + } + if (! StartService(hSc, ArgCount, ServiceArgs))

1 0

[janderwald] 39406: - Prevent using of uninitialized values in error case - Don't leak ServiceHandle and ServiceManagerHandle
by janderwald＠svn.reactos.org 05 Feb '09

05 Feb '09

Author: janderwald Date: Thu Feb 5 06:56:11 2009 New Revision: 39406 URL: http://svn.reactos.org/svn/reactos?rev=39406&view=rev Log: - Prevent using of uninitialized values in error case - Don't leak ServiceHandle and ServiceManagerHandle Modified: trunk/reactos/base/applications/sc/query.c trunk/reactos/base/applications/sc/start.c Modified: trunk/reactos/base/applications/sc/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/query… ============================================================================== --- trunk/reactos/base/applications/sc/query.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/sc/query.c [iso-8859-1] Thu Feb 5 06:56:11 2009 @@ -26,9 +26,9 @@ LPSERVICE_STATUS_PROCESS QueryService(LPCTSTR ServiceName) { - SC_HANDLE hSCManager; + SC_HANDLE hSCManager = NULL; LPSERVICE_STATUS_PROCESS pServiceInfo = NULL; - SC_HANDLE hSc; + SC_HANDLE hSc = NULL; DWORD BufSiz = 0; DWORD BytesNeeded = 0; DWORD Ret; @@ -71,6 +71,8 @@ goto fail; } + CloseServiceHandle(hSc); + CloseServiceHandle(hSCManager); return pServiceInfo; fail: Modified: trunk/reactos/base/applications/sc/start.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/start… ============================================================================== --- trunk/reactos/base/applications/sc/start.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/sc/start.c [iso-8859-1] Thu Feb 5 06:56:11 2009 @@ -11,8 +11,8 @@ BOOL Start(LPCTSTR ServiceName, LPCTSTR *ServiceArgs, INT ArgCount) { - SC_HANDLE hSCManager; - SC_HANDLE hSc; + SC_HANDLE hSCManager = NULL; + SC_HANDLE hSc = NULL; LPSERVICE_STATUS_PROCESS pServiceInfo = NULL; #ifdef SCDBG

1 0

[cwittich] 39405: enable iexplore build
by cwittich＠svn.reactos.org 05 Feb '09

05 Feb '09

Author: cwittich Date: Thu Feb 5 06:52:59 2009 New Revision: 39405 URL: http://svn.reactos.org/svn/reactos?rev=39405&view=rev Log: enable iexplore build Modified: trunk/reactos/base/applications/applications.rbuild Modified: trunk/reactos/base/applications/applications.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/applicat… ============================================================================== --- trunk/reactos/base/applications/applications.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/applications/applications.rbuild [iso-8859-1] Thu Feb 5 06:52:59 2009 @@ -25,11 +25,9 @@ <directory name="hh"> <xi:include href="hh/hh.rbuild" /> </directory> - <directory name="kbswitch"> <xi:include href="kbswitch/kbswitch.rbuild" /> </directory>

1 0

[dchapyshev] 39404: - Sync usp10 with Wine head
by dchapyshev＠svn.reactos.org 05 Feb '09

05 Feb '09

Author: dchapyshev Date: Thu Feb 5 05:07:55 2009 New Revision: 39404 URL: http://svn.reactos.org/svn/reactos?rev=39404&view=rev Log: - Sync usp10 with Wine head Modified: trunk/reactos/dll/win32/usp10/usp10.c Modified: trunk/reactos/dll/win32/usp10/usp10.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/usp10.c?re… ============================================================================== --- trunk/reactos/dll/win32/usp10/usp10.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/usp10.c [iso-8859-1] Thu Feb 5 05:07:55 2009 @@ -138,10 +138,16 @@ &props[73] }; +#define GLYPH_BLOCK_SHIFT 8 +#define GLYPH_BLOCK_SIZE (1UL << GLYPH_BLOCK_SHIFT) +#define GLYPH_BLOCK_MASK (GLYPH_BLOCK_SIZE - 1) +#define GLYPH_MAX 65536 + typedef struct { - HDC hdc; LOGFONTW lf; TEXTMETRICW tm; + WORD *glyphs[GLYPH_MAX / GLYPH_BLOCK_SIZE]; + ABC *widths[GLYPH_MAX / GLYPH_BLOCK_SIZE]; } ScriptCache; typedef struct { @@ -155,6 +161,7 @@ } StringGlyphs; typedef struct { + HDC hdc; BOOL invalid; int clip_len; ScriptCache *sc; @@ -187,68 +194,78 @@ return HeapFree(GetProcessHeap(), 0, mem); } -static HDC get_cache_hdc(SCRIPT_CACHE *psc) -{ - return ((ScriptCache *)*psc)->hdc; -} - -static WCHAR get_cache_default_char(SCRIPT_CACHE *psc) +static inline WCHAR get_cache_default_char(SCRIPT_CACHE *psc) { return ((ScriptCache *)*psc)->tm.tmDefaultChar; } -static LONG get_cache_height(SCRIPT_CACHE *psc) +static inline LONG get_cache_height(SCRIPT_CACHE *psc) { return ((ScriptCache *)*psc)->tm.tmHeight; } -static BYTE get_cache_pitch_family(SCRIPT_CACHE *psc) +static inline BYTE get_cache_pitch_family(SCRIPT_CACHE *psc) { return ((ScriptCache *)*psc)->tm.tmPitchAndFamily; } -static HRESULT init_script_cache(const HDC hdc, ScriptCache *sc) -{ - if (!GetTextMetricsW(hdc, &sc->tm)) return E_INVALIDARG; - if (!GetObjectW(GetCurrentObject(hdc, OBJ_FONT), sizeof(LOGFONTW), &sc->lf)) return E_INVALIDARG; - sc->hdc = hdc; - return S_OK; -} - -static HRESULT get_script_cache(const HDC hdc, SCRIPT_CACHE *psc) -{ +static inline WORD get_cache_glyph(SCRIPT_CACHE *psc, WCHAR c) +{ + WORD *block = ((ScriptCache *)*psc)->glyphs[c >> GLYPH_BLOCK_SHIFT]; + + if (!block) return 0; + return block[c & GLYPH_BLOCK_MASK]; +} + +static inline WORD set_cache_glyph(SCRIPT_CACHE *psc, WCHAR c, WORD glyph) +{ + WORD **block = &((ScriptCache *)*psc)->glyphs[c >> GLYPH_BLOCK_SHIFT]; + + if (!*block && !(*block = heap_alloc_zero(sizeof(WORD) * GLYPH_BLOCK_SIZE))) return 0; + return ((*block)[c & GLYPH_BLOCK_MASK] = glyph); +} + +static inline BOOL get_cache_glyph_widths(SCRIPT_CACHE *psc, WORD glyph, ABC *abc) +{ + static const ABC nil; + ABC *block = ((ScriptCache *)*psc)->widths[glyph >> GLYPH_BLOCK_SHIFT]; + + if (!block || !memcmp(&block[glyph & GLYPH_BLOCK_MASK], &nil, sizeof(ABC))) return FALSE; + memcpy(abc, &block[glyph & GLYPH_BLOCK_MASK], sizeof(ABC)); + return TRUE; +} + +static inline BOOL set_cache_glyph_widths(SCRIPT_CACHE *psc, WORD glyph, ABC *abc) +{ + ABC **block = &((ScriptCache *)*psc)->widths[glyph >> GLYPH_BLOCK_SHIFT]; + + if (!*block && !(*block = heap_alloc_zero(sizeof(ABC) * GLYPH_BLOCK_SIZE))) return FALSE; + memcpy(&(*block)[glyph & GLYPH_BLOCK_MASK], abc, sizeof(ABC)); + return TRUE; +} + +static HRESULT init_script_cache(const HDC hdc, SCRIPT_CACHE *psc) +{ + ScriptCache *sc; + if (!psc) return E_INVALIDARG; - if (!*psc) - { - HRESULT ret; - ScriptCache *sc; - - if (!hdc) return E_PENDING; - if (!(sc = heap_alloc_zero(sizeof(ScriptCache)))) return E_OUTOFMEMORY; - if ((ret = init_script_cache(hdc, sc))) - { - heap_free(sc); - return ret; - } - *psc = sc; - } - TRACE("<- %p\n", *psc); - return S_OK; -} - -static HFONT select_cached_font(SCRIPT_CACHE *psc) -{ - HFONT old_font; - ScriptCache *sc = *psc; - - old_font = SelectObject(sc->hdc, CreateFontIndirectW(&sc->lf)); - return old_font; -} - -static void unselect_cached_font(SCRIPT_CACHE *psc, HFONT old_font) -{ - ScriptCache *sc = *psc; - DeleteObject(SelectObject(sc->hdc, old_font)); + if (*psc) return S_OK; + if (!hdc) return E_PENDING; + + if (!(sc = heap_alloc_zero(sizeof(ScriptCache)))) return E_OUTOFMEMORY; + if (!GetTextMetricsW(hdc, &sc->tm)) + { + heap_free(sc); + return E_INVALIDARG; + } + if (!GetObjectW(GetCurrentObject(hdc, OBJ_FONT), sizeof(LOGFONTW), &sc->lf)) + { + heap_free(sc); + return E_INVALIDARG; + } + *psc = sc; + TRACE("<- %p\n", sc); + return S_OK; } /*********************************************************************** @@ -284,10 +301,16 @@ { TRACE("%p\n", psc); - if (psc) - { - heap_free(*psc); - *psc = NULL; + if (psc && *psc) + { + unsigned int i; + for (i = 0; i < GLYPH_MAX / GLYPH_BLOCK_SIZE; i++) + { + heap_free(((ScriptCache *)*psc)->glyphs[i]); + heap_free(((ScriptCache *)*psc)->widths[i]); + } + heap_free(*psc); + *psc = NULL; } return S_OK; } @@ -337,7 +360,7 @@ TRACE("%p,%p,%p\n", hdc, psc, sfp); if (!sfp) return E_INVALIDARG; - if ((hr = get_script_cache(hdc, psc))) return hr; + if ((hr = init_script_cache(hdc, psc)) != S_OK) return hr; if (sfp->cBytes != sizeof(SCRIPT_FONTPROPERTIES)) return E_INVALIDARG; @@ -496,6 +519,8 @@ #define Script_Arabic 6 #define Script_Latin 1 #define Script_Numeric 5 +#define Script_CR 22 +#define Script_LF 23 int cnt = 0, index = 0; int New_Script = SCRIPT_UNDEFINED; @@ -509,6 +534,12 @@ pItems[index].iCharPos = 0; memset(&pItems[index].a, 0, sizeof(SCRIPT_ANALYSIS)); + if (pwcInChars[cnt] == '\r') + pItems[index].a.eScript = Script_CR; + else + if (pwcInChars[cnt] == '\n') + pItems[index].a.eScript = Script_LF; + else if (pwcInChars[cnt] >= Numeric_start && pwcInChars[cnt] <= Numeric_stop) pItems[index].a.eScript = Script_Numeric; else @@ -523,10 +554,16 @@ TRACE("New_Script=%d, eScript=%d index=%d cnt=%d iCharPos=%d\n", New_Script, pItems[index].a.eScript, index, cnt, - pItems[index].iCharPos = cnt); - - for (cnt=0; cnt < cInChars; cnt++) - { + pItems[index].iCharPos); + + for (cnt=1; cnt < cInChars; cnt++) + { + if (pwcInChars[cnt] == '\r') + New_Script = Script_CR; + else + if (pwcInChars[cnt] == '\n') + New_Script = Script_LF; + else if ((pwcInChars[cnt] >= Numeric_start && pwcInChars[cnt] <= Numeric_stop) || (New_Script == Script_Numeric && pwcInChars[cnt] == Numeric_space)) New_Script = Script_Numeric; @@ -535,7 +572,8 @@ || (New_Script == Script_Arabic && pwcInChars[cnt] == Numeric_space)) New_Script = Script_Arabic; else - if ((WCHAR) pwcInChars[cnt] >= Latin_start && (WCHAR) pwcInChars[cnt] <= Latin_stop) + if ((pwcInChars[cnt] >= Latin_start && pwcInChars[cnt] <= Latin_stop) + || (New_Script == Script_Latin && pwcInChars[cnt] == Numeric_space)) New_Script = Script_Latin; else New_Script = SCRIPT_UNDEFINED; @@ -557,7 +595,7 @@ if (New_Script == Script_Arabic) pItems[index].a.s.uBidiLevel = 1; - TRACE("index=%d cnt=%d iCharPos=%d\n", index, cnt, pItems[index].iCharPos = cnt); + TRACE("index=%d cnt=%d iCharPos=%d\n", index, cnt, pItems[index].iCharPos); } } @@ -609,6 +647,7 @@ /* FIXME: handle clipping */ analysis->clip_len = cString; + analysis->hdc = hdc; hr = ScriptItemize(pString, cString, num_items, psControl, psState, analysis->pItem, &analysis->numItems); @@ -625,7 +664,7 @@ hr = ScriptItemize(pString, cString, num_items, psControl, psState, analysis->pItem, &analysis->numItems); } - if (hr) goto error; + if (hr != S_OK) goto error; if ((analysis->logattrs = heap_alloc(sizeof(SCRIPT_LOGATTR) * cString))) ScriptBreak(pString, cString, (SCRIPT_STRING_ANALYSIS)analysis, analysis->logattrs); @@ -753,7 +792,7 @@ cnt += analysis->glyphs[item].numGlyphs; /* point to the end of the copied text */ } - hr = ScriptTextOut(analysis->sc->hdc, (SCRIPT_CACHE *)&analysis->sc, iX, iY, + hr = ScriptTextOut(analysis->hdc, (SCRIPT_CACHE *)&analysis->sc, iX, iY, uOptions, prc, &analysis->pItem->a, NULL, 0, glyphs, cnt, analysis->glyphs->piAdvance, NULL, analysis->glyphs->pGoffset); TRACE("ScriptTextOut hr=%08x\n", hr); @@ -1006,7 +1045,7 @@ */ HRESULT WINAPI ScriptBreak(const WCHAR *chars, int count, const SCRIPT_ANALYSIS *sa, SCRIPT_LOGATTR *la) { - unsigned int i; + int i; TRACE("(%s, %d, %p, %p)\n", debugstr_wn(chars, count), count, sa, la); @@ -1017,8 +1056,14 @@ memset(&la[i], 0, sizeof(SCRIPT_LOGATTR)); /* FIXME: set the other flags */ - la[i].fWhiteSpace = isspaceW(chars[i]); + la[i].fWhiteSpace = (chars[i] == ' '); la[i].fCharStop = 1; + + if (i > 0 && la[i - 1].fWhiteSpace) + { + la[i].fSoftBreak = 1; + la[i].fWordStop = 1; + } } return S_OK; } @@ -1196,7 +1241,8 @@ */ HRESULT WINAPI ScriptIsComplex(const WCHAR *chars, int len, DWORD flag) { - unsigned int i, j; + int i; + unsigned int j; TRACE("(%s,%d,0x%x)\n", debugstr_wn(chars, len), len, flag); @@ -1238,47 +1284,56 @@ SCRIPT_ANALYSIS *psa, WORD *pwOutGlyphs, WORD *pwLogClust, SCRIPT_VISATTR *psva, int *pcGlyphs) { - int cnt; HRESULT hr; - HFONT hfont; - - TRACE("(%p, %p, %p, %d, %d, %p)\n", hdc, psc, pwcChars, cChars, cMaxGlyphs, psa); + unsigned int i; + + TRACE("(%p, %p, %s, %d, %d, %p, %p, %p, %p, %p)\n", hdc, psc, debugstr_wn(pwcChars, cChars), + cChars, cMaxGlyphs, psa, pwOutGlyphs, pwLogClust, psva, pcGlyphs); + if (psa) TRACE("psa values: %d, %d, %d, %d, %d, %d, %d\n", psa->eScript, psa->fRTL, psa->fLayoutRTL, psa->fLinkBefore, psa->fLinkAfter, psa->fLogicalOrder, psa->fNoGlyphIndex); if (!psva || !pcGlyphs) return E_INVALIDARG; if (cChars > cMaxGlyphs) return E_OUTOFMEMORY; - if ((hr = get_script_cache(hdc, psc))) return hr; *pcGlyphs = cChars; - - hfont = select_cached_font(psc); + if ((hr = init_script_cache(hdc, psc)) != S_OK) return hr; if ((get_cache_pitch_family(psc) & TMPF_TRUETYPE) && !psa->fNoGlyphIndex) { - GetGlyphIndicesW(get_cache_hdc(psc), pwcChars, cChars, pwOutGlyphs, 0); + for (i = 0; i < cChars; i++) + { + if (!(pwOutGlyphs[i] = get_cache_glyph(psc, pwcChars[i]))) + { + WORD glyph; + if (!hdc) return E_PENDING; + if (GetGlyphIndicesW(hdc, &pwcChars[i], 1, &glyph, GGI_MARK_NONEXISTING_GLYPHS) == GDI_ERROR) return S_FALSE; + pwOutGlyphs[i] = set_cache_glyph(psc, pwcChars[i], glyph); + } + } } else { TRACE("no glyph translation\n"); - for (cnt = 0; cnt < cChars; cnt++) pwOutGlyphs[cnt] = pwcChars[cnt]; + for (i = 0; i < cChars; i++) pwOutGlyphs[i] = pwcChars[i]; } if (psva) { /* set up a valid SCRIPT_VISATTR and LogClust for each char in this run */ - for (cnt = 0; cnt < cChars; cnt++) + for (i = 0; i < cChars; i++) { /* FIXME: set to better values */ - psva[cnt].uJustification = 2; - psva[cnt].fClusterStart = 1; - psva[cnt].fDiacritic = 0; - psva[cnt].fZeroWidth = 0; - - if (pwLogClust) pwLogClust[cnt] = cnt; + psva[i].uJustification = (pwcChars[i] == ' ') ? SCRIPT_JUSTIFY_BLANK : SCRIPT_JUSTIFY_CHARACTER; + psva[i].fClusterStart = 1; + psva[i].fDiacritic = 0; + psva[i].fZeroWidth = 0; + psva[i].fReserved = 0; + psva[i].fShapeReserved = 0; + + if (pwLogClust) pwLogClust[i] = i; } } - unselect_cached_font(psc, hfont); return S_OK; } @@ -1307,58 +1362,46 @@ SCRIPT_ANALYSIS *psa, int *piAdvance, GOFFSET *pGoffset, ABC *pABC ) { HRESULT hr; - LPABC lpABC; - HFONT hfont; - unsigned int i; - - TRACE("(%p, %p, %p, %s, %d, %p, %p, %p)\n", hdc, psc, pwGlyphs, - debugstr_wn(pwGlyphs, cGlyphs), cGlyphs, psva, psa, piAdvance); + int i; + + TRACE("(%p, %p, %p, %d, %p, %p, %p, %p, %p)\n", hdc, psc, pwGlyphs, cGlyphs, psva, psa, + piAdvance, pGoffset, pABC); if (!psva) return E_INVALIDARG; - if ((hr = get_script_cache(hdc, psc))) return hr; - - hfont = select_cached_font(psc); - - /* Here we need to calculate the width of the run unit. At this point the input string - * has been converted to glyphs and we still need to translate back to the original chars - * to get the correct ABC widths. */ - - if (!(lpABC = heap_alloc_zero(sizeof(ABC) * cGlyphs))) return E_OUTOFMEMORY; + if ((hr = init_script_cache(hdc, psc)) != S_OK) return hr; + if (pABC) memset(pABC, 0, sizeof(ABC)); - - if ((get_cache_pitch_family(psc) & TMPF_TRUETYPE) && !psa->fNoGlyphIndex) - { - GetCharABCWidthsI(get_cache_hdc(psc), 0, cGlyphs, (WORD *)pwGlyphs, lpABC); - } - else - { - INT width; - for (i = 0; i < cGlyphs; i++) + for (i = 0; i < cGlyphs; i++) + { + ABC abc; + if (!get_cache_glyph_widths(psc, pwGlyphs[i], &abc)) { - GetCharWidth32W(get_cache_hdc(psc), pwGlyphs[i], pwGlyphs[i], &width); - lpABC[i].abcB = width; + if (!hdc) return E_PENDING; + if ((get_cache_pitch_family(psc) & TMPF_TRUETYPE) && !psa->fNoGlyphIndex) + { + if (!GetCharABCWidthsI(hdc, 0, 1, (WORD *)&pwGlyphs[i], &abc)) return S_FALSE; + } + else + { + INT width; + if (!GetCharWidth32W(hdc, pwGlyphs[i], pwGlyphs[i], &width)) return S_FALSE; + abc.abcB = width; + abc.abcA = abc.abcC = 0; + } + set_cache_glyph_widths(psc, pwGlyphs[i], &abc); } - } - - for (i = 0; i < cGlyphs; i++) - { - TRACE(" Glyph=%04x, abcA=%d, abcB=%d, abcC=%d index=%d\n", - pwGlyphs[i], lpABC[i].abcA, lpABC[i].abcB, lpABC[i].abcC, i); - if (pABC) { - pABC->abcA += lpABC[i].abcA; - pABC->abcB += lpABC[i].abcB; - pABC->abcC += lpABC[i].abcC; + pABC->abcA += abc.abcA; + pABC->abcB += abc.abcB; + pABC->abcC += abc.abcC; } /* FIXME: set to more reasonable values */ if (pGoffset) pGoffset[i].du = pGoffset[i].dv = 0; - if (piAdvance) piAdvance[i] = lpABC[i].abcA + lpABC[i].abcB + lpABC[i].abcC; - } + if (piAdvance) piAdvance[i] = abc.abcA + abc.abcB + abc.abcC; + } + if (pABC) TRACE("Total for run: abcA=%d, abcB=%d, abcC=%d\n", pABC->abcA, pABC->abcB, pABC->abcC); - - heap_free(lpABC); - unselect_cached_font(psc, hfont); return S_OK; } @@ -1383,19 +1426,32 @@ int cChars, DWORD dwFlags, WORD *pwOutGlyphs) { HRESULT hr; - HFONT hfont; + int i; TRACE("(%p,%p,%s,%d,0x%x,%p)\n", hdc, psc, debugstr_wn(pwcInChars, cChars), cChars, dwFlags, pwOutGlyphs); - if ((hr = get_script_cache(hdc, psc))) return hr; - - hfont = select_cached_font(psc); - if (GetGlyphIndicesW(get_cache_hdc(psc), pwcInChars, cChars, pwOutGlyphs, 0) == GDI_ERROR) - hr = S_FALSE; - - unselect_cached_font(psc, hfont); - return hr; + if ((hr = init_script_cache(hdc, psc)) != S_OK) return hr; + + if ((get_cache_pitch_family(psc) & TMPF_TRUETYPE)) + { + for (i = 0; i < cChars; i++) + { + if (!(pwOutGlyphs[i] = get_cache_glyph(psc, pwcInChars[i]))) + { + WORD glyph; + if (!hdc) return E_PENDING; + if (GetGlyphIndicesW(hdc, &pwcInChars[i], 1, &glyph, GGI_MARK_NONEXISTING_GLYPHS) == GDI_ERROR) return S_FALSE; + pwOutGlyphs[i] = set_cache_glyph(psc, pwcInChars[i], glyph); + } + } + } + else + { + TRACE("no glyph translation\n"); + for (i = 0; i < cChars; i++) pwOutGlyphs[i] = pwcInChars[i]; + } + return S_OK; } /*********************************************************************** @@ -1447,7 +1503,7 @@ TRACE("(%p, %p, %p)\n", hdc, psc, height); if (!height) return E_INVALIDARG; - if ((hr = get_script_cache(hdc, psc))) return hr; + if ((hr = init_script_cache(hdc, psc)) != S_OK) return hr; *height = get_cache_height(psc); return S_OK; @@ -1470,18 +1526,29 @@ */ HRESULT WINAPI ScriptGetGlyphABCWidth(HDC hdc, SCRIPT_CACHE *psc, WORD glyph, ABC *abc) { - HFONT hfont; - HRESULT hr = S_OK; + HRESULT hr; TRACE("(%p, %p, 0x%04x, %p)\n", hdc, psc, glyph, abc); - if ((hr = get_script_cache(hdc, psc))) return hr; - - hfont = select_cached_font(psc); - if (!GetCharABCWidthsI(get_cache_hdc(psc), 0, 1, &glyph, abc)) hr = E_HANDLE; - - unselect_cached_font(psc, hfont); - return hr; + if ((hr = init_script_cache(hdc, psc)) != S_OK) return hr; + + if (!get_cache_glyph_widths(psc, glyph, abc)) + { + if (!hdc) return E_PENDING; + if ((get_cache_pitch_family(psc) & TMPF_TRUETYPE)) + { + if (!GetCharABCWidthsI(hdc, 0, 1, &glyph, abc)) return S_FALSE; + } + else + { + INT width; + if (!GetCharWidth32W(hdc, glyph, glyph, &width)) return S_FALSE; + abc->abcB = width; + abc->abcA = abc->abcC = 0; + } + set_cache_glyph_widths(psc, glyph, abc); + } + return S_OK; } /*********************************************************************** @@ -1601,7 +1668,7 @@ */ const SIZE * WINAPI ScriptString_pSize(SCRIPT_STRING_ANALYSIS ssa) { - unsigned int i, j; + int i, j; StringAnalysis *analysis = ssa; TRACE("(%p)\n", ssa); @@ -1680,7 +1747,8 @@ */ HRESULT WINAPI ScriptStringGetOrder(SCRIPT_STRING_ANALYSIS ssa, UINT *order) { - unsigned int i, j, k; + int i, j; + unsigned int k; StringAnalysis *analysis = ssa; TRACE("(%p)\n", ssa); @@ -1727,9 +1795,8 @@ return S_OK; } - -VOID WINAPI LpkPresent() -{ - /* FIXME */ - ERR("LPK: %s is unimplemented, please try again later.\n", __FUNCTION__); -} +VOID WINAPI LpkPresent() +{ + /* FIXME */ + ERR("LPK: %s is unimplemented, please try again later.\n", __FUNCTION__); +}

1 0

[cwittich] 39403: Alexandre Julliard : include: Fix packing of the msacm structures. <julliard at winehq.org>
by cwittich＠svn.reactos.org 05 Feb '09

05 Feb '09

Author: cwittich Date: Thu Feb 5 03:09:29 2009 New Revision: 39403 URL: http://svn.reactos.org/svn/reactos?rev=39403&view=rev Log: Alexandre Julliard : include: Fix packing of the msacm structures. <julliard at winehq.org> Modified: trunk/reactos/include/psdk/msacm.h Modified: trunk/reactos/include/psdk/msacm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/msacm.h?rev=3… ============================================================================== --- trunk/reactos/include/psdk/msacm.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/msacm.h [iso-8859-1] Thu Feb 5 03:09:29 2009 @@ -25,6 +25,8 @@ extern "C" { #endif /* defined(__cplusplus) */ +#include <pshpack1.h> + #define ACMAPI WINAPI /*********************************************************************** @@ -773,6 +775,8 @@ HACMSTREAM has, PACMSTREAMHEADER pash, DWORD fdwUnprepare ); +#include <poppack.h> + #ifdef __cplusplus } /* extern "C" */ #endif /* defined(__cplusplus) */

1 0

[cwittich] 39402: shell32: Fixed potential buffer overwrite in execute_from_key (Coverity). Marcus Meissner <marcus at jet.franken.de>
by cwittich＠svn.reactos.org 05 Feb '09

05 Feb '09

Author: cwittich Date: Thu Feb 5 02:55:28 2009 New Revision: 39402 URL: http://svn.reactos.org/svn/reactos?rev=39402&view=rev Log: shell32: Fixed potential buffer overwrite in execute_from_key (Coverity). Marcus Meissner <marcus at jet.franken.de> Modified: trunk/reactos/dll/win32/shell32/shlexec.c Modified: trunk/reactos/dll/win32/shell32/shlexec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlexec.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlexec.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlexec.c [iso-8859-1] Thu Feb 5 02:55:28 2009 @@ -908,6 +908,8 @@ /* Is there a replace() function anywhere? */ cmdlen /= sizeof(WCHAR); + if (cmdlen >= sizeof(cmd)/sizeof(WCHAR)) + cmdlen = sizeof(cmd)/sizeof(WCHAR)-1; cmd[cmdlen] = '\0'; SHELL_ArgifyW(param, sizeof(param)/sizeof(WCHAR), cmd, lpFile, psei->lpIDList, szCommandline, &resultLen); if (resultLen > sizeof(param)/sizeof(WCHAR))

1 0

[cwittich] 39401: Aric Stewart : advapi32: Add Security Label sids used by IE7. <aric at codeweavers.com>
by cwittich＠svn.reactos.org 05 Feb '09

05 Feb '09

Author: cwittich Date: Thu Feb 5 02:50:14 2009 New Revision: 39401 URL: http://svn.reactos.org/svn/reactos?rev=39401&view=rev Log: Aric Stewart : advapi32: Add Security Label sids used by IE7. <aric at codeweavers.com> Modified: trunk/reactos/dll/win32/advapi32/sec/sid.c trunk/reactos/include/psdk/winnt.h Modified: trunk/reactos/dll/win32/advapi32/sec/sid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/sid… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/sid.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/sid.c [iso-8859-1] Thu Feb 5 02:50:14 2009 @@ -108,6 +108,10 @@ { {0,0}, WinBuiltinAuthorizationAccessSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_AUTHORIZATIONACCESS } } }, { {0,0}, WinBuiltinTerminalServerLicenseServersSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_TS_LICENSE_SERVERS } } }, { {0,0}, WinBuiltinDCOMUsersSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_DCOM_USERS } } }, + { {'L','W'}, WinLowLabelSid, { SID_REVISION, 1, { SECURITY_MANDATORY_LABEL_AUTHORITY}, { SECURITY_MANDATORY_LOW_RID} } }, + { {'M','E'}, WinMediumLabelSid, { SID_REVISION, 1, { SECURITY_MANDATORY_LABEL_AUTHORITY}, { SECURITY_MANDATORY_MEDIUM_RID } } }, + { {'H','I'}, WinHighLabelSid, { SID_REVISION, 1, { SECURITY_MANDATORY_LABEL_AUTHORITY}, { SECURITY_MANDATORY_HIGH_RID } } }, + { {'S','I'}, WinSystemLabelSid, { SID_REVISION, 1, { SECURITY_MANDATORY_LABEL_AUTHORITY}, { SECURITY_MANDATORY_SYSTEM_RID } } }, }; typedef struct WELLKNOWNRID Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=3… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Thu Feb 5 02:50:14 2009 @@ -596,6 +596,14 @@ #define DOMAIN_GROUP_RID_ENTERPRISE_ADMINS 0x00000207L #define DOMAIN_GROUP_RID_POLICY_ADMINS 0x00000208L +#define SECURITY_MANDATORY_LABEL_AUTHORITY {0,0,0,0,0,16} +#define SECURITY_MANDATORY_UNTRUSTED_RID 0x00000000L +#define SECURITY_MANDATORY_LOW_RID 0x00001000L +#define SECURITY_MANDATORY_MEDIUM_RID 0x00002000L +#define SECURITY_MANDATORY_HIGH_RID 0x00003000L +#define SECURITY_MANDATORY_SYSTEM_RID 0x00004000L +#define SECURITY_MANDATORY_PROTECTED_PROCESS_RID 0x00005000L + #define DOMAIN_ALIAS_RID_ADMINS 0x00000220L #define DOMAIN_ALIAS_RID_USERS 0x00000221L #define DOMAIN_ALIAS_RID_GUESTS 0x00000222L @@ -621,70 +629,84 @@ #define SECURITY_MANDATORY_LABEL_AUTHORITY {0,0,0,0,0,16} -typedef enum -{ - WinNullSid = 0, - WinWorldSid, - WinLocalSid, - WinCreatorOwnerSid, - WinCreatorGroupSid, - WinCreatorOwnerServerSid, - WinCreatorGroupServerSid, - WinNtAuthoritySid, - WinDialupSid, - WinNetworkSid, - WinBatchSid, - WinInteractiveSid, - WinServiceSid, - WinAnonymousSid, - WinProxySid, - WinEnterpriseControllersSid, - WinSelfSid, - WinAuthenticatedUserSid, - WinRestrictedCodeSid, - WinTerminalServerSid, - WinRemoteLogonIdSid, - WinLogonIdsSid, - WinLocalSystemSid, - WinLocalServiceSid, - WinNetworkServiceSid, - WinBuiltinDomainSid, - WinBuiltinAdministratorsSid, - WinBuiltinUsersSid, - WinBuiltinGuestsSid, - WinBuiltinPowerUsersSid, - WinBuiltinAccountOperatorsSid, - WinBuiltinSystemOperatorsSid, - WinBuiltinPrintOperatorsSid, - WinBuiltinBackupOperatorsSid, - WinBuiltinReplicatorSid, - WinBuiltinPreWindows2000CompatibleAccessSid, - WinBuiltinRemoteDesktopUsersSid, - WinBuiltinNetworkConfigurationOperatorsSid, - WinAccountAdministratorSid, - WinAccountGuestSid, - WinAccountKrbtgtSid, - WinAccountDomainAdminsSid, - WinAccountDomainUsersSid, - WinAccountDomainGuestsSid, - WinAccountComputersSid, - WinAccountControllersSid, - WinAccountCertAdminsSid, - WinAccountSchemaAdminsSid, - WinAccountEnterpriseAdminsSid, - WinAccountPolicyAdminsSid, - WinAccountRasAndIasServersSid, - WinNTLMAuthenticationSid, - WinDigestAuthenticationSid, - WinSChannelAuthenticationSid, - WinThisOrganizationSid, - WinOtherOrganizationSid, - WinBuiltinIncomingForestTrustBuildersSid, - WinBuiltinPerfMonitoringUsersSid, - WinBuiltinPerfLoggingUsersSid, - WinBuiltinAuthorizationAccessSid, - WinBuiltinTerminalServerLicenseServersSid, - WinBuiltinDCOMUsersSid +typedef enum { + WinNullSid = 0, + WinWorldSid = 1, + WinLocalSid = 2, + WinCreatorOwnerSid = 3, + WinCreatorGroupSid = 4, + WinCreatorOwnerServerSid = 5, + WinCreatorGroupServerSid = 6, + WinNtAuthoritySid = 7, + WinDialupSid = 8, + WinNetworkSid = 9, + WinBatchSid = 10, + WinInteractiveSid = 11, + WinServiceSid = 12, + WinAnonymousSid = 13, + WinProxySid = 14, + WinEnterpriseControllersSid = 15, + WinSelfSid = 16, + WinAuthenticatedUserSid = 17, + WinRestrictedCodeSid = 18, + WinTerminalServerSid = 19, + WinRemoteLogonIdSid = 20, + WinLogonIdsSid = 21, + WinLocalSystemSid = 22, + WinLocalServiceSid = 23, + WinNetworkServiceSid = 24, + WinBuiltinDomainSid = 25, + WinBuiltinAdministratorsSid = 26, + WinBuiltinUsersSid = 27, + WinBuiltinGuestsSid = 28, + WinBuiltinPowerUsersSid = 29, + WinBuiltinAccountOperatorsSid = 30, + WinBuiltinSystemOperatorsSid = 31, + WinBuiltinPrintOperatorsSid = 32, + WinBuiltinBackupOperatorsSid = 33, + WinBuiltinReplicatorSid = 34, + WinBuiltinPreWindows2000CompatibleAccessSid = 35, + WinBuiltinRemoteDesktopUsersSid = 36, + WinBuiltinNetworkConfigurationOperatorsSid = 37, + WinAccountAdministratorSid = 38, + WinAccountGuestSid = 39, + WinAccountKrbtgtSid = 40, + WinAccountDomainAdminsSid = 41, + WinAccountDomainUsersSid = 42, + WinAccountDomainGuestsSid = 43, + WinAccountComputersSid = 44, + WinAccountControllersSid = 45, + WinAccountCertAdminsSid = 46, + WinAccountSchemaAdminsSid = 47, + WinAccountEnterpriseAdminsSid = 48, + WinAccountPolicyAdminsSid = 49, + WinAccountRasAndIasServersSid = 50, + WinNTLMAuthenticationSid = 51, + WinDigestAuthenticationSid = 52, + WinSChannelAuthenticationSid = 53, + WinThisOrganizationSid = 54, + WinOtherOrganizationSid = 55, + WinBuiltinIncomingForestTrustBuildersSid = 56, + WinBuiltinPerfMonitoringUsersSid = 57, + WinBuiltinPerfLoggingUsersSid = 58, + WinBuiltinAuthorizationAccessSid = 59, + WinBuiltinTerminalServerLicenseServersSid = 60, + WinBuiltinDCOMUsersSid = 61, + WinBuiltinIUsersSid = 62, + WinIUserSid = 63, + WinBuiltinCryptoOperatorsSid = 64, + WinUntrustedLabelSid = 65, + WinLowLabelSid = 66, + WinMediumLabelSid = 67, + WinHighLabelSid = 68, + WinSystemLabelSid = 69, + WinWriteRestrictedCodeSid = 70, + WinCreatorOwnerRightsSid = 71, + WinCacheablePrincipalsGroupSid = 72, + WinNonCacheablePrincipalsGroupSid = 73, + WinEnterpriseReadonlyControllersSid = 74, + WinAccountReadonlyControllersSid = 75, + WinBuiltinEventLogReadersGroup = 76 } WELL_KNOWN_SID_TYPE; #define SE_CREATE_TOKEN_NAME TEXT("SeCreateTokenPrivilege")

1 0

[cwittich] 39400: a little bit of wine syncing
by cwittich＠svn.reactos.org 05 Feb '09

05 Feb '09

Author: cwittich Date: Thu Feb 5 01:58:35 2009 New Revision: 39400 URL: http://svn.reactos.org/svn/reactos?rev=39400&view=rev Log: a little bit of wine syncing Modified: trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c Modified: trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/iphlpap… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c [iso-8859-1] Thu Feb 5 01:58:35 2009 @@ -1845,16 +1845,20 @@ /****************************************************************** * GetUniDirectionalAdapterInfo (IPHLPAPI.@) * - * - * PARAMS - * - * pIPIfInfo [In/Out] - * dwOutBufLen [In/Out] - * - * RETURNS - * - * DWORD - * + * This is a Win98-only function to get information on "unidirectional" + * adapters. Since this is pretty nonsensical in other contexts, it + * never returns anything. + * + * PARAMS + * pIPIfInfo [Out] buffer for adapter infos + * dwOutBufLen [Out] length of the output buffer + * + * RETURNS + * Success: NO_ERROR + * Failure: error code from winerror.h + * + * FIXME + * Stub, returns ERROR_NOT_SUPPORTED. */ DWORD WINAPI GetUniDirectionalAdapterInfo(PIP_UNIDIRECTIONAL_ADAPTER_ADDRESS pIPIfInfo, PULONG dwOutBufLen) { @@ -1867,15 +1871,21 @@ /****************************************************************** * IpReleaseAddress (IPHLPAPI.@) * - * - * PARAMS - * - * AdapterInfo [In/Out] - * - * RETURNS - * - * DWORD - * + * Release an IP obtained through DHCP, + * + * PARAMS + * AdapterInfo [In] adapter to release IP address + * + * RETURNS + * Success: NO_ERROR + * Failure: error code from winerror.h + * + * NOTES + * Since GetAdaptersInfo never returns adapters that have DHCP enabled, + * this function does nothing. + * + * FIXME + * Stub, returns ERROR_NOT_SUPPORTED. */ DWORD WINAPI IpReleaseAddress(PIP_ADAPTER_INDEX_MAP AdapterInfo) { @@ -1889,15 +1899,21 @@ /****************************************************************** * IpRenewAddress (IPHLPAPI.@) * - * - * PARAMS - * - * AdapterInfo [In/Out] - * - * RETURNS - * - * DWORD - * + * Renew an IP obtained through DHCP. + * + * PARAMS + * AdapterInfo [In] adapter to renew IP address + * + * RETURNS + * Success: NO_ERROR + * Failure: error code from winerror.h + * + * NOTES + * Since GetAdaptersInfo never returns adapters that have DHCP enabled, + * this function does nothing. + * + * FIXME + * Stub, returns ERROR_NOT_SUPPORTED. */ DWORD WINAPI IpRenewAddress(PIP_ADAPTER_INDEX_MAP AdapterInfo) { @@ -1911,22 +1927,22 @@ /****************************************************************** * NotifyAddrChange (IPHLPAPI.@) * - * - * PARAMS - * - * Handle [In/Out] - * overlapped [In/Out] - * - * RETURNS - * - * DWORD - * + * Notify caller whenever the ip-interface map is changed. + * + * PARAMS + * Handle [Out] handle usable in asynchronous notification + * overlapped [In] overlapped structure that notifies the caller + * + * RETURNS + * Success: NO_ERROR + * Failure: error code from winerror.h + * + * FIXME + * Stub, returns ERROR_NOT_SUPPORTED. */ DWORD WINAPI NotifyAddrChange(PHANDLE Handle, LPOVERLAPPED overlapped) { - TRACE("Handle %p, overlapped %p\n", Handle, overlapped); - FIXME(":stub\n"); - /* marking Win2K+ functions not supported */ + FIXME("(Handle %p, overlapped %p): stub\n", Handle, overlapped); return ERROR_NOT_SUPPORTED; } @@ -1934,22 +1950,22 @@ /****************************************************************** * NotifyRouteChange (IPHLPAPI.@) * - * - * PARAMS - * - * Handle [In/Out] - * overlapped [In/Out] - * - * RETURNS - * - * DWORD - * + * Notify caller whenever the ip routing table is changed. + * + * PARAMS + * Handle [Out] handle usable in asynchronous notification + * overlapped [In] overlapped structure that notifies the caller + * + * RETURNS + * Success: NO_ERROR + * Failure: error code from winerror.h + * + * FIXME + * Stub, returns ERROR_NOT_SUPPORTED. */ DWORD WINAPI NotifyRouteChange(PHANDLE Handle, LPOVERLAPPED overlapped) { - TRACE("Handle %p, overlapped %p\n", Handle, overlapped); - FIXME(":stub\n"); - /* marking Win2K+ functions not supported */ + FIXME("(Handle %p, overlapped %p): stub\n", Handle, overlapped); return ERROR_NOT_SUPPORTED; } @@ -1957,25 +1973,25 @@ /****************************************************************** * SendARP (IPHLPAPI.@) * - * - * PARAMS - * - * DestIP [In] - * SrcIP [In] - * pMacAddr [In/Out] - * PhyAddrLen [In/Out] - * - * RETURNS - * - * DWORD - * + * Send an ARP request. + * + * PARAMS + * DestIP [In] attempt to obtain this IP + * SrcIP [In] optional sender IP address + * pMacAddr [Out] buffer for the mac address + * PhyAddrLen [In/Out] length of the output buffer + * + * RETURNS + * Success: NO_ERROR + * Failure: error code from winerror.h + * + * FIXME + * Stub, returns ERROR_NOT_SUPPORTED. */ DWORD WINAPI SendARP(IPAddr DestIP, IPAddr SrcIP, PULONG pMacAddr, PULONG PhyAddrLen) { - TRACE("DestIP 0x%08lx, SrcIP 0x%08lx, pMacAddr %p, PhyAddrLen %p\n", DestIP, - SrcIP, pMacAddr, PhyAddrLen); - FIXME(":stub\n"); - /* marking Win2K+ functions not supported */ + FIXME("(DestIP 0x%08x, SrcIP 0x%08x, pMacAddr %p, PhyAddrLen %p): stub\n", + DestIP, SrcIP, pMacAddr, PhyAddrLen); return ERROR_NOT_SUPPORTED; } @@ -1983,24 +1999,25 @@ /****************************************************************** * SetIfEntry (IPHLPAPI.@) * - * - * PARAMS - * - * pIfRow [In/Out] - * - * RETURNS - * - * DWORD - * + * Set the administrative status of an interface. + * + * PARAMS + * pIfRow [In] dwAdminStatus member specifies the new status. + * + * RETURNS + * Success: NO_ERROR + * Failure: error code from winerror.h + * + * FIXME + * Stub, returns ERROR_NOT_SUPPORTED. */ DWORD WINAPI SetIfEntry(PMIB_IFROW pIfRow) { - TRACE("pIfRow %p\n", pIfRow); - /* this is supposed to set an administratively interface up or down. + FIXME("(pIfRow %p): stub\n", pIfRow); + /* this is supposed to set an interface administratively up or down. Could do SIOCSIFFLAGS and set/clear IFF_UP, but, not sure I want to, and this sort of down is indistinguishable from other sorts of down (e.g. no link). */ - FIXME(":stub\n"); return ERROR_NOT_SUPPORTED; } @@ -2008,14 +2025,14 @@ /****************************************************************** * SetIpForwardEntry (IPHLPAPI.@) * - * - * PARAMS - * - * pRoute [In/Out] - * - * RETURNS - * - * DWORD + * Modify an existing route. + * + * PARAMS + * pRoute [In] route with the new information + * + * RETURNS + * Success: NO_ERROR + * Failure: error code from winerror.h * */ DWORD WINAPI SetIpForwardEntry(PMIB_IPFORWARDROW pRoute) @@ -2027,111 +2044,113 @@ /****************************************************************** * SetIpNetEntry (IPHLPAPI.@) * - * - * PARAMS - * - * pArpEntry [In/Out] - * - * RETURNS - * - * DWORD - * + * Modify an existing ARP entry. + * + * PARAMS + * pArpEntry [In] ARP entry with the new information + * + * RETURNS + * Success: NO_ERROR + * Failure: error code from winerror.h + * + * FIXME + * Stub, returns NO_ERROR. */ DWORD WINAPI SetIpNetEntry(PMIB_IPNETROW pArpEntry) { - TRACE("pArpEntry %p\n", pArpEntry); + FIXME("(pArpEntry %p): stub\n", pArpEntry); /* same as CreateIpNetEntry here, could use SIOCSARP, not sure I want to */ - FIXME(":stub\n"); - return (DWORD) 0; + return 0; } /****************************************************************** * SetIpStatistics (IPHLPAPI.@) * - * - * PARAMS - * - * pIpStats [In/Out] - * - * RETURNS - * - * DWORD - * + * Toggle IP forwarding and det the default TTL value. + * + * PARAMS + * pIpStats [In] IP statistics with the new information + * + * RETURNS + * Success: NO_ERROR + * Failure: error code from winerror.h + * + * FIXME + * Stub, returns NO_ERROR. */ DWORD WINAPI SetIpStatistics(PMIB_IPSTATS pIpStats) { - TRACE("pIpStats %p\n", pIpStats); - FIXME(":stub\n"); - return (DWORD) 0; + FIXME("(pIpStats %p): stub\n", pIpStats); + return 0; } /****************************************************************** * SetIpTTL (IPHLPAPI.@) * - * - * PARAMS - * - * nTTL [In] - * - * RETURNS - * - * DWORD - * + * Set the default TTL value. + * + * PARAMS + * nTTL [In] new TTL value + * + * RETURNS + * Success: NO_ERROR + * Failure: error code from winerror.h + * + * FIXME + * Stub, returns NO_ERROR. */ DWORD WINAPI SetIpTTL(UINT nTTL) { - TRACE("nTTL %d\n", nTTL); - /* could echo nTTL > /proc/net/sys/net/ipv4/ip_default_ttl, not sure I - want to. Could map EACCESS to ERROR_ACCESS_DENIED, I suppose */ - FIXME(":stub\n"); - return (DWORD) 0; + FIXME("(nTTL %d): stub\n", nTTL); + return 0; } /****************************************************************** * SetTcpEntry (IPHLPAPI.@) * - * - * PARAMS - * - * pTcpRow [In/Out] - * - * RETURNS - * - * DWORD - * + * Set the state of a TCP connection. + * + * PARAMS + * pTcpRow [In] specifies connection with new state + * + * RETURNS + * Success: NO_ERROR + * Failure: error code from winerror.h + * + * FIXME + * Stub, returns NO_ERROR. */ DWORD WINAPI SetTcpEntry(PMIB_TCPROW pTcpRow) { - TRACE("pTcpRow %p\n", pTcpRow); - FIXME(":stub\n"); - return (DWORD) 0; + FIXME("(pTcpRow %p): stub\n", pTcpRow); + return 0; } /****************************************************************** * UnenableRouter (IPHLPAPI.@) * - * - * PARAMS - * - * pOverlapped [In/Out] - * lpdwEnableCount [In/Out] - * - * RETURNS - * - * DWORD - * + * Decrement the IP-forwarding reference count. Turn off IP-forwarding + * if it reaches zero. + * + * PARAMS + * pOverlapped [In/Out] should be the same as in EnableRouter() + * lpdwEnableCount [Out] optional, receives reference count + * + * RETURNS + * Success: NO_ERROR + * Failure: error code from winerror.h + * + * FIXME + * Stub, returns ERROR_NOT_SUPPORTED. */ DWORD WINAPI UnenableRouter(OVERLAPPED * pOverlapped, LPDWORD lpdwEnableCount) { - TRACE("pOverlapped %p, lpdwEnableCount %p\n", pOverlapped, lpdwEnableCount); - FIXME(":stub\n"); - /* could echo "0" > /proc/net/sys/net/ipv4/ip_forward, not sure I want to - could map EACCESS to ERROR_ACCESS_DENIED, I suppose - marking Win2K+ functions not supported */ + FIXME("(pOverlapped %p, lpdwEnableCount %p): stub\n", pOverlapped, + lpdwEnableCount); return ERROR_NOT_SUPPORTED; }

1 0

[cwittich] 39399: add shdoclc from wine 1.1.14
by cwittich＠svn.reactos.org 05 Feb '09

05 Feb '09

Author: cwittich Date: Thu Feb 5 01:46:59 2009 New Revision: 39399 URL: http://svn.reactos.org/svn/reactos?rev=39399&view=rev Log: add shdoclc from wine 1.1.14 Added: trunk/reactos/dll/win32/shdoclc/ (with props) trunk/reactos/dll/win32/shdoclc/Bg.rc (with props) trunk/reactos/dll/win32/shdoclc/Da.rc (with props) trunk/reactos/dll/win32/shdoclc/De.rc (with props) trunk/reactos/dll/win32/shdoclc/En.rc (with props) trunk/reactos/dll/win32/shdoclc/Es.rc (with props) trunk/reactos/dll/win32/shdoclc/Fi.rc (with props) trunk/reactos/dll/win32/shdoclc/Fr.rc (with props) trunk/reactos/dll/win32/shdoclc/Hu.rc (with props) trunk/reactos/dll/win32/shdoclc/Ko.rc (with props) trunk/reactos/dll/win32/shdoclc/Nl.rc (with props) trunk/reactos/dll/win32/shdoclc/No.rc (with props) trunk/reactos/dll/win32/shdoclc/Pt.rc (with props) trunk/reactos/dll/win32/shdoclc/Ru.rc (with props) trunk/reactos/dll/win32/shdoclc/Si.rc (with props) trunk/reactos/dll/win32/shdoclc/Sv.rc (with props) trunk/reactos/dll/win32/shdoclc/Tr.rc (with props) trunk/reactos/dll/win32/shdoclc/Zh.rc (with props) trunk/reactos/dll/win32/shdoclc/rsrc.rc (with props) trunk/reactos/dll/win32/shdoclc/shdoclc.h (with props) trunk/reactos/dll/win32/shdoclc/shdoclc.rbuild (with props) trunk/reactos/dll/win32/shdoclc/shdoclc.spec (with props) Modified: trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/dll/win32/win32.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… Added: trunk/reactos/dll/win32/shdoclc/Bg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdoclc/Bg.rc?re… Added: trunk/reactos/dll/win32/shdoclc/Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdoclc/Da.rc?re… Added: trunk/reactos/dll/win32/shdoclc/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdoclc/De.rc?re… Added: trunk/reactos/dll/win32/shdoclc/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdoclc/En.rc?re… Added: trunk/reactos/dll/win32/shdoclc/Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdoclc/Es.rc?re… Added: trunk/reactos/dll/win32/shdoclc/Fi.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdoclc/Fi.rc?re… Added: trunk/reactos/dll/win32/shdoclc/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdoclc/Fr.rc?re… Added: trunk/reactos/dll/win32/shdoclc/Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdoclc/Hu.rc?re… Added: trunk/reactos/dll/win32/shdoclc/Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdoclc/Ko.rc?re… Added: trunk/reactos/dll/win32/shdoclc/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdoclc/Nl.rc?re… Added: trunk/reactos/dll/win32/shdoclc/No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdoclc/No.rc?re… Added: trunk/reactos/dll/win32/shdoclc/Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdoclc/Pt.rc?re… Added: trunk/reactos/dll/win32/shdoclc/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdoclc/Ru.rc?re… Added: trunk/reactos/dll/win32/shdoclc/Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdoclc/Si.rc?re… Added: trunk/reactos/dll/win32/shdoclc/Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdoclc/Sv.rc?re… Added: trunk/reactos/dll/win32/shdoclc/Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdoclc/Tr.rc?re… Added: trunk/reactos/dll/win32/shdoclc/Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdoclc/Zh.rc?re… Added: trunk/reactos/dll/win32/shdoclc/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdoclc/rsrc.rc?… Added: trunk/reactos/dll/win32/shdoclc/shdoclc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdoclc/shdoclc.… Added: trunk/reactos/dll/win32/shdoclc/shdoclc.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdoclc/shdoclc.… Added: trunk/reactos/dll/win32/shdoclc/shdoclc.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdoclc/shdoclc.… Modified: trunk/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev…

1 0

[cwittich] 39398: urlmon: Fixed target buffer length to MBtoWC Marcus Meissner <marcus at jet.franken.de> http://www.winehq.org/pipermail/wine-patches/2009-February/068906.html
by cwittich＠svn.reactos.org 05 Feb '09

05 Feb '09

Author: cwittich Date: Thu Feb 5 01:01:34 2009 New Revision: 39398 URL: http://svn.reactos.org/svn/reactos?rev=39398&view=rev Log: urlmon: Fixed target buffer length to MBtoWC Marcus Meissner <marcus at jet.franken.de> http://www.winehq.org/pipermail/wine-patches/2009-February/068906.html Modified: trunk/reactos/dll/win32/urlmon/umon.c Modified: trunk/reactos/dll/win32/urlmon/umon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/umon.c?re… ============================================================================== --- trunk/reactos/dll/win32/urlmon/umon.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/umon.c [iso-8859-1] Thu Feb 5 01:01:34 2009 @@ -1185,7 +1185,7 @@ if(szURL) { len = MultiByteToWideChar(CP_ACP, 0, szURL, -1, NULL, 0); url = heap_alloc(len*sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, szURL, -1, url, -1); + MultiByteToWideChar(CP_ACP, 0, szURL, -1, url, len); } if(szFileName)

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs