November 2005 - Wine-commits

wine/dlls/msi tests/package.c cond.y
by Alexandre Julliard 14 Nov '05

14 Nov '05

ChangeSet ID: 21250 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/14 05:24:14 Modified files: dlls/msi/tests : package.c dlls/msi : cond.y Log message: Mike McCormack <mike(a)codeweavers.com> Fix comparison of empty properties to numbers and add test cases. Patch: http://cvs.winehq.org/patch.py?id=21250 Old revision New revision Changes Path 1.10 1.11 +54 -0 wine/dlls/msi/tests/package.c 1.25 1.26 +28 -2 wine/dlls/msi/cond.y Index: wine/dlls/msi/tests/package.c diff -u -p wine/dlls/msi/tests/package.c:1.10 wine/dlls/msi/tests/package.c:1.11 --- wine/dlls/msi/tests/package.c:1.10 14 Nov 2005 11:24:14 -0000 +++ wine/dlls/msi/tests/package.c 14 Nov 2005 11:24:14 -0000 @@ -593,6 +593,60 @@ void test_condition(void) r = MsiEvaluateCondition(hpkg, "Installed<>\"\""); ok( r == MSICONDITION_FALSE, "wrong return val\n"); + r = MsiEvaluateCondition(hpkg, "NOT 1 AND 0"); + ok( r == MSICONDITION_FALSE, "wrong return val\n"); + + r = MsiEvaluateCondition(hpkg, "bandalmael=0"); + ok( r == MSICONDITION_FALSE, "wrong return val\n"); + + MsiSetProperty(hpkg, "bandalmael", "0" ); + r = MsiEvaluateCondition(hpkg, "bandalmael=0"); + ok( r == MSICONDITION_TRUE, "wrong return val\n"); + + MsiSetProperty(hpkg, "bandalmael", "" ); + r = MsiEvaluateCondition(hpkg, "bandalmael=0"); + ok( r == MSICONDITION_FALSE, "wrong return val\n"); + + MsiSetProperty(hpkg, "bandalmael", "asdf" ); + r = MsiEvaluateCondition(hpkg, "bandalmael=0"); + ok( r == MSICONDITION_FALSE, "wrong return val\n"); + + MsiSetProperty(hpkg, "bandalmael", "0asdf" ); + r = MsiEvaluateCondition(hpkg, "bandalmael=0"); + ok( r == MSICONDITION_FALSE, "wrong return val\n"); + + MsiSetProperty(hpkg, "bandalmael", "0 " ); + r = MsiEvaluateCondition(hpkg, "bandalmael=0"); + ok( r == MSICONDITION_FALSE, "wrong return val\n"); + + MsiSetProperty(hpkg, "bandalmael", "-0" ); + r = MsiEvaluateCondition(hpkg, "bandalmael=0"); + ok( r == MSICONDITION_TRUE, "wrong return val\n"); + + MsiSetProperty(hpkg, "bandalmael", "0000000000000" ); + r = MsiEvaluateCondition(hpkg, "bandalmael=0"); + ok( r == MSICONDITION_TRUE, "wrong return val\n"); + + MsiSetProperty(hpkg, "bandalmael", "--0" ); + r = MsiEvaluateCondition(hpkg, "bandalmael=0"); + ok( r == MSICONDITION_FALSE, "wrong return val\n"); + + MsiSetProperty(hpkg, "bandalmael", "0x00" ); + r = MsiEvaluateCondition(hpkg, "bandalmael=0"); + ok( r == MSICONDITION_FALSE, "wrong return val\n"); + + MsiSetProperty(hpkg, "bandalmael", "-" ); + r = MsiEvaluateCondition(hpkg, "bandalmael=0"); + ok( r == MSICONDITION_FALSE, "wrong return val\n"); + + MsiSetProperty(hpkg, "bandalmael", "+0" ); + r = MsiEvaluateCondition(hpkg, "bandalmael=0"); + ok( r == MSICONDITION_FALSE, "wrong return val\n"); + + MsiSetProperty(hpkg, "bandalmael", "0.0" ); + r = MsiEvaluateCondition(hpkg, "bandalmael=0"); + ok( r == MSICONDITION_FALSE, "wrong return val\n"); + MsiCloseHandle( hpkg ); } Index: wine/dlls/msi/cond.y diff -u -p wine/dlls/msi/cond.y:1.25 wine/dlls/msi/cond.y:1.26 --- wine/dlls/msi/cond.y:1.25 14 Nov 2005 11:24:14 -0000 +++ wine/dlls/msi/cond.y 14 Nov 2005 11:24:14 -0000 @@ -75,6 +75,30 @@ static INT compare_and_free_strings( LPW return r; } +static BOOL num_from_prop( LPCWSTR p, INT *val ) +{ + INT ret = 0, sign = 1; + + if (!p) + return FALSE; + if (*p == '-') + { + sign = -1; + p++; + } + if (!*p) + return FALSE; + while (*p) + { + if( *p < '0' || *p > '9' ) + return FALSE; + ret = ret*10 + (*p - '0'); + p++; + } + *val = ret*sign; + return TRUE; +} + %} %pure-parser @@ -169,11 +193,13 @@ boolean_factor: } | symbol_s operator value_i { - $$ = compare_int( $1 ? atoiW($1) : 0, $2, $3 ); + int num; + $$ = num_from_prop( $1, &num ) && compare_int( num, $2, $3 ); } | value_i operator symbol_s { - $$ = compare_int( $1, $2, $3 ? atoiW($3) : 0 ); + int num; + $$ = num_from_prop( $3, &num ) && compare_int( $1, $2, num ); } | symbol_s operator symbol_s {

1 0

wine/dlls/user/tests msg.c
by Alexandre Julliard 14 Nov '05

14 Nov '05

ChangeSet ID: 21249 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/14 05:24:06 Modified files: dlls/user/tests: msg.c Log message: Dmitry Timoshkov <dmitry(a)codeweavers.com> Fix message tests to run cleanly on Windows XP SP1. Patch: http://cvs.winehq.org/patch.py?id=21249 Old revision New revision Changes Path 1.102 1.103 +37 -5 wine/dlls/user/tests/msg.c

1 0

wine/dlls/winmm/joystick joystick.c
by Alexandre Julliard 14 Nov '05

14 Nov '05

ChangeSet ID: 21248 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/14 05:23:34 Modified files: dlls/winmm/joystick: joystick.c Log message: Edgar Hucek <gimli(a)gentoo.org> Unicode compile fix. Patch: http://cvs.winehq.org/patch.py?id=21248 Old revision New revision Changes Path 1.19 1.20 +2 -0 wine/dlls/winmm/joystick/joystick.c Index: wine/dlls/winmm/joystick/joystick.c diff -u -p wine/dlls/winmm/joystick/joystick.c:1.19 wine/dlls/winmm/joystick/joystick.c:1.20 --- wine/dlls/winmm/joystick/joystick.c:1.19 14 Nov 2005 11:23:34 -0000 +++ wine/dlls/winmm/joystick/joystick.c 14 Nov 2005 11:23:34 -0000 @@ -68,6 +68,8 @@ #include "mmddk.h" #include "wine/debug.h" +#include "wine/unicode.h" + WINE_DEFAULT_DEBUG_CHANNEL(joystick); #ifdef HAVE_LINUX_JOYSTICK_H

1 0

wine/dlls/kernel/tests thread.c
by Alexandre Julliard 14 Nov '05

14 Nov '05

ChangeSet ID: 21247 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/14 05:23:11 Modified files: dlls/kernel/tests: thread.c Log message: Eric Pouech <eric.pouech(a)wanadoo.fr> Fix set_test_val function declaration to ensure stack is left untouched. Patch: http://cvs.winehq.org/patch.py?id=21247 Old revision New revision Changes Path 1.30 1.31 +1 -1 wine/dlls/kernel/tests/thread.c Index: wine/dlls/kernel/tests/thread.c diff -u -p wine/dlls/kernel/tests/thread.c:1.30 wine/dlls/kernel/tests/thread.c:1.31 --- wine/dlls/kernel/tests/thread.c:1.30 14 Nov 2005 11:23:11 -0000 +++ wine/dlls/kernel/tests/thread.c 14 Nov 2005 11:23:11 -0000 @@ -611,7 +611,7 @@ static VOID test_GetThreadExitCode(void) static int test_value = 0; -static void set_test_val( int val ) +static void WINAPI set_test_val( int val ) { test_value += val; }

1 0

wine/dlls/wininet tests/http.c internet.c
by Alexandre Julliard 14 Nov '05

14 Nov '05

ChangeSet ID: 21246 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/14 05:23:02 Modified files: dlls/wininet/tests: http.c dlls/wininet : internet.c Log message: Saulius Krasuckas <saulius.krasuckas(a)ieee.org> Fix a test for InternetCreateUrlA as no Windows platform sets last error here. Make InternetCreateUrlA pass the test. Patch: http://cvs.winehq.org/patch.py?id=21246 Old revision New revision Changes Path 1.29 1.30 +2 -2 wine/dlls/wininet/tests/http.c 1.139 1.140 +0 -2 wine/dlls/wininet/internet.c Index: wine/dlls/wininet/tests/http.c diff -u -p wine/dlls/wininet/tests/http.c:1.29 wine/dlls/wininet/tests/http.c:1.30 --- wine/dlls/wininet/tests/http.c:1.29 14 Nov 2005 11:23: 2 -0000 +++ wine/dlls/wininet/tests/http.c 14 Nov 2005 11:23: 2 -0000 @@ -784,8 +784,8 @@ static void InternetCreateUrlA_test() len = 42; ret = InternetCreateUrlA(&urlComp, 0, szUrl, &len); ok(ret, "Expected success\n"); - ok(GetLastError() == ERROR_ALREADY_EXISTS, - "Expected ERROR_ALREADYEXISTS, got %ld\n", GetLastError()); + ok(GetLastError() == 0xdeadbeef, + "Expected 0xdeadbeef, got %ld\n", GetLastError()); ok(len == 32, "Expected len 32, got %ld\n", len); ok(!strcmp(szUrl, CREATE_URL4), "Expected %s, got %s\n", CREATE_URL3, szUrl); Index: wine/dlls/wininet/internet.c diff -u -p wine/dlls/wininet/internet.c:1.139 wine/dlls/wininet/internet.c:1.140 --- wine/dlls/wininet/internet.c:1.139 14 Nov 2005 11:23: 2 -0000 +++ wine/dlls/wininet/internet.c 14 Nov 2005 11:23: 2 -0000 @@ -3584,8 +3584,6 @@ static BOOL calc_url_length(LPURL_COMPON SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - else - SetLastError(ERROR_ALREADY_EXISTS); } if (lpUrlComponents->lpszPassword)

1 0

wine/dlls/crypt32/tests cert.c
by Alexandre Julliard 14 Nov '05

14 Nov '05

ChangeSet ID: 21245 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/14 05:22:34 Modified files: dlls/crypt32/tests: cert.c Log message: Saulius Krasuckas <saulius.krasuckas(a)ieee.org> Don't call missing API function. Patch: http://cvs.winehq.org/patch.py?id=21245 Old revision New revision Changes Path 1.12 1.13 +52 -48 wine/dlls/crypt32/tests/cert.c Index: wine/dlls/crypt32/tests/cert.c diff -u -p wine/dlls/crypt32/tests/cert.c:1.12 wine/dlls/crypt32/tests/cert.c:1.13 --- wine/dlls/crypt32/tests/cert.c:1.12 14 Nov 2005 11:22:34 -0000 +++ wine/dlls/crypt32/tests/cert.c 14 Nov 2005 11:22:34 -0000 @@ -1469,23 +1469,25 @@ static void testVerifyCertSig(HCRYPTPROV DWORD size = 0; BOOL ret; - ret = pCryptVerifyCertificateSignatureEx(0, 0, 0, NULL, 0, NULL, 0, NULL); - ok(!ret && GetLastError() == HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER), - "Expected HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER), got %08lx\n", - GetLastError()); - ret = pCryptVerifyCertificateSignatureEx(csp, 0, 0, NULL, 0, NULL, 0, NULL); - ok(!ret && GetLastError() == HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER), - "Expected HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER), got %08lx\n", - GetLastError()); - ret = pCryptVerifyCertificateSignatureEx(csp, X509_ASN_ENCODING, 0, NULL, 0, - NULL, 0, NULL); - ok(!ret && GetLastError() == HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER), - "Expected HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER), got %08lx\n", - GetLastError()); - /* This crashes - ret = pCryptVerifyCertificateSignatureEx(csp, X509_ASN_ENCODING, - CRYPT_VERIFY_CERT_SIGN_SUBJECT_BLOB, NULL, 0, NULL, 0, NULL); - */ + if(pCryptVerifyCertificateSignatureEx) { + ret = pCryptVerifyCertificateSignatureEx(0, 0, 0, NULL, 0, NULL, 0, NULL); + ok(!ret && GetLastError() == HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER), + "Expected HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER), got %08lx\n", + GetLastError()); + ret = pCryptVerifyCertificateSignatureEx(csp, 0, 0, NULL, 0, NULL, 0, NULL); + ok(!ret && GetLastError() == HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER), + "Expected HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER), got %08lx\n", + GetLastError()); + ret = pCryptVerifyCertificateSignatureEx(csp, X509_ASN_ENCODING, 0, NULL, 0, + NULL, 0, NULL); + ok(!ret && GetLastError() == HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER), + "Expected HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER), got %08lx\n", + GetLastError()); + /* This crashes + ret = pCryptVerifyCertificateSignatureEx(csp, X509_ASN_ENCODING, + CRYPT_VERIFY_CERT_SIGN_SUBJECT_BLOB, NULL, 0, NULL, 0, NULL); + */ + } info.ToBeSigned.cbData = toBeSigned->cbData; info.ToBeSigned.pbData = toBeSigned->pbData; info.SignatureAlgorithm.pszObjId = (LPSTR)sigOID; @@ -1501,36 +1503,38 @@ static void testVerifyCertSig(HCRYPTPROV CRYPT_DATA_BLOB certBlob = { 0, NULL }; PCERT_PUBLIC_KEY_INFO pubKeyInfo = NULL; - ret = pCryptVerifyCertificateSignatureEx(csp, X509_ASN_ENCODING, - CRYPT_VERIFY_CERT_SIGN_SUBJECT_BLOB, &certBlob, 0, NULL, 0, NULL); - ok(!ret && GetLastError() == CRYPT_E_ASN1_EOD, - "Expected CRYPT_E_ASN1_EOD, got %08lx\n", GetLastError()); - certBlob.cbData = 1; - certBlob.pbData = (void *)0xdeadbeef; - ret = pCryptVerifyCertificateSignatureEx(csp, X509_ASN_ENCODING, - CRYPT_VERIFY_CERT_SIGN_SUBJECT_BLOB, &certBlob, 0, NULL, 0, NULL); - ok(!ret && GetLastError() == STATUS_ACCESS_VIOLATION, - "Expected STATUS_ACCESS_VIOLATION, got %08lx\n", GetLastError()); - certBlob.cbData = size; - certBlob.pbData = cert; - ret = pCryptVerifyCertificateSignatureEx(csp, X509_ASN_ENCODING, - CRYPT_VERIFY_CERT_SIGN_SUBJECT_BLOB, &certBlob, 0, NULL, 0, NULL); - ok(!ret && GetLastError() == - HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER), - "Expected HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER), got %08lx\n", - GetLastError()); - ret = pCryptVerifyCertificateSignatureEx(csp, X509_ASN_ENCODING, - CRYPT_VERIFY_CERT_SIGN_SUBJECT_BLOB, &certBlob, - CRYPT_VERIFY_CERT_SIGN_ISSUER_NULL, NULL, 0, NULL); - ok(!ret && GetLastError() == - HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER), - "Expected HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER), got %08lx\n", - GetLastError()); - /* This crashes - ret = pCryptVerifyCertificateSignatureEx(csp, X509_ASN_ENCODING, - CRYPT_VERIFY_CERT_SIGN_SUBJECT_BLOB, &certBlob, - CRYPT_VERIFY_CERT_SIGN_ISSUER_PUBKEY, NULL, 0, NULL); - */ + if(pCryptVerifyCertificateSignatureEx) { + ret = pCryptVerifyCertificateSignatureEx(csp, X509_ASN_ENCODING, + CRYPT_VERIFY_CERT_SIGN_SUBJECT_BLOB, &certBlob, 0, NULL, 0, NULL); + ok(!ret && GetLastError() == CRYPT_E_ASN1_EOD, + "Expected CRYPT_E_ASN1_EOD, got %08lx\n", GetLastError()); + certBlob.cbData = 1; + certBlob.pbData = (void *)0xdeadbeef; + ret = pCryptVerifyCertificateSignatureEx(csp, X509_ASN_ENCODING, + CRYPT_VERIFY_CERT_SIGN_SUBJECT_BLOB, &certBlob, 0, NULL, 0, NULL); + ok(!ret && GetLastError() == STATUS_ACCESS_VIOLATION, + "Expected STATUS_ACCESS_VIOLATION, got %08lx\n", GetLastError()); + certBlob.cbData = size; + certBlob.pbData = cert; + ret = pCryptVerifyCertificateSignatureEx(csp, X509_ASN_ENCODING, + CRYPT_VERIFY_CERT_SIGN_SUBJECT_BLOB, &certBlob, 0, NULL, 0, NULL); + ok(!ret && GetLastError() == + HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER), + "Expected HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER), got %08lx\n", + GetLastError()); + ret = pCryptVerifyCertificateSignatureEx(csp, X509_ASN_ENCODING, + CRYPT_VERIFY_CERT_SIGN_SUBJECT_BLOB, &certBlob, + CRYPT_VERIFY_CERT_SIGN_ISSUER_NULL, NULL, 0, NULL); + ok(!ret && GetLastError() == + HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER), + "Expected HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER), got %08lx\n", + GetLastError()); + /* This crashes + ret = pCryptVerifyCertificateSignatureEx(csp, X509_ASN_ENCODING, + CRYPT_VERIFY_CERT_SIGN_SUBJECT_BLOB, &certBlob, + CRYPT_VERIFY_CERT_SIGN_ISSUER_PUBKEY, NULL, 0, NULL); + */ + } CryptExportPublicKeyInfoEx(csp, AT_SIGNATURE, X509_ASN_ENCODING, (LPSTR)sigOID, 0, NULL, NULL, &size); pubKeyInfo = HeapAlloc(GetProcessHeap(), 0, size); @@ -1539,7 +1543,7 @@ static void testVerifyCertSig(HCRYPTPROV ret = CryptExportPublicKeyInfoEx(csp, AT_SIGNATURE, X509_ASN_ENCODING, (LPSTR)sigOID, 0, NULL, pubKeyInfo, &size); ok(ret, "CryptExportKey failed: %08lx\n", GetLastError()); - if (ret) + if (ret && pCryptVerifyCertificateSignatureEx) { ret = pCryptVerifyCertificateSignatureEx(csp, X509_ASN_ENCODING, CRYPT_VERIFY_CERT_SIGN_SUBJECT_BLOB, &certBlob,

1 0

wine/dlls/ddraw surface_dib.c ddraw_utils.c
by Alexandre Julliard 14 Nov '05

14 Nov '05

ChangeSet ID: 21244 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/14 05:22:20 Modified files: dlls/ddraw : surface_dib.c ddraw_utils.c Log message: Christian Costa <titan.costa(a)wanadoo.fr> Add DDBLT_DONOTWAIT flag. Separate DDBLT_WAIT and DDBLT_ASYNC fixme in Blt method. Patch: http://cvs.winehq.org/patch.py?id=21244 Old revision New revision Changes Path 1.7 1.8 +19 -7 wine/dlls/ddraw/surface_dib.c 1.3 1.4 +2 -1 wine/dlls/ddraw/ddraw_utils.c Index: wine/dlls/ddraw/surface_dib.c diff -u -p wine/dlls/ddraw/surface_dib.c:1.7 wine/dlls/ddraw/surface_dib.c:1.8 --- wine/dlls/ddraw/surface_dib.c:1.7 14 Nov 2005 11:22:20 -0000 +++ wine/dlls/ddraw/surface_dib.c 14 Nov 2005 11:22:20 -0000 @@ -669,15 +669,27 @@ DIB_DirectDrawSurface_Blt(LPDIRECTDRAWSU dbuf = (BYTE*)ddesc.lpSurface+(xdst.top*ddesc.u1.lPitch)+(xdst.left*bpp); - if (dwFlags & (DDBLT_WAIT|DDBLT_ASYNC)) - { + if (dwFlags & DDBLT_WAIT) { static BOOL displayed = FALSE; if (!displayed) - { - FIXME("dwFlags DDBLT_WAIT and/or DDBLT_ASYNC: can't handle right now.\n"); - displayed = TRUE; - } - dwFlags &= ~(DDBLT_WAIT|DDBLT_ASYNC); + FIXME("Can't handle DDBLT_WAIT flag right now.\n"); + displayed = TRUE; + dwFlags &= ~DDBLT_WAIT; + } + if (dwFlags & DDBLT_ASYNC) { + static BOOL displayed = FALSE; + if (!displayed) + FIXME("Can't handle DDBLT_ASYNC flag right now.\n"); + displayed = TRUE; + dwFlags &= ~DDBLT_ASYNC; + } + if (dwFlags & DDBLT_DONOTWAIT) { + /* DDBLT_DONOTWAIT appeared in DX7 */ + static BOOL displayed = FALSE; + if (!displayed) + FIXME("Can't handle DDBLT_DONOTWAIT flag right now.\n"); + displayed = TRUE; + dwFlags &= ~DDBLT_DONOTWAIT; } /* First, all the 'source-less' blits */ Index: wine/dlls/ddraw/ddraw_utils.c diff -u -p wine/dlls/ddraw/ddraw_utils.c:1.3 wine/dlls/ddraw/ddraw_utils.c:1.4 --- wine/dlls/ddraw/ddraw_utils.c:1.3 14 Nov 2005 11:22:20 -0000 +++ wine/dlls/ddraw/ddraw_utils.c 14 Nov 2005 11:22:20 -0000 @@ -405,7 +405,8 @@ void DDRAW_dump_DDBLT(DWORD flagmask) FE(DDBLT_ZBUFFERSRCCONSTOVERRIDE), FE(DDBLT_ZBUFFERSRCOVERRIDE), FE(DDBLT_WAIT), - FE(DDBLT_DEPTHFILL) + FE(DDBLT_DEPTHFILL), + FE(DDBLT_DONOTWAIT) }; DDRAW_dump_flags(flagmask, flags, sizeof(flags)/sizeof(flags[0]));

1 0

wine/dlls/urlmon umon.c
by Alexandre Julliard 14 Nov '05

14 Nov '05

ChangeSet ID: 21243 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/14 05:22:01 Modified files: dlls/urlmon : umon.c Log message: Jacek Caban <jack(a)itma.pwr.wroc.pl> Move BindToStorage hack to the separated function. Patch: http://cvs.winehq.org/patch.py?id=21243 Old revision New revision Changes Path 1.66 1.67 +37 -4 wine/dlls/urlmon/umon.c Index: wine/dlls/urlmon/umon.c diff -u -p wine/dlls/urlmon/umon.c:1.66 wine/dlls/urlmon/umon.c:1.67 --- wine/dlls/urlmon/umon.c:1.66 14 Nov 2005 11:22: 1 -0000 +++ wine/dlls/urlmon/umon.c 14 Nov 2005 11:22: 1 -0000 @@ -547,13 +547,12 @@ static void CALLBACK URLMON_InternetCall /****************************************************************************** * URLMoniker_BindToStorage ******************************************************************************/ -static HRESULT WINAPI URLMonikerImpl_BindToStorage(IMoniker* iface, +static HRESULT URLMonikerImpl_BindToStorage_hack(LPCWSTR URLName, IBindCtx* pbc, IMoniker* pmkToLeft, REFIID riid, VOID** ppvObject) { - URLMonikerImpl *This = (URLMonikerImpl *)iface; HRESULT hres; BINDINFO bi; DWORD bindf; @@ -561,6 +560,9 @@ static HRESULT WINAPI URLMonikerImpl_Bin Binding *bind; int len; + WARN("(%s %p %p %s %p)\n", debugstr_w(URLName), pbc, pmkToLeft, debugstr_guid(riid), + ppvObject); + if(pmkToLeft) { FIXME("pmkToLeft != NULL\n"); return E_NOTIMPL; @@ -575,9 +577,9 @@ static HRESULT WINAPI URLMonikerImpl_Bin bind->ref = 1; URLMON_LockModule(); - len = lstrlenW(This->URLName)+1; + len = lstrlenW(URLName)+1; bind->URLName = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); - memcpy(bind->URLName, This->URLName, len*sizeof(WCHAR)); + memcpy(bind->URLName, URLName, len*sizeof(WCHAR)); hres = UMCreateStreamOnCacheFile(bind->URLName, 0, szFileName, &bind->hCacheFile, &bind->pstrCache); @@ -855,6 +857,37 @@ static HRESULT WINAPI URLMonikerImpl_Bin return hres; } +static HRESULT WINAPI URLMonikerImpl_BindToStorage(IMoniker* iface, + IBindCtx* pbc, + IMoniker* pmkToLeft, + REFIID riid, + VOID** ppvObject) +{ + URLMonikerImpl *This = (URLMonikerImpl*)iface; + WCHAR schema[64]; + BOOL bret; + + URL_COMPONENTSW url = {sizeof(URL_COMPONENTSW), schema, + sizeof(schema)/sizeof(WCHAR), 0, NULL, 0, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0}; + + bret = InternetCrackUrlW(This->URLName, 0, ICU_ESCAPE, &url); + if(!bret) { + ERR("InternetCrackUrl failed: %ld\n", GetLastError()); + return E_FAIL; + } + + if(url.nScheme == INTERNET_SCHEME_HTTP + || url.nScheme== INTERNET_SCHEME_HTTPS + || url.nScheme== INTERNET_SCHEME_FTP + || url.nScheme == INTERNET_SCHEME_GOPHER + || url.nScheme == INTERNET_SCHEME_FILE) + return URLMonikerImpl_BindToStorage_hack(This->URLName, pbc, pmkToLeft, riid, ppvObject); + + FIXME("(%p)->(%p %p %s %p)\n", This, pbc, pmkToLeft, debugstr_guid(riid), ppvObject); + + return E_NOTIMPL; +} + /****************************************************************************** * URLMoniker_Reduce ******************************************************************************/

1 0

wine/dlls/d3d9 volumetexture.c vertexshader.c ...
by Alexandre Julliard 14 Nov '05

14 Nov '05

ChangeSet ID: 21242 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/14 05:21:46 Modified files: dlls/d3d9 : volumetexture.c vertexshader.c vertexdeclaration.c vertexbuffer.c texture.c swapchain.c stateblock.c query.c pixelshader.c indexbuffer.c device.c cubetexture.c Log message: Oliver Stieber <oliver_stieber(a)yahoo.co.uk> Remove the setting of the result pointer to NULL in creates, tests show that windows doesn't set the result to NULL on error. Patch: http://cvs.winehq.org/patch.py?id=21242 Old revision New revision Changes Path 1.15 1.16 +4 -4 wine/dlls/d3d9/volumetexture.c 1.13 1.14 +3 -3 wine/dlls/d3d9/vertexshader.c 1.12 1.13 +10 -9 wine/dlls/d3d9/vertexdeclaration.c 1.13 1.14 +4 -4 wine/dlls/d3d9/vertexbuffer.c 1.18 1.19 +5 -5 wine/dlls/d3d9/texture.c 1.10 1.11 +2 -3 wine/dlls/d3d9/swapchain.c 1.12 1.13 +2 -3 wine/dlls/d3d9/stateblock.c 1.12 1.13 +3 -3 wine/dlls/d3d9/query.c 1.12 1.13 +15 -14 wine/dlls/d3d9/pixelshader.c 1.12 1.13 +4 -4 wine/dlls/d3d9/indexbuffer.c 1.33 1.34 +3 -3 wine/dlls/d3d9/device.c 1.16 1.17 +2 -2 wine/dlls/d3d9/cubetexture.c

1 0

wine/dlls/ntdll thread.c
by Alexandre Julliard 14 Nov '05

14 Nov '05

ChangeSet ID: 21241 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/14 05:21:13 Modified files: dlls/ntdll : thread.c Log message: Eric Pouech <eric.pouech(a)wanadoo.fr> Init wShowWindow in RTL_USER_PARAMETERS for Wine processes started from the command-line. Patch: http://cvs.winehq.org/patch.py?id=21241 Old revision New revision Changes Path 1.45 1.46 +1 -0 wine/dlls/ntdll/thread.c Index: wine/dlls/ntdll/thread.c diff -u -p wine/dlls/ntdll/thread.c:1.45 wine/dlls/ntdll/thread.c:1.46 --- wine/dlls/ntdll/thread.c:1.45 14 Nov 2005 11:21:13 -0000 +++ wine/dlls/ntdll/thread.c 14 Nov 2005 11:21:13 -0000 @@ -122,6 +122,7 @@ void thread_init(void) peb.LdrData = &ldr; params.CurrentDirectory.DosPath.Buffer = current_dir; params.CurrentDirectory.DosPath.MaximumLength = sizeof(current_dir); + params.wShowWindow = 1; /* SW_SHOWNORMAL */ RtlInitializeBitMap( &tls_bitmap, peb.TlsBitmapBits, sizeof(peb.TlsBitmapBits) * 8 ); RtlInitializeBitMap( &tls_expansion_bitmap, peb.TlsExpansionBitmapBits, sizeof(peb.TlsExpansionBitmapBits) * 8 );

1 0