September 2007 - Wine-commits

Maarten Lankhorst : dsound: Change default bpp and sample frequency to be better for the ears.
by Alexandre Julliard 11 Sep '07

11 Sep '07

Module: wine Branch: master Commit: aaa9e41fdfc9ed6f8531f93861a014593acff228 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aaa9e41fdfc9ed6f8531f9386… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Aug 31 18:21:14 2007 +0200 dsound: Change default bpp and sample frequency to be better for the ears. --- dlls/dsound/dsound_main.c | 12 ++++++------ programs/winecfg/audio.c | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c index 770525c..791b33c 100644 --- a/dlls/dsound/dsound_main.c +++ b/dlls/dsound/dsound_main.c @@ -96,8 +96,8 @@ int ds_snd_queue_min = DS_SND_QUEUE_MIN; int ds_hw_accel = DS_HW_ACCEL_FULL; int ds_default_playback = 0; int ds_default_capture = 0; -int ds_default_sample_rate = 22050; -int ds_default_bits_per_sample = 8; +int ds_default_sample_rate = 44100; +int ds_default_bits_per_sample = 16; /* * Get a config key from either the app-specific or the default config @@ -203,10 +203,10 @@ void setup_dsound_options(void) WARN("ds_default_playback = %d (default=0)\n",ds_default_playback); if (ds_default_capture != 0) WARN("ds_default_capture = %d (default=0)\n",ds_default_playback); - if (ds_default_sample_rate != 22050) - WARN("ds_default_sample_rate = %d (default=22050)\n",ds_default_sample_rate); - if (ds_default_bits_per_sample != 8) - WARN("ds_default_bits_per_sample = %d (default=8)\n",ds_default_bits_per_sample); + if (ds_default_sample_rate != 44100) + WARN("ds_default_sample_rate = %d (default=44100)\n",ds_default_sample_rate); + if (ds_default_bits_per_sample != 16) + WARN("ds_default_bits_per_sample = %d (default=16)\n",ds_default_bits_per_sample); } static const char * get_device_id(LPCGUID pGuid) diff --git a/programs/winecfg/audio.c b/programs/winecfg/audio.c index e54aaa6..071c13d 100644 --- a/programs/winecfg/audio.c +++ b/programs/winecfg/audio.c @@ -692,7 +692,7 @@ static void initAudioDlg (HWND hDlg) for (i = 0; NULL != DSound_Rates[i]; ++i) { SendDlgItemMessage(hDlg, IDC_DSOUND_RATES, CB_ADDSTRING, 0, (LPARAM) DSound_Rates[i]); } - buf = get_reg_key(config_key, keypath("DirectSound"), "DefaultSampleRate", "22050"); + buf = get_reg_key(config_key, keypath("DirectSound"), "DefaultSampleRate", "44100"); for (i = 0; NULL != DSound_Rates[i]; ++i) { if (strcmp(buf, DSound_Rates[i]) == 0) { SendDlgItemMessage(hDlg, IDC_DSOUND_RATES, CB_SETCURSEL, i, 0); @@ -704,7 +704,7 @@ static void initAudioDlg (HWND hDlg) for (i = 0; NULL != DSound_Bits[i]; ++i) { SendDlgItemMessage(hDlg, IDC_DSOUND_BITS, CB_ADDSTRING, 0, (LPARAM) DSound_Bits[i]); } - buf = get_reg_key(config_key, keypath("DirectSound"), "DefaultBitsPerSample", "8"); + buf = get_reg_key(config_key, keypath("DirectSound"), "DefaultBitsPerSample", "16"); for (i = 0; NULL != DSound_Bits[i]; ++i) { if (strcmp(buf, DSound_Bits[i]) == 0) { SendDlgItemMessage(hDlg, IDC_DSOUND_BITS, CB_SETCURSEL, i, 0);

1 0

Mikolaj Zalewski : include: Add errorrep.h header.
by Alexandre Julliard 11 Sep '07

11 Sep '07

Module: wine Branch: master Commit: 5ce0788e4dc90dbcae6c6c5841ed35872a2810bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ce0788e4dc90dbcae6c6c584… Author: Mikolaj Zalewski <mikolajz(a)google.com> Date: Fri Aug 31 13:36:03 2007 -0700 include: Add errorrep.h header. --- include/Makefile.in | 1 + include/errorrep.h | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 0 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 2557d2a..660977b 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -161,6 +161,7 @@ SRCDIR_INCLUDES = \ dxerr9.h \ dxfile.h \ dyngraph.idl \ + errorrep.h \ errors.h \ evcode.h \ evntrace.h \ diff --git a/include/errorrep.h b/include/errorrep.h new file mode 100644 index 0000000..5af7bf6 --- /dev/null +++ b/include/errorrep.h @@ -0,0 +1,43 @@ +/* + * errorrep.h - error reporting APIs (implemented in faultrep.dll) + * + * Copyright 2007 Google (Mikolaj Zalewski) + * + * 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 + */ + +#ifndef __WINE_ERRORREP_H +#define __WINE_ERRORREP_H + +typedef enum tagEFaultRepRetVal +{ + frrvOk, + frrvOkManifest, + frrvOkQueued, + frrvOkErr, + frrvErrNoDW, + frrvErrTimeout, + frrvLaunchDebugger, + frrvOkHeadless, + frrvErrAnotherInstance +} EFaultRepRetVal; + +EFaultRepRetVal WINAPI ReportFault(LPEXCEPTION_POINTERS, DWORD); + +BOOL WINAPI AddERExcludedApplicationA(LPCSTR); +BOOL WINAPI AddERExcludedApplicationW(LPCWSTR); +#define AddERExcludedApplication WINELIB_NAME_AW(AddERExcludedApplication) + +#endif /* __WINE_ERORREP_H */

1 0

Mikolaj Zalewski : faultrep: Implement AddERExcludedApplication[AW].
by Alexandre Julliard 11 Sep '07

11 Sep '07

Module: wine Branch: master Commit: 6af419c14b25fa0b4bbd8b659b6656d0b39a6274 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6af419c14b25fa0b4bbd8b659… Author: Mikolaj Zalewski <mikolajz(a)google.com> Date: Fri Aug 31 18:10:13 2007 -0700 faultrep: Implement AddERExcludedApplication[AW]. --- dlls/faultrep/Makefile.in | 2 +- dlls/faultrep/faultrep.c | 77 +++++++++++++++++++++++++++++++++++++++++++ dlls/faultrep/faultrep.spec | 4 +- 3 files changed, 80 insertions(+), 3 deletions(-) diff --git a/dlls/faultrep/Makefile.in b/dlls/faultrep/Makefile.in index e6e04a2..f521178 100644 --- a/dlls/faultrep/Makefile.in +++ b/dlls/faultrep/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = faultrep.dll -IMPORTS = kernel32 +IMPORTS = advapi32 kernel32 C_SRCS = faultrep.c diff --git a/dlls/faultrep/faultrep.c b/dlls/faultrep/faultrep.c index 7771191..3a04754 100644 --- a/dlls/faultrep/faultrep.c +++ b/dlls/faultrep/faultrep.c @@ -21,10 +21,87 @@ #include "windef.h" #include "winbase.h" +#include "winnls.h" +#include "winreg.h" #include "wine/debug.h" +#include "wine/unicode.h" + +#include "errorrep.h" WINE_DEFAULT_DEBUG_CHANNEL(faultrep); +static const WCHAR SZ_EXCLUSIONLIST_KEY[] = { + 'S','o','f','t','w','a','r','e','\\', + 'M','i','c','r','o','s','o','f','t','\\', + 'P','C','H','e','a','l','t','h','\\', + 'E','r','r','o','r','R','e','p','o','r','t','i','n','g','\\', + 'E','x','c','l','u','s','i','o','n','L','i','s','t', 0}; + +/************************************************************************* + * AddERExcludedApplicationW [FAULTREP.@] + * + * Adds an application to a list of applications for which fault reports + * shouldn't be genereated + * + * PARAMS + * lpAppFileName [I] The filename of the application executable + * + * RETURNS + * TRUE on success, FALSE of failure + * + * NOTES + * Wine doesn't use this data but stores it in the registry (in the same place + * as Windows would) in case it will be useful in a future version + * + * According to MSDN this function should succeed even if the user have no write + * access to HKLM. This probably means that there is no error checking. + */ +BOOL WINAPI AddERExcludedApplicationW(LPCWSTR lpAppFileName) +{ + WCHAR *bslash; + DWORD value = 1; + HKEY hkey; + + TRACE("(%s)\n", wine_dbgstr_w(lpAppFileName)); + bslash = strrchrW(lpAppFileName, '\\'); + if (bslash != NULL) + lpAppFileName = bslash + 1; + if (*lpAppFileName == '\0') + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + if (!RegCreateKeyW(HKEY_LOCAL_MACHINE, SZ_EXCLUSIONLIST_KEY, &hkey)) + { + RegSetValueExW(hkey, lpAppFileName, 0, REG_DWORD, (LPBYTE)&value, sizeof(value)); + RegCloseKey(hkey); + } + + return TRUE; +} + +/************************************************************************* + * AddERExcludedApplicationA [FAULTREP.@] + * + * See AddERExcludedApplicationW + */ +BOOL WINAPI AddERExcludedApplicationA(LPCSTR lpAppFileName) +{ + int len = MultiByteToWideChar(CP_ACP, 0, lpAppFileName, -1, NULL, 0); + WCHAR *wstr; + BOOL ret; + + TRACE("(%s)\n", wine_dbgstr_a(lpAppFileName)); + if (len == 0) + return FALSE; + wstr = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*len); + MultiByteToWideChar(CP_ACP, 0, lpAppFileName, -1, wstr, len); + ret = AddERExcludedApplicationW(wstr); + HeapFree(GetProcessHeap(), 0, wstr); + return ret; +} + /*********************************************************************** * DllMain. */ diff --git a/dlls/faultrep/faultrep.spec b/dlls/faultrep/faultrep.spec index 3cc9934..77a2827 100644 --- a/dlls/faultrep/faultrep.spec +++ b/dlls/faultrep/faultrep.spec @@ -1,5 +1,5 @@ -@ stub AddERExcludedApplicationA -@ stub AddERExcludedApplicationW +@ stdcall AddERExcludedApplicationA(str) +@ stdcall AddERExcludedApplicationW(wstr) @ stub CreateMinidumpA @ stub CreateMinidumpW @ stub ReportEREvent

1 0

Damjan Jovanovic : kernel32: Use sysconf instead of the obsolete CLK_TCK.
by Alexandre Julliard 11 Sep '07

11 Sep '07

Module: wine Branch: master Commit: f3c9a9b1b60eae85af861947a303b6fffaf58c95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3c9a9b1b60eae85af861947a… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Mon Sep 10 10:14:42 2007 +0200 kernel32: Use sysconf instead of the obsolete CLK_TCK. --- dlls/kernel32/time.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index 0614c13..0ad612d 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -547,13 +547,11 @@ VOID WINAPI GetSystemTimeAsFileTime( * 2) Time is relative. There is no 'starting date', so there is * no need for offset correction, like in UnixTimeToFileTime */ -#ifndef CLK_TCK -# define CLK_TCK CLOCKS_PER_SEC -#endif static void TIME_ClockTimeToFileTime(clock_t unix_time, LPFILETIME filetime) { + long clocksPerSec = sysconf(_SC_CLK_TCK); ULONGLONG secs = RtlEnlargedUnsignedMultiply( unix_time, 10000000 ); - secs = RtlExtendedLargeIntegerDivide( secs, CLK_TCK, NULL ); + secs = RtlExtendedLargeIntegerDivide( secs, clocksPerSec, NULL ); filetime->dwLowDateTime = (DWORD)secs; filetime->dwHighDateTime = (DWORD)(secs >> 32); }

1 0

Dan Hipschman : widl: Output UUID files compatible with older Visual C++ and MinGW.
by Alexandre Julliard 11 Sep '07

11 Sep '07

Module: wine Branch: master Commit: 9d2c6e78f2ae1e263dabbcc03e7cf267f2d3685a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d2c6e78f2ae1e263dabbcc03… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Mon Sep 10 16:08:44 2007 -0700 widl: Output UUID files compatible with older Visual C++ and MinGW. --- tools/widl/widl.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index cca1325..ca88958 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -396,8 +396,7 @@ int main(int argc,char *argv[]) fprintf(idfile, "from %s - Do not edit ***/\n\n", input_name); fprintf(idfile, "#include <rpc.h>\n"); fprintf(idfile, "#include <rpcndr.h>\n\n"); - fprintf(idfile, "#define INITGUID\n"); - fprintf(idfile, "#include <guiddef.h>\n\n"); + fprintf(idfile, "#include <initguid.h>\n\n"); fprintf(idfile, "#ifdef __cplusplus\n"); fprintf(idfile, "extern \"C\" {\n"); fprintf(idfile, "#endif\n\n");

1 0

Dmitry Timoshkov : server: Map ETXTBSY to STATUS_SHARING_VIOLATION.
by Alexandre Julliard 11 Sep '07

11 Sep '07

Module: wine Branch: master Commit: c75edd04c2c83a9caf2df81502e807ccb96e744b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c75edd04c2c83a9caf2df8150… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Sep 11 13:07:29 2007 +0900 server: Map ETXTBSY to STATUS_SHARING_VIOLATION. --- server/file.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/server/file.c b/server/file.c index 0932414..a8152da 100644 --- a/server/file.c +++ b/server/file.c @@ -286,6 +286,7 @@ void file_set_error(void) { switch (errno) { + case ETXTBSY: case EAGAIN: set_error( STATUS_SHARING_VIOLATION ); break; case EBADF: set_error( STATUS_INVALID_HANDLE ); break; case ENOSPC: set_error( STATUS_DISK_FULL ); break;

1 0

Stefan Leichter : dmloader: Remove 'recursive registry key delete' function .
by Alexandre Julliard 11 Sep '07

11 Sep '07

Module: wine Branch: master Commit: 63a3d8718ed322dc366301bc54d233abca3603e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63a3d8718ed322dc366301bc5… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Tue Sep 11 09:50:32 2007 +0200 dmloader: Remove 'recursive registry key delete' function. --- dlls/dmloader/regsvr.c | 76 +++++------------------------------------------ 1 files changed, 8 insertions(+), 68 deletions(-) diff --git a/dlls/dmloader/regsvr.c b/dlls/dmloader/regsvr.c index d801e49..cd4de35 100644 --- a/dlls/dmloader/regsvr.c +++ b/dlls/dmloader/regsvr.c @@ -101,9 +101,6 @@ static LONG register_key_defvalueA(HKEY base, WCHAR const *name, static LONG register_progid(WCHAR const *clsid, char const *progid, char const *curver_progid, char const *name, char const *extra); -static LONG recursive_delete_key(HKEY key); -static LONG recursive_delete_keyA(HKEY base, char const *name); -static LONG recursive_delete_keyW(HKEY base, WCHAR const *name); /*********************************************************************** * register_interfaces @@ -190,7 +187,8 @@ static HRESULT unregister_interfaces(struct regsvr_interface const *list) { WCHAR buf[39]; StringFromGUID2(list->iid, buf, 39); - res = recursive_delete_keyW(interface_key, buf); + res = RegDeleteTreeW(interface_key, buf); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; } RegCloseKey(interface_key); @@ -295,16 +293,19 @@ static HRESULT unregister_coclasses(struct regsvr_coclass const *list) { WCHAR buf[39]; StringFromGUID2(list->clsid, buf, 39); - res = recursive_delete_keyW(coclass_key, buf); + res = RegDeleteTreeW(coclass_key, buf); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; if (list->progid) { - res = recursive_delete_keyA(HKEY_CLASSES_ROOT, list->progid); + res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->progid); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; } if (list->viprogid) { - res = recursive_delete_keyA(HKEY_CLASSES_ROOT, list->viprogid); + res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->viprogid); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; } } @@ -413,67 +414,6 @@ error_close_progid_key: } /*********************************************************************** - * recursive_delete_key - */ -static LONG recursive_delete_key(HKEY key) { - LONG res; - WCHAR subkey_name[MAX_PATH]; - DWORD cName; - HKEY subkey; - - for (;;) { - cName = sizeof(subkey_name) / sizeof(WCHAR); - res = RegEnumKeyExW(key, 0, subkey_name, &cName, - NULL, NULL, NULL, NULL); - if (res != ERROR_SUCCESS && res != ERROR_MORE_DATA) { - res = ERROR_SUCCESS; /* presumably we're done enumerating */ - break; - } - res = RegOpenKeyExW(key, subkey_name, 0, - KEY_READ | KEY_WRITE, &subkey); - if (res == ERROR_FILE_NOT_FOUND) continue; - if (res != ERROR_SUCCESS) break; - - res = recursive_delete_key(subkey); - RegCloseKey(subkey); - if (res != ERROR_SUCCESS) break; - } - - if (res == ERROR_SUCCESS) res = RegDeleteKeyW(key, 0); - return res; -} - -/*********************************************************************** - * recursive_delete_keyA - */ -static LONG recursive_delete_keyA(HKEY base, char const *name) { - LONG res; - HKEY key; - - res = RegOpenKeyExA(base, name, 0, KEY_READ | KEY_WRITE, &key); - if (res == ERROR_FILE_NOT_FOUND) return ERROR_SUCCESS; - if (res != ERROR_SUCCESS) return res; - res = recursive_delete_key(key); - RegCloseKey(key); - return res; -} - -/*********************************************************************** - * recursive_delete_keyW - */ -static LONG recursive_delete_keyW(HKEY base, WCHAR const *name) { - LONG res; - HKEY key; - - res = RegOpenKeyExW(base, name, 0, KEY_READ | KEY_WRITE, &key); - if (res == ERROR_FILE_NOT_FOUND) return ERROR_SUCCESS; - if (res != ERROR_SUCCESS) return res; - res = recursive_delete_key(key); - RegCloseKey(key); - return res; -} - -/*********************************************************************** * coclass list */ static struct regsvr_coclass const coclass_list[] = {

1 0

Stefan Leichter : dmime: Remove 'recursive registry key delete' function.
by Alexandre Julliard 11 Sep '07

11 Sep '07

Module: wine Branch: master Commit: 29ae673c223c798c3b2c1093a52a4ea0279298e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29ae673c223c798c3b2c1093a… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Tue Sep 11 09:52:50 2007 +0200 dmime: Remove 'recursive registry key delete' function. --- dlls/dmime/regsvr.c | 76 +++++--------------------------------------------- 1 files changed, 8 insertions(+), 68 deletions(-) diff --git a/dlls/dmime/regsvr.c b/dlls/dmime/regsvr.c index dc6bdf6..b0212a9 100644 --- a/dlls/dmime/regsvr.c +++ b/dlls/dmime/regsvr.c @@ -101,9 +101,6 @@ static LONG register_key_defvalueA(HKEY base, WCHAR const *name, static LONG register_progid(WCHAR const *clsid, char const *progid, char const *curver_progid, char const *name, char const *extra); -static LONG recursive_delete_key(HKEY key); -static LONG recursive_delete_keyA(HKEY base, char const *name); -static LONG recursive_delete_keyW(HKEY base, WCHAR const *name); /*********************************************************************** * register_interfaces @@ -190,7 +187,8 @@ static HRESULT unregister_interfaces(struct regsvr_interface const *list) { WCHAR buf[39]; StringFromGUID2(list->iid, buf, 39); - res = recursive_delete_keyW(interface_key, buf); + res = RegDeleteTreeW(interface_key, buf); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; } RegCloseKey(interface_key); @@ -295,16 +293,19 @@ static HRESULT unregister_coclasses(struct regsvr_coclass const *list) { WCHAR buf[39]; StringFromGUID2(list->clsid, buf, 39); - res = recursive_delete_keyW(coclass_key, buf); + res = RegDeleteTreeW(coclass_key, buf); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; if (list->progid) { - res = recursive_delete_keyA(HKEY_CLASSES_ROOT, list->progid); + res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->progid); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; } if (list->viprogid) { - res = recursive_delete_keyA(HKEY_CLASSES_ROOT, list->viprogid); + res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->viprogid); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; } } @@ -413,67 +414,6 @@ error_close_progid_key: } /*********************************************************************** - * recursive_delete_key - */ -static LONG recursive_delete_key(HKEY key) { - LONG res; - WCHAR subkey_name[MAX_PATH]; - DWORD cName; - HKEY subkey; - - for (;;) { - cName = sizeof(subkey_name) / sizeof(WCHAR); - res = RegEnumKeyExW(key, 0, subkey_name, &cName, - NULL, NULL, NULL, NULL); - if (res != ERROR_SUCCESS && res != ERROR_MORE_DATA) { - res = ERROR_SUCCESS; /* presumably we're done enumerating */ - break; - } - res = RegOpenKeyExW(key, subkey_name, 0, - KEY_READ | KEY_WRITE, &subkey); - if (res == ERROR_FILE_NOT_FOUND) continue; - if (res != ERROR_SUCCESS) break; - - res = recursive_delete_key(subkey); - RegCloseKey(subkey); - if (res != ERROR_SUCCESS) break; - } - - if (res == ERROR_SUCCESS) res = RegDeleteKeyW(key, 0); - return res; -} - -/*********************************************************************** - * recursive_delete_keyA - */ -static LONG recursive_delete_keyA(HKEY base, char const *name) { - LONG res; - HKEY key; - - res = RegOpenKeyExA(base, name, 0, KEY_READ | KEY_WRITE, &key); - if (res == ERROR_FILE_NOT_FOUND) return ERROR_SUCCESS; - if (res != ERROR_SUCCESS) return res; - res = recursive_delete_key(key); - RegCloseKey(key); - return res; -} - -/*********************************************************************** - * recursive_delete_keyW - */ -static LONG recursive_delete_keyW(HKEY base, WCHAR const *name) { - LONG res; - HKEY key; - - res = RegOpenKeyExW(base, name, 0, KEY_READ | KEY_WRITE, &key); - if (res == ERROR_FILE_NOT_FOUND) return ERROR_SUCCESS; - if (res != ERROR_SUCCESS) return res; - res = recursive_delete_key(key); - RegCloseKey(key); - return res; -} - -/*********************************************************************** * coclass list */ static struct regsvr_coclass const coclass_list[] = {

1 0

Juan Lang : crypt32: Add a function to create a certificate chain engine potentially before the root store is created .
by Alexandre Julliard 11 Sep '07

11 Sep '07

Module: wine Branch: master Commit: 391f826d49604f2bc70bf2574e2273307f139d48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=391f826d49604f2bc70bf2574… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Sep 10 09:33:39 2007 -0700 crypt32: Add a function to create a certificate chain engine potentially before the root store is created. --- dlls/crypt32/chain.c | 78 +++++++++++++++++++++++---------------- dlls/crypt32/crypt32_private.h | 7 ++++ 2 files changed, 53 insertions(+), 32 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 4424f52..10997af 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -104,12 +104,48 @@ static BOOL CRYPT_CheckRestrictedRoot(HCERTSTORE store) return ret; } -BOOL WINAPI CertCreateCertificateChainEngine(PCERT_CHAIN_ENGINE_CONFIG pConfig, - HCERTCHAINENGINE *phChainEngine) +HCERTCHAINENGINE CRYPT_CreateChainEngine(HCERTSTORE root, + PCERT_CHAIN_ENGINE_CONFIG pConfig) { static const WCHAR caW[] = { 'C','A',0 }; static const WCHAR myW[] = { 'M','y',0 }; static const WCHAR trustW[] = { 'T','r','u','s','t',0 }; + PCertificateChainEngine engine = + CryptMemAlloc(sizeof(CertificateChainEngine)); + + if (engine) + { + HCERTSTORE worldStores[4]; + + engine->ref = 1; + engine->hRoot = root; + engine->hWorld = CertOpenStore(CERT_STORE_PROV_COLLECTION, 0, 0, + CERT_STORE_CREATE_NEW_FLAG, NULL); + worldStores[0] = CertDuplicateStore(engine->hRoot); + worldStores[1] = CertOpenSystemStoreW(0, caW); + worldStores[2] = CertOpenSystemStoreW(0, myW); + worldStores[3] = CertOpenSystemStoreW(0, trustW); + CRYPT_AddStoresToCollection(engine->hWorld, + sizeof(worldStores) / sizeof(worldStores[0]), worldStores); + CRYPT_AddStoresToCollection(engine->hWorld, + pConfig->cAdditionalStore, pConfig->rghAdditionalStore); + CRYPT_CloseStores(sizeof(worldStores) / sizeof(worldStores[0]), + worldStores); + engine->dwFlags = pConfig->dwFlags; + engine->dwUrlRetrievalTimeout = pConfig->dwUrlRetrievalTimeout; + engine->MaximumCachedCertificates = + pConfig->MaximumCachedCertificates; + if (pConfig->CycleDetectionModulus) + engine->CycleDetectionModulus = pConfig->CycleDetectionModulus; + else + engine->CycleDetectionModulus = DEFAULT_CYCLE_MODULUS; + } + return (HCERTCHAINENGINE)engine; +} + +BOOL WINAPI CertCreateCertificateChainEngine(PCERT_CHAIN_ENGINE_CONFIG pConfig, + HCERTCHAINENGINE *phChainEngine) +{ BOOL ret; TRACE("(%p, %p)\n", pConfig, phChainEngine); @@ -123,39 +159,17 @@ BOOL WINAPI CertCreateCertificateChainEngine(PCERT_CHAIN_ENGINE_CONFIG pConfig, ret = CRYPT_CheckRestrictedRoot(pConfig->hRestrictedRoot); if (ret) { - PCertificateChainEngine engine = - CryptMemAlloc(sizeof(CertificateChainEngine)); + HCERTSTORE root; + HCERTCHAINENGINE engine; + if (pConfig->hRestrictedRoot) + root = CertDuplicateStore(pConfig->hRestrictedRoot); + else + root = CertOpenSystemStoreW(0, rootW); + engine = CRYPT_CreateChainEngine(root, pConfig); if (engine) { - HCERTSTORE worldStores[4]; - - engine->ref = 1; - if (pConfig->hRestrictedRoot) - engine->hRoot = CertDuplicateStore(pConfig->hRestrictedRoot); - else - engine->hRoot = CertOpenSystemStoreW(0, rootW); - engine->hWorld = CertOpenStore(CERT_STORE_PROV_COLLECTION, 0, 0, - CERT_STORE_CREATE_NEW_FLAG, NULL); - worldStores[0] = CertDuplicateStore(engine->hRoot); - worldStores[1] = CertOpenSystemStoreW(0, caW); - worldStores[2] = CertOpenSystemStoreW(0, myW); - worldStores[3] = CertOpenSystemStoreW(0, trustW); - CRYPT_AddStoresToCollection(engine->hWorld, - sizeof(worldStores) / sizeof(worldStores[0]), worldStores); - CRYPT_AddStoresToCollection(engine->hWorld, - pConfig->cAdditionalStore, pConfig->rghAdditionalStore); - CRYPT_CloseStores(sizeof(worldStores) / sizeof(worldStores[0]), - worldStores); - engine->dwFlags = pConfig->dwFlags; - engine->dwUrlRetrievalTimeout = pConfig->dwUrlRetrievalTimeout; - engine->MaximumCachedCertificates = - pConfig->MaximumCachedCertificates; - if (pConfig->CycleDetectionModulus) - engine->CycleDetectionModulus = pConfig->CycleDetectionModulus; - else - engine->CycleDetectionModulus = DEFAULT_CYCLE_MODULUS; - *phChainEngine = (HCERTCHAINENGINE)engine; + *phChainEngine = engine; ret = TRUE; } else diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h index ffd5a87..4397005 100644 --- a/dlls/crypt32/crypt32_private.h +++ b/dlls/crypt32/crypt32_private.h @@ -251,6 +251,13 @@ PWINECRYPT_CERTSTORE CRYPT_FileNameOpenStoreA(HCRYPTPROV hCryptProv, PWINECRYPT_CERTSTORE CRYPT_FileNameOpenStoreW(HCRYPTPROV hCryptProv, DWORD dwFlags, const void *pvPara); +/* Allocates and initializes a certificate chain engine, but without creating + * the root store. Instead, it uses root, and assumes the caller has done any + * checking necessary. + */ +HCERTCHAINENGINE CRYPT_CreateChainEngine(HCERTSTORE root, + PCERT_CHAIN_ENGINE_CONFIG pConfig); + /* Helper function for store reading functions and * CertAddSerializedElementToStore. Returns a context of the appropriate type * if it can, or NULL otherwise. Doesn't validate any of the properties in

1 0

Juan Lang : crypt32: Add a root store implementation that reads trusted certificates from well-known locations on the local system .
by Alexandre Julliard 11 Sep '07

11 Sep '07

Module: wine Branch: master Commit: 9663f9427b10e1d82bc98b03b07d688d09f64dd2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9663f9427b10e1d82bc98b03b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Sep 10 09:46:56 2007 -0700 crypt32: Add a root store implementation that reads trusted certificates from well-known locations on the local system. --- dlls/crypt32/Makefile.in | 1 + dlls/crypt32/crypt32_private.h | 1 + dlls/crypt32/rootstore.c | 506 ++++++++++++++++++++++++++++++++++++++++ dlls/crypt32/store.c | 8 +- 4 files changed, 511 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9663f9427b10e1d82bc98…

1 0