wine-commits May 2011

wine-commits@winehq.org

2 participants
945 discussions

Huw Davies : gdi32: Add a missing const.
by Alexandre Julliard 11 May '11

11 May '11

Module: wine Branch: master Commit: 90b2672e6b7e9a5140efb48e32cbb9e76252297a URL: http://source.winehq.org/git/wine.git/?a=commit;h=90b2672e6b7e9a5140efb48e3… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed May 11 15:16:45 2011 +0100 gdi32: Add a missing const. --- dlls/gdi32/dibdrv/dibdrv.h | 2 +- dlls/gdi32/dibdrv/primitives.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index c2b3294..7327fca 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -37,7 +37,7 @@ static inline DC *get_dibdrv_dc( PHYSDEV dev ) typedef struct primitive_funcs { - void (* solid_rects)(const dib_info *dib, int num, RECT *rc, DWORD and, DWORD xor); + void (* solid_rects)(const dib_info *dib, int num, const RECT *rc, DWORD and, DWORD xor); DWORD (* colorref_to_pixel)(const dib_info *dib, COLORREF color); } primitive_funcs; diff --git a/dlls/gdi32/dibdrv/primitives.c b/dlls/gdi32/dibdrv/primitives.c index c8d60cb..a35877e 100644 --- a/dlls/gdi32/dibdrv/primitives.c +++ b/dlls/gdi32/dibdrv/primitives.c @@ -31,7 +31,7 @@ static inline void do_rop_32(DWORD *ptr, DWORD and, DWORD xor) *ptr = (*ptr & and) ^ xor; } -static void solid_rects_32(const dib_info *dib, int num, RECT *rc, DWORD and, DWORD xor) +static void solid_rects_32(const dib_info *dib, int num, const RECT *rc, DWORD and, DWORD xor) { DWORD *ptr, *start; int x, y, i; @@ -45,7 +45,7 @@ static void solid_rects_32(const dib_info *dib, int num, RECT *rc, DWORD and, DW } } -static void solid_rects_null(const dib_info *dib, int num, RECT *rc, DWORD and, DWORD xor) +static void solid_rects_null(const dib_info *dib, int num, const RECT *rc, DWORD and, DWORD xor) { return; }

1 0

Huw Davies : gdi32: Initialise the bit fields even in the BI_RGB case in order to make format comparisons easier .
by Alexandre Julliard 11 May '11

11 May '11

Module: wine Branch: master Commit: 93349f02adf41e549f219af411447dd527eb4852 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93349f02adf41e549f219af41… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed May 11 15:13:40 2011 +0100 gdi32: Initialise the bit fields even in the BI_RGB case in order to make format comparisons easier. --- dlls/gdi32/dibdrv/dc.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 5273b29..e43ec15 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -76,6 +76,8 @@ static void init_bit_fields(dib_info *dib, const DWORD *bit_fields) static BOOL init_dib(dib_info *dib, const BITMAPINFOHEADER *bi, const DWORD *bit_fields, void *bits) { + static const DWORD bit_fields_888[3] = {0xff0000, 0x00ff00, 0x0000ff}; + dib->bit_count = bi->biBitCount; dib->width = bi->biWidth; dib->height = bi->biHeight; @@ -99,15 +101,14 @@ static BOOL init_dib(dib_info *dib, const BITMAPINFOHEADER *bi, const DWORD *bit { case 32: if(bi->biCompression == BI_RGB) + bit_fields = bit_fields_888; + + init_bit_fields(dib, bit_fields); + + if(dib->red_mask == 0xff0000 && dib->green_mask == 0x00ff00 && dib->blue_mask == 0x0000ff) dib->funcs = &funcs_8888; else - { - init_bit_fields(dib, bit_fields); - if(dib->red_mask == 0xff0000 && dib->green_mask == 0x00ff00 && dib->blue_mask == 0x0000ff) - dib->funcs = &funcs_8888; - else - dib->funcs = &funcs_32; - } + dib->funcs = &funcs_32; break; default:

1 0

Piotr Caban : msvcrt: Don' t pass NULL as __ms_va_list in printf implementation.
by Alexandre Julliard 11 May '11

11 May '11

Module: wine Branch: master Commit: 64cf208040f14f46d65b288272c8fabd93418af8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64cf208040f14f46d65b28827… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 11 15:39:07 2011 +0200 msvcrt: Don't pass NULL as __ms_va_list in printf implementation. --- dlls/msvcrt/console.c | 4 ++-- dlls/msvcrt/file.c | 8 ++++---- dlls/msvcrt/msvcrt.h | 4 ++-- dlls/msvcrt/printf.h | 22 +++++++++++----------- dlls/msvcrt/wcs.c | 16 ++++++++-------- 5 files changed, 27 insertions(+), 27 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=64cf208040f14f46d65b2…

1 0

Jacek Caban : mshtml: Added IOmNavigator::get_cpuClass implementation.
by Alexandre Julliard 11 May '11

11 May '11

Module: wine Branch: master Commit: ebac489c49bc5962bc8d9f2cb3be05a7393ab4c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebac489c49bc5962bc8d9f2cb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 11 14:58:35 2011 +0000 mshtml: Added IOmNavigator::get_cpuClass implementation. --- dlls/mshtml/omnavigator.c | 14 ++++++++++++-- dlls/mshtml/tests/dom.c | 13 ++++++++----- 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index 37bd95b..f5a3573 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -443,8 +443,18 @@ static HRESULT WINAPI OmNavigator_toString(IOmNavigator *iface, BSTR *String) static HRESULT WINAPI OmNavigator_get_cpuClass(IOmNavigator *iface, BSTR *p) { OmNavigator *This = impl_from_IOmNavigator(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + static const WCHAR cpu_classW[] = +#ifdef _WIN64 + {'x','6','4',0}; +#else + {'x','8','6',0}; +#endif + + TRACE("(%p)->(%p)\n", This, p); + + *p = SysAllocString(cpu_classW); + return *p ? S_OK : E_OUTOFMEMORY; } static HRESULT WINAPI OmNavigator_get_systemLanguage(IOmNavigator *iface, BSTR *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 8029381..dcd2e21 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -3865,11 +3865,14 @@ static void test_navigator(IHTMLDocument2 *doc) bstr = NULL; hres = IOmNavigator_get_platform(navigator, &bstr); ok(hres == S_OK, "get_platform failed: %08x\n", hres); -#ifdef _WIN64 - ok(!strcmp_wa(bstr, "Win64") || broken(!strcmp_wa(bstr, "Win32") /* IE6 */), "unexpected platform %s\n", wine_dbgstr_w(bstr)); -#else - ok(!strcmp_wa(bstr, "Win32"), "unexpected platform %s\n", wine_dbgstr_w(bstr)); -#endif + ok(!strcmp_wa(bstr, sizeof(void*) == 8 ? "Win64" : "Win32") + || (sizeof(void*) == 8 && broken(!strcmp_wa(bstr, "Win32") /* IE6 */)), "unexpected platform %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + + bstr = NULL; + hres = IOmNavigator_get_cpuClass(navigator, &bstr); + ok(hres == S_OK, "get_cpuClass failed: %08x\n", hres); + ok(!strcmp_wa(bstr, sizeof(void*) == 8 ? "x64" : "x86"), "unexpected cpuClass %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); bstr = NULL;

1 0

Jacek Caban : mshtml: Ignore more dispID values in OnChanged notifications to fix tests on some IE installations .
by Alexandre Julliard 11 May '11

11 May '11

Module: wine Branch: master Commit: 75916ffe7ac82b11758559ba4de1ed83a6762475 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75916ffe7ac82b11758559ba4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 11 13:21:24 2011 +0000 mshtml: Ignore more dispID values in OnChanged notifications to fix tests on some IE installations. --- dlls/mshtml/tests/htmldoc.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index b0ceea0..33078e9 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -851,6 +851,8 @@ static HRESULT WINAPI PropertyNotifySink_OnChanged(IPropertyNotifySink *iface, D CHECK_EXPECT(OnChanged_1012); return S_OK; case 1030: + case 3000022: + case 3000023: case 3000024: case 3000025: case 3000028:

1 0

Jacek Caban : kernel32: Moved QueryWorkingSet and QueryWorkingSetEx implementation to kernel32.
by Alexandre Julliard 11 May '11

11 May '11

Module: wine Branch: master Commit: c1c70c62cba78e11d342de9c66c73fbdd91dbaa1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1c70c62cba78e11d342de9c6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 11 13:06:45 2011 +0000 kernel32: Moved QueryWorkingSet and QueryWorkingSetEx implementation to kernel32. --- dlls/kernel32/kernel32.spec | 2 ++ dlls/kernel32/process.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/psapi/psapi.spec | 4 ++-- dlls/psapi/psapi_main.c | 38 -------------------------------------- 4 files changed, 42 insertions(+), 40 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 01939c9..a4e45d6 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -772,6 +772,8 @@ @ stdcall K32GetProcessImageFileNameW(long ptr long) @ stdcall K32EnumProcessModules(long ptr long ptr) @ stdcall K32EnumProcesses(ptr long ptr) +@ stdcall K32QueryWorkingSet(long ptr long) +@ stdcall K32QueryWorkingSetEx(long ptr long) @ stdcall -i386 -private -register K32Thk1632Epilog() krnl386.exe16.K32Thk1632Epilog @ stdcall -i386 -private -register K32Thk1632Prolog() krnl386.exe16.K32Thk1632Prolog @ stdcall LCIDToLocaleName(long ptr long long) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 6ca1279..5436c06 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -3584,6 +3584,44 @@ BOOL WINAPI K32EnumProcessModules(HANDLE process, HMODULE *lphModule, } /*********************************************************************** + * K32QueryWorkingSet (KERNEL32.@) + */ +BOOL WINAPI K32QueryWorkingSet( HANDLE process, LPVOID buffer, DWORD size ) +{ + NTSTATUS status; + + TRACE( "(%p, %p, %d)\n", process, buffer, size ); + + status = NtQueryVirtualMemory( process, NULL, MemoryWorkingSetList, buffer, size, NULL ); + + if (status) + { + SetLastError( RtlNtStatusToDosError( status ) ); + return FALSE; + } + return TRUE; +} + +/*********************************************************************** + * K32QueryWorkingSetEx (KERNEL32.@) + */ +BOOL WINAPI K32QueryWorkingSetEx( HANDLE process, LPVOID buffer, DWORD size ) +{ + NTSTATUS status; + + TRACE( "(%p, %p, %d)\n", process, buffer, size ); + + status = NtQueryVirtualMemory( process, NULL, MemoryWorkingSetList, buffer, size, NULL ); + + if (status) + { + SetLastError( RtlNtStatusToDosError( status ) ); + return FALSE; + } + return TRUE; +} + +/*********************************************************************** * ProcessIdToSessionId (KERNEL32.@) * This function is available on Terminal Server 4SP4 and Windows 2000 */ diff --git a/dlls/psapi/psapi.spec b/dlls/psapi/psapi.spec index 70f1144..37d6e80 100644 --- a/dlls/psapi/psapi.spec +++ b/dlls/psapi/psapi.spec @@ -21,5 +21,5 @@ @ stdcall GetProcessMemoryInfo(long ptr long) @ stdcall GetWsChanges(long ptr long) @ stdcall InitializeProcessForWsWatch(long) -@ stdcall QueryWorkingSet(long ptr long) -@ stdcall QueryWorkingSetEx(long ptr long) +@ stdcall QueryWorkingSet(long ptr long) kernel32.K32QueryWorkingSet +@ stdcall QueryWorkingSetEx(long ptr long) kernel32.K32QueryWorkingSetEx diff --git a/dlls/psapi/psapi_main.c b/dlls/psapi/psapi_main.c index 34dfeed..909e7ce 100644 --- a/dlls/psapi/psapi_main.c +++ b/dlls/psapi/psapi_main.c @@ -475,41 +475,3 @@ BOOL WINAPI InitializeProcessForWsWatch(HANDLE hProcess) return TRUE; } - -/*********************************************************************** - * QueryWorkingSet (PSAPI.@) - */ -BOOL WINAPI QueryWorkingSet( HANDLE process, LPVOID buffer, DWORD size ) -{ - NTSTATUS status; - - TRACE( "(%p, %p, %d)\n", process, buffer, size ); - - status = NtQueryVirtualMemory( process, NULL, MemoryWorkingSetList, buffer, size, NULL ); - - if (status) - { - SetLastError( RtlNtStatusToDosError( status ) ); - return FALSE; - } - return TRUE; -} - -/*********************************************************************** - * QueryWorkingSetEx (PSAPI.@) - */ -BOOL WINAPI QueryWorkingSetEx( HANDLE process, LPVOID buffer, DWORD size ) -{ - NTSTATUS status; - - TRACE( "(%p, %p, %d)\n", process, buffer, size ); - - status = NtQueryVirtualMemory( process, NULL, MemoryWorkingSetList, buffer, size, NULL ); - - if (status) - { - SetLastError( RtlNtStatusToDosError( status ) ); - return FALSE; - } - return TRUE; -}

1 0

Jacek Caban : urlmon: Code clean up and make tests a bit stricker.
by Alexandre Julliard 11 May '11

11 May '11

Module: wine Branch: master Commit: f123b6a78fdb322ab3499923c06b015661ebde35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f123b6a78fdb322ab3499923c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 11 11:34:47 2011 +0000 urlmon: Code clean up and make tests a bit stricker. --- dlls/urlmon/tests/protocol.c | 17 ++++++----------- dlls/urlmon/tests/url.c | 17 +++++++---------- 2 files changed, 13 insertions(+), 21 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index 615c895..4ca6da1 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -570,15 +570,11 @@ static void call_continue(PROTOCOLDATA *protocol_data) if(tested_protocol == HTTP_TEST || tested_protocol == HTTPS_TEST) CLEAR_CALLED(ReportProgress_COOKIE_SENT); if(tested_protocol == HTTP_TEST || tested_protocol == HTTPS_TEST || tested_protocol == FTP_TEST) { - if (http_is_first) { + if (http_is_first){ CLEAR_CALLED(ReportProgress_FINDINGRESOURCE); - CLEAR_CALLED(ReportProgress_CONNECTING); CLEAR_CALLED(ReportProgress_PROXYDETECTING); - }else { - CHECK_NOT_CALLED(ReportProgress_FINDINGRESOURCE); - /* IE7 does call this */ - CLEAR_CALLED(ReportProgress_CONNECTING); } + CLEAR_CALLED(ReportProgress_CONNECTING); } if(tested_protocol == FTP_TEST) todo_wine CHECK_CALLED(ReportProgress_SENDINGREQUEST); @@ -926,9 +922,6 @@ static HRESULT WINAPI ProtocolSink_ReportData(IInternetProtocolSink *iface, DWOR if(http_is_first) { CHECK_CALLED(ReportProgress_FINDINGRESOURCE); CHECK_CALLED(ReportProgress_CONNECTING); - } else todo_wine { - CHECK_NOT_CALLED(ReportProgress_FINDINGRESOURCE); - CHECK_NOT_CALLED(ReportProgress_CONNECTING); } CHECK_CALLED(ReportProgress_SENDINGREQUEST); CHECK_CALLED(OnResponse); @@ -2761,8 +2754,10 @@ static void test_http_protocol_url(LPCWSTR url, int prot, DWORD flags, DWORD tym test_http_info(async_protocol); SET_EXPECT(ReportProgress_COOKIE_SENT); - SET_EXPECT(ReportProgress_FINDINGRESOURCE); - SET_EXPECT(ReportProgress_CONNECTING); + if(http_is_first) { + SET_EXPECT(ReportProgress_FINDINGRESOURCE); + SET_EXPECT(ReportProgress_CONNECTING); + } SET_EXPECT(ReportProgress_SENDINGREQUEST); if(test_redirect) SET_EXPECT(ReportProgress_REDIRECTING); diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 0f588b8..7c74865 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -1592,8 +1592,6 @@ static HRESULT WINAPI statusclb_OnProgress(IBindStatusCallbackEx *iface, ULONG u CHECK_EXPECT(Obj_OnProgress_FINDINGRESOURCE); else if(test_protocol == FTP_TEST) todo_wine CHECK_EXPECT(OnProgress_FINDINGRESOURCE); - else if(onsecurityproblem_hres == S_OK) - CHECK_EXPECT2(OnProgress_FINDINGRESOURCE); /* todo wine */ else CHECK_EXPECT(OnProgress_FINDINGRESOURCE); if(emulate_protocol && (test_protocol == HTTP_TEST || test_protocol == HTTPS_TEST || test_protocol == WINETEST_TEST)) @@ -1721,10 +1719,8 @@ static HRESULT WINAPI statusclb_OnProgress(IBindStatusCallbackEx *iface, ULONG u HRESULT hr; if(iface != &objbsc) ok(0, "unexpected call\n"); - else if(1||emulate_protocol) - CHECK_EXPECT(Obj_OnProgress_CLASSIDAVAILABLE); else - todo_wine CHECK_EXPECT(Obj_OnProgress_CLASSIDAVAILABLE); + CHECK_EXPECT(Obj_OnProgress_CLASSIDAVAILABLE); hr = CLSIDFromString((LPCOLESTR)szStatusText, &clsid); ok(hr == S_OK, "CLSIDFromString failed with error 0x%08x\n", hr); ok(IsEqualCLSID(&clsid, &CLSID_HTMLDocument), @@ -2806,7 +2802,8 @@ static void test_BindToStorage(int protocol, DWORD flags, DWORD t) SET_EXPECT(BeginningTransaction); SET_EXPECT(QueryInterface_IHttpNegotiate2); SET_EXPECT(GetRootSecurityId); - SET_EXPECT(OnProgress_FINDINGRESOURCE); + if(http_is_first) + SET_EXPECT(OnProgress_FINDINGRESOURCE); SET_EXPECT(OnProgress_CONNECTING); } if(flags & BINDTEST_INVALID_CN) { @@ -2944,7 +2941,7 @@ static void test_BindToStorage(int protocol, DWORD flags, DWORD t) CHECK_CALLED(QueryInterface_IHttpNegotiate2); CHECK_CALLED(GetRootSecurityId); } - if(http_is_first || (test_protocol == HTTPS_TEST && !(flags & BINDTEST_INVALID_CN))) { + if(http_is_first) { if (! proxy_active()) { CHECK_CALLED(OnProgress_FINDINGRESOURCE); @@ -2956,7 +2953,6 @@ static void test_BindToStorage(int protocol, DWORD flags, DWORD t) CLEAR_CALLED(OnProgress_CONNECTING); } }else if(!abort_start) { - CHECK_NOT_CALLED(OnProgress_FINDINGRESOURCE); /* IE7 does call this */ CLEAR_CALLED(OnProgress_CONNECTING); } @@ -3099,7 +3095,8 @@ static void test_BindToObject(int protocol, DWORD flags) SET_EXPECT(BeginningTransaction); SET_EXPECT(QueryInterface_IHttpNegotiate2); SET_EXPECT(GetRootSecurityId); - SET_EXPECT(Obj_OnProgress_FINDINGRESOURCE); + if(http_is_first) + SET_EXPECT(Obj_OnProgress_FINDINGRESOURCE); SET_EXPECT(Obj_OnProgress_CONNECTING); SET_EXPECT(QueryInterface_IWindowForBindingUI); SET_EXPECT(QueryService_IWindowForBindingUI); @@ -3183,7 +3180,6 @@ static void test_BindToObject(int protocol, DWORD flags) CHECK_CALLED(Obj_OnProgress_FINDINGRESOURCE); CHECK_CALLED(Obj_OnProgress_CONNECTING); }else { - CHECK_NOT_CALLED(Obj_OnProgress_FINDINGRESOURCE); /* IE7 does call this */ CLEAR_CALLED(Obj_OnProgress_CONNECTING); } @@ -3666,6 +3662,7 @@ START_TEST(url) test_BindToStorage(WINETEST_TEST, BINDTEST_EMULATE|BINDTEST_NO_CALLBACK|BINDTEST_USE_CACHE, TYMED_ISTREAM); trace("asynchronous https test...\n"); + http_is_first = TRUE; test_BindToStorage(HTTPS_TEST, 0, TYMED_ISTREAM); trace("emulated https test...\n");

1 0

Jacek Caban : wininet: Set TCP_NODELAY on socket.
by Alexandre Julliard 11 May '11

11 May '11

Module: wine Branch: master Commit: c280970c3e04021645353db52169f22f68ad4670 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c280970c3e04021645353db52… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 11 11:32:34 2011 +0000 wininet: Set TCP_NODELAY on socket. --- dlls/wininet/netconnection.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index c1e108e..1119e48 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -58,6 +58,9 @@ #ifdef HAVE_NETINET_IN_H # include <netinet/in.h> #endif +#ifdef HAVE_NETINET_TCP_H +# include <netinet/tcp.h> +#endif #ifdef HAVE_OPENSSL_SSL_H # include <openssl/ssl.h> # include <openssl/opensslv.h> @@ -497,7 +500,7 @@ static DWORD init_openssl(void) DWORD create_netconn(BOOL useSSL, server_t *server, DWORD security_flags, netconn_t **ret) { netconn_t *netconn; - int result; + int result, flag; if(useSSL) { DWORD res; @@ -532,6 +535,13 @@ DWORD create_netconn(BOOL useSSL, server_t *server, DWORD security_flags, netcon return sock_get_error(errno); } +#ifdef TCP_NODELAY + flag = 1; + result = setsockopt(netconn->socketFD, IPPROTO_TCP, TCP_NODELAY, (void*)&flag, sizeof(flag)); + if(result < 0) + WARN("setsockopt(TCP_NODELAY) failed\n"); +#endif + server_addref(server); netconn->server = server;

1 0

Hans Leidekker : msi: Don' t resolve child folders if the parent path is unmodified.
by Alexandre Julliard 11 May '11

11 May '11

Module: wine Branch: master Commit: e8bdbf879a70a0b0bae35ebb95b7c3e223117abd URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8bdbf879a70a0b0bae35ebb9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed May 11 11:25:40 2011 +0200 msi: Don't resolve child folders if the parent path is unmodified. --- dlls/msi/action.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 669881c..32cea4e 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -3018,6 +3018,12 @@ void msi_resolve_target_folder( MSIPACKAGE *package, const WCHAR *name, BOOL loa path = msi_build_directory_name( 3, parent->ResolvedTarget, folder->TargetDefault, NULL ); } msi_clean_path( path ); + if (folder->ResolvedTarget && !strcmpiW( path, folder->ResolvedTarget )) + { + TRACE("%s already resolved to %s\n", debugstr_w(name), debugstr_w(folder->ResolvedTarget)); + msi_free( path ); + return; + } msi_set_property( package->db, folder->Directory, path ); msi_free( folder->ResolvedTarget ); folder->ResolvedTarget = path;

1 0

Hans Leidekker : msi/tests: Show that MsiSetTargetPath updates folder properties.
by Alexandre Julliard 11 May '11

11 May '11

Module: wine Branch: master Commit: defcf092a9ac2dc3711b3d6c67f50976961380b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=defcf092a9ac2dc3711b3d6c6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed May 11 11:25:17 2011 +0200 msi/tests: Show that MsiSetTargetPath updates folder properties. --- dlls/msi/tests/package.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index ce8866c..d240acf 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -1144,9 +1144,21 @@ static void test_settargetpath(void) query_file_path( hpkg, "[#RootFile]", buffer ); ok( !lstrcmp(buffer, file), "Expected %s, got %s\n", file, buffer); + sz = sizeof(buffer); + r = MsiGetPropertyA( hpkg, "TestParent", buffer, &sz ); + ok( r == ERROR_SUCCESS, "MsiGetProperty returned %u\n", r ); + lstrcatA( tempdir, "TestParent\\" ); + ok( !lstrcmpi(buffer, tempdir), "Expected \"%s\", got \"%s\"\n", tempdir, buffer ); + r = MsiSetTargetPath( hpkg, "TestParent", "C:\\one\\two" ); ok( r == ERROR_SUCCESS, "MsiSetTargetPath returned %d\n", r ); + sz = sizeof(buffer); + r = MsiGetPropertyA( hpkg, "TestParent", buffer, &sz ); + ok( r == ERROR_SUCCESS, "MsiGetProperty returned %u\n", r ); + ok( lstrcmpi(buffer, "C:\\one\\two\\TestDir\\"), + "Expected \"C:\\one\\two\\TestDir\\\", got \"%s\"\n", buffer ); + query_file_path( hpkg, "[#TestFile]", buffer ); ok( !lstrcmpi(buffer, "C:\\one\\two\\TestDir\\testfile.txt"), "Expected C:\\one\\two\\TestDir\\testfile.txt, got %s\n", buffer );

1 0

← Newer
1
...
63
64
65
66
67
68
69
...
95
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 May 2011