Author: winesync Date: Fri Apr 4 09:43:57 2008 New Revision: 32860
URL: http://svn.reactos.org/svn/reactos?rev=32860&view=rev Log: Autosyncing with Wine HEAD
Modified: trunk/reactos/dll/win32/uxtheme/draw.c trunk/reactos/dll/win32/uxtheme/metric.c trunk/reactos/dll/win32/uxtheme/msstyles.c trunk/reactos/dll/win32/uxtheme/uxtheme.rbuild
Modified: trunk/reactos/dll/win32/uxtheme/draw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/draw.c?re... ============================================================================== --- trunk/reactos/dll/win32/uxtheme/draw.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/draw.c [iso-8859-1] Fri Apr 4 09:43:57 2008 @@ -1609,12 +1609,12 @@ } else { /* otherwise, try to determine content rect from the background type and props */ int bgtype = BT_BORDERFILL; - memcpy(pContentRect, pBoundingRect, sizeof(RECT)); + *pContentRect = *pBoundingRect;
GetThemeEnumValue(hTheme, iPartId, iStateId, TMT_BGTYPE, &bgtype); if(bgtype == BT_BORDERFILL) { int bordersize = 1; - + GetThemeInt(hTheme, iPartId, iStateId, TMT_BORDERSIZE, &bordersize); InflateRect(pContentRect, -bordersize, -bordersize); } else if ((bgtype == BT_IMAGEFILE) @@ -1657,12 +1657,12 @@ } else { /* otherwise, try to determine content rect from the background type and props */ int bgtype = BT_BORDERFILL; - memcpy(pExtentRect, pContentRect, sizeof(RECT)); + *pExtentRect = *pContentRect;
GetThemeEnumValue(hTheme, iPartId, iStateId, TMT_BGTYPE, &bgtype); if(bgtype == BT_BORDERFILL) { int bordersize = 1; - + GetThemeInt(hTheme, iPartId, iStateId, TMT_BORDERSIZE, &bordersize); InflateRect(pExtentRect, bordersize, bordersize); } else if ((bgtype == BT_IMAGEFILE)
Modified: trunk/reactos/dll/win32/uxtheme/metric.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/metric.c?... ============================================================================== --- trunk/reactos/dll/win32/uxtheme/metric.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/metric.c [iso-8859-1] Fri Apr 4 09:43:57 2008 @@ -135,7 +135,7 @@ case TMT_MSGBOXFONT: font = &ncm.lfMessageFont; break; default: FIXME("Unknown FontID: %d\n", iFontID); break; } - if(font) CopyMemory(plf, font, sizeof(LOGFONTW)); + if(font) *plf = *font; else hr = STG_E_INVALIDPARAMETER; } return hr;
Modified: trunk/reactos/dll/win32/uxtheme/msstyles.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/msstyles.... ============================================================================== --- trunk/reactos/dll/win32/uxtheme/msstyles.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/msstyles.c [iso-8859-1] Fri Apr 4 09:43:57 2008 @@ -141,7 +141,7 @@ } pszSizes = (LPWSTR)LoadResource(hTheme, hrsc);
- /* Validate requested color against whats available from the theme */ + /* Validate requested color against what's available from the theme */ if(pszColorName) { tmp = pszColors; while(*tmp) { @@ -155,7 +155,7 @@ else pszSelectedColor = pszColors; /* Use the default color */
- /* Validate requested size against whats available from the theme */ + /* Validate requested size against what's available from the theme */ if(pszSizeName) { tmp = pszSizes; while(*tmp) { @@ -751,27 +751,27 @@ switch (iPropertyId) { case TMT_CAPTIONFONT: - memcpy (&state->metrics.lfCaptionFont, &font, sizeof (LOGFONTW)); + state->metrics.lfCaptionFont = font; state->metricsDirty = TRUE; break; case TMT_SMALLCAPTIONFONT: - memcpy (&state->metrics.lfSmCaptionFont, &font, sizeof (LOGFONTW)); + state->metrics.lfSmCaptionFont = font; state->metricsDirty = TRUE; break; case TMT_MENUFONT: - memcpy (&state->metrics.lfMenuFont, &font, sizeof (LOGFONTW)); + state->metrics.lfMenuFont = font; state->metricsDirty = TRUE; break; case TMT_STATUSFONT: - memcpy (&state->metrics.lfStatusFont, &font, sizeof (LOGFONTW)); + state->metrics.lfStatusFont = font; state->metricsDirty = TRUE; break; case TMT_MSGBOXFONT: - memcpy (&state->metrics.lfMessageFont, &font, sizeof (LOGFONTW)); + state->metrics.lfMessageFont = font; state->metricsDirty = TRUE; break; case TMT_ICONTITLEFONT: - memcpy (&state->iconTitleFont, &font, sizeof (LOGFONTW)); + state->iconTitleFont = font; state->metricsDirty = TRUE; break; } @@ -1347,10 +1347,10 @@ LPCWSTR lpCur = tp->lpValue; LPCWSTR lpEnd = tp->lpValue + tp->dwValueLen;
- MSSTYLES_GetNextInteger(lpCur, lpEnd, &lpCur, (int*)&pRect->left); - MSSTYLES_GetNextInteger(lpCur, lpEnd, &lpCur, (int*)&pRect->top); - MSSTYLES_GetNextInteger(lpCur, lpEnd, &lpCur, (int*)&pRect->right); - if(!MSSTYLES_GetNextInteger(lpCur, lpEnd, &lpCur, (int*)&pRect->bottom)) { + MSSTYLES_GetNextInteger(lpCur, lpEnd, &lpCur, &pRect->left); + MSSTYLES_GetNextInteger(lpCur, lpEnd, &lpCur, &pRect->top); + MSSTYLES_GetNextInteger(lpCur, lpEnd, &lpCur, &pRect->right); + if(!MSSTYLES_GetNextInteger(lpCur, lpEnd, &lpCur, &pRect->bottom)) { TRACE("Could not parse rect property\n"); return E_PROP_ID_UNSUPPORTED; }
Modified: trunk/reactos/dll/win32/uxtheme/uxtheme.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/uxtheme.r... ============================================================================== --- trunk/reactos/dll/win32/uxtheme/uxtheme.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/uxtheme.rbuild [iso-8859-1] Fri Apr 4 09:43:57 2008 @@ -1,5 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<group> <module name="uxtheme" type="win32dll" baseaddress="${BASEADDRESS_UXTHEME}" installbase="system32" installname="uxtheme.dll" allowwarnings="true"> <importlibrary definition="uxtheme.spec.def" /> <include base="uxtheme">.</include> @@ -7,13 +8,6 @@ <define name="__WINESRC__" /> <define name="WINVER">0x600</define> <define name="_WIN32_WINNT">0x600</define> - <library>wine</library> - <library>user32</library> - <library>gdi32</library> - <library>advapi32</library> - <library>kernel32</library> - <library>ntdll</library> - <library>msimg32</library> <file>draw.c</file> <file>main.c</file> <file>metric.c</file> @@ -24,4 +18,12 @@ <file>uxini.c</file> <file>version.rc</file> <file>uxtheme.spec</file> + <library>wine</library> + <library>user32</library> + <library>gdi32</library> + <library>advapi32</library> + <library>kernel32</library> + <library>msimg32</library> + <library>ntdll</library> </module> +</group>
-
winesync＠svn.reactos.org