January 2013 - Wine-Commits

Andrew Talbot : advapi32: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard Jan. 2, 2013

Jan. 2, 2013

Module: wine Branch: master Commit: a377563b00b0ac1bb7d9f788cb000a4335e6725d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a377563b00b0ac1bb7d9f788c… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Dec 28 22:05:26 2012 +0000 advapi32: Avoid signed-unsigned integer comparisons. --- dlls/advapi32/eventlog.c | 4 ++-- dlls/advapi32/security.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c index 38c533a..0922fff 100644 --- a/dlls/advapi32/eventlog.c +++ b/dlls/advapi32/eventlog.c @@ -651,7 +651,7 @@ BOOL WINAPI ReportEventA ( HANDLE hEventLog, WORD wType, WORD wCategory, DWORD d { LPWSTR *wideStrArray; UNICODE_STRING str; - int i; + UINT i; BOOL ret; FIXME("(%p,0x%04x,0x%04x,0x%08x,%p,0x%04x,0x%08x,%p,%p): stub\n", hEventLog, @@ -684,7 +684,7 @@ BOOL WINAPI ReportEventA ( HANDLE hEventLog, WORD wType, WORD wCategory, DWORD d BOOL WINAPI ReportEventW( HANDLE hEventLog, WORD wType, WORD wCategory, DWORD dwEventID, PSID lpUserSid, WORD wNumStrings, DWORD dwDataSize, LPCWSTR *lpStrings, LPVOID lpRawData ) { - int i; + UINT i; FIXME("(%p,0x%04x,0x%04x,0x%08x,%p,0x%04x,0x%08x,%p,%p): stub\n", hEventLog, wType, wCategory, dwEventID, lpUserSid, wNumStrings, dwDataSize, lpStrings, lpRawData); diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index d857591..5a74783 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -4785,7 +4785,7 @@ static BOOL DumpAce(LPVOID pace, WCHAR **pwptr, ULONG *plen) static BOOL DumpAcl(PACL pacl, WCHAR **pwptr, ULONG *plen, BOOL protected, BOOL autoInheritReq, BOOL autoInherited) { WORD count; - int i; + UINT i; if (protected) DumpString(SDDL_PROTECTED, -1, pwptr, plen);

1 0

Andrew Talbot : comctl32: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard Jan. 2, 2013

Jan. 2, 2013

Module: wine Branch: master Commit: 23fde785eeeb5b5e0451f810d260909e742462eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=23fde785eeeb5b5e0451f810d… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Dec 28 22:05:31 2012 +0000 comctl32: Avoid signed-unsigned integer comparisons. --- dlls/comctl32/imagelist.c | 2 +- dlls/comctl32/monthcal.c | 6 ++++-- dlls/comctl32/rebar.c | 2 +- dlls/comctl32/status.c | 10 ++++++---- dlls/comctl32/updown.c | 4 ++-- 5 files changed, 14 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 6142ba7..3eb7724 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -2235,7 +2235,7 @@ HIMAGELIST WINAPI ImageList_Read (LPSTREAM pstm) void *image_bits, *mask_bits = NULL; ILHEAD ilHead; HIMAGELIST himl; - int i; + unsigned int i; TRACE("%p\n", pstm); diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index f27eee3..ef2ad68 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -1076,7 +1076,8 @@ static void MONTHCAL_PaintFocusAndCircle(const MONTHCAL_INFO *infoPtr, HDC hdc, /* months before first calendar month and after last calendar month */ static void MONTHCAL_PaintLeadTrailMonths(const MONTHCAL_INFO *infoPtr, HDC hdc, const PAINTSTRUCT *ps) { - INT mask, length, index; + INT mask, index; + UINT length; SYSTEMTIME st_max, st; if (infoPtr->dwStyle & MCS_NOTRAILINGDATES) return; @@ -1116,7 +1117,8 @@ static void MONTHCAL_PaintLeadTrailMonths(const MONTHCAL_INFO *infoPtr, HDC hdc, static void MONTHCAL_PaintCalendar(const MONTHCAL_INFO *infoPtr, HDC hdc, const PAINTSTRUCT *ps, INT calIdx) { const SYSTEMTIME *date = &infoPtr->calendars[calIdx].month; - INT i, j, length; + INT i, j; + UINT length; RECT r, fill_bk_rect; SYSTEMTIME st; WCHAR buf[80]; diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index 0ae69ef..4e26c33 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -1124,7 +1124,7 @@ REBAR_MoveChildWindows (const REBAR_INFO *infoPtr, UINT start, UINT endplus) * or infoPtr->uNumBands if none */ static int next_visible(const REBAR_INFO *infoPtr, int i) { - int n; + unsigned int n; for (n = i + 1; n < infoPtr->uNumBands; n++) if (!HIDDENBAND(REBAR_GetBand(infoPtr, n))) break; diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c index 19d671d..c4efedb 100644 --- a/dlls/comctl32/status.c +++ b/dlls/comctl32/status.c @@ -285,7 +285,6 @@ STATUSBAR_RefreshPart (const STATUS_INFO *infoPtr, HDC hdc, const STATUSWINDOWPA static LRESULT STATUSBAR_Refresh (STATUS_INFO *infoPtr, HDC hdc) { - int i; RECT rect; HBRUSH hbrBk; HFONT hOldFont; @@ -319,6 +318,8 @@ STATUSBAR_Refresh (STATUS_INFO *infoPtr, HDC hdc) if (infoPtr->simple) { STATUSBAR_RefreshPart (infoPtr, hdc, &infoPtr->part0, 0); } else { + unsigned int i; + for (i = 0; i < infoPtr->numParts; i++) { STATUSBAR_RefreshPart (infoPtr, hdc, &infoPtr->parts[i], i); } @@ -336,7 +337,8 @@ STATUSBAR_Refresh (STATUS_INFO *infoPtr, HDC hdc) static int STATUSBAR_InternalHitTest(const STATUS_INFO *infoPtr, const POINT *pt) { - int i; + unsigned int i; + if (infoPtr->simple) return 255; @@ -352,7 +354,7 @@ STATUSBAR_SetPartBounds (STATUS_INFO *infoPtr) { STATUSWINDOWPART *part; RECT rect, *r; - int i; + UINT i; /* get our window size */ GetClientRect (infoPtr->Self, &rect); @@ -883,7 +885,7 @@ STATUSBAR_Simple (STATUS_INFO *infoPtr, BOOL simple) static LRESULT STATUSBAR_WMDestroy (STATUS_INFO *infoPtr) { - int i; + unsigned int i; TRACE("\n"); for (i = 0; i < infoPtr->numParts; i++) { diff --git a/dlls/comctl32/updown.c b/dlls/comctl32/updown.c index 2c5fc60..390f829 100644 --- a/dlls/comctl32/updown.c +++ b/dlls/comctl32/updown.c @@ -1026,10 +1026,10 @@ static LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam, L if (TRACE_ON(updown)) { - INT i; + UINT i; for (i = 0; i < wParam; i++) - TRACE("%d: nSec %u nInc %u\n", i, + TRACE("%u: nSec %u nInc %u\n", i, infoPtr->AccelVect[i].nSec, infoPtr->AccelVect[i].nInc); }

1 0

Hans Leidekker : wmiutils: Parse the path passed to IWbemPath::SetText.
by Alexandre Julliard Jan. 2, 2013

Jan. 2, 2013

Module: wine Branch: master Commit: 8059192e1203fbce97139c1602eafe9e34b80ada URL: http://source.winehq.org/git/wine.git/?a=commit;h=8059192e1203fbce97139c160… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 2 13:34:03 2013 +0100 wmiutils: Parse the path passed to IWbemPath::SetText. --- dlls/wmiutils/path.c | 124 +++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 112 insertions(+), 12 deletions(-) diff --git a/dlls/wmiutils/path.c b/dlls/wmiutils/path.c index e32c9b6..0d52544 100644 --- a/dlls/wmiutils/path.c +++ b/dlls/wmiutils/path.c @@ -36,11 +36,41 @@ WINE_DEFAULT_DEBUG_CHANNEL(wmiutils); struct path { IWbemPath IWbemPath_iface; - LONG refs; - WCHAR *text; - int len; + LONG refs; + WCHAR *text; + int len_text; + WCHAR *server; + int len_server; + WCHAR **namespaces; + int *len_namespaces; + int num_namespaces; + WCHAR *class; + int len_class; }; +static void init_path( struct path *path ) +{ + path->text = NULL; + path->len_text = 0; + path->server = NULL; + path->len_server = 0; + path->namespaces = NULL; + path->len_namespaces = NULL; + path->num_namespaces = 0; + path->class = NULL; + path->len_class = 0; +} + +static void clear_path( struct path *path ) +{ + heap_free( path->text ); + heap_free( path->server ); + heap_free( path->namespaces ); + heap_free( path->len_namespaces ); + heap_free( path->class ); + init_path( path ); +} + static inline struct path *impl_from_IWbemPath( IWbemPath *iface ) { return CONTAINING_RECORD(iface, struct path, IWbemPath_iface); @@ -61,7 +91,7 @@ static ULONG WINAPI path_Release( if (!refs) { TRACE("destroying %p\n", path); - heap_free( path->text ); + clear_path( path ); heap_free( path ); } return refs; @@ -90,25 +120,94 @@ static HRESULT WINAPI path_QueryInterface( return S_OK; } +static HRESULT parse_text( struct path *path, ULONG mode, const WCHAR *text ) +{ + HRESULT hr = E_OUTOFMEMORY; + const WCHAR *p, *q; + unsigned int i, len; + + p = q = text; + if ((p[0] == '\\' && p[1] == '\\') || (p[0] == '/' && p[1] == '/')) + { + p += 2; + q = p; + while (*q && *q != '\\' && *q != '/') q++; + len = q - p; + if (!(path->server = heap_alloc( (len + 1) * sizeof(WCHAR) ))) goto done; + memcpy( path->server, p, len * sizeof(WCHAR) ); + path->server[len] = 0; + path->len_server = len; + } + p = q; + while (*q && *q != ':') + { + if (*q == '\\' || *q == '/') path->num_namespaces++; + q++; + } + if (path->num_namespaces) + { + if (!(path->namespaces = heap_alloc( path->num_namespaces * sizeof(WCHAR *) ))) goto done; + if (!(path->len_namespaces = heap_alloc( path->num_namespaces * sizeof(int) ))) goto done; + + i = 0; + q = p; + while (*q && *q != ':') + { + if (*q == '\\' || *q == '/') + { + p = q + 1; + while (*p && *p != '\\' && *p != '/' && *p != ':') p++; + len = p - q - 1; + if (!(path->namespaces[i] = heap_alloc( (len + 1) * sizeof(WCHAR) ))) goto done; + memcpy( path->namespaces[i], q + 1, len * sizeof(WCHAR) ); + path->namespaces[i][len] = 0; + path->len_namespaces[i] = len; + i++; + } + q++; + } + } + if (*q == ':') q++; + p = q; + while (*q && *q != '.') q++; + len = q - p; + if (!(path->class = heap_alloc( (len + 1) * sizeof(WCHAR) ))) goto done; + memcpy( path->class, p, len * sizeof(WCHAR) ); + path->class[len] = 0; + path->len_class = len; + + if (*q == '.') FIXME("handle key list\n"); + hr = S_OK; + +done: + if (hr != S_OK) clear_path( path ); + return hr; +} + static HRESULT WINAPI path_SetText( IWbemPath *iface, ULONG uMode, LPCWSTR pszPath) { struct path *path = impl_from_IWbemPath( iface ); + HRESULT hr; int len; TRACE("%p, %u, %s\n", iface, uMode, debugstr_w(pszPath)); - if (!pszPath) return WBEM_E_INVALID_PARAMETER; + if (!uMode || !pszPath) return WBEM_E_INVALID_PARAMETER; - if (uMode) FIXME("igoring mode %u\n", uMode); + clear_path( path ); + if ((hr = parse_text( path, uMode, pszPath )) != S_OK) return hr; len = strlenW( pszPath ); - if (!(path->text = heap_alloc( (len + 1) * sizeof(WCHAR) ))) return E_OUTOFMEMORY; - + if (!(path->text = heap_alloc( (len + 1) * sizeof(WCHAR) ))) + { + clear_path( path ); + return E_OUTOFMEMORY; + } strcpyW( path->text, pszPath ); - path->len = len; + path->len_text = len; return S_OK; } @@ -129,13 +228,13 @@ static HRESULT WINAPI path_GetText( FIXME("flags 0x%x not supported\n", lFlags); return WBEM_E_INVALID_PARAMETER; } - if (*puBufferLength < path->len + 1) + if (*puBufferLength < path->len_text + 1) { - *puBufferLength = path->len + 1; + *puBufferLength = path->len_text + 1; return S_OK; } if (pszText) strcpyW( pszText, path->text ); - *puBufferLength = path->len + 1; + *puBufferLength = path->len_text + 1; return S_OK; } @@ -389,6 +488,7 @@ HRESULT WbemPath_create( IUnknown *pUnkOuter, LPVOID *ppObj ) path->IWbemPath_iface.lpVtbl = &path_vtbl; path->refs = 1; + init_path( path ); *ppObj = &path->IWbemPath_iface;

1 0

Hans Leidekker : wmiutils: Register WbemDefPath.
by Alexandre Julliard Jan. 2, 2013

Jan. 2, 2013

Module: wine Branch: master Commit: ee9c24229599893ad564fb99ae59d0aa940d4803 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee9c24229599893ad564fb99a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 2 13:33:49 2013 +0100 wmiutils: Register WbemDefPath. --- dlls/wmiutils/wmiutils_classes.idl | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/wmiutils/wmiutils_classes.idl b/dlls/wmiutils/wmiutils_classes.idl index c137e86..315a987 100644 --- a/dlls/wmiutils/wmiutils_classes.idl +++ b/dlls/wmiutils/wmiutils_classes.idl @@ -20,6 +20,12 @@ [ threading(both), + uuid(cf4cc405-e2c5-4ddd-b3ce-5e7582d8c9fa) +] +coclass WbemDefPath { interface IWbemPath; } + +[ + threading(both), uuid(eb87e1bd-3233-11d2-aec9-00c04fb68820) ] coclass WbemStatusCode { interface IWbemStatusCodeText; }

1 0

Hans Leidekker : winhttp/tests: Accept another error from WinHttpGetProxyForUrl.
by Alexandre Julliard Jan. 2, 2013

Jan. 2, 2013

Module: wine Branch: master Commit: 8d0551b98d8161b0664eeb78fae2cfcf50f3ccb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d0551b98d8161b0664eeb78f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 2 13:05:57 2013 +0100 winhttp/tests: Accept another error from WinHttpGetProxyForUrl. --- dlls/winhttp/tests/winhttp.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 05e7804..132551c 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -2697,7 +2697,8 @@ static void test_WinHttpGetProxyForUrl(void) SetLastError(0xdeadbeef); ret = WinHttpGetProxyForUrl( session, urlW, &options, &info ); error = GetLastError(); - if (!ret) ok( error == ERROR_WINHTTP_AUTODETECTION_FAILED, "got %u\n", error ); + if (!ret) ok( error == ERROR_WINHTTP_AUTODETECTION_FAILED || + error == ERROR_WINHTTP_UNABLE_TO_DOWNLOAD_SCRIPT, "got %u\n", error ); else { trace("Proxy.AccessType=%u\n", info.dwAccessType);

1 0

Andrew Eikum : wininet: Fail on URLs without a scheme.
by Alexandre Julliard Jan. 2, 2013

Jan. 2, 2013

Module: wine Branch: master Commit: d6c0e8159b7aab54696dde71c07c077c0da75ea0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6c0e8159b7aab54696dde71c… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Dec 31 14:33:20 2012 -0600 wininet: Fail on URLs without a scheme. --- dlls/wininet/internet.c | 210 ++++++++++++++++++++--------------------- dlls/wininet/tests/internet.c | 2 - dlls/wininet/tests/url.c | 23 ++++- 3 files changed, 123 insertions(+), 112 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d6c0e8159b7aab54696dd…

1 0

Jacek Caban : atl100: Fixed NULL catmap handling in AtlRegisterClassCategoriesHelper.
by Alexandre Julliard Jan. 2, 2013

Jan. 2, 2013

Module: wine Branch: master Commit: 9704fcaf730547c7c55604d21adb1821edc8e9b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9704fcaf730547c7c55604d21… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 31 14:29:23 2012 +0100 atl100: Fixed NULL catmap handling in AtlRegisterClassCategoriesHelper. --- dlls/atl100/atl.c | 3 +++ dlls/atl100/tests/atl.c | 7 +++++++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/atl100/atl.c b/dlls/atl100/atl.c index accc88c..1033952 100644 --- a/dlls/atl100/atl.c +++ b/dlls/atl100/atl.c @@ -429,6 +429,9 @@ HRESULT WINAPI AtlRegisterClassCategoriesHelper(REFCLSID clsid, const struct _AT TRACE("(%s %p %x)\n", debugstr_guid(clsid), catmap, reg); + if(!catmap) + return S_OK; + if(!catreg) { ICatRegister *new_catreg; diff --git a/dlls/atl100/tests/atl.c b/dlls/atl100/tests/atl.c index 35ef34b..c640003 100644 --- a/dlls/atl100/tests/atl.c +++ b/dlls/atl100/tests/atl.c @@ -154,6 +154,13 @@ static void test_regcat(void) test_key_not_exists(HKEY_CLASSES_ROOT, "CLSID\\{" CLSID_TEST_STR "}\\Implemented Categories"); test_key_not_exists(HKEY_CLASSES_ROOT, "CLSID\\{" CLSID_TEST_STR "}\\Required Categories"); test_key_exists(HKEY_CLASSES_ROOT, "CLSID\\{" CLSID_TEST_STR "}"); + + ok(RegDeleteKeyA(HKEY_CLASSES_ROOT, "CLSID\\{" CLSID_TEST_STR "}") == ERROR_SUCCESS, "Could not delete key\n"); + + hres = AtlRegisterClassCategoriesHelper(&CLSID_Test, NULL, TRUE); + ok(hres == S_OK, "AtlRegisterClassCategoriesHelper failed: %08x\n", hres); + + test_key_not_exists(HKEY_CLASSES_ROOT, "CLSID\\{" CLSID_TEST_STR "}"); } static void test_typelib(void)

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard Jan. 2, 2013

Jan. 2, 2013

Module: wine Branch: master Commit: bc17219a22a6b4384aa042f960a47b8541c47395 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc17219a22a6b4384aa042f96… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Sat Dec 29 09:41:35 2012 +0200 po: Update Lithuanian translation. --- po/lt.po | 42 +++++++++++++++++------------------------- 1 files changed, 17 insertions(+), 25 deletions(-) diff --git a/po/lt.po b/po/lt.po index e741048..60c6956 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-12-21 19:24+0300\n" +"PO-Revision-Date: 2012-12-29 09:34+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -10371,77 +10371,69 @@ msgstr "Šios tarnybos vykdomos:\n" #: netstat.rc:27 msgid "CLOSED" -msgstr "" +msgstr "NUTRAUKTAS" #: netstat.rc:28 msgid "LISTENING" -msgstr "" +msgstr "KLAUSOMASI" #: netstat.rc:29 msgid "SYN_SENT" -msgstr "" +msgstr "SYN_IŠSIŲSTAS" #: netstat.rc:30 msgid "SYN_RCVD" -msgstr "" +msgstr "SYN_GAUTAS" #: netstat.rc:31 msgid "ESTABLISHED" -msgstr "" +msgstr "UŽMEGZTAS" #: netstat.rc:32 msgid "FIN_WAIT1" -msgstr "" +msgstr "FIN_LAUKIMAS1" #: netstat.rc:33 msgid "FIN_WAIT2" -msgstr "" +msgstr "FIN_LAUKIMAS2" #: netstat.rc:34 msgid "CLOSE_WAIT" -msgstr "" +msgstr "NUTRAUKIMO_LAUKIMAS" #: netstat.rc:35 msgid "CLOSING" -msgstr "" +msgstr "NUTRAUKIAMA" #: netstat.rc:36 msgid "LAST_ACK" -msgstr "" +msgstr "PASKUTINIS_ACK" #: netstat.rc:37 msgid "TIME_WAIT" -msgstr "" +msgstr "PERIODO_LAUKIMAS" #: netstat.rc:38 msgid "DELETE_TCB" -msgstr "" +msgstr "TCB_PAŠALINTAS" #: netstat.rc:40 -#, fuzzy -#| msgid "LAN Connection" msgid "Active Connections" -msgstr "Vietinio tinklo ryšys" +msgstr "Aktyvūs ryšiai" #: netstat.rc:41 msgid "Proto" -msgstr "" +msgstr "Prot." #: netstat.rc:42 -#, fuzzy -#| msgid "Email Address" msgid "Local Address" -msgstr "Elektroninio pašto adresas" +msgstr "Vietinis adresas" #: netstat.rc:43 -#, fuzzy -#| msgid "Street Address" msgid "Foreign Address" -msgstr "Adresas" +msgstr "Svetimas adresas" #: netstat.rc:44 -#, fuzzy -#| msgid "Status" msgid "State" msgstr "Būsena"

1 0

Henri Verbeet : d3d10core: Only create unique rasterizer state objects.
by Alexandre Julliard Jan. 2, 2013

Jan. 2, 2013

Module: wine Branch: master Commit: 5d38662235aa5d89e0b3754fbbc8c2df36838367 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d38662235aa5d89e0b3754fb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 2 12:07:27 2013 +0100 d3d10core: Only create unique rasterizer state objects. --- dlls/d3d10core/d3d10core_private.h | 5 +++- dlls/d3d10core/device.c | 42 +++++++++++++++++++++++++++++++++++- dlls/d3d10core/state.c | 19 ++++++++++++---- 3 files changed, 59 insertions(+), 7 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index ede3b7a..a859642 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -248,10 +248,12 @@ struct d3d10_rasterizer_state ID3D10RasterizerState ID3D10RasterizerState_iface; LONG refcount; + struct d3d10_device *device; D3D10_RASTERIZER_DESC desc; + struct wine_rb_entry entry; }; -HRESULT d3d10_rasterizer_state_init(struct d3d10_rasterizer_state *state, +HRESULT d3d10_rasterizer_state_init(struct d3d10_rasterizer_state *state, struct d3d10_device *device, const D3D10_RASTERIZER_DESC *desc) DECLSPEC_HIDDEN; struct d3d10_rasterizer_state *unsafe_impl_from_ID3D10RasterizerState(ID3D10RasterizerState *iface) DECLSPEC_HIDDEN; @@ -294,6 +296,7 @@ struct d3d10_device struct wine_rb_tree blend_states; struct wine_rb_tree depthstencil_states; + struct wine_rb_tree rasterizer_states; struct wine_rb_tree sampler_states; struct d3d10_blend_state *blend_state; diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 3542d53..4783781 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -82,6 +82,7 @@ static ULONG STDMETHODCALLTYPE d3d10_device_inner_Release(IUnknown *iface) if (device->wined3d_device) wined3d_device_decref(device->wined3d_device); wine_rb_destroy(&device->sampler_states, NULL, NULL); + wine_rb_destroy(&device->rasterizer_states, NULL, NULL); wine_rb_destroy(&device->depthstencil_states, NULL, NULL); wine_rb_destroy(&device->blend_states, NULL, NULL); } @@ -1475,7 +1476,9 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateDepthStencilState(ID3D10Devi static HRESULT STDMETHODCALLTYPE d3d10_device_CreateRasterizerState(ID3D10Device *iface, const D3D10_RASTERIZER_DESC *desc, ID3D10RasterizerState **rasterizer_state) { + struct d3d10_device *device = impl_from_ID3D10Device(iface); struct d3d10_rasterizer_state *object; + struct wine_rb_entry *entry; HRESULT hr; TRACE("iface %p, desc %p, rasterizer_state %p.\n", iface, desc, rasterizer_state); @@ -1483,6 +1486,18 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateRasterizerState(ID3D10Device if (!desc) return E_INVALIDARG; + if ((entry = wine_rb_get(&device->rasterizer_states, desc))) + { + object = WINE_RB_ENTRY_VALUE(entry, struct d3d10_rasterizer_state, entry); + + TRACE("Returning existing rasterizer state %p.\n", object); + *rasterizer_state = &object->ID3D10RasterizerState_iface; + ID3D10RasterizerState_AddRef(*rasterizer_state); + + return S_OK; + } + + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) { @@ -1490,7 +1505,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateRasterizerState(ID3D10Device return E_OUTOFMEMORY; } - if (FAILED(hr = d3d10_rasterizer_state_init(object, desc))) + if (FAILED(hr = d3d10_rasterizer_state_init(object, device, desc))) { WARN("Failed to initialize rasterizer state, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); @@ -2020,6 +2035,22 @@ static const struct wine_rb_functions d3d10_depthstencil_state_rb_ops = d3d10_depthstencil_state_compare, }; +static int d3d10_rasterizer_state_compare(const void *key, const struct wine_rb_entry *entry) +{ + const D3D10_RASTERIZER_DESC *ka = key; + const D3D10_RASTERIZER_DESC *kb = &WINE_RB_ENTRY_VALUE(entry, const struct d3d10_rasterizer_state, entry)->desc; + + return memcmp(ka, kb, sizeof(*ka)); +} + +static const struct wine_rb_functions d3d10_rasterizer_state_rb_ops = +{ + d3d10_rb_alloc, + d3d10_rb_realloc, + d3d10_rb_free, + d3d10_rasterizer_state_compare, +}; + HRESULT d3d10_device_init(struct d3d10_device *device, void *outer_unknown) { device->ID3D10Device_iface.lpVtbl = &d3d10_device_vtbl; @@ -2043,9 +2074,18 @@ HRESULT d3d10_device_init(struct d3d10_device *device, void *outer_unknown) return E_FAIL; } + if (wine_rb_init(&device->rasterizer_states, &d3d10_rasterizer_state_rb_ops) == -1) + { + WARN("Failed to initialize rasterizer state rbtree.\n"); + wine_rb_destroy(&device->depthstencil_states, NULL, NULL); + wine_rb_destroy(&device->blend_states, NULL, NULL); + return E_FAIL; + } + if (wine_rb_init(&device->sampler_states, &d3d10_sampler_state_rb_ops) == -1) { WARN("Failed to initialize sampler state rbtree.\n"); + wine_rb_destroy(&device->rasterizer_states, NULL, NULL); wine_rb_destroy(&device->depthstencil_states, NULL, NULL); wine_rb_destroy(&device->blend_states, NULL, NULL); return E_FAIL; diff --git a/dlls/d3d10core/state.c b/dlls/d3d10core/state.c index f49875d..f0d162b 100644 --- a/dlls/d3d10core/state.c +++ b/dlls/d3d10core/state.c @@ -341,14 +341,15 @@ static ULONG STDMETHODCALLTYPE d3d10_rasterizer_state_AddRef(ID3D10RasterizerSta static ULONG STDMETHODCALLTYPE d3d10_rasterizer_state_Release(ID3D10RasterizerState *iface) { - struct d3d10_rasterizer_state *This = impl_from_ID3D10RasterizerState(iface); - ULONG refcount = InterlockedDecrement(&This->refcount); + struct d3d10_rasterizer_state *state = impl_from_ID3D10RasterizerState(iface); + ULONG refcount = InterlockedDecrement(&state->refcount); - TRACE("%p decreasing refcount to %u.\n", This, refcount); + TRACE("%p decreasing refcount to %u.\n", state, refcount); if (!refcount) { - HeapFree(GetProcessHeap(), 0, This); + wine_rb_remove(&state->device->rasterizer_states, &state->desc); + HeapFree(GetProcessHeap(), 0, state); } return refcount; @@ -414,12 +415,20 @@ static const struct ID3D10RasterizerStateVtbl d3d10_rasterizer_state_vtbl = d3d10_rasterizer_state_GetDesc, }; -HRESULT d3d10_rasterizer_state_init(struct d3d10_rasterizer_state *state, const D3D10_RASTERIZER_DESC *desc) +HRESULT d3d10_rasterizer_state_init(struct d3d10_rasterizer_state *state, struct d3d10_device *device, + const D3D10_RASTERIZER_DESC *desc) { state->ID3D10RasterizerState_iface.lpVtbl = &d3d10_rasterizer_state_vtbl; state->refcount = 1; + state->device = device; state->desc = *desc; + if (wine_rb_put(&device->rasterizer_states, desc, &state->entry) == -1) + { + ERR("Failed to insert rasterizer state entry.\n"); + return E_FAIL; + } + return S_OK; }

1 0

Henri Verbeet : ddraw: Avoid LPD3DMATRIXHANDLE.
by Alexandre Julliard Jan. 2, 2013

Jan. 2, 2013

Module: wine Branch: master Commit: d1b87e1378ff9ff2a85f39d4e1d3965d256a5ec9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1b87e1378ff9ff2a85f39d4e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 2 12:07:24 2013 +0100 ddraw: Avoid LPD3DMATRIXHANDLE. --- include/d3d.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/d3d.h b/include/d3d.h index fa6179f..6dbf3d8 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -952,7 +952,7 @@ DECLARE_INTERFACE_(IDirect3DDevice,IUnknown) DWORD flags, D3DRECT *rect) PURE; STDMETHOD(GetPickRecords)(THIS_ LPDWORD lpCount, LPD3DPICKRECORD lpD3DPickRec) PURE; STDMETHOD(EnumTextureFormats)(THIS_ LPD3DENUMTEXTUREFORMATSCALLBACK lpD3DEnumTextureProc, LPVOID lpArg) PURE; - STDMETHOD(CreateMatrix)(THIS_ LPD3DMATRIXHANDLE lpD3DMatHandle) PURE; + STDMETHOD(CreateMatrix)(THIS_ D3DMATRIXHANDLE *matrix) PURE; STDMETHOD(SetMatrix)(THIS_ D3DMATRIXHANDLE D3DMatHandle, LPD3DMATRIX lpD3DMatrix) PURE; STDMETHOD(GetMatrix)(THIS_ D3DMATRIXHANDLE D3DMatHandle, LPD3DMATRIX lpD3DMatrix) PURE; STDMETHOD(DeleteMatrix)(THIS_ D3DMATRIXHANDLE D3DMatHandle) PURE;

1 0