[DDRAW] Fix bug 1246

Hi,

This patch fixes bug 1246 :
http://bugs.winehq.com/show_bug.cgi?id=1246

Bye,
Christian.

Changelog :
Add support for 24 bpp to _Blt_ColorFill.
Fix endianness issue in DIB_DirectDrawSurface_Blt.

Christian Costa   titan.costa <at> wanadoo.fr

Index: dsurface/dib.c
===================================================================
RCS file: /home/wine/wine/dlls/ddraw/dsurface/dib.c,v
retrieving revision 1.26
diff -u -r1.26 dib.c
--- dsurface/dib.c	8 Jan 2003 21:09:27 -0000	1.26
+++ dsurface/dib.c	1 Feb 2003 00:51:46 -0000
 <at>  <at>  -326,6 +326,13  <at>  <at> 
     switch(bpp) {
     case 1: COLORFILL_ROW(BYTE)
     case 2: COLORFILL_ROW(WORD)
+    case 3: { BYTE *d = (BYTE *) buf;
+              for (x = 0; x < width; x++,d+=3) {
+                d[0] = (color    ) & 0xFF;

wrc: set preprocessor option

Some apps to use the --preprocessor thingy for windres,
so we will have to support it sooner or later. So we
might as well decide the interface now, to avoid interface
changes in the future. This allows us to get rid of -N,
which now becomes -P cat.

ChangeLog
  Add option to set preprocessor (not yet implemented).
  Remove the -N option, which is equivalent to '-P cat'.

Index: tools/wrc/wrc.c
===================================================================
RCS file: /var/cvs/wine/tools/wrc/wrc.c,v
retrieving revision 1.27
diff -u -r1.27 wrc.c
--- tools/wrc/wrc.c	31 Jan 2003 03:20:49 -0000	1.27
+++ tools/wrc/wrc.c	31 Jan 2003 17:47:59 -0000
 <at>  <at>  -102,10 +102,10  <at>  <at> 
 	"   -J		Do not search the standard include path\n"
 	"   -l lan      Set default language to lan (default is neutral {0, 0})\n"
 	"   -m          Do not remap numerical resource IDs\n"
-	"   -N          Do not preprocess input\n"
 	"   -o file     Output to file (default is infile.[res|s]\n"
 	"   -O format	The output format: one of `res', 'asm'.\n"
 	"   -p prefix   Give a prefix for the generated names\n"
+	"   -P program	Specifies the preprocessor to use, including arguments.\n"
 	"   -s          Add structure with win32/16 (PE/NE) resource directory\n"
 	"   -v          Enable verbose mode.\n"
 	"   -V          Print version and exit\n"

Re: WCMD : Problem into PATH command

Seems the bug I posted is fixed now.
http://bugs.winehq.com/show_bug.cgi?id=1247
Patch :

Index: builtins.c
===================================================================
RCS file: /home/wine/wine/programs/wcmd/builtins.c,v
retrieving revision 1.16
diff -u -r1.16 builtins.c
--- builtins.c	15 Jan 2003 03:35:32 -0000	1.16
+++ builtins.c	1 Feb 2003 02:54:36 -0000
 <at>  <at>  -672,7 +672,7  <at>  <at> 
  * Set/Show the path environment variable
  */

-void WCMD_setshow_path () {
+void WCMD_setshow_path (char *command) {

 char string[1024];
 DWORD status;
 <at>  <at>  -687,7 +687,7  <at>  <at> 
     }
   }
   else {
-    status = SetEnvironmentVariable ("PATH", param1);
+    status = SetEnvironmentVariable ("PATH", command);
     if (!status) WCMD_print_error();
   }
 }
Index: wcmd.h

winedbg: fixing attach command

attach command no longer worked as expected. this should fix it
A+
-- 
Eric Pouech

Name:          wd_attach
ChangeLog:     
License:       X11
GenDate:       2003/02/01 10:55:31 UTC
ModifiedFiles: programs/winedbg/debugger.h programs/winedbg/winedbg.c programs/winedbg/dbg.y
AddedFiles:    
===================================================================
RCS file: /home/cvs/cvsroot/wine/wine/programs/winedbg/debugger.h,v
retrieving revision 1.4
diff -u -u -r1.4 debugger.h
--- programs/winedbg/debugger.h	30 Jan 2003 00:24:18 -0000	1.4
+++ programs/winedbg/debugger.h	1 Feb 2003 09:29:52 -0000
 <at>  <at>  -531,7 +531,7  <at>  <at> 
 extern int	        DEBUG_Printf(int chn, const char* format, ...);
 #endif
 extern DBG_INTVAR*	DEBUG_GetIntVar(const char*);
-extern BOOL             DEBUG_Attach(DWORD pid, BOOL cofe);
+extern BOOL             DEBUG_Attach(DWORD pid, BOOL cofe, BOOL wfe);
 extern BOOL             DEBUG_Detach(void);
 extern void             DEBUG_Run(const char* args);
 extern DBG_PROCESS*	DEBUG_AddProcess(DWORD pid, HANDLE h, const char* imageName);
Index: programs/winedbg/winedbg.c
===================================================================
RCS file: /home/cvs/cvsroot/wine/wine/programs/winedbg/winedbg.c,v

winedbg: maintenance

this patch should be (mostly) a no op in gdb proxy part:
- source code factorization
- replacing sprintf by snprintf for sake of mind

(NB: next patch will include the rest of sprintf => snprintf conversion 
in winedbg)

A+
-- 
Eric Pouech

Name:          wd_pxy
ChangeLog:     	- translated sprintf calls into snprintf
	- added helper for sending strings in hex form
License:       X11
GenDate:       2003/02/01 13:31:35 UTC
ModifiedFiles: programs/winedbg/gdbproxy.c
AddedFiles:    
Index: programs/winedbg/gdbproxy.c
===================================================================
RCS file: /home/cvs/cvsroot/wine/wine/programs/winedbg/gdbproxy.c,v
retrieving revision 1.5
diff -u -u -r1.5 gdbproxy.c
--- programs/winedbg/gdbproxy.c	23 Jan 2003 21:32:35 -0000	1.5
+++ programs/winedbg/gdbproxy.c	1 Feb 2003 10:48:14 -0000
 <at>  <at>  -791,7 +791,7  <at>  <at> 
         strcpy(buffer, "Running");
     }
     else

winedbg: maintenance

as announced, the rest of sprintf=>snprintf conversion
A+
-- 
Eric Pouech

Name:          wd_snprintf
ChangeLog:     translated sprintf calls into snprintf
License:       X11
GenDate:       2003/02/01 13:34:52 UTC
ModifiedFiles: programs/winedbg/ext_debugger.c programs/winedbg/hash.c
programs/winedbg/module.c programs/winedbg/source.c programs/winedbg/winedbg.c
AddedFiles:    
===================================================================
RCS file: /home/cvs/cvsroot/wine/wine/programs/winedbg/ext_debugger.c,v
retrieving revision 1.1
diff -u -u -r1.1 ext_debugger.c
--- programs/winedbg/ext_debugger.c	13 Sep 2002 17:54:28 -0000	1.1
+++ programs/winedbg/ext_debugger.c	1 Feb 2003 10:34:40 -0000
 <at>  <at>  -129,7 +129,7  <at>  <at> 
     memset(pid_string, 0, DBG_BUFF_SIZE);

     /* make pid into string */
-    sprintf(pid_string, "%ld", (long) attach_pid);
+    snprintf(pid_string, sizeof(pid_string), "%ld", (long) attach_pid);

     /* now exec the debugger to get it's own clean memory space */
     if (dbg_no_xterm)
Index: programs/winedbg/hash.c
===================================================================

[DINPUT] Ove's keyboard hook fix

Hi all,

This is just Ove's patch that applies cleanly to latest CVS which removes
the adding of the keyboard hook on DINPUT DLL loading.

Changelog:
  Ove Kaaven <ovek <at> transgaming.com>
  Only install the keyboard hook on device creation

-- 
		 Lionel Ulmer - http://www.bbrox.org/

--- ../wine_base/dlls/dinput/dinput_main.c	Sun Jan  5 23:59:00 2003
+++ dlls/dinput/dinput_main.c	Sat Feb  1 17:58:54 2003
 <at>  <at>  -58,10 +58,8  <at>  <at> 
     {
       case DLL_PROCESS_ATTACH:
         DINPUT_instance = inst;
-        keyboard_hook = SetWindowsHookExW( WH_KEYBOARD_LL, KeyboardCallback, inst, 0 );
         break;
       case DLL_PROCESS_DETACH:
-        UnhookWindowsHookEx(keyboard_hook);
         break;
     }
     return TRUE;
--- ../wine_base/dlls/dinput/dinput_private.h	Sun Jan  5 23:59:00 2003
+++ dlls/dinput/dinput_private.h	Sat Feb  1 17:59:08 2003
 <at>  <at>  -42,10 +42,6  <at>  <at> 

small ctl3d fix

I've finally found a bug which crashed Ultima IX at startup.

ChangeLog:
 - added debug messages
 - changed return of Ctl3dIsAutoSubclass from FALSE to TRUE

Re: remove <wineconf> from sample config

Ove Kaaven wrote:

 >
 > On Fri, 31 Jan 2003, Tony Lambregts wrote:
 >
 >> In order to be able to simply include the sample config file in the
 >> documnetation something has to be done about the lines #  <wineconf>
 >> and # </wineconf>. These are just comments and IFAICT can be safely
 >> removed.
 >
 >
 > Not exactly, they're markers used by tools/wineconf to mark the parts
 > that
 > should be copied into the generated config file, in addition to the
 > autogenerated drive config.
 >
 >
 >
OK. But as place holders they can be anything so how about this.

Change Log: Modify the wineconf tags so that the sample config can be 
included in the documentation.

Files Changed: documentation/config
                tools/wineconf

--

-- 

Tony Lambregts

Re: small ctl3d fix

"Rok Mandeljc" <rokmandeljc <at> hotmail.com> wrote:

> I've finally found a bug which crashed Ultima IX at startup.
> 
> ChangeLog:
>  - added debug messages
>  - changed return of Ctl3dIsAutoSubclass from FALSE to TRUE

Attached patch should fix the problem in a right way.

Changelog:
    Manage internal ctl3d auto subclass flag.

--

-- 
Dmitry.

diff -u cvs/hq/wine/dlls/ctl3d/ctl3d.c wine/dlls/ctl3d/ctl3d.c
--- cvs/hq/wine/dlls/ctl3d/ctl3d.c	Fri Jan  3 03:34:14 2003
+++ wine/dlls/ctl3d/ctl3d.c	Sun Feb  2 18:57:51 2003
 <at>  <at>  -21,13 +21,17  <at>  <at> 
 #include "wine/winbase16.h"
 #include "wine/winuser16.h"

+static BOOL16 CTL3D16_is_auto_subclass = FALSE;
+
 BOOL16 WINAPI Ctl3dAutoSubclass16(HINSTANCE16 hInst)
 {
+    CTL3D16_is_auto_subclass = TRUE;