March 2010 - Wine-Commits - list.winehq.org

Juan Lang : iphlpapi: Remove an unused define.
by Alexandre Julliard March 26, 2010

March 26, 2010

Module: wine Branch: master Commit: 88c4210b4a83ce41d8852be659e53a52f0c9e132 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88c4210b4a83ce41d8852be65… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Mar 23 14:57:22 2010 -0700 iphlpapi: Remove an unused define. --- dlls/iphlpapi/ifenum.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/iphlpapi/ifenum.c b/dlls/iphlpapi/ifenum.c index 5a3db75..4628b21 100644 --- a/dlls/iphlpapi/ifenum.c +++ b/dlls/iphlpapi/ifenum.c @@ -115,8 +115,6 @@ #define INITIAL_INTERFACES_ASSUMED 4 -#define INDEX_IS_LOOPBACK 0x00800000 - /* Functions */ static int isLoopbackInterface(int fd, const char *name)

1 0

Michael Stefaniuc : inetmib1/tests: Fix duplicate expressions in if condition.
by Alexandre Julliard March 26, 2010

March 26, 2010

Module: wine Branch: master Commit: f7883024704409ea5bc30a8c79fc4efe0a6af576 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7883024704409ea5bc30a8c7… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 26 13:13:04 2010 +0100 inetmib1/tests: Fix duplicate expressions in if condition. --- dlls/inetmib1/tests/main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/inetmib1/tests/main.c b/dlls/inetmib1/tests/main.c index 158e23c..cc0e56f 100644 --- a/dlls/inetmib1/tests/main.c +++ b/dlls/inetmib1/tests/main.c @@ -189,8 +189,8 @@ static void testQuery(void) vars[2].name.idLength)) moreData = FALSE; else if (!SnmpUtilOidCmp(&vars[0].name, &vars2[0].name) || - !SnmpUtilOidCmp(&vars[0].name, &vars2[0].name) || - !SnmpUtilOidCmp(&vars[0].name, &vars2[0].name)) + !SnmpUtilOidCmp(&vars[1].name, &vars2[1].name) || + !SnmpUtilOidCmp(&vars[2].name, &vars2[2].name)) { /* If the OID isn't modified, the function isn't implemented on this * platform, skip the remaining tests.

1 0

Hans Leidekker : include: Add some missing defines.
by Alexandre Julliard March 26, 2010

March 26, 2010

Module: wine Branch: master Commit: a9cd43db2fc6388782de47e007135d208422b545 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9cd43db2fc6388782de47e00… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 26 12:10:54 2010 +0100 include: Add some missing defines. --- include/sspi.h | 2 ++ include/winerror.h | 1 + 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/include/sspi.h b/include/sspi.h index f8a71bd..6e69c09 100644 --- a/include/sspi.h +++ b/include/sspi.h @@ -131,6 +131,8 @@ typedef struct _SecPkgInfoW #define SECPKG_FLAG_DELEGATION 0x00020000 #define SECPKG_FLAG_READONLY_WITH_CHECKSUM 0x00040000 +#define SECPKG_ID_NONE 0xffff + typedef struct _SecBuffer { ULONG cbBuffer; diff --git a/include/winerror.h b/include/winerror.h index f6c7b0f..ff31d4d 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -2232,6 +2232,7 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define SEC_I_CONTINUE_NEEDED _HRESULT_TYPEDEF_(0x00090312L) #define SEC_I_COMPLETE_NEEDED _HRESULT_TYPEDEF_(0x00090313L) #define SEC_I_COMPLETE_AND_CONTINUE _HRESULT_TYPEDEF_(0x00090314L) +#define SEC_I_CONTEXT_EXPIRED _HRESULT_TYPEDEF_(0x00090317L) #define SEC_E_BAD_PKGID _HRESULT_TYPEDEF_(0x80090316L) #define SEC_E_CONTEXT_EXPIRED _HRESULT_TYPEDEF_(0x80090317L) #define SEC_E_INCOMPLETE_MESSAGE _HRESULT_TYPEDEF_(0x80090318L)

1 0

Hans Leidekker : msi: Keep source directory and cabinet file separate.
by Alexandre Julliard March 26, 2010

March 26, 2010

Module: wine Branch: master Commit: e5869d5d5c8f01b140ac5fba1044f3c10975612c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5869d5d5c8f01b140ac5fba1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 26 12:12:15 2010 +0100 msi: Keep source directory and cabinet file separate. --- dlls/msi/media.c | 79 ++++++++++++++++++++++++++++++++------------------- dlls/msi/msipriv.h | 2 +- 2 files changed, 50 insertions(+), 31 deletions(-) diff --git a/dlls/msi/media.c b/dlls/msi/media.c index 5c53027..c8a1487 100644 --- a/dlls/msi/media.c +++ b/dlls/msi/media.c @@ -264,7 +264,6 @@ static LONG CDECL cabinet_seek_stream( INT_PTR hf, LONG dist, int seektype ) static UINT CDECL msi_media_get_disk_info(MSIPACKAGE *package, MSIMEDIAINFO *mi) { MSIRECORD *row; - LPWSTR ptr; static const WCHAR query[] = { 'S','E','L','E','C','T',' ','*',' ', 'F','R','O','M',' ', @@ -285,10 +284,7 @@ static UINT CDECL msi_media_get_disk_info(MSIPACKAGE *package, MSIMEDIAINFO *mi) if (!mi->first_volume) mi->first_volume = strdupW(mi->volume_label); - ptr = strrchrW(mi->source, '\\') + 1; - lstrcpyW(ptr, mi->cabinet); msiobj_release(&row->hdr); - return ERROR_SUCCESS; } @@ -300,12 +296,24 @@ static INT_PTR cabinet_partial_file(FDINOTIFICATIONTYPE fdint, return 0; } +static WCHAR *get_cabinet_filename(MSIMEDIAINFO *mi) +{ + int len; + WCHAR *ret; + + len = strlenW(mi->sourcedir) + strlenW(mi->cabinet) + 1; + if (!(ret = msi_alloc(len * sizeof(WCHAR)))) return NULL; + strcpyW(ret, mi->sourcedir); + strcatW(ret, mi->cabinet); + return ret; +} + static INT_PTR cabinet_next_cabinet(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION pfdin) { MSICABDATA *data = pfdin->pv; MSIMEDIAINFO *mi = data->mi; - LPWSTR cab = strdupAtoW(pfdin->psz1); + LPWSTR cabinet_file = NULL, cab = strdupAtoW(pfdin->psz1); INT_PTR res = -1; UINT rc; @@ -332,10 +340,13 @@ static INT_PTR cabinet_next_cabinet(FDINOTIFICATIONTYPE fdint, goto done; } - TRACE("Searching for %s\n", debugstr_w(mi->source)); + if (!(cabinet_file = get_cabinet_filename(mi))) + goto done; + + TRACE("Searching for %s\n", debugstr_w(cabinet_file)); res = 0; - if (GetFileAttributesW(mi->source) == INVALID_FILE_ATTRIBUTES) + if (GetFileAttributesW(cabinet_file) == INVALID_FILE_ATTRIBUTES) { if (msi_change_media(data->package, mi) != ERROR_SUCCESS) res = -1; @@ -343,6 +354,7 @@ static INT_PTR cabinet_next_cabinet(FDINOTIFICATIONTYPE fdint, done: msi_free(cab); + msi_free(cabinet_file); return res; } @@ -504,12 +516,11 @@ static INT_PTR CDECL cabinet_notify_stream( FDINOTIFICATIONTYPE fdint, PFDINOTIF static BOOL extract_cabinet( MSIPACKAGE* package, MSIMEDIAINFO *mi, LPVOID data ) { LPSTR cabinet, cab_path = NULL; - LPWSTR ptr; HFDI hfdi; ERF erf; BOOL ret = FALSE; - TRACE("Extracting %s\n", debugstr_w(mi->source)); + TRACE("Extracting %s\n", debugstr_w(mi->cabinet)); hfdi = FDICreate( cabinet_alloc, cabinet_free, cabinet_open, cabinet_read, cabinet_write, cabinet_close, cabinet_seek, 0, &erf ); @@ -519,17 +530,14 @@ static BOOL extract_cabinet( MSIPACKAGE* package, MSIMEDIAINFO *mi, LPVOID data return FALSE; } - ptr = strrchrW( mi->source, '\\' ) + 1; - cabinet = strdupWtoA( ptr ); + cabinet = strdupWtoA( mi->cabinet ); if (!cabinet) goto done; - cab_path = strdupWtoA( mi->source ); + cab_path = strdupWtoA( mi->sourcedir ); if (!cab_path) goto done; - cab_path[ptr - mi->source] = '\0'; - ret = FDICopy( hfdi, cabinet, cab_path, 0, cabinet_notify, NULL, data ); if (!ret) ERR("FDICopy failed\n"); @@ -652,12 +660,9 @@ static UINT msi_load_media_info(MSIPACKAGE *package, MSIFILE *file, MSIMEDIAINFO mi->first_volume = strdupW(mi->volume_label); source_dir = msi_dup_property(package, cszSourceDir); - lstrcpyW(mi->source, source_dir); + lstrcpyW(mi->sourcedir, source_dir); mi->type = get_drive_type(source_dir); - if (file->IsCompressed && mi->cabinet && mi->cabinet[0] != '#') - lstrcatW(mi->source, mi->cabinet); - options = MSICODE_PRODUCT; if (mi->type == DRIVE_CDROM || mi->type == DRIVE_REMOVABLE) { @@ -671,7 +676,7 @@ static UINT msi_load_media_info(MSIPACKAGE *package, MSIFILE *file, MSIMEDIAINFO } else { - source = mi->source; + source = mi->sourcedir; options |= MSISOURCETYPE_NETWORK; } @@ -724,9 +729,8 @@ static UINT find_published_source(MSIPACKAGE *package, MSIMEDIAINFO *mi) { if (!strncmpiW(source, volume, strlenW(source))) { - lstrcpyW(mi->source, source); - lstrcatW(mi->source, mi->cabinet); - TRACE("Found network source %s\n", debugstr_w(mi->source)); + lstrcpyW(mi->sourcedir, source); + TRACE("Found network source %s\n", debugstr_w(mi->sourcedir)); return ERROR_SUCCESS; } } @@ -749,8 +753,8 @@ static UINT find_published_source(MSIPACKAGE *package, MSIMEDIAINFO *mi) if (source_matches_volume(mi, source)) { /* FIXME: what about SourceDir */ - lstrcpyW(mi->source, source); - TRACE("Found disk source %s\n", debugstr_w(mi->source)); + lstrcpyW(mi->sourcedir, source); + TRACE("Found disk source %s\n", debugstr_w(mi->sourcedir)); return ERROR_SUCCESS; } } @@ -761,6 +765,7 @@ static UINT find_published_source(MSIPACKAGE *package, MSIMEDIAINFO *mi) UINT ready_media(MSIPACKAGE *package, MSIFILE *file, MSIMEDIAINFO *mi) { UINT rc = ERROR_SUCCESS; + WCHAR *cabinet_file; /* media info for continuous cabinet is already loaded */ if (mi->is_continuous) @@ -777,15 +782,24 @@ UINT ready_media(MSIPACKAGE *package, MSIFILE *file, MSIMEDIAINFO *mi) if (!mi->cabinet || mi->cabinet[0] == '#') return ERROR_SUCCESS; + cabinet_file = get_cabinet_filename(mi); + /* package should be downloaded */ if (file->IsCompressed && - GetFileAttributesW(mi->source) == INVALID_FILE_ATTRIBUTES && + GetFileAttributesW(cabinet_file) == INVALID_FILE_ATTRIBUTES && package->BaseURL && UrlIsW(package->BaseURL, URLIS_URL)) { - WCHAR temppath[MAX_PATH]; + WCHAR temppath[MAX_PATH], *p; - msi_download_file(mi->source, temppath); - lstrcpyW(mi->source, temppath); + msi_download_file(cabinet_file, temppath); + if ((p = strrchrW(temppath, '\\'))) *p = 0; + + msi_free(mi->sourcedir); + strcpyW(mi->sourcedir, temppath); + msi_free(mi->cabinet); + strcpyW(mi->cabinet, p + 1); + + msi_free(cabinet_file); return ERROR_SUCCESS; } @@ -803,20 +817,25 @@ UINT ready_media(MSIPACKAGE *package, MSIFILE *file, MSIMEDIAINFO *mi) { rc = msi_change_media(package, mi); if (rc != ERROR_SUCCESS) + { + msi_free(cabinet_file); return rc; + } } } if (file->IsCompressed && - GetFileAttributesW(mi->source) == INVALID_FILE_ATTRIBUTES) + GetFileAttributesW(cabinet_file) == INVALID_FILE_ATTRIBUTES) { rc = find_published_source(package, mi); if (rc != ERROR_SUCCESS) { - ERR("Cabinet not found: %s\n", debugstr_w(mi->source)); + ERR("Cabinet not found: %s\n", debugstr_w(cabinet_file)); + msi_free(cabinet_file); return ERROR_INSTALL_FAILURE; } } + msi_free(cabinet_file); return ERROR_SUCCESS; } diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 4546f5c..f13f5b9 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -143,7 +143,7 @@ typedef struct tagMSIMEDIAINFO LPWSTR volume_label; BOOL is_continuous; BOOL is_extracted; - WCHAR source[MAX_PATH]; + WCHAR sourcedir[MAX_PATH]; } MSIMEDIAINFO; typedef struct tagMSIPATCHINFO

1 0

Michael Stefaniuc : rpcrt4/tests: Fix duplicate expressions in if conditions.
by Alexandre Julliard March 26, 2010

March 26, 2010

Module: wine Branch: master Commit: 3a8a9620ab4d59e67f3c43e567257f70ef46baac URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a8a9620ab4d59e67f3c43e56… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 26 13:12:35 2010 +0100 rpcrt4/tests: Fix duplicate expressions in if conditions. --- dlls/rpcrt4/tests/ndr_marshall.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index b5987dc..569bd20 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -861,7 +861,7 @@ static int ps1_cmp(const void *s1, const void *s2, size_t num) if(*p1->pl1 != *p2->pl1) return 1; } - else if(p1->pl1 || p1->pl1) + else if(p1->pl1 || p2->pl1) return 1; if(p1->pc1 && p2->pc1) @@ -869,7 +869,7 @@ static int ps1_cmp(const void *s1, const void *s2, size_t num) if(*p1->pc1 != *p2->pc1) return 1; } - else if(p1->pc1 || p1->pc1) + else if(p1->pc1 || p2->pc1) return 1; return 0;

1 0

Hans Leidekker : msi: Implement the Reinstall control event.
by Alexandre Julliard March 26, 2010

March 26, 2010

Module: wine Branch: master Commit: 2c5e1f686be5aae0c4a1bc75860e746909503f62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c5e1f686be5aae0c4a1bc758… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 26 12:12:06 2010 +0100 msi: Implement the Reinstall control event. --- dlls/msi/events.c | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/dlls/msi/events.c b/dlls/msi/events.c index e8f2297..1f63c72 100644 --- a/dlls/msi/events.c +++ b/dlls/msi/events.c @@ -383,6 +383,24 @@ static UINT ControlEvent_ReinstallMode(MSIPACKAGE *package, LPCWSTR argument, return MSI_SetPropertyW( package, szReinstallMode, argument ); } +static UINT ControlEvent_Reinstall( MSIPACKAGE *package, LPCWSTR argument, + msi_dialog *dialog ) +{ + static const WCHAR szReinstallEq[] = {'R','E','I','N','S','T','A','L','L','=',0}; + UINT r = ERROR_OUTOFMEMORY; + WCHAR *cmd; + + cmd = msi_alloc( (strlenW( szReinstallEq ) + strlenW( argument ) + 1) * sizeof(WCHAR) ); + if (cmd) + { + strcpyW( cmd, szReinstallEq ); + strcatW( cmd, argument ); + r = MsiConfigureProductExW( package->ProductCode, INSTALLLEVEL_DEFAULT, INSTALLSTATE_DEFAULT, cmd ); + msi_free( cmd ); + } + return r; +} + static UINT ControlEvent_ValidateProductID(MSIPACKAGE *package, LPCWSTR argument, msi_dialog *dialog) { @@ -417,6 +435,7 @@ static const struct _events Events[] = { { "DirectoryListUp",ControlEvent_DirectoryListUp }, { "SelectionBrowse",ControlEvent_SpawnDialog }, { "ReinstallMode",ControlEvent_ReinstallMode }, + { "Reinstall",ControlEvent_Reinstall }, { "ValidateProductID",ControlEvent_ValidateProductID }, { NULL,NULL }, };

1 0

Hans Leidekker : msi: Return the right error when a cabinet cannot be extracted.
by Alexandre Julliard March 26, 2010

March 26, 2010

Module: wine Branch: master Commit: 1407f1ee36b23975330283992aade954c597d468 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1407f1ee36b23975330283992… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 26 12:11:44 2010 +0100 msi: Return the right error when a cabinet cannot be extracted. --- dlls/msi/files.c | 2 +- dlls/msi/tests/install.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index bb5b197..e2f399d 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -292,7 +292,7 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package) !msi_cabextract(package, mi, &data)) { ERR("Failed to extract cabinet: %s\n", debugstr_w(mi->cabinet)); - rc = ERROR_FUNCTION_FAILED; + rc = ERROR_INSTALL_FAILURE; break; } } diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 0631a5e..6672de2 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -3670,9 +3670,9 @@ static void test_caborder(void) r = MsiInstallProductA(msifile, NULL); ok(!delete_pf("msitest\\caesar", TRUE), "File is installed\n"); + ok(r == ERROR_INSTALL_FAILURE, "Expected ERROR_INSTALL_FAILURE, got %u\n", r); todo_wine { - ok(r == ERROR_INSTALL_FAILURE, "Expected ERROR_INSTALL_FAILURE, got %u\n", r); ok(!delete_pf("msitest\\augustus", TRUE), "File is installed\n"); ok(!delete_pf("msitest\\maximus", TRUE), "File is installed\n"); ok(!delete_pf("msitest", FALSE), "File is installed\n");

1 0

Hans Leidekker : msi: Update the UI in the StartServices and StopServices actions.
by Alexandre Julliard March 26, 2010

March 26, 2010

Module: wine Branch: master Commit: 129161fec5d2f4bac2f6ad65442dd3b53d04be78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=129161fec5d2f4bac2f6ad654… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 26 12:11:21 2010 +0100 msi: Update the UI in the StartServices and StopServices actions. --- dlls/msi/action.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 47 insertions(+), 5 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 1a483de..28b0368 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -5153,10 +5153,11 @@ static UINT ITERATE_StartService(MSIRECORD *rec, LPVOID param) { MSIPACKAGE *package = param; MSICOMPONENT *comp; + MSIRECORD *uirow; SC_HANDLE scm = NULL, service = NULL; LPCWSTR component, *vector = NULL; - LPWSTR name, args; - DWORD event, numargs; + LPWSTR name, args, display_name = NULL; + DWORD event, numargs, len; UINT r = ERROR_FUNCTION_FAILED; component = MSI_RecordGetString(rec, 6); @@ -5189,6 +5190,14 @@ static UINT ITERATE_StartService(MSIRECORD *rec, LPVOID param) goto done; } + len = 0; + if (!GetServiceDisplayNameW( scm, name, NULL, &len ) && + GetLastError() == ERROR_INSUFFICIENT_BUFFER) + { + if ((display_name = msi_alloc( ++len * sizeof(WCHAR )))) + GetServiceDisplayNameW( scm, name, display_name, &len ); + } + service = OpenServiceW(scm, name, SERVICE_START); if (!service) { @@ -5208,12 +5217,19 @@ static UINT ITERATE_StartService(MSIRECORD *rec, LPVOID param) r = ERROR_SUCCESS; done: + uirow = MSI_CreateRecord( 2 ); + MSI_RecordSetStringW( uirow, 1, display_name ); + MSI_RecordSetStringW( uirow, 2, name ); + ui_actiondata( package, szStartServices, uirow ); + msiobj_release( &uirow->hdr ); + CloseServiceHandle(service); CloseServiceHandle(scm); msi_free(name); msi_free(args); msi_free(vector); + msi_free(display_name); return r; } @@ -5326,9 +5342,11 @@ static UINT ITERATE_StopService( MSIRECORD *rec, LPVOID param ) { MSIPACKAGE *package = param; MSICOMPONENT *comp; + MSIRECORD *uirow; LPCWSTR component; - LPWSTR name; - DWORD event; + LPWSTR name = NULL, display_name = NULL; + DWORD event, len; + SC_HANDLE scm; event = MSI_RecordGetInteger( rec, 3 ); if (!(event & msidbServiceControlEventStop)) @@ -5347,10 +5365,34 @@ static UINT ITERATE_StopService( MSIRECORD *rec, LPVOID param ) } comp->Action = INSTALLSTATE_ABSENT; + scm = OpenSCManagerW( NULL, NULL, SC_MANAGER_CONNECT ); + if (!scm) + { + ERR("Failed to open the service control manager\n"); + goto done; + } + + len = 0; + if (!GetServiceDisplayNameW( scm, name, NULL, &len ) && + GetLastError() == ERROR_INSUFFICIENT_BUFFER) + { + if ((display_name = msi_alloc( ++len * sizeof(WCHAR )))) + GetServiceDisplayNameW( scm, name, display_name, &len ); + } + CloseServiceHandle( scm ); + deformat_string( package, MSI_RecordGetString( rec, 2 ), &name ); stop_service( name ); - msi_free( name ); +done: + uirow = MSI_CreateRecord( 2 ); + MSI_RecordSetStringW( uirow, 1, display_name ); + MSI_RecordSetStringW( uirow, 2, name ); + ui_actiondata( package, szStopServices, uirow ); + msiobj_release( &uirow->hdr ); + + msi_free( name ); + msi_free( display_name ); return ERROR_SUCCESS; }

1 0

Hans Leidekker : msi: Improve the SetODBCFolders action stub.
by Alexandre Julliard March 26, 2010

March 26, 2010

Module: wine Branch: master Commit: 5a08c9ed6f1c0d01fabff3269398443ad2c47390 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a08c9ed6f1c0d01fabff3269… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 26 12:12:35 2010 +0100 msi: Improve the SetODBCFolders action stub. --- dlls/msi/action.c | 40 ++++++++++++++++++++++++++++++++++------ 1 files changed, 34 insertions(+), 6 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 28b0368..cf403e1 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -6837,6 +6837,40 @@ static UINT ACTION_InstallAdminPackage( MSIPACKAGE *package ) return ERROR_SUCCESS; } +static UINT ACTION_SetODBCFolders( MSIPACKAGE *package ) +{ + UINT r, count; + MSIQUERY *view; + + static const WCHAR driver_query[] = { + 'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', + 'O','D','B','C','D','r','i','v','e','r',0 }; + + static const WCHAR translator_query[] = { + 'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', + 'O','D','B','C','T','r','a','n','s','l','a','t','o','r',0 }; + + r = MSI_DatabaseOpenViewW( package->db, driver_query, &view ); + if (r == ERROR_SUCCESS) + { + count = 0; + r = MSI_IterateRecords( view, &count, NULL, package ); + msiobj_release( &view->hdr ); + if (count) FIXME("ignored %u rows in ODBCDriver table\n", count); + } + + r = MSI_DatabaseOpenViewW( package->db, translator_query, &view ); + if (r == ERROR_SUCCESS) + { + count = 0; + r = MSI_IterateRecords( view, &count, NULL, package ); + msiobj_release( &view->hdr ); + if (count) FIXME("ignored %u rows in ODBCTranslator table\n", count); + } + + return ERROR_SUCCESS; +} + static UINT msi_unimplemented_action_stub( MSIPACKAGE *package, LPCSTR action, LPCWSTR table ) { @@ -6923,12 +6957,6 @@ static UINT ACTION_RemoveExistingProducts( MSIPACKAGE *package ) return msi_unimplemented_action_stub( package, "RemoveExistingProducts", table ); } -static UINT ACTION_SetODBCFolders( MSIPACKAGE *package ) -{ - static const WCHAR table[] = { 'D','i','r','e','c','t','o','r','y',0 }; - return msi_unimplemented_action_stub( package, "SetODBCFolders", table ); -} - static UINT ACTION_UnregisterClassInfo( MSIPACKAGE *package ) { static const WCHAR table[] = { 'A','p','p','I','d',0 };

1 0

Justin Chevrier : gdiplus: Handle UnitWorld in GdipGetFontHeightGivenDPI.
by Alexandre Julliard March 26, 2010

March 26, 2010

Module: wine Branch: master Commit: b7679da9a7c4d2c9ec6796d74447e98abe69047a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7679da9a7c4d2c9ec6796d74… Author: Justin Chevrier <jchevrier(a)gmail.com> Date: Thu Mar 25 20:27:21 2010 -0400 gdiplus: Handle UnitWorld in GdipGetFontHeightGivenDPI. --- dlls/gdiplus/font.c | 1 + dlls/gdiplus/tests/font.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index fda5428..6e58f98 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -489,6 +489,7 @@ GpStatus WINGDIPAPI GdipGetFontHeightGivenDPI(GDIPCONST GpFont *font, REAL dpi, switch (font->unit) { case UnitPixel: + case UnitWorld: *height = font_height; break; case UnitPoint: diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index ec45bf7..1bf2c1e 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -381,8 +381,8 @@ static void test_heightgivendpi(void) stat = GdipCreateFont(fontfamily, 30, FontStyleRegular, UnitWorld, &font); expect(Ok, stat); stat = GdipGetFontHeightGivenDPI(font, 96, &height); - todo_wine expect(Ok, stat); - todo_wine expectf((REAL)34.497070, height); + expect(Ok, stat); + expectf((REAL)34.497070, height); GdipDeleteFont(font); height = 12345;

1 0