ooo-build r13106 - in trunk: . patches/dev300

[brosenk svn gnome org]

Author: brosenk
Date: Mon Jul  7 20:09:39 2008
New Revision: 13106
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13106&view=rev

Log:
m22-ify store-registry.diff


Added:
   trunk/patches/dev300/store-registry-m21.diff
      - copied unchanged from r13104, /trunk/patches/dev300/store-registry.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/store-registry.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Mon Jul  7 20:09:39 2008
@@ -1927,7 +1927,14 @@
 store-core.diff
 #FIXME src680: in store-install.diff, instsetoo_native part was commented out
 store-install.diff
+
+[ Store <= dev300-m21 ]
+store-registry-m21.diff
+
+[ Store >= dev300-m22 ]
 store-registry.diff
+
+[ Store ]
 # don't burn 3% of startup doing CRC's we don't need
 speed-store.diff, i#78495, michael
 # don't do a load of locking we don't need to 1% of startup

Modified: trunk/patches/dev300/store-registry.diff
==============================================================================
--- trunk/patches/dev300/store-registry.diff	(original)
+++ trunk/patches/dev300/store-registry.diff	Mon Jul  7 20:09:39 2008
@@ -1,20 +1,17 @@
-diff -rup /home/rodo/svn/ooo-build-reference/build/oof680-m7/registry/inc/registry/registry.h registry/inc/registry/registry.h
---- /home/rodo/svn/ooo-build-reference/build/oof680-m7/registry/inc/registry/registry.h	2005-09-09 07:12:56.000000000 +0200
-+++ registry/inc/registry/registry.h	2007-03-14 11:24:57.000000000 +0100
-@@ -420,7 +420,8 @@ RegError REGISTRY_CALLTYPE reg_mergeKey(
+--- ./registry/inc/registry/registry.h.store-registry~	2008-07-07 21:53:26.583846279 +0200
++++ ./registry/inc/registry/registry.h	2008-07-07 22:05:39.641847088 +0200
+@@ -410,7 +410,7 @@ RegError REGISTRY_CALLTYPE SAL_DLLPUBLIC
  	@return	REG_NO_ERROR if succeeds else an error code. 
  */
- RegError REGISTRY_CALLTYPE reg_createRegistry(rtl_uString* registryName, 
+ RegError REGISTRY_CALLTYPE SAL_DLLPUBLIC_EXPORT reg_createRegistry(rtl_uString* registryName, 
 -							 				  RegHandle* phRegistry);
-+							 				  RegHandle* phRegistry,
-+                                              bool bInternal = false);
++							 				  RegHandle* phRegistry, bool bInternal = false);
  
  
  /**	This function opens the root key of a registry.
-diff -rup /home/rodo/svn/ooo-build-reference/build/oof680-m7/registry/source/regimpl.cxx registry/source/regimpl.cxx
---- /home/rodo/svn/ooo-build-reference/build/oof680-m7/registry/source/regimpl.cxx	2007-03-01 17:56:47.000000000 +0100
-+++ registry/source/regimpl.cxx	2007-03-14 09:58:40.000000000 +0100
-@@ -508,7 +508,7 @@ ORegistry::~ORegistry()
+--- ./registry/source/regimpl.cxx.store-registry~	2008-07-07 21:53:24.154848251 +0200
++++ ./registry/source/regimpl.cxx	2008-07-07 22:04:50.955847680 +0200
+@@ -483,7 +483,7 @@ ORegistry::~ORegistry()
  //*********************************************************************
  //  initRegistry
  //
@@ -23,7 +20,7 @@
  {
      OStoreFile      rRegFile;
      storeAccessMode sAccessMode = REG_MODE_OPEN;
-@@ -531,7 +531,10 @@ RegError ORegistry::initRegistry(const O
+@@ -506,7 +506,10 @@ RegError ORegistry::initRegistry(const O
      }
      else
      {
@@ -35,12 +32,11 @@
      }
  
      if (errCode)
-diff -rup /home/rodo/svn/ooo-build-reference/build/oof680-m7/registry/source/regimpl.hxx registry/source/regimpl.hxx
---- /home/rodo/svn/ooo-build-reference/build/oof680-m7/registry/source/regimpl.hxx	2006-06-19 16:28:05.000000000 +0200
-+++ registry/source/regimpl.hxx	2007-03-14 09:59:26.000000000 +0100
-@@ -50,7 +50,11 @@
+--- ./registry/source/regimpl.hxx.store-registry~	2008-04-11 12:50:09.000000000 +0200
++++ ./registry/source/regimpl.hxx	2008-07-07 22:04:50.957847096 +0200
+@@ -36,7 +36,11 @@
+ #include	<osl/mutex.hxx>
  #include	<store/store.hxx>
- #endif
  
 -#define REG_PAGESIZE 512
 +#define REG_PAGESIZE_PUBLIC   512
@@ -51,7 +47,7 @@
  
  #define	REG_MODE_CREATE		store_AccessCreate
  #define	REG_MODE_OPEN		store_AccessReadWrite 
-@@ -107,7 +111,8 @@ public:
+@@ -93,7 +97,8 @@ public:
  		{ return --m_refCount; }
  
  	RegError	initRegistry(const OUString& name, 
@@ -61,10 +57,9 @@
  
  	RegError	closeRegistry();
  
-diff -rup /home/rodo/svn/ooo-build-reference/build/oof680-m7/registry/source/registry.cxx registry/source/registry.cxx
---- /home/rodo/svn/ooo-build-reference/build/oof680-m7/registry/source/registry.cxx	2006-09-17 03:53:45.000000000 +0200
-+++ registry/source/registry.cxx	2007-03-14 11:20:28.000000000 +0100
-@@ -654,12 +654,13 @@ RegError REGISTRY_CALLTYPE reg_mergeKey(
+--- ./registry/source/registry.cxx.store-registry~	2008-04-11 12:50:37.000000000 +0200
++++ ./registry/source/registry.cxx	2008-07-07 22:04:50.959846582 +0200
+@@ -637,12 +637,13 @@ RegError REGISTRY_CALLTYPE reg_mergeKey(
  //	reg_createRegistry
  //
  RegError REGISTRY_CALLTYPE reg_createRegistry(rtl_uString* registryName, 
@@ -80,10 +75,9 @@
  	{
  		*phRegistry = NULL;
  		return ret;
-diff -rup /home/rodo/svn/ooo-build-reference/build/oof680-m7/registry/tools/regmerge.cxx registry/tools/regmerge.cxx
---- /home/rodo/svn/ooo-build-reference/build/oof680-m7/registry/tools/regmerge.cxx	2006-09-17 03:55:09.000000000 +0200
-+++ registry/tools/regmerge.cxx	2007-03-14 11:25:05.000000000 +0100
-@@ -118,15 +118,16 @@ static void dumpHelp()
+--- ./registry/tools/regmerge.cxx.store-registry~	2008-04-11 12:58:26.000000000 +0200
++++ ./registry/tools/regmerge.cxx	2008-07-07 22:04:50.962846684 +0200
+@@ -98,15 +98,16 @@ static void dumpHelp()
  {
      fprintf(stderr, "using: regmerge [-v|--verbose] mergefile mergeKeyName regfile_1 ... regfile_n\n");
      fprintf(stderr, "       regmerge @regcmds\nOptions:\n");    
@@ -107,7 +101,7 @@
  {
  	FILE	*commandfile;
  	char 	option[256];
-@@ -142,13 +143,17 @@ static bool checkCommandFile(char* cmdfi
+@@ -122,13 +123,17 @@ static bool checkCommandFile(char* cmdfi
  		{
  			if (option[0]== '@')
  			{
@@ -127,7 +121,7 @@
                          strncmp(option, "--verbose", 9) == 0)
                      {
                          bVerbose = true;
-@@ -175,23 +180,28 @@ static bool checkCommandFile(char* cmdfi
+@@ -155,23 +160,28 @@ static bool checkCommandFile(char* cmdfi
      return bVerbose;
  }	
  
@@ -159,7 +153,7 @@
                      strncmp(argv[i], "--verbose", 9) == 0)
                  {
                      bVerbose = true;
-@@ -229,7 +239,8 @@ int _cdecl main( int argc, char * argv[]
+@@ -209,7 +219,8 @@ int _cdecl main( int argc, char * argv[]
  {
  	RegHandle 		hReg;
  	RegKeyHandle	hRootKey;
@@ -169,7 +163,7 @@
  
  	if (realargc < 4)
  	{
-@@ -241,7 +252,7 @@ int _cdecl main( int argc, char * argv[]
+@@ -221,7 +232,7 @@ int _cdecl main( int argc, char * argv[]
  	::rtl::OUString regName( convertToFileUrl(realargv[1]) );
  	if (reg_openRegistry(regName.pData, &hReg, REG_READWRITE))
  	{