November 2007 - Wine-Commits

Alexander Nicolaysen Sørnes : maintainer : Simplify SQL code
by Chris Morgan Nov. 6, 2007

Nov. 6, 2007

Module: appdb Branch: master Commit: b3e71b0a8137846039ead71a57f9b4a6b97d77c1 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=b3e71b0a8137846039ead71a… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Tue Nov 6 15:29:58 2007 +0100 maintainer: Simplify SQL code --- include/maintainer.php | 64 ++++++++++------------------------------------- 1 files changed, 14 insertions(+), 50 deletions(-) diff --git a/include/maintainer.php b/include/maintainer.php index c3d64aa..e7d2b47 100644 --- a/include/maintainer.php +++ b/include/maintainer.php @@ -410,24 +410,8 @@ class maintainer /* Excluding requests for queued apps and versions, as these will be handled automatically */ - $sQuery = "(SELECT DISTINCT appMaintainers.* FROM - appMaintainers, appFamily WHERE - appMaintainers.queued = '?' - AND - appMaintainers.superMaintainer = '1' - AND - appFamily.appId = appMaintainers.appId - AND - appFamily.queued = 'false') UNION - (SELECT DISTINCT appMaintainers.* FROM - appMaintainers, appVersion WHERE - appMaintainers.queued = '?' - AND - appMaintainers.versionId = appVersion.versionId - AND - appMaintainers.superMaintainer = '0' - AND - appVersion.queued = 'false')$sLimit"; + $sQuery = "SELECT * FROM appMaintainers WHERE + appMaintainers.queued = '?'$sLimit"; if($bQueued) { @@ -435,13 +419,10 @@ class maintainer { if($sLimit) { - return query_parameters($sQuery, $bQueued ? "true" : "false", - $bQueued ? "true" : "false", - $iStart, $iRows); + return query_parameters($sQuery, $bQueued ? "true" : "false", $iStart, $iRows); } else { - return query_parameters($sQuery, $bQueued ? "true" : "false", - $bQueued ? "true" : "false"); + return query_parameters($sQuery, $bQueued ? "true" : "false"); } } else { @@ -451,12 +432,10 @@ class maintainer { if($sLimit) { - return query_parameters($sQuery, $bQueued ? "true" : "false", - $bQueued ? "true" : "false", $iStart, $iRows); + return query_parameters($sQuery, $bQueued ? "true" : "false", $iStart, $iRows); } else { - return query_parameters($sQuery, $bQueued ? "true" : "false", - $bQueued ? "true" : "false"); + return query_parameters($sQuery, $bQueued ? "true" : "false"); } } } @@ -512,31 +491,16 @@ class maintainer /* Excluding requests for queued apps and versions, as these are handled automatically. One SELECT for super maintainers, one for maintainers. */ - $sQuery = "(SELECT COUNT(DISTINCT maintainerId) as count FROM - appMaintainers, appFamily WHERE - appMaintainers.queued = '?' - AND - appMaintainers.superMaintainer = '1' - AND - appFamily.appId = appMaintainers.appId - AND - appFamily.queued = 'false') UNION - (SELECT COUNT(DISTINCT maintainerId) as count FROM - appMaintainers, appVersion WHERE - appMaintainers.queued = '?' - AND - appMaintainers.versionId = appVersion.versionId - AND - appMaintainers.superMaintainer = '0' - AND - appVersion.queued = 'false')"; - - if(!($hResult = query_parameters($sQuery, $bQueued ? "true" : "false", - $bQueued ? "true" : "false"))) + $sQuery = "SELECT COUNT(maintainerId) as count FROM appMaintainers WHERE + appMaintainers.queued = '?'"; + + if(!($hResult = query_parameters($sQuery, $bQueued ? "true" : "false"))) return FALSE; - for($iCount = 0; $oRow = query_fetch_object($hResult);) - $iCount += $oRow->count; + if($oRow = query_fetch_object($hResult)) + $iCount = $oRow->count; + else + $iCount = 0; return $iCount; }

1 0

Rob Shearman : server: Don' t do access checks on the security descriptors of newly created objects.
by Alexandre Julliard Nov. 6, 2007

Nov. 6, 2007

Module: wine Branch: master Commit: 92db6d2c2f94c2c90ce947b3c33269d5e7e05d55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92db6d2c2f94c2c90ce947b3c… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Nov 5 14:23:36 2007 +0000 server: Don't do access checks on the security descriptors of newly created objects. --- dlls/kernel32/tests/sync.c | 1 - server/event.c | 5 ++++- server/handle.c | 2 +- server/handle.h | 2 ++ server/mapping.c | 5 ++++- server/mutex.c | 5 ++++- server/semaphore.c | 5 ++++- 7 files changed, 19 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 716e56e..616404e 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -278,7 +278,6 @@ static void test_event_security(void) InitializeAcl(&acl, sizeof(acl), ACL_REVISION); SetSecurityDescriptorDacl(&sd, TRUE, &acl, FALSE); handle = CreateEventA(&sa, FALSE, FALSE, __FILE__ ": Test Event"); - todo_wine ok(handle != NULL, "CreateEventW with blank sd failed with error %d\n", GetLastError()); CloseHandle(handle); } diff --git a/server/event.c b/server/event.c index 99d0f4b..624159b 100644 --- a/server/event.c +++ b/server/event.c @@ -187,7 +187,10 @@ DECL_HANDLER(create_event) if ((event = create_event( root, &name, req->attributes, req->manual_reset, req->initial_state, sd ))) { - reply->handle = alloc_handle( current->process, event, req->access, req->attributes ); + if (get_error() == STATUS_OBJECT_NAME_EXISTS) + reply->handle = alloc_handle( current->process, event, req->access, req->attributes ); + else + reply->handle = alloc_handle_no_access_check( current->process, event, req->access, req->attributes ); release_object( event ); } diff --git a/server/handle.c b/server/handle.c index 30facbe..9b14810 100644 --- a/server/handle.c +++ b/server/handle.c @@ -226,7 +226,7 @@ static obj_handle_t alloc_entry( struct handle_table *table, void *obj, unsigned /* allocate a handle for an object, incrementing its refcount */ /* return the handle, or 0 on error */ -static obj_handle_t alloc_handle_no_access_check( struct process *process, void *ptr, unsigned int access, unsigned int attr ) +obj_handle_t alloc_handle_no_access_check( struct process *process, void *ptr, unsigned int access, unsigned int attr ) { struct object *obj = ptr; diff --git a/server/handle.h b/server/handle.h index db19590..fc34ee7 100644 --- a/server/handle.h +++ b/server/handle.h @@ -36,6 +36,8 @@ struct unicode_str; /* that the thing pointed to starts with a struct object... */ extern obj_handle_t alloc_handle( struct process *process, void *obj, unsigned int access, unsigned int attr ); +extern obj_handle_t alloc_handle_no_access_check( struct process *process, void *ptr, + unsigned int access, unsigned int attr ); extern int close_handle( struct process *process, obj_handle_t handle ); extern struct object *get_handle_obj( struct process *process, obj_handle_t handle, unsigned int access, const struct object_ops *ops ); diff --git a/server/mapping.c b/server/mapping.c index bd21a50..9f062d0 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -415,7 +415,10 @@ DECL_HANDLER(create_mapping) if ((obj = create_mapping( root, &name, req->attributes, req->size, req->protect, req->file_handle, sd ))) { - reply->handle = alloc_handle( current->process, obj, req->access, req->attributes ); + if (get_error() == STATUS_OBJECT_NAME_EXISTS) + reply->handle = alloc_handle( current->process, obj, req->access, req->attributes ); + else + reply->handle = alloc_handle_no_access_check( current->process, obj, req->access, req->attributes ); release_object( obj ); } diff --git a/server/mutex.c b/server/mutex.c index 979f21f..0193422 100644 --- a/server/mutex.c +++ b/server/mutex.c @@ -212,7 +212,10 @@ DECL_HANDLER(create_mutex) if ((mutex = create_mutex( root, &name, req->attributes, req->owned, sd ))) { - reply->handle = alloc_handle( current->process, mutex, req->access, req->attributes ); + if (get_error() == STATUS_OBJECT_NAME_EXISTS) + reply->handle = alloc_handle( current->process, mutex, req->access, req->attributes ); + else + reply->handle = alloc_handle_no_access_check( current->process, mutex, req->access, req->attributes ); release_object( mutex ); } diff --git a/server/semaphore.c b/server/semaphore.c index 09445e1..1412170 100644 --- a/server/semaphore.c +++ b/server/semaphore.c @@ -187,7 +187,10 @@ DECL_HANDLER(create_semaphore) if ((sem = create_semaphore( root, &name, req->attributes, req->initial, req->max, sd ))) { - reply->handle = alloc_handle( current->process, sem, req->access, req->attributes ); + if (get_error() == STATUS_OBJECT_NAME_EXISTS) + reply->handle = alloc_handle( current->process, sem, req->access, req->attributes ); + else + reply->handle = alloc_handle_no_access_check( current->process, sem, req->access, req->attributes ); release_object( sem ); }

1 0

Alexandre Julliard : comctl32/tests: Flush pending events before progress repaint tests.
by Alexandre Julliard Nov. 6, 2007

Nov. 6, 2007

Module: wine Branch: master Commit: a1b02c2cecfd3a0af509c0cc94108048e5cff84f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1b02c2cecfd3a0af509c0cc9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 6 14:39:41 2007 +0100 comctl32/tests: Flush pending events before progress repaint tests. --- dlls/comctl32/tests/progress.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/progress.c b/dlls/comctl32/tests/progress.c index a13d01a..42c1e8d 100644 --- a/dlls/comctl32/tests/progress.c +++ b/dlls/comctl32/tests/progress.c @@ -33,6 +33,21 @@ static HWND hProgressParentWnd, hProgressWnd; static const char progressTestClass[] = "ProgressBarTestClass"; +/* try to make sure pending X events have been processed before continuing */ +static void flush_events(void) +{ + MSG msg; + int diff = 100; + DWORD time = GetTickCount() + diff; + + while (diff > 0) + { + if (MsgWaitForMultipleObjects( 0, NULL, FALSE, min(10,diff), QS_ALLINPUT ) == WAIT_TIMEOUT) break; + while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessage( &msg ); + diff = time - GetTickCount(); + } +} + static LRESULT CALLBACK ProgressTestWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { switch(msg) { @@ -113,6 +128,7 @@ static void init(void) ShowWindow(hProgressParentWnd, SW_SHOWNORMAL); ok(GetUpdateRect(hProgressParentWnd, NULL, FALSE), "GetUpdateRect: There should be a region that needs to be updated\n"); + flush_events(); update_window(hProgressParentWnd); }

1 0

Alexandre Julliard : Include objbase. h where need to get the DllRegisterServer prototype.
by Alexandre Julliard Nov. 6, 2007

Nov. 6, 2007

Module: wine Branch: master Commit: 97675b1365a25dc9d614855b39819235ef2af1dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=97675b1365a25dc9d614855b3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 6 14:39:16 2007 +0100 Include objbase.h where need to get the DllRegisterServer prototype. --- dlls/cryptnet/cryptnet_main.c | 1 + dlls/hnetcfg/hnetcfg.c | 1 + dlls/winhttp/main.c | 1 + dlls/wintrust/register.c | 1 + 4 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index 487da9d..0ad302d 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -31,6 +31,7 @@ #include "winnt.h" #include "winnls.h" #include "wininet.h" +#include "objbase.h" #define CERT_REVOCATION_PARA_HAS_EXTRA_FIELDS #include "wincrypt.h" diff --git a/dlls/hnetcfg/hnetcfg.c b/dlls/hnetcfg/hnetcfg.c index a95b443..3487bc3 100644 --- a/dlls/hnetcfg/hnetcfg.c +++ b/dlls/hnetcfg/hnetcfg.c @@ -20,6 +20,7 @@ #include "windef.h" #include "winbase.h" +#include "objbase.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(hnetcfg); diff --git a/dlls/winhttp/main.c b/dlls/winhttp/main.c index b8739d2..8f26859 100644 --- a/dlls/winhttp/main.c +++ b/dlls/winhttp/main.c @@ -22,6 +22,7 @@ #include "windef.h" #include "winbase.h" +#include "objbase.h" #include "winhttp.h" #include "wine/debug.h" diff --git a/dlls/wintrust/register.c b/dlls/wintrust/register.c index a3e18e0..1657815 100644 --- a/dlls/wintrust/register.c +++ b/dlls/wintrust/register.c @@ -26,6 +26,7 @@ #include "winuser.h" #include "winreg.h" #include "winnls.h" +#include "objbase.h" #include "guiddef.h" #include "wintrust.h"

1 0

James Hawkins : msi: Test that the install state is dependent on the feature and component registration .
by Alexandre Julliard Nov. 6, 2007

Nov. 6, 2007

Module: wine Branch: master Commit: 25a612b8f3cab3e7a59b3db4ef276e25ff97f100 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25a612b8f3cab3e7a59b3db4e… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Nov 6 05:23:39 2007 -0600 msi: Test that the install state is dependent on the feature and component registration. --- dlls/msi/tests/package.c | 954 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 938 insertions(+), 16 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=25a612b8f3cab3e7a59b3…

1 0

Tim Schwartz : net.exe: Lists existing NetUse connections.
by Alexandre Julliard Nov. 6, 2007

Nov. 6, 2007

Module: wine Branch: master Commit: 26b182fd92c45635905b4c20c313b134e11b6109 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26b182fd92c45635905b4c20c… Author: Tim Schwartz <tim(a)sanityinternet.com> Date: Mon Nov 5 15:02:49 2007 -0600 net.exe: Lists existing NetUse connections. --- programs/net/En.rc | 3 +++ programs/net/Makefile.in | 2 +- programs/net/net.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ programs/net/resources.h | 3 +++ 4 files changed, 52 insertions(+), 1 deletions(-) diff --git a/programs/net/En.rc b/programs/net/En.rc index f3d8f4f..aff6d1d 100644 --- a/programs/net/En.rc +++ b/programs/net/En.rc @@ -37,4 +37,7 @@ STRINGTABLE STRING_STOP_SVC_SUCCESS, "The %s service was stopped successfully.\n" STRING_STOP_SVC_FAIL, "The %s service failed to stop.\n" STRING_HELP_USAGE, "The syntax of this command is:\n\nNET HELP command\n -or-\nNET command /HELP\n\n Commands available are:\n NET HELP NET START NET STOP\n" + STRING_NO_ENTRIES, "There are no entries in the list.\n" + STRING_USE_HEADER, "\nStatus Local Remote\n---------------------------------------------------------------\n" + STRING_USE_ENTRY, "%s %S %S Open resources: %lu\n" } diff --git a/programs/net/Makefile.in b/programs/net/Makefile.in index 5364f4e..8ababf7 100644 --- a/programs/net/Makefile.in +++ b/programs/net/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = net.exe APPMODE = -mconsole -IMPORTS = user32 advapi32 kernel32 +IMPORTS = netapi32 user32 advapi32 kernel32 C_SRCS = net.c diff --git a/programs/net/net.c b/programs/net/net.c index 4bc3652..f27c853 100644 --- a/programs/net/net.c +++ b/programs/net/net.c @@ -19,6 +19,7 @@ #include <stdio.h> #include <string.h> #include <windows.h> +#include <lm.h> #include "resources.h" #define NET_START 0001 @@ -36,6 +37,45 @@ int output_string(int msg, ...) return 0; } +static BOOL net_use(int argc, char *argv[]) +{ + USE_INFO_2 *buffer, *connection; + DWORD read, total, resume_handle, rc, i; + const char *status_description[] = { "OK", "Paused", "Disconnected", "An error occurred", + "A network error occurred", "Connection is being made", + "Reconnecting" }; + resume_handle = 0; + buffer = NULL; + + if(argc<3) + { + do { + rc = NetUseEnum(NULL, 2, (BYTE **) &buffer, 2048, &read, &total, &resume_handle); + if (rc != ERROR_MORE_DATA && rc != ERROR_SUCCESS) + { + break; + } + + if(total == 0) + { + output_string(STRING_NO_ENTRIES); + break; + } + + output_string(STRING_USE_HEADER); + for (i = 0, connection = buffer; i < read; ++i, ++connection) + output_string(STRING_USE_ENTRY, status_description[connection->ui2_status], connection->ui2_local, + connection->ui2_remote, connection->ui2_refcount); + + if (buffer != NULL) NetApiBufferFree(buffer); + } while (rc == ERROR_MORE_DATA); + + return TRUE; + } + + return FALSE; +} + static BOOL StopService(SC_HANDLE SCManager, SC_HANDLE serviceHandle) { LPENUM_SERVICE_STATUS dependencies = NULL; @@ -159,5 +199,10 @@ int main(int argc, char *argv[]) return 0; } + if(!strcasecmp(argv[1], "use")) + { + if(!net_use(argc, argv)) return 1; + } + return 0; } diff --git a/programs/net/resources.h b/programs/net/resources.h index 4c1c167..c5199fd 100644 --- a/programs/net/resources.h +++ b/programs/net/resources.h @@ -30,3 +30,6 @@ #define STRING_STOP_SVC_SUCCESS 112 #define STRING_STOP_SVC_FAIL 113 #define STRING_HELP_USAGE 114 +#define STRING_NO_ENTRIES 115 +#define STRING_USE_HEADER 116 +#define STRING_USE_ENTRY 117

1 0

Alexandre Julliard : Make some variables static.
by Alexandre Julliard Nov. 6, 2007

Nov. 6, 2007

Module: wine Branch: master Commit: 0590fe2ecf25705d09a308da58b0b1338be0f166 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0590fe2ecf25705d09a308da5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 6 14:38:54 2007 +0100 Make some variables static. --- dlls/advapi32/security.c | 2 +- dlls/credui/credui_main.c | 2 +- dlls/msi/msi_main.c | 5 +++-- dlls/rsaenh/mpi.c | 5 ++++- dlls/rsaenh/tomcrypt.h | 3 --- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 1c55d0a..bd2ac06 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -137,7 +137,7 @@ typedef struct WELLKOWNRID DWORD Rid; } WELLKNOWNRID; -WELLKNOWNRID WellKnownRids[] = { +static const WELLKNOWNRID WellKnownRids[] = { { WinAccountAdministratorSid, DOMAIN_USER_RID_ADMIN }, { WinAccountGuestSid, DOMAIN_USER_RID_GUEST }, { WinAccountKrbtgtSid, DOMAIN_USER_RID_KRBTGT }, diff --git a/dlls/credui/credui_main.c b/dlls/credui/credui_main.c index 93d5b88..f9e24eb 100644 --- a/dlls/credui/credui_main.c +++ b/dlls/credui/credui_main.c @@ -45,7 +45,7 @@ struct pending_credentials static HINSTANCE hinstCredUI; -struct list pending_credentials_list = LIST_INIT(pending_credentials_list); +static struct list pending_credentials_list = LIST_INIT(pending_credentials_list); static CRITICAL_SECTION csPendingCredentials; static CRITICAL_SECTION_DEBUG critsect_debug = diff --git a/dlls/msi/msi_main.c b/dlls/msi/msi_main.c index cf3f30c..2c32b3b 100644 --- a/dlls/msi/msi_main.c +++ b/dlls/msi/msi_main.c @@ -44,10 +44,11 @@ INSTALLUI_HANDLERW gUIHandlerW = NULL; DWORD gUIFilter = 0; LPVOID gUIContext = NULL; WCHAR gszLogFile[MAX_PATH]; -WCHAR msi_path[MAX_PATH]; -ITypeLib *msi_typelib = NULL; HINSTANCE msi_hInstance; +static WCHAR msi_path[MAX_PATH]; +static ITypeLib *msi_typelib; + /* * Dll lifetime tracking declaration */ diff --git a/dlls/rsaenh/mpi.c b/dlls/rsaenh/mpi.c index a7408a4..c6f083b 100644 --- a/dlls/rsaenh/mpi.c +++ b/dlls/rsaenh/mpi.c @@ -31,6 +31,9 @@ #include <stdarg.h> #include "tomcrypt.h" +/* table of first PRIME_SIZE primes */ +static const mp_digit __prime_tab[]; + /* Known optimal configurations CPU /Compiler /MUL CUTOFF/SQR CUTOFF ------------------------------------------------------------- @@ -3808,7 +3811,7 @@ mp_zero (mp_int * a) memset (a->dp, 0, sizeof (mp_digit) * a->alloc); } -const mp_digit __prime_tab[] = { +static const mp_digit __prime_tab[] = { 0x0002, 0x0003, 0x0005, 0x0007, 0x000B, 0x000D, 0x0011, 0x0013, 0x0017, 0x001D, 0x001F, 0x0025, 0x0029, 0x002B, 0x002F, 0x0035, 0x003B, 0x003D, 0x0043, 0x0047, 0x0049, 0x004F, 0x0053, 0x0059, diff --git a/dlls/rsaenh/tomcrypt.h b/dlls/rsaenh/tomcrypt.h index b9e29d9..53c2f40 100644 --- a/dlls/rsaenh/tomcrypt.h +++ b/dlls/rsaenh/tomcrypt.h @@ -473,9 +473,6 @@ int mp_exptmod(const mp_int *a, const mp_int *b, mp_int *c, mp_int *d); /* number of primes */ #define PRIME_SIZE 256 -/* table of first PRIME_SIZE primes */ -extern const mp_digit __prime_tab[]; - /* result=1 if a is divisible by one of the first PRIME_SIZE primes */ int mp_prime_is_divisible(const mp_int *a, int *result);

1 0

James Hawkins : msi: Process the ADDSOURCE property when setting feature states.
by Alexandre Julliard Nov. 6, 2007

Nov. 6, 2007

Module: wine Branch: master Commit: c31fd4371a248fa36a9cffb480a10a9cf2c85d86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c31fd4371a248fa36a9cffb48… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Nov 6 05:22:11 2007 -0600 msi: Process the ADDSOURCE property when setting feature states. --- dlls/msi/action.c | 3 +++ dlls/msi/tests/package.c | 30 ++++++------------------------ 2 files changed, 9 insertions(+), 24 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index aaf8fdf..ec2bbea 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1727,6 +1727,8 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *package) {'I','N','S','T','A','L','L','L','E','V','E','L',0}; static const WCHAR szAddLocal[] = {'A','D','D','L','O','C','A','L',0}; + static const WCHAR szAddSource[] = + {'A','D','D','S','O','U','R','C','E',0}; static const WCHAR szRemove[] = {'R','E','M','O','V','E',0}; static const WCHAR szReinstall[] = @@ -1766,6 +1768,7 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *package) */ override |= process_state_property(package,szAddLocal,INSTALLSTATE_LOCAL); override |= process_state_property(package,szRemove,INSTALLSTATE_ABSENT); + override |= process_state_property(package,szAddSource,INSTALLSTATE_SOURCE); override |= process_state_property(package,szReinstall,INSTALLSTATE_LOCAL); if (!override) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 8ba97d9..9d09835 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -2733,20 +2733,14 @@ static void test_states(void) r = MsiGetFeatureState(hpkg, "two", &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( action == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", action); - } + ok( action == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", action); state = 0xdeadbee; action = 0xdeadbee; r = MsiGetFeatureState(hpkg, "three", &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( action == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", action); - } + ok( action == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", action); state = 0xdeadbee; action = 0xdeadbee; @@ -2815,40 +2809,28 @@ static void test_states(void) r = MsiGetComponentState(hpkg, "delta", &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( action == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", action); - } + ok( action == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", action); state = 0xdeadbee; action = 0xdeadbee; r = MsiGetComponentState(hpkg, "epsilon", &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( action == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", action); - } + ok( action == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", action); state = 0xdeadbee; action = 0xdeadbee; r = MsiGetComponentState(hpkg, "zeta", &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( action == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", action); - } + ok( action == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", action); state = 0xdeadbee; action = 0xdeadbee; r = MsiGetComponentState(hpkg, "iota", &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( action == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", action); - } + ok( action == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", action); state = 0xdeadbee; action = 0xdeadbee;

1 0

James Hawkins : msi: Test the install states of removed features.
by Alexandre Julliard Nov. 6, 2007

Nov. 6, 2007

Module: wine Branch: master Commit: 75b825da17bd0b4e525c032cb588438ddc732846 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75b825da17bd0b4e525c032cb… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Nov 6 05:19:55 2007 -0600 msi: Test the install states of removed features. --- dlls/msi/tests/package.c | 491 +++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 461 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=75b825da17bd0b4e525c0…

1 0

James Hawkins : msi: Add a missing struct initialization.
by Alexandre Julliard Nov. 6, 2007

Nov. 6, 2007

Module: wine Branch: master Commit: fcc490d04793acda23069a7a70259c31a2cdde0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcc490d04793acda23069a7a7… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Nov 6 05:18:24 2007 -0600 msi: Add a missing struct initialization. --- dlls/msi/create.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msi/create.c b/dlls/msi/create.c index ed6b43a..ae9f69c 100644 --- a/dlls/msi/create.c +++ b/dlls/msi/create.c @@ -135,6 +135,7 @@ static const MSIVIEWOPS create_ops = NULL, NULL, NULL, + NULL, }; static UINT check_columns( column_info *col_info )

1 0