August 2008 - Wine-commits - list.winehq.org

Hans Leidekker : winhttp: Implement WinHttpConnect.
by Alexandre Julliard 19 Aug '08

19 Aug '08

Module: wine Branch: master Commit: 770ee20461ba7a262f291a7c295ec2dfbd32333d URL: http://source.winehq.org/git/wine.git/?a=commit;h=770ee20461ba7a262f291a7c2… Author: Hans Leidekker <hans(a)meelstraat.net> Date: Fri Aug 15 14:42:28 2008 +0200 winhttp: Implement WinHttpConnect. --- dlls/winhttp/main.c | 13 ------ dlls/winhttp/session.c | 81 ++++++++++++++++++++++++++++++++++++++++ dlls/winhttp/tests/winhttp.c | 18 +++----- dlls/winhttp/winhttp_private.h | 21 ++++++++++ 4 files changed, 109 insertions(+), 24 deletions(-) diff --git a/dlls/winhttp/main.c b/dlls/winhttp/main.c index e5c904b..6133590 100644 --- a/dlls/winhttp/main.c +++ b/dlls/winhttp/main.c @@ -117,19 +117,6 @@ BOOL WINAPI WinHttpGetIEProxyConfigForCurrentUser(WINHTTP_CURRENT_USER_IE_PROXY_ } /*********************************************************************** - * WinHttpConnect (winhttp.@) - */ - -HINTERNET WINAPI WinHttpConnect (HINTERNET hSession, LPCWSTR pwszServerName, - INTERNET_PORT nServerPort, DWORD dwReserved) -{ - FIXME("(%s, %d, 0x%x): stub\n", debugstr_w(pwszServerName), nServerPort, dwReserved); - - SetLastError(ERROR_NOT_SUPPORTED); - return NULL; -} - -/*********************************************************************** * WinHttpOpenRequest (winhttp.@) */ HINTERNET WINAPI WinHttpOpenRequest (HINTERNET hConnect, LPCWSTR pwszVerb, LPCWSTR pwszObjectName, diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 76a878e..8f8ac2f 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -102,6 +102,87 @@ end: } /*********************************************************************** + * connect_destroy (internal) + */ +static void connect_destroy( object_header_t *hdr ) +{ + connect_t *connect = (connect_t *)hdr; + + TRACE("%p\n", connect); + + release_object( &connect->session->hdr ); + + heap_free( connect->hostname ); + heap_free( connect->servername ); + heap_free( connect->username ); + heap_free( connect->password ); + heap_free( connect ); +} + +static const object_vtbl_t connect_vtbl = +{ + connect_destroy, + NULL, + NULL +}; + +/*********************************************************************** + * WinHttpConnect (winhttp.@) + */ +HINTERNET WINAPI WinHttpConnect( HINTERNET hsession, LPCWSTR server, INTERNET_PORT port, DWORD reserved ) +{ + connect_t *connect; + session_t *session; + HINTERNET hconnect = NULL; + + TRACE("%p, %s, %u, %x\n", hsession, debugstr_w(server), port, reserved); + + if (!server) + { + set_last_error( ERROR_INVALID_PARAMETER ); + return NULL; + } + if (!(session = (session_t *)grab_object( hsession ))) + { + set_last_error( ERROR_INVALID_HANDLE ); + return NULL; + } + if (session->hdr.type != WINHTTP_HANDLE_TYPE_SESSION) + { + release_object( &session->hdr ); + set_last_error( ERROR_WINHTTP_INCORRECT_HANDLE_TYPE ); + return NULL; + } + if (!(connect = heap_alloc_zero( sizeof(connect_t) ))) + { + release_object( &session->hdr ); + return NULL; + } + connect->hdr.type = WINHTTP_HANDLE_TYPE_CONNECT; + connect->hdr.vtbl = &connect_vtbl; + connect->hdr.refs = 1; + connect->hdr.flags = session->hdr.flags; + connect->hdr.callback = session->hdr.callback; + connect->hdr.notify_mask = session->hdr.notify_mask; + + addref_object( &session->hdr ); + connect->session = session; + list_add_head( &session->hdr.children, &connect->hdr.entry ); + + if (server && !(connect->hostname = strdupW( server ))) goto end; + connect->hostport = port; + + if (!(hconnect = alloc_handle( &connect->hdr ))) goto end; + connect->hdr.handle = hconnect; + +end: + release_object( &connect->hdr ); + + TRACE("returning %p\n", hconnect); + return hconnect; +} + +/*********************************************************************** * WinHttpCloseHandle (winhttp.@) */ BOOL WINAPI WinHttpCloseHandle( HINTERNET handle ) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 2c7143e..5f6ce7c 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -42,13 +42,11 @@ static void test_OpenRequest (void) SetLastError(0xdeadbeef); connection = WinHttpConnect(session, NULL, INTERNET_DEFAULT_HTTP_PORT, 0); ok (connection == NULL, "WinHttpConnect succeeded in opening connection to NULL server argument.\n"); - todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %u.\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %u.\n", GetLastError()); /* Test with a valid server name */ connection = WinHttpConnect (session, test_server, INTERNET_DEFAULT_HTTP_PORT, 0); - todo_wine ok(connection != NULL, - "WinHttpConnect failed to open a connection, error: %u.\n", GetLastError()); + ok(connection != NULL, "WinHttpConnect failed to open a connection, error: %u.\n", GetLastError()); request = WinHttpOpenRequest(connection, NULL, NULL, NULL, WINHTTP_NO_REFERER, WINHTTP_DEFAULT_ACCEPT_TYPES, 0); @@ -67,7 +65,7 @@ static void test_OpenRequest (void) done: ret = WinHttpCloseHandle(connection); - todo_wine ok(ret == TRUE, "WinHttpCloseHandle failed on closing connection, got %d.\n", ret); + ok(ret == TRUE, "WinHttpCloseHandle failed on closing connection, got %d.\n", ret); ret = WinHttpCloseHandle(session); ok(ret == TRUE, "WinHttpCloseHandle failed on closing session, got %d.\n", ret); @@ -101,8 +99,7 @@ static void test_SendRequest (void) ok(session != NULL, "WinHttpOpen failed to open session.\n"); connection = WinHttpConnect (session, test_site, INTERNET_DEFAULT_HTTP_PORT, 0); - todo_wine ok(connection != NULL, - "WinHttpConnect failed to open a connection, error: %u.\n", GetLastError()); + ok(connection != NULL, "WinHttpConnect failed to open a connection, error: %u.\n", GetLastError()); request = WinHttpOpenRequest(connection, test_verb, test_file, NULL, WINHTTP_NO_REFERER, WINHTTP_DEFAULT_ACCEPT_TYPES, WINHTTP_FLAG_BYPASS_PROXY_CACHE); @@ -140,7 +137,7 @@ static void test_SendRequest (void) todo_wine ok(ret == TRUE, "WinHttpCloseHandle failed on closing request, got %d.\n", ret); done: ret = WinHttpCloseHandle(connection); - todo_wine ok(ret == TRUE, "WinHttpCloseHandle failed on closing connection, got %d.\n", ret); + ok(ret == TRUE, "WinHttpCloseHandle failed on closing connection, got %d.\n", ret); ret = WinHttpCloseHandle(session); ok(ret == TRUE, "WinHttpCloseHandle failed on closing session, got %d.\n", ret); } @@ -230,8 +227,7 @@ static void test_WinHttpAddHeaders(void) ok(session != NULL, "WinHttpOpen failed to open session.\n"); connection = WinHttpConnect (session, test_site, INTERNET_DEFAULT_HTTP_PORT, 0); - todo_wine ok(connection != NULL, - "WinHttpConnect failed to open a connection, error: %u.\n", GetLastError()); + ok(connection != NULL, "WinHttpConnect failed to open a connection, error: %u.\n", GetLastError()); request = WinHttpOpenRequest(connection, test_verb, test_file, NULL, WINHTTP_NO_REFERER, WINHTTP_DEFAULT_ACCEPT_TYPES, 0); @@ -547,7 +543,7 @@ static void test_WinHttpAddHeaders(void) todo_wine ok(ret == TRUE, "WinHttpCloseHandle failed on closing request, got %d.\n", ret); done: ret = WinHttpCloseHandle(connection); - todo_wine ok(ret == TRUE, "WinHttpCloseHandle failed on closing connection, got %d.\n", ret); + ok(ret == TRUE, "WinHttpCloseHandle failed on closing connection, got %d.\n", ret); ret = WinHttpCloseHandle(session); ok(ret == TRUE, "WinHttpCloseHandle failed on closing session, got %d.\n", ret); diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 1d40fcb..74398a6 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -19,9 +19,17 @@ #ifndef _WINE_WINHTTP_PRIVATE_H_ #define _WINE_WINHTTP_PRIVATE_H_ +#ifndef __WINE_CONFIG_H +# error You must include config.h to use this header +#endif + #include "wine/list.h" #include "wine/unicode.h" +#ifdef HAVE_NETDB_H +# include <netdb.h> +#endif + typedef struct _object_header_t object_header_t; typedef struct @@ -57,6 +65,19 @@ typedef struct LPWSTR proxy_password; } session_t; +typedef struct +{ + object_header_t hdr; + session_t *session; + LPWSTR hostname; /* final destination of the request */ + LPWSTR servername; /* name of the server we directly connect to */ + LPWSTR username; + LPWSTR password; + INTERNET_PORT hostport; + INTERNET_PORT serverport; + struct sockaddr_in sockaddr; +} connect_t; + object_header_t *addref_object( object_header_t * ); object_header_t *grab_object( HINTERNET ); void release_object( object_header_t * );

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 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 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 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 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

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 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

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

19 Aug '08

Module: wine Branch: master Commit: 42115638c8096e1238da435824e5554648b9e073 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42115638c8096e1238da43582… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Aug 18 23:14:19 2008 -0500 msi: Use MsiQueryComponent state to determine the component's state. --- dlls/msi/action.c | 23 +++++++++++++++-------- dlls/msi/tests/package.c | 9 ++++++--- 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index a375000..b2fdbea 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1693,19 +1693,26 @@ static UINT ACTION_FileCost(MSIPACKAGE *package) static void ACTION_GetComponentInstallStates(MSIPACKAGE *package) { MSICOMPONENT *comp; + INSTALLSTATE state; + UINT r; - LIST_FOR_EACH_ENTRY( comp, &package->components, MSICOMPONENT, entry ) - { - INSTALLSTATE res; + state = MsiQueryProductStateW(package->ProductCode); + LIST_FOR_EACH_ENTRY(comp, &package->components, MSICOMPONENT, entry) + { if (!comp->ComponentId) continue; - res = MsiGetComponentPathW( package->ProductCode, - comp->ComponentId, NULL, NULL); - if (res < 0) - res = INSTALLSTATE_ABSENT; - comp->Installed = res; + if (state != INSTALLSTATE_LOCAL && state != INSTALLSTATE_DEFAULT) + comp->Installed = INSTALLSTATE_ABSENT; + else + { + r = MsiQueryComponentStateW(package->ProductCode, NULL, + package->Context, comp->ComponentId, + &comp->Installed); + if (r != ERROR_SUCCESS) + comp->Installed = INSTALLSTATE_ABSENT; + } } } diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index f3f75ad..c27e2fe 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -3794,7 +3794,10 @@ static void test_states(void) action = 0xdeadbee; r = MsiGetFeatureState(hpkg, "five", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); - ok( state == INSTALLSTATE_ABSENT, "Expected INSTALLSTATE_ABSENT, got %d\n", state); + todo_wine + { + ok( state == INSTALLSTATE_ABSENT, "Expected INSTALLSTATE_ABSENT, got %d\n", state); + } ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); state = 0xdeadbee; @@ -4592,9 +4595,9 @@ static void test_states(void) action = 0xdeadbee; r = MsiGetFeatureState(hpkg, "five", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); - ok( state == INSTALLSTATE_ABSENT, "Expected INSTALLSTATE_ABSENT, got %d\n", state); todo_wine { + ok( state == INSTALLSTATE_ABSENT, "Expected INSTALLSTATE_ABSENT, got %d\n", state); ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); } @@ -5393,9 +5396,9 @@ static void test_states(void) action = 0xdeadbee; r = MsiGetFeatureState(hpkg, "five", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); - ok( state == INSTALLSTATE_ABSENT, "Expected INSTALLSTATE_ABSENT, got %d\n", state); todo_wine { + ok( state == INSTALLSTATE_ABSENT, "Expected INSTALLSTATE_ABSENT, got %d\n", state); ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); }

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