b784050837
0.0-0.fdr.2.20030911 - Fix SSL detection (need krb5), require openssl. - Disable ALSA by default, use "--with alsa" to enable. - Disable valgrind by default, use "--with valgrind" to enable. - Cosmetic improvements. Tue Sep 16 2003 Panu Matilainen <pmatilai@welho.com> 0.0-0.fdr.1.20030911 - update to 20030911 Tue Aug 19 2003 Panu Matilainen <pmatilai@welho.com> 0.0-0.fdr.1.20030813 - update to 20030813 Thu Jul 10 2003 Panu Matilainen <pmatilai@welho.com> 0.0-0.fdr.1.20030709 - update to 20030709 - add /lib/tls requirement -> only works with NTPL capable systems Wed Jul 02 2003 Panu Matilainen <pmatilai@welho.com> 0.0-0.fdr.1.20030618 - update to 20030618 Thu May 22 2003 Panu Matilainen <pmatilai@welho.com> 0.0-0.fdr.1.20030508 - update to 20030508 - add buildreq's & other QA issues from #255 Sat May 03 2003 Panu Matilainen <pmatilai@welho.com> 0.0-0.fdr.1.20030408 - package for fedora - based on modified RH wine from 8.0 found off the net
104 lines
3.2 KiB
Diff
104 lines
3.2 KiB
Diff
Index: wine/misc/registry.c
|
|
===================================================================
|
|
RCS file: /home/wine/wine/misc/registry.c,v
|
|
retrieving revision 1.125
|
|
diff -u -r1.125 registry.c
|
|
--- wine/misc/registry.c 30 Mar 2003 03:05:12 -0000 1.125
|
|
+++ wine/misc/registry.c 26 Nov 2002 18:21:01 -0000
|
|
@@ -1609,14 +1609,65 @@
|
|
|
|
strcpy(tmp,confdir);
|
|
strcat(tmp,"/" SAVE_LOCAL_REGBRANCH_USER_DEFAULT);
|
|
+ if (access( tmp, R_OK ) && !access( "/etc/wine/" SAVE_LOCAL_REGBRANCH_USER_DEFAULT, R_OK )) {
|
|
+ /* If the registry doesn't exist, copy the global one */
|
|
+ FILE *in, *out;
|
|
+ char buf[1024];
|
|
+ in = fopen( "/etc/wine/" SAVE_LOCAL_REGBRANCH_USER_DEFAULT, "r" );
|
|
+ if(!in)
|
|
+ return;
|
|
+ out = fopen( tmp, "w" );
|
|
+ if(!out) {
|
|
+ fclose(in);
|
|
+ return;
|
|
+ }
|
|
+ while(fgets(buf, 1024, in))
|
|
+ fputs(buf, out);
|
|
+ fclose(in);
|
|
+ fclose(out);
|
|
+ }
|
|
load_wine_registry(hkey_users_default,tmp);
|
|
|
|
strcpy(tmp,confdir);
|
|
strcat(tmp,"/" SAVE_LOCAL_REGBRANCH_CURRENT_USER);
|
|
+ if (access( tmp, R_OK ) && !access( "/etc/wine/" SAVE_LOCAL_REGBRANCH_CURRENT_USER, R_OK )) {
|
|
+ /* If the registry doesn't exist, copy the global one */
|
|
+ FILE *in, *out;
|
|
+ char buf[1024];
|
|
+ in = fopen( "/etc/wine/" SAVE_LOCAL_REGBRANCH_CURRENT_USER, "r" );
|
|
+ if(!in)
|
|
+ return;
|
|
+ out = fopen( tmp, "w" );
|
|
+ if(!out) {
|
|
+ fclose(in);
|
|
+ return;
|
|
+ }
|
|
+ while(fgets(buf, 1024, in))
|
|
+ fputs(buf, out);
|
|
+ fclose(in);
|
|
+ fclose(out);
|
|
+ }
|
|
load_wine_registry(hkey_current_user,tmp);
|
|
|
|
strcpy(tmp,confdir);
|
|
strcat(tmp,"/" SAVE_LOCAL_REGBRANCH_LOCAL_MACHINE);
|
|
+ if (access( tmp, R_OK ) && !access( "/etc/wine/" SAVE_LOCAL_REGBRANCH_LOCAL_MACHINE, R_OK )) {
|
|
+ /* If the registry doesn't exist, copy the global one */
|
|
+ FILE *in, *out;
|
|
+ char buf[1024];
|
|
+ in = fopen( "/etc/wine/" SAVE_LOCAL_REGBRANCH_LOCAL_MACHINE, "r" );
|
|
+ if(!in)
|
|
+ return;
|
|
+ out = fopen( tmp, "w" );
|
|
+ if(!out) {
|
|
+ fclose(in);
|
|
+ return;
|
|
+ }
|
|
+ while(fgets(buf, 1024, in))
|
|
+ fputs(buf, out);
|
|
+ fclose(in);
|
|
+ fclose(out);
|
|
+ }
|
|
load_wine_registry(hkey_local_machine,tmp);
|
|
|
|
free(tmp);
|
|
Index: wine/server/registry.c
|
|
===================================================================
|
|
RCS file: /home/wine/wine/server/registry.c,v
|
|
retrieving revision 1.50
|
|
diff -u -r1.50 registry.c
|
|
--- wine/server/registry.c 25 Feb 2003 04:04:18 -0000 1.50
|
|
+++ wine/server/registry.c 26 Nov 2002 18:21:02 -0000
|
|
@@ -1486,6 +1486,23 @@
|
|
if (!(filename = malloc( strlen(config) + 8 ))) fatal_error( "out of memory\n" );
|
|
strcpy( filename, config );
|
|
strcat( filename, "/config" );
|
|
+ if (access( filename, R_OK ) && !access( "/etc/wine/wine.conf", R_OK )) {
|
|
+ /* If the registry doesn't exist, copy the global one */
|
|
+ FILE *in, *out;
|
|
+ char buf[1024];
|
|
+ in = fopen( "/etc/wine/wine.conf", "r" );
|
|
+ if(!in)
|
|
+ return;
|
|
+ out = fopen( filename, "w" );
|
|
+ if(!out) {
|
|
+ fclose(in);
|
|
+ return;
|
|
+ }
|
|
+ while(fgets(buf, 1024, in))
|
|
+ fputs(buf, out);
|
|
+ fclose(in);
|
|
+ fclose(out);
|
|
+ }
|
|
if ((f = fopen( filename, "r" )))
|
|
{
|
|
struct key *key;
|