wine-commits March 2009

wine-commits@winehq.org

2 participants
834 discussions

James Hawkins : msi: Use a SQL marker to query the _Property table when fetching a property.
by Alexandre Julliard 02 Mar '09

02 Mar '09

Module: wine Branch: master Commit: 293bdffa29f5daba1195ad761de7e646bf6c1db0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=293bdffa29f5daba1195ad761… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Mar 2 02:33:56 2009 -0800 msi: Use a SQL marker to query the _Property table when fetching a property. --- dlls/msi/package.c | 24 ++++++++++++++++++++++-- 1 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index f662fe0..7172ff4 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1403,16 +1403,36 @@ UINT WINAPI MsiSetPropertyW( MSIHANDLE hInstall, LPCWSTR szName, LPCWSTR szValue static MSIRECORD *MSI_GetPropertyRow( MSIPACKAGE *package, LPCWSTR name ) { + MSIQUERY *view; + MSIRECORD *rec, *row = NULL; + UINT r; + static const WCHAR query[]= { 'S','E','L','E','C','T',' ','`','V','a','l','u','e','`',' ', 'F','R','O','M',' ' ,'`','_','P','r','o','p','e','r','t','y','`', ' ','W','H','E','R','E',' ' ,'`','_','P','r','o','p','e','r','t','y','`', - '=','\'','%','s','\'',0}; + '=','?',0}; if (!name || !*name) return NULL; - return MSI_QueryGetRecord( package->db, query, name ); + rec = MSI_CreateRecord(1); + if (!rec) + return NULL; + + MSI_RecordSetStringW(rec, 1, name); + + r = MSI_DatabaseOpenViewW(package->db, query, &view); + if (r == ERROR_SUCCESS) + { + MSI_ViewExecute(view, rec); + MSI_ViewFetch(view, &row); + MSI_ViewClose(view); + msiobj_release(&view->hdr); + } + + msiobj_release(&rec->hdr); + return row; } /* internal function, not compatible with MsiGetPropertyW */

1 0

James Hawkins : msi: Delete the view on error.
by Alexandre Julliard 02 Mar '09

02 Mar '09

Module: wine Branch: master Commit: f36e13fd818e3e9208ba05a3b6c730e6b4db4fea URL: http://source.winehq.org/git/wine.git/?a=commit;h=f36e13fd818e3e9208ba05a3b… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Mar 2 02:33:48 2009 -0800 msi: Delete the view on error. --- dlls/msi/sql.y | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/msi/sql.y b/dlls/msi/sql.y index f5616ba..425b584 100644 --- a/dlls/msi/sql.y +++ b/dlls/msi/sql.y @@ -961,7 +961,11 @@ UINT MSI_ParseSQL( MSIDATABASE *db, LPCWSTR command, MSIVIEW **phview, TRACE("Parse returned %d\n", r); if( r ) { - *sql.view = NULL; + if (*sql.view) + { + (*sql.view)->ops->delete(*sql.view); + *sql.view = NULL; + } return sql.r; }

1 0

James Hawkins : msi: The PATH environment variable can be longer than MAX_PATH, so dynamically allocate strings to deal with that.
by Alexandre Julliard 02 Mar '09

02 Mar '09

Module: wine Branch: master Commit: 046bcc918c70f760870363ee5cfba0a1470328cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=046bcc918c70f760870363ee5… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Mar 2 02:33:41 2009 -0800 msi: The PATH environment variable can be longer than MAX_PATH, so dynamically allocate strings to deal with that. --- dlls/msi/tests/package.c | 20 ++++++++++++++++---- 1 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index f9029e6..46fde5a 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -7330,6 +7330,8 @@ static void test_appsearch_reglocator(void) BOOL space, version; HKEY hklm, classes; HKEY hkcu, users; + LPSTR pathdata; + LPSTR pathvar; LPCSTR str; LPSTR ptr; LONG res; @@ -7772,12 +7774,22 @@ static void test_appsearch_reglocator(void) ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(!lstrcmpA(prop, "#-42"), "Expected \"#-42\", got \"%s\"\n", prop); - ExpandEnvironmentStringsA("%PATH%", path, MAX_PATH); + size = ExpandEnvironmentStringsA("%PATH%", NULL, 0); + pathvar = HeapAlloc(GetProcessHeap(), 0, size); + ExpandEnvironmentStringsA("%PATH%", pathvar, size); - size = MAX_PATH; - r = MsiGetPropertyA(hpkg, "SIGPROP4", prop, &size); + size = 0; + r = MsiGetPropertyA(hpkg, "SIGPROP4", NULL, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(!lstrcmpA(prop, path), "Expected \"%s\", got \"%s\"\n", path, prop); + + pathdata = HeapAlloc(GetProcessHeap(), 0, ++size); + r = MsiGetPropertyA(hpkg, "SIGPROP4", pathdata, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(pathdata, pathvar), + "Expected \"%s\", got \"%s\"\n", pathvar, pathdata); + + HeapFree(GetProcessHeap(), 0, pathvar); + HeapFree(GetProcessHeap(), 0, pathdata); size = MAX_PATH; r = MsiGetPropertyA(hpkg, "SIGPROP5", prop, &size);

1 0

James Hawkins : msi: The _Streams and _Storages table are special and always exist.
by Alexandre Julliard 02 Mar '09

02 Mar '09

Module: wine Branch: master Commit: 37c5e0401013939c8e4c6eef1f9cf5a0b2a00e4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=37c5e0401013939c8e4c6eef1… Author: James Hawkins <truiken(a)gmail.com> Date: Sun Mar 1 21:41:46 2009 -0800 msi: The _Streams and _Storages table are special and always exist. --- dlls/msi/table.c | 8 +++++--- dlls/msi/tests/db.c | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 19a9915..ab86bcd 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -1060,9 +1060,11 @@ BOOL TABLE_Exists( MSIDATABASE *db, LPCWSTR name ) UINT r, table_id = 0, i, count; MSITABLE *table = NULL; - if( !lstrcmpW( name, szTables ) ) - return TRUE; - if( !lstrcmpW( name, szColumns ) ) + static const WCHAR szStreams[] = {'_','S','t','r','e','a','m','s',0}; + static const WCHAR szStorages[] = {'_','S','t','o','r','a','g','e','s',0}; + + if( !lstrcmpW( name, szTables ) || !lstrcmpW( name, szColumns ) || + !lstrcmpW( name, szStreams ) || !lstrcmpW( name, szStorages ) ) return TRUE; r = msi_string2idW( db->strings, name, &table_id ); diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 641202b..ab10da9 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -3965,12 +3965,12 @@ static void test_special_tables(void) query = "CREATE TABLE `_Storages` ( " "`foo` INT NOT NULL, `bar` INT LOCALIZABLE PRIMARY KEY `foo`)"; r = run_query(hdb, 0, query); - todo_wine ok(r == ERROR_BAD_QUERY_SYNTAX, "created _Streams table\n"); + ok(r == ERROR_BAD_QUERY_SYNTAX, "created _Streams table\n"); query = "CREATE TABLE `_Streams` ( " "`foo` INT NOT NULL, `bar` INT LOCALIZABLE PRIMARY KEY `foo`)"; r = run_query(hdb, 0, query); - todo_wine ok(r == ERROR_BAD_QUERY_SYNTAX, "created _Streams table\n"); + ok(r == ERROR_BAD_QUERY_SYNTAX, "created _Streams table\n"); query = "CREATE TABLE `_Tables` ( " "`foo` INT NOT NULL, `bar` INT LOCALIZABLE PRIMARY KEY `foo`)";

1 0

James Hawkins : msi: Column attributes for temporary string and int columns should be g and j respectively .
by Alexandre Julliard 02 Mar '09

02 Mar '09

Module: wine Branch: master Commit: c9b3bc1165022d970eacc3f143b3107f2f6bc3c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9b3bc1165022d970eacc3f14… Author: James Hawkins <truiken(a)gmail.com> Date: Sun Mar 1 21:41:39 2009 -0800 msi: Column attributes for temporary string and int columns should be g and j respectively. --- dlls/msi/alter.c | 4 ++-- dlls/msi/create.c | 4 ++-- dlls/msi/delete.c | 7 ++++--- dlls/msi/distinct.c | 7 ++++--- dlls/msi/insert.c | 16 ++++++++-------- dlls/msi/join.c | 7 ++++--- dlls/msi/msipriv.h | 2 +- dlls/msi/msiquery.c | 27 ++++++++++++++++++++------- dlls/msi/select.c | 9 +++++---- dlls/msi/storages.c | 9 ++++++--- dlls/msi/streams.c | 9 ++++++--- dlls/msi/table.c | 18 ++++++++++++------ dlls/msi/tests/db.c | 4 ++-- dlls/msi/update.c | 6 +++--- dlls/msi/where.c | 9 +++++---- 15 files changed, 84 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c9b3bc1165022d970eacc…

1 0

James Hawkins : msi: Order primary keys to be first in the column list when creating a table.
by Alexandre Julliard 02 Mar '09

02 Mar '09

Module: wine Branch: master Commit: c07b554edcd0b71f92c662c6c0042b76354c6862 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c07b554edcd0b71f92c662c6c… Author: James Hawkins <truiken(a)gmail.com> Date: Sun Mar 1 21:41:30 2009 -0800 msi: Order primary keys to be first in the column list when creating a table. --- dlls/msi/sql.y | 53 +++++- dlls/msi/tests/db.c | 486 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 529 insertions(+), 10 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c07b554edcd0b71f92c66…

1 0

James Hawkins : msi: Correctly order transposed column values in the INSERT query.
by Alexandre Julliard 02 Mar '09

02 Mar '09

Module: wine Branch: master Commit: b3c9875cf770aee477c2a4bc92cc0c27b9dee5bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3c9875cf770aee477c2a4bc9… Author: James Hawkins <truiken(a)gmail.com> Date: Sun Mar 1 21:41:22 2009 -0800 msi: Correctly order transposed column values in the INSERT query. --- dlls/msi/database.c | 2 +- dlls/msi/insert.c | 127 +++++++++++++++++++++++++++++++++++++++++++++++++- dlls/msi/msipriv.h | 2 +- dlls/msi/select.c | 4 +- dlls/msi/storages.c | 13 ++++-- dlls/msi/streams.c | 13 ++++-- dlls/msi/table.c | 49 +++++++++++++++---- dlls/msi/tests/db.c | 110 ++++++++++++++++++++++++++++++++++++++++++++ 8 files changed, 294 insertions(+), 26 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b3c9875cf770aee477c2a…

1 0

Jacek Caban : urlmon: Added IInternetPriority interface stup implementation to FtpProtocol.
by Alexandre Julliard 02 Mar '09

02 Mar '09

Module: wine Branch: master Commit: 4063a32f80de44307cb34e0b0e2137142dcf510a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4063a32f80de44307cb34e0b0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 2 03:21:43 2009 +0100 urlmon: Added IInternetPriority interface stup implementation to FtpProtocol. --- dlls/urlmon/ftp.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 51 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/ftp.c b/dlls/urlmon/ftp.c index 7b528ad..f79641e 100644 --- a/dlls/urlmon/ftp.c +++ b/dlls/urlmon/ftp.c @@ -23,12 +23,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(urlmon); typedef struct { const IInternetProtocolVtbl *lpInternetProtocolVtbl; + const IInternetPriorityVtbl *lpInternetPriorityVtbl; + LONG ref; } FtpProtocol; #define PROTOCOL_THIS(iface) DEFINE_THIS(FtpProtocol, InternetProtocol, iface) #define PROTOCOL(x) ((IInternetProtocol*) &(x)->lpInternetProtocolVtbl) +#define PRIORITY(x) ((IInternetPriority*) &(x)->lpInternetPriorityVtbl) static HRESULT WINAPI FtpProtocol_QueryInterface(IInternetProtocol *iface, REFIID riid, void **ppv) { @@ -44,6 +47,9 @@ static HRESULT WINAPI FtpProtocol_QueryInterface(IInternetProtocol *iface, REFII }else if(IsEqualGUID(&IID_IInternetProtocol, riid)) { TRACE("(%p)->(IID_IInternetProtocol %p)\n", This, ppv); *ppv = PROTOCOL(This); + }else if(IsEqualGUID(&IID_IInternetPriority, riid)) { + TRACE("(%p)->(IID_IInternetPriority %p)\n", This, ppv); + *ppv = PRIORITY(This); } if(*ppv) { @@ -173,6 +179,50 @@ static const IInternetProtocolVtbl FtpProtocolVtbl = { FtpProtocol_UnlockRequest }; +#define PRIORITY_THIS(iface) DEFINE_THIS(FtpProtocol, InternetPriority, iface) + +static HRESULT WINAPI FtpPriority_QueryInterface(IInternetPriority *iface, REFIID riid, void **ppv) +{ + FtpProtocol *This = PRIORITY_THIS(iface); + return IInternetProtocol_QueryInterface(PROTOCOL(This), riid, ppv); +} + +static ULONG WINAPI FtpPriority_AddRef(IInternetPriority *iface) +{ + FtpProtocol *This = PRIORITY_THIS(iface); + return IInternetProtocol_AddRef(PROTOCOL(This)); +} + +static ULONG WINAPI FtpPriority_Release(IInternetPriority *iface) +{ + FtpProtocol *This = PRIORITY_THIS(iface); + return IInternetProtocol_Release(PROTOCOL(This)); +} + +static HRESULT WINAPI FtpPriority_SetPriority(IInternetPriority *iface, LONG nPriority) +{ + FtpProtocol *This = PRIORITY_THIS(iface); + FIXME("(%p)->(%d)\n", This, nPriority); + return E_NOTIMPL; +} + +static HRESULT WINAPI FtpPriority_GetPriority(IInternetPriority *iface, LONG *pnPriority) +{ + FtpProtocol *This = PRIORITY_THIS(iface); + FIXME("(%p)->(%p)\n", This, pnPriority); + return E_NOTIMPL; +} + +#undef PRIORITY_THIS + +static const IInternetPriorityVtbl FtpPriorityVtbl = { + FtpPriority_QueryInterface, + FtpPriority_AddRef, + FtpPriority_Release, + FtpPriority_SetPriority, + FtpPriority_GetPriority +}; + HRESULT FtpProtocol_Construct(IUnknown *pUnkOuter, LPVOID *ppobj) { FtpProtocol *ret; @@ -184,6 +234,7 @@ HRESULT FtpProtocol_Construct(IUnknown *pUnkOuter, LPVOID *ppobj) ret = heap_alloc(sizeof(FtpProtocol)); ret->lpInternetProtocolVtbl = &FtpProtocolVtbl; + ret->lpInternetPriorityVtbl = &FtpPriorityVtbl; ret->ref = 1; *ppobj = PROTOCOL(ret);

1 0

Jacek Caban : urlmon: Move HttpProtocolVtbl to its implementation ( code clean up).
by Alexandre Julliard 02 Mar '09

02 Mar '09

Module: wine Branch: master Commit: a7ef2f4ef0af1cb954ecb7abb6f2c36d1dba3aaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7ef2f4ef0af1cb954ecb7abb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 2 03:21:22 2009 +0100 urlmon: Move HttpProtocolVtbl to its implementation (code clean up). --- dlls/urlmon/http.c | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/urlmon/http.c b/dlls/urlmon/http.c index 99c22ff..80eefbe 100644 --- a/dlls/urlmon/http.c +++ b/dlls/urlmon/http.c @@ -461,6 +461,22 @@ static HRESULT WINAPI HttpProtocol_UnlockRequest(IInternetProtocol *iface) #undef PROTOCOL_THIS +static const IInternetProtocolVtbl HttpProtocolVtbl = { + HttpProtocol_QueryInterface, + HttpProtocol_AddRef, + HttpProtocol_Release, + HttpProtocol_Start, + HttpProtocol_Continue, + HttpProtocol_Abort, + HttpProtocol_Terminate, + HttpProtocol_Suspend, + HttpProtocol_Resume, + HttpProtocol_Read, + HttpProtocol_Seek, + HttpProtocol_LockRequest, + HttpProtocol_UnlockRequest +}; + #define PRIORITY_THIS(iface) DEFINE_THIS(HttpProtocol, InternetPriority, iface) static HRESULT WINAPI HttpPriority_QueryInterface(IInternetPriority *iface, REFIID riid, void **ppv) @@ -511,22 +527,6 @@ static const IInternetPriorityVtbl HttpPriorityVtbl = { HttpPriority_GetPriority }; -static const IInternetProtocolVtbl HttpProtocolVtbl = { - HttpProtocol_QueryInterface, - HttpProtocol_AddRef, - HttpProtocol_Release, - HttpProtocol_Start, - HttpProtocol_Continue, - HttpProtocol_Abort, - HttpProtocol_Terminate, - HttpProtocol_Suspend, - HttpProtocol_Resume, - HttpProtocol_Read, - HttpProtocol_Seek, - HttpProtocol_LockRequest, - HttpProtocol_UnlockRequest -}; - static HRESULT create_http_protocol(BOOL https, void **ppobj) { HttpProtocol *ret;

1 0

Jacek Caban : urlmon: Move HttpProtocol:: Start implementation to generic Protocol object.
by Alexandre Julliard 02 Mar '09

02 Mar '09

Module: wine Branch: master Commit: a4ba18a50dd132e39da3214a753ce653466bb3e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4ba18a50dd132e39da3214a7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 2 03:21:07 2009 +0100 urlmon: Move HttpProtocol::Start implementation to generic Protocol object. --- dlls/urlmon/http.c | 507 ++++++++++++++------------------------------- dlls/urlmon/protocol.c | 161 ++++++++++++++ dlls/urlmon/urlmon_main.h | 3 + 3 files changed, 316 insertions(+), 355 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a4ba18a50dd132e39da32…

1 0

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