rebase-0.4 patch

rebase-0.4 patch

[Jason Tishler]

[-- Attachment #1: Type: text/plain, Size: 1135 bytes --]

Ralf,

The attached patch changes your version of rebase as follows:

    1. Round NewImageSize (to the nearest 0x10000) to be consistent
       with MS's rebase.
    2. Fix bug when rebasing up.

Are you willing to accept these changes -- in particular, #2?

If so, then I would like to offer the following too:

    1. gcc 3.2 patches (completed)
    2. conversion to librebase.a patch (to be completed)

My plan is as follows:

    1. Convert your rebase into a library, librebase.a.
    2. Merge librebase.a with my stand-alone, non-persistent rebase.
    3. Release this rebase so there is one version that supports all
       users (including Me) and all DLLs (including ones that need
       fix-up due to stripping).
    4. Merge the above into my stand-alone, persistent rebase.
    5. Submit a setup.exe patch with the above functionality.
    6. When setup.exe patch is accepted, release stand-alone, persistent
       rebase that can be used for DLLs not installed by setup.exe.

Jason

-- 
PGP/GPG Key: http://www.tishler.net/jason/pubkey.asc or key servers
Fingerprint: 7A73 1405 7F2B E669 C19D  8784 1AFD E4CC ECF4 8EF6

[-- Attachment #2: rebase.cc.diff --]
[-- Type: text/plain, Size: 717 bytes --]

--- ../rebase-ralf-0.4.orig/rebase.cc	2002-08-10 17:41:40.000000000 -0400
+++ rebase.cc	2002-12-03 15:35:24.000000000 -0500
@@ -113,8 +113,16 @@ BOOL ReBaseImage(
 	*OldImageSize = ntheader->OptionalHeader.SizeOfImage; 
 	*NewImageSize = ntheader->OptionalHeader.SizeOfImage; 
 
+	// Round NewImageSize to be consistent with MS's rebase.
+	const ULONG imageSizeGranularity = 0x10000;
+	ULONG remainder = *NewImageSize % imageSizeGranularity;
+	if (remainder)
+		*NewImageSize = (*NewImageSize - remainder) + imageSizeGranularity;
+
 	if (fGoingDown)
 		*NewImageBase -= *NewImageSize; 
+	else
+		*NewImageBase += *NewImageSize; 
 		
 	// already rebased 
 	if (ntheader->OptionalHeader.ImageBase == *NewImageBase) {


[-- Attachment #3: Type: text/plain, Size: 214 bytes --]

--
Unsubscribe info:      http://cygwin.com/ml/#unsubscribe-simple
Bug reporting:         http://cygwin.com/bugs.html
Documentation:         http://cygwin.com/docs.html
FAQ:                   http://cygwin.com/faq/

Re: rebase-0.4 patch

[Jason Tishler]

Ralf,

On Wed, Dec 04, 2002 at 07:45:52AM +0100, Ralf Habacker wrote:
> > Are you willing to accept these changes -- in particular, #2?
> 
> I've applied this patches to the kde-cygwin sources.

Thanks.  Have you committed them to CVS yet?  (So I can patch against
the latest source).

> Feel free to use it as you like under the term of the gpl license. I'm
> glad that this stuff is usable for others. :-)

Again thanks.  I hope you won't mind some of the changes that I plan on
making:

    1. automatically fix relocations, if necessary
    2. suppress some of the output
    3. reformat via indent

> What about the final cvs archive. Where will this code live ?

I've been assuming somewhere in the Cygwin and/or setup.exe source
trees.

Jason

-- 
PGP/GPG Key: http://www.tishler.net/jason/pubkey.asc or key servers
Fingerprint: 7A73 1405 7F2B E669 C19D  8784 1AFD E4CC ECF4 8EF6

--
Unsubscribe info:      http://cygwin.com/ml/#unsubscribe-simple
Bug reporting:         http://cygwin.com/bugs.html
Documentation:         http://cygwin.com/docs.html
FAQ:                   http://cygwin.com/faq/

Re: rebase-0.4 patch

[Robert Collins]

[-- Attachment #1: Type: text/plain, Size: 359 bytes --]

On Thu, 2002-12-05 at 07:41, Jason Tishler wrote:
> > What about the final cvs archive. Where will this code live ?
> 
> I've been assuming somewhere in the Cygwin and/or setup.exe source
> trees.

I suggest an independent module in cygwin-apps CVS repository.

Rob
-- 
---
GPG key available at: http://users.bigpond.net.au/robertc/keys.txt.
---

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 189 bytes --]

Re: rebase-0.4 patch

[Christopher Faylor]

On Thu, Dec 05, 2002 at 05:57:41PM +1100, Robert Collins wrote:
>On Thu, 2002-12-05 at 07:41, Jason Tishler wrote:
>>>What about the final cvs archive.  Where will this code live ?
>>
>>I've been assuming somewhere in the Cygwin and/or setup.exe source
>>trees.
>
>I suggest an independent module in cygwin-apps CVS repository.

You have write permission in the cygwin-apps repository, Jason, if
you want to create a new rebase directory.

cgf

--
Unsubscribe info:      http://cygwin.com/ml/#unsubscribe-simple
Bug reporting:         http://cygwin.com/bugs.html
Documentation:         http://cygwin.com/docs.html
FAQ:                   http://cygwin.com/faq/

RE: rebase-0.4 patch

[Ralf Habacker]

> -----Original Message-----
> From: Jason Tishler [mailto:jason@tishler.net]
> Sent: Wednesday, December 04, 2002 9:42 PM
> To: Ralf Habacker
> Cc: Cygwin
> Subject: Re: rebase-0.4 patch
>
>
> Ralf,
>
> On Wed, Dec 04, 2002 at 07:45:52AM +0100, Ralf Habacker wrote:
> > > Are you willing to accept these changes -- in particular, #2?
> >
> > I've applied this patches to the kde-cygwin sources.
>
> Thanks.  Have you committed them to CVS yet?  (So I can patch against
> the latest source).

Yes.

> > Feel free to use it as you like under the term of the gpl license. I'm
> > glad that this stuff is usable for others. :-)
>
> Again thanks.  I hope you won't mind some of the changes that I plan on
> making:
>
>     1. automatically fix relocations, if necessary
>     2. suppress some of the output

I've added some debugging stuff, perhaps you like conditional the relating
messages with the debugging flags.

>     3. reformat via indent

Which indent command line you will use. I can do it before, do simplifiy
applying backward to the kde-cygwin archive.


Ralf



--
Unsubscribe info:      http://cygwin.com/ml/#unsubscribe-simple
Bug reporting:         http://cygwin.com/bugs.html
Documentation:         http://cygwin.com/docs.html
FAQ:                   http://cygwin.com/faq/

RE: rebase-0.4 patch

[Robert Collins]

[-- Attachment #1: Type: text/plain, Size: 410 bytes --]

On Thu, 2002-12-05 at 19:15, Ralf Habacker wrote:


> >     3. reformat via indent
> 
> Which indent command line you will use. I can do it before, do simplifiy
> applying backward to the kde-cygwin archive.

Just 'indent'. However for C++, astyle --gnu does a better job of
meeting the GNU standards, FWICT.

Rob
-- 
---
GPG key available at: http://users.bigpond.net.au/robertc/keys.txt.
---

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 189 bytes --]

RE: rebase-0.4 patch

[Ralf Habacker]

> > >     3. reformat via indent
> >
> > Which indent command line you will use. I can do it before, do simplifiy
> > applying backward to the kde-cygwin archive.
>
> Just 'indent'. However for C++, astyle --gnu does a better job of
> meeting the GNU standards, FWICT.
>
There are two possibilites. Which tool should we use ? I think it is necessary
to define for the furture relating to this topic.


BTW: What means FWICT, I haven't found an explanation of this in google.

Ralf


--
Unsubscribe info:      http://cygwin.com/ml/#unsubscribe-simple
Bug reporting:         http://cygwin.com/bugs.html
Documentation:         http://cygwin.com/docs.html
FAQ:                   http://cygwin.com/faq/

RE: rebase-0.4 patch

[Ralf Habacker]

>
> However for C++, astyle --gnu does a better job of
> meeting the GNU standards, FWICT.
>
$ astyle --gnu
Unknown command line option: gnu
For help on options, type 'astyle -h'

astyle --gnu does not work. It must be astyle --style=gnu.

What about spaces and tabs. Tabs would make big files smaller as using tabs, but
the problem is with the indention, which isn't equal for all users and all
editors. For example I'm using 2 spaces.

Ralf





--
Unsubscribe info:      http://cygwin.com/ml/#unsubscribe-simple
Bug reporting:         http://cygwin.com/bugs.html
Documentation:         http://cygwin.com/docs.html
FAQ:                   http://cygwin.com/faq/

RE: rebase-0.4 patch

[Robert Collins]

[-- Attachment #1: Type: text/plain, Size: 595 bytes --]

On Thu, 2002-12-05 at 19:50, Ralf Habacker wrote:

> astyle --gnu does not work. It must be astyle --style=gnu.
> 
> What about spaces and tabs. Tabs would make big files smaller as using tabs, but
> the problem is with the indention, which isn't equal for all users and all
> editors. For example I'm using 2 spaces.

It's your library. You and Jason can battle this one out. I find that
the result of simply astyle --style=gnu are good and consistent. You can
do whatever you want though.

Rob

-- 
---
GPG key available at: http://users.bigpond.net.au/robertc/keys.txt.
---

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 189 bytes --]

RE: rebase-0.4 patch

[Robert Collins]

[-- Attachment #1: Type: text/plain, Size: 240 bytes --]

On Thu, 2002-12-05 at 19:43, Ralf Habacker wrote:


> BTW: What means FWICT, I haven't found an explanation of this in google.

From What I Can Tell.
-- 
---
GPG key available at: http://users.bigpond.net.au/robertc/keys.txt.
---

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 189 bytes --]

Re: rebase-0.4 patch

[Jason Tishler]

Ralf,

On Thu, Dec 05, 2002 at 08:44:37PM +1100, Robert Collins wrote:
> On Thu, 2002-12-05 at 19:50, Ralf Habacker wrote:
> > astyle --gnu does not work. It must be astyle --style=gnu.
> > 
> > What about spaces and tabs. Tabs would make big files smaller as
> > using tabs, but the problem is with the indention, which isn't equal
> > for all users and all editors. For example I'm using 2 spaces.
> 
> It's your library. You and Jason can battle this one out. I find that
> the result of simply astyle --style=gnu are good and consistent. You
> can do whatever you want though.

To be consistent with the rest of the Cygwin source, I suggest the
following:

    o tabstop = 8
    o indent = 2

Jason

-- 
PGP/GPG Key: http://www.tishler.net/jason/pubkey.asc or key servers
Fingerprint: 7A73 1405 7F2B E669 C19D  8784 1AFD E4CC ECF4 8EF6

--
Unsubscribe info:      http://cygwin.com/ml/#unsubscribe-simple
Bug reporting:         http://cygwin.com/bugs.html
Documentation:         http://cygwin.com/docs.html
FAQ:                   http://cygwin.com/faq/

RE: rebase-0.4 patch

[Ralf Habacker]

> On Thu, Dec 05, 2002 at 08:44:37PM +1100, Robert Collins wrote:
> > On Thu, 2002-12-05 at 19:50, Ralf Habacker wrote:
> > > astyle --gnu does not work. It must be astyle --style=gnu.
> > >
> > > What about spaces and tabs. Tabs would make big files smaller as
> > > using tabs, but the problem is with the indention, which isn't equal
> > > for all users and all editors. For example I'm using 2 spaces.
> >
> > It's your library. You and Jason can battle this one out. I find that
> > the result of simply astyle --style=gnu are good and consistent. You
> > can do whatever you want though.
>
> To be consistent with the rest of the Cygwin source, I suggest the
> following:
>
>     o tabstop = 8
>     o indent = 2
>

cygwin setup seems to use 2 spaces for an indent and to avoid tabs the resulting
line should be

	astyle --style=gnu -s2 --convert-tabs

I've checked the sources with this style.


Ralf


--
Unsubscribe info:      http://cygwin.com/ml/#unsubscribe-simple
Bug reporting:         http://cygwin.com/bugs.html
Documentation:         http://cygwin.com/docs.html
FAQ:                   http://cygwin.com/faq/

Re: rebase-0.4 patch

[Jason Tishler]

Chris,

On Wed, Dec 04, 2002 at 04:02:46PM -0500, Christopher Faylor wrote:
> On Thu, Dec 05, 2002 at 05:57:41PM +1100, Robert Collins wrote:
> >I suggest an independent module in cygwin-apps CVS repository.
> 
> You have write permission in the cygwin-apps repository, Jason, if
> you want to create a new rebase directory.

Once we reach consensus of the directory/module structure and Ralf and I
figure out the logistics of moving his code, I will take you up on your
offer.

Thanks,
Jason

-- 
PGP/GPG Key: http://www.tishler.net/jason/pubkey.asc or key servers
Fingerprint: 7A73 1405 7F2B E669 C19D  8784 1AFD E4CC ECF4 8EF6

--
Unsubscribe info:      http://cygwin.com/ml/#unsubscribe-simple
Bug reporting:         http://cygwin.com/bugs.html
Documentation:         http://cygwin.com/docs.html
FAQ:                   http://cygwin.com/faq/