Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-29 02:25:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fix warnings

Browse source 
- Print unicode strings normally with %S instead of wine macro.

svn path=/trunk/; revision=16770
This commit is contained in:
Alex Ionescu 2005-07-27 01:09:38 +00:00
parent bbd697daa6
commit 0359f3c1eb
2 changed files with 27 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/subsys/system/format/format.c
View file

@ -63,7 +63,7 @@ static VOID PrintWin32Error( LPTSTR Message, DWORD ErrorCode )
MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
(LPTSTR)&lpMsgBuf, 0, NULL ); (LPTSTR)&lpMsgBuf, 0, NULL );
_tprintf(_T("%S: %S\n"), Message, lpMsgBuf ); _tprintf(_T("%S: %S\n"), (LPWSTR)Message, (LPWSTR)lpMsgBuf );
LocalFree( lpMsgBuf ); LocalFree( lpMsgBuf );
} }

52
reactos/subsys/system/msiexec/msiexec.c
View file

@ -162,7 +162,7 @@ static LPWSTR build_properties(struct string_list *property_list)
} }
*p = 0; *p = 0;
WINE_TRACE("properties -> %s\n", wine_dbgstr_w(ret) ); WINE_TRACE("properties -> %S\n", ret);
return ret; return ret;
} }
@ -258,14 +258,14 @@ static VOID *LoadProc(LPCWSTR DllName, LPCSTR ProcName, HMODULE* DllHandle)
*DllHandle = LoadLibraryExW(DllName, NULL, LOAD_WITH_ALTERED_SEARCH_PATH); *DllHandle = LoadLibraryExW(DllName, NULL, LOAD_WITH_ALTERED_SEARCH_PATH);
if(!*DllHandle) if(!*DllHandle)
{ {
fprintf(stderr, "Unable to load dll %s\n", wine_dbgstr_w(DllName)); fprintf(stderr, "Unable to load dll %S\n", DllName);
ExitProcess(1); ExitProcess(1);
} }
proc = (VOID *) GetProcAddress(*DllHandle, ProcName); proc = (VOID *) GetProcAddress(*DllHandle, ProcName);
if(!proc) if(!proc)
{ {
fprintf(stderr, "Dll %s does not implement function %s\n", fprintf(stderr, "Dll %S does not implement function %s\n",
wine_dbgstr_w(DllName), ProcName); DllName, ProcName);
FreeLibrary(*DllHandle); FreeLibrary(*DllHandle);
ExitProcess(1); ExitProcess(1);
} }
@ -284,10 +284,10 @@ static DWORD DoDllRegisterServer(LPCWSTR DllName)
hr = pfDllRegisterServer(); hr = pfDllRegisterServer();
if(FAILED(hr)) if(FAILED(hr))
{ {
fprintf(stderr, "Failed to register dll %s\n", wine_dbgstr_w(DllName)); fprintf(stderr, "Failed to register dll %S\n", DllName);
return 1; return 1;
} }
printf("Successfully registered dll %s\n", wine_dbgstr_w(DllName)); printf("Successfully registered dll %S\n", DllName);
if(DllHandle) if(DllHandle)
FreeLibrary(DllHandle); FreeLibrary(DllHandle);
return 0; return 0;
@ -304,10 +304,10 @@ static DWORD DoDllUnregisterServer(LPCWSTR DllName)
hr = pfDllUnregisterServer(); hr = pfDllUnregisterServer();
if(FAILED(hr)) if(FAILED(hr))
{ {
fprintf(stderr, "Failed to unregister dll %s\n", wine_dbgstr_w(DllName)); fprintf(stderr, "Failed to unregister dll %S\n", DllName);
return 1; return 1;
} }
printf("Successfully unregistered dll %s\n", wine_dbgstr_w(DllName)); printf("Successfully unregistered dll %S\n", DllName);
if(DllHandle) if(DllHandle)
FreeLibrary(DllHandle); FreeLibrary(DllHandle);
return 0; return 0;
@ -485,7 +485,7 @@ int main(int argc, char **argv)
for(i = 1; i < argc; i++) for(i = 1; i < argc; i++)
{ {
WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); WINE_TRACE("argvW[%d] = %S\n", i, argvW[i]);
if (!msi_strequal(argvW[i], "/regserver")) if (!msi_strequal(argvW[i], "/regserver"))
{ {
@ -506,7 +506,7 @@ int main(int argc, char **argv)
i++; i++;
if(i >= argc) if(i >= argc)
ShowUsage(1); ShowUsage(1);
WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); WINE_TRACE("argvW[%d] = %S\n", i, argvW[i]);
argvWi = argvW[i]; argvWi = argvW[i];
} }
PackageName = argvWi; PackageName = argvWi;
@ -519,7 +519,7 @@ int main(int argc, char **argv)
i++; i++;
if(i >= argc) if(i >= argc)
ShowUsage(1); ShowUsage(1);
WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); WINE_TRACE("argvW[%d] = %S\n", i, argvW[i]);
PackageName = argvW[i]; PackageName = argvW[i];
StringListAppend(&property_list, ActionAdmin); StringListAppend(&property_list, ActionAdmin);
} }
@ -588,7 +588,7 @@ int main(int argc, char **argv)
i++; i++;
if(i >= argc) if(i >= argc)
ShowUsage(1); ShowUsage(1);
WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); WINE_TRACE("argvW[%d] = %S\n", i, argvW[i]);
PackageName = argvW[i]; PackageName = argvW[i];
} }
else if(!msi_strequal(argvW[i], "/x")) else if(!msi_strequal(argvW[i], "/x"))
@ -597,7 +597,7 @@ int main(int argc, char **argv)
i++; i++;
if(i >= argc) if(i >= argc)
ShowUsage(1); ShowUsage(1);
WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); WINE_TRACE("argvW[%d] = %S\n", i, argvW[i]);
PackageName = argvW[i]; PackageName = argvW[i];
StringListAppend(&property_list, RemoveAll); StringListAppend(&property_list, RemoveAll);
} }
@ -626,7 +626,7 @@ int main(int argc, char **argv)
i++; i++;
if(i >= argc) if(i >= argc)
ShowUsage(1); ShowUsage(1);
WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); WINE_TRACE("argvW[%d] = %S\n", i, argvW[i]);
PackageName = argvW[i]; PackageName = argvW[i];
} }
else if(!msi_strequal(argvW[i], "u")) else if(!msi_strequal(argvW[i], "u"))
@ -636,7 +636,7 @@ int main(int argc, char **argv)
i++; i++;
if(i >= argc) if(i >= argc)
ShowUsage(1); ShowUsage(1);
WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); WINE_TRACE("argvW[%d] = %S\n", i, argvW[i]);
PackageName = argvW[i]; PackageName = argvW[i];
} }
else if(!msi_strequal(argvW[i], "m")) else if(!msi_strequal(argvW[i], "m"))
@ -646,7 +646,7 @@ int main(int argc, char **argv)
i++; i++;
if(i >= argc) if(i >= argc)
ShowUsage(1); ShowUsage(1);
WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); WINE_TRACE("argvW[%d] = %S\n", i, argvW[i]);
PackageName = argvW[i]; PackageName = argvW[i];
} }
else if(!msi_strequal(argvW[i], "/t")) else if(!msi_strequal(argvW[i], "/t"))
@ -654,7 +654,7 @@ int main(int argc, char **argv)
i++; i++;
if(i >= argc) if(i >= argc)
ShowUsage(1); ShowUsage(1);
WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); WINE_TRACE("argvW[%d] = %S\n", i, argvW[i]);
StringListAppend(&transform_list, argvW[i]); StringListAppend(&transform_list, argvW[i]);
} }
else if(!msi_strprefix(argvW[i], "TRANSFORMS=")) else if(!msi_strprefix(argvW[i], "TRANSFORMS="))
@ -666,7 +666,7 @@ int main(int argc, char **argv)
i++; i++;
if(i >= argc) if(i >= argc)
ShowUsage(1); ShowUsage(1);
WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); WINE_TRACE("argvW[%d] = %S\n", i, argvW[i]);
Language = msi_atou(argvW[i]); Language = msi_atou(argvW[i]);
} }
else if(!msi_strprefix(argvW[i], "/l")) else if(!msi_strprefix(argvW[i], "/l"))
@ -751,12 +751,12 @@ int main(int argc, char **argv)
i++; i++;
if(i >= argc) if(i >= argc)
ShowUsage(1); ShowUsage(1);
WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); WINE_TRACE("argvW[%d] = %S\n", i, argvW[i]);
LogFileName = argvW[i]; LogFileName = argvW[i];
if(MsiEnableLogW(LogMode, LogFileName, LogAttributes) != ERROR_SUCCESS) if(MsiEnableLogW(LogMode, LogFileName, LogAttributes) != ERROR_SUCCESS)
{ {
fprintf(stderr, "Logging in %s (0x%08lx, %lu) failed\n", fprintf(stderr, "Logging in %S (0x%08lx, %lu) failed\n",
wine_dbgstr_w(LogFileName), LogMode, LogAttributes); LogFileName, LogMode, LogAttributes);
ExitProcess(1); ExitProcess(1);
} }
} }
@ -766,7 +766,7 @@ int main(int argc, char **argv)
i++; i++;
if(i >= argc) if(i >= argc)
ShowUsage(1); ShowUsage(1);
WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); WINE_TRACE("argvW[%d] = %S\n", i, argvW[i]);
PatchFileName = argvW[i]; PatchFileName = argvW[i];
} }
else if(!msi_strprefix(argvW[i], "/q")) else if(!msi_strprefix(argvW[i], "/q"))
@ -806,8 +806,8 @@ int main(int argc, char **argv)
} }
else else
{ {
fprintf(stderr, "Unknown option \"%s\" for UI level\n", fprintf(stderr, "Unknown option \"%S\" for UI level\n",
wine_dbgstr_w(argvW[i]+2)); argvW[i]+2);
} }
} }
else if(!msi_strequal(argvW[i], "/y")) else if(!msi_strequal(argvW[i], "/y"))
@ -816,7 +816,7 @@ int main(int argc, char **argv)
i++; i++;
if(i >= argc) if(i >= argc)
ShowUsage(1); ShowUsage(1);
WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); WINE_TRACE("argvW[%d] = %S\n", i, argvW[i]);
DllName = argvW[i]; DllName = argvW[i];
} }
else if(!msi_strequal(argvW[i], "/z")) else if(!msi_strequal(argvW[i], "/z"))
@ -825,7 +825,7 @@ int main(int argc, char **argv)
i++; i++;
if(i >= argc) if(i >= argc)
ShowUsage(1); ShowUsage(1);
WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); WINE_TRACE("argvW[%d] = %S\n", i, argvW[i]);
DllName = argvW[i]; DllName = argvW[i];
} }
else if(!msi_strequal(argvW[i], "/h") || !msi_strequal(argvW[i], "/?")) else if(!msi_strequal(argvW[i], "/h") || !msi_strequal(argvW[i], "/?"))