wine-commits February 2017

wine-commits@winehq.org

2 participants
838 discussions

Matteo Bruni : d3dx10: Make use of data_size when tracing data string.
by Alexandre Julliard 08 Feb '17

08 Feb '17

Module: wine Branch: master Commit: 5bcdee38c0392c09140a05f3834399571d6b802e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bcdee38c0392c09140a05f38… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Feb 7 22:08:43 2017 +0100 d3dx10: Make use of data_size when tracing data string. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/async.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx10_43/async.c b/dlls/d3dx10_43/async.c index fb988a4..c638904 100644 --- a/dlls/d3dx10_43/async.c +++ b/dlls/d3dx10_43/async.c @@ -226,8 +226,9 @@ HRESULT WINAPI D3DX10CompileFromMemory(const char *data, SIZE_T data_size, const { TRACE("data %s, data_size %lu, filename %s, defines %p, include %p, entry_point %s, target %s, " "sflags %#x, eflags %#x, pump %p, shader %p, error_messages %p, hresult %p.\n", - debugstr_a(data), data_size, debugstr_a(filename), defines, include, debugstr_a(entry_point), - debugstr_a(target), sflags, eflags, pump, shader, error_messages, hresult); + debugstr_an(data, data_size), data_size, debugstr_a(filename), defines, include, + debugstr_a(entry_point), debugstr_a(target), sflags, eflags, pump, shader, + error_messages, hresult); if (pump) FIXME("Unimplemented ID3DX10ThreadPump handling.\n");

1 0

Matteo Bruni : ddraw/tests: Fix IDirect3DDevice typo.
by Alexandre Julliard 08 Feb '17

08 Feb '17

Module: wine Branch: master Commit: a65f16bf64faadc738b004d08a67de229d8f34b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a65f16bf64faadc738b004d08… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Feb 7 22:08:42 2017 +0100 ddraw/tests: Fix IDirect3DDevice typo. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index c408024..278b9c6 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -8295,11 +8295,11 @@ static void test_shademode(void) hr = IDirect3DExecuteBuffer_Unlock(execute_buffer); ok(SUCCEEDED(hr), "Failed to unlock execute buffer, hr %#x.\n", hr); - hr = IDirect3DDevice2_BeginScene(device); + hr = IDirect3DDevice_BeginScene(device); set_execute_data(execute_buffer, 4, sizeof(quad_strip), inst_length); hr = IDirect3DDevice_Execute(device, execute_buffer, viewport, D3DEXECUTE_CLIPPED); ok(SUCCEEDED(hr), "Failed to execute exec buffer, hr %#x.\n", hr); - hr = IDirect3DDevice2_EndScene(device); + hr = IDirect3DDevice_EndScene(device); ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); color0 = get_surface_color(rt, 100, 100); /* Inside first triangle */

1 0

Matteo Bruni : wined3d: Don't query aux buffers count on core profile.
by Alexandre Julliard 08 Feb '17

08 Feb '17

Module: wine Branch: master Commit: e99937ef51fa31b44abba050acf168a83e7d88d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e99937ef51fa31b44abba050a… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Feb 7 22:08:40 2017 +0100 wined3d: Don't query aux buffers count on core profile. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index e8cc3fc..61c9367 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1908,7 +1908,8 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, } } - gl_info->gl_ops.gl.p_glGetIntegerv(GL_AUX_BUFFERS, &ret->aux_buffers); + if (gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) + gl_info->gl_ops.gl.p_glGetIntegerv(GL_AUX_BUFFERS, &ret->aux_buffers); TRACE("Setting up the screen\n");

1 0

Francois Gouget : inetcomm/tests: A spelling fix in an ok() message.
by Alexandre Julliard 08 Feb '17

08 Feb '17

Module: wine Branch: master Commit: 6b2dbe6cf6e30d9833f32d2c933be9175cc3eba1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b2dbe6cf6e30d9833f32d2c9… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Feb 8 12:09:51 2017 +0100 inetcomm/tests: A spelling fix in an ok() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/tests/mimeole.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index 5701af6..c2026bc 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -1579,7 +1579,7 @@ static void test_mhtml_protocol(void) hres = IClassFactory_CreateInstance(class_factory, &outer, &IID_IUnknown, (void**)&unk); ok(hres == S_OK, "CreateInstance returned: %08x\n", hres); hres = IUnknown_QueryInterface(unk, &IID_IInternetProtocol, (void**)&unk2); - ok(hres == S_OK, "Coult not get IInternetProtocol iface: %08x\n", hres); + ok(hres == S_OK, "Could not get IInternetProtocol iface: %08x\n", hres); IUnknown_Release(unk2); IUnknown_Release(unk);

1 0

Francois Gouget : include: Add a couple of INTERNET_SCHEME_XXX constants.
by Alexandre Julliard 08 Feb '17

08 Feb '17

Module: wine Branch: master Commit: b436a15a87e2652062f7aa6f35ec499f64abfbbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b436a15a87e2652062f7aa6f3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 8 12:10:20 2017 +0100 include: Add a couple of INTERNET_SCHEME_XXX constants. Also add comments noting that it is not a mistake for the wininet.h constants to be incompatible with the winhttp.h ones. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winhttp.h | 3 +++ include/wininet.h | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/include/winhttp.h b/include/winhttp.h index 3d87280..52c60e4 100644 --- a/include/winhttp.h +++ b/include/winhttp.h @@ -38,8 +38,11 @@ typedef HINTERNET *LPHINTERNET; typedef WORD INTERNET_PORT; typedef INTERNET_PORT *LPINTERNET_PORT; +/* Yes, these values contradict wininet.h */ #define INTERNET_SCHEME_HTTP 1 #define INTERNET_SCHEME_HTTPS 2 +#define INTERNET_SCHEME_FTP 3 +#define INTERNET_SCHEME_SOCKS 4 typedef int INTERNET_SCHEME, *LPINTERNET_SCHEME; #define ICU_ESCAPE 0x80000000 diff --git a/include/wininet.h b/include/wininet.h index 9e0fb40..39a6646 100644 --- a/include/wininet.h +++ b/include/wininet.h @@ -136,14 +136,14 @@ typedef enum { INTERNET_SCHEME_PARTIAL = -2, INTERNET_SCHEME_UNKNOWN = -1, INTERNET_SCHEME_DEFAULT = 0, - INTERNET_SCHEME_FTP, + INTERNET_SCHEME_FTP, /* yes, this contradicts winhttp.h */ INTERNET_SCHEME_GOPHER, - INTERNET_SCHEME_HTTP, - INTERNET_SCHEME_HTTPS, + INTERNET_SCHEME_HTTP, /* yes, this contradicts winhttp.h */ + INTERNET_SCHEME_HTTPS, /* yes, this contradicts winhttp.h */ INTERNET_SCHEME_FILE, INTERNET_SCHEME_NEWS, INTERNET_SCHEME_MAILTO, - INTERNET_SCHEME_SOCKS, + INTERNET_SCHEME_SOCKS, /* yes, this contradicts winhttp.h */ INTERNET_SCHEME_JAVASCRIPT, INTERNET_SCHEME_VBSCRIPT, INTERNET_SCHEME_RES,

1 0

Francois Gouget : include: Add prototypes for IStream_{Reset, Size}().
by Alexandre Julliard 08 Feb '17

08 Feb '17

Module: wine Branch: master Commit: abf2be0ab874a2bb07e2bcfad016b93fe72c02bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=abf2be0ab874a2bb07e2bcfad… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Feb 8 12:13:46 2017 +0100 include: Add prototypes for IStream_{Reset,Size}(). Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/shlwapi.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/shlwapi.h b/include/shlwapi.h index 4c91c1c..2c68b7f 100644 --- a/include/shlwapi.h +++ b/include/shlwapi.h @@ -984,6 +984,9 @@ HRESULT WINAPI SHCreateStreamWrapper(LPBYTE,DWORD,DWORD,struct IStream**); #endif /* NO_SHLWAPI_STREAM */ +HRESULT WINAPI IStream_Reset(IStream*); +HRESULT WINAPI IStream_Size(IStream*,ULARGE_INTEGER*); + /* SHAutoComplete flags */ #define SHACF_DEFAULT 0x00000000 #define SHACF_FILESYSTEM 0x00000001

1 0

Francois Gouget : winetest: Flush the report file to disk between each test.
by Alexandre Julliard 08 Feb '17

08 Feb '17

Module: wine Branch: master Commit: 7bc46c15ef4ebbc71609588142ccdce11cb6762a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bc46c15ef4ebbc7160958814… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 8 14:12:07 2017 +0100 winetest: Flush the report file to disk between each test. Should Windows crash, this makes it easier to know which test is responsible. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winetest/main.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 1eb49b6..48b71c5 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -626,6 +626,10 @@ run_ex (char *cmd, HANDLE out_file, const char *tempdir, DWORD ms) PROCESS_INFORMATION pi; DWORD wait, status; + /* Flush to disk so we know which test caused Windows to crash if it does */ + if (out_file) + FlushFileBuffers(out_file); + GetStartupInfoA (&si); si.dwFlags = STARTF_USESTDHANDLES; si.hStdInput = GetStdHandle( STD_INPUT_HANDLE );

1 0

Alistair Leslie-Hughes : dpnet/tests: Don't hardcode paths.
by Alexandre Julliard 08 Feb '17

08 Feb '17

Module: wine Branch: master Commit: d9610706e527dbc470af7696f41c8d2b31870204 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9610706e527dbc470af7696f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Feb 7 21:27:32 2017 +0000 dpnet/tests: Don't hardcode paths. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpnet/tests/address.c | 12 +++++++++--- dlls/dpnet/tests/client.c | 12 +++++++++--- dlls/dpnet/tests/server.c | 32 +++++++++++++++++++++----------- 3 files changed, 39 insertions(+), 17 deletions(-) diff --git a/dlls/dpnet/tests/address.c b/dlls/dpnet/tests/address.c index 4aed626..a1dcdef 100644 --- a/dlls/dpnet/tests/address.c +++ b/dlls/dpnet/tests/address.c @@ -358,10 +358,16 @@ static void address_duplicate(void) START_TEST(address) { HRESULT hr; + char path[MAX_PATH]; - if (!winetest_interactive && - (is_stub_dll("c:\\windows\\system32\\dpnet.dll") || - is_stub_dll("c:\\windows\\syswow64\\dpnet.dll"))) + if(!GetSystemDirectoryA(path, MAX_PATH)) + { + skip("Failed to get systems directory\n"); + return; + } + strcat(path, "\\dpnet.dll"); + + if (!winetest_interactive && is_stub_dll(path)) { win_skip("dpnet is a stub dll, skipping tests\n"); return; diff --git a/dlls/dpnet/tests/client.c b/dlls/dpnet/tests/client.c index d2edcbe..bbd77fe 100644 --- a/dlls/dpnet/tests/client.c +++ b/dlls/dpnet/tests/client.c @@ -613,10 +613,16 @@ static void test_cleanup_dp_peer(void) START_TEST(client) { BOOL firewall_enabled; + char path[MAX_PATH]; - if (!winetest_interactive && - (is_stub_dll("c:\\windows\\system32\\dpnet.dll") || - is_stub_dll("c:\\windows\\syswow64\\dpnet.dll"))) + if(!GetSystemDirectoryA(path, MAX_PATH)) + { + skip("Failed to get systems directory\n"); + return; + } + strcat(path, "\\dpnet.dll"); + + if (!winetest_interactive && is_stub_dll(path)) { win_skip("dpnet is a stub dll, skipping tests\n"); return; diff --git a/dlls/dpnet/tests/server.c b/dlls/dpnet/tests/server.c index 2f52c58..422e6d6 100644 --- a/dlls/dpnet/tests/server.c +++ b/dlls/dpnet/tests/server.c @@ -236,11 +236,8 @@ done: HRESULT set_firewall( enum firewall_op op ) { static const WCHAR dpnsvrW[] = - {'c',':','\\','w','i','n','d','o','w','s','\\','s','y','s','t','e','m','3','2','\\', - 'd','p','n','s','v','r','.','e','x','e',0}; - static const WCHAR dpnsvr_wow64W[] = - {'c',':','\\','w','i','n','d','o','w','s','\\','s','y','s','w','o','w','6','4','\\', - 'd','p','n','s','v','r','.','e','x','e',0}; + {'d','p','n','s','v','r','.','e','x','e',0}; + static const WCHAR seperator[] = {'\\',0}; static const WCHAR clientW[] = {'d','p','n','e','t','_','c','l','i','e','n','t',0}; static const WCHAR serverW[] = @@ -252,7 +249,7 @@ HRESULT set_firewall( enum firewall_op op ) INetFwAuthorizedApplication *app = NULL; INetFwAuthorizedApplications *apps = NULL; BSTR name, image = SysAllocStringLen( NULL, MAX_PATH ); - BOOL is_wow64; + WCHAR path[MAX_PATH]; if (!GetModuleFileNameW( NULL, image, MAX_PATH )) { @@ -260,6 +257,14 @@ HRESULT set_firewall( enum firewall_op op ) return E_FAIL; } + if(!GetSystemDirectoryW(path, MAX_PATH)) + { + SysFreeString( image ); + return E_FAIL; + } + lstrcatW(path, seperator); + lstrcatW(path, dpnsvrW); + init = CoInitializeEx( 0, COINIT_APARTMENTTHREADED ); hr = CoCreateInstance( &CLSID_NetFwMgr, NULL, CLSCTX_INPROC_SERVER, &IID_INetFwMgr, @@ -307,8 +312,7 @@ HRESULT set_firewall( enum firewall_op op ) if (hr != S_OK) goto done; SysFreeString( image ); - IsWow64Process( GetCurrentProcess(), &is_wow64 ); - image = is_wow64 ? SysAllocString( dpnsvr_wow64W ) : SysAllocString( dpnsvrW ); + image = SysAllocString( path ); hr = INetFwAuthorizedApplication_put_ProcessImageFileName( app, image ); if (hr != S_OK) goto done; @@ -366,10 +370,16 @@ START_TEST(server) { HRESULT hr; BOOL firewall_enabled; + char path[MAX_PATH]; + + if(!GetSystemDirectoryA(path, MAX_PATH)) + { + skip("Failed to get systems directory\n"); + return; + } + strcat(path, "\\dpnet.dll"); - if (!winetest_interactive && - (is_stub_dll("c:\\windows\\system32\\dpnet.dll") || - is_stub_dll("c:\\windows\\syswow64\\dpnet.dll"))) + if (!winetest_interactive && is_stub_dll(path)) { win_skip("dpnet is a stub dll, skipping tests\n"); return;

1 0

Alistair Leslie-Hughes : dpnet/test: Share code between tests.
by Alexandre Julliard 08 Feb '17

08 Feb '17

Module: wine Branch: master Commit: afe438a8d013c87997b8374f3ef91447bc59c7d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=afe438a8d013c87997b8374f3… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Feb 7 21:27:20 2017 +0000 dpnet/test: Share code between tests. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpnet/tests/address.c | 28 +------- dlls/dpnet/tests/client.c | 150 +----------------------------------------- dlls/dpnet/tests/dpnet_test.h | 32 +++++++++ dlls/dpnet/tests/server.c | 16 ++--- 4 files changed, 42 insertions(+), 184 deletions(-) diff --git a/dlls/dpnet/tests/address.c b/dlls/dpnet/tests/address.c index 16ba6a7..4aed626 100644 --- a/dlls/dpnet/tests/address.c +++ b/dlls/dpnet/tests/address.c @@ -22,6 +22,8 @@ #include <dplay8.h> #include "wine/test.h" +#include "dpnet_test.h" + /* {6733C6E8-A0D6-450E-8C18-CEACF331DC27} */ static const GUID IID_Random = {0x6733c6e8, 0xa0d6, 0x450e, { 0x8c, 0x18, 0xce, 0xac, 0xf3, 0x31, 0xdc, 0x27 } }; static const WCHAR localhost[] = {'l','o','c','a','l','h','o','s','t',0}; @@ -353,32 +355,6 @@ static void address_duplicate(void) } } -/* taken from programs/winetest/main.c */ -static BOOL is_stub_dll(const char *filename) -{ - DWORD size, ver; - BOOL isstub = FALSE; - char *p, *data; - - size = GetFileVersionInfoSizeA(filename, &ver); - if (!size) return FALSE; - - data = HeapAlloc(GetProcessHeap(), 0, size); - if (!data) return FALSE; - - if (GetFileVersionInfoA(filename, ver, size, data)) - { - char buf[256]; - - sprintf(buf, "\\StringFileInfo\\%04x%04x\\OriginalFilename", MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), 1200); - if (VerQueryValueA(data, buf, (void**)&p, &size)) - isstub = !lstrcmpiA("wcodstub.dll", p); - } - HeapFree(GetProcessHeap(), 0, data); - - return isstub; -} - START_TEST(address) { HRESULT hr; diff --git a/dlls/dpnet/tests/client.c b/dlls/dpnet/tests/client.c index a1817a4..d2edcbe 100644 --- a/dlls/dpnet/tests/client.c +++ b/dlls/dpnet/tests/client.c @@ -24,9 +24,10 @@ #include <dplobby8.h> #include <winver.h> #define COBJMACROS -#include <netfw.h> #include "wine/test.h" +#include "dpnet_test.h" + static IDirectPlay8Peer* peer = NULL; static IDirectPlay8Client* client = NULL; static IDirectPlay8LobbiedApplication* lobbied = NULL; @@ -609,153 +610,6 @@ static void test_cleanup_dp_peer(void) CoUninitialize(); } -static BOOL is_process_elevated(void) -{ - HANDLE token; - if (OpenProcessToken( GetCurrentProcess(), TOKEN_QUERY, &token )) - { - TOKEN_ELEVATION_TYPE type; - DWORD size; - BOOL ret; - - ret = GetTokenInformation( token, TokenElevationType, &type, sizeof(type), &size ); - CloseHandle( token ); - return (ret && type == TokenElevationTypeFull); - } - return FALSE; -} - -static BOOL is_firewall_enabled(void) -{ - HRESULT hr, init; - INetFwMgr *mgr = NULL; - INetFwPolicy *policy = NULL; - INetFwProfile *profile = NULL; - VARIANT_BOOL enabled = VARIANT_FALSE; - - init = CoInitializeEx( 0, COINIT_APARTMENTTHREADED ); - - hr = CoCreateInstance( &CLSID_NetFwMgr, NULL, CLSCTX_INPROC_SERVER, &IID_INetFwMgr, - (void **)&mgr ); - ok( hr == S_OK, "got %08x\n", hr ); - if (hr != S_OK) goto done; - - hr = INetFwMgr_get_LocalPolicy( mgr, &policy ); - ok( hr == S_OK, "got %08x\n", hr ); - if (hr != S_OK) goto done; - - hr = INetFwPolicy_get_CurrentProfile( policy, &profile ); - if (hr != S_OK) goto done; - - hr = INetFwProfile_get_FirewallEnabled( profile, &enabled ); - ok( hr == S_OK, "got %08x\n", hr ); - -done: - if (policy) INetFwPolicy_Release( policy ); - if (profile) INetFwProfile_Release( profile ); - if (mgr) INetFwMgr_Release( mgr ); - if (SUCCEEDED( init )) CoUninitialize(); - return (enabled == VARIANT_TRUE); -} - -enum firewall_op -{ - APP_ADD, - APP_REMOVE -}; - -static HRESULT set_firewall( enum firewall_op op ) -{ - static const WCHAR testW[] = {'d','p','n','e','t','_','t','e','s','t',0}; - HRESULT hr, init; - INetFwMgr *mgr = NULL; - INetFwPolicy *policy = NULL; - INetFwProfile *profile = NULL; - INetFwAuthorizedApplication *app = NULL; - INetFwAuthorizedApplications *apps = NULL; - BSTR name, image = SysAllocStringLen( NULL, MAX_PATH ); - - if (!GetModuleFileNameW( NULL, image, MAX_PATH )) - { - SysFreeString( image ); - return E_FAIL; - } - init = CoInitializeEx( 0, COINIT_APARTMENTTHREADED ); - - hr = CoCreateInstance( &CLSID_NetFwMgr, NULL, CLSCTX_INPROC_SERVER, &IID_INetFwMgr, - (void **)&mgr ); - ok( hr == S_OK, "got %08x\n", hr ); - if (hr != S_OK) goto done; - - hr = INetFwMgr_get_LocalPolicy( mgr, &policy ); - ok( hr == S_OK, "got %08x\n", hr ); - if (hr != S_OK) goto done; - - hr = INetFwPolicy_get_CurrentProfile( policy, &profile ); - if (hr != S_OK) goto done; - - INetFwProfile_get_AuthorizedApplications( profile, &apps ); - ok( hr == S_OK, "got %08x\n", hr ); - if (hr != S_OK) goto done; - - hr = CoCreateInstance( &CLSID_NetFwAuthorizedApplication, NULL, CLSCTX_INPROC_SERVER, - &IID_INetFwAuthorizedApplication, (void **)&app ); - ok( hr == S_OK, "got %08x\n", hr ); - if (hr != S_OK) goto done; - - hr = INetFwAuthorizedApplication_put_ProcessImageFileName( app, image ); - if (hr != S_OK) goto done; - - name = SysAllocString( testW ); - hr = INetFwAuthorizedApplication_put_Name( app, name ); - SysFreeString( name ); - ok( hr == S_OK, "got %08x\n", hr ); - if (hr != S_OK) goto done; - - if (op == APP_ADD) - hr = INetFwAuthorizedApplications_Add( apps, app ); - else if (op == APP_REMOVE) - hr = INetFwAuthorizedApplications_Remove( apps, image ); - else - hr = E_INVALIDARG; - -done: - if (app) INetFwAuthorizedApplication_Release( app ); - if (apps) INetFwAuthorizedApplications_Release( apps ); - if (policy) INetFwPolicy_Release( policy ); - if (profile) INetFwProfile_Release( profile ); - if (mgr) INetFwMgr_Release( mgr ); - if (SUCCEEDED( init )) CoUninitialize(); - SysFreeString( image ); - return hr; -} - -/* taken from programs/winetest/main.c */ -static BOOL is_stub_dll(const char *filename) -{ - DWORD size, ver; - BOOL isstub = FALSE; - char *p, *data; - - size = GetFileVersionInfoSizeA(filename, &ver); - if (!size) return FALSE; - - data = HeapAlloc(GetProcessHeap(), 0, size); - if (!data) return FALSE; - - if (GetFileVersionInfoA(filename, ver, size, data)) - { - char buf[256]; - - sprintf(buf, "\\StringFileInfo\\%04x%04x\\OriginalFilename", MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), 1200); - if (VerQueryValueA(data, buf, (void**)&p, &size)) - isstub = !lstrcmpiA("wcodstub.dll", p); - } - HeapFree(GetProcessHeap(), 0, data); - - return isstub; -} - START_TEST(client) { BOOL firewall_enabled; diff --git a/dlls/dpnet/tests/dpnet_test.h b/dlls/dpnet/tests/dpnet_test.h new file mode 100644 index 0000000..1de2559 --- /dev/null +++ b/dlls/dpnet/tests/dpnet_test.h @@ -0,0 +1,32 @@ +/* + * Copyright 2016 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#ifndef __DPNET_PRIVATE_H__ +#define __DPNET_PRIVATE_H__ + +enum firewall_op +{ + APP_ADD, + APP_REMOVE +}; + +extern BOOL is_firewall_enabled(void) DECLSPEC_HIDDEN; +extern BOOL is_process_elevated(void) DECLSPEC_HIDDEN; +extern HRESULT set_firewall( enum firewall_op op ) DECLSPEC_HIDDEN; +extern BOOL is_stub_dll(const char *filename) DECLSPEC_HIDDEN; + +#endif diff --git a/dlls/dpnet/tests/server.c b/dlls/dpnet/tests/server.c index bfc21b0..2f52c58 100644 --- a/dlls/dpnet/tests/server.c +++ b/dlls/dpnet/tests/server.c @@ -24,6 +24,8 @@ #include <netfw.h> #include "wine/test.h" +#include "dpnet_test.h" + /* {CD0C3D4B-E15E-4CF2-9EA8-6E1D6548C5A5} */ static const GUID appguid = { 0xcd0c3d4b, 0xe15e, 0x4cf2, { 0x9e, 0xa8, 0x6e, 0x1d, 0x65, 0x48, 0xc5, 0xa5 } }; static WCHAR sessionname[] = {'w','i','n','e','g','a','m','e','s','s','e','r','v','e','r',0}; @@ -182,7 +184,7 @@ static void test_server_info(void) } } -static BOOL is_process_elevated(void) +BOOL is_process_elevated(void) { HANDLE token; if (OpenProcessToken( GetCurrentProcess(), TOKEN_QUERY, &token )) @@ -198,7 +200,7 @@ static BOOL is_process_elevated(void) return FALSE; } -static BOOL is_firewall_enabled(void) +BOOL is_firewall_enabled(void) { HRESULT hr, init; INetFwMgr *mgr = NULL; @@ -231,13 +233,7 @@ done: return (enabled == VARIANT_TRUE); } -enum firewall_op -{ - APP_ADD, - APP_REMOVE -}; - -static HRESULT set_firewall( enum firewall_op op ) +HRESULT set_firewall( enum firewall_op op ) { static const WCHAR dpnsvrW[] = {'c',':','\\','w','i','n','d','o','w','s','\\','s','y','s','t','e','m','3','2','\\', @@ -341,7 +337,7 @@ done: } /* taken from programs/winetest/main.c */ -static BOOL is_stub_dll(const char *filename) +BOOL is_stub_dll(const char *filename) { DWORD size, ver; BOOL isstub = FALSE;

1 0

Nikolay Sivov : oleaut32: Return proper interface pointers.
by Alexandre Julliard 08 Feb '17

08 Feb '17

Module: wine Branch: master Commit: 9e54ae767e761dce16abb3696cbe8b8f8dff5c5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e54ae767e761dce16abb3696… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 8 16:02:31 2017 +0300 oleaut32: Return proper interface pointers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/olepicture.c | 2 +- dlls/oleaut32/typelib.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index bfca22f..ac8b207 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -461,7 +461,7 @@ static HRESULT WINAPI OLEPictureImpl_QueryInterface( *ppvObject = 0; if (IsEqualIID(&IID_IUnknown, riid) || IsEqualIID(&IID_IPicture, riid)) - *ppvObject = This; + *ppvObject = &This->IPicture_iface; else if (IsEqualIID(&IID_IDispatch, riid)) *ppvObject = &This->IDispatch_iface; else if (IsEqualIID(&IID_IPictureDisp, riid)) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 4fdfbeb..3df9631 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5579,7 +5579,7 @@ static HRESULT WINAPI ITypeInfo_fnQueryInterface( if(IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid,&IID_ITypeInfo)|| IsEqualIID(riid,&IID_ITypeInfo2)) - *ppvObject = This; + *ppvObject = &This->ITypeInfo2_iface; else if(IsEqualIID(riid, &IID_ICreateTypeInfo) || IsEqualIID(riid, &IID_ICreateTypeInfo2)) *ppvObject = &This->ICreateTypeInfo2_iface;

1 0

← Newer
1
...
60
61
62
63
64
65
66
...
84
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2017