Mike McCormack : msi: Remove an unused parameter.

Alexandre Julliard julliard at wine.codeweavers.com
Wed Nov 22 05:21:16 CST 2006


Module: wine
Branch: master
Commit: eb16fd5198772183da49b71c165f5ef40846a150
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=eb16fd5198772183da49b71c165f5ef40846a150

Author: Mike McCormack <mike at codeweavers.com>
Date:   Wed Nov 22 17:04:24 2006 +0900

msi: Remove an unused parameter.

---

 dlls/msi/custom.c |   25 ++++++++-----------------
 1 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c
index bbc56a8..4358c81 100644
--- a/dlls/msi/custom.c
+++ b/dlls/msi/custom.c
@@ -367,9 +367,9 @@ static UINT process_action_return_value(
     }
 }
 
-static UINT process_handle(MSIPACKAGE* package, UINT type, 
+static UINT process_handle(MSIPACKAGE* package, UINT type,
                            HANDLE ThreadHandle, HANDLE ProcessHandle,
-                           LPCWSTR Name, BOOL *finished)
+                           LPCWSTR Name)
 {
     UINT rc = ERROR_SUCCESS;
 
@@ -393,8 +393,6 @@ static UINT process_handle(MSIPACKAGE* p
         CloseHandle(ThreadHandle);
         if (ProcessHandle)
             CloseHandle(ProcessHandle);
-        if (finished)
-            *finished = TRUE;
     }
     else 
     {
@@ -416,8 +414,6 @@ static UINT process_handle(MSIPACKAGE* p
             if (ProcessHandle)
                 CloseHandle(ProcessHandle);
         }
-        if (finished)
-            *finished = FALSE;
     }
 
     return rc;
@@ -512,7 +508,6 @@ static UINT HANDLE_CustomType1(MSIPACKAG
 {
     WCHAR tmp_file[MAX_PATH];
     UINT r = ERROR_SUCCESS;
-    BOOL finished = FALSE;
     HANDLE ThreadHandle;
 
     r = store_binary_to_temp(package, source, tmp_file);
@@ -530,7 +525,7 @@ static UINT HANDLE_CustomType1(MSIPACKAG
 
     ThreadHandle = do_msidbCustomActionTypeDll( package, tmp_file, target );
 
-    r = process_handle(package, type, ThreadHandle, NULL, action, &finished );
+    r = process_handle(package, type, ThreadHandle, NULL, action);
 
     return r;
 }
@@ -547,7 +542,6 @@ static UINT HANDLE_CustomType2(MSIPACKAG
     WCHAR *cmd;
     static const WCHAR spc[] = {' ',0};
     UINT r = ERROR_SUCCESS;
-    BOOL finished = FALSE;
 
     memset(&si,0,sizeof(STARTUPINFOW));
 
@@ -585,8 +579,7 @@ static UINT HANDLE_CustomType2(MSIPACKAG
         return ERROR_SUCCESS;
     }
 
-    r = process_handle(package, type, info.hThread, info.hProcess, action,
-                          &finished);
+    r = process_handle(package, type, info.hThread, info.hProcess, action);
 
     return r;
 }
@@ -608,7 +601,7 @@ static UINT HANDLE_CustomType17(MSIPACKA
 
     hThread = do_msidbCustomActionTypeDll( package, file->TargetPath, target );
 
-    return process_handle(package, type, hThread, NULL, action, NULL );
+    return process_handle(package, type, hThread, NULL, action);
 }
 
 static UINT HANDLE_CustomType18(MSIPACKAGE *package, LPCWSTR source,
@@ -662,8 +655,7 @@ static UINT HANDLE_CustomType18(MSIPACKA
     }
     msi_free(cmd);
 
-    prc = process_handle(package, type, info.hThread, info.hProcess, action, 
-                         NULL);
+    prc = process_handle(package, type, info.hThread, info.hProcess, action);
 
     return prc;
 }
@@ -748,7 +740,7 @@ static UINT HANDLE_CustomType50(MSIPACKA
     }
     msi_free(cmd);
 
-    return process_handle(package, type, info.hThread, info.hProcess, action, NULL);
+    return process_handle(package, type, info.hThread, info.hProcess, action);
 }
 
 static UINT HANDLE_CustomType34(MSIPACKAGE *package, LPCWSTR source,
@@ -788,8 +780,7 @@ static UINT HANDLE_CustomType34(MSIPACKA
     }
     msi_free(deformated);
 
-    prc = process_handle(package, type, info.hThread, info.hProcess, action,
-                         NULL);
+    prc = process_handle(package, type, info.hThread, info.hProcess, action);
 
     return prc;
 }




More information about the wine-cvs mailing list