- Revert changes, msiexec is shared.
svn path=/trunk/; revision=16771
/* These function return a printable version of a string, including
quotes. The string will be valid for some time, but not indefinitely
as strings are re-used. */
/* These function return a printable version of a string, including
quotes. The string will be valid for some time, but not indefinitely
as strings are re-used. */
+extern const char *wine_dbgstr_w( const WCHAR *s );
extern const char *wine_dbgstr_an( const char * s, int n );
extern const char *wine_dbgstr_wn( const wchar_t *s, int n );
extern const char *wine_dbgstr_guid( const struct _GUID *id );
extern const char *wine_dbgstr_an( const char * s, int n );
extern const char *wine_dbgstr_wn( const wchar_t *s, int n );
extern const char *wine_dbgstr_guid( const struct _GUID *id );
- WINE_TRACE("properties -> %S\n", ret);
+ WINE_TRACE("properties -> %s\n", wine_dbgstr_w(ret) );
*DllHandle = LoadLibraryExW(DllName, NULL, LOAD_WITH_ALTERED_SEARCH_PATH);
if(!*DllHandle)
{
*DllHandle = LoadLibraryExW(DllName, NULL, LOAD_WITH_ALTERED_SEARCH_PATH);
if(!*DllHandle)
{
- fprintf(stderr, "Unable to load dll %S\n", DllName);
+ fprintf(stderr, "Unable to load dll %s\n", wine_dbgstr_w(DllName));
ExitProcess(1);
}
proc = (VOID *) GetProcAddress(*DllHandle, ProcName);
if(!proc)
{
ExitProcess(1);
}
proc = (VOID *) GetProcAddress(*DllHandle, ProcName);
if(!proc)
{
- fprintf(stderr, "Dll %S does not implement function %s\n",
- DllName, ProcName);
+ fprintf(stderr, "Dll %s does not implement function %s\n",
+ wine_dbgstr_w(DllName), ProcName);
FreeLibrary(*DllHandle);
ExitProcess(1);
}
FreeLibrary(*DllHandle);
ExitProcess(1);
}
hr = pfDllRegisterServer();
if(FAILED(hr))
{
hr = pfDllRegisterServer();
if(FAILED(hr))
{
- fprintf(stderr, "Failed to register dll %S\n", DllName);
+ fprintf(stderr, "Failed to register dll %s\n", wine_dbgstr_w(DllName));
- printf("Successfully registered dll %S\n", DllName);
+ printf("Successfully registered dll %s\n", wine_dbgstr_w(DllName));
if(DllHandle)
FreeLibrary(DllHandle);
return 0;
if(DllHandle)
FreeLibrary(DllHandle);
return 0;
hr = pfDllUnregisterServer();
if(FAILED(hr))
{
hr = pfDllUnregisterServer();
if(FAILED(hr))
{
- fprintf(stderr, "Failed to unregister dll %S\n", DllName);
+ fprintf(stderr, "Failed to unregister dll %s\n", wine_dbgstr_w(DllName));
- printf("Successfully unregistered dll %S\n", DllName);
+ printf("Successfully unregistered dll %s\n", wine_dbgstr_w(DllName));
if(DllHandle)
FreeLibrary(DllHandle);
return 0;
if(DllHandle)
FreeLibrary(DllHandle);
return 0;
for(i = 1; i < argc; i++)
{
for(i = 1; i < argc; i++)
{
- WINE_TRACE("argvW[%d] = %S\n", i, argvW[i]);
+ WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i]));
if (!msi_strequal(argvW[i], "/regserver"))
{
if (!msi_strequal(argvW[i], "/regserver"))
{
i++;
if(i >= argc)
ShowUsage(1);
i++;
if(i >= argc)
ShowUsage(1);
- WINE_TRACE("argvW[%d] = %S\n", i, argvW[i]);
+ WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i]));
argvWi = argvW[i];
}
PackageName = argvWi;
argvWi = argvW[i];
}
PackageName = argvWi;
i++;
if(i >= argc)
ShowUsage(1);
i++;
if(i >= argc)
ShowUsage(1);
- WINE_TRACE("argvW[%d] = %S\n", i, argvW[i]);
+ WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i]));
PackageName = argvW[i];
StringListAppend(&property_list, ActionAdmin);
}
PackageName = argvW[i];
StringListAppend(&property_list, ActionAdmin);
}
i++;
if(i >= argc)
ShowUsage(1);
i++;
if(i >= argc)
ShowUsage(1);
- WINE_TRACE("argvW[%d] = %S\n", i, argvW[i]);
+ WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i]));
PackageName = argvW[i];
}
else if(!msi_strequal(argvW[i], "/x"))
PackageName = argvW[i];
}
else if(!msi_strequal(argvW[i], "/x"))
i++;
if(i >= argc)
ShowUsage(1);
i++;
if(i >= argc)
ShowUsage(1);
- WINE_TRACE("argvW[%d] = %S\n", i, argvW[i]);
+ WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i]));
PackageName = argvW[i];
StringListAppend(&property_list, RemoveAll);
}
PackageName = argvW[i];
StringListAppend(&property_list, RemoveAll);
}
i++;
if(i >= argc)
ShowUsage(1);
i++;
if(i >= argc)
ShowUsage(1);
- WINE_TRACE("argvW[%d] = %S\n", i, argvW[i]);
+ WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i]));
PackageName = argvW[i];
}
else if(!msi_strequal(argvW[i], "u"))
PackageName = argvW[i];
}
else if(!msi_strequal(argvW[i], "u"))
i++;
if(i >= argc)
ShowUsage(1);
i++;
if(i >= argc)
ShowUsage(1);
- WINE_TRACE("argvW[%d] = %S\n", i, argvW[i]);
+ WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i]));
PackageName = argvW[i];
}
else if(!msi_strequal(argvW[i], "m"))
PackageName = argvW[i];
}
else if(!msi_strequal(argvW[i], "m"))
i++;
if(i >= argc)
ShowUsage(1);
i++;
if(i >= argc)
ShowUsage(1);
- WINE_TRACE("argvW[%d] = %S\n", i, argvW[i]);
+ WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i]));
PackageName = argvW[i];
}
else if(!msi_strequal(argvW[i], "/t"))
PackageName = argvW[i];
}
else if(!msi_strequal(argvW[i], "/t"))
i++;
if(i >= argc)
ShowUsage(1);
i++;
if(i >= argc)
ShowUsage(1);
- WINE_TRACE("argvW[%d] = %S\n", i, argvW[i]);
+ WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i]));
StringListAppend(&transform_list, argvW[i]);
}
else if(!msi_strprefix(argvW[i], "TRANSFORMS="))
StringListAppend(&transform_list, argvW[i]);
}
else if(!msi_strprefix(argvW[i], "TRANSFORMS="))
i++;
if(i >= argc)
ShowUsage(1);
i++;
if(i >= argc)
ShowUsage(1);
- WINE_TRACE("argvW[%d] = %S\n", i, argvW[i]);
+ WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i]));
Language = msi_atou(argvW[i]);
}
else if(!msi_strprefix(argvW[i], "/l"))
Language = msi_atou(argvW[i]);
}
else if(!msi_strprefix(argvW[i], "/l"))
i++;
if(i >= argc)
ShowUsage(1);
i++;
if(i >= argc)
ShowUsage(1);
- WINE_TRACE("argvW[%d] = %S\n", i, argvW[i]);
+ WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i]));
LogFileName = argvW[i];
if(MsiEnableLogW(LogMode, LogFileName, LogAttributes) != ERROR_SUCCESS)
{
LogFileName = argvW[i];
if(MsiEnableLogW(LogMode, LogFileName, LogAttributes) != ERROR_SUCCESS)
{
- fprintf(stderr, "Logging in %S (0x%08lx, %lu) failed\n",
- LogFileName, LogMode, LogAttributes);
+ fprintf(stderr, "Logging in %s (0x%08lx, %lu) failed\n",
+ wine_dbgstr_w(LogFileName), LogMode, LogAttributes);
i++;
if(i >= argc)
ShowUsage(1);
i++;
if(i >= argc)
ShowUsage(1);
- WINE_TRACE("argvW[%d] = %S\n", i, argvW[i]);
+ WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i]));
PatchFileName = argvW[i];
}
else if(!msi_strprefix(argvW[i], "/q"))
PatchFileName = argvW[i];
}
else if(!msi_strprefix(argvW[i], "/q"))
- fprintf(stderr, "Unknown option \"%S\" for UI level\n",
- argvW[i]+2);
+ fprintf(stderr, "Unknown option \"%s\" for UI level\n",
+ wine_dbgstr_w(argvW[i]+2));
}
}
else if(!msi_strequal(argvW[i], "/y"))
}
}
else if(!msi_strequal(argvW[i], "/y"))
i++;
if(i >= argc)
ShowUsage(1);
i++;
if(i >= argc)
ShowUsage(1);
- WINE_TRACE("argvW[%d] = %S\n", i, argvW[i]);
+ WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i]));
DllName = argvW[i];
}
else if(!msi_strequal(argvW[i], "/z"))
DllName = argvW[i];
}
else if(!msi_strequal(argvW[i], "/z"))
i++;
if(i >= argc)
ShowUsage(1);
i++;
if(i >= argc)
ShowUsage(1);
- WINE_TRACE("argvW[%d] = %S\n", i, argvW[i]);
+ WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i]));
DllName = argvW[i];
}
else if(!msi_strequal(argvW[i], "/h") || !msi_strequal(argvW[i], "/?"))
DllName = argvW[i];
}
else if(!msi_strequal(argvW[i], "/h") || !msi_strequal(argvW[i], "/?"))