January 2009 - Wine-Commits

Juan Lang : cryptui: Always initialize export wizard's export options.
by Alexandre Julliard Jan. 27, 2009

Jan. 27, 2009

Module: wine Branch: master Commit: 53955c57fe3bca8ea3c6f240c244e9539fc532fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=53955c57fe3bca8ea3c6f240c… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sat Jan 24 11:46:30 2009 -0800 cryptui: Always initialize export wizard's export options. --- dlls/cryptui/main.c | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 61554b7..21c04e0 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -6268,18 +6268,16 @@ static BOOL show_export_ui(DWORD dwFlags, HWND hwndParent, data.dwFlags = dwFlags; data.pwszWizardTitle = pwszWizardTitle; data.pExportInfo = pExportInfo; + data.contextInfo.dwSize = sizeof(data.contextInfo); + data.contextInfo.dwExportFormat = 0; + data.contextInfo.fExportChain = FALSE; + data.contextInfo.fStrongEncryption = FALSE; + data.contextInfo.fExportPrivateKeys = FALSE; if (pExportInfo->dwSubjectChoice == CRYPTUI_WIZ_EXPORT_CERT_CONTEXT && pvoid) memcpy(&data.contextInfo, pvoid, min(((PCCRYPTUI_WIZ_EXPORT_CERTCONTEXT_INFO)pvoid)->dwSize, sizeof(data.contextInfo))); - else - { - data.contextInfo.dwExportFormat = 0; - data.contextInfo.fExportChain = FALSE; - data.contextInfo.fStrongEncryption = FALSE; - data.contextInfo.fExportPrivateKeys = FALSE; - } data.fileName = NULL; data.file = INVALID_HANDLE_VALUE; data.success = FALSE;

1 0

Juan Lang : cryptui: Default to exporting in DER format.
by Alexandre Julliard Jan. 27, 2009

Jan. 27, 2009

Module: wine Branch: master Commit: 116514618828c851c75853892f8d1f89c717cb22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=116514618828c851c75853892… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sat Jan 24 11:46:56 2009 -0800 cryptui: Default to exporting in DER format. --- dlls/cryptui/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 21c04e0..ca58a97 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -6269,7 +6269,7 @@ static BOOL show_export_ui(DWORD dwFlags, HWND hwndParent, data.pwszWizardTitle = pwszWizardTitle; data.pExportInfo = pExportInfo; data.contextInfo.dwSize = sizeof(data.contextInfo); - data.contextInfo.dwExportFormat = 0; + data.contextInfo.dwExportFormat = CRYPTUI_WIZ_EXPORT_FORMAT_DER; data.contextInfo.fExportChain = FALSE; data.contextInfo.fStrongEncryption = FALSE; data.contextInfo.fExportPrivateKeys = FALSE;

1 0

Juan Lang : cryptui: Add error checking to CryptUIWizExport.
by Alexandre Julliard Jan. 27, 2009

Jan. 27, 2009

Module: wine Branch: master Commit: 4ae62fba2201f5977e439b1583a844aef23c2706 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ae62fba2201f5977e439b158… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sat Jan 24 12:02:35 2009 -0800 cryptui: Add error checking to CryptUIWizExport. --- dlls/cryptui/main.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index ca58a97..9ea7b93 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -6137,6 +6137,11 @@ static BOOL do_export(HANDLE file, PCCRYPTUI_WIZ_EXPORT_INFO pExportInfo, { BOOL ret; + if (pContextInfo->dwSize != sizeof(CRYPTUI_WIZ_EXPORT_CERTCONTEXT_INFO)) + { + SetLastError(E_INVALIDARG); + return FALSE; + } switch (pExportInfo->dwSubjectChoice) { case CRYPTUI_WIZ_EXPORT_CRL_CONTEXT: @@ -6152,6 +6157,10 @@ static BOOL do_export(HANDLE file, PCCRYPTUI_WIZ_EXPORT_INFO pExportInfo, default: switch (pContextInfo->dwExportFormat) { + case CRYPTUI_WIZ_EXPORT_FORMAT_DER: + ret = save_der(file, pExportInfo->u.pCertContext->pbCertEncoded, + pExportInfo->u.pCertContext->cbCertEncoded); + break; case CRYPTUI_WIZ_EXPORT_FORMAT_BASE64: ret = save_base64(file, pExportInfo->u.pCertContext->pbCertEncoded, @@ -6165,8 +6174,8 @@ static BOOL do_export(HANDLE file, PCCRYPTUI_WIZ_EXPORT_INFO pExportInfo, ret = FALSE; break; default: - ret = save_der(file, pExportInfo->u.pCertContext->pbCertEncoded, - pExportInfo->u.pCertContext->cbCertEncoded); + SetLastError(E_FAIL); + ret = FALSE; } } return ret;

1 0

Alexander Nicolaysen Sørnes : maintainerView: Remove bad keyword
by Alexander Nicolaysen Sørnes Jan. 26, 2009

Jan. 26, 2009

Module: appdb Branch: master Commit: 6165781bbd9a520efc97976f3712e6c40d2779cd URL: http://source.winehq.org/git/appdb.git/?a=commit;h=6165781bbd9a520efc97976f… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Mon Jan 26 18:07:53 2009 +0100 maintainerView: Remove bad keyword --- include/maintainerView.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/maintainerView.php b/include/maintainerView.php index b9c0733..df8591b 100644 --- a/include/maintainerView.php +++ b/include/maintainerView.php @@ -22,7 +22,7 @@ class maintainerView $this->bViewingSelf = false; } - static function objectGetId() + function objectGetId() { return $this->iUserId; }

1 0

Alexander Nicolaysen Sørnes : maintainerView: Implement objectGetId()
by Alexander Nicolaysen Sørnes Jan. 26, 2009

Jan. 26, 2009

Module: appdb Branch: master Commit: 5d16febfe5870d43bfdd25cc6abe9567acd64b25 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=5d16febfe5870d43bfdd25cc… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Mon Jan 26 18:04:07 2009 +0100 maintainerView: Implement objectGetId() --- include/maintainerView.php | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/include/maintainerView.php b/include/maintainerView.php index fe89ff7..b9c0733 100644 --- a/include/maintainerView.php +++ b/include/maintainerView.php @@ -22,6 +22,11 @@ class maintainerView $this->bViewingSelf = false; } + static function objectGetId() + { + return $this->iUserId; + } + function addVersionRatingInfo($oTableRow, $oVersion) { $oTableRow->AddTextCell($oVersion->objectMakeLink());

1 0

David Adam : d3dx9_39: Implement this dll and forward the functions to d3dx9_36.
by Alexandre Julliard Jan. 26, 2009

Jan. 26, 2009

Module: wine Branch: master Commit: 5775edd805eeab17f4c4899d64f43090bcec71e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5775edd805eeab17f4c4899d6… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Sun Jan 25 13:29:33 2009 +0100 d3dx9_39: Implement this dll and forward the functions to d3dx9_36. --- configure | 9 + configure.ac | 1 + dlls/d3dx9_39/Makefile.in | 15 ++ dlls/d3dx9_39/d3dx9_39.spec | 336 +++++++++++++++++++++++++++++++++++++++++ dlls/d3dx9_39/d3dx9_39_main.c | 62 ++++++++ dlls/d3dx9_39/version.rc | 26 +++ 6 files changed, 449 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5775edd805eeab17f4c48…

1 0

David Adam : d3dx9_38: Implement the dll and forward the functions to d3dx9_36.
by Alexandre Julliard Jan. 26, 2009

Jan. 26, 2009

Module: wine Branch: master Commit: 1c5b536d8a8527426f3d9ded7154bf0e5e64d5e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c5b536d8a8527426f3d9ded7… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Sun Jan 25 11:38:20 2009 +0100 d3dx9_38: Implement the dll and forward the functions to d3dx9_36. --- configure | 9 + configure.ac | 1 + dlls/d3dx9_38/Makefile.in | 15 ++ dlls/d3dx9_38/d3dx9_38.spec | 336 +++++++++++++++++++++++++++++++++++++++++ dlls/d3dx9_38/d3dx9_38_main.c | 62 ++++++++ dlls/d3dx9_38/version.rc | 26 +++ 6 files changed, 449 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1c5b536d8a8527426f3d9…

1 0

Aric Stewart : rasdlg: Initial stub dll.
by Alexandre Julliard Jan. 26, 2009

Jan. 26, 2009

Module: wine Branch: master Commit: f55151a33afa161a45c38ab587bb736e7a64ab69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f55151a33afa161a45c38ab58… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Jan 23 11:43:16 2009 -0600 rasdlg: Initial stub dll. --- configure | 9 +++++++++ configure.ac | 1 + dlls/Makefile.in | 5 +++++ dlls/rasdlg/Makefile.in | 14 ++++++++++++++ dlls/rasdlg/rasdlg.spec | 36 ++++++++++++++++++++++++++++++++++++ dlls/rasdlg/rasdlg_main.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 109 insertions(+), 0 deletions(-) diff --git a/configure b/configure index b90bb7f..b70f783 100755 --- a/configure +++ b/configure @@ -26128,6 +26128,14 @@ dlls/rasapi32/tests/Makefile: dlls/rasapi32/tests/Makefile.in dlls/Maketest.rule ac_config_files="$ac_config_files dlls/rasapi32/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ + dlls/rasdlg/Makefile" +test "x$enable_rasdlg" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + rasdlg" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +dlls/rasdlg/Makefile: dlls/rasdlg/Makefile.in dlls/Makedll.rules" +ac_config_files="$ac_config_files dlls/rasdlg/Makefile" + +ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/resutils/Makefile" test "x$enable_resutils" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ resutils" @@ -28489,6 +28497,7 @@ do "dlls/query/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/query/Makefile" ;; "dlls/rasapi32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/rasapi32/Makefile" ;; "dlls/rasapi32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/rasapi32/tests/Makefile" ;; + "dlls/rasdlg/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/rasdlg/Makefile" ;; "dlls/resutils/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/resutils/Makefile" ;; "dlls/riched20/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/riched20/Makefile" ;; "dlls/riched20/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/riched20/tests/Makefile" ;; diff --git a/configure.ac b/configure.ac index c2f4588..57dd55f 100644 --- a/configure.ac +++ b/configure.ac @@ -2053,6 +2053,7 @@ WINE_CONFIG_MAKEFILE([dlls/quartz/tests/Makefile],[dlls/Maketest.rules],[dlls],[ WINE_CONFIG_MAKEFILE([dlls/query/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/rasapi32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/rasapi32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) +WINE_CONFIG_MAKEFILE([dlls/rasdlg/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/resutils/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/riched20/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/riched20/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index afdf29b..90075c6 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -271,6 +271,7 @@ IMPORT_LIBS = \ psapi/libpsapi.$(IMPLIBEXT) \ quartz/libquartz.$(IMPLIBEXT) \ rasapi32/librasapi32.$(IMPLIBEXT) \ + rasdlg/librasdlg.$(IMPLIBEXT) \ resutils/libresutils.$(IMPLIBEXT) \ riched20/libriched20.$(IMPLIBEXT) \ rpcrt4/librpcrt4.$(IMPLIBEXT) \ @@ -413,6 +414,7 @@ CROSS_IMPLIBS = \ psapi/libpsapi.a \ quartz/libquartz.a \ rasapi32/librasapi32.a \ + rasdlg/librasdlg.a \ resutils/libresutils.a \ riched20/libriched20.a \ rpcrt4/librpcrt4.a \ @@ -749,6 +751,9 @@ quartz/libquartz.def quartz/libquartz.a: quartz/quartz.spec $(WINEBUILD) rasapi32/librasapi32.def rasapi32/librasapi32.a: rasapi32/rasapi32.spec $(WINEBUILD) @cd rasapi32 && $(MAKE) `basename $@` +rasdlg/librasdlg.def rasdlg/librasdlg.a: rasdlg/rasdlg.spec $(WINEBUILD) + @cd rasdlg && $(MAKE) `basename $@` + resutils/libresutils.def resutils/libresutils.a: resutils/resutils.spec $(WINEBUILD) @cd resutils && $(MAKE) `basename $@` diff --git a/dlls/rasdlg/Makefile.in b/dlls/rasdlg/Makefile.in new file mode 100644 index 0000000..02d3a7f --- /dev/null +++ b/dlls/rasdlg/Makefile.in @@ -0,0 +1,14 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = rasdlg.dll +IMPORTLIB = rasdlg +IMPORTS = kernel32 + +C_SRCS = \ + rasdlg_main.c + +(a)MAKE_DLL_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/rasdlg/rasdlg.spec b/dlls/rasdlg/rasdlg.spec new file mode 100644 index 0000000..f6a36d6 --- /dev/null +++ b/dlls/rasdlg/rasdlg.spec @@ -0,0 +1,36 @@ +@ stub DwTerminalDlg +@ stub GetRasDialOutProtocols +@ stub RasAutodialDisableDlgA +@ stub RasAutodialDisableDlgW +@ stub RasAutodialQueryDlgA +@ stub RasAutodialQueryDlgW +@ stub RasDialDlgA +@ stub RasDialDlgW +@ stub RasEntryDlgA +@ stub RasEntryDlgW +@ stub RasMonitorDlgA +@ stub RasMonitorDlgW +@ stub RasPhonebookDlgA +@ stub RasPhonebookDlgW +@ stub RasSrvAddPropPages +@ stub RasSrvAddWizPages +@ stub RasSrvAllowConnectionsConfig +@ stub RasSrvCleanupService +@ stub RasSrvEnumConnections +@ stub RasSrvHangupConnection +@ stub RasSrvInitializeService +@ stub RasSrvIsConnectionConnected +@ stub RasSrvIsServiceRunning +@ stub RasSrvQueryShowIcon +@ stub RasUserEnableManualDial +@ stub RasUserGetManualDial +@ stub RasUserPrefsDlg +@ stub RasWizCreateNewEntry +@ stub RasWizGetNCCFlags +@ stub RasWizGetSuggestedEntryName +@ stub RasWizGetUserInputConnectionName +@ stub RasWizIsEntryRenamable +@ stub RasWizQueryMaxPageCount +@ stub RasWizSetEntryName +@ stub RouterEntryDlgA +@ stub RouterEntryDlgW diff --git a/dlls/rasdlg/rasdlg_main.c b/dlls/rasdlg/rasdlg_main.c new file mode 100644 index 0000000..00ceb89 --- /dev/null +++ b/dlls/rasdlg/rasdlg_main.c @@ -0,0 +1,44 @@ +/* + * Implementation of the Remote Access Common Dialog API + * + * Copyright 2009 CodeWeavers, Aric Stewart + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(rasdlg); + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); + + switch (fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + default: + break; + } + + return TRUE; +}

1 0

Ge van Geldorp : kernel32/tests: "none" debugger test needs user interaction.
by Alexandre Julliard Jan. 26, 2009

Jan. 26, 2009

Module: wine Branch: master Commit: ee3a743e6c009ebf76b269535763ee3afc52d4cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee3a743e6c009ebf76b269535… Author: Ge van Geldorp <ge(a)gse.nl> Date: Mon Jan 26 12:21:16 2009 +0100 kernel32/tests: "none" debugger test needs user interaction. --- dlls/kernel32/tests/debugger.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index 2672e44..706ca24 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -364,7 +364,13 @@ static void test_ExitCode(void) strstr((char*)debugger_val, "winedbg --auto")) crash_and_winedbg(hkey, test_exe); - crash_and_debug(hkey, test_exe, "dbg,none"); + if (winetest_interactive) + /* Since the debugging process never sets the debug event, it isn't recognized + as a valid debugger and, after the debugger exits, Windows will show a dialog box + asking the user what to do */ + crash_and_debug(hkey, test_exe, "dbg,none"); + else + skip("\"none\" debugger test needs user interaction\n"); crash_and_debug(hkey, test_exe, "dbg,event,order"); crash_and_debug(hkey, test_exe, "dbg,attach,event,code2"); if (pDebugSetProcessKillOnExit)

1 0

Marcus Meissner : msi: Initialize row (Coverity).
by Alexandre Julliard Jan. 26, 2009

Jan. 26, 2009

Module: wine Branch: master Commit: 76b08f3aa770da8cb2c0513ba3af9cd3721ac386 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76b08f3aa770da8cb2c0513ba… Author: Marcus Meissner <meissner(a)suse.de> Date: Mon Jan 26 11:14:48 2009 +0100 msi: Initialize row (Coverity). --- dlls/msi/database.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index cce2717..83b1f2c 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -1206,7 +1206,7 @@ static UINT merge_diff_row(MSIRECORD *rec, LPVOID param) MERGETABLE *table = data->curtable; MERGEROW *mergerow; MSIQUERY *dbview; - MSIRECORD *row; + MSIRECORD *row = NULL; LPWSTR query; UINT r;

1 0