Changeset 10

Timestamp:

Feb 21, 2018, 12:49:59 AM (7 years ago)

Author:

Gregg Young

Message:

The changes in these files were made to fix Open Watcom compiler, WRC and wipfc errors and warning. There are several more in the next commit.

Location:

trunk

Files:

• common.rc (modified) (1 diff)
• czech/gotrescz.rc (modified) (1 diff)
• data/rosaleen.bmp (modified) ( previous)
• deutsch/gotresde.rc (modified) (1 diff)
• dll/gotchdll.h (modified) (2 diffs)
• english/gotcha_en.ipf (modified) (13 diffs)
• gotcha.cpp (modified) (1 diff)
• gotcha.h (modified) (2 diffs)
• gotcha.rc (modified) (1 diff)
• italiano/gotcha_it.ipf (modified) (14 diffs)
• italiano/gotresit.rc (modified) (1 diff)
• mainwin.cpp (modified) (2 diffs)
• portbras/gotcha_br.ipf (modified) (13 diffs)
• portbras/gotresbr.rc (modified) (1 diff)
• rstring.cpp (modified) (1 diff)
• rstring.h (modified) (1 diff)

trunk/common.rc

@@ -25 +25 @@
 #include "version.h"
 
-ICON    1 "src\\data\\gotcha.ico"
-POINTER 2 "src\\data\\gotcha.ptr"
-BITMAP  3 "src\\data\\snap.bmp"
-BITMAP  4 "src\\data\\smile.bmp"
+ICON    1 "..\\data\\gotcha.ico"
+POINTER 2 "..\\data\\gotcha.ptr"
+BITMAP  3 "..\\data\\snap.bmp"
+BITMAP  4 "..\\data\\smile.bmp"
 
 /** Haupthilfstabelle ****************************************************/

trunk/czech/gotrescz.rc

@@ -22 +22 @@
 
 /* Please do NOT try to translate the following statement :-) */
-RCINCLUDE "src\common.rc"
+RCINCLUDE "..\common.rc"
 
 /* Pros¡m, upravte jm‚no jazyka (ale ponechte Ÿ¡slo) :-) 

trunk/deutsch/gotresde.rc

@@ -20 +20 @@
 
 /* Bitte die folgende Zeile NICHT bersetzen :-) */
-RCINCLUDE "src\common.rc"
+RCINCLUDE "..\common.rc"
 
 /* Please adjust the name of the language (but leave the number alone :-) 

trunk/dll/gotchdll.h

@@ -2 +2 @@
 #ifndef _THTH_GOTCHDLL_H_
 #define _THTH_GOTCHDLL_H_
+#ifdef __cplusplus
+      extern "C" {
+#endif
 
 extern void EXPENTRY InitDLL (HAB hab, HWND hwnd);
@@ -8 +11 @@
 extern USHORT Version (VOID);
 
+#ifdef __cplusplus
+        }
 #endif
+
+#endif

trunk/english/gotcha_en.ipf

@@ -1 +1 @@
 :userdoc.
 
-.im src\common.ipf
+.im ..\common.ipf
 
 .*-------------------------------------------------------------------------
@@ -7 +7 @@
 
 :h1 id=about res=1000.About &progname.
-:artwork name='src\data\gotcha.bmp' align=center.
+:artwork name='..\data\gotcha.bmp' align=center.
 :p.&progname. is a small (well, not :hp1.that:ehp1. small any more)
 utility for OS/2 which allows to easily capture windows, window interiors,
@@ -16 +16 @@
 .* FIXME
 .* changed from: 
-.*  (bitmap format)
+(bitmap format)
 .* changed to:
-.*  (in many image formats, depending on what MMOS/2 can do).
+(in many image formats, depending on what MMOS/2 can do).
 
 :p.&progname. also has features for automatically making a capture every n
@@ -373 +373 @@
 .*-------------------------------------------------------------------------
 .*Version history
-:h2 id=history.Version history :p.Here you can see what was added or changed
+:h2 id=history res=5001.Version history 
+
+:p.Here you can see what was added or changed
 in the different versions of the program.
 
@@ -543 +545 @@
 .*fold00.*Future enhancements
 
-:h2 id=future.Future enhancements
+:h2 id=future res=5002.Future enhancements
 :p.Well, there's still a few things that users requested and that will be
 added a long time ago in a galaxy far away ... aarg, a future version I
@@ -557 +559 @@
 .*fold00.*Disclaimer & legal stuff
 
-:h1 id=disclaimer.Disclaimer &amp. legal stuff
+:h1 id=disclaimer res=5003.Disclaimer &amp. legal stuff
 :p.Following are the usual disclaimers. For those of you, who have read them
 far too many times, here is just the short version&colon.
@@ -605 +607 @@
 .*fold00.*GNU Public License
 
-:h1 id=gpl.GNU GENERAL PUBLIC LICENSE
+:h1 id=gpl res=5004.GNU GENERAL PUBLIC LICENSE
 
 :lines.
@@ -954 +956 @@
 .*fold00.*Author & Gotcha! homepage
 
-:h1 id=author.Author &amp. &progname. homepage
+:h1 id=author res=5005.Author &amp. &progname. homepage
 :p.:hp7.Author:ehp7.
 
@@ -970 +972 @@
 :edl.
 
-:artwork name='src\data\teamlogo.bmp' align=center.
+:artwork name='..\data\teamlogo.bmp' align=center.
 :p.Proud member of Team OS/2 Region Trier (:hp1.www.teamos2.ipcon.de:ehp1.), 
 the makers of the "Team Trier Collection"-CDROM.
@@ -986 +988 @@
 .*-------------------------------------------------------------------------
 .*fold00.*Help wanted!
-:h1 id=helpwanted.Help wanted!
+:h1 id=helpwanted res=5006.Help wanted!
 :p.Now that &progname. supports other languages, I of course want to include
 as many as possible. The problem is that I only speak english and german well
@@ -1005 +1007 @@
 .*fold00.*Credits
 
-:h1 id=credits.Credits
+:h1 id=credits res=5007.Credits
 :p.I wish to thank the following people, for their help and support with
 &progname.&colon.
@@ -1027 +1029 @@
 .*-------------------------------------------------------------------------
 .*fold00.*Registering
-:h1 id=register."Registering"
+:h1 id=register res=5008."Registering"
 .*:p. if you are satisfied with what &progname. 1.67 offers, you are free to keep
 .*using this version ... but please keep in mind that it lacks many useful
@@ -1109 +1111 @@
 .*fold00.*Dedication
 
-:h1 id=dedication.Dedication
-:p.:artwork name='src\data\rosaleen.bmp' align=center.
+:h1 id=dedication res=5009.Dedication
+:p.:artwork name='..\data\rosaleen.bmp' align=center.
 :hp2.
 .ce Gotcha! is dedicated to Rosaleen.

trunk/gotcha.cpp

@@ -21 +21 @@
 
 #include "gotcha.h"
-//#include "dll/gotchdll.h"
+#include "dll/gotchdll.h"
 #include "settings.h"
 #include "string.h"

trunk/gotcha.h

@@ -28 +28 @@
 #define INCL_DOSRESOURCES
 #define INCL_WINHELP
+#define INCL_MMIOOS2
 
 #define OS2EMX_PLAIN_CHAR
@@ -83 +84 @@
 
 HBITMAP  CaptureWindow (HWND hwnd, HWND hwndParent, PRECTL prcl, BOOL f);
-VOID     SaveBitmap (HBITMAP hbm, HPS hps);
+VOID     SaveBitmap (HBITMAP hbm, HPS hps, int width, int height, int bitCount);
 VOID     SaveBitmapToClipboard (HBITMAP hbm);
 VOID     SaveBitmapToFile (HBITMAP hbm, PSZ psz, HPS hps);

trunk/gotcha.rc

@@ -1 @@
-ICON 1 "SRC\\gotcha.ico"
+ICON 1 ".\\gotcha.ico"

trunk/italiano/gotcha_it.ipf

@@ -1 +1 @@
 :userdoc.
 
-.*  Note from Thorsten: This file is not licensed under the GPL but
+.* Note from Thorsten: This file is not licensed under the GPL but
 .* copyright by Alberto Gabrielli.
 
 .*##############################
 .*
-.*      Gotcha!
-.*      =======
-.*      italiano.ipf
-.*      v.1.73 - GA
-.*      2002-05-21
+.*    Gotcha!
+.*    =======
+.*    italiano.ipf
+.*    v.1.73 - GA
+.*    2002-05-21
 .*
-.*      (C) 2002 - Alberto Gabrielli
+.*    (C) 2002 - Alberto Gabrielli
 .*
 .*##############################
@@ -24 +24 @@
 .*                  - Removed a "&version." no longer needed
 
-.im src\common.ipf
+.im ..\common.ipf
 
 .*-------------------------------------------------------------------------
@@ -30 +30 @@
 
 :h1 id=about res=1000.Informazioni sul programma
-:artwork name='src\data\gotcha.bmp' align=center.
+:artwork name='..\data\gotcha.bmp' align=center.
 .*:p.Attention&colon. This version of the documentation may be outdated or
 .*incomplete. If you think you are missing something, see the English version!
@@ -415 +415 @@
 .*-------------------------------------------------------------------------
 .*FOLD00.*Version history
-:h2 id=history.Cronologia :p.Questa pagina contiene l'elenco dei cambiamenti nelle varie
+:h2 id=history res=5001.Cronologia 
+
+:p.Questa pagina contiene l'elenco dei cambiamenti nelle varie
 versioni del programma.
 
@@ -527 +529 @@
 .*fold00.*Bugs
 
-:h2 id=bugs.Problemi conosciuti
+:h2 id=bugs res=5002.Problemi conosciuti
 :p.Dopo il rilascio della v1.00, la mia sensazione che il codice di &progname. fosse il
 pi— pasticciato degli ultimi anni si Š rivelata esatta, visto che
@@ -604 +606 @@
 .*fold00.*Future enhancements
 
-:h2 id=future.Miglioramenti futuri
+:h2 id=future res=5003.Miglioramenti futuri
 :p.Beh, ci sono ancora alcune cose richieste dagli utenti, e che verranno aggiunte in un tempo
 lontano, in una remotissima galassia... aargh, in una futura versione, intendevo... ;-)
@@ -616 +618 @@
 .*fold00.*Disclaimer & legal stuff
 
-:h1 id=disclaimer.Disclaimer &amp. questioni legali
+:h1 id=disclaimer res=5004.Disclaimer &amp. questioni legali
 
 :p.[inizio N.d.T.]
@@ -700 +702 @@
 .*fold00.*GNU Public License
 
-:h1 id=gpl.GNU GENERAL PUBLIC LICENSE
+:h1 id=gpl res=5005.GNU GENERAL PUBLIC LICENSE
 
 :lines.
@@ -1049 +1051 @@
 .*fold00.*Author & Gotcha! homepage
 
-:h1 id=author.L'autore &amp. la pagina Web di &progname.
+:h1 id=author res=5006.L'autore &amp. la pagina Web di &progname.
 :p.:hp7.Autore:ehp7.
 
@@ -1065 +1067 @@
 :edl.
 
-:artwork name='src\data\teamlogo.bmp' align=center.
+:artwork name='..\data\teamlogo.bmp' align=center.
 :p.Membro orgoglioso del Team OS/2 Region Trier (:hp1.www.teamos2.ipcon.de:ehp1.),
 i creatori del CD-ROM "Team Trier Collection".
@@ -1080 +1082 @@
 .*-------------------------------------------------------------------------
 .*fold00.*Help wanted!
-:h1 id=helpwanted.Richiesta di aiuto!
+:h1 id=helpwanted res=5007.Richiesta di aiuto!
 
 :p.Ora che &progname. gestisce altre lingue, Š chiaro che vorrei includerne quante pi—
@@ -1102 +1104 @@
 .*fold00.*Credits
 
-:h1 id=credits.Ringraziamenti
+:h1 id=credits res=5008.Ringraziamenti
 :p.Per il loro l'aiuto ed appoggio su &progname., desidero ringraziare le seguenti persone&colon.
 
@@ -1124 +1126 @@
 .*-------------------------------------------------------------------------
 .*fold00.*Registering
-:h1 id=register."Registrazione"
+:h1 id=register res=5009."Registrazione"
 .*:p. if you are satisfied with what &progname. 1.67 offers, you are free to keep
 .*using this version ... but please keep in mind that it lacks many useful
@@ -1227 +1229 @@
 .*fold00.*Dedication
 
-:h1 id=dedication.Dedica
-:p.:artwork name='src\data\rosaleen.bmp' align=center.
+:h1 id=dedication res=5010.Dedica
+:p.:artwork name='..\data\rosaleen.bmp' align=center.
 :hp2.
 .ce &progname. Š dedicato a Rosaleen.

trunk/italiano/gotresit.rc

@@ -56 +56 @@
 
 /* Please do NOT try to translate the following statement :-) */
-RCINCLUDE "src\common.rc"
+RCINCLUDE "..\common.rc"
 
 /* Please adjust the name of the language (but leave the number alone :-)

trunk/mainwin.cpp

@@ -326 +326 @@
             // I have no idea why this delay is necessary, but CAP_SCREEN with
             // hiding our window does not work without it ...
-            _sleep2 (100);
+            DosSleep (100);
             usState = STATE_SELECTWINDOW;
             WinSendMsg (hwnd, UM_SELECTWINDOW, 0,0);
@@ -466 +466 @@
         // I have no idea why this delay is necessary, but CAP_SCREEN with
         // hiding our window does not work without it ...
-        _sleep2 (100);
+        DosSleep (100);
         WinSendMsg (hwnd, UM_CAPTURE2, 0,0);
         return MRESULT (FALSE);

trunk/portbras/gotcha_br.ipf

@@ -2 +2 @@
 .* :title.Documenta‡Æo do Gotcha! 1.65
 
-.*  Note from Thorsten: This file is not licensed under the GPL but 
+.* Note from Thorsten: This file is not licensed under the GPL but 
 .* copyright by rico Mendon‡a.
 
-.im src\common.ipf
+.im ..\common.ipf
 
 .*-------------------------------------------------------------------------
@@ -11 +11 @@
 
 :h1 id=about res=1000.Sobre Gotcha!
-:artwork name='src\\data\\gotcha.bmp' align=center.
+:artwork name='..\\data\\gotcha.bmp' align=center.
 :p.Attention&colon. This version of the documentation may be outdated or
 incomplete. If you think you are missing something, see the English version!
@@ -317 +317 @@
 .*-------------------------------------------------------------------------
 .*FOLD00.*Altera‡äes em cada versÆo
-:h2 id=history.Altera‡äes em cada versÆo :p.Aqui vocˆ pode ver o que foi acrescentado ou
+:h2 id=history  res=5001.Altera‡äes em cada versÆo :p.Aqui vocˆ pode ver o que foi acrescentado ou
  alterado nas diferentes versäes deste programa.
 
@@ -429 +429 @@
 .*fold00.*Bugs
 
-:h2 id=bugs.Bugs conhecidos
+:h2 id=bugs  res=5002.Bugs conhecidos
 :p.Ap¢s o lan‡amento da v1.00, meu consenso de que Gotcha! ‚ o meu c¢digo mais
 bagun‡ado dos £ltimos anos se confirmou, pois mesmo os bugs tinham bugs! ;-)
@@ -487 +487 @@
 .*fold00.*Melhorias futuras
 
-:h2 id=future.Futuras melhorias
+:h2 id=future  res=5003.Futuras melhorias
 :p.Bem, ainda existem algumas coisas que os usu rios pediram e que serÆo acrescentadas 
 num futuro distante em uma gal xia long¡nqua ... aarg, quer dizer, em uma versÆo futura  ;-)
@@ -501 +501 @@
 .*fold00.*Avisos & considera‡äes legais
 
-:h1 id=disclaimer.Avisos &amp. considera‡äes legais
+:h1 id=disclaimer  res=5004.Avisos &amp. considera‡äes legais
 :p.Seguem os avisos de sempre. Para aqueles que ainda nÆo leram este tipo de aviso
 vezes demais, aqui tem uma versÆo mais curta&colon.
@@ -545 +545 @@
 .*FOLD00.*GNU Public License
 
-:h1 id=gpl.GNU GENERAL PUBLIC LICENSE
+:h1 id=gpl  res=5005.GNU GENERAL PUBLIC LICENSE
 
 :lines.
@@ -894 +894 @@
 .*fold00.*Homepage do autor e de Gotcha!
 
-:h1 id=author.Homepage do autor e de &progname.
+:h1 id=author  res=5006.Homepage do autor e de &progname.
 :p.:hp7.Autor:ehp7.
 
@@ -910 +910 @@
 :edl.
 
-:artwork name='src\\data\\teamlogo.bmp' align=center.
+:artwork name='..\\data\\teamlogo.bmp' align=center.
 :p.Orgulhoso membro do Team OS/2 Region Trier e.V., criadores do CDROM "Team Trier Collection".
 
@@ -925 +925 @@
 .*-------------------------------------------------------------------------
 .*fold00.*Precisa-se de ajuda!
-:h1 id=helpwanted.Precisa-se de ajuda!
+:h1 id=helpwanted res=5007.Precisa-se de ajuda!
 :p.Agora que &progname. suporta outra l¡nguas, ‚ claro que eu gostaria
 de incluir quantas forem poss¡veis. O problema ‚ que eu apenas falo
@@ -948 +948 @@
 .*fold00.*Cr‚ditos
 
-:h1 id=credits.Cr‚ditos
+:h1 id=credits  res=5008.Cr‚ditos
 :p.Eu gostaria de agradecer as pessoas abaixo, por sua ajuda e suporte com
 &progname.&colon.
@@ -970 +970 @@
 .*-------------------------------------------------------------------------
 .*fold00.*Registrando
-:h1 id=register."Registrando"
+:h1 id=register  res=5009."Registrando"
 .*:p. se vocˆ est  satisfeito com o que &progname. 1.67 oferece, vocˆ pode continuar
 .*utilizando esta versÆo ... mas lembre-se que ela ainda nÆo possui muitas fun‡äes £teis
@@ -1051 +1051 @@
 .*fold00.*Dedicat¢ria
 
-:h1 id=dedication.Dedicat¢ria
-:p.:artwork name='src\\data\\rosaleen.bmp' align=center.
+:h1 id=dedication  res=5010.Dedicat¢ria
+:p.:artwork name='..\\data\\rosaleen.bmp' align=center.
 :hp2.
 .ce Gotcha! ‚ dedicado a Rosaleen.

trunk/portbras/gotresbr.rc

@@ -23 +23 @@
 
 /* Please do NOT try to translate the following statement :-) */
-RCINCLUDE "src\common.rc"
+RCINCLUDE "..\common.rc"
 
 /* Please adjust the name of the language (but leave the number alone :-) 

trunk/rstring.cpp

@@ -17 +17 @@
  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  ***/
-
+#define INCL_DOS
+#include <os2.h>
 #include "rstring.h"
 

trunk/rstring.h

@@ -21 +21 @@
 #define _RSTRING_H_
 
-#define OS2EMX_PLAIN_CHAR
+//#define OS2EMX_PLAIN_CHAR
+#define INCL_DOSMODULEMGR
 
 #include <os2.h>