July 2006 - Wine-commits - list.winehq.org

Robert Shearman : ole32: Add validation of parameters to CoGetClassObject and make sure to initialise ppv to NULL .
by Alexandre Julliard 14 Jul '06

14 Jul '06

Module: wine Branch: refs/heads/master Commit: 69e10bf1ed94ef933a6e627a3dd0167a065e9598 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=69e10bf1ed94ef933a6e627… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Jul 14 00:02:24 2006 +0100 ole32: Add validation of parameters to CoGetClassObject and make sure to initialise ppv to NULL. --- dlls/ole32/compobj.c | 11 +++++++++++ dlls/ole32/tests/compobj.c | 12 ++++++++++++ 2 files changed, 23 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 4efa235..db0fcbe 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -1618,6 +1618,17 @@ HRESULT WINAPI CoGetClassObject( TRACE("\n\tCLSID:\t%s,\n\tIID:\t%s\n", debugstr_guid(rclsid), debugstr_guid(iid)); + if (!ppv) + return E_INVALIDARG; + + *ppv = NULL; + + if (!COM_CurrentApt()) + { + ERR("apartment not initialised\n"); + return CO_E_NOTINITIALIZED; + } + if (pServerInfo) { FIXME("\tpServerInfo: name=%s\n",debugstr_w(pServerInfo->pwszName)); FIXME("\t\tpAuthInfo=%p\n",pServerInfo->pAuthInfo); diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 06bf381..9164be8 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -100,6 +100,17 @@ static void test_CoCreateInstance(void) ok(hr == CO_E_NOTINITIALIZED, "CoCreateInstance should have returned CO_E_NOTINITIALIZED instead of 0x%08lx\n", hr); } +static void test_CoGetClassObject(void) +{ + IUnknown *pUnk = (IUnknown *)0xdeadbeef; + HRESULT hr = CoGetClassObject(&CLSID_MyComputer, CLSCTX_INPROC_SERVER, NULL, &IID_IUnknown, (void **)&pUnk); + ok(hr == CO_E_NOTINITIALIZED, "CoGetClassObject should have returned CO_E_NOTINITIALIZED instead of 0x%08lx\n", hr); + ok(pUnk == NULL, "CoGetClassObject should have changed the passed in pointer to NULL, instead of %p\n", pUnk); + + hr = CoGetClassObject(&CLSID_MyComputer, CLSCTX_INPROC_SERVER, NULL, &IID_IUnknown, NULL); + ok(hr == E_INVALIDARG, "CoGetClassObject should have returned E_INVALIDARG instead of 0x%08lx\n", hr); +} + static ATOM register_dummy_class(void) { WNDCLASS wc = @@ -138,4 +149,5 @@ START_TEST(compobj) test_CLSIDFromString(); test_CoCreateInstance(); test_ole_menu(); + test_CoGetClassObject(); }

1 0

Robert Shearman : rpcrt4: Add the threading model and a description when registering a CLSID for the PSFactoryBuffer .
by Alexandre Julliard 14 Jul '06

14 Jul '06

Module: wine Branch: refs/heads/master Commit: a02034a609ca2f8ab3eac156b69a225188fbbc48 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a02034a609ca2f8ab3eac15… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Jul 14 00:02:31 2006 +0100 rpcrt4: Add the threading model and a description when registering a CLSID for the PSFactoryBuffer. --- dlls/rpcrt4/cpsf.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/cpsf.c b/dlls/rpcrt4/cpsf.c index 454ef7a..a350c40 100644 --- a/dlls/rpcrt4/cpsf.c +++ b/dlls/rpcrt4/cpsf.c @@ -230,9 +230,11 @@ HRESULT WINAPI NdrDllRegisterProxy(HMODU TRACE("registering CLSID %s => %s\n", clsid, module); if (RegCreateKeyExA(HKEY_CLASSES_ROOT, keyname, 0, NULL, 0, KEY_WRITE, NULL, &key, NULL) == ERROR_SUCCESS) { + RegSetValueExA(subkey, NULL, 0, REG_SZ, (LPBYTE)"PSFactoryBuffer", strlen("PSFactoryBuffer")); if (RegCreateKeyExA(key, "InProcServer32", 0, NULL, 0, KEY_WRITE, NULL, &subkey, NULL) == ERROR_SUCCESS) { RegSetValueExA(subkey, NULL, 0, REG_SZ, (LPBYTE)module, strlen(module)); + RegSetValueExA(subkey, "ThreadingModel", 0, REG_SZ, (LPBYTE)"Both", strlen("Both")); RegCloseKey(subkey); } RegCloseKey(key);

1 0

Michael Stefaniuc : Fix swapped 2nd and 3rd argument passed to memset.
by Alexandre Julliard 14 Jul '06

14 Jul '06

Module: wine Branch: refs/heads/master Commit: 932a2a0d54b7da746e1f55c8dc83144d686e5df3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=932a2a0d54b7da746e1f55c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 13 23:06:17 2006 +0200 Fix swapped 2nd and 3rd argument passed to memset. --- dlls/dinput/device.c | 2 +- dlls/gdi/tests/brush.c | 2 +- dlls/winedos/int10.c | 8 ++++---- dlls/winex11.drv/xim.c | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index d8924d3..7e2e9d4 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -271,7 +271,7 @@ void fill_DataFormat(void *out, const vo break; default: - memset((out_c + df->dt[i].offset_out), df->dt[i].size, 0); + memset((out_c + df->dt[i].offset_out), 0, df->dt[i].size); break; } } diff --git a/dlls/gdi/tests/brush.c b/dlls/gdi/tests/brush.c index 36ad129..c2aee7c 100644 --- a/dlls/gdi/tests/brush.c +++ b/dlls/gdi/tests/brush.c @@ -56,7 +56,7 @@ static void test_solidbrush(void) } else stockBrush = NULL; - memset(&br, sizeof(br), 0); + memset(&br, 0, sizeof(br)); ret = GetObject(solidBrush, sizeof(br), &br); ok( ret !=0, "GetObject on solid %s brush failed, error=%ld\n", stock[i].name, GetLastError()); ok(br.lbStyle==BS_SOLID, "%s brush has wrong style, got %d expected %d\n", stock[i].name, br.lbStyle, BS_SOLID); diff --git a/dlls/winedos/int10.c b/dlls/winedos/int10.c index 01665b5..98821f2 100644 --- a/dlls/winedos/int10.c +++ b/dlls/winedos/int10.c @@ -299,7 +299,7 @@ static void INT10_FillControllerInformat *(SEGPTR*)(buffer + 36) = 0; /* 40 - BYTE[216]: reserved for VBE implementation, set to zero */ - memset( buffer + 40, 216, 0 ); + memset( buffer + 40, 0, 216 ); /* * 256 - BYTE[256]: reserved for VBE3.0 implementation, @@ -548,7 +548,7 @@ static BOOL INT10_FillModeInformation( s mib->MaxPixelClock = 0; /* FIXME */ /* 66 - BYTE[190]: reserved, set to zero */ - memset( &mib->Reserved4, 190, 0 ); + memset( &mib->Reserved4, 0, 190 ); return TRUE; } @@ -636,7 +636,7 @@ static void INT10_FillStateInformation( buffer[46] = 0; /* FIXME: correct value? */ /* 47 - BYTE[2]: reserved, set to zero */ - memset( buffer + 47, 2, 0 ); + memset( buffer + 47, 0, 2 ); /* * 49 - BYTE: video memory available @@ -673,7 +673,7 @@ static void INT10_FillStateInformation( buffer[51] = 4; /* FIXME: correct value? */ /* 52 - BYTE[12]: reserved, set to zero */ - memset( buffer + 52, 12, 0 ); + memset( buffer + 52, 0, 12 ); } diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c index 845083a..110e7e8 100644 --- a/dlls/winex11.drv/xim.c +++ b/dlls/winex11.drv/xim.c @@ -163,8 +163,8 @@ static BOOL X11DRV_ImmSetInternalString( HeapAlloc(GetProcessHeap(), 0, dwCompStringSize + byte_expansion); - memset(&(CompositionString[dwCompStringSize]), byte_expansion, - 0); + memset(&(CompositionString[dwCompStringSize]), 0, + byte_expansion); dwCompStringSize += byte_expansion; }

1 0

Alexandre Julliard : msiexec: Invert the return values of the boolean functions so that
by Alexandre Julliard 14 Jul '06

14 Jul '06

Module: wine Branch: refs/heads/master Commit: 4cf14960ba12d0108c7f2e693431478ad22df99d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4cf14960ba12d0108c7f2e6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 14 12:38:20 2006 +0200 msiexec: Invert the return values of the boolean functions so that their names make more sense. --- programs/msiexec/msiexec.c | 72 ++++++++++++++++++++++---------------------- 1 files changed, 36 insertions(+), 36 deletions(-) diff --git a/programs/msiexec/msiexec.c b/programs/msiexec/msiexec.c index e63727b..0d273f2 100644 --- a/programs/msiexec/msiexec.c +++ b/programs/msiexec/msiexec.c @@ -219,21 +219,21 @@ static BOOL msi_strequal(LPCWSTR str1, L len = MultiByteToWideChar( CP_ACP, 0, str2, -1, NULL, 0); if( !len ) - return TRUE; + return FALSE; if( lstrlenW(str1) != (len-1) ) - return TRUE; + return FALSE; strW = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*len); MultiByteToWideChar( CP_ACP, 0, str2, -1, strW, len); ret = CompareStringW(GetThreadLocale(), NORM_IGNORECASE, str1, len, strW, len); HeapFree(GetProcessHeap(), 0, strW); - return (ret != CSTR_EQUAL); + return (ret == CSTR_EQUAL); } /* prefix is hyphen or dash, and str1 is the same as str2, ignoring case */ static BOOL msi_option_equal(LPCWSTR str1, LPCSTR str2) { if (str1[0] != '/' && str1[0] != '-') - return TRUE; + return FALSE; /* skip over the hyphen or slash */ return msi_strequal(str1 + 1, str2); @@ -247,21 +247,21 @@ static BOOL msi_strprefix(LPCWSTR str1, len = MultiByteToWideChar( CP_ACP, 0, str2, -1, NULL, 0); if( !len ) - return TRUE; + return FALSE; if( lstrlenW(str1) < (len-1) ) - return TRUE; + return FALSE; strW = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*len); MultiByteToWideChar( CP_ACP, 0, str2, -1, strW, len); ret = CompareStringW(GetThreadLocale(), NORM_IGNORECASE, str1, len-1, strW, len-1); HeapFree(GetProcessHeap(), 0, strW); - return (ret != CSTR_EQUAL); + return (ret == CSTR_EQUAL); } /* prefix is hyphen or dash, and str2 is at the beginning of str1, ignoring case */ static BOOL msi_option_prefix(LPCWSTR str1, LPCSTR str2) { if (str1[0] != '/' && str1[0] != '-') - return TRUE; + return FALSE; /* skip over the hyphen or slash */ return msi_strprefix(str1 + 1, str2); @@ -401,7 +401,7 @@ int main(int argc, char **argv) * We do that before starting to process the real commandline, * then overwrite the commandline again. */ - if(!msi_option_equal(argvW[1], "@")) + if(msi_option_equal(argvW[1], "@")) { if(!process_args_from_reg( argvW[2], &argc, &argvW )) return 1; @@ -411,15 +411,15 @@ int main(int argc, char **argv) { WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); - if (!msi_option_equal(argvW[i], "regserver")) + if (msi_option_equal(argvW[i], "regserver")) { FunctionRegServer = TRUE; } - else if (!msi_option_equal(argvW[i], "unregserver") || !msi_option_equal(argvW[i], "unregister")) + else if (msi_option_equal(argvW[i], "unregserver") || msi_option_equal(argvW[i], "unregister")) { FunctionUnregServer = TRUE; } - else if(!msi_option_prefix(argvW[i], "i")) + else if(msi_option_prefix(argvW[i], "i")) { LPWSTR argvWi = argvW[i]; FunctionInstall = TRUE; @@ -435,7 +435,7 @@ int main(int argc, char **argv) } PackageName = argvWi; } - else if(!msi_option_equal(argvW[i], "a")) + else if(msi_option_equal(argvW[i], "a")) { FunctionInstall = TRUE; FunctionInstallAdmin = TRUE; @@ -447,7 +447,7 @@ int main(int argc, char **argv) PackageName = argvW[i]; StringListAppend(&property_list, ActionAdmin); } - else if(!msi_option_prefix(argvW[i], "f")) + else if(msi_option_prefix(argvW[i], "f")) { int j; int len = lstrlenW(argvW[i]); @@ -515,7 +515,7 @@ int main(int argc, char **argv) WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); PackageName = argvW[i]; } - else if(!msi_option_equal(argvW[i], "x")) + else if(msi_option_equal(argvW[i], "x")) { FunctionInstall = TRUE; i++; @@ -525,7 +525,7 @@ int main(int argc, char **argv) PackageName = argvW[i]; StringListAppend(&property_list, RemoveAll); } - else if(!msi_option_prefix(argvW[i], "j")) + else if(msi_option_prefix(argvW[i], "j")) { int j; int len = lstrlenW(argvW[i]); @@ -553,7 +553,7 @@ int main(int argc, char **argv) WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); PackageName = argvW[i]; } - else if(!msi_strequal(argvW[i], "u")) + else if(msi_strequal(argvW[i], "u")) { FunctionAdvertise = TRUE; AdvertiseMode = ADVERTISEFLAGS_USERASSIGN; @@ -563,7 +563,7 @@ int main(int argc, char **argv) WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); PackageName = argvW[i]; } - else if(!msi_strequal(argvW[i], "m")) + else if(msi_strequal(argvW[i], "m")) { FunctionAdvertise = TRUE; AdvertiseMode = ADVERTISEFLAGS_MACHINEASSIGN; @@ -573,7 +573,7 @@ int main(int argc, char **argv) WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); PackageName = argvW[i]; } - else if(!msi_option_equal(argvW[i], "t")) + else if(msi_option_equal(argvW[i], "t")) { i++; if(i >= argc) @@ -581,7 +581,7 @@ int main(int argc, char **argv) WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); StringListAppend(&transform_list, argvW[i]); } - else if(!msi_option_equal(argvW[i], "g")) + else if(msi_option_equal(argvW[i], "g")) { i++; if(i >= argc) @@ -589,7 +589,7 @@ int main(int argc, char **argv) WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); Language = msi_atou(argvW[i]); } - else if(!msi_option_prefix(argvW[i], "l")) + else if(msi_option_prefix(argvW[i], "l")) { int j; int len = lstrlenW(argvW[i]); @@ -680,7 +680,7 @@ int main(int argc, char **argv) ExitProcess(1); } } - else if(!msi_option_equal(argvW[i], "p")) + else if(msi_option_equal(argvW[i], "p")) { FunctionPatch = TRUE; i++; @@ -689,37 +689,37 @@ int main(int argc, char **argv) WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); PatchFileName = argvW[i]; } - else if(!msi_option_prefix(argvW[i], "q")) + else if(msi_option_prefix(argvW[i], "q")) { - if(lstrlenW(argvW[i]) == 2 || !msi_strequal(argvW[i]+2, "n")) + if(lstrlenW(argvW[i]) == 2 || msi_strequal(argvW[i]+2, "n")) { InstallUILevel = INSTALLUILEVEL_NONE; } - else if(!msi_strequal(argvW[i]+2, "b")) + else if(msi_strequal(argvW[i]+2, "b")) { InstallUILevel = INSTALLUILEVEL_BASIC; } - else if(!msi_strequal(argvW[i]+2, "r")) + else if(msi_strequal(argvW[i]+2, "r")) { InstallUILevel = INSTALLUILEVEL_REDUCED; } - else if(!msi_strequal(argvW[i]+2, "f")) + else if(msi_strequal(argvW[i]+2, "f")) { InstallUILevel = INSTALLUILEVEL_FULL|INSTALLUILEVEL_ENDDIALOG; } - else if(!msi_strequal(argvW[i]+2, "n+")) + else if(msi_strequal(argvW[i]+2, "n+")) { InstallUILevel = INSTALLUILEVEL_NONE|INSTALLUILEVEL_ENDDIALOG; } - else if(!msi_strequal(argvW[i]+2, "b+")) + else if(msi_strequal(argvW[i]+2, "b+")) { InstallUILevel = INSTALLUILEVEL_BASIC|INSTALLUILEVEL_ENDDIALOG; } - else if(!msi_strequal(argvW[i]+2, "b-")) + else if(msi_strequal(argvW[i]+2, "b-")) { InstallUILevel = INSTALLUILEVEL_BASIC|INSTALLUILEVEL_PROGRESSONLY; } - else if(!msi_strequal(argvW[i]+2, "b+!")) + else if(msi_strequal(argvW[i]+2, "b+!")) { InstallUILevel = INSTALLUILEVEL_BASIC|INSTALLUILEVEL_ENDDIALOG; WINE_FIXME("Unknown modifier: !\n"); @@ -730,7 +730,7 @@ int main(int argc, char **argv) wine_dbgstr_w(argvW[i]+2)); } } - else if(!msi_option_equal(argvW[i], "y")) + else if(msi_option_equal(argvW[i], "y")) { FunctionDllRegisterServer = TRUE; i++; @@ -739,7 +739,7 @@ int main(int argc, char **argv) WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); DllName = argvW[i]; } - else if(!msi_option_equal(argvW[i], "z")) + else if(msi_option_equal(argvW[i], "z")) { FunctionDllUnregisterServer = TRUE; i++; @@ -748,16 +748,16 @@ int main(int argc, char **argv) WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); DllName = argvW[i]; } - else if(!msi_option_equal(argvW[i], "h") || !msi_option_equal(argvW[i], "?")) + else if(msi_option_equal(argvW[i], "h") || msi_option_equal(argvW[i], "?")) { ShowUsage(0); } - else if(!msi_option_equal(argvW[i], "m")) + else if(msi_option_equal(argvW[i], "m")) { FunctionUnknown = TRUE; WINE_FIXME("Unknown parameter /m\n"); } - else if(!msi_option_equal(argvW[i], "D")) + else if(msi_option_equal(argvW[i], "D")) { FunctionUnknown = TRUE; WINE_FIXME("Unknown parameter /D\n");

1 0

James Hawkins : msiexec: Also support options using a hyphen.
by Alexandre Julliard 14 Jul '06

14 Jul '06

Module: wine Branch: refs/heads/master Commit: 8c3fc3a889bd6c5e0dc965d0aec4dad9fc5937db URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8c3fc3a889bd6c5e0dc965d… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Jul 13 14:46:51 2006 -0700 msiexec: Also support options using a hyphen. --- programs/msiexec/msiexec.c | 56 ++++++++++++++++++++++++++++++-------------- 1 files changed, 38 insertions(+), 18 deletions(-) diff --git a/programs/msiexec/msiexec.c b/programs/msiexec/msiexec.c index d637216..e63727b 100644 --- a/programs/msiexec/msiexec.c +++ b/programs/msiexec/msiexec.c @@ -229,6 +229,16 @@ static BOOL msi_strequal(LPCWSTR str1, L return (ret != CSTR_EQUAL); } +/* prefix is hyphen or dash, and str1 is the same as str2, ignoring case */ +static BOOL msi_option_equal(LPCWSTR str1, LPCSTR str2) +{ + if (str1[0] != '/' && str1[0] != '-') + return TRUE; + + /* skip over the hyphen or slash */ + return msi_strequal(str1 + 1, str2); +} + /* str2 is at the beginning of str1, ignoring case */ static BOOL msi_strprefix(LPCWSTR str1, LPCSTR str2) { @@ -247,6 +257,16 @@ static BOOL msi_strprefix(LPCWSTR str1, return (ret != CSTR_EQUAL); } +/* prefix is hyphen or dash, and str2 is at the beginning of str1, ignoring case */ +static BOOL msi_option_prefix(LPCWSTR str1, LPCSTR str2) +{ + if (str1[0] != '/' && str1[0] != '-') + return TRUE; + + /* skip over the hyphen or slash */ + return msi_strprefix(str1 + 1, str2); +} + static VOID *LoadProc(LPCWSTR DllName, LPCSTR ProcName, HMODULE* DllHandle) { VOID* (*proc)(void); @@ -381,7 +401,7 @@ int main(int argc, char **argv) * We do that before starting to process the real commandline, * then overwrite the commandline again. */ - if(!msi_strequal(argvW[1], "/@")) + if(!msi_option_equal(argvW[1], "@")) { if(!process_args_from_reg( argvW[2], &argc, &argvW )) return 1; @@ -391,15 +411,15 @@ int main(int argc, char **argv) { WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); - if (!msi_strequal(argvW[i], "/regserver")) + if (!msi_option_equal(argvW[i], "regserver")) { FunctionRegServer = TRUE; } - else if (!msi_strequal(argvW[i], "/unregserver") || !msi_strequal(argvW[i], "/unregister")) + else if (!msi_option_equal(argvW[i], "unregserver") || !msi_option_equal(argvW[i], "unregister")) { FunctionUnregServer = TRUE; } - else if(!msi_strprefix(argvW[i], "/i")) + else if(!msi_option_prefix(argvW[i], "i")) { LPWSTR argvWi = argvW[i]; FunctionInstall = TRUE; @@ -415,7 +435,7 @@ int main(int argc, char **argv) } PackageName = argvWi; } - else if(!msi_strequal(argvW[i], "/a")) + else if(!msi_option_equal(argvW[i], "a")) { FunctionInstall = TRUE; FunctionInstallAdmin = TRUE; @@ -427,7 +447,7 @@ int main(int argc, char **argv) PackageName = argvW[i]; StringListAppend(&property_list, ActionAdmin); } - else if(!msi_strprefix(argvW[i], "/f")) + else if(!msi_option_prefix(argvW[i], "f")) { int j; int len = lstrlenW(argvW[i]); @@ -495,7 +515,7 @@ int main(int argc, char **argv) WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); PackageName = argvW[i]; } - else if(!msi_strequal(argvW[i], "/x")) + else if(!msi_option_equal(argvW[i], "x")) { FunctionInstall = TRUE; i++; @@ -505,7 +525,7 @@ int main(int argc, char **argv) PackageName = argvW[i]; StringListAppend(&property_list, RemoveAll); } - else if(!msi_strprefix(argvW[i], "/j")) + else if(!msi_option_prefix(argvW[i], "j")) { int j; int len = lstrlenW(argvW[i]); @@ -553,7 +573,7 @@ int main(int argc, char **argv) WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); PackageName = argvW[i]; } - else if(!msi_strequal(argvW[i], "/t")) + else if(!msi_option_equal(argvW[i], "t")) { i++; if(i >= argc) @@ -561,7 +581,7 @@ int main(int argc, char **argv) WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); StringListAppend(&transform_list, argvW[i]); } - else if(!msi_strequal(argvW[i], "/g")) + else if(!msi_option_equal(argvW[i], "g")) { i++; if(i >= argc) @@ -569,7 +589,7 @@ int main(int argc, char **argv) WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); Language = msi_atou(argvW[i]); } - else if(!msi_strprefix(argvW[i], "/l")) + else if(!msi_option_prefix(argvW[i], "l")) { int j; int len = lstrlenW(argvW[i]); @@ -660,7 +680,7 @@ int main(int argc, char **argv) ExitProcess(1); } } - else if(!msi_strequal(argvW[i], "/p")) + else if(!msi_option_equal(argvW[i], "p")) { FunctionPatch = TRUE; i++; @@ -669,7 +689,7 @@ int main(int argc, char **argv) WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); PatchFileName = argvW[i]; } - else if(!msi_strprefix(argvW[i], "/q")) + else if(!msi_option_prefix(argvW[i], "q")) { if(lstrlenW(argvW[i]) == 2 || !msi_strequal(argvW[i]+2, "n")) { @@ -710,7 +730,7 @@ int main(int argc, char **argv) wine_dbgstr_w(argvW[i]+2)); } } - else if(!msi_strequal(argvW[i], "/y")) + else if(!msi_option_equal(argvW[i], "y")) { FunctionDllRegisterServer = TRUE; i++; @@ -719,7 +739,7 @@ int main(int argc, char **argv) WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); DllName = argvW[i]; } - else if(!msi_strequal(argvW[i], "/z")) + else if(!msi_option_equal(argvW[i], "z")) { FunctionDllUnregisterServer = TRUE; i++; @@ -728,16 +748,16 @@ int main(int argc, char **argv) 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], "/?")) + else if(!msi_option_equal(argvW[i], "h") || !msi_option_equal(argvW[i], "?")) { ShowUsage(0); } - else if(!msi_strequal(argvW[i], "/m")) + else if(!msi_option_equal(argvW[i], "m")) { FunctionUnknown = TRUE; WINE_FIXME("Unknown parameter /m\n"); } - else if(!msi_strequal(argvW[i], "/D")) + else if(!msi_option_equal(argvW[i], "D")) { FunctionUnknown = TRUE; WINE_FIXME("Unknown parameter /D\n");

1 0

Alexandre Julliard : configure: Revert the error exit code for warnings, it causes more
by Alexandre Julliard 14 Jul '06

14 Jul '06

Module: wine Branch: refs/heads/master Commit: 100e24213f70988005856e744c2d6786e5e69a50 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=100e24213f70988005856e7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 14 11:32:11 2006 +0200 configure: Revert the error exit code for warnings, it causes more trouble than it's worth. --- configure | 8 -------- configure.ac | 8 -------- 2 files changed, 0 insertions(+), 16 deletions(-) diff --git a/configure b/configure index 5b032c6..e046057 100755 --- a/configure +++ b/configure @@ -25959,7 +25959,6 @@ if test "$no_create" != yes; then fi -exitcode=0 if test "$have_x" = "no" then echo >&2 @@ -25971,7 +25970,6 @@ echo "$as_me: WARNING: X support, which echo "$as_me: WARNING: isn't what you want anyway. You will need to install devel" >&2;} { echo "$as_me:$LINENO: WARNING: packages of Xlib/Xfree86 at the very least." >&5 echo "$as_me: WARNING: packages of Xlib/Xfree86 at the very least." >&2;} - exitcode=1 fi if test "$wine_cv_opengl_version_OK" = "no" @@ -25981,7 +25979,6 @@ then echo "$as_me: WARNING: Old Mesa headers detected. Wine will be built without Direct3D" >&2;} { echo "$as_me:$LINENO: WARNING: support. Consider upgrading your Mesa libraries (http://www.mesa3d.org/)" >&5 echo "$as_me: WARNING: support. Consider upgrading your Mesa libraries (http://www.mesa3d.org/)" >&2;} - exitcode=1 fi if test "$wine_cv_msg_freetype" = "yes" @@ -25995,7 +25992,6 @@ echo "$as_me: WARNING: installed, but 'f echo "$as_me: WARNING: the freetype-devel package (or its equivalent on your distribution)" >&2;} { echo "$as_me:$LINENO: WARNING: to enable Wine to use TrueType fonts." >&5 echo "$as_me: WARNING: to enable Wine to use TrueType fonts." >&2;} - exitcode=1 fi if test -z "$FONTSSUBDIRS" @@ -26011,7 +26007,6 @@ echo "$as_me: WARNING: FreeType is missi fi { echo "$as_me:$LINENO: WARNING: Fonts will not be built. Dialog text may be invisible or unaligned." >&5 echo "$as_me: WARNING: Fonts will not be built. Dialog text may be invisible or unaligned." >&2;} - exitcode=1 fi if test -z "$ALSALIBS" -a \ @@ -26031,12 +26026,9 @@ echo "$as_me: WARNING: No sound system w echo "$as_me: WARNING: The currently supported sound systems are:" >&2;} { echo "$as_me:$LINENO: WARNING: ALSA, ARTS, EsounD, AudioIO, Jack, NAS and OSS" >&5 echo "$as_me: WARNING: ALSA, ARTS, EsounD, AudioIO, Jack, NAS and OSS" >&2;} - exitcode=1 fi echo echo "Configure finished. Do '${ac_make} depend && ${ac_make}' to compile Wine." echo -exit $exitcode - diff --git a/configure.ac b/configure.ac index bf94eaa..ff7ec32 100644 --- a/configure.ac +++ b/configure.ac @@ -1848,7 +1848,6 @@ tools/wrc/Makefile]) AC_OUTPUT -exitcode=0 if test "$have_x" = "no" then echo >&2 @@ -1856,7 +1855,6 @@ then AC_MSG_WARN([X support, which currently does not work, and probably]) AC_MSG_WARN([isn't what you want anyway. You will need to install devel]) AC_MSG_WARN([ packages of Xlib/Xfree86 at the very least.]) - exitcode=1 fi if test "$wine_cv_opengl_version_OK" = "no" @@ -1864,7 +1862,6 @@ then echo >&2 AC_MSG_WARN([Old Mesa headers detected. Wine will be built without Direct3D]) AC_MSG_WARN([support. Consider upgrading your Mesa libraries (http://www.mesa3d.org/).]) - exitcode=1 fi if test "$wine_cv_msg_freetype" = "yes" @@ -1874,7 +1871,6 @@ then AC_MSG_WARN([installed, but 'freetype-config' is not in your PATH. Install]) AC_MSG_WARN([the freetype-devel package (or its equivalent on your distribution)]) AC_MSG_WARN([to enable Wine to use TrueType fonts.]) - exitcode=1 fi if test -z "$FONTSSUBDIRS" @@ -1887,7 +1883,6 @@ then AC_MSG_WARN([FreeType is missing.]) fi AC_MSG_WARN([Fonts will not be built. Dialog text may be invisible or unaligned.]) - exitcode=1 fi if test -z "$ALSALIBS" -a \ @@ -1904,15 +1899,12 @@ then AC_MSG_WARN([No sound system was found. Windows applications will be silent.]) AC_MSG_WARN([The currently supported sound systems are:]) AC_MSG_WARN([ALSA, ARTS, EsounD, AudioIO, Jack, NAS and OSS]) - exitcode=1 fi echo echo "Configure finished. Do '${ac_make} depend && ${ac_make}' to compile Wine." echo -exit $exitcode - dnl Local Variables: dnl comment-start: "dnl " dnl comment-end: ""

1 0

Andrew Talbot : winedump: Write-strings warnings fix.
by Alexandre Julliard 14 Jul '06

14 Jul '06

Module: wine Branch: refs/heads/master Commit: a695805ced5ea50c2c992b430fd8acf1c178f014 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a695805ced5ea50c2c992b4… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Thu Jul 13 20:06:08 2006 +0100 winedump: Write-strings warnings fix. --- tools/winedump/pe.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index 6ef0607..da55f63 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -139,7 +139,7 @@ static const char * const DirectoryNames "IAT", "Delay IAT", "COM Descript", "" }; -static char *get_magic_type(WORD magic) +static const char *get_magic_type(WORD magic) { switch(magic) { case IMAGE_NT_OPTIONAL_HDR32_MAGIC:

1 0

James Hawkins : msi: Add handling for the GroupBox dialog control.
by Alexandre Julliard 14 Jul '06

14 Jul '06

Module: wine Branch: refs/heads/master Commit: 1adcf0087af491d2f1413d87ae225b17101568fc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1adcf0087af491d2f1413d8… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Jul 13 14:03:23 2006 -0700 msi: Add handling for the GroupBox dialog control. --- dlls/msi/dialog.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index ce1af99..a4b4bec 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -134,6 +134,7 @@ static const WCHAR szRadioButtonGroup[] static const WCHAR szIcon[] = { 'I','c','o','n',0 }; static const WCHAR szSelectionTree[] = { 'S','e','l','e','c','t','i','o','n','T','r','e','e',0 }; +static const WCHAR szGroupBox[] = { 'G','r','o','u','p','B','o','x',0 }; static UINT msi_dialog_checkbox_handler( msi_dialog *, msi_control *, WPARAM ); static void msi_dialog_checkbox_sync_state( msi_dialog *, msi_control * ); @@ -1689,6 +1690,21 @@ static UINT msi_dialog_selection_tree( m return ERROR_SUCCESS; } +/******************** Group Box ***************************************/ + +static UINT msi_dialog_group_box( msi_dialog *dialog, MSIRECORD *rec ) +{ + msi_control *control; + DWORD style; + + style = BS_GROUPBOX | WS_CHILD | WS_GROUP; + control = msi_dialog_add_control( dialog, rec, WC_BUTTONW, style ); + if (!control) + return ERROR_FUNCTION_FAILED; + + return ERROR_SUCCESS; +} + static const struct control_handler msi_dialog_handler[] = { { szText, msi_dialog_text_control }, @@ -1705,6 +1721,7 @@ static const struct control_handler msi_ { szRadioButtonGroup, msi_dialog_radiogroup_control }, { szIcon, msi_dialog_icon_control }, { szSelectionTree, msi_dialog_selection_tree }, + { szGroupBox, msi_dialog_group_box }, }; #define NUM_CONTROL_TYPES (sizeof msi_dialog_handler/sizeof msi_dialog_handler[0])

1 0

Alexandre Julliard : ntdll: Support for arbitrary memory allocation granularity.
by Alexandre Julliard 14 Jul '06

14 Jul '06

Module: wine Branch: refs/heads/master Commit: 8f47bd0306f969e9a34796f531541eedadaeac36 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8f47bd0306f969e9a34796f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 13 20:36:41 2006 +0200 ntdll: Support for arbitrary memory allocation granularity. --- dlls/ntdll/virtual.c | 45 +++++++++++++++++++++++++++------------------ 1 files changed, 27 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 5e7a15d..e00acfb 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -129,7 +129,6 @@ static UINT_PTR page_mask; # define ADDRESS_SPACE_LIMIT 0 /* no limit needed on other platforms */ # define USER_SPACE_LIMIT 0 /* no limit needed on other platforms */ #endif /* __i386__ */ -static const UINT_PTR granularity_mask = 0xffff; /* Allocation granularity (usually 64k) */ #define ROUND_ADDR(addr,mask) \ ((void *)((UINT_PTR)(addr) & ~(UINT_PTR)(mask))) @@ -238,6 +237,17 @@ static struct file_view *VIRTUAL_FindVie /*********************************************************************** + * get_mask + */ +static inline UINT_PTR get_mask( ULONG zero_bits ) +{ + if (!zero_bits) return 0xffff; /* allocations are aligned to 64K by default */ + if (zero_bits < page_shift) zero_bits = page_shift; + return (1 << zero_bits) - 1; +} + + +/*********************************************************************** * find_view_range * * Find the first view overlapping at least part of the specified range. @@ -574,7 +584,8 @@ static inline void *unmap_extra_space( v * Create a view and mmap the corresponding memory area. * The csVirtual section must be held by caller. */ -static NTSTATUS map_view( struct file_view **view_ret, void *base, size_t size, BYTE vprot ) +static NTSTATUS map_view( struct file_view **view_ret, void *base, size_t size, size_t mask, + BYTE vprot ) { void *ptr; NTSTATUS status; @@ -615,7 +626,7 @@ static NTSTATUS map_view( struct file_vi } else { - size_t view_size = size + granularity_mask + 1; + size_t view_size = size + mask + 1; for (;;) { @@ -628,7 +639,7 @@ static NTSTATUS map_view( struct file_vi if (is_beyond_limit( ptr, view_size, user_space_limit )) add_reserved_area( ptr, view_size ); else break; } - ptr = unmap_extra_space( ptr, view_size, size, granularity_mask ); + ptr = unmap_extra_space( ptr, view_size, size, mask ); } status = create_view( view_ret, ptr, size, vprot ); @@ -831,7 +842,7 @@ static int do_relocations( char *base, c * * Map an executable (PE format) image into memory. */ -static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_size, +static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_size, SIZE_T mask, SIZE_T header_size, int shared_fd, BOOL removable, PVOID *addr_ptr ) { IMAGE_DOS_HEADER *dos; @@ -850,11 +861,11 @@ static NTSTATUS map_image( HANDLE hmappi RtlEnterCriticalSection( &csVirtual ); if (base >= (char *)0x110000) /* make sure the DOS area remains free */ - status = map_view( &view, base, total_size, + status = map_view( &view, base, total_size, mask, VPROT_COMMITTED | VPROT_READ | VPROT_EXEC | VPROT_WRITECOPY | VPROT_IMAGE ); if (status == STATUS_CONFLICTING_ADDRESSES) - status = map_view( &view, NULL, total_size, + status = map_view( &view, NULL, total_size, mask, VPROT_COMMITTED | VPROT_READ | VPROT_EXEC | VPROT_WRITECOPY | VPROT_IMAGE ); if (status != STATUS_SUCCESS) goto error; @@ -1258,6 +1269,7 @@ NTSTATUS WINAPI NtAllocateVirtualMemory( void *base; BYTE vprot; SIZE_T size = *size_ptr; + SIZE_T mask = get_mask( zero_bits ); NTSTATUS status = STATUS_SUCCESS; struct file_view *view; @@ -1278,13 +1290,13 @@ NTSTATUS WINAPI NtAllocateVirtualMemory( if (*ret) { if (type & MEM_RESERVE) /* Round down to 64k boundary */ - base = ROUND_ADDR( *ret, granularity_mask ); + base = ROUND_ADDR( *ret, mask ); else base = ROUND_ADDR( *ret, page_mask ); size = (((UINT_PTR)*ret + size + page_mask) & ~page_mask) - (UINT_PTR)base; /* disallow low 64k, wrap-around and kernel space */ - if (((char *)base <= (char *)granularity_mask) || + if (((char *)base < (char *)0x10000) || ((char *)base + size < (char *)base) || is_beyond_limit( base, size, ADDRESS_SPACE_LIMIT )) return STATUS_INVALID_PARAMETER; @@ -1301,9 +1313,6 @@ NTSTATUS WINAPI NtAllocateVirtualMemory( type &= ~MEM_TOP_DOWN; } - if (zero_bits) - WARN("zero_bits %lu ignored\n", zero_bits); - /* Compute the alloc type flags */ if (!(type & MEM_SYSTEM)) @@ -1333,7 +1342,7 @@ NTSTATUS WINAPI NtAllocateVirtualMemory( } else if ((type & MEM_RESERVE) || !base) { - status = map_view( &view, base, size, vprot ); + status = map_view( &view, base, size, mask, vprot ); if (status == STATUS_SUCCESS) { view->flags |= VFLAG_VALLOC; @@ -1722,6 +1731,7 @@ NTSTATUS WINAPI NtMapViewOfSection( HAND FILE_FS_DEVICE_INFORMATION device_info; NTSTATUS res; SIZE_T size = 0; + SIZE_T mask = get_mask( zero_bits ); int unix_handle = -1; int prot; void *base; @@ -1744,8 +1754,7 @@ NTSTATUS WINAPI NtMapViewOfSection( HAND /* Check parameters */ - if ((offset.u.LowPart & granularity_mask) || - (*addr_ptr && ((UINT_PTR)*addr_ptr & granularity_mask))) + if ((offset.u.LowPart & mask) || (*addr_ptr && ((UINT_PTR)*addr_ptr & mask))) return STATUS_INVALID_PARAMETER; SERVER_START_REQ( get_mapping_info ) @@ -1776,14 +1785,14 @@ NTSTATUS WINAPI NtMapViewOfSection( HAND if ((res = wine_server_handle_to_fd( shared_file, FILE_READ_DATA|FILE_WRITE_DATA, &shared_fd, NULL ))) goto done; - res = map_image( handle, unix_handle, base, size_low, header_size, + res = map_image( handle, unix_handle, base, size_low, mask, header_size, shared_fd, removable, addr_ptr ); wine_server_release_fd( shared_file, shared_fd ); NtClose( shared_file ); } else { - res = map_image( handle, unix_handle, base, size_low, header_size, + res = map_image( handle, unix_handle, base, size_low, mask, header_size, -1, removable, addr_ptr ); } wine_server_release_fd( handle, unix_handle ); @@ -1840,7 +1849,7 @@ NTSTATUS WINAPI NtMapViewOfSection( HAND RtlEnterCriticalSection( &csVirtual ); - res = map_view( &view, *addr_ptr, size, prot ); + res = map_view( &view, *addr_ptr, size, mask, prot ); if (res) { RtlLeaveCriticalSection( &csVirtual );

1 0

Alexandre Julliard : ntdll: Use the map_view() function to allocate TEBs, now that it supports an arbitrary granularity.
by Alexandre Julliard 14 Jul '06

14 Jul '06

Module: wine Branch: refs/heads/master Commit: bb63a325d727339c7afc1d4fb8c7556ebe875117 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bb63a325d727339c7afc1d4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 13 20:38:31 2006 +0200 ntdll: Use the map_view() function to allocate TEBs, now that it supports an arbitrary granularity. --- dlls/ntdll/virtual.c | 24 +++--------------------- 1 files changed, 3 insertions(+), 21 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index e00acfb..cd0beab 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1156,11 +1156,9 @@ #endif /* page_mask */ */ NTSTATUS VIRTUAL_alloc_teb( void **ret, size_t size, BOOL first ) { - void *ptr; NTSTATUS status; struct file_view *view; size_t align_size; - BYTE vprot = VPROT_READ | VPROT_WRITE | VPROT_COMMITTED; if (first) virtual_init(); @@ -1169,31 +1167,15 @@ NTSTATUS VIRTUAL_alloc_teb( void **ret, align_size = page_size; while (align_size < size) align_size *= 2; - for (;;) - { - if ((ptr = wine_anon_mmap( NULL, 2 * align_size, VIRTUAL_GetUnixProt(vprot), 0 )) == (void *)-1) - { - if (errno == ENOMEM) return STATUS_NO_MEMORY; - return STATUS_INVALID_PARAMETER; - } - if (!is_beyond_limit( ptr, 2 * align_size, user_space_limit )) - { - ptr = unmap_extra_space( ptr, 2 * align_size, align_size, align_size - 1 ); - break; - } - /* if we got something beyond the user limit, unmap it and retry */ - add_reserved_area( ptr, 2 * align_size ); - } - if (!first) RtlEnterCriticalSection( &csVirtual ); - status = create_view( &view, ptr, size, vprot ); + status = map_view( &view, NULL, align_size, align_size - 1, + VPROT_READ | VPROT_WRITE | VPROT_COMMITTED ); if (status == STATUS_SUCCESS) { view->flags |= VFLAG_VALLOC; - *ret = ptr; + *ret = view->base; } - else unmap_area( ptr, size ); if (!first) RtlLeaveCriticalSection( &csVirtual );

1 0