December 2009 - Wine-Commits

Huw Davies : user32: Pad lfFaceName so we don' t write uninitialised data to the registry.
by Alexandre Julliard Dec. 4, 2009

Dec. 4, 2009

Module: wine Branch: master Commit: 6b8c9aee4fd57ac1f2f949992b3c5a6702f780a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b8c9aee4fd57ac1f2f949992… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Dec 4 14:28:04 2009 +0000 user32: Pad lfFaceName so we don't write uninitialised data to the registry. Found by Valgrind. --- dlls/user32/sysparams.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 5113acb..c6cb494 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -699,7 +699,7 @@ static BOOL SYSPARAMS_Save( LPCWSTR lpRegKey, LPCWSTR lpValName, LPCWSTR lpValue /* Convenience function to save logical fonts */ static BOOL SYSPARAMS_SaveLogFont( LPCWSTR lpRegKey, LPCWSTR lpValName, - const LPLOGFONTW plf, UINT fWinIni ) + const LOGFONTW *plf, UINT fWinIni ) { LOGFONTW lf = *plf; int len;

1 0

Paul Vriens : kernel32/tests: Correct some ok() statements.
by Alexandre Julliard Dec. 4, 2009

Dec. 4, 2009

Module: wine Branch: master Commit: 3b43c4e585fbf96df8c7e97ca08746be33c0b41c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b43c4e585fbf96df8c7e97ca… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Dec 4 12:43:40 2009 +0100 kernel32/tests: Correct some ok() statements. --- dlls/kernel32/tests/path.c | 23 +++++++++++++---------- 1 files changed, 13 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index ca56002..c8ab0a8 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -954,7 +954,7 @@ static void test_GetTempPath(void) static void test_GetLongPathNameA(void) { - DWORD length, templength, hostsize; + DWORD length, explength, hostsize; char tempfile[MAX_PATH]; char longpath[MAX_PATH]; char unc_prefix[MAX_PATH]; @@ -984,16 +984,16 @@ static void test_GetLongPathNameA(void) memset(temppath2, 0, MAX_PATH); lstrcpyA(temppath2, "\\\\?\\"); lstrcatA(temppath2, tempfile); - templength = length; + explength = length + 4; length = pGetLongPathNameA(temppath2, NULL, 0); - ok(length == templength + 4, "Wrong length %d, expected %d\n", length, templength + 4); + ok(length == explength, "Wrong length %d, expected %d\n", length, explength); length = pGetLongPathNameA(temppath2, NULL, MAX_PATH); - ok(length == templength + 4, "Wrong length %d, expected %d\n", length, templength + 4); + ok(length == explength, "Wrong length %d, expected %d\n", length, explength); length = pGetLongPathNameA(temppath2, temppath, 4); - ok(length == templength + 4, "Wrong length %d, expected %d\n", length, templength + 4); + ok(length == explength, "Wrong length %d, expected %d\n", length, explength); ok(temppath[0] == 0, "Buffer should not have been touched\n"); /* Now an UNC path with the computername */ @@ -1020,27 +1020,30 @@ static void test_GetLongPathNameA(void) /* NULL test */ length = pGetLongPathNameA(unc_short, NULL, 0); + explength = lstrlenA(longpath) + 1; todo_wine - ok(length == lstrlenA(longpath) + 1, "Wrong length, expected %d\n", length); + ok(length == explength, "Wrong length %d, expected %d\n", length, explength); length = pGetLongPathNameA(unc_short, NULL, MAX_PATH); todo_wine - ok(length == lstrlenA(longpath) + 1, "Wrong length, expected %d\n", length); + ok(length == explength, "Wrong length %d, expected %d\n", length, explength); memset(unc_long, 0, MAX_PATH); length = pGetLongPathNameA(unc_short, unc_long, lstrlenA(unc_short)); /* length will include terminating '0' on failure */ todo_wine - ok(length == lstrlenA(longpath) + 1, "Wrong length, expected %d\n", length); + ok(length == explength, "Wrong length %d, expected %d\n", length, explength); ok(unc_long[0] == 0, "Buffer should not have been touched\n"); memset(unc_long, 0, MAX_PATH); - templength = length; length = pGetLongPathNameA(unc_short, unc_long, length); /* length doesn't include terminating '0' on success */ - ok(length == templength - 1, "Wrong length %d, expected %d\n", length, templength - 1); + explength--; todo_wine + { + ok(length == explength, "Wrong length %d, expected %d\n", length, explength); ok(!lstrcmpiA(unc_long, longpath), "Expected (%s), got (%s)\n", longpath, unc_long); + } DeleteFileA(tempfile); }

1 0

Henri Verbeet : wined3d: The stateblock doesn't really need a parent.
by Alexandre Julliard Dec. 4, 2009

Dec. 4, 2009

Module: wine Branch: master Commit: dd5fc79f56e2b2447da8db61fbeeb034ef03eb95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd5fc79f56e2b2447da8db61f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Dec 4 11:50:48 2009 +0100 wined3d: The stateblock doesn't really need a parent. --- dlls/wined3d/device.c | 2 +- dlls/wined3d/stateblock.c | 12 +----------- dlls/wined3d/wined3d_private.h | 5 ++--- include/wine/wined3d.idl | 2 +- 4 files changed, 5 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 98c5002..cefabea 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -605,7 +605,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateStateBlock(IWineD3DDevice *iface, return E_OUTOFMEMORY; } - hr = stateblock_init(object, This, type, parent); + hr = stateblock_init(object, This, type); if (FAILED(hr)) { WARN("Failed to initialize stateblock, hr %#x.\n", hr); diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 9082c3d..41fca71 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -535,13 +535,6 @@ static ULONG WINAPI IWineD3DStateBlockImpl_Release(IWineD3DStateBlock *iface) { /********************************************************** * IWineD3DStateBlockImpl parts follows **********************************************************/ -static HRESULT WINAPI IWineD3DStateBlockImpl_GetParent(IWineD3DStateBlock *iface, IUnknown **pParent) { - IWineD3DStateBlockImpl *This = (IWineD3DStateBlockImpl *)iface; - IUnknown_AddRef(This->parent); - *pParent = This->parent; - return WINED3D_OK; -} - static HRESULT WINAPI IWineD3DStateBlockImpl_GetDevice(IWineD3DStateBlock *iface, IWineD3DDevice** ppDevice){ IWineD3DStateBlockImpl *This = (IWineD3DStateBlockImpl *)iface; @@ -1328,22 +1321,19 @@ static const IWineD3DStateBlockVtbl IWineD3DStateBlock_Vtbl = IWineD3DStateBlockImpl_AddRef, IWineD3DStateBlockImpl_Release, /* IWineD3DStateBlock */ - IWineD3DStateBlockImpl_GetParent, IWineD3DStateBlockImpl_GetDevice, IWineD3DStateBlockImpl_Capture, IWineD3DStateBlockImpl_Apply, IWineD3DStateBlockImpl_InitStartupStateBlock }; -HRESULT stateblock_init(IWineD3DStateBlockImpl *stateblock, IWineD3DDeviceImpl *device, - WINED3DSTATEBLOCKTYPE type, IUnknown *parent) +HRESULT stateblock_init(IWineD3DStateBlockImpl *stateblock, IWineD3DDeviceImpl *device, WINED3DSTATEBLOCKTYPE type) { unsigned int i; HRESULT hr; stateblock->lpVtbl = &IWineD3DStateBlock_Vtbl; stateblock->ref = 1; - stateblock->parent = parent; stateblock->wineD3DDevice = device; stateblock->blockType = type; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7bb5b71..39519a1 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2194,7 +2194,6 @@ struct IWineD3DStateBlockImpl LONG ref; /* Note: Ref counting not required */ /* IWineD3DStateBlock information */ - IUnknown *parent; IWineD3DDeviceImpl *wineD3DDevice; WINED3DSTATEBLOCKTYPE blockType; @@ -2293,8 +2292,8 @@ struct IWineD3DStateBlockImpl unsigned int num_contained_sampler_states; }; -HRESULT stateblock_init(IWineD3DStateBlockImpl *stateblock, IWineD3DDeviceImpl *device, - WINED3DSTATEBLOCKTYPE type, IUnknown *parent) DECLSPEC_HIDDEN; +HRESULT stateblock_init(IWineD3DStateBlockImpl *stateblock, + IWineD3DDeviceImpl *device, WINED3DSTATEBLOCKTYPE type) DECLSPEC_HIDDEN; void stateblock_init_contained_states(IWineD3DStateBlockImpl *object) DECLSPEC_HIDDEN; /* Direct3D terminology with little modifications. We do not have an issued state diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index 0658b74..da21af8 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -2724,7 +2724,7 @@ interface IWineD3DVertexDeclaration : IWineD3DBase local, uuid(83b073ce-6f30-11d9-c687-00046142c14f) ] -interface IWineD3DStateBlock : IWineD3DBase +interface IWineD3DStateBlock : IUnknown { HRESULT GetDevice( [out] IWineD3DDevice **device

1 0

Henri Verbeet : dxgi/tests: Add a small test for IDXGIAdapter::GetDesc().
by Alexandre Julliard Dec. 4, 2009

Dec. 4, 2009

Module: wine Branch: master Commit: 2800970d1abfea5bdcd9a55c6c3132e65f87b8ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=2800970d1abfea5bdcd9a55c6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Dec 4 11:50:50 2009 +0100 dxgi/tests: Add a small test for IDXGIAdapter::GetDesc(). --- dlls/dxgi/tests/device.c | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index 491616c..32e87e6 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -98,6 +98,36 @@ static void test_device_interfaces(IDXGIDevice *device) ok(SUCCEEDED(hr), "IDXGIDevice does not implement ID3D10Device\n"); } +static void test_adapter_desc(IDXGIDevice *device) +{ + DXGI_ADAPTER_DESC desc; + IDXGIAdapter *adapter; + HRESULT hr; + + hr = IDXGIDevice_GetAdapter(device, &adapter); + ok(SUCCEEDED(hr), "GetAdapter failed, hr %#x.\n", hr); + + hr = IDXGIAdapter_GetDesc(adapter, NULL); + ok(hr == E_INVALIDARG, "GetDesc returned %#x, expected %#x.\n", + hr, E_INVALIDARG); + + hr = IDXGIAdapter_GetDesc(adapter, &desc); + ok(SUCCEEDED(hr), "GetDesc failed, hr %#x.\n", hr); + + trace("%s.\n", wine_dbgstr_w(desc.Description)); + trace("%04x: %04x:%04x (rev %02x).\n", + desc.SubSysId, desc.VendorId, desc.DeviceId, desc.Revision); + trace("Dedicated video memory: %lu (%lu MB).\n", + desc.DedicatedVideoMemory, desc.DedicatedVideoMemory / (1024 * 1024)); + trace("Dedicated system memory: %lu (%lu MB).\n", + desc.DedicatedSystemMemory, desc.DedicatedSystemMemory / (1024 * 1024)); + trace("Shared system memory: %lu (%lu MB).\n", + desc.SharedSystemMemory, desc.SharedSystemMemory / (1024 * 1024)); + trace("LUID: %08x:%08x.\n", desc.AdapterLuid.HighPart, desc.AdapterLuid.LowPart); + + IDXGIAdapter_Release(adapter); +} + static void test_create_surface(IDXGIDevice *device) { ID3D10Texture2D *texture; @@ -184,6 +214,7 @@ START_TEST(device) return; } + test_adapter_desc(device); test_device_interfaces(device); test_create_surface(device); test_parents(device);

1 0

Alistair Leslie-Hughes : shdocvw: Implement IWebBrowser2_get_Name.
by Alexandre Julliard Dec. 4, 2009

Dec. 4, 2009

Module: wine Branch: master Commit: e7906026bb82f30a69a7c788e32cd9edd7154e33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7906026bb82f30a69a7c788e… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Dec 4 22:49:29 2009 +1100 shdocvw: Implement IWebBrowser2_get_Name. --- dlls/shdocvw/tests/webbrowser.c | 14 ++++++++++++++ dlls/shdocvw/webbrowser.c | 10 ++++++++-- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/shdocvw/tests/webbrowser.c b/dlls/shdocvw/tests/webbrowser.c index 41b7c7d..fba30be 100644 --- a/dlls/shdocvw/tests/webbrowser.c +++ b/dlls/shdocvw/tests/webbrowser.c @@ -139,6 +139,13 @@ static IWebBrowser2 *wb; static HWND container_hwnd, shell_embedding_hwnd; static BOOL is_downloading = FALSE; +static int strcmp_wa(LPCWSTR strw, const char *stra) +{ + CHAR buf[512]; + WideCharToMultiByte(CP_ACP, 0, strw, -1, buf, sizeof(buf), NULL, NULL); + return lstrcmpA(stra, buf); +} + static const char *debugstr_guid(REFIID riid) { static char buf[50]; @@ -1588,6 +1595,7 @@ static void test_ie_funcs(IUnknown *unk) int i; LONG hwnd; HRESULT hres; + BSTR sName; hres = IUnknown_QueryInterface(unk, &IID_IWebBrowser2, (void**)&wb); ok(hres == S_OK, "Could not get IWebBrowser2 interface: %08x\n", hres); @@ -1807,6 +1815,12 @@ static void test_ie_funcs(IUnknown *unk) hres = IWebBrowser2_get_Application(wb, NULL); ok(hres == E_POINTER, "get_Application failed: %08x, expected E_POINTER\n", hres); + /* Name */ + hres = IWebBrowser2_get_Name(wb, &sName); + ok(hres == S_OK, "getName failed: %08x, expected S_OK\n", hres); + ok(!strcmp_wa(sName, "Microsoft Web Browser Control"), "got '%s', expected 'Microsoft Web Browser Control'\n", wine_dbgstr_w(sName)); + SysFreeString(sName); + /* Quit */ hres = IWebBrowser2_Quit(wb); diff --git a/dlls/shdocvw/webbrowser.c b/dlls/shdocvw/webbrowser.c index 1f2e149..6c3c671 100644 --- a/dlls/shdocvw/webbrowser.c +++ b/dlls/shdocvw/webbrowser.c @@ -530,9 +530,15 @@ static HRESULT WINAPI WebBrowser_GetProperty(IWebBrowser2 *iface, BSTR szPropert static HRESULT WINAPI WebBrowser_get_Name(IWebBrowser2 *iface, BSTR *Name) { + static const WCHAR sName[] = {'M','i','c','r','o','s','o','f','t',' ','W','e','b',\ + ' ','B','r','o','w','s','e','r',' ','C','o','n','t','r','o','l',0}; WebBrowser *This = WEBBROWSER_THIS(iface); - FIXME("(%p)->(%p)\n", This, Name); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, Name); + + *Name = SysAllocString(sName); + + return S_OK; } static HRESULT WINAPI WebBrowser_get_HWND(IWebBrowser2 *iface, LONG *pHWND)

1 0

Dmitry Timoshkov : kernel32: Explicitly treat the current working directory name as a unix one.
by Alexandre Julliard Dec. 4, 2009

Dec. 4, 2009

Module: wine Branch: master Commit: 2536bfd1d8ee90bf0e59706145ee0e8da6a7be7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2536bfd1d8ee90bf0e5970614… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Fri Dec 4 19:39:19 2009 +0800 kernel32: Explicitly treat the current working directory name as a unix one. --- dlls/kernel32/process.c | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 83d3f6c..08ac255 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -829,14 +829,16 @@ static void init_current_directory( CURDIR *cur_dir ) if (pwd) { - WCHAR *dirW; - int lenW = MultiByteToWideChar( CP_UNIXCP, 0, pwd, -1, NULL, 0 ); - if ((dirW = HeapAlloc( GetProcessHeap(), 0, lenW * sizeof(WCHAR) ))) + ANSI_STRING unix_name; + UNICODE_STRING nt_name; + RtlInitAnsiString( &unix_name, pwd ); + if (!wine_unix_to_nt_file_name( &unix_name, &nt_name )) { - MultiByteToWideChar( CP_UNIXCP, 0, pwd, -1, dirW, lenW ); - RtlInitUnicodeString( &dir_str, dirW ); - RtlSetCurrentDirectory_U( &dir_str ); - RtlFreeUnicodeString( &dir_str ); + UNICODE_STRING dos_path; + /* skip the \??\ prefix, nt_name is 0 terminated */ + RtlInitUnicodeString( &dos_path, nt_name.Buffer + 4 ); + RtlSetCurrentDirectory_U( &dos_path ); + RtlFreeUnicodeString( &nt_name ); } }

1 0

Hans Leidekker : wininet: Add a test for status callbacks on ftp connections.
by Alexandre Julliard Dec. 4, 2009

Dec. 4, 2009

Module: wine Branch: master Commit: e018a5e25b653e49b6b9c8703a8b5a117c9058bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=e018a5e25b653e49b6b9c8703… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 4 13:26:00 2009 +0100 wininet: Add a test for status callbacks on ftp connections. --- dlls/wininet/tests/ftp.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 48 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/tests/ftp.c b/dlls/wininet/tests/ftp.c index d19b9a8..37c71da 100644 --- a/dlls/wininet/tests/ftp.c +++ b/dlls/wininet/tests/ftp.c @@ -42,6 +42,7 @@ static BOOL (WINAPI *pFtpCommandA)(HINTERNET,BOOL,DWORD,LPCSTR,DWORD_PTR,HINTERNET*); +static INTERNET_STATUS_CALLBACK (WINAPI *pInternetSetStatusCallbackA)(HINTERNET,INTERNET_STATUS_CALLBACK); static void test_getfile_no_open(void) @@ -908,6 +909,51 @@ static void test_get_current_dir(HINTERNET hFtp, HINTERNET hConnect) ok ( GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got: %d\n", GetLastError()); } +static void WINAPI status_callback(HINTERNET handle, DWORD_PTR ctx, DWORD status, LPVOID info, DWORD info_len) +{ + switch (status) + { + case INTERNET_STATUS_RESOLVING_NAME: + case INTERNET_STATUS_NAME_RESOLVED: + case INTERNET_STATUS_CONNECTING_TO_SERVER: + case INTERNET_STATUS_CONNECTED_TO_SERVER: + trace("%p %lx %u %s %u\n", handle, ctx, status, (char *)info, info_len); + break; + default: + break; + } +} + +static void test_status_callbacks(HINTERNET hInternet) +{ + INTERNET_STATUS_CALLBACK cb; + HINTERNET hFtp; + BOOL ret; + + if (!pInternetSetStatusCallbackA) + { + win_skip("InternetSetStatusCallbackA() is not available, skipping test\n"); + return; + } + + cb = pInternetSetStatusCallbackA(hInternet, status_callback); + ok(cb == NULL, "expected NULL got %p\n", cb); + + hFtp = InternetConnect(hInternet, "ftp.winehq.org", INTERNET_DEFAULT_FTP_PORT, "anonymous", NULL, + INTERNET_SERVICE_FTP, INTERNET_FLAG_PASSIVE, 1); + if (!hFtp) + { + skip("No ftp connection could be made to ftp.winehq.org %u\n", GetLastError()); + return; + } + + ret = InternetCloseHandle(hFtp); + ok(ret, "InternetCloseHandle failed %u\n", GetLastError()); + + cb = pInternetSetStatusCallbackA(hInternet, NULL); + ok(cb == status_callback, "expected check_status got %p\n", cb); +} + START_TEST(ftp) { HMODULE hWininet; @@ -915,6 +961,7 @@ START_TEST(ftp) hWininet = GetModuleHandleA("wininet.dll"); pFtpCommandA = (void*)GetProcAddress(hWininet, "FtpCommandA"); + pInternetSetStatusCallbackA = (void*)GetProcAddress(hWininet, "InternetSetStatusCallbackA"); SetLastError(0xdeadbeef); hInternet = InternetOpen("winetest", 0, NULL, NULL, 0); @@ -956,6 +1003,7 @@ START_TEST(ftp) test_command(hFtp, hHttp); test_find_first_file(hFtp, hHttp); test_get_current_dir(hFtp, hHttp); + test_status_callbacks(hInternet); InternetCloseHandle(hHttp); InternetCloseHandle(hFtp);

1 0

Hans Leidekker : wininet: Fix some status callbacks to return a string instead of a sockaddr structure .
by Alexandre Julliard Dec. 4, 2009

Dec. 4, 2009

Module: wine Branch: master Commit: 5f082498319ce279c7b5dfc381a2808dd76066fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f082498319ce279c7b5dfc38… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 4 13:25:14 2009 +0100 wininet: Fix some status callbacks to return a string instead of a sockaddr structure. Spotted by Juan Lang. --- dlls/wininet/ftp.c | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 1736ad5..6c9765f 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -43,6 +43,9 @@ #ifdef HAVE_SYS_SOCKET_H # include <sys/socket.h> #endif +#ifdef HAVE_ARPA_INET_H +# include <arpa/inet.h> +#endif #ifdef HAVE_UNISTD_H # include <unistd.h> #endif @@ -2440,6 +2443,7 @@ HINTERNET FTP_Connect(appinfo_t *hIC, LPCWSTR lpszServerName, BOOL bSuccess = FALSE; ftp_session_t *lpwfs = NULL; HINTERNET handle = NULL; + char szaddr[INET_ADDRSTRLEN]; TRACE("%p Server(%s) Port(%d) User(%s) Paswd(%s)\n", hIC, debugstr_w(lpszServerName), @@ -2544,15 +2548,17 @@ HINTERNET FTP_Connect(appinfo_t *hIC, LPCWSTR lpszServerName, goto lerror; } - SendAsyncCallback(&hIC->hdr, dwContext, INTERNET_STATUS_NAME_RESOLVED, - (LPWSTR) lpszServerName, strlenW(lpszServerName)); - if (socketAddr.sin_family != AF_INET) { WARN("unsupported address family %d\n", socketAddr.sin_family); INTERNET_SetLastError(ERROR_INTERNET_CANNOT_CONNECT); goto lerror; } + + inet_ntop(socketAddr.sin_family, &socketAddr.sin_addr, szaddr, sizeof(szaddr)); + SendAsyncCallback(&hIC->hdr, dwContext, INTERNET_STATUS_NAME_RESOLVED, + szaddr, strlen(szaddr)+1); + nsocket = socket(AF_INET,SOCK_STREAM,0); if (nsocket == -1) { @@ -2561,7 +2567,7 @@ HINTERNET FTP_Connect(appinfo_t *hIC, LPCWSTR lpszServerName, } SendAsyncCallback(&hIC->hdr, dwContext, INTERNET_STATUS_CONNECTING_TO_SERVER, - &socketAddr, sock_namelen); + szaddr, strlen(szaddr)+1); if (connect(nsocket, (struct sockaddr *)&socketAddr, sock_namelen) < 0) { @@ -2574,7 +2580,7 @@ HINTERNET FTP_Connect(appinfo_t *hIC, LPCWSTR lpszServerName, TRACE("Connected to server\n"); lpwfs->sndSocket = nsocket; SendAsyncCallback(&hIC->hdr, dwContext, INTERNET_STATUS_CONNECTED_TO_SERVER, - &socketAddr, sock_namelen); + szaddr, strlen(szaddr)+1); sock_namelen = sizeof(lpwfs->socketAddress); getsockname(nsocket, (struct sockaddr *) &lpwfs->socketAddress, &sock_namelen);

1 0

Henri Verbeet : dxgi: Implement IDXGIAdapter::GetDesc().
by Alexandre Julliard Dec. 4, 2009

Dec. 4, 2009

Module: wine Branch: master Commit: 0491fcce303a3bd7c88e4c625181d8a65c1ea2f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0491fcce303a3bd7c88e4c625… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Dec 4 11:50:49 2009 +0100 dxgi: Implement IDXGIAdapter::GetDesc(). --- dlls/dxgi/adapter.c | 46 ++++++++++++++++++++++++++++++++++++++++++---- dlls/dxgi/dxgi_main.c | 2 +- dlls/dxgi/dxgi_private.h | 5 +++-- dlls/wined3d/directx.c | 1 + include/wine/wined3d.idl | 1 + 5 files changed, 48 insertions(+), 7 deletions(-) diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index d13e3e1..7046d7c 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -104,7 +104,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetParent(IWineDXGIAdapter *iface, TRACE("iface %p, riid %s, parent %p\n", iface, debugstr_guid(riid), parent); - return IDXGIFactory_QueryInterface(This->parent, riid, parent); + return IWineDXGIFactory_QueryInterface(This->parent, riid, parent); } /* IDXGIAdapter methods */ @@ -132,9 +132,47 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_EnumOutputs(IWineDXGIAdapter *ifac static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetDesc(IWineDXGIAdapter *iface, DXGI_ADAPTER_DESC *desc) { - FIXME("iface %p, desc %p stub!\n", iface, desc); + struct dxgi_adapter *This = (struct dxgi_adapter *)iface; + WINED3DADAPTER_IDENTIFIER adapter_id; + char description[128]; + IWineD3D *wined3d; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, desc %p.\n", iface, desc); + + if (!desc) return E_INVALIDARG; + + wined3d = IWineDXGIFactory_get_wined3d(This->parent); + adapter_id.driver_size = 0; + adapter_id.description = description; + adapter_id.description_size = sizeof(description); + adapter_id.device_name_size = 0; + + EnterCriticalSection(&dxgi_cs); + hr = IWineD3D_GetAdapterIdentifier(wined3d, This->ordinal, 0, &adapter_id); + IWineD3D_Release(wined3d); + LeaveCriticalSection(&dxgi_cs); + + if (SUCCEEDED(hr)) + { + if (!MultiByteToWideChar(CP_ACP, 0, description, -1, desc->Description, 128)) + { + DWORD err = GetLastError(); + ERR("Failed to translate description %s (%#x).\n", debugstr_a(description), err); + hr = E_FAIL; + } + + desc->VendorId = adapter_id.vendor_id; + desc->DeviceId = adapter_id.device_id; + desc->SubSysId = adapter_id.subsystem_id; + desc->Revision = adapter_id.revision; + desc->DedicatedVideoMemory = adapter_id.video_memory; + desc->DedicatedSystemMemory = 0; /* FIXME */ + desc->SharedSystemMemory = 0; /* FIXME */ + memcpy(&desc->AdapterLuid, &adapter_id.adapter_luid, sizeof(desc->AdapterLuid)); + } + + return hr; } static HRESULT STDMETHODCALLTYPE dxgi_adapter_CheckInterfaceSupport(IWineDXGIAdapter *iface, @@ -175,7 +213,7 @@ static const struct IWineDXGIAdapterVtbl dxgi_adapter_vtbl = dxgi_adapter_get_ordinal, }; -HRESULT dxgi_adapter_init(struct dxgi_adapter *adapter, IDXGIFactory *parent, UINT ordinal) +HRESULT dxgi_adapter_init(struct dxgi_adapter *adapter, IWineDXGIFactory *parent, UINT ordinal) { struct dxgi_output *output; diff --git a/dlls/dxgi/dxgi_main.c b/dlls/dxgi/dxgi_main.c index 3b153ab..489f986 100644 --- a/dlls/dxgi/dxgi_main.c +++ b/dlls/dxgi/dxgi_main.c @@ -129,7 +129,7 @@ HRESULT WINAPI CreateDXGIFactory(REFIID riid, void **factory) goto fail; } - hr = dxgi_adapter_init(adapter, (IDXGIFactory *)object, i); + hr = dxgi_adapter_init(adapter, (IWineDXGIFactory *)object, i); if (FAILED(hr)) { UINT j; diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 2929534..033168b 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -26,6 +26,7 @@ #include "wingdi.h" #include "winuser.h" #include "objbase.h" +#include "winnls.h" #include "dxgi.h" #ifdef DXGI_INIT_GUID @@ -111,13 +112,13 @@ void dxgi_output_init(struct dxgi_output *output, struct dxgi_adapter *adapter) struct dxgi_adapter { const struct IWineDXGIAdapterVtbl *vtbl; - IDXGIFactory *parent; + IWineDXGIFactory *parent; LONG refcount; UINT ordinal; IDXGIOutput *output; }; -HRESULT dxgi_adapter_init(struct dxgi_adapter *adapter, IDXGIFactory *parent, UINT ordinal) DECLSPEC_HIDDEN; +HRESULT dxgi_adapter_init(struct dxgi_adapter *adapter, IWineDXGIFactory *parent, UINT ordinal) DECLSPEC_HIDDEN; /* IDXGISwapChain */ extern const struct IDXGISwapChainVtbl dxgi_swapchain_vtbl DECLSPEC_HIDDEN; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 5e00438..60db4a4 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2425,6 +2425,7 @@ static HRESULT WINAPI IWineD3DImpl_GetAdapterIdentifier(IWineD3D *iface, UINT Ad memcpy(&pIdentifier->device_identifier, &IID_D3DDEVICE_D3DUID, sizeof(pIdentifier->device_identifier)); pIdentifier->whql_level = (Flags & WINED3DENUM_NO_WHQL_LEVEL) ? 0 : 1; memcpy(&pIdentifier->adapter_luid, &adapter->luid, sizeof(pIdentifier->adapter_luid)); + pIdentifier->video_memory = adapter->TextureRam; return WINED3D_OK; } diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index da21af8..8bcc2a8 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -1706,6 +1706,7 @@ typedef struct _WINED3DADAPTER_IDENTIFIER GUID device_identifier; DWORD whql_level; LUID adapter_luid; + SIZE_T video_memory; } WINED3DADAPTER_IDENTIFIER; typedef struct _WINED3DPRESENT_PARAMETERS

1 0

Owen Rudge : imagehlp: Implement ImageAddCertificate.
by Alexandre Julliard Dec. 4, 2009

Dec. 4, 2009

Module: wine Branch: master Commit: 1f6d24565cc3a4ea75747bc8c836a884253602aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f6d24565cc3a4ea75747bc8c… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Thu Dec 3 13:51:02 2009 -0600 imagehlp: Implement ImageAddCertificate. --- dlls/imagehlp/integrity.c | 166 +++++++++++++++++++++++++++++++++++++- dlls/imagehlp/tests/integrity.c | 10 +- 2 files changed, 166 insertions(+), 10 deletions(-) diff --git a/dlls/imagehlp/integrity.c b/dlls/imagehlp/integrity.c index a46c853..6a13c53 100644 --- a/dlls/imagehlp/integrity.c +++ b/dlls/imagehlp/integrity.c @@ -167,6 +167,67 @@ static BOOL IMAGEHLP_GetSecurityDirOffset( HANDLE handle, } /*********************************************************************** + * IMAGEHLP_SetSecurityDirOffset (INTERNAL) + * + * Read a file's PE header, and update the offset and size of the + * security directory. + */ +static BOOL IMAGEHLP_SetSecurityDirOffset(HANDLE handle, + DWORD dwOfs, DWORD dwSize) +{ + IMAGE_NT_HEADERS32 nt_hdr32; + IMAGE_NT_HEADERS64 nt_hdr64; + IMAGE_DATA_DIRECTORY *sd; + int ret, nt_hdr_size = 0; + DWORD pe_offset; + void *nt_hdr; + DWORD count; + BOOL r; + + ret = IMAGEHLP_GetNTHeaders(handle, &pe_offset, &nt_hdr32, &nt_hdr64); + + if (ret == HDR_NT32) + { + sd = &nt_hdr32.OptionalHeader.DataDirectory[IMAGE_FILE_SECURITY_DIRECTORY]; + + nt_hdr = &nt_hdr32; + nt_hdr_size = sizeof(IMAGE_NT_HEADERS32); + } + else if (ret == HDR_NT64) + { + sd = &nt_hdr64.OptionalHeader.DataDirectory[IMAGE_FILE_SECURITY_DIRECTORY]; + + nt_hdr = &nt_hdr64; + nt_hdr_size = sizeof(IMAGE_NT_HEADERS64); + } + else + return FALSE; + + sd->Size = dwSize; + sd->VirtualAddress = dwOfs; + + TRACE("size = %x addr = %x\n", sd->Size, sd->VirtualAddress); + + /* write the header back again */ + count = SetFilePointer(handle, pe_offset, NULL, FILE_BEGIN); + + if (count == INVALID_SET_FILE_POINTER) + return FALSE; + + count = 0; + + r = WriteFile(handle, nt_hdr, nt_hdr_size, &count, NULL); + + if (!r) + return FALSE; + + if (count != nt_hdr_size) + return FALSE; + + return TRUE; +} + +/*********************************************************************** * IMAGEHLP_GetCertificateOffset (INTERNAL) * * Read a file's PE header, and return the offset and size of the @@ -227,16 +288,111 @@ static BOOL IMAGEHLP_GetCertificateOffset( HANDLE handle, DWORD num, /*********************************************************************** * ImageAddCertificate (IMAGEHLP.@) + * + * Adds the specified certificate to the security directory of + * open PE file. */ BOOL WINAPI ImageAddCertificate( HANDLE FileHandle, LPWIN_CERTIFICATE Certificate, PDWORD Index) { - FIXME("(%p, %p, %p): stub\n", - FileHandle, Certificate, Index - ); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + DWORD size = 0, count = 0, offset = 0, sd_VirtualAddr = 0, index = 0; + WIN_CERTIFICATE hdr; + const size_t cert_hdr_size = sizeof hdr - sizeof hdr.bCertificate; + BOOL r; + + TRACE("(%p, %p, %p)\n", FileHandle, Certificate, Index); + + r = IMAGEHLP_GetSecurityDirOffset(FileHandle, &sd_VirtualAddr, &size); + + /* If we've already got a security directory, find the end of it */ + if ((r) && (sd_VirtualAddr != 0)) + { + offset = 0; + index = 0; + count = 0; + + /* Check if the security directory is at the end of the file. + If not, we should probably relocate it. */ + if (GetFileSize(FileHandle, NULL) != sd_VirtualAddr + size) + { + FIXME("Security directory already present but not located at EOF, not adding certificate\n"); + + SetLastError(ERROR_NOT_SUPPORTED); + return FALSE; + } + + while (offset < size) + { + /* read the length of the current certificate */ + count = SetFilePointer (FileHandle, sd_VirtualAddr + offset, + NULL, FILE_BEGIN); + + if (count == INVALID_SET_FILE_POINTER) + return FALSE; + + r = ReadFile(FileHandle, &hdr, cert_hdr_size, &count, NULL); + + if (!r) + return FALSE; + + if (count != cert_hdr_size) + return FALSE; + + /* check the certificate is not too big or too small */ + if (hdr.dwLength < cert_hdr_size) + return FALSE; + + if (hdr.dwLength > (size-offset)) + return FALSE; + + /* next certificate */ + offset += hdr.dwLength; + + /* padded out to the nearest 8-byte boundary */ + if (hdr.dwLength % 8) + offset += 8 - (hdr.dwLength % 8); + + index++; + } + + count = SetFilePointer (FileHandle, sd_VirtualAddr + offset, NULL, FILE_BEGIN); + + if (count == INVALID_SET_FILE_POINTER) + return FALSE; + } + else + { + sd_VirtualAddr = SetFilePointer(FileHandle, 0, NULL, FILE_END); + + if (sd_VirtualAddr == INVALID_SET_FILE_POINTER) + return FALSE; + } + + /* Write the certificate to the file */ + r = WriteFile(FileHandle, Certificate, Certificate->dwLength, &count, NULL); + + if (!r) + return FALSE; + + /* Pad out if necessary */ + if (Certificate->dwLength % 8) + { + char null[8]; + + ZeroMemory(null, 8); + WriteFile(FileHandle, null, 8 - (Certificate->dwLength % 8), NULL, NULL); + + size += 8 - (Certificate->dwLength % 8); + } + + size += Certificate->dwLength; + + /* Update the security directory offset and size */ + if (!IMAGEHLP_SetSecurityDirOffset(FileHandle, sd_VirtualAddr, size)) + return FALSE; + + return TRUE; } /*********************************************************************** diff --git a/dlls/imagehlp/tests/integrity.c b/dlls/imagehlp/tests/integrity.c index 01fd4e9..e89167c 100644 --- a/dlls/imagehlp/tests/integrity.c +++ b/dlls/imagehlp/tests/integrity.c @@ -146,7 +146,7 @@ static void test_add_certificate(void) cert->wCertificateType = WIN_CERT_TYPE_PKCS_SIGNED_DATA; CopyMemory(cert->bCertificate, test_cert_data, sizeof(test_cert_data)); - todo_wine ok(pImageAddCertificate(hFile, cert, &index), "Unable to add certificate to image, error %x\n", GetLastError()); + ok(pImageAddCertificate(hFile, cert, &index), "Unable to add certificate to image, error %x\n", GetLastError()); HeapFree(GetProcessHeap(), 0, cert); CloseHandle(hFile); @@ -170,7 +170,7 @@ static void test_get_certificate(void) ret = pImageGetCertificateData(hFile, 0, NULL, &cert_len); err = GetLastError(); - todo_wine ok ((ret == FALSE) && (err == ERROR_INSUFFICIENT_BUFFER), "ImageGetCertificateData gave unexpected result; ret=%d / err=%x\n", ret, err); + ok ((ret == FALSE) && (err == ERROR_INSUFFICIENT_BUFFER), "ImageGetCertificateData gave unexpected result; ret=%d / err=%x\n", ret, err); cert = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, cert_len); @@ -181,8 +181,8 @@ static void test_get_certificate(void) return; } - todo_wine ok(ret = pImageGetCertificateData(hFile, 0, cert, &cert_len), "Unable to retrieve certificate; err=%x\n", GetLastError()); - todo_wine ok(memcmp(cert->bCertificate, test_cert_data, cert_len - sizeof(WIN_CERTIFICATE)) == 0, "Certificate retrieved did not match original\n"); + ok(ret = pImageGetCertificateData(hFile, 0, cert, &cert_len), "Unable to retrieve certificate; err=%x\n", GetLastError()); + ok(memcmp(cert->bCertificate, test_cert_data, cert_len - sizeof(WIN_CERTIFICATE)) == 0, "Certificate retrieved did not match original\n"); HeapFree(GetProcessHeap(), 0, cert); CloseHandle(hFile); @@ -204,7 +204,7 @@ static void test_remove_certificate(void) todo_wine ok (pImageRemoveCertificate(hFile, 0), "Unable to remove certificate from file; err=%x\n", GetLastError()); /* Test to see if the certificate has actually been removed */ - ok(pImageGetCertificateHeader(hFile, 0, &cert) == FALSE, "Certificate header retrieval succeeded when it should have failed\n"); + todo_wine ok(pImageGetCertificateHeader(hFile, 0, &cert) == FALSE, "Certificate header retrieval succeeded when it should have failed\n"); CloseHandle(hFile); }

1 0