advpack: Remove two variables which are not really used and two extraneous invocations of get_parameter from RegisterOCX. (RESEND)

Gerald Pfeifer gerald at pfeifer.com
Fri May 7 15:22:57 CDT 2010


This passes testing fine for me and there are no further invocations of
get_parameter in this function (which operates on a copy), so this also
looks like an optimization?

Gerald
---
 dlls/advpack/advpack.c |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/dlls/advpack/advpack.c b/dlls/advpack/advpack.c
index 112d38a..658e225 100644
--- a/dlls/advpack/advpack.c
+++ b/dlls/advpack/advpack.c
@@ -492,7 +492,7 @@ HRESULT do_ocx_reg(HMODULE hocx, BOOL do_reg)
  */
 HRESULT WINAPI RegisterOCX(HWND hWnd, HINSTANCE hInst, LPCSTR cmdline, INT show)
 {
-    LPWSTR ocx_filename, str_flags, param;
+    LPWSTR ocx_filename;
     LPWSTR cmdline_copy, cmdline_ptr;
     UNICODE_STRING cmdlineW;
     HRESULT hr = E_FAIL;
@@ -512,9 +512,6 @@ HRESULT WINAPI RegisterOCX(HWND hWnd, HINSTANCE hInst, LPCSTR cmdline, INT show)
     if (!ocx_filename || !*ocx_filename)
         goto done;
 
-    str_flags = get_parameter(&cmdline_ptr, ',');
-    param = get_parameter(&cmdline_ptr, ',');
-
     hm = LoadLibraryExW(ocx_filename, NULL, LOAD_WITH_ALTERED_SEARCH_PATH);
     if (!hm)
         goto done;
-- 
1.6.6.2



More information about the wine-patches mailing list