December 2008 - Wine-commits

Hans Leidekker : winhttp: Validate parameters per component in WinHttpCrackUrl.
by Alexandre Julliard 11 Dec '08

11 Dec '08

Module: wine Branch: master Commit: b527d9905c7772984beb68728becfcae6be306b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b527d9905c7772984beb68728… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Dec 11 13:56:40 2008 +0100 winhttp: Validate parameters per component in WinHttpCrackUrl. --- dlls/winhttp/url.c | 43 +++++++++++++++++++++---------------------- 1 files changed, 21 insertions(+), 22 deletions(-) diff --git a/dlls/winhttp/url.c b/dlls/winhttp/url.c index 41a46b7..f8c1972 100644 --- a/dlls/winhttp/url.c +++ b/dlls/winhttp/url.c @@ -34,10 +34,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(winhttp); static const WCHAR scheme_http[] = {'h','t','t','p',0}; static const WCHAR scheme_https[] = {'h','t','t','p','s',0}; -static BOOL set_component( WCHAR **str, DWORD *str_len, WCHAR *value, DWORD len ) +static BOOL set_component( WCHAR **str, DWORD *str_len, WCHAR *value, DWORD len, DWORD flags ) { if (!*str) { + if (len && (flags & ICU_DECODE)) + { + set_last_error( ERROR_INVALID_PARAMETER ); + return FALSE; + } *str = value; *str_len = len; } @@ -89,12 +94,6 @@ BOOL WINAPI WinHttpCrackUrl( LPCWSTR url, DWORD len, DWORD flags, LPURL_COMPONEN WCHAR *url_tmp; DWORD url_len = len + 1; - if (!uc->lpszScheme || !uc->lpszUserName || !uc->lpszPassword || - !uc->lpszHostName || !uc->lpszUrlPath || !uc-> lpszExtraInfo) - { - set_last_error( ERROR_INVALID_PARAMETER ); - return FALSE; - } if (!(url_tmp = HeapAlloc( GetProcessHeap(), 0, url_len * sizeof(WCHAR) ))) { set_last_error( ERROR_OUTOFMEMORY ); @@ -121,7 +120,7 @@ BOOL WINAPI WinHttpCrackUrl( LPCWSTR url, DWORD len, DWORD flags, LPURL_COMPONEN else if (p - url == 5 && !strncmpiW( url, scheme_https, 5 )) uc->nScheme = INTERNET_SCHEME_HTTPS; else goto exit; - if (!(set_component( &uc->lpszScheme, &uc->dwSchemeLength, (WCHAR *)url, p - url ))) goto exit; + if (!(set_component( &uc->lpszScheme, &uc->dwSchemeLength, (WCHAR *)url, p - url, flags ))) goto exit; p++; /* skip ':' */ if (!p[0] || p[0] != '/' || p[1] != '/') goto exit; @@ -132,42 +131,42 @@ BOOL WINAPI WinHttpCrackUrl( LPCWSTR url, DWORD len, DWORD flags, LPURL_COMPONEN { if ((r = memchrW( p, ':', q - p ))) { - if (!(set_component( &uc->lpszUserName, &uc->dwUserNameLength, p, r - p ))) goto exit; + if (!(set_component( &uc->lpszUserName, &uc->dwUserNameLength, p, r - p, flags ))) goto exit; r++; - if (!(set_component( &uc->lpszPassword, &uc->dwPasswordLength, r, q - r ))) goto exit; + if (!(set_component( &uc->lpszPassword, &uc->dwPasswordLength, r, q - r, flags ))) goto exit; } else { - if (!(set_component( &uc->lpszUserName, &uc->dwUserNameLength, p, q - p ))) goto exit; - if (!(set_component( &uc->lpszPassword, &uc->dwPasswordLength, NULL, 0 ))) goto exit; + if (!(set_component( &uc->lpszUserName, &uc->dwUserNameLength, p, q - p, flags ))) goto exit; + if (!(set_component( &uc->lpszPassword, &uc->dwPasswordLength, NULL, 0, flags ))) goto exit; } p = q + 1; } else { - if (!(set_component( &uc->lpszUserName, &uc->dwUserNameLength, NULL, 0 ))) goto exit; - if (!(set_component( &uc->lpszPassword, &uc->dwPasswordLength, NULL, 0 ))) goto exit; + if (!(set_component( &uc->lpszUserName, &uc->dwUserNameLength, NULL, 0, flags ))) goto exit; + if (!(set_component( &uc->lpszPassword, &uc->dwPasswordLength, NULL, 0, flags ))) goto exit; } if ((q = memchrW( p, '/', len - (p - url) ))) { - if (!(set_component( &uc->lpszHostName, &uc->dwHostNameLength, p, q - p ))) goto exit; + if (!(set_component( &uc->lpszHostName, &uc->dwHostNameLength, p, q - p, flags ))) goto exit; if ((r = memchrW( q, '?', len - (q - url) ))) { - if (!(set_component( &uc->lpszUrlPath, &uc->dwUrlPathLength, q, r - q ))) goto exit; - if (!(set_component( &uc->lpszExtraInfo, &uc->dwExtraInfoLength, r, len - (r - url) ))) goto exit; + if (!(set_component( &uc->lpszUrlPath, &uc->dwUrlPathLength, q, r - q, flags ))) goto exit; + if (!(set_component( &uc->lpszExtraInfo, &uc->dwExtraInfoLength, r, len - (r - url), flags ))) goto exit; } else { - if (!(set_component( &uc->lpszUrlPath, &uc->dwUrlPathLength, q, len - (q - url) ))) goto exit; - if (!(set_component( &uc->lpszExtraInfo, &uc->dwExtraInfoLength, (WCHAR *)url + len, 0 ))) goto exit; + if (!(set_component( &uc->lpszUrlPath, &uc->dwUrlPathLength, q, len - (q - url), flags ))) goto exit; + if (!(set_component( &uc->lpszExtraInfo, &uc->dwExtraInfoLength, (WCHAR *)url + len, 0, flags ))) goto exit; } } else { - if (!(set_component( &uc->lpszHostName, &uc->dwHostNameLength, p, len - (p - url) ))) goto exit; - if (!(set_component( &uc->lpszUrlPath, &uc->dwUrlPathLength, (WCHAR *)url + len, 0 ))) goto exit; - if (!(set_component( &uc->lpszExtraInfo, &uc->dwExtraInfoLength, (WCHAR *)url + len, 0 ))) goto exit; + if (!(set_component( &uc->lpszHostName, &uc->dwHostNameLength, p, len - (p - url), flags ))) goto exit; + if (!(set_component( &uc->lpszUrlPath, &uc->dwUrlPathLength, (WCHAR *)url + len, 0, flags ))) goto exit; + if (!(set_component( &uc->lpszExtraInfo, &uc->dwExtraInfoLength, (WCHAR *)url + len, 0, flags ))) goto exit; } ret = TRUE;

1 0

Hans Leidekker : winhttp: Resolve host port at the latest possible moment.
by Alexandre Julliard 11 Dec '08

11 Dec '08

Module: wine Branch: master Commit: 0719b6ed86ce6ea86a577a3c288541d88ee88121 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0719b6ed86ce6ea86a577a3c2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Dec 11 13:56:52 2008 +0100 winhttp: Resolve host port at the latest possible moment. --- dlls/winhttp/request.c | 25 +++++++++++++++++-------- dlls/winhttp/session.c | 4 ++-- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index d2d515f..868045a 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -715,13 +715,16 @@ static BOOL open_connection( request_t *request ) connect_t *connect; char address[32]; WCHAR *addressW; + INTERNET_PORT port; if (netconn_connected( &request->netconn )) return TRUE; + connect = request->connect; + port = connect->hostport ? connect->hostport : (request->hdr.flags & WINHTTP_FLAG_SECURE ? 443 : 80); send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_RESOLVING_NAME, connect->servername, strlenW(connect->servername) + 1 ); - if (!netconn_resolve( connect->servername, connect->serverport, &connect->sockaddr )) return FALSE; + if (!netconn_resolve( connect->servername, port, &connect->sockaddr )) return FALSE; inet_ntop( connect->sockaddr.sin_family, &connect->sockaddr.sin_addr, address, sizeof(address) ); addressW = strdupAW( address ); @@ -764,20 +767,24 @@ void close_connection( request_t *request ) send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_CONNECTION_CLOSED, 0, 0 ); } -static BOOL add_host_header( request_t *request, WCHAR *hostname, INTERNET_PORT port, DWORD modifier ) +static BOOL add_host_header( request_t *request, DWORD modifier ) { BOOL ret; DWORD len; WCHAR *host; static const WCHAR fmt[] = {'%','s',':','%','u',0}; + connect_t *connect = request->connect; + INTERNET_PORT port; + + port = connect->hostport ? connect->hostport : (request->hdr.flags & WINHTTP_FLAG_SECURE ? 443 : 80); if (port == INTERNET_DEFAULT_HTTP_PORT || port == INTERNET_DEFAULT_HTTPS_PORT) { - return process_header( request, attr_host, hostname, modifier, TRUE ); + return process_header( request, attr_host, connect->hostname, modifier, TRUE ); } - len = strlenW( hostname ) + 7; /* sizeof(":65335") */ + len = strlenW( connect->hostname ) + 7; /* sizeof(":65335") */ if (!(host = heap_alloc( len * sizeof(WCHAR) ))) return FALSE; - sprintfW( host, fmt, hostname, port ); + sprintfW( host, fmt, connect->hostname, port ); ret = process_header( request, attr_host, host, modifier, TRUE ); heap_free( host ); return ret; @@ -802,7 +809,7 @@ static BOOL send_request( request_t *request, LPCWSTR headers, DWORD headers_len process_header( request, attr_user_agent, session->agent, WINHTTP_ADDREQ_FLAG_ADD_IF_NEW, TRUE ); if (connect->hostname) - add_host_header( request, connect->hostname, connect->hostport, WINHTTP_ADDREQ_FLAG_ADD_IF_NEW ); + add_host_header( request, WINHTTP_ADDREQ_FLAG_ADD_IF_NEW ); if (total_len || (request->verb && !strcmpW( request->verb, postW ))) { @@ -1092,14 +1099,16 @@ static BOOL handle_redirect( request_t *request ) port = uc.nPort ? uc.nPort : (uc.nScheme == INTERNET_SCHEME_HTTPS ? 443 : 80); if (strcmpiW( connect->servername, hostname ) || connect->serverport != port) { + heap_free( connect->hostname ); + connect->hostname = hostname; heap_free( connect->servername ); - connect->servername = hostname; + connect->servername = strdupW( connect->hostname ); connect->serverport = connect->hostport = port; netconn_close( &request->netconn ); if (!(ret = netconn_init( &request->netconn, request->hdr.flags & WINHTTP_FLAG_SECURE ))) goto end; } - if (!(ret = add_host_header( request, hostname, port, WINHTTP_ADDREQ_FLAG_REPLACE ))) goto end; + if (!(ret = add_host_header( request, WINHTTP_ADDREQ_FLAG_REPLACE ))) goto end; if (!(ret = open_connection( request ))) goto end; heap_free( request->path ); diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index e9937ce..db4ce03 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -253,10 +253,10 @@ HINTERNET WINAPI WinHttpConnect( HINTERNET hsession, LPCWSTR server, INTERNET_PO list_add_head( &session->hdr.children, &connect->hdr.entry ); if (server && !(connect->hostname = strdupW( server ))) goto end; - connect->hostport = port ? port : (connect->hdr.flags & WINHTTP_FLAG_SECURE ? 443 : 80); + connect->hostport = port; if (server && !(connect->servername = strdupW( server ))) goto end; - connect->serverport = port ? port : (connect->hdr.flags & WINHTTP_FLAG_SECURE ? 443 : 80); + connect->serverport = port; if (!(hconnect = alloc_handle( &connect->hdr ))) goto end; connect->hdr.handle = hconnect;

1 0

Ricardo Filipe : advapi32: Add stub for UnregisterTraceGuids.
by Alexandre Julliard 11 Dec '08

11 Dec '08

Module: wine Branch: master Commit: a19051b9ae4ac0e35b94d74921925eedabc59739 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a19051b9ae4ac0e35b94d7492… Author: Ricardo Filipe <ricardo_barbano(a)hotmail.com> Date: Fri Dec 5 18:02:05 2008 +0000 advapi32: Add stub for UnregisterTraceGuids. --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/eventlog.c | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index ec924ff..972ea7b 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -646,7 +646,7 @@ # @ stub UninstallApplication @ stdcall UnlockServiceDatabase (ptr) # @ stub UnregisterIdleTask -@ stub UnregisterTraceGuids +@ stdcall UnregisterTraceGuids(double) @ stub UpdateTraceA @ stub UpdateTraceW @ stub WdmWmiServiceMain diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c index 03bb4f3..d7f50a5 100644 --- a/dlls/advapi32/eventlog.c +++ b/dlls/advapi32/eventlog.c @@ -490,3 +490,17 @@ ULONG WINAPI RegisterTraceGuidsA( WMIDPREQUEST RequestAddress, debugstr_a(MofResourceName), RegistrationHandle); return ERROR_CALL_NOT_IMPLEMENTED; } + +/****************************************************************************** + * UnregisterTraceGuids [ADVAPI32.@] + * + * See RegisterTraceGuids + * + * FIXME + * Stub. + */ +ULONG WINAPI UnregisterTraceGuids( TRACEHANDLE RegistrationHandle ) +{ + FIXME("%s: stub\n", wine_dbgstr_longlong(RegistrationHandle)); + return ERROR_CALL_NOT_IMPLEMENTED; +}

1 0

Nikolay Sivov : oleaut32: Added PICTYPE_NONE and PICTYPE_UNINITIALIZED to IPicture::Render.
by Alexandre Julliard 11 Dec '08

11 Dec '08

Module: wine Branch: master Commit: b6d50aed419a9390aa6b840de6a17b7c2698d1f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6d50aed419a9390aa6b840de… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Dec 10 15:08:47 2008 +0300 oleaut32: Added PICTYPE_NONE and PICTYPE_UNINITIALIZED to IPicture::Render. --- dlls/oleaut32/olepicture.c | 8 +++++ dlls/oleaut32/tests/olepicture.c | 65 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 498ee53..bdce729 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -637,6 +637,10 @@ static HRESULT WINAPI OLEPictureImpl_Render(IPicture *iface, HDC hdc, TRACE("prcWBounds (%d,%d) - (%d,%d)\n", prcWBounds->left, prcWBounds->top, prcWBounds->right, prcWBounds->bottom); + if(cx == 0 || cy == 0 || cxSrc == 0 || cySrc == 0){ + return CTL_E_INVALIDPROPERTYVALUE; + } + /* * While the documentation suggests this to be here (or after rendering?) * it does cause an endless recursion in my sample app. -MM 20010804 @@ -644,6 +648,10 @@ static HRESULT WINAPI OLEPictureImpl_Render(IPicture *iface, HDC hdc, */ switch(This->desc.picType) { + case PICTYPE_UNINITIALIZED: + case PICTYPE_NONE: + /* nothing to do */ + return S_OK; case PICTYPE_BITMAP: { HBITMAP hbmpOld; diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index f81c419..89e99dd 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -25,6 +25,7 @@ #include <float.h> #define COBJMACROS +#define NONAMELESSUNION #include "wine/test.h" #include <windef.h> @@ -587,6 +588,69 @@ static void test_enhmetafile(void) GlobalFree(hglob); } +static void test_Render(void) +{ + IPicture *pic; + HRESULT hres; + short type; + PICTDESC desc; + HDC hdc = GetDC(0); + + /* test IPicture::Render return code on uninitialized picture */ + OleCreatePictureIndirect(NULL, &IID_IPicture, TRUE, (VOID**)&pic); + hres = IPicture_get_Type(pic, &type); + ok(hres == S_OK, "IPicture_get_Type does not return S_OK, but 0x%08x\n", hres); + ok(type == PICTYPE_UNINITIALIZED, "Expected type = PICTYPE_UNINITIALIZED, got = %d\n", type); + /* zero dimensions */ + hres = IPicture_Render(pic, hdc, 0, 0, 0, 0, 0, 0, 0, 0, NULL); + ole_expect(hres, CTL_E_INVALIDPROPERTYVALUE); + hres = IPicture_Render(pic, hdc, 0, 0, 10, 10, 0, 0, 10, 0, NULL); + ole_expect(hres, CTL_E_INVALIDPROPERTYVALUE); + hres = IPicture_Render(pic, hdc, 0, 0, 10, 10, 0, 0, 0, 10, NULL); + ole_expect(hres, CTL_E_INVALIDPROPERTYVALUE); + hres = IPicture_Render(pic, hdc, 0, 0, 10, 10, 0, 0, 0, 0, NULL); + ole_expect(hres, CTL_E_INVALIDPROPERTYVALUE); + hres = IPicture_Render(pic, hdc, 0, 0, 0, 10, 0, 0, 10, 10, NULL); + ole_expect(hres, CTL_E_INVALIDPROPERTYVALUE); + hres = IPicture_Render(pic, hdc, 0, 0, 10, 0, 0, 0, 10, 10, NULL); + ole_expect(hres, CTL_E_INVALIDPROPERTYVALUE); + hres = IPicture_Render(pic, hdc, 0, 0, 0, 0, 0, 0, 10, 10, NULL); + ole_expect(hres, CTL_E_INVALIDPROPERTYVALUE); + /* nonzero dimensions, PICTYPE_UNINITIALIZED */ + hres = IPicture_Render(pic, hdc, 0, 0, 10, 10, 0, 0, 10, 10, NULL); + ole_expect(hres, S_OK); + IPicture_Release(pic); + + desc.cbSizeofstruct = sizeof(PICTDESC); + desc.picType = PICTYPE_ICON; + desc.u.icon.hicon = LoadIcon(NULL, IDI_APPLICATION); + if(!desc.u.icon.hicon){ + win_skip("LoadIcon failed. Skipping...\n"); + ReleaseDC(NULL, hdc); + return; + } + + OleCreatePictureIndirect(&desc, &IID_IPicture, TRUE, (VOID**)&pic); + /* zero dimensions, PICTYPE_ICON */ + hres = IPicture_Render(pic, hdc, 0, 0, 0, 0, 0, 0, 0, 0, NULL); + ole_expect(hres, CTL_E_INVALIDPROPERTYVALUE); + hres = IPicture_Render(pic, hdc, 0, 0, 10, 10, 0, 0, 10, 0, NULL); + ole_expect(hres, CTL_E_INVALIDPROPERTYVALUE); + hres = IPicture_Render(pic, hdc, 0, 0, 10, 10, 0, 0, 0, 10, NULL); + ole_expect(hres, CTL_E_INVALIDPROPERTYVALUE); + hres = IPicture_Render(pic, hdc, 0, 0, 10, 10, 0, 0, 0, 0, NULL); + ole_expect(hres, CTL_E_INVALIDPROPERTYVALUE); + hres = IPicture_Render(pic, hdc, 0, 0, 0, 10, 0, 0, 10, 10, NULL); + ole_expect(hres, CTL_E_INVALIDPROPERTYVALUE); + hres = IPicture_Render(pic, hdc, 0, 0, 10, 0, 0, 0, 10, 10, NULL); + ole_expect(hres, CTL_E_INVALIDPROPERTYVALUE); + hres = IPicture_Render(pic, hdc, 0, 0, 0, 0, 0, 0, 10, 10, NULL); + ole_expect(hres, CTL_E_INVALIDPROPERTYVALUE); + IPicture_Release(pic); + + ReleaseDC(NULL, hdc); +} + START_TEST(olepicture) { hOleaut32 = GetModuleHandleA("oleaut32.dll"); @@ -613,6 +677,7 @@ START_TEST(olepicture) test_Invoke(); test_OleCreatePictureIndirect(); + test_Render(); }

1 0

Andrew Talbot : wintrust: Sign-compare warnings fix.
by Alexandre Julliard 11 Dec '08

11 Dec '08

Module: wine Branch: master Commit: 79ab433946494965942d99aecf2d008c9b681848 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79ab433946494965942d99aec… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Dec 10 21:55:31 2008 +0000 wintrust: Sign-compare warnings fix. --- dlls/wintrust/asn.c | 3 ++- dlls/wintrust/crypt.c | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/wintrust/asn.c b/dlls/wintrust/asn.c index 3a51c91..4799a68 100644 --- a/dlls/wintrust/asn.c +++ b/dlls/wintrust/asn.c @@ -2195,7 +2195,8 @@ static BOOL WINAPI CRYPT_AsnDecodeInt(DWORD dwCertEncodingType, } else { - int val, i; + int val; + DWORD i; *pcbStructInfo = sizeof(int); if (blob->pbData[blob->cbData - 1] & 0x80) diff --git a/dlls/wintrust/crypt.c b/dlls/wintrust/crypt.c index 136f795..33cc6de 100644 --- a/dlls/wintrust/crypt.c +++ b/dlls/wintrust/crypt.c @@ -349,7 +349,7 @@ static BOOL WINTRUST_GetSignedMsgFromCabFile(SIP_SUBJECTINFO *pSubjectInfo, /* get basic offset & size info */ base_offset = SetFilePointer(pSubjectInfo->hFile, 0L, NULL, SEEK_CUR); - if (SetFilePointer(pSubjectInfo->hFile, 0, NULL, SEEK_END) == -1) + if (SetFilePointer(pSubjectInfo->hFile, 0, NULL, SEEK_END) == INVALID_SET_FILE_POINTER) { TRACE("seek error\n"); return FALSE; @@ -357,7 +357,7 @@ static BOOL WINTRUST_GetSignedMsgFromCabFile(SIP_SUBJECTINFO *pSubjectInfo, cabsize = SetFilePointer(pSubjectInfo->hFile, 0L, NULL, SEEK_CUR); if ((cabsize == -1) || (base_offset == -1) || - (SetFilePointer(pSubjectInfo->hFile, base_offset, NULL, SEEK_SET) == -1)) + (SetFilePointer(pSubjectInfo->hFile, base_offset, NULL, SEEK_SET) == INVALID_SET_FILE_POINTER)) { TRACE("seek error\n"); return FALSE; @@ -453,7 +453,7 @@ static BOOL WINTRUST_GetSignedMsgFromCabFile(SIP_SUBJECTINFO *pSubjectInfo, SetLastError(ERROR_INSUFFICIENT_BUFFER); return FALSE; } - if (SetFilePointer(pSubjectInfo->hFile, cert_offset, NULL, SEEK_SET) == -1) + if (SetFilePointer(pSubjectInfo->hFile, cert_offset, NULL, SEEK_SET) == INVALID_SET_FILE_POINTER) { ERR("couldn't seek to cert location\n"); return FALSE;

1 0

Stefan Dösinger : WineD3D: Abstract some ATIfs op debug TRACEs.
by Alexandre Julliard 11 Dec '08

11 Dec '08

Module: wine Branch: master Commit: fef73782ceb34c039e7d1fe92a200edf9a86aa35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fef73782ceb34c039e7d1fe92… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Dec 9 18:16:14 2008 +0100 WineD3D: Abstract some ATIfs op debug TRACEs. It makes the code more readable and will help us to merge the ALPHAOP and COLOROP code. --- dlls/wined3d/ati_fragment_shader.c | 382 +++++++++++++++++------------------- 1 files changed, 183 insertions(+), 199 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fef73782ceb34c039e7d1…

1 0

Stefan Dösinger : wined3d: Fix ARG_UNUSED and use it properly.
by Alexandre Julliard 11 Dec '08

11 Dec '08

Module: wine Branch: master Commit: f2f90b6965df8c8d14595960e75390fb6a6d50c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2f90b6965df8c8d14595960e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Dec 9 20:02:18 2008 +0100 wined3d: Fix ARG_UNUSED and use it properly. That bug was uncovered by Henri's change of the bitfield sizes. --- dlls/wined3d/utils.c | 20 ++++++++++---------- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 0eb5337..4e46013 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1957,14 +1957,14 @@ void gen_ffp_frag_op(IWineD3DStateBlockImpl *stateblock, struct ffp_frag_setting cop = stateblock->textureState[i][WINED3DTSS_COLOROP]; aop = stateblock->textureState[i][WINED3DTSS_ALPHAOP]; - carg1 = (args[cop] & ARG1) ? stateblock->textureState[i][WINED3DTSS_COLORARG1] : 0xffffffff; - carg2 = (args[cop] & ARG2) ? stateblock->textureState[i][WINED3DTSS_COLORARG2] : 0xffffffff; - carg0 = (args[cop] & ARG0) ? stateblock->textureState[i][WINED3DTSS_COLORARG0] : 0xffffffff; + carg1 = (args[cop] & ARG1) ? stateblock->textureState[i][WINED3DTSS_COLORARG1] : ARG_UNUSED; + carg2 = (args[cop] & ARG2) ? stateblock->textureState[i][WINED3DTSS_COLORARG2] : ARG_UNUSED; + carg0 = (args[cop] & ARG0) ? stateblock->textureState[i][WINED3DTSS_COLORARG0] : ARG_UNUSED; if(is_invalid_op(stateblock->wineD3DDevice, i, cop, carg1, carg2, carg0)) { - carg0 = 0xffffffff; - carg2 = 0xffffffff; + carg0 = ARG_UNUSED; + carg2 = ARG_UNUSED; carg1 = WINED3DTA_CURRENT; cop = WINED3DTOP_SELECTARG1; } @@ -1978,9 +1978,9 @@ void gen_ffp_frag_op(IWineD3DStateBlockImpl *stateblock, struct ffp_frag_setting aarg2 = carg2; aarg0 = carg0; } else { - aarg1 = (args[aop] & ARG1) ? stateblock->textureState[i][WINED3DTSS_ALPHAARG1] : 0xffffffff; - aarg2 = (args[aop] & ARG2) ? stateblock->textureState[i][WINED3DTSS_ALPHAARG2] : 0xffffffff; - aarg0 = (args[aop] & ARG0) ? stateblock->textureState[i][WINED3DTSS_ALPHAARG0] : 0xffffffff; + aarg1 = (args[aop] & ARG1) ? stateblock->textureState[i][WINED3DTSS_ALPHAARG1] : ARG_UNUSED; + aarg2 = (args[aop] & ARG2) ? stateblock->textureState[i][WINED3DTSS_ALPHAARG2] : ARG_UNUSED; + aarg0 = (args[aop] & ARG0) ? stateblock->textureState[i][WINED3DTSS_ALPHAARG0] : ARG_UNUSED; } if(i == 0 && stateblock->textures[0] && @@ -2015,8 +2015,8 @@ void gen_ffp_frag_op(IWineD3DStateBlockImpl *stateblock, struct ffp_frag_setting if(is_invalid_op(stateblock->wineD3DDevice, i, aop, aarg1, aarg2, aarg0)) { - aarg0 = 0xffffffff; - aarg2 = 0xffffffff; + aarg0 = ARG_UNUSED; + aarg2 = ARG_UNUSED; aarg1 = WINED3DTA_CURRENT; aop = WINED3DTOP_SELECTARG1; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b10b644..fe5569a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -922,7 +922,7 @@ enum dst_arg /***************************************************************************** * Fixed function pipeline replacements */ -#define ARG_UNUSED 0x3f +#define ARG_UNUSED 0xff struct texture_stage_op { unsigned cop : 8;

1 0

Ricardo Filipe : hal: Add stubs for ExAcquireFastMutex and ExReleaseFastMutex.
by Alexandre Julliard 11 Dec '08

11 Dec '08

Module: wine Branch: master Commit: bad677d58ac6a5ce1d7b448522527405aba11289 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bad677d58ac6a5ce1d7b44852… Author: Ricardo Filipe <ricardo_barbano(a)hotmail.com> Date: Tue Dec 9 03:19:34 2008 +0000 hal: Add stubs for ExAcquireFastMutex and ExReleaseFastMutex. --- dlls/hal/hal.c | 20 ++++++++++++++++++++ dlls/hal/hal.spec | 4 ++-- include/ddk/wdm.h | 9 +++++++++ 3 files changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/hal/hal.c b/dlls/hal/hal.c index 6390edf..5fce05e 100644 --- a/dlls/hal/hal.c +++ b/dlls/hal/hal.c @@ -54,6 +54,26 @@ WINE_DEFAULT_DEBUG_CHANNEL(ntoskrnl); #ifdef DEFINE_FASTCALL1_ENTRYPOINT +DEFINE_FASTCALL1_ENTRYPOINT( ExAcquireFastMutex ) +VOID __regs_ExAcquireFastMutex(PFAST_MUTEX FastMutex) +#else +VOID ExAcquireFastMutex(PFAST_MUTEX FastMutex) +#endif +{ + FIXME("%p: stub\n", FastMutex); +} + +#ifdef DEFINE_FASTCALL1_ENTRYPOINT +DEFINE_FASTCALL1_ENTRYPOINT( ExReleaseFastMutex ) +VOID __regs_ExReleaseFastMutex(PFAST_MUTEX FastMutex) +#else +VOID ExReleaseFastMutex(PFAST_MUTEX FastMutex) +#endif +{ + FIXME("%p: stub\n", FastMutex); +} + +#ifdef DEFINE_FASTCALL1_ENTRYPOINT DEFINE_FASTCALL1_ENTRYPOINT( KfAcquireSpinLock ) KIRQL WINAPI __regs_KfAcquireSpinLock(PKSPIN_LOCK SpinLock) #else diff --git a/dlls/hal/hal.spec b/dlls/hal/hal.spec index 5afbee0..83eedea 100644 --- a/dlls/hal/hal.spec +++ b/dlls/hal/hal.spec @@ -1,5 +1,5 @@ -@ stub ExAcquireFastMutex -@ stub ExReleaseFastMutex +@ stdcall -norelay ExAcquireFastMutex(ptr) +@ stdcall -norelay ExReleaseFastMutex(ptr) @ stub ExTryToAcquireFastMutex @ stub HalClearSoftwareInterrupt @ stub HalRequestSoftwareInterrupt diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 3e4528b..efc3f6a 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -132,6 +132,15 @@ typedef struct _IO_WORKITEM *PIO_WORKITEM; typedef struct _OBJECT_TYPE *POBJECT_TYPE; typedef struct _OBJECT_HANDLE_INFORMATION *POBJECT_HANDLE_INFORMATION; +typedef struct _FAST_MUTEX +{ + LONG Count; + PKTHREAD Owner; + ULONG Contention; + KEVENT Gate; + ULONG OldIrql; +} FAST_MUTEX, *PFAST_MUTEX; + #define MAXIMUM_VOLUME_LABEL_LENGTH (32 * sizeof(WCHAR)) typedef struct _VPB {

1 0

Stefan Dösinger : wined3d: Don' t load INT and BOOL constants needlessly.
by Alexandre Julliard 11 Dec '08

11 Dec '08

Module: wine Branch: master Commit: 4916cd5478ff6fcf212eae3707bc5be063498040 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4916cd5478ff6fcf212eae370… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Nov 27 01:21:36 2008 +0100 wined3d: Don't load INT and BOOL constants needlessly. --- dlls/wined3d/baseshader.c | 8 ++++++++ dlls/wined3d/glsl_shader.c | 24 ++++++++++++++++-------- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 25 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 65dcf2a..8d6c28c 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -349,6 +349,8 @@ HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, struct shader_reg_m max_loop_depth = cur_loop_depth; pToken += curOpcode->num_params; + /* Rep and Loop always use an integer constant for the control parameters */ + This->baseShader.uses_int_consts = TRUE; } else if (WINED3DSIO_ENDLOOP == curOpcode->opcode || WINED3DSIO_ENDREP == curOpcode->opcode) { cur_loop_depth--; @@ -494,6 +496,12 @@ HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, struct shader_reg_m reg_maps->usesrelconstF = TRUE; } } + else if(WINED3DSPR_CONSTINT == regtype) { + This->baseShader.uses_int_consts = TRUE; + } + else if(WINED3DSPR_CONSTBOOL == regtype) { + This->baseShader.uses_bool_consts = TRUE; + } /* WINED3DSPR_TEXCRDOUT is the same as WINED3DSPR_OUTPUT. _OUTPUT can be > MAX_REG_TEXCRD and is used * in >= 3.0 shaders. Filter 3.0 shaders to prevent overflows, and also filter pixel shaders because TECRDOUT diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 6ec2591..3f54170 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -418,12 +418,16 @@ static void shader_glsl_load_constants( stateBlock->vertexShaderConstantF, constant_locations, constant_list); /* Load DirectX 9 integer constants/uniforms for vertex shader */ - shader_glsl_load_constantsI(vshader, gl_info, prog->vuniformI_locations, - stateBlock->vertexShaderConstantI, stateBlock->changed.vertexShaderConstantsI); + if(vshader->baseShader.uses_int_consts) { + shader_glsl_load_constantsI(vshader, gl_info, prog->vuniformI_locations, + stateBlock->vertexShaderConstantI, stateBlock->changed.vertexShaderConstantsI); + } /* Load DirectX 9 boolean constants/uniforms for vertex shader */ - shader_glsl_load_constantsB(vshader, gl_info, programId, - stateBlock->vertexShaderConstantB, stateBlock->changed.vertexShaderConstantsB); + if(vshader->baseShader.uses_bool_consts) { + shader_glsl_load_constantsB(vshader, gl_info, programId, + stateBlock->vertexShaderConstantB, stateBlock->changed.vertexShaderConstantsB); + } /* Upload the position fixup params */ GL_EXTCALL(glUniform4fvARB(prog->posFixup_location, 1, &deviceImpl->posFixup[0])); @@ -442,12 +446,16 @@ static void shader_glsl_load_constants( stateBlock->pixelShaderConstantF, constant_locations, constant_list); /* Load DirectX 9 integer constants/uniforms for pixel shader */ - shader_glsl_load_constantsI(pshader, gl_info, prog->puniformI_locations, - stateBlock->pixelShaderConstantI, stateBlock->changed.pixelShaderConstantsI); + if(pshader->baseShader.uses_int_consts) { + shader_glsl_load_constantsI(pshader, gl_info, prog->puniformI_locations, + stateBlock->pixelShaderConstantI, stateBlock->changed.pixelShaderConstantsI); + } /* Load DirectX 9 boolean constants/uniforms for pixel shader */ - shader_glsl_load_constantsB(pshader, gl_info, programId, - stateBlock->pixelShaderConstantB, stateBlock->changed.pixelShaderConstantsB); + if(pshader->baseShader.uses_bool_consts) { + shader_glsl_load_constantsB(pshader, gl_info, programId, + stateBlock->pixelShaderConstantB, stateBlock->changed.pixelShaderConstantsB); + } /* Upload the environment bump map matrix if needed. The needsbumpmat member specifies the texture stage to load the matrix from. * It can't be 0 for a valid texbem instruction. diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5ac771f..b10b644 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2194,6 +2194,7 @@ typedef struct IWineD3DBaseShaderClass BOOL is_compiled; UINT cur_loop_depth, cur_loop_regno; BOOL load_local_constsF; + BOOL uses_bool_consts, uses_int_consts; /* Type of shader backend */ int shader_mode;

1 0

Alexandre Julliard : ntdll: Enforce correct protection values in virtual memory functions.
by Alexandre Julliard 11 Dec '08

11 Dec '08

Module: wine Branch: master Commit: a2089abd948564ff4aa930ebac8f8894b49a6f39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2089abd948564ff4aa930eba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 11 14:05:42 2008 +0100 ntdll: Enforce correct protection values in virtual memory functions. --- dlls/kernel32/tests/virtual.c | 26 +++++++++++++++++++++++ dlls/ntdll/loader.c | 2 +- dlls/ntdll/virtual.c | 46 ++++++++++++++++++++++------------------ 3 files changed, 52 insertions(+), 22 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 0e53a1c..0fdd69e 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -255,6 +255,32 @@ static void test_VirtualAlloc(void) ok(old_prot == PAGE_READONLY, "wrong old protection: got %04x instead of PAGE_READONLY\n", old_prot); + /* invalid protection values */ + SetLastError(0xdeadbeef); + addr2 = VirtualAlloc(NULL, 0x1000, MEM_RESERVE, 0); + ok(!addr2, "VirtualAlloc succeeded\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + addr2 = VirtualAlloc(NULL, 0x1000, MEM_COMMIT, 0); + ok(!addr2, "VirtualAlloc succeeded\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + addr2 = VirtualAlloc(addr1, 0x1000, MEM_COMMIT, PAGE_READONLY | PAGE_EXECUTE); + ok(!addr2, "VirtualAlloc succeeded\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ok(!VirtualProtect(addr1, 0x1000, PAGE_READWRITE | PAGE_EXECUTE_WRITECOPY, &old_prot), + "VirtualProtect succeeded\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ok(!VirtualProtect(addr1, 0x1000, 0, &old_prot), "VirtualProtect succeeded\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); ok(!VirtualFree(addr1, 0x10000, 0), "VirtualFree should fail with type 0\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %d, expected ERROR_INVALID_PARAMETER\n", GetLastError()); diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 7526465..d3a0067 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1464,7 +1464,7 @@ static NTSTATUS load_native_dll( LPCWSTR load_path, LPCWSTR name, HANDLE file, size.QuadPart = 0; status = NtCreateSection( &mapping, STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ, - &attr, &size, 0, SEC_IMAGE, file ); + &attr, &size, PAGE_READONLY, SEC_IMAGE, file ); if (status != STATUS_SUCCESS) return status; module = NULL; diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 9616477..da08e2f 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -503,7 +503,7 @@ static DWORD VIRTUAL_GetWin32Prot( BYTE vprot ) /*********************************************************************** - * VIRTUAL_GetProt + * get_vprot_flags * * Build page protections from Win32 flags. * @@ -513,41 +513,40 @@ static DWORD VIRTUAL_GetWin32Prot( BYTE vprot ) * RETURNS * Value of page protection flags */ -static BYTE VIRTUAL_GetProt( DWORD protect ) +static NTSTATUS get_vprot_flags( DWORD protect, unsigned int *vprot ) { - BYTE vprot; - switch(protect & 0xff) { case PAGE_READONLY: - vprot = VPROT_READ; + *vprot = VPROT_READ; break; case PAGE_READWRITE: - vprot = VPROT_READ | VPROT_WRITE; + *vprot = VPROT_READ | VPROT_WRITE; break; case PAGE_WRITECOPY: - vprot = VPROT_READ | VPROT_WRITECOPY; + *vprot = VPROT_READ | VPROT_WRITECOPY; break; case PAGE_EXECUTE: - vprot = VPROT_EXEC; + *vprot = VPROT_EXEC; break; case PAGE_EXECUTE_READ: - vprot = VPROT_EXEC | VPROT_READ; + *vprot = VPROT_EXEC | VPROT_READ; break; case PAGE_EXECUTE_READWRITE: - vprot = VPROT_EXEC | VPROT_READ | VPROT_WRITE; + *vprot = VPROT_EXEC | VPROT_READ | VPROT_WRITE; break; case PAGE_EXECUTE_WRITECOPY: - vprot = VPROT_EXEC | VPROT_READ | VPROT_WRITECOPY; + *vprot = VPROT_EXEC | VPROT_READ | VPROT_WRITECOPY; break; case PAGE_NOACCESS: - default: - vprot = 0; + *vprot = 0; break; + default: + return STATUS_INVALID_PARAMETER; } - if (protect & PAGE_GUARD) vprot |= VPROT_GUARD; - if (protect & PAGE_NOCACHE) vprot |= VPROT_NOCACHE; - return vprot; + if (protect & PAGE_GUARD) *vprot |= VPROT_GUARD; + if (protect & PAGE_NOCACHE) *vprot |= VPROT_NOCACHE; + return STATUS_SUCCESS; } @@ -1632,7 +1631,8 @@ NTSTATUS WINAPI NtAllocateVirtualMemory( HANDLE process, PVOID *ret, ULONG zero_ if (is_beyond_limit( 0, size, working_set_limit )) return STATUS_WORKING_SET_LIMIT_RANGE; - vprot = VIRTUAL_GetProt( protect ) | VPROT_VALLOC; + if ((status = get_vprot_flags( protect, &vprot ))) return status; + vprot |= VPROT_VALLOC; if (type & MEM_COMMIT) vprot |= VPROT_COMMITTED; if (*ret) @@ -1811,6 +1811,7 @@ NTSTATUS WINAPI NtProtectVirtualMemory( HANDLE process, PVOID *addr_ptr, SIZE_T NTSTATUS status = STATUS_SUCCESS; char *base; BYTE vprot; + unsigned int new_vprot; SIZE_T size = *size_ptr; LPVOID addr = *addr_ptr; @@ -1843,6 +1844,8 @@ NTSTATUS WINAPI NtProtectVirtualMemory( HANDLE process, PVOID *addr_ptr, SIZE_T size = ROUND_SIZE( addr, size ); base = ROUND_ADDR( addr, page_mask ); + if ((status = get_vprot_flags( new_prot, &new_vprot ))) return status; + new_vprot |= VPROT_COMMITTED; server_enter_uninterrupted_section( &csVirtual, &sigset ); @@ -1856,8 +1859,7 @@ NTSTATUS WINAPI NtProtectVirtualMemory( HANDLE process, PVOID *addr_ptr, SIZE_T if (get_committed_size( view, base, &vprot ) >= size && (vprot & VPROT_COMMITTED)) { if (old_prot) *old_prot = VIRTUAL_GetWin32Prot( vprot ); - vprot = VIRTUAL_GetProt( new_prot ) | VPROT_COMMITTED; - if (!VIRTUAL_SetProt( view, base, size, vprot )) status = STATUS_ACCESS_DENIED; + if (!VIRTUAL_SetProt( view, base, size, new_vprot )) status = STATUS_ACCESS_DENIED; } else status = STATUS_NOT_COMMITTED; } @@ -2135,6 +2137,8 @@ NTSTATUS WINAPI NtCreateSection( HANDLE *handle, ACCESS_MASK access, const OBJEC if (len > MAX_PATH*sizeof(WCHAR)) return STATUS_NAME_TOO_LONG; + if ((ret = get_vprot_flags( protect, &vprot ))) return ret; + objattr.rootdir = wine_server_obj_handle( attr ? attr->RootDirectory : 0 ); objattr.sd_len = 0; objattr.name_len = len; @@ -2144,7 +2148,6 @@ NTSTATUS WINAPI NtCreateSection( HANDLE *handle, ACCESS_MASK access, const OBJEC if (ret != STATUS_SUCCESS) return ret; } - vprot = VIRTUAL_GetProt( protect ); if (!(sec_flags & SEC_RESERVE)) vprot |= VPROT_COMMITTED; if (sec_flags & SEC_NOCACHE) vprot |= VPROT_NOCACHE; if (sec_flags & SEC_IMAGE) vprot |= VPROT_IMAGE; @@ -2331,7 +2334,8 @@ NTSTATUS WINAPI NtMapViewOfSection( HANDLE handle, HANDLE process, PVOID *addr_p server_enter_uninterrupted_section( &csVirtual, &sigset ); - vprot = VIRTUAL_GetProt( protect ) | (map_vprot & VPROT_COMMITTED); + get_vprot_flags( protect, &vprot ); + vprot |= (map_vprot & VPROT_COMMITTED); res = map_view( &view, *addr_ptr, size, mask, FALSE, vprot ); if (res) {

1 0