May 2010 - Wine-Commits - list.winehq.org

Juan Lang : wintrust/tests: Fix test failures when not running as administrator.
by Alexandre Julliard May 18, 2010

May 18, 2010

Module: wine Branch: master Commit: 0b7711e545e2aa8d43049114b8a823112212486c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b7711e545e2aa8d43049114b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon May 17 10:44:11 2010 -0700 wintrust/tests: Fix test failures when not running as administrator. --- dlls/wintrust/tests/crypt.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/wintrust/tests/crypt.c b/dlls/wintrust/tests/crypt.c index 64a91b7..68a9ebc 100644 --- a/dlls/wintrust/tests/crypt.c +++ b/dlls/wintrust/tests/crypt.c @@ -233,7 +233,12 @@ static void test_context(void) */ ret = pCryptCATAdminAcquireContext(&hca, &dummy, 0); - ok(ret, "Expected success\n"); + ok(ret || GetLastError() == ERROR_ACCESS_DENIED, "CryptCATAdminAcquireContext failed %u\n", GetLastError()); + if (!ret && GetLastError() == ERROR_ACCESS_DENIED) + { + win_skip("Not running as administrator\n"); + return; + } ok(hca != NULL, "Expected a context handle, got NULL\n"); attrs = GetFileAttributes(catroot); @@ -492,7 +497,12 @@ static void test_CryptCATAdminAddRemoveCatalog(void) CloseHandle(file); ret = pCryptCATAdminAcquireContext(&hcatadmin, &dummy, 0); - ok(ret, "CryptCATAdminAcquireContext failed %u\n", GetLastError()); + ok(ret || GetLastError() == ERROR_ACCESS_DENIED, "CryptCATAdminAcquireContext failed %u\n", GetLastError()); + if (!ret && GetLastError() == ERROR_ACCESS_DENIED) + { + win_skip("Not running as administrator\n"); + return; + } SetLastError(0xdeadbeef); hcatinfo = pCryptCATAdminAddCatalog(NULL, NULL, NULL, 0);

1 0

Juan Lang : winhttp: Honor security flags when verifying a certificate.
by Alexandre Julliard May 18, 2010

May 18, 2010

Module: wine Branch: master Commit: b659dee9999e4db272ccdc5b5ab14dac9d47fc02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b659dee9999e4db272ccdc5b5… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon May 17 10:13:13 2010 -0700 winhttp: Honor security flags when verifying a certificate. --- dlls/winhttp/net.c | 22 +++++++++++++++++----- 1 files changed, 17 insertions(+), 5 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index da57f8c..ab7a4a7 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -254,7 +254,7 @@ static PCCERT_CONTEXT X509_to_cert_context(X509 *cert) } static DWORD netconn_verify_cert( PCCERT_CONTEXT cert, HCERTSTORE store, - WCHAR *server ) + WCHAR *server, DWORD security_flags ) { BOOL ret; CERT_CHAIN_PARA chainPara = { sizeof(chainPara), { 0 } }; @@ -272,7 +272,10 @@ static DWORD netconn_verify_cert( PCCERT_CONTEXT cert, HCERTSTORE store, if (chain->TrustStatus.dwErrorStatus) { if (chain->TrustStatus.dwErrorStatus & CERT_TRUST_IS_NOT_TIME_VALID) - err = ERROR_WINHTTP_SECURE_CERT_DATE_INVALID; + { + if (!(security_flags & SECURITY_FLAG_IGNORE_CERT_DATE_INVALID)) + err = ERROR_WINHTTP_SECURE_CERT_DATE_INVALID; + } else if (chain->TrustStatus.dwErrorStatus & CERT_TRUST_IS_UNTRUSTED_ROOT) err = ERROR_WINHTTP_SECURE_INVALID_CA; @@ -285,7 +288,10 @@ static DWORD netconn_verify_cert( PCCERT_CONTEXT cert, HCERTSTORE store, err = ERROR_WINHTTP_SECURE_CERT_REVOKED; else if (chain->TrustStatus.dwErrorStatus & CERT_TRUST_IS_NOT_VALID_FOR_USAGE) - err = ERROR_WINHTTP_SECURE_CERT_WRONG_USAGE; + { + if (!(security_flags & SECURITY_FLAG_IGNORE_CERT_WRONG_USAGE)) + err = ERROR_WINHTTP_SECURE_CERT_WRONG_USAGE; + } else err = ERROR_WINHTTP_SECURE_INVALID_CERT; } @@ -310,7 +316,10 @@ static DWORD netconn_verify_cert( PCCERT_CONTEXT cert, HCERTSTORE store, if (ret && policyStatus.dwError) { if (policyStatus.dwError == CERT_E_CN_NO_MATCH) - err = ERROR_WINHTTP_SECURE_CERT_CN_INVALID; + { + if (!(security_flags & SECURITY_FLAG_IGNORE_CERT_CN_INVALID)) + err = ERROR_WINHTTP_SECURE_CERT_CN_INVALID; + } else err = ERROR_WINHTTP_SECURE_INVALID_CERT; } @@ -328,9 +337,11 @@ static int netconn_secure_verify( int preverify_ok, X509_STORE_CTX *ctx ) SSL *ssl; WCHAR *server; BOOL ret = FALSE; + netconn_t *conn; ssl = pX509_STORE_CTX_get_ex_data( ctx, pSSL_get_ex_data_X509_STORE_CTX_idx() ); server = pSSL_get_ex_data( ssl, hostname_idx ); + conn = pSSL_get_ex_data( ssl, conn_idx ); if (preverify_ok) { HCERTSTORE store = CertOpenStore( CERT_STORE_PROV_MEMORY, 0, 0, @@ -362,7 +373,8 @@ static int netconn_secure_verify( int preverify_ok, X509_STORE_CTX *ctx ) if (!endCert) ret = FALSE; if (ret) { - DWORD_PTR err = netconn_verify_cert( endCert, store, server ); + DWORD_PTR err = netconn_verify_cert( endCert, store, server, + conn->security_flags ); if (err) {

1 0

Juan Lang : winhttp: Store a pointer to the netconn_t in the SSL context.
by Alexandre Julliard May 18, 2010

May 18, 2010

Module: wine Branch: master Commit: 2a569a9e892749e19b42d5b2b838cb9efd9b604a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a569a9e892749e19b42d5b2b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon May 17 10:29:23 2010 -0700 winhttp: Store a pointer to the netconn_t in the SSL context. --- dlls/winhttp/net.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 5890c06..da57f8c 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -95,6 +95,7 @@ static SSL_METHOD *method; static SSL_CTX *ctx; static int hostname_idx; static int error_idx; +static int conn_idx; #define MAKE_FUNCPTR(f) static typeof(f) * p##f @@ -485,6 +486,14 @@ BOOL netconn_init( netconn_t *conn, BOOL secure ) LeaveCriticalSection( &init_ssl_cs ); return FALSE; } + conn_idx = pSSL_get_ex_new_index( 0, (void *)"netconn index", NULL, NULL, NULL ); + if (conn_idx == -1) + { + ERR("SSL_get_ex_new_index failed: %s\n", pERR_error_string( pERR_get_error(), 0 )); + set_last_error( ERROR_OUTOFMEMORY ); + LeaveCriticalSection( &init_ssl_cs ); + return FALSE; + } pSSL_CTX_set_verify( ctx, SSL_VERIFY_PEER, netconn_secure_verify ); pCRYPTO_set_id_callback(ssl_thread_id); @@ -631,6 +640,12 @@ BOOL netconn_secure_connect( netconn_t *conn, WCHAR *hostname ) set_last_error( ERROR_WINHTTP_SECURE_CHANNEL_ERROR ); goto fail; } + if (!pSSL_set_ex_data( conn->ssl_conn, conn_idx, conn )) + { + ERR("SSL_set_ex_data failed: %s\n", pERR_error_string( pERR_get_error(), 0 )); + set_last_error( ERROR_WINHTTP_SECURE_CHANNEL_ERROR ); + return FALSE; + } if (!pSSL_set_fd( conn->ssl_conn, conn->socket )) { ERR("SSL_set_fd failed: %s\n", pERR_error_string( pERR_get_error(), 0 ));

1 0

Julius Schwartzenberg : wined3d: Cope with the new Intel renderer string.
by Alexandre Julliard May 18, 2010

May 18, 2010

Module: wine Branch: master Commit: ba11b695e6b55f90d0a311efa921231291d7361c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba11b695e6b55f90d0a311efa… Author: Julius Schwartzenberg <julius.schwartzenberg(a)gmail.com> Date: Mon May 17 17:59:03 2010 +0200 wined3d: Cope with the new Intel renderer string. --- dlls/wined3d/directx.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index bcc271b..a2a7f8e 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1204,7 +1204,8 @@ static enum wined3d_gl_vendor wined3d_guess_gl_vendor(struct wined3d_gl_info *gl return GL_VENDOR_FGLRX; if (strstr(gl_vendor_string, "Intel(R)") - || strstr(gl_renderer, "Intel(R)") + /* Intel switched from Intel(R) to Intel® recently, so just match Intel. */ + || strstr(gl_renderer, "Intel") || strstr(gl_vendor_string, "Intel Inc.")) return GL_VENDOR_INTEL; @@ -1236,7 +1237,8 @@ static enum wined3d_pci_vendor wined3d_guess_card_vendor(const char *gl_vendor_s return HW_VENDOR_ATI; if (strstr(gl_vendor_string, "Intel(R)") - || strstr(gl_renderer, "Intel(R)") + /* Intel switched from Intel(R) to Intel® recently, so just match Intel. */ + || strstr(gl_renderer, "Intel") || strstr(gl_vendor_string, "Intel Inc.")) return HW_VENDOR_INTEL; @@ -1944,7 +1946,8 @@ static const struct vendor_card_selection vendor_card_select_table[] = {GL_VENDOR_FGLRX, HW_VENDOR_ATI, "AMD/ATI binary driver", select_card_ati_binary}, {GL_VENDOR_MESA, HW_VENDOR_ATI, "Mesa AMD/ATI driver", select_card_ati_mesa}, {GL_VENDOR_MESA, HW_VENDOR_NVIDIA, "Mesa Nouveau driver", select_card_nvidia_mesa}, - {GL_VENDOR_MESA, HW_VENDOR_INTEL, "Mesa Intel driver", select_card_intel_mesa} + {GL_VENDOR_MESA, HW_VENDOR_INTEL, "Mesa Intel driver", select_card_intel_mesa}, + {GL_VENDOR_INTEL, HW_VENDOR_INTEL, "Mesa Intel driver", select_card_intel_mesa} };

1 0

Sven Baars : wineps.drv: Fix Dutch translation.
by Alexandre Julliard May 18, 2010

May 18, 2010

Module: wine Branch: master Commit: 141875c84aa0dac61d8a588a44213578161e317e URL: http://source.winehq.org/git/wine.git/?a=commit;h=141875c84aa0dac61d8a588a4… Author: Sven Baars <sven.wine(a)gmail.com> Date: Mon May 17 19:04:02 2010 +0200 wineps.drv: Fix Dutch translation. --- dlls/wineps.drv/wps_Nl.rc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wineps.drv/wps_Nl.rc b/dlls/wineps.drv/wps_Nl.rc index e5b1f9c..c6b5345 100644 --- a/dlls/wineps.drv/wps_Nl.rc +++ b/dlls/wineps.drv/wps_Nl.rc @@ -31,11 +31,11 @@ FONT 8, "MS Shell Dlg" LISTBOX IDD_PAPERS, 10, 15, 200, 45, LBS_STANDARD | LBS_HASSTRINGS | WS_TABSTOP GROUPBOX "Ori�ntatie", -1, 10, 80, 200, 50 - CONTROL "&Portret", IDD_ORIENT_PORTRAIT, "Button", BS_AUTORADIOBUTTON | + CONTROL "&Staand", IDD_ORIENT_PORTRAIT, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 20, 90, 60, 10 - CONTROL "&Landschap", IDD_ORIENT_LANDSCAPE, "Button", BS_AUTORADIOBUTTON, + CONTROL "&Liggend", IDD_ORIENT_LANDSCAPE, "Button", BS_AUTORADIOBUTTON, 20, 110, 60, 10 - LTEXT "Duplex:", IDD_DUPLEX_NAME, 10, 140, 100, 8 + LTEXT "Dubbelzijdig:", IDD_DUPLEX_NAME, 10, 140, 100, 8 COMBOBOX IDD_DUPLEX, 10, 151, 200, 20, CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_TABSTOP }

1 0

Owen Rudge : d3dx9: Implement CreateEffectFromFile/Resource functions.
by Alexandre Julliard May 18, 2010

May 18, 2010

Module: wine Branch: master Commit: 00eb092e4dec30680b94e722574034c5971857af URL: http://source.winehq.org/git/wine.git/?a=commit;h=00eb092e4dec30680b94e7225… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Mon May 17 10:50:41 2010 -0500 d3dx9: Implement CreateEffectFromFile/Resource functions. --- dlls/d3dx9_36/d3dx9_36.spec | 18 +++--- dlls/d3dx9_36/effect.c | 139 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 148 insertions(+), 9 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index e6ad559..19406e7 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -52,15 +52,15 @@ @ stdcall D3DXCreateEffectCompilerFromFileW(wstr ptr ptr long ptr ptr) @ stdcall D3DXCreateEffectCompilerFromResourceA(long str ptr ptr long ptr ptr) @ stdcall D3DXCreateEffectCompilerFromResourceW(long wstr ptr ptr long ptr ptr) -@ stdcall D3DXCreateEffectEx(ptr ptr long ptr ptr ptr long ptr ptr ptr) -@ stub D3DXCreateEffectFromFileA -@ stub D3DXCreateEffectFromFileExA -@ stub D3DXCreateEffectFromFileExW -@ stub D3DXCreateEffectFromFileW -@ stub D3DXCreateEffectFromResourceA -@ stub D3DXCreateEffectFromResourceExA -@ stub D3DXCreateEffectFromResourceExW -@ stub D3DXCreateEffectFromResourceW +@ stdcall D3DXCreateEffectEx(ptr ptr long ptr ptr str long ptr ptr ptr) +@ stdcall D3DXCreateEffectFromFileA(ptr str ptr ptr long ptr ptr ptr) +@ stdcall D3DXCreateEffectFromFileExA(ptr str ptr ptr str long ptr ptr ptr) +@ stdcall D3DXCreateEffectFromFileExW(ptr str ptr ptr str long ptr ptr ptr) +@ stdcall D3DXCreateEffectFromFileW(ptr wstr ptr ptr long ptr ptr ptr) +@ stdcall D3DXCreateEffectFromResourceA(ptr long str ptr ptr long ptr ptr ptr) +@ stdcall D3DXCreateEffectFromResourceExA(ptr long str ptr ptr str long ptr ptr ptr) +@ stdcall D3DXCreateEffectFromResourceExW(ptr long str ptr ptr str long ptr ptr ptr) +@ stdcall D3DXCreateEffectFromResourceW(ptr long wstr ptr ptr long ptr ptr ptr) @ stdcall D3DXCreateEffectPool(ptr) @ stdcall D3DXCreateFontA(ptr long long long long long long long long long str ptr) @ stdcall D3DXCreateFontIndirectA(ptr ptr ptr) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index fd761b4..e4c9007 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -999,6 +999,145 @@ HRESULT WINAPI D3DXCreateEffectPool(LPD3DXEFFECTPOOL* pool) return S_OK; } +HRESULT WINAPI D3DXCreateEffectFromFileExW(LPDIRECT3DDEVICE9 device, LPCWSTR srcfile, + const D3DXMACRO *defines, LPD3DXINCLUDE include, LPCSTR skipconstants, DWORD flags, + LPD3DXEFFECTPOOL pool, LPD3DXEFFECT *effect, LPD3DXBUFFER *compilationerrors) +{ + LPVOID buffer; + HRESULT ret; + DWORD size; + + TRACE("(%s): relay\n", debugstr_w(srcfile)); + + if (!device || !srcfile || !defines) + return D3DERR_INVALIDCALL; + + ret = map_view_of_file(srcfile, &buffer, &size); + + if (FAILED(ret)) + return D3DXERR_INVALIDDATA; + + ret = D3DXCreateEffectEx(device, buffer, size, defines, include, skipconstants, flags, pool, effect, compilationerrors); + UnmapViewOfFile(buffer); + + return ret; +} + +HRESULT WINAPI D3DXCreateEffectFromFileExA(LPDIRECT3DDEVICE9 device, LPCSTR srcfile, + const D3DXMACRO *defines, LPD3DXINCLUDE include, LPCSTR skipconstants, DWORD flags, + LPD3DXEFFECTPOOL pool, LPD3DXEFFECT *effect, LPD3DXBUFFER *compilationerrors) +{ + LPWSTR srcfileW; + HRESULT ret; + DWORD len; + + TRACE("(void): relay\n"); + + if (!srcfile || !defines) + return D3DERR_INVALIDCALL; + + len = MultiByteToWideChar(CP_ACP, 0, srcfile, -1, NULL, 0); + srcfileW = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, srcfile, -1, srcfileW, len); + + ret = D3DXCreateEffectFromFileExW(device, srcfileW, defines, include, skipconstants, flags, pool, effect, compilationerrors); + HeapFree(GetProcessHeap(), 0, srcfileW); + + return ret; +} + +HRESULT WINAPI D3DXCreateEffectFromFileW(LPDIRECT3DDEVICE9 device, LPCWSTR srcfile, + const D3DXMACRO *defines, LPD3DXINCLUDE include, DWORD flags, LPD3DXEFFECTPOOL pool, + LPD3DXEFFECT *effect, LPD3DXBUFFER *compilationerrors) +{ + TRACE("(void): relay\n"); + return D3DXCreateEffectFromFileExW(device, srcfile, defines, include, NULL, flags, pool, effect, compilationerrors); +} + +HRESULT WINAPI D3DXCreateEffectFromFileA(LPDIRECT3DDEVICE9 device, LPCSTR srcfile, + const D3DXMACRO *defines, LPD3DXINCLUDE include, DWORD flags, LPD3DXEFFECTPOOL pool, + LPD3DXEFFECT *effect, LPD3DXBUFFER *compilationerrors) +{ + TRACE("(void): relay\n"); + return D3DXCreateEffectFromFileExA(device, srcfile, defines, include, NULL, flags, pool, effect, compilationerrors); +} + +HRESULT WINAPI D3DXCreateEffectFromResourceExW(LPDIRECT3DDEVICE9 device, HMODULE srcmodule, LPCWSTR srcresource, + const D3DXMACRO *defines, LPD3DXINCLUDE include, LPCSTR skipconstants, DWORD flags, + LPD3DXEFFECTPOOL pool, LPD3DXEFFECT *effect, LPD3DXBUFFER *compilationerrors) +{ + HRSRC resinfo; + + TRACE("(%p, %s): relay\n", srcmodule, debugstr_w(srcresource)); + + if (!device || !defines) + return D3DERR_INVALIDCALL; + + resinfo = FindResourceW(srcmodule, srcresource, (LPCWSTR) RT_RCDATA); + + if (resinfo) + { + LPVOID buffer; + HRESULT ret; + DWORD size; + + ret = load_resource_into_memory(srcmodule, resinfo, &buffer, &size); + + if (FAILED(ret)) + return D3DXERR_INVALIDDATA; + + return D3DXCreateEffectEx(device, buffer, size, defines, include, skipconstants, flags, pool, effect, compilationerrors); + } + + return D3DXERR_INVALIDDATA; +} + +HRESULT WINAPI D3DXCreateEffectFromResourceExA(LPDIRECT3DDEVICE9 device, HMODULE srcmodule, LPCSTR srcresource, + const D3DXMACRO *defines, LPD3DXINCLUDE include, LPCSTR skipconstants, DWORD flags, + LPD3DXEFFECTPOOL pool, LPD3DXEFFECT *effect, LPD3DXBUFFER *compilationerrors) +{ + HRSRC resinfo; + + TRACE("(%p, %s): relay\n", srcmodule, debugstr_a(srcresource)); + + if (!device || !defines) + return D3DERR_INVALIDCALL; + + resinfo = FindResourceA(srcmodule, srcresource, (LPCSTR) RT_RCDATA); + + if (resinfo) + { + LPVOID buffer; + HRESULT ret; + DWORD size; + + ret = load_resource_into_memory(srcmodule, resinfo, &buffer, &size); + + if (FAILED(ret)) + return D3DXERR_INVALIDDATA; + + return D3DXCreateEffectEx(device, buffer, size, defines, include, skipconstants, flags, pool, effect, compilationerrors); + } + + return D3DXERR_INVALIDDATA; +} + +HRESULT WINAPI D3DXCreateEffectFromResourceW(LPDIRECT3DDEVICE9 device, HMODULE srcmodule, LPCWSTR srcresource, + const D3DXMACRO *defines, LPD3DXINCLUDE include, DWORD flags, LPD3DXEFFECTPOOL pool, + LPD3DXEFFECT *effect, LPD3DXBUFFER *compilationerrors) +{ + TRACE("(void): relay\n"); + return D3DXCreateEffectFromResourceExW(device, srcmodule, srcresource, defines, include, NULL, flags, pool, effect, compilationerrors); +} + +HRESULT WINAPI D3DXCreateEffectFromResourceA(LPDIRECT3DDEVICE9 device, HMODULE srcmodule, LPCSTR srcresource, + const D3DXMACRO *defines, LPD3DXINCLUDE include, DWORD flags, LPD3DXEFFECTPOOL pool, + LPD3DXEFFECT *effect, LPD3DXBUFFER *compilationerrors) +{ + TRACE("(void): relay\n"); + return D3DXCreateEffectFromResourceExA(device, srcmodule, srcresource, defines, include, NULL, flags, pool, effect, compilationerrors); +} + HRESULT WINAPI D3DXCreateEffectCompilerFromFileW(LPCWSTR srcfile, const D3DXMACRO *defines, LPD3DXINCLUDE include, DWORD flags, LPD3DXEFFECTCOMPILER *effectcompiler, LPD3DXBUFFER *parseerrors) {

1 0

Owen Rudge : d3dx9: Implement D3DXCreateEffectCompilerFromFile/Resource.
by Alexandre Julliard May 18, 2010

May 18, 2010

Module: wine Branch: master Commit: b3523a447c6b094897f175475bbf53042c315388 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3523a447c6b094897f175475… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Mon May 17 10:50:29 2010 -0500 d3dx9: Implement D3DXCreateEffectCompilerFromFile/Resource. --- dlls/d3dx9_36/d3dx9_36.spec | 8 ++-- dlls/d3dx9_36/effect.c | 97 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 101 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index d2437b8..e6ad559 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -48,10 +48,10 @@ @ stub D3DXCreateCylinder @ stdcall D3DXCreateEffect(ptr ptr long ptr ptr long ptr ptr ptr) @ stdcall D3DXCreateEffectCompiler(ptr long ptr ptr long ptr ptr) -@ stub D3DXCreateEffectCompilerFromFileA -@ stub D3DXCreateEffectCompilerFromFileW -@ stub D3DXCreateEffectCompilerFromResourceA -@ stub D3DXCreateEffectCompilerFromResourceW +@ stdcall D3DXCreateEffectCompilerFromFileA(str ptr ptr long ptr ptr) +@ stdcall D3DXCreateEffectCompilerFromFileW(wstr ptr ptr long ptr ptr) +@ stdcall D3DXCreateEffectCompilerFromResourceA(long str ptr ptr long ptr ptr) +@ stdcall D3DXCreateEffectCompilerFromResourceW(long wstr ptr ptr long ptr ptr) @ stdcall D3DXCreateEffectEx(ptr ptr long ptr ptr ptr long ptr ptr ptr) @ stub D3DXCreateEffectFromFileA @ stub D3DXCreateEffectFromFileExA diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 4633d88..fd761b4 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -998,3 +998,100 @@ HRESULT WINAPI D3DXCreateEffectPool(LPD3DXEFFECTPOOL* pool) return S_OK; } + +HRESULT WINAPI D3DXCreateEffectCompilerFromFileW(LPCWSTR srcfile, const D3DXMACRO *defines, LPD3DXINCLUDE include, + DWORD flags, LPD3DXEFFECTCOMPILER *effectcompiler, LPD3DXBUFFER *parseerrors) +{ + LPVOID buffer; + HRESULT ret; + DWORD size; + + TRACE("(%s): relay\n", debugstr_w(srcfile)); + + if (!srcfile || !defines) + return D3DERR_INVALIDCALL; + + ret = map_view_of_file(srcfile, &buffer, &size); + + if (FAILED(ret)) + return D3DXERR_INVALIDDATA; + + ret = D3DXCreateEffectCompiler(buffer, size, defines, include, flags, effectcompiler, parseerrors); + UnmapViewOfFile(buffer); + + return ret; +} + +HRESULT WINAPI D3DXCreateEffectCompilerFromFileA(LPCSTR srcfile, const D3DXMACRO *defines, LPD3DXINCLUDE include, + DWORD flags, LPD3DXEFFECTCOMPILER *effectcompiler, LPD3DXBUFFER *parseerrors) +{ + LPWSTR srcfileW; + HRESULT ret; + DWORD len; + + TRACE("(void): relay\n"); + + if (!srcfile || !defines) + return D3DERR_INVALIDCALL; + + len = MultiByteToWideChar(CP_ACP, 0, srcfile, -1, NULL, 0); + srcfileW = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, srcfile, -1, srcfileW, len); + + ret = D3DXCreateEffectCompilerFromFileW(srcfileW, defines, include, flags, effectcompiler, parseerrors); + HeapFree(GetProcessHeap(), 0, srcfileW); + + return ret; +} + +HRESULT WINAPI D3DXCreateEffectCompilerFromResourceA(HMODULE srcmodule, LPCSTR srcresource, const D3DXMACRO *defines, + LPD3DXINCLUDE include, DWORD flags, LPD3DXEFFECTCOMPILER *effectcompiler, LPD3DXBUFFER *parseerrors) +{ + HRSRC resinfo; + + TRACE("(%p, %s): relay\n", srcmodule, debugstr_a(srcresource)); + + resinfo = FindResourceA(srcmodule, srcresource, (LPCSTR) RT_RCDATA); + + if (resinfo) + { + LPVOID buffer; + HRESULT ret; + DWORD size; + + ret = load_resource_into_memory(srcmodule, resinfo, &buffer, &size); + + if (FAILED(ret)) + return D3DXERR_INVALIDDATA; + + return D3DXCreateEffectCompiler(buffer, size, defines, include, flags, effectcompiler, parseerrors); + } + + return D3DXERR_INVALIDDATA; +} + +HRESULT WINAPI D3DXCreateEffectCompilerFromResourceW(HMODULE srcmodule, LPCWSTR srcresource, const D3DXMACRO *defines, + LPD3DXINCLUDE include, DWORD flags, LPD3DXEFFECTCOMPILER *effectcompiler, LPD3DXBUFFER *parseerrors) +{ + HRSRC resinfo; + + TRACE("(%p, %s): relay\n", srcmodule, debugstr_w(srcresource)); + + resinfo = FindResourceW(srcmodule, srcresource, (LPCWSTR) RT_RCDATA); + + if (resinfo) + { + LPVOID buffer; + HRESULT ret; + DWORD size; + + ret = load_resource_into_memory(srcmodule, resinfo, &buffer, &size); + + if (FAILED(ret)) + return D3DXERR_INVALIDDATA; + + return D3DXCreateEffectCompiler(buffer, size, defines, include, flags, effectcompiler, parseerrors); + } + + return D3DXERR_INVALIDDATA; +}

1 0

André Hentschel : winedev: There is no config file.
by Alexandre Julliard May 18, 2010

May 18, 2010

Module: docs Branch: master Commit: 1a35b907c5826bc434a288f588e4597e71dfda45 URL: http://source.winehq.org/git/docs.git/?a=commit;h=1a35b907c5826bc434a288f58… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon May 17 20:04:27 2010 +0200 winedev: There is no config file. --- en/winedev-architecture.sgml | 36 ++++-------------------------------- 1 files changed, 4 insertions(+), 32 deletions(-) diff --git a/en/winedev-architecture.sgml b/en/winedev-architecture.sgml index 9332b44..953c24c 100644 --- a/en/winedev-architecture.sgml +++ b/en/winedev-architecture.sgml @@ -686,7 +686,7 @@ <para> This document mainly deals with the status of current DLL - support by Wine. The Wine ini file currently supports + support by Wine. <filename>Winecfg</filename> currently supports settings to change the load order of DLLs. The load order depends on several issues, which results in different settings for various DLLs. @@ -761,13 +761,6 @@ <title>Load Order for DLLs</title> <para> - Using the DLL sections from the wine configuration file, the - load order can be tweaked to a high degree. In general it is - advised not to change the settings of the configuration - file. The default configuration specifies the right load - order for the most important DLLs. - </para> - <para> The default load order follows this algorithm: for all DLLs which have a fully-functional Wine implementation, or where the native DLL is known not to work, the built-in library @@ -775,30 +768,9 @@ takes load-order precedence. </para> <para> - The <varname>DefaultLoadOrder</varname> from the - [DllDefaults] section specifies for all DLLs which version - to try first. See manpage for explanation of the arguments. - </para> - <para> - The [DllOverrides] section deals with DLLs, which need a - different-from-default treatment. - </para> - <para> - The [DllPairs] section is for DLLs, which must be loaded in - pairs. In general, these are DLLs for either 16-bit or - 32-bit applications. In most cases in Windows, the 32-bit - version cannot be used without its 16-bit counterpart. For - Wine, it is customary that the 16-bit implementations rely - on the 32-bit implementations and cast the results back to - 16-bit arguments. Changing anything in this section is bound - to result in errors. - </para> - <para> - For the future, the Wine implementation of Windows DLL seems - to head towards unifying the 16 and 32 bit DLLs wherever - possible, resulting in larger DLLs. They are stored in the - <filename>dlls/</filename> subdirectory using the 32-bit - name. + See <ulink url="http://www.winehq.org/docs/wineusr-guide/"> + The Wine User Guide</ulink> for informations + on how to change the settings. </para> </sect3> </sect2>

1 0

André Hentschel : winedev: There is no PRELOAD variable.
by Alexandre Julliard May 18, 2010

May 18, 2010

Module: docs Branch: master Commit: b9338fec2b96f4eea80a7eccf913a36748a5e67f URL: http://source.winehq.org/git/docs.git/?a=commit;h=b9338fec2b96f4eea80a7eccf… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon May 17 20:04:11 2010 +0200 winedev: There is no PRELOAD variable. --- en/winedev-architecture.sgml | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/en/winedev-architecture.sgml b/en/winedev-architecture.sgml index efd60a0..9332b44 100644 --- a/en/winedev-architecture.sgml +++ b/en/winedev-architecture.sgml @@ -565,10 +565,7 @@ descriptor). Since, the DLL descriptor is automatically registered when the shared library is loaded - remember, registration call is put inside a - shared library constructor - using the - <envar>PRELOAD</envar> environment variable when - running a Wine process can force the registration of - some DLL descriptors. + shared library constructor. </para> </listitem> <listitem>

1 0

André Hentschel : winedev: Remove obsolete hardware trace section which may just be confusing.
by Alexandre Julliard May 18, 2010

May 18, 2010

Module: docs Branch: master Commit: ea74781890720b7f8916dfb189a025331c79fbf2 URL: http://source.winehq.org/git/docs.git/?a=commit;h=ea74781890720b7f8916dfb18… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon May 17 20:04:34 2010 +0200 winedev: Remove obsolete hardware trace section which may just be confusing. --- en/winedev-otherdebug.sgml | 233 -------------------------------------------- 1 files changed, 0 insertions(+), 233 deletions(-) diff --git a/en/winedev-otherdebug.sgml b/en/winedev-otherdebug.sgml index 0454a1f..e484cc9 100644 --- a/en/winedev-otherdebug.sgml +++ b/en/winedev-otherdebug.sgml @@ -1,238 +1,5 @@ <chapter id="otherdebug"> <title>Other debugging techniques</title> - <sect1 id="hardware-trace"> - <title>Doing A Hardware Trace</title> - - <para> - The primary reason to do this is to reverse engineer a - hardware device for which you don't have documentation, but - can get to work under Wine. - </para> - <para> - This lot is aimed at parallel port devices, and in particular - parallel port scanners which are now so cheap they are - virtually being given away. The problem is that few - manufactures will release any programming information which - prevents drivers being written for Sane, and the traditional - technique of using DOSemu to produce the traces does not work - as the scanners invariably only have drivers for Windows. - </para> - <para> - Presuming that you have compiled and installed wine the first - thing to do is to enable direct hardware access to your - parallel port. To do this edit <filename>config</filename> - (usually in <filename>~/.wine/</filename>) and in the - ports section add the following two lines - </para> - <programlisting> -read=0x378,0x379,0x37a,0x37c,0x77a -write=0x378,x379,0x37a,0x37c,0x77a - </programlisting> - <para> - This adds the necessary access required for SPP/PS2/EPP/ECP - parallel port on LPT1. You will need to adjust these number - accordingly if your parallel port is on LPT2 or LPT0. - </para> - <para> - When starting wine use the following command line, where - <literal>XXXX</literal> is the program you need to run in - order to access your scanner, and <literal>YYYY</literal> is - the file your trace will be stored in: - </para> - <programlisting> -WINEDEBUG=+io wine XXXX 2> >(sed 's/^[^:]*:io:[^ ]* //' > YYYY) - </programlisting> - <para> - You will need large amounts of hard disk space (read hundreds - of megabytes if you do a full page scan), and for reasonable - performance a really fast processor and lots of RAM. - </para> - <para> - You will need to postprocess the output into a more manageable - format, using the <command>shrink</command> program. First - you need to compile the source (which is located at the end of - this section): - <programlisting> -cc shrink.c -o shrink - </programlisting> - </para> - <para> - Use the <command>shrink</command> program to reduce the - physical size of the raw log as follows: - </para> - <programlisting> -cat log | shrink > log2 - </programlisting> - <para> - The trace has the basic form of - </para> - <programlisting> -XXXX > YY @ ZZZZ:ZZZZ - </programlisting> - <para> - where <literal>XXXX</literal> is the port in hexadecimal being - accessed, <literal>YY</literal> is the data written (or read) - from the port, and <literal>ZZZZ:ZZZZ</literal> is the address - in memory of the instruction that accessed the port. The - direction of the arrow indicates whether the data was written - or read from the port. - </para> - <programlisting> -> data was written to the port -< data was read from the port - </programlisting> - <para> - My basic tip for interpreting these logs is to pay close - attention to the addresses of the IO instructions. Their - grouping and sometimes proximity should reveal the presence of - subroutines in the driver. By studying the different versions - you should be able to work them out. For example consider the - following section of trace from my UMAX Astra 600P - </para> - <programlisting> -0x378 > 55 @ 0297:01ec -0x37a > 05 @ 0297:01f5 -0x379 < 8f @ 0297:01fa -0x37a > 04 @ 0297:0211 -0x378 > aa @ 0297:01ec -0x37a > 05 @ 0297:01f5 -0x379 < 8f @ 0297:01fa -0x37a > 04 @ 0297:0211 -0x378 > 00 @ 0297:01ec -0x37a > 05 @ 0297:01f5 -0x379 < 8f @ 0297:01fa -0x37a > 04 @ 0297:0211 -0x378 > 00 @ 0297:01ec -0x37a > 05 @ 0297:01f5 -0x379 < 8f @ 0297:01fa -0x37a > 04 @ 0297:0211 -0x378 > 00 @ 0297:01ec -0x37a > 05 @ 0297:01f5 -0x379 < 8f @ 0297:01fa -0x37a > 04 @ 0297:0211 -0x378 > 00 @ 0297:01ec -0x37a > 05 @ 0297:01f5 -0x379 < 8f @ 0297:01fa -0x37a > 04 @ 0297:0211 - </programlisting> - <para> - As you can see there is a repeating structure starting at - address <literal>0297:01ec</literal> that consists of four io - accesses on the parallel port. Looking at it the first io - access writes a changing byte to the data port the second - always writes the byte <literal>0x05</literal> to the control - port, then a value which always seems to - <literal>0x8f</literal> is read from the status port at which - point a byte <literal>0x04</literal> is written to the control - port. By studying this and other sections of the trace we can - write a C routine that emulates this, shown below with some - macros to make reading/writing on the parallel port easier to - read. - </para> - <programlisting> -#define r_dtr(x) inb(x) -#define r_str(x) inb(x+1) -#define r_ctr(x) inb(x+2) -#define w_dtr(x,y) outb(y, x) -#define w_str(x,y) outb(y, x+1) -#define w_ctr(x,y) outb(y, x+2) - -/* Seems to be sending a command byte to the scanner */ -int udpp_put(int udpp_base, unsigned char command) -{ - int loop, value; - - w_dtr(udpp_base, command); - w_ctr(udpp_base, 0x05); - - for (loop=0; loop < 10; loop++) - if ((value = r_str(udpp_base)) & 0x80) - { - w_ctr(udpp_base, 0x04); - return value & 0xf8; - } - - return (value & 0xf8) | 0x01; -} - </programlisting> - <para> - For the UMAX Astra 600P only seven such routines exist (well - 14 really, seven for SPP and seven for EPP). Whether you - choose to disassemble the driver at this point to verify the - routines is your own choice. If you do, the address from the - trace should help in locating them in the disassembly. - </para> - <para> - You will probably then find it useful to write a script/perl/C - program to analyse the logfile and decode them futher as this - can reveal higher level grouping of the low level routines. - For example from the logs from my UMAX Astra 600P when decoded - further reveal (this is a small snippet) - </para> - <programlisting> -start: -put: 55 8f -put: aa 8f -put: 00 8f -put: 00 8f -put: 00 8f -put: c2 8f -wait: ff -get: af,87 -wait: ff -get: af,87 -end: cc -start: -put: 55 8f -put: aa 8f -put: 00 8f -put: 03 8f -put: 05 8f -put: 84 8f -wait: ff - </programlisting> - <para> - From this it is easy to see that <varname>put</varname> - routine is often grouped together in five successive calls - sending information to the scanner. Once these are understood - it should be possible to process the logs further to show the - higher level routines in an easy to see format. Once the - highest level format that you can derive from this process is - understood, you then need to produce a series of scans varying - only one parameter between them, so you can discover how to - set the various parameters for the scanner. - </para> - - <para> - The following is the <filename>shrink.c</filename> program: - <programlisting> -/* Copyright David Campbell <campbell(a)torque.net> */ -#include <stdio.h> -#include <string.h> - -int main (void) -{ - char buff[256], lastline[256] = ""; - int count = 0; - - while (!feof (stdin)) - { - fgets (buff, sizeof (buff), stdin); - if (strcmp (buff, lastline)) - { - if (count > 1) - printf ("# Last line repeated %i times #\n", count); - printf ("%s", buff); - strcpy (lastline, buff); - count = 1; - } - else count++; - } - return 0; -} - </programlisting> - </para> - </sect1> <sect1 id="undoc-func"> <title>Understanding undocumented APIs</title>

1 0