September 2011 - Wine-Commits

Alexandre Julliard : wldap32: Include system headers before Windows headers .
by Alexandre Julliard Sept. 5, 2011

Sept. 5, 2011

Module: wine Branch: master Commit: e04866f3cfae4dd90d8c578211360019ab5ff137 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e04866f3cfae4dd90d8c57821… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 5 17:23:34 2011 +0200 wldap32: Include system headers before Windows headers. --- dlls/wldap32/add.c | 10 ++++------ dlls/wldap32/bind.c | 10 ++++------ dlls/wldap32/compare.c | 10 ++++------ dlls/wldap32/control.c | 10 ++++------ dlls/wldap32/delete.c | 10 ++++------ dlls/wldap32/dn.c | 10 ++++------ dlls/wldap32/error.c | 10 ++++------ dlls/wldap32/extended.c | 10 ++++------ dlls/wldap32/init.c | 10 ++++------ dlls/wldap32/misc.c | 10 ++++------ dlls/wldap32/modify.c | 10 ++++------ dlls/wldap32/modrdn.c | 10 ++++------ dlls/wldap32/option.c | 10 ++++------ dlls/wldap32/page.c | 17 +++++++---------- dlls/wldap32/parse.c | 10 ++++------ dlls/wldap32/rename.c | 10 ++++------ dlls/wldap32/search.c | 10 ++++------ dlls/wldap32/value.c | 10 ++++------ 18 files changed, 75 insertions(+), 112 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e04866f3cfae4dd90d8c5…

1 0

Hans Leidekker : msi: Initialize a variable.
by Alexandre Julliard Sept. 5, 2011

Sept. 5, 2011

Module: wine Branch: master Commit: 9cb38911d22e2da7e459d08979f4053b2b9dc0cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cb38911d22e2da7e459d0897… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 5 11:49:17 2011 +0200 msi: Initialize a variable. --- dlls/msi/package.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index e635886..1025607 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1508,6 +1508,7 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, MSIPACKAGE **pPackage) TRACE("%s %p\n", debugstr_w(szPackage), pPackage); + localfile[0] = 0; if( szPackage[0] == '#' ) { handle = atoiW(&szPackage[1]);

1 0

Hans Leidekker : msi: Use a higher value for the initial transform disk id.
by Alexandre Julliard Sept. 5, 2011

Sept. 5, 2011

Module: wine Branch: master Commit: 470688f7292297e4a542bf95be6d5c28653b1427 URL: http://source.winehq.org/git/wine.git/?a=commit;h=470688f7292297e4a542bf95b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 5 11:48:35 2011 +0200 msi: Use a higher value for the initial transform disk id. --- dlls/msi/msipriv.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 998970b..96f0808 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -76,7 +76,7 @@ struct tagMSIOBJECTHDR }; #define MSI_INITIAL_MEDIA_TRANSFORM_OFFSET 10000 -#define MSI_INITIAL_MEDIA_TRANSFORM_DISKID 10000 +#define MSI_INITIAL_MEDIA_TRANSFORM_DISKID 30000 typedef struct tagMSIDATABASE {

1 0

Hans Leidekker : msi/tests: Fix a number of test messages.
by Alexandre Julliard Sept. 5, 2011

Sept. 5, 2011

Module: wine Branch: master Commit: eaf8848d0d7fb0cb6e87a3b83dc9ff595cf5d997 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eaf8848d0d7fb0cb6e87a3b83… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 5 11:48:03 2011 +0200 msi/tests: Fix a number of test messages. --- dlls/msi/tests/action.c | 36 +++--- dlls/msi/tests/automation.c | 10 +- dlls/msi/tests/install.c | 249 +++++++++++++++++++++---------------------- 3 files changed, 147 insertions(+), 148 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=eaf8848d0d7fb0cb6e87a…

1 0

Hans Leidekker : msi: Avoid a leak when a query is executed more than once.
by Alexandre Julliard Sept. 5, 2011

Sept. 5, 2011

Module: wine Branch: master Commit: a8b51497e518817716a8f79c29999d22726ad35d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8b51497e518817716a8f79c2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 5 11:47:37 2011 +0200 msi: Avoid a leak when a query is executed more than once. --- dlls/msi/where.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/msi/where.c b/dlls/msi/where.c index 5304900..0e346d6 100644 --- a/dlls/msi/where.c +++ b/dlls/msi/where.c @@ -73,6 +73,7 @@ typedef struct tagMSIWHEREVIEW struct expr *cond; UINT rec_index; MSIORDERINFO *order_info; + UINT error; } MSIWHEREVIEW; #define INITIAL_REORDER_SIZE 16 @@ -617,6 +618,9 @@ static UINT WHERE_execute( struct tagMSIVIEW *view, MSIRECORD *record ) if( !table ) return ERROR_FUNCTION_FAILED; + if (wv->reorder) + return wv->error; + r = init_reorder(wv); if (r != ERROR_SUCCESS) return r; @@ -648,7 +652,9 @@ static UINT WHERE_execute( struct tagMSIVIEW *view, MSIRECORD *record ) if (wv->order_info) r = wv->order_info->error; + msi_free( rows ); + wv->error = r; return r; }

1 0

Hans Leidekker : winhttp: Fix some memory leaks.
by Alexandre Julliard Sept. 5, 2011

Sept. 5, 2011

Module: wine Branch: master Commit: d5a98e5d85090dbc28c1795033048470a122496e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5a98e5d85090dbc28c179503… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 5 11:46:51 2011 +0200 winhttp: Fix some memory leaks. --- dlls/winhttp/request.c | 18 ++++++++++++++++-- dlls/winhttp/session.c | 11 ++++++----- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index c46ce21..0d9e60a 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2403,20 +2403,32 @@ static HRESULT WINAPI winhttp_request_SetProxy( { case HTTPREQUEST_PROXYSETTING_DEFAULT: request->proxy.dwAccessType = WINHTTP_ACCESS_TYPE_DEFAULT_PROXY; + heap_free( (WCHAR *)request->proxy.lpszProxy ); + heap_free( (WCHAR *)request->proxy.lpszProxyBypass ); request->proxy.lpszProxy = NULL; request->proxy.lpszProxyBypass = NULL; break; case HTTPREQUEST_PROXYSETTING_DIRECT: request->proxy.dwAccessType = WINHTTP_ACCESS_TYPE_NO_PROXY; + heap_free( (WCHAR *)request->proxy.lpszProxy ); + heap_free( (WCHAR *)request->proxy.lpszProxyBypass ); request->proxy.lpszProxy = NULL; request->proxy.lpszProxyBypass = NULL; break; case HTTPREQUEST_PROXYSETTING_PROXY: request->proxy.dwAccessType = WINHTTP_ACCESS_TYPE_NAMED_PROXY; - if (V_VT( &proxy_server ) == VT_BSTR) request->proxy.lpszProxy = strdupW( V_BSTR( &proxy_server ) ); - if (V_VT( &bypass_list ) == VT_BSTR) request->proxy.lpszProxyBypass = strdupW( V_BSTR( &bypass_list ) ); + if (V_VT( &proxy_server ) == VT_BSTR) + { + heap_free( (WCHAR *)request->proxy.lpszProxy ); + request->proxy.lpszProxy = strdupW( V_BSTR( &proxy_server ) ); + } + if (V_VT( &bypass_list ) == VT_BSTR) + { + heap_free( (WCHAR *)request->proxy.lpszProxyBypass ); + request->proxy.lpszProxyBypass = strdupW( V_BSTR( &bypass_list ) ); + } break; default: @@ -3334,6 +3346,8 @@ HRESULT WinHttpRequest_create( IUnknown *unknown, void **obj ) request->IWinHttpRequest_iface.lpVtbl = &winhttp_request_vtbl; request->refs = 1; request->state = REQUEST_STATE_UNINITIALIZED; + request->proxy.lpszProxy = NULL; + request->proxy.lpszProxyBypass = NULL; InitializeCriticalSection( &request->cs ); *obj = &request->IWinHttpRequest_iface; diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 1fe1889..b7cc31b 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -206,6 +206,7 @@ HINTERNET WINAPI WinHttpOpen( LPCWSTR agent, DWORD access, LPCWSTR proxy, LPCWST session->hdr.flags = flags; session->hdr.refs = 1; session->hdr.redirect_policy = WINHTTP_OPTION_REDIRECT_POLICY_DISALLOW_HTTPS_TO_HTTP; + list_init( &session->hdr.children ); session->resolve_timeout = DEFAULT_RESOLVE_TIMEOUT; session->connect_timeout = DEFAULT_CONNECT_TIMEOUT; session->send_timeout = DEFAULT_SEND_TIMEOUT; @@ -498,6 +499,7 @@ HINTERNET WINAPI WinHttpConnect( HINTERNET hsession, LPCWSTR server, INTERNET_PO connect->hdr.callback = session->hdr.callback; connect->hdr.notify_mask = session->hdr.notify_mask; connect->hdr.context = session->hdr.context; + list_init( &connect->hdr.children ); addref_object( &session->hdr ); connect->session = session; @@ -505,9 +507,7 @@ HINTERNET WINAPI WinHttpConnect( HINTERNET hsession, LPCWSTR server, INTERNET_PO if (!(connect->hostname = strdupW( server ))) goto end; connect->hostport = port; - - if (!set_server_for_hostname( connect, server, port )) - goto end; + if (!set_server_for_hostname( connect, server, port )) goto end; if (!(hconnect = alloc_handle( &connect->hdr ))) goto end; connect->hdr.handle = hconnect; @@ -516,7 +516,7 @@ HINTERNET WINAPI WinHttpConnect( HINTERNET hsession, LPCWSTR server, INTERNET_PO end: release_object( &connect->hdr ); - + release_object( &session->hdr ); TRACE("returning %p\n", hconnect); return hconnect; } @@ -930,6 +930,7 @@ HINTERNET WINAPI WinHttpOpenRequest( HINTERNET hconnect, LPCWSTR verb, LPCWSTR o request->hdr.callback = connect->hdr.callback; request->hdr.notify_mask = connect->hdr.notify_mask; request->hdr.context = connect->hdr.context; + list_init( &request->hdr.children ); addref_object( &connect->hdr ); request->connect = connect; @@ -970,7 +971,7 @@ HINTERNET WINAPI WinHttpOpenRequest( HINTERNET hconnect, LPCWSTR verb, LPCWSTR o end: release_object( &request->hdr ); - + release_object( &connect->hdr ); TRACE("returning %p\n", hrequest); return hrequest; }

1 0

Hans Leidekker : winhttp: Properly test a boolean variant.
by Alexandre Julliard Sept. 5, 2011

Sept. 5, 2011

Module: wine Branch: master Commit: 82f76510055461f4a4706feed300b2db5479ca63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82f76510055461f4a4706feed… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 5 11:45:45 2011 +0200 winhttp: Properly test a boolean variant. --- dlls/winhttp/request.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index a3c2207..c46ce21 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2541,7 +2541,7 @@ static HRESULT WINAPI winhttp_request_Open( path[uc.dwUrlPathLength + uc.dwExtraInfoLength] = 0; if (!(verb = strdupW( method ))) goto error; - if (V_BOOL( &async ) == VARIANT_TRUE) flags |= WINHTTP_FLAG_ASYNC; + if (V_BOOL( &async )) flags |= WINHTTP_FLAG_ASYNC; if (!(hsession = WinHttpOpen( user_agentW, WINHTTP_ACCESS_TYPE_DEFAULT_PROXY, NULL, NULL, flags ))) { err = get_last_error();

1 0

Alistair Leslie-Hughes : ntdsapi: Add stubs DsServerRegisterSpnA, DsServerRegisterSpnW.
by Alexandre Julliard Sept. 5, 2011

Sept. 5, 2011

Module: wine Branch: master Commit: 5b49e228aebe8d373a9fe7f35c04454a08b4a53b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b49e228aebe8d373a9fe7f35… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Aug 31 15:34:07 2011 +1000 ntdsapi: Add stubs DsServerRegisterSpnA, DsServerRegisterSpnW. --- dlls/ntdsapi/ntdsapi.c | 20 ++++++++++++++++++++ dlls/ntdsapi/ntdsapi.spec | 4 ++-- include/ntdsapi.h | 11 +++++++++++ 3 files changed, 33 insertions(+), 2 deletions(-) diff --git a/dlls/ntdsapi/ntdsapi.c b/dlls/ntdsapi/ntdsapi.c index 76565fb..1ffbd9d 100644 --- a/dlls/ntdsapi/ntdsapi.c +++ b/dlls/ntdsapi/ntdsapi.c @@ -165,3 +165,23 @@ DWORD WINAPI DsGetSpnA(DS_SPN_NAME_TYPE ServType, LPCSTR Servlass, LPCSTR ServNa return ERROR_CALL_NOT_IMPLEMENTED; } + +/*********************************************************************** + * DsServerRegisterSpnA (NTDSAPI.@) + */ +DWORD WINAPI DsServerRegisterSpnA(DS_SPN_WRITE_OP operation, LPCSTR ServiceClass, LPCSTR UserObjectDN) +{ + FIXME("(%d,%s,%s): stub!\n", operation, + debugstr_a(ServiceClass), debugstr_a(UserObjectDN)); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/*********************************************************************** + * DsServerRegisterSpnW (NTDSAPI.@) + */ +DWORD WINAPI DsServerRegisterSpnW(DS_SPN_WRITE_OP operation, LPCWSTR ServiceClass, LPCWSTR UserObjectDN) +{ + FIXME("(%d,%s,%s): stub!\n", operation, + debugstr_w(ServiceClass), debugstr_w(UserObjectDN)); + return ERROR_CALL_NOT_IMPLEMENTED; +} diff --git a/dlls/ntdsapi/ntdsapi.spec b/dlls/ntdsapi/ntdsapi.spec index 8a4758a..f4ae6f8 100644 --- a/dlls/ntdsapi/ntdsapi.spec +++ b/dlls/ntdsapi/ntdsapi.spec @@ -80,8 +80,8 @@ @ stub DsReplicaUpdateRefsW @ stub DsReplicaVerifyObjectsA @ stub DsReplicaVerifyObjectsW -@ stub DsServerRegisterSpnA -@ stub DsServerRegisterSpnW +@ stdcall DsServerRegisterSpnA(long str str) +@ stdcall DsServerRegisterSpnW(long wstr wstr) @ stub DsUnBindA @ stub DsUnBindW @ stub DsUnquoteRdnValueA diff --git a/include/ntdsapi.h b/include/ntdsapi.h index 9fecdab..6d2902f 100644 --- a/include/ntdsapi.h +++ b/include/ntdsapi.h @@ -39,6 +39,17 @@ typedef enum DS_SPN_SERVICE = 5 } DS_SPN_NAME_TYPE; +typedef enum +{ + DS_SPN_ADD_SPN_OP = 0, + DS_SPN_REPLACE_SPN_OP = 1, + DS_SPN_DELETE_SPN_OP = 2 +} DS_SPN_WRITE_OP; + +DWORD WINAPI DsServerRegisterSpnA(DS_SPN_WRITE_OP operation, LPCSTR ServiceClass, LPCSTR UserObjectDN); +DWORD WINAPI DsServerRegisterSpnW(DS_SPN_WRITE_OP operation, LPCWSTR ServiceClass, LPCWSTR UserObjectDN); +#define DsServerRegisterSpn WINELIB_NAME_AW(DsServerRegisterSpn) + #ifdef __cplusplus } #endif

1 0

Frédéric Delanoy : cmd/tests: Add tests for IF '= =' operator.
by Alexandre Julliard Sept. 5, 2011

Sept. 5, 2011

Module: wine Branch: master Commit: f35d52e20ee4b494636ec8e88b96ee9e2b6722b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f35d52e20ee4b494636ec8e88… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sun Sep 4 16:33:29 2011 +0200 cmd/tests: Add tests for IF '==' operator. --- programs/cmd/tests/test_builtins.cmd | 6 ++++++ programs/cmd/tests/test_builtins.cmd.exp | 6 ++++++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 5bd375e..9a5f786 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -576,6 +576,12 @@ if /i foo==FOO echo if /i seems to work if /i not foo==FOO echo if /i seems to be broken if /I foo==FOO echo if /I seems to work if /I not foo==FOO echo if /I seems to be broken +echo Testing string comparisons +if abc == abc (echo equal) else echo non equal +if abc =="abc" (echo equal) else echo non equal +if "abc"== abc (echo equal) else echo non equal +if "abc"== "abc" (echo equal) else echo non equal +echo Testing tabs handling if(a)tab@1==1 echo doom if @tab(a)1==1 echo doom if 1==1 (echo doom) else(a)tab@echo quake diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index c67b10f..514a635 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -387,6 +387,12 @@ Testing case sensitivity with and without /i option if seems to default to case sensitivity if /i seems to work if /I seems to work +Testing string comparisons +equal +(a)todo_wine@non equal +(a)todo_wine@non equal +equal +Testing tabs handling doom doom doom

1 0

André Hentschel : cryptnet: Use the constants from the wininet header.
by Alexandre Julliard Sept. 5, 2011

Sept. 5, 2011

Module: wine Branch: master Commit: 220191abe1de3614c1512704f4ada9881bacdd7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=220191abe1de3614c1512704f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Sep 4 19:29:35 2011 +0200 cryptnet: Use the constants from the wininet header. --- dlls/cryptnet/cryptnet_main.c | 41 +++++++++++++++++++++++++++++------------ 1 files changed, 29 insertions(+), 12 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index ec9dddd..6464908 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -583,16 +583,25 @@ static BOOL CRYPT_CrackUrl(LPCWSTR pszURL, URL_COMPONENTSW *components) memset(components, 0, sizeof(*components)); components->dwStructSize = sizeof(*components); - components->lpszHostName = CryptMemAlloc(MAX_PATH * sizeof(WCHAR)); - components->dwHostNameLength = MAX_PATH; - components->lpszUrlPath = CryptMemAlloc(MAX_PATH * 2 * sizeof(WCHAR)); - components->dwUrlPathLength = 2 * MAX_PATH; + components->lpszHostName = CryptMemAlloc(INTERNET_MAX_HOST_NAME_LENGTH * sizeof(WCHAR)); + components->dwHostNameLength = INTERNET_MAX_HOST_NAME_LENGTH; + if (!components->lpszHostName) + { + SetLastError(ERROR_OUTOFMEMORY); + return FALSE; + } + components->lpszUrlPath = CryptMemAlloc(INTERNET_MAX_PATH_LENGTH * sizeof(WCHAR)); + components->dwUrlPathLength = INTERNET_MAX_PATH_LENGTH; + if (!components->lpszUrlPath) + { + CryptMemFree(components->lpszHostName); + SetLastError(ERROR_OUTOFMEMORY); + return FALSE; + } + ret = InternetCrackUrlW(pszURL, 0, ICU_DECODE, components); if (ret) { - if ((components->dwUrlPathLength == 2 * MAX_PATH - 1) || - (components->dwHostNameLength == MAX_PATH - 1)) - FIXME("Buffers are too small\n"); switch (components->nScheme) { case INTERNET_SCHEME_FTP: @@ -1025,16 +1034,19 @@ static BOOL WINAPI File_RetrieveEncodedObjectW(LPCWSTR pszURL, *ppfnFreeObject = CRYPT_FreeBlob; *ppvFreeContext = NULL; - components.lpszUrlPath = CryptMemAlloc(MAX_PATH * 2 * sizeof(WCHAR)); - components.dwUrlPathLength = 2 * MAX_PATH; + components.lpszUrlPath = CryptMemAlloc(INTERNET_MAX_PATH_LENGTH * sizeof(WCHAR)); + components.dwUrlPathLength = INTERNET_MAX_PATH_LENGTH; + if (!components.lpszUrlPath) + { + SetLastError(ERROR_OUTOFMEMORY); + return FALSE; + } + ret = InternetCrackUrlW(pszURL, 0, ICU_DECODE, &components); if (ret) { LPWSTR path; - if (components.dwUrlPathLength == 2 * MAX_PATH - 1) - FIXME("Buffers are too small\n"); - /* 3 == lstrlenW(L"c:") + 1 */ path = CryptMemAlloc((components.dwUrlPathLength + 3) * sizeof(WCHAR)); if (path) @@ -1087,6 +1099,11 @@ static BOOL WINAPI File_RetrieveEncodedObjectW(LPCWSTR pszURL, ret = FALSE; CryptMemFree(path); } + else + { + SetLastError(ERROR_OUTOFMEMORY); + ret = FALSE; + } } CryptMemFree(components.lpszUrlPath); return ret;

1 0