wine-commits August 2008

wine-commits@winehq.org

2 participants
839 discussions

Hans Leidekker : winhttp: Add a handle management implementation.
by Alexandre Julliard 19 Aug '08

19 Aug '08

Module: wine Branch: master Commit: d5c0ccf93aed9f2d61734d2f8d3e2f5bee6744e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5c0ccf93aed9f2d61734d2f8… Author: Hans Leidekker <hans(a)meelstraat.net> Date: Fri Aug 15 14:41:36 2008 +0200 winhttp: Add a handle management implementation. --- dlls/winhttp/Makefile.in | 4 +- dlls/winhttp/handle.c | 156 ++++++++++++++++++++++++++++++++++++++++ dlls/winhttp/winhttp_private.h | 68 +++++++++++++++++ 3 files changed, 227 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/Makefile.in b/dlls/winhttp/Makefile.in index e69b137..bf26202 100644 --- a/dlls/winhttp/Makefile.in +++ b/dlls/winhttp/Makefile.in @@ -6,7 +6,9 @@ MODULE = winhttp.dll IMPORTLIB = winhttp IMPORTS = kernel32 -C_SRCS = main.c +C_SRCS = \ + handle.c \ + main.c @MAKE_DLL_RULES@ diff --git a/dlls/winhttp/handle.c b/dlls/winhttp/handle.c new file mode 100644 index 0000000..8886788 --- /dev/null +++ b/dlls/winhttp/handle.c @@ -0,0 +1,156 @@ +/* + * Copyright 2008 Hans Leidekker for CodeWeavers + * + * Based on the handle implementation from wininet. + * + * 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 + */ + +#include "config.h" +#include "wine/port.h" +#include "wine/debug.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winnls.h" +#include "winhttp.h" + +#include "winhttp_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(winhttp); + +#define HANDLE_CHUNK_SIZE 0x10 + +static CRITICAL_SECTION handle_cs; +static CRITICAL_SECTION_DEBUG handle_cs_debug = +{ + 0, 0, &handle_cs, + { &handle_cs_debug.ProcessLocksList, &handle_cs_debug.ProcessLocksList }, + 0, 0, { (ULONG_PTR)(__FILE__ ": handle_cs") } +}; +static CRITICAL_SECTION handle_cs = { &handle_cs_debug, -1, 0, 0, 0, 0 }; + +static object_header_t **handles; +static ULONG_PTR next_handle; +static ULONG_PTR max_handles; + +object_header_t *addref_object( object_header_t *hdr ) +{ + ULONG refs = InterlockedIncrement( &hdr->refs ); + TRACE("%p -> refcount = %d\n", hdr, refs); + return hdr; +} + +object_header_t *grab_object( HINTERNET hinternet ) +{ + object_header_t *hdr = NULL; + ULONG_PTR handle = (ULONG_PTR)hinternet; + + EnterCriticalSection( &handle_cs ); + + if ((handle > 0) && (handle <= max_handles) && handles[handle - 1]) + hdr = addref_object( handles[handle - 1] ); + + LeaveCriticalSection( &handle_cs ); + + TRACE("handle 0x%lx -> %p\n", handle, hdr); + return hdr; +} + +void release_object( object_header_t *hdr ) +{ + ULONG refs = InterlockedDecrement( &hdr->refs ); + TRACE("object %p refcount = %d\n", hdr, refs); + if (!refs) + { + TRACE("destroying object %p\n", hdr); + if (hdr->type != WINHTTP_HANDLE_TYPE_SESSION) list_remove( &hdr->entry ); + hdr->vtbl->destroy( hdr ); + } +} + +HINTERNET alloc_handle( object_header_t *hdr ) +{ + object_header_t **p; + ULONG_PTR handle = 0, num; + + list_init( &hdr->children ); + + EnterCriticalSection( &handle_cs ); + if (!max_handles) + { + num = HANDLE_CHUNK_SIZE; + if (!(p = heap_alloc_zero( sizeof(ULONG_PTR) * num ))) goto end; + handles = p; + max_handles = num; + } + if (max_handles == next_handle) + { + num = max_handles + HANDLE_CHUNK_SIZE; + if (!(p = heap_realloc_zero( handles, sizeof(ULONG_PTR) * num ))) goto end; + handles = p; + max_handles = num; + } + handle = next_handle; + if (handles[handle]) ERR("handle isn't free but should be\n"); + + handles[handle] = addref_object( hdr ); + while (handles[next_handle] && (next_handle < max_handles)) next_handle++; + +end: + LeaveCriticalSection( &handle_cs ); + return hdr->handle = (HINTERNET)(handle + 1); +} + +BOOL free_handle( HINTERNET hinternet ) +{ + BOOL ret = FALSE; + ULONG_PTR handle = (ULONG_PTR)hinternet; + object_header_t *hdr = NULL, *child, *next; + + EnterCriticalSection( &handle_cs ); + + if ((handle > 0) && (handle <= max_handles)) + { + handle--; + if (handles[handle]) + { + hdr = handles[handle]; + TRACE("destroying handle 0x%lx for object %p\n", handle + 1, hdr); + handles[handle] = NULL; + ret = TRUE; + } + } + + LeaveCriticalSection( &handle_cs ); + + if (hdr) + { + LIST_FOR_EACH_ENTRY_SAFE( child, next, &hdr->children, object_header_t, entry ) + { + TRACE("freeing child handle %p for parent handle 0x%lx\n", child->handle, handle + 1); + free_handle( child->handle ); + } + release_object( hdr ); + } + + EnterCriticalSection( &handle_cs ); + if (next_handle > handle && !handles[handle]) next_handle = handle; + LeaveCriticalSection( &handle_cs ); + + return ret; +} diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h new file mode 100644 index 0000000..7d06c87 --- /dev/null +++ b/dlls/winhttp/winhttp_private.h @@ -0,0 +1,68 @@ +/* + * Copyright 2008 Hans Leidekker for CodeWeavers + * + * 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 _WINE_WINHTTP_PRIVATE_H_ +#define _WINE_WINHTTP_PRIVATE_H_ + +#include "wine/list.h" + +typedef struct _object_header_t object_header_t; + +typedef struct +{ + void (*destroy)( object_header_t * ); + BOOL (*query_option)( object_header_t *, DWORD, void *, DWORD *, BOOL ); + BOOL (*set_option)( object_header_t *, DWORD, void *, DWORD ); +} object_vtbl_t; + +struct _object_header_t +{ + DWORD type; + HINTERNET handle; + const object_vtbl_t *vtbl; + DWORD flags; + DWORD error; + DWORD_PTR context; + LONG refs; + WINHTTP_STATUS_CALLBACK callback; + DWORD notify_mask; + struct list entry; + struct list children; +}; + +static inline void *heap_alloc( SIZE_T size ) +{ + return HeapAlloc( GetProcessHeap(), 0, size ); +} + +static inline void *heap_alloc_zero( SIZE_T size ) +{ + return HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, size ); +} + +static inline void *heap_realloc_zero( LPVOID mem, SIZE_T size ) +{ + return HeapReAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, mem, size ); +} + +static inline BOOL heap_free( LPVOID mem ) +{ + return HeapFree( GetProcessHeap(), 0, mem ); +} + +#endif /* _WINE_WINHTTP_PRIVATE_H_ */

1 0

Zac Brown : winhttp: Add test for adding/querying headers.
by Alexandre Julliard 19 Aug '08

19 Aug '08

Module: wine Branch: master Commit: dfd9681fabd386a05d3d3a1754706bc0f46c3968 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfd9681fabd386a05d3d3a175… Author: Zac Brown <zac(a)zacbrown.org> Date: Thu Aug 14 14:50:18 2008 -0700 winhttp: Add test for adding/querying headers. --- dlls/winhttp/tests/winhttp.c | 372 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 371 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dfd9681fabd386a05d3d3…

1 0

Zac Brown : winhttp: Add stub implementation for WinHttpAddRequestHeaders.
by Alexandre Julliard 19 Aug '08

19 Aug '08

Module: wine Branch: master Commit: db0b7beffa21aaa1038e37c67fe60b5362ba68b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db0b7beffa21aaa1038e37c67… Author: Zac Brown <zac(a)zacbrown.org> Date: Thu Aug 14 14:57:25 2008 -0700 winhttp: Add stub implementation for WinHttpAddRequestHeaders. --- dlls/winhttp/main.c | 12 ++++++++++++ dlls/winhttp/winhttp.spec | 2 +- 2 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/main.c b/dlls/winhttp/main.c index 192ec21..fb66360 100644 --- a/dlls/winhttp/main.c +++ b/dlls/winhttp/main.c @@ -293,3 +293,15 @@ BOOL WINAPI WinHttpQueryHeaders (HINTERNET hRequest, DWORD dwInfoLevel, LPCWSTR SetLastError(ERROR_NOT_SUPPORTED); return FALSE; } + +/*********************************************************************** + * WinHttpAddRequestHeaders (winhttp.@) + */ +BOOL WINAPI WinHttpAddRequestHeaders (HINTERNET hRequest, LPCWSTR pwszHeaders, + DWORD dwHeadersLength, DWORD dwModifiers) +{ + FIXME("(%s, %d, %d): stub\n", debugstr_w(pwszHeaders), dwHeadersLength, dwModifiers); + + SetLastError(ERROR_NOT_SUPPORTED); + return FALSE; +} diff --git a/dlls/winhttp/winhttp.spec b/dlls/winhttp/winhttp.spec index fc82609..ce9407e 100644 --- a/dlls/winhttp/winhttp.spec +++ b/dlls/winhttp/winhttp.spec @@ -2,7 +2,7 @@ @ stdcall -private DllGetClassObject(ptr ptr ptr) @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() -@ stub WinHttpAddRequestHeaders +@ stdcall WinHttpAddRequestHeaders(ptr wstr long long) @ stdcall WinHttpCheckPlatform() @ stdcall WinHttpCloseHandle(ptr) @ stdcall WinHttpConnect(ptr wstr long long)

1 0

Zac Brown : winhttp: Add stub implementation for WinHttpQueryHeaders.
by Alexandre Julliard 19 Aug '08

19 Aug '08

Module: wine Branch: master Commit: 9dd04bfc32f2ae92143fdeb3b19f5ec7f53a289a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9dd04bfc32f2ae92143fdeb3b… Author: Zac Brown <zac(a)zacbrown.org> Date: Thu Aug 14 14:56:23 2008 -0700 winhttp: Add stub implementation for WinHttpQueryHeaders. --- dlls/winhttp/main.c | 12 ++++++++++++ dlls/winhttp/winhttp.spec | 2 +- 2 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/main.c b/dlls/winhttp/main.c index 10a02b7..192ec21 100644 --- a/dlls/winhttp/main.c +++ b/dlls/winhttp/main.c @@ -281,3 +281,15 @@ BOOL WINAPI WinHttpTimeToSystemTime (LPCWSTR pwszTime, SYSTEMTIME* pst) SetLastError(ERROR_NOT_SUPPORTED); return FALSE; } + +/*********************************************************************** + * WinHttpQueryHeaders (winhttp.@) + */ +BOOL WINAPI WinHttpQueryHeaders (HINTERNET hRequest, DWORD dwInfoLevel, LPCWSTR pwszName, + LPVOID lpBuffer, LPDWORD lpdwBufferLength, LPDWORD lpdwIndex) +{ + FIXME("(%d): stub\n", dwInfoLevel); + + SetLastError(ERROR_NOT_SUPPORTED); + return FALSE; +} diff --git a/dlls/winhttp/winhttp.spec b/dlls/winhttp/winhttp.spec index c093898..fc82609 100644 --- a/dlls/winhttp/winhttp.spec +++ b/dlls/winhttp/winhttp.spec @@ -16,7 +16,7 @@ @ stdcall WinHttpOpenRequest(ptr wstr wstr wstr wstr ptr long) @ stub WinHttpQueryAuthSchemes @ stdcall WinHttpQueryDataAvailable(ptr ptr) -@ stub WinHttpQueryHeaders +@ stdcall WinHttpQueryHeaders(ptr long wstr ptr ptr ptr) @ stdcall WinHttpQueryOption(ptr long ptr ptr) @ stdcall WinHttpReadData(ptr ptr long ptr) @ stdcall WinHttpReceiveResponse(ptr ptr)

1 0

Zac Brown : winhttp: Add test for WinHttpTimeToSystemTime.
by Alexandre Julliard 19 Aug '08

19 Aug '08

Module: wine Branch: master Commit: 525037d758a12e301fd3ba71acdad9850b80b289 URL: http://source.winehq.org/git/wine.git/?a=commit;h=525037d758a12e301fd3ba71a… Author: Zac Brown <zac(a)zacbrown.org> Date: Thu Aug 14 14:56:07 2008 -0700 winhttp: Add test for WinHttpTimeToSystemTime. --- dlls/winhttp/tests/winhttp.c | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index c3878a9..220d50b 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -161,9 +161,33 @@ static void test_WinHttpTimeFromSystemTime(void) "Time string returned did not match expected time string.\n"); } +static void test_WinHttpTimeToSystemTime(void) +{ + BOOL ret; + SYSTEMTIME time; + static const SYSTEMTIME expected_time = {2008, 7, 1, 28, 10, 5, 52, 0}; + static const WCHAR time_string1[] = + {'M','o','n',',',' ','2','8',' ','J','u','l',' ','2','0','0','8',' ', + + '1','0',':','0','5',':','5','2',' ','G','M','T','\n',0}; + static const WCHAR time_string2[] = + {' ','m','o','n',' ','2','8',' ','j','u','l',' ','2','0','0','8',' ', + '1','0',' ','0','5',' ','5','2','\n',0}; + + ret = WinHttpTimeToSystemTime(time_string1, &time); + todo_wine ok(ret == TRUE, "WinHttpTimeToSystemTime failed: %u\n", GetLastError()); + todo_wine ok(memcmp(&time, &expected_time, sizeof(SYSTEMTIME)) == 0, + "Returned SYSTEMTIME structure did not match expected SYSTEMTIME structure.\n"); + + ret = WinHttpTimeToSystemTime(time_string2, &time); + todo_wine ok(ret == TRUE, "WinHttpTimeToSystemTime failed: %u\n", GetLastError()); + todo_wine ok(memcmp(&time, &expected_time, sizeof(SYSTEMTIME)) == 0, + "Returned SYSTEMTIME structure did not match expected SYSTEMTIME structure.\n"); +} + START_TEST (winhttp) { test_OpenRequest(); test_SendRequest(); test_WinHttpTimeFromSystemTime(); + test_WinHttpTimeToSystemTime(); }

1 0

Zac Brown : winhttp: Add stub implementation for WinHttpTimeToSystemTime.
by Alexandre Julliard 19 Aug '08

19 Aug '08

Module: wine Branch: master Commit: 59397fab0265efbb12b44f6e1d66faf1e4342efc URL: http://source.winehq.org/git/wine.git/?a=commit;h=59397fab0265efbb12b44f6e1… Author: Zac Brown <zac(a)zacbrown.org> Date: Thu Aug 14 14:55:16 2008 -0700 winhttp: Add stub implementation for WinHttpTimeToSystemTime. --- dlls/winhttp/main.c | 11 +++++++++++ dlls/winhttp/winhttp.spec | 2 +- 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/main.c b/dlls/winhttp/main.c index 2915d3b..10a02b7 100644 --- a/dlls/winhttp/main.c +++ b/dlls/winhttp/main.c @@ -270,3 +270,14 @@ BOOL WINAPI WinHttpTimeFromSystemTime (CONST SYSTEMTIME* pst, LPWSTR pwszTime) SetLastError(ERROR_NOT_SUPPORTED); return FALSE; } + +/*********************************************************************** + * WinHttpTimeToSystemTime (winhttp.@) + */ +BOOL WINAPI WinHttpTimeToSystemTime (LPCWSTR pwszTime, SYSTEMTIME* pst) +{ + FIXME("(%s, %p): stub\n", debugstr_w(pwszTime), pst); + + SetLastError(ERROR_NOT_SUPPORTED); + return FALSE; +} diff --git a/dlls/winhttp/winhttp.spec b/dlls/winhttp/winhttp.spec index 24af2e0..c093898 100644 --- a/dlls/winhttp/winhttp.spec +++ b/dlls/winhttp/winhttp.spec @@ -27,5 +27,5 @@ @ stub WinHttpSetStatusCallback @ stub WinHttpSetTimeouts @ stdcall WinHttpTimeFromSystemTime(ptr ptr) -@ stub WinHttpTimeToSystemTime +@ stdcall WinHttpTimeToSystemTime(wstr ptr) @ stdcall WinHttpWriteData(ptr ptr long ptr)

1 0

Zac Brown : winhttp: Add test for WinHttpTimeFromSystemTime.
by Alexandre Julliard 19 Aug '08

19 Aug '08

Module: wine Branch: master Commit: 5706b84513dd54e1b3ff5a1ef6914eed359595c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5706b84513dd54e1b3ff5a1ef… Author: Zac Brown <zac(a)zacbrown.org> Date: Thu Aug 14 14:54:18 2008 -0700 winhttp: Add test for WinHttpTimeFromSystemTime. --- dlls/winhttp/tests/winhttp.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 3b43550..c3878a9 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -146,8 +146,24 @@ static void test_SendRequest (void) todo_wine ok(ret == TRUE, "WinHttpCloseHandle failed on closing session, got %d.\n", ret); } +static void test_WinHttpTimeFromSystemTime(void) +{ + BOOL ret; + static const SYSTEMTIME time = {2008, 7, 1, 28, 10, 5, 52, 0}; + static const WCHAR expected_string[] = + {'M','o','n',',',' ','2','8',' ','J','u','l',' ','2','0','0','8',' ', + '1','0',':','0','5',':','5','2',' ','G','M','T',0}; + WCHAR time_string[WINHTTP_TIME_FORMAT_BUFSIZE+1]; + + ret = WinHttpTimeFromSystemTime(&time, time_string); + todo_wine ok(ret == TRUE, "WinHttpTimeFromSystemTime failed: %u\n", GetLastError()); + todo_wine ok(memcmp(time_string, expected_string, sizeof(expected_string)) == 0, + "Time string returned did not match expected time string.\n"); +} + START_TEST (winhttp) { test_OpenRequest(); test_SendRequest(); + test_WinHttpTimeFromSystemTime(); }

1 0

Zac Brown : winhttp: Add stub implementation for WinHttpTimeFromSystemTime.
by Alexandre Julliard 19 Aug '08

19 Aug '08

Module: wine Branch: master Commit: 6858aa4a0fb1c326c1eb439fc07ccda140ea44d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6858aa4a0fb1c326c1eb439fc… Author: Zac Brown <zac(a)zacbrown.org> Date: Thu Aug 14 14:54:01 2008 -0700 winhttp: Add stub implementation for WinHttpTimeFromSystemTime. --- dlls/winhttp/main.c | 11 +++++++++++ dlls/winhttp/winhttp.spec | 2 +- 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/main.c b/dlls/winhttp/main.c index 18059ba..2915d3b 100644 --- a/dlls/winhttp/main.c +++ b/dlls/winhttp/main.c @@ -259,3 +259,14 @@ BOOL WINAPI WinHttpWriteData (HINTERNET hRequest, LPCVOID lpBuffer, SetLastError(ERROR_NOT_SUPPORTED); return FALSE; } + +/*********************************************************************** + * WinHttpTimeFromSystemTime (winhttp.@) + */ +BOOL WINAPI WinHttpTimeFromSystemTime (CONST SYSTEMTIME* pst, LPWSTR pwszTime) +{ + FIXME("(%p, %p): stub\n", pst, pwszTime); + + SetLastError(ERROR_NOT_SUPPORTED); + return FALSE; +} diff --git a/dlls/winhttp/winhttp.spec b/dlls/winhttp/winhttp.spec index c6ada03..24af2e0 100644 --- a/dlls/winhttp/winhttp.spec +++ b/dlls/winhttp/winhttp.spec @@ -26,6 +26,6 @@ @ stdcall WinHttpSetOption(ptr long ptr long) @ stub WinHttpSetStatusCallback @ stub WinHttpSetTimeouts -@ stub WinHttpTimeFromSystemTime +@ stdcall WinHttpTimeFromSystemTime(ptr ptr) @ stub WinHttpTimeToSystemTime @ stdcall WinHttpWriteData(ptr ptr long ptr)

1 0

Vincent Povirk : wininet: Default to keep-alive when the server is HTTP/1.1 , not when it isn't.
by Alexandre Julliard 19 Aug '08

19 Aug '08

Module: wine Branch: master Commit: 17c0c0a54b17c8bdd5d2a40d27b9bd9f461b666d URL: http://source.winehq.org/git/wine.git/?a=commit;h=17c0c0a54b17c8bdd5d2a40d2… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Aug 14 13:22:58 2008 -0500 wininet: Default to keep-alive when the server is HTTP/1.1, not when it isn't. --- dlls/wininet/http.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index ba82a84..4630f3b 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4061,9 +4061,9 @@ BOOL HTTP_FinishedReading(LPWININETHTTPREQW lpwhr) /* as per RFC 2068, S8.1.2.1, if the client is HTTP/1.1 then assume that * the connection is keep-alive by default */ - if (!HTTP_HttpQueryInfoW(lpwhr, HTTP_QUERY_VERSION, szVersion, - &dwBufferSize, NULL) || - strcmpiW(szVersion, g_szHttp1_1)) + if (HTTP_HttpQueryInfoW(lpwhr, HTTP_QUERY_VERSION, szVersion, + &dwBufferSize, NULL) && + !strcmpiW(szVersion, g_szHttp1_1)) { keepalive = TRUE; }

1 0

James Hawkins : msi: Use MsiQueryFeatureState to determine the feature' s state.
by Alexandre Julliard 19 Aug '08

19 Aug '08

Module: wine Branch: master Commit: 5a3c3b6a12ba15821667e4d4d25caee28f2cf9bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a3c3b6a12ba15821667e4d4d… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Aug 18 23:14:53 2008 -0500 msi: Use MsiQueryFeatureState to determine the feature's state. --- dlls/msi/action.c | 41 ++++++++++------------------------------- dlls/msi/tests/package.c | 37 ++++++++----------------------------- 2 files changed, 18 insertions(+), 60 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index b2fdbea..4eb266c 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1716,42 +1716,22 @@ static void ACTION_GetComponentInstallStates(MSIPACKAGE *package) } } -/* scan for and update current install states */ -static void ACTION_UpdateFeatureInstallStates(MSIPACKAGE *package) +static void ACTION_GetFeatureInstallStates(MSIPACKAGE *package) { - MSICOMPONENT *comp; MSIFEATURE *feature; + INSTALLSTATE state; + + state = MsiQueryProductStateW(package->ProductCode); LIST_FOR_EACH_ENTRY( feature, &package->features, MSIFEATURE, entry ) { - ComponentList *cl; - INSTALLSTATE res = INSTALLSTATE_ABSENT; - - LIST_FOR_EACH_ENTRY( cl, &feature->Components, ComponentList, entry ) + if (state != INSTALLSTATE_LOCAL && state != INSTALLSTATE_DEFAULT) + feature->Installed = INSTALLSTATE_ABSENT; + else { - comp= cl->component; - - if (!comp->ComponentId) - { - res = INSTALLSTATE_ABSENT; - break; - } - - if (res == INSTALLSTATE_ABSENT) - res = comp->Installed; - else - { - if (res == comp->Installed) - continue; - - if (res != INSTALLSTATE_DEFAULT && res != INSTALLSTATE_LOCAL && - res != INSTALLSTATE_SOURCE) - { - res = INSTALLSTATE_INCOMPLETE; - } - } + feature->Installed = MsiQueryFeatureStateW(package->ProductCode, + feature->Feature); } - feature->Installed = res; } } @@ -2202,6 +2182,7 @@ static UINT ACTION_CostFinalize(MSIPACKAGE *package) /* read components states from the registry */ ACTION_GetComponentInstallStates(package); + ACTION_GetFeatureInstallStates(package); TRACE("File calculations\n"); msi_check_file_install_states( package ); @@ -2238,8 +2219,6 @@ static UINT ACTION_CostFinalize(MSIPACKAGE *package) /* FIXME: check volume disk space */ MSI_SetPropertyW(package, szOutOfDiskSpace, szZero); - ACTION_UpdateFeatureInstallStates(package); - return MSI_SetFeatureStates(package); } diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index c27e2fe..8611bf6 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -3774,30 +3774,21 @@ static void test_states(void) action = 0xdeadbee; r = MsiGetFeatureState(hpkg, "three", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); - todo_wine - { - ok( state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); - } + ok( state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); ok( action == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", action); state = 0xdeadbee; action = 0xdeadbee; r = MsiGetFeatureState(hpkg, "four", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); - todo_wine - { - ok( state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); - } + ok( state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); ok( action == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", action); state = 0xdeadbee; action = 0xdeadbee; r = MsiGetFeatureState(hpkg, "five", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); - todo_wine - { - ok( state == INSTALLSTATE_ABSENT, "Expected INSTALLSTATE_ABSENT, got %d\n", state); - } + ok( state == INSTALLSTATE_ABSENT, "Expected INSTALLSTATE_ABSENT, got %d\n", state); ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); state = 0xdeadbee; @@ -4575,20 +4566,14 @@ static void test_states(void) action = 0xdeadbee; r = MsiGetFeatureState(hpkg, "three", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); - todo_wine - { - ok( state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); - } + ok( state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); ok( action == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", action); state = 0xdeadbee; action = 0xdeadbee; r = MsiGetFeatureState(hpkg, "four", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); - todo_wine - { - ok( state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); - } + ok( state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); ok( action == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", action); state = 0xdeadbee; @@ -5376,21 +5361,15 @@ static void test_states(void) action = 0xdeadbee; r = MsiGetFeatureState(hpkg, "three", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); - todo_wine - { - ok( state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); - } + ok( state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); ok( action == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", action); state = 0xdeadbee; action = 0xdeadbee; r = MsiGetFeatureState(hpkg, "four", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); - todo_wine - { - ok( state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); - ok( state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); - } + ok( state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); + ok( state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); state = 0xdeadbee; action = 0xdeadbee;

1 0

← Newer
1
...
49
50
51
52
53
54
55
...
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 August 2008