October 2009 - Wine-commits

Henri Verbeet : ddraw/tests: Remove some leftover debug code.
by Alexandre Julliard 19 Oct '09

19 Oct '09

Module: wine Branch: master Commit: 02772641b2528d666b2d487ce99056346cf23191 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02772641b2528d666b2d487ce… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 19 10:12:18 2009 +0200 ddraw/tests: Remove some leftover debug code. --- dlls/ddraw/tests/dsurface.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 44be603..1a6023f 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -3224,7 +3224,6 @@ static void GetDCFormatTest(void) ddsd.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN; hr = IDirectDraw7_CreateSurface(dd7, &ddsd, &surface, NULL); - hr = E_FAIL; if(FAILED(hr)) { ddsd.ddsCaps.dwCaps = DDSCAPS_TEXTURE;

1 0

Henri Verbeet : wined3d: Cleanup IWineD3DDeviceImpl_UpdateTexture().
by Alexandre Julliard 19 Oct '09

19 Oct '09

Module: wine Branch: master Commit: adf5bb5f6aa51d59aab3813b9c8f063b15def1ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=adf5bb5f6aa51d59aab3813b9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 19 10:12:19 2009 +0200 wined3d: Cleanup IWineD3DDeviceImpl_UpdateTexture(). The root problem here is that with the original error handling a NULL dereference occurs (IWineD3DBaseTexture_GetType()) when either the source or destination texture is NULL. Rewriting the error handling changes the indentation of almost the entire function though, so this patch ends up rewriting the entire function. --- dlls/wined3d/device.c | 185 ++++++++++++++++++++++++------------------------- 1 files changed, 90 insertions(+), 95 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=adf5bb5f6aa51d59aab38…

1 0

Henri Verbeet : d3d8: Add traces.
by Alexandre Julliard 19 Oct '09

19 Oct '09

Module: wine Branch: master Commit: f8bd01a315f4f38e6267cf3c9aaf853094da27cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8bd01a315f4f38e6267cf3c9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 19 10:12:20 2009 +0200 d3d8: Add traces. --- dlls/d3d8/cubetexture.c | 56 ++++++--- dlls/d3d8/device.c | 289 +++++++++++++++++++++++++++-------------- dlls/d3d8/directx.c | 55 ++++++--- dlls/d3d8/indexbuffer.c | 45 +++++-- dlls/d3d8/pixelshader.c | 6 +- dlls/d3d8/stateblock.c | 12 +- dlls/d3d8/surface.c | 40 ++++-- dlls/d3d8/swapchain.c | 13 ++- dlls/d3d8/texture.c | 57 ++++++--- dlls/d3d8/vertexbuffer.c | 45 +++++-- dlls/d3d8/vertexdeclaration.c | 10 +- dlls/d3d8/vertexshader.c | 6 +- dlls/d3d8/volume.c | 37 ++++-- dlls/d3d8/volumetexture.c | 55 ++++++--- 14 files changed, 487 insertions(+), 239 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f8bd01a315f4f38e6267c…

1 0

Juan Lang : ws2_32: Don't overwrite address length before checking it.
by Alexandre Julliard 19 Oct '09

19 Oct '09

Module: wine Branch: master Commit: d1963ee2f19c931cbd6d7c039081440d08cb9011 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1963ee2f19c931cbd6d7c039… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Oct 16 16:53:53 2009 -0700 ws2_32: Don't overwrite address length before checking it. --- dlls/ws2_32/socket.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index a8d3efc..35f7b07 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1219,13 +1219,16 @@ static int ws_sockaddr_u2ws(const struct sockaddr* uaddr, struct WS_sockaddr* ws win6old->sin6_port = uin6->sin6_port; win6old->sin6_flowinfo = uin6->sin6_flowinfo; memcpy(&win6old->sin6_addr,&uin6->sin6_addr,16); /* 16 bytes = 128 address bits */ - *wsaddrlen = sizeof(struct WS_sockaddr_in6_old); #ifdef HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID if (*wsaddrlen >= sizeof(struct WS_sockaddr_in6)) { struct WS_sockaddr_in6* win6 = (struct WS_sockaddr_in6*)wsaddr; win6->sin6_scope_id = uin6->sin6_scope_id; *wsaddrlen = sizeof(struct WS_sockaddr_in6); } + else + *wsaddrlen = sizeof(struct WS_sockaddr_in6_old); +#else + *wsaddrlen = sizeof(struct WS_sockaddr_in6_old); #endif return 0; }

1 0

Marcus Meissner : localspl: Check for NULL return from HeapAlloc.
by Alexandre Julliard 19 Oct '09

19 Oct '09

Module: wine Branch: master Commit: 1aee3595423a8aa15e3560d764001129263bce10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1aee3595423a8aa15e3560d76… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Oct 17 12:40:42 2009 +0200 localspl: Check for NULL return from HeapAlloc. --- dlls/localspl/provider.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index e032a8e..8c6a940 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -193,7 +193,7 @@ static LPWSTR strdupW(LPCWSTR p) if(!p) return NULL; len = (lstrlenW(p) + 1) * sizeof(WCHAR); ret = heap_alloc(len); - memcpy(ret, p, len); + if (ret) memcpy(ret, p, len); return ret; }

1 0

Ričardas Barkauskas : comctl32/propsheet: Test and fix for crash processing PSM_INDEXTOHWND with no longer valid handle .
by Alexandre Julliard 19 Oct '09

19 Oct '09

Module: wine Branch: master Commit: a8f89a2ffa7065e59be39f0b5e32c1ece63cd340 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8f89a2ffa7065e59be39f0b5… Author: Ričardas Barkauskas <miegalius(a)gmail.com> Date: Sat Oct 17 19:11:29 2009 +0300 comctl32/propsheet: Test and fix for crash processing PSM_INDEXTOHWND with no longer valid handle. --- dlls/comctl32/propsheet.c | 2 ++ dlls/comctl32/tests/propsheet.c | 8 +++++++- 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 4759d4c..5aef0e1 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -2553,6 +2553,8 @@ static LRESULT PROPSHEET_IndexToHwnd(HWND hwndDlg, int iPageIndex) { PropSheetInfo * psInfo = GetPropW(hwndDlg, PropSheetInfoStr); TRACE("(%p, %d)\n", hwndDlg, iPageIndex); + if (!psInfo) + return 0; if (iPageIndex<0 || iPageIndex>=psInfo->nPages) { WARN("%d out of range.\n", iPageIndex); return 0; diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index 0eebe33..a61fa0b 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -26,6 +26,7 @@ #include "wine/test.h" static HWND parent; +static HWND sheethwnd; static LONG active_page = -1; @@ -40,12 +41,13 @@ static int CALLBACK sheet_callback(HWND hwnd, UINT msg, LPARAM lparam) char caption[256]; GetWindowTextA(hwnd, caption, sizeof(caption)); ok(!strcmp(caption,"test caption"), "caption: %s\n", caption); + sheethwnd = hwnd; return 0; } } return 0; } - + static INT_PTR CALLBACK page_dlg_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { @@ -71,6 +73,10 @@ static INT_PTR CALLBACK page_dlg_proc(HWND hwnd, UINT msg, WPARAM wparam, return FALSE; } } + case WM_NCDESTROY: + ok(!SendMessageA(sheethwnd, PSM_INDEXTOHWND, 400, 0),"Should always be 0\n"); + return TRUE; + default: return FALSE; }

1 0

Francois Gouget : comctl32/monthcal: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 19 Oct '09

19 Oct '09

Module: wine Branch: master Commit: 5a45951f3ed3434509485803adf7eec19da4d245 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a45951f3ed3434509485803a… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Oct 17 20:27:44 2009 +0200 comctl32/monthcal: Fix compilation on systems that don't support nameless unions. --- dlls/comctl32/monthcal.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 1c06d23..2c98331 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -368,10 +368,10 @@ static BOOL MONTHCAL_IsSelRangeValid(const MONTHCAL_INFO *infoPtr, SystemTimeToFileTime(range0, &ft_range0); SystemTimeToFileTime(range1, &ft_range1); - ul_range0.LowPart = ft_range0.dwLowDateTime; - ul_range0.HighPart = ft_range0.dwHighDateTime; - ul_range1.LowPart = ft_range1.dwLowDateTime; - ul_range1.HighPart = ft_range1.dwHighDateTime; + ul_range0.u.LowPart = ft_range0.dwLowDateTime; + ul_range0.u.HighPart = ft_range0.dwHighDateTime; + ul_range1.u.LowPart = ft_range1.dwLowDateTime; + ul_range1.u.HighPart = ft_range1.dwHighDateTime; cmp = CompareFileTime(&ft_range0, &ft_range1); @@ -388,8 +388,8 @@ static BOOL MONTHCAL_IsSelRangeValid(const MONTHCAL_INFO *infoPtr, else ul_range0.QuadPart = ul_range1.QuadPart - DAYSTO100NSECS(infoPtr->maxSelCount - 1); - ft_range0.dwLowDateTime = ul_range0.LowPart; - ft_range0.dwHighDateTime = ul_range0.HighPart; + ft_range0.dwLowDateTime = ul_range0.u.LowPart; + ft_range0.dwHighDateTime = ul_range0.u.HighPart; FileTimeToSystemTime(&ft_range0, adjust); }

1 0

Francois Gouget : crypt32: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 19 Oct '09

19 Oct '09

Module: wine Branch: master Commit: d2cc5380db296a2246e462334f6c68f12b4de614 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2cc5380db296a2246e462334… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Oct 17 20:27:58 2009 +0200 crypt32: Fix compilation on systems that don't support nameless unions. --- dlls/crypt32/str.c | 31 +++++++++++++++++-------------- 1 files changed, 17 insertions(+), 14 deletions(-) diff --git a/dlls/crypt32/str.c b/dlls/crypt32/str.c index b0a3d25..758abc9 100644 --- a/dlls/crypt32/str.c +++ b/dlls/crypt32/str.c @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <stdarg.h> + +#define NONAMELESSUNION + #include "windef.h" #include "winbase.h" #include "winnls.h" @@ -1017,11 +1020,11 @@ DWORD WINAPI CertGetNameStringW(PCCERT_CONTEXT pCertContext, DWORD dwType, if (entry) { if (!pszNameString) - ret = strlenW(entry->pwszRfc822Name) + 1; + ret = strlenW(entry->u.pwszRfc822Name) + 1; else if (cchNameString) { - ret = min(strlenW(entry->pwszRfc822Name), cchNameString - 1); - memcpy(pszNameString, entry->pwszRfc822Name, + ret = min(strlenW(entry->u.pwszRfc822Name), cchNameString - 1); + memcpy(pszNameString, entry->u.pwszRfc822Name, ret * sizeof(WCHAR)); pszNameString[ret++] = 0; } @@ -1045,7 +1048,7 @@ DWORD WINAPI CertGetNameStringW(PCCERT_CONTEXT pCertContext, DWORD dwType, if (entry) ret = CertNameToStrW(pCertContext->dwCertEncodingType, - &entry->DirectoryName, *(DWORD *)pvTypePara, pszNameString, + &entry->u.DirectoryName, *(DWORD *)pvTypePara, pszNameString, cchNameString); if (info) LocalFree(info); @@ -1062,7 +1065,7 @@ DWORD WINAPI CertGetNameStringW(PCCERT_CONTEXT pCertContext, DWORD dwType, if (entry) ret = cert_name_to_str_with_indent(X509_ASN_ENCODING, 0, - &entry->DirectoryName, 0, pszNameString, cchNameString); + &entry->u.DirectoryName, 0, pszNameString, cchNameString); if (altInfo) LocalFree(altInfo); } @@ -1102,12 +1105,12 @@ DWORD WINAPI CertGetNameStringW(PCCERT_CONTEXT pCertContext, DWORD dwType, if (entry) { if (!pszNameString) - ret = strlenW(entry->pwszRfc822Name) + 1; + ret = strlenW(entry->u.pwszRfc822Name) + 1; else if (cchNameString) { - ret = min(strlenW(entry->pwszRfc822Name), + ret = min(strlenW(entry->u.pwszRfc822Name), cchNameString - 1); - memcpy(pszNameString, entry->pwszRfc822Name, + memcpy(pszNameString, entry->u.pwszRfc822Name, ret * sizeof(WCHAR)); pszNameString[ret++] = 0; } @@ -1139,11 +1142,11 @@ DWORD WINAPI CertGetNameStringW(PCCERT_CONTEXT pCertContext, DWORD dwType, if (entry) { if (!pszNameString) - ret = strlenW(entry->pwszDNSName) + 1; + ret = strlenW(entry->u.pwszDNSName) + 1; else if (cchNameString) { - ret = min(strlenW(entry->pwszDNSName), cchNameString - 1); - memcpy(pszNameString, entry->pwszDNSName, ret * sizeof(WCHAR)); + ret = min(strlenW(entry->u.pwszDNSName), cchNameString - 1); + memcpy(pszNameString, entry->u.pwszDNSName, ret * sizeof(WCHAR)); pszNameString[ret++] = 0; } } @@ -1163,11 +1166,11 @@ DWORD WINAPI CertGetNameStringW(PCCERT_CONTEXT pCertContext, DWORD dwType, if (entry) { if (!pszNameString) - ret = strlenW(entry->pwszURL) + 1; + ret = strlenW(entry->u.pwszURL) + 1; else if (cchNameString) { - ret = min(strlenW(entry->pwszURL), cchNameString - 1); - memcpy(pszNameString, entry->pwszURL, ret * sizeof(WCHAR)); + ret = min(strlenW(entry->u.pwszURL), cchNameString - 1); + memcpy(pszNameString, entry->u.pwszURL, ret * sizeof(WCHAR)); pszNameString[ret++] = 0; } }

1 0

Francois Gouget : ntdll/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 19 Oct '09

19 Oct '09

Module: wine Branch: master Commit: 9b89b85e5f49bffae4afa9c863d04b9f9b9c7f13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b89b85e5f49bffae4afa9c86… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Oct 17 20:28:14 2009 +0200 ntdll/tests: Fix compilation on systems that don't support nameless unions. --- dlls/ntdll/tests/directory.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/directory.c b/dlls/ntdll/tests/directory.c index 6b621df..ea722dd 100644 --- a/dlls/ntdll/tests/directory.c +++ b/dlls/ntdll/tests/directory.c @@ -184,7 +184,7 @@ static void test_NtQueryDirectoryFile(void) pNtQueryDirectoryFile( dirh, NULL, NULL, NULL, &io, data, sizeof(data), FileBothDirectoryInformation, FALSE, NULL, TRUE ); - ok (io.Status == STATUS_SUCCESS, "filed to query directory; status %x\n", io.Status); + ok (U(io).Status == STATUS_SUCCESS, "filed to query directory; status %x\n", U(io).Status); data_len = io.Information; ok (data_len >= sizeof(FILE_BOTH_DIRECTORY_INFORMATION), "not enough data in directory\n"); @@ -198,9 +198,9 @@ static void test_NtQueryDirectoryFile(void) if (dir_info->NextEntryOffset == 0) { pNtQueryDirectoryFile( dirh, 0, NULL, NULL, &io, data, sizeof(data), FileBothDirectoryInformation, FALSE, NULL, FALSE ); - if (io.Status == STATUS_NO_MORE_FILES) + if (U(io).Status == STATUS_NO_MORE_FILES) break; - ok (io.Status == STATUS_SUCCESS, "filed to query directory; status %x\n", io.Status); + ok (U(io).Status == STATUS_SUCCESS, "filed to query directory; status %x\n", U(io).Status); data_len = io.Information; if (data_len < sizeof(FILE_BOTH_DIRECTORY_INFORMATION)) break;

1 0

Jacek Caban : shlwapi: Make more strict restriction for URL scheme and fix error handling in ParseURLW .
by Alexandre Julliard 19 Oct '09

19 Oct '09

Module: wine Branch: master Commit: 4d592ae84fbb16fec55a3e73f7bc1e2b45e85705 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d592ae84fbb16fec55a3e73f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Oct 18 21:49:41 2009 +0200 shlwapi: Make more strict restriction for URL scheme and fix error handling in ParseURLW. --- dlls/shlwapi/tests/url.c | 2 +- dlls/shlwapi/url.c | 42 +++++++++++++++--------------------------- 2 files changed, 16 insertions(+), 28 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index f135f2a..39cf00b 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -131,7 +131,7 @@ static const TEST_URL_CANONICALIZE TEST_CANONICALIZE[] = { {"res:///c:\\tests\\foo bar", 0, S_OK, "res:///c:\\tests\\foo bar", TRUE}, {"res:///c:\\tests\\foo bar", URL_DONT_SIMPLIFY, S_OK, "res:///c:\\tests\\foo bar", TRUE}, {"A", 0, S_OK, "A", FALSE}, - {"/uri-res/N2R?urn:sha1:B3K", URL_DONT_ESCAPE_EXTRA_INFO | URL_WININET_COMPATIBILITY /*0x82000000*/, S_OK, "/uri-res/N2R?urn:sha1:B3K", TRUE} /*LimeWire online installer calls this*/, + {"/uri-res/N2R?urn:sha1:B3K", URL_DONT_ESCAPE_EXTRA_INFO | URL_WININET_COMPATIBILITY /*0x82000000*/, S_OK, "/uri-res/N2R?urn:sha1:B3K", FALSE} /*LimeWire online installer calls this*/, {"http:www.winehq.org/dir/../index.html", 0, S_OK, "http:www.winehq.org/index.html"}, }; diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index 1b8803c..2b7a8cd 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -180,38 +180,26 @@ HRESULT WINAPI ParseURLA(LPCSTR x, PARSEDURLA *y) */ HRESULT WINAPI ParseURLW(LPCWSTR x, PARSEDURLW *y) { - DWORD cnt; + const WCHAR *ptr = x; - y->nScheme = URL_SCHEME_INVALID; - if (y->cbSize != sizeof(*y)) return E_INVALIDARG; - /* FIXME: leading white space generates error of 0x80041001 which - * is undefined - */ - if (*x <= ' ') return 0x80041001; - cnt = 0; - y->cchProtocol = 0; - y->pszProtocol = x; - while (*x) { - if (*x == ':') { - y->cchProtocol = cnt; - cnt = -1; - y->pszSuffix = x+1; - break; - } - x++; - cnt++; - } + TRACE("%s %p\n", debugstr_w(x), y); + + if(y->cbSize != sizeof(*y)) + return E_INVALIDARG; + + while(*ptr && (isalnumW(*ptr) || *ptr == '-')) + ptr++; - /* check for no scheme in string start */ - /* (apparently schemes *must* be larger than a single character) */ - if ((*x == '\0') || (y->cchProtocol <= 1)) { + if (*ptr != ':' || ptr <= x+1) { y->pszProtocol = NULL; return 0x80041001; } - /* found scheme, set length of remainder */ - y->cchSuffix = lstrlenW(y->pszSuffix); - y->nScheme = get_scheme_code(y->pszProtocol, y->cchProtocol); + y->pszProtocol = x; + y->cchProtocol = ptr-x; + y->pszSuffix = ptr+1; + y->cchSuffix = strlenW(y->pszSuffix); + y->nScheme = get_scheme_code(x, ptr-x); return S_OK; }

1 0