Tue Jun 7 08:41:27 1994 Bob Amstadt (bob@pooh) * loader/selector.c (FixupFunctionPrologs): New function to fixup loaded DLL function prologs. It replaces the do nothing code with code that loads DS with the appropriate data segment for the DLL. * misc/cursor.c (LoadCursor): Disabled cursor loading from .EXE or .DLL. The code needs to handle the possibility of multiple cursors in a single directory. Also, it should check to see if the cursor is the right size. * objects/font.c (EnumFonts): Checked for lpLogFontList[i] == NULL * objects/gdiobj.c (SetObjectOwner): Removed stub. Replaced with simple return in gdi.spec. This function is not defined for the retail version of Windows. * memory/heap.c (WIN16_LocalHandleDelta): New function. This is really a dummy that imitates the proper return values. * loader/library.c (GetProcAddress): Fixed definition of IS_BUILTIN_DLL() macro. Mon Jun 6 18:15:40 1994 Bob Amstadt (bob@pooh) * miscemu/int21.c (SeekFile): Needed to return current position in DX:AX. * windows/utility.c (windows_wsprintf): Added support for '#' in format, and fixed bug with "ptr" being incremented too many times. * miscemu/int21.c (OpenExistingFile): Add code to handle opening files read-only and write-only. * loader/wine.c: Segment fixups now done in LoadImage instead of _WinMain. This is necessary to support LoadLibrary(). Sun Jun 5 17:34:24 1994 Erik Bos (erik@hacktic.nl) * [loader/*] - fixed: GetModuleHandle() sometimes returned a wrong handle. - don't init dlls when cs == 0 (lzexpand, doesn't seem to have a init function) - LoadLibrary & LoadImage now return error instead of stopping wine. - moved most of NE-functions into one file. - LoadLibrary() uses w_files list instead of its own list. - NE exectables are now fixed-up and initialised when loaded instead of only once before calling InitTask. * [miscemu/int15.c] [miscemu/int31.c] Added. * [loader/selector.c] Stubs added for {Get|Set}SelectorLimit(), {Get|Set}SelectorBase(). * [misc/main.c] Stub added for IsRomModule(). * [miscemu/int21.c] Some cleanup, added heap for returning data. Jun 6, 94 martin2@trgcorp.solucorp.qc.ca (Martin Ayotte) * [tools/build.c] Change MAX_ORDINALS define to higher value, 1299 entries. (MMSYSTEM doesn't have succesive numbers, some are around 1200). * [windows/utility.c] Bug fix in windows_wsprintf(), (twice increments ...). * [windows/winpos.c] Bug fix in SetWindowPos(), redraw was done if flag was set to SWP_NOREDRAW while SWP_SHOWWINDOW). * [misc/message.c] [controls/combo.c] Add an InvalidateRect() in WM_SHOWWINDOW to statisfy the new 'saveunder'. * [windows/win.c] In CreateWindowEx(), do SetMenu() calls after window creation, just before sending to WM_NCCALCSIZE. * [controls/menu.c] In function SetMenu(), now use SetWindowPos() with flags SWP_FRAMECHANGED to readjust menu area. Function MenuBarCalcSize() redone. Sun May 29 11:08:24 1994 David B. Thomas (dt@yenta.abq.nm.us) * [objects/text.c] Fixed problems associated with DT_WORDBREAK flag. String length was not being properly decremented when lines were folded, and wrapping was not performed when DT_NOCLIP and DT_NOPREFIX were both on in addition to DT_WORDBREAK. Windows does wrapping in this case, and now so does wine. Sun Jun 5 19:17:49 1994 Olaf Flebbe (olaf@dragon) * [edit.c] cp1 was uninitialized iff lineno == 0 * FindFile tests for existance of file even if a full filename was supplied. What about unix file names? * [controls/listbox ] wndPtr was uninitialized for LB_SETTOPINDEX * [misc/property.c] Do not free lpProp. Is it really allocated by malloc? {edited by Bob Amstadt: changed free() to GlobalFree()}
403 lines
10 KiB
C
403 lines
10 KiB
C
/* utility.c Utility functions for Wine
|
|
* Author: acb
|
|
* Commenced: 10-9-1993
|
|
*
|
|
* This unit contains the implementations of
|
|
* various Windows API functions that perform
|
|
* utility tasks; i.e., that do not fit into
|
|
* any major category but perform useful tasks.
|
|
*/
|
|
|
|
#include <stdio.h>
|
|
#include <stdarg.h>
|
|
#include <ctype.h>
|
|
#include <stdlib.h>
|
|
#include "windows.h"
|
|
|
|
static char Copyright[] = "Copyright Andrew C. Bulhak, 1993";
|
|
|
|
/*#define debug_utility*/
|
|
|
|
/* MulDiv is a simple function that may as well have been
|
|
* implemented as a macro; however Microsoft, in their infinite
|
|
* wisdom, have implemented it as a DLL function and therefore
|
|
* so should we.
|
|
* Basically, it takes two 16-bit integers, multiplies them
|
|
* and divides by a third integer.
|
|
*/
|
|
|
|
int MulDiv(int foo, int bar, int baz)
|
|
{
|
|
return (long)(((int)foo*bar)/baz);
|
|
};
|
|
|
|
/* UTILITY_strip015() removes \015 (^M, CR) from a string;
|
|
* this is done to convert a MS-DOS-style string to a more
|
|
* UNIX-friendly format. Replacement is done in-place.
|
|
*/
|
|
|
|
void UTILITY_strip015(char *dest) {
|
|
char *src = dest;
|
|
|
|
while(*src) {
|
|
while(*src == '\015') src++; /* Skip \015s */
|
|
while((*src) && (*src != '\015')) *(dest++) = *(src++);
|
|
};
|
|
*dest = '\0'; /* Add null terminator */
|
|
};
|
|
|
|
/**********************************************************************
|
|
* DebugPrintString
|
|
*/
|
|
int
|
|
DebugPrintString(char *str)
|
|
{
|
|
fprintf(stderr, "%s", str);
|
|
return 0;
|
|
}
|
|
|
|
/*
|
|
* OutputDebugString strips CRs from its (string) parameter and
|
|
* calls DebugPrintString(), which was written by someone else.
|
|
* Since this is part of the standard Windows API, it needs no
|
|
* references to nonstandard DLLs.
|
|
*/
|
|
|
|
void OutputDebugString(LPSTR foo)
|
|
{
|
|
UTILITY_strip015(foo);
|
|
DebugPrintString(foo);
|
|
};
|
|
|
|
/* UTILITY_qualify(source, dest) takes the format string source and
|
|
* changes all the parameters to correspond to Linux integer sizes
|
|
* rather than Windows sizes. For example, it converts %i to %hi
|
|
* and %lx to %x. No array size checking is done at present.
|
|
*/
|
|
|
|
static void UTILITY_qualify(const char *source, char *dest)
|
|
{
|
|
#ifdef debug_utility
|
|
fprintf(stderr, "UTILITY_qualify(\"%s\", \"%s\");\n", source, dest);
|
|
#endif
|
|
if(!source) return; /* Dumbass attack! */
|
|
while(*source) {
|
|
/* Find next format code. */
|
|
while((*source != '%') && (*source)) {
|
|
*(dest++) = *(source++);
|
|
}
|
|
/* Yeah, I know I shouldn't use gotos.... */
|
|
if (!(*source)) goto loop_end;
|
|
/* skip the '%' */
|
|
*(dest++) = *(source++);
|
|
/* Now insert a size qualifier, if needed. */
|
|
switch(*source) {
|
|
case 'i':
|
|
case 'd':
|
|
case 'x':
|
|
case 'X':
|
|
case 'u':
|
|
case 'o':
|
|
/* We have a 16-bit value here. */
|
|
*(dest++) = 'h';
|
|
break;
|
|
};
|
|
/* Here we go 'round the mulberry bush... */
|
|
loop_end:
|
|
};
|
|
*dest = '\0';
|
|
};
|
|
|
|
/* UTILITY_argsize() evaluates the size of the argument list that
|
|
* accompanies a vsprintf() or wvsprintf() call.
|
|
* Arguments:
|
|
* char *format; printf-style format string.
|
|
* BOOL windows; if this is TRUE, we assume that ints are
|
|
* 16 bits in size; otherwise we deal with
|
|
* 32-bit variables.
|
|
* Returns:
|
|
* size (in bytes) of the arguments that follow the call.
|
|
*/
|
|
|
|
size_t UTILITY_argsize(const char *format, BOOL windows)
|
|
{
|
|
size_t size = 0;
|
|
|
|
#define INT_SIZE (windows ? 2 : 4)
|
|
|
|
while(*format) {
|
|
while((*format) && (*format != '%')) format++; /* skip ahead */
|
|
if(*format) {
|
|
char modifier = ' ';
|
|
#ifdef debug_utility
|
|
fprintf(stderr, "found:\t\"%%");
|
|
#endif
|
|
format++; /* skip past '%' */
|
|
/* First skip the flags, field width, etc. */
|
|
/* First the flags */
|
|
if ((*format == '#') || (*format == '-') || (*format == '+')
|
|
|| (*format == ' ')) {
|
|
#ifdef debug_utility
|
|
fprintf(stderr, "%c", *format);
|
|
#endif
|
|
format++;
|
|
}
|
|
/* Now the field width, etc. */
|
|
while(isdigit(*format)) {
|
|
#ifdef debug_utility
|
|
fprintf(stderr, "%c", *format);
|
|
#endif
|
|
format++;
|
|
}
|
|
if(*format == '.') {
|
|
#ifdef debug_utility
|
|
fprintf(stderr, "%c", *format);
|
|
#endif
|
|
format++;
|
|
}
|
|
while(isdigit(*format)) {
|
|
#ifdef debug_utility
|
|
fprintf(stderr, "%c", *format);
|
|
#endif
|
|
format++;
|
|
}
|
|
/* Now we handle the rest */
|
|
if((*format == 'h') || (*format == 'l') || (*format == 'L')) {
|
|
#ifdef debug_utility
|
|
fprintf(stderr, "%c", modifier);
|
|
#endif
|
|
modifier = *(format++);
|
|
}
|
|
/* Handle the actual type. */
|
|
#ifdef debug_utility
|
|
fprintf(stderr, "%c\"\n", *format);
|
|
#endif
|
|
switch(*format) {
|
|
case 'd':
|
|
case 'i':
|
|
case 'o':
|
|
case 'x':
|
|
case 'X':
|
|
case 'u':
|
|
case 'c':
|
|
size += ((modifier == 'l') ? 4 : INT_SIZE);
|
|
break;
|
|
case 's': size += sizeof(char *); break;
|
|
case 'e':
|
|
case 'E':
|
|
case 'f':
|
|
case 'g':
|
|
case 'G':
|
|
/* It doesn't look as if Windows' wvsprintf()
|
|
supports floating-point arguments. However,
|
|
I'll leave this code here just in case. */
|
|
size += (modifier == 'L') ? sizeof(long double) : sizeof(double);
|
|
break;
|
|
case 'p': size += sizeof(void *); break;
|
|
case 'n': size += sizeof(int *); break;
|
|
};
|
|
};
|
|
};
|
|
#undef INT_SIZE
|
|
#ifdef debug_utility
|
|
fprintf(stderr, "UTILITY_argsize: returning %i\n", size);
|
|
#endif
|
|
return size;
|
|
};
|
|
|
|
/* UTILITY_convertArgs() creates a 32-bit argument list from a 16-bit list.
|
|
* This is used to allow wvsprintf() arguments to be fed through
|
|
* vsprintf().
|
|
*
|
|
* Arguments:
|
|
* char *fmt; format string
|
|
* char *winarg; Windows-style arguments
|
|
*
|
|
* Returns:
|
|
* malloc()ed pointer to new argument list. This should
|
|
* be free()d as soon as it is finished with.
|
|
*/
|
|
|
|
char *UTILITY_convertArgs(char *format, char *winarg)
|
|
{
|
|
char *result = (char *)malloc(UTILITY_argsize(format, 0));
|
|
char *rptr = result;
|
|
|
|
while(*format) {
|
|
while((*format) && (*format != '%')) format++; /* skip ahead */
|
|
if(*format) {
|
|
char modifier = ' ';
|
|
#ifdef debug_utility
|
|
fprintf(stderr, "found:\t\"%%");
|
|
#endif
|
|
format++; /* skip past '%' */
|
|
/* First skip the flags, field width, etc. */
|
|
/* First the flags */
|
|
if ((*format == '#') || (*format == '-') || (*format == '+')
|
|
|| (*format == ' ')) format++;
|
|
/* Now the field width, etc. */
|
|
while(isdigit(*format)) format++;
|
|
if(*format == '.') format++;
|
|
while(isdigit(*format)) format++;
|
|
/* Now we handle the rest */
|
|
if((*format == 'h') || (*format == 'l') || (*format == 'L'))
|
|
modifier = *(format++);
|
|
/* Handle the actual type. */
|
|
#ifdef debug_utility
|
|
fprintf(stderr, "%c\"\n", *format);
|
|
#endif
|
|
switch(*format) {
|
|
case 'd':
|
|
case 'i':
|
|
*(((int *)rptr)++) = (modifier=='l') ? *(((int *)winarg)++) : *(((short *)winarg)++);
|
|
break;
|
|
case 'o':
|
|
case 'x':
|
|
case 'X':
|
|
case 'u':
|
|
case 'c':
|
|
*(((unsigned int *)rptr)++) = (modifier=='l') ? *(((unsigned int *)winarg)++)
|
|
: *(((unsigned short *)winarg)++);
|
|
break;
|
|
case 's':
|
|
case 'p':
|
|
case 'n': /* A pointer, is a pointer, is a pointer... */
|
|
*(((char **)rptr)++) = *(((char **)winarg)++);
|
|
break;
|
|
case 'e':
|
|
case 'E':
|
|
case 'f':
|
|
case 'g':
|
|
case 'G':
|
|
/* It doesn't look as if Windows' wvsprintf()
|
|
supports floating-point arguments. However,
|
|
I'll leave this code here just in case. */
|
|
if(modifier=='L')
|
|
*(((long double *)rptr)++) = *(((long double *)winarg)++);
|
|
else *(((double *)rptr)++) = *(((double *)winarg)++);
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
return result;
|
|
};
|
|
|
|
#ifndef WINELIB
|
|
INT windows_wsprintf(BYTE *win_stack)
|
|
{
|
|
LPSTR lpOutput, lpFormat, ptr;
|
|
BYTE new_stack[1024], *stack_ptr;
|
|
|
|
lpOutput = (LPSTR) *(DWORD*)win_stack;
|
|
win_stack += 4;
|
|
lpFormat = (LPSTR) *(DWORD*)win_stack;
|
|
win_stack += 4;
|
|
|
|
/* create 32-bit stack for libc's vsprintf() */
|
|
|
|
for (ptr = lpFormat, stack_ptr = new_stack; *ptr; ptr++) {
|
|
if (*ptr != '%' || *++ptr == '%')
|
|
continue;
|
|
|
|
/* skip width/precision */
|
|
while (*ptr == '-' || *ptr == '+' || *ptr == '.' ||
|
|
*ptr == ' ' || isdigit(*ptr) || *ptr == '#')
|
|
ptr++;
|
|
|
|
switch (*ptr) {
|
|
case 's':
|
|
*(DWORD*)stack_ptr = *(DWORD*)win_stack;
|
|
stack_ptr += 4;
|
|
win_stack += 4;
|
|
break;
|
|
case 'l':
|
|
*(DWORD*)stack_ptr = *(DWORD*)win_stack;
|
|
stack_ptr += 4;
|
|
win_stack += 4;
|
|
ptr++; /* skip next type character */
|
|
break;
|
|
case 'c':
|
|
|
|
/* windows' wsprintf() %c ignores 0's, we replace 0 with SPACE to make sure
|
|
that the remaining part of the string isn't ignored by the winapp */
|
|
|
|
if (*(WORD*)win_stack)
|
|
*(DWORD*)stack_ptr = *(WORD*)win_stack;
|
|
else
|
|
*(DWORD*)stack_ptr = ' ';
|
|
stack_ptr += 4;
|
|
win_stack += 2;
|
|
break;
|
|
case 'd':
|
|
case 'i':
|
|
*(int*)stack_ptr = *(INT*)win_stack;
|
|
stack_ptr += 4;
|
|
win_stack += 2;
|
|
break;
|
|
case 'u':
|
|
case 'x':
|
|
case 'X':
|
|
*(DWORD*)stack_ptr = *(WORD*)win_stack;
|
|
stack_ptr += 4;
|
|
win_stack += 2;
|
|
break;
|
|
default:
|
|
*(DWORD*)stack_ptr = 0;
|
|
stack_ptr += 4;
|
|
win_stack += 4;
|
|
fprintf(stderr, "wsprintf: oops, unknown formattype %c used!\n", *ptr);
|
|
break;
|
|
}
|
|
}
|
|
|
|
return vsprintf(lpOutput, lpFormat, new_stack);
|
|
}
|
|
#endif
|
|
|
|
/**************************************************************************
|
|
* wsprintf [USER.420] (not used by relay)
|
|
*/
|
|
int wsprintf(LPSTR lpOutput, LPSTR lpFormat, ...)
|
|
{
|
|
va_list valist;
|
|
int ArgCnt;
|
|
|
|
va_start(valist, lpFormat);
|
|
ArgCnt = vsprintf(lpOutput, lpFormat, valist);
|
|
va_end(valist);
|
|
|
|
return ArgCnt;
|
|
}
|
|
|
|
|
|
/* wvsprintf() is an implementation of vsprintf(). This
|
|
* implementation converts the arguments to 32-bit integers and
|
|
* calls the standard library function vsprintf().
|
|
*
|
|
* Known shortcomings:
|
|
* wvsprintf() doesn't yet convert the arguments back after
|
|
* calling vsprintf(), so if Windows implements %n and a
|
|
* program depends on it, we're in trouble.
|
|
*/
|
|
|
|
int wvsprintf(LPSTR buf, LPSTR format, LPSTR args)
|
|
{
|
|
char qualified_fmt[1536];
|
|
char *newargs;
|
|
int result;
|
|
|
|
/* 1.5K is a safe value as wvsprintf can only handle buffers up to
|
|
1K and in a worst case such a buffer would look like "%i%i%i..." */
|
|
|
|
if(!buf || !format) return 0;
|
|
|
|
/* Change the format string so that ints are handled as short by
|
|
default */
|
|
|
|
/* Convert agruments to 32-bit values */
|
|
newargs = UTILITY_convertArgs(format, args);
|
|
result = vsprintf(buf, qualified_fmt, newargs);
|
|
|
|
free(newargs);
|
|
return result;
|
|
};
|