January 2009 - Wine-commits

Rob Shearman : widl: Make the case of messages output by warning and error functions consistent .
by Alexandre Julliard 07 Jan '09

07 Jan '09

Module: wine Branch: master Commit: 1d8dbeff9a1ee63b3e6aad038b9fc3cb8d423276 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d8dbeff9a1ee63b3e6aad038… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Wed Jan 7 11:43:47 2009 +0000 widl: Make the case of messages output by warning and error functions consistent. Standardise on lower case "warning" and "error", since they match the case of what gcc prints. --- tools/widl/utils.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/widl/utils.c b/tools/widl/utils.c index 2e05add..6547774 100644 --- a/tools/widl/utils.c +++ b/tools/widl/utils.c @@ -71,7 +71,7 @@ void error_loc(const char *s, ...) loc_info_t cur_loc = CURRENT_LOCATION; va_list ap; va_start(ap, s); - generic_msg(&cur_loc, s, "Error", ap); + generic_msg(&cur_loc, s, "error", ap); va_end(ap); exit(1); } @@ -86,7 +86,7 @@ void error_loc_info(const loc_info_t *loc_info, const char *s, ...) { va_list ap; va_start(ap, s); - generic_msg(loc_info, s, "Error", ap); + generic_msg(loc_info, s, "error", ap); va_end(ap); exit(1); } @@ -96,7 +96,7 @@ int parser_warning(const char *s, ...) loc_info_t cur_loc = CURRENT_LOCATION; va_list ap; va_start(ap, s); - generic_msg(&cur_loc, s, "Warning", ap); + generic_msg(&cur_loc, s, "warning", ap); va_end(ap); return 0; } @@ -124,7 +124,7 @@ void warning_loc_info(const loc_info_t *loc_info, const char *s, ...) { va_list ap; va_start(ap, s); - generic_msg(loc_info, s, "Warning", ap); + generic_msg(loc_info, s, "warning", ap); va_end(ap); }

1 0

Hans Leidekker : qmgr: Improve a couple of stubs.
by Alexandre Julliard 07 Jan '09

07 Jan '09

Module: wine Branch: master Commit: 0184dea2d4f4d32de6b397be686e416e8aef2f47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0184dea2d4f4d32de6b397be6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 7 13:22:19 2009 +0100 qmgr: Improve a couple of stubs. --- dlls/qmgr/job.c | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/qmgr/job.c b/dlls/qmgr/job.c index 871f14c..a82b39f 100644 --- a/dlls/qmgr/job.c +++ b/dlls/qmgr/job.c @@ -382,32 +382,34 @@ static HRESULT WINAPI BITS_IBackgroundCopyJob_SetMinimumRetryDelay( IBackgroundCopyJob2 *iface, ULONG Seconds) { - FIXME("Not implemented\n"); - return E_NOTIMPL; + FIXME("%u\n", Seconds); + return S_OK; } static HRESULT WINAPI BITS_IBackgroundCopyJob_GetMinimumRetryDelay( IBackgroundCopyJob2 *iface, ULONG *Seconds) { - FIXME("Not implemented\n"); - return E_NOTIMPL; + FIXME("%p\n", Seconds); + *Seconds = 30; + return S_OK; } static HRESULT WINAPI BITS_IBackgroundCopyJob_SetNoProgressTimeout( IBackgroundCopyJob2 *iface, ULONG Seconds) { - FIXME("Not implemented\n"); - return E_NOTIMPL; + FIXME("%u\n", Seconds); + return S_OK; } static HRESULT WINAPI BITS_IBackgroundCopyJob_GetNoProgressTimeout( IBackgroundCopyJob2 *iface, ULONG *Seconds) { - FIXME("Not implemented\n"); - return E_NOTIMPL; + FIXME("%p\n", Seconds); + *Seconds = 900; + return S_OK; } static HRESULT WINAPI BITS_IBackgroundCopyJob_GetErrorCount(

1 0

Francois Gouget : dnsapi: dns_ns_name_pton() is unused so remove it.
by Alexandre Julliard 07 Jan '09

07 Jan '09

Module: wine Branch: master Commit: dfefbd12003c1938615411f7e966d22400674c49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfefbd12003c1938615411f7e… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jan 7 12:41:44 2009 +0100 dnsapi: dns_ns_name_pton() is unused so remove it. --- dlls/dnsapi/ns_name.c | 129 ------------------------------------------------- 1 files changed, 0 insertions(+), 129 deletions(-) diff --git a/dlls/dnsapi/ns_name.c b/dlls/dnsapi/ns_name.c index 9822578..c8e8187 100644 --- a/dlls/dnsapi/ns_name.c +++ b/dlls/dnsapi/ns_name.c @@ -140,135 +140,6 @@ dns_ns_name_ntop(const u_char *src, char *dst, size_t dstsiz) { return (dn - dst); } -/* - * dns_ns_name_pton(src, dst, dstsiz) - * Convert a ascii string into an encoded domain name as per RFC1035. - * return: - * -1 if it fails - * 1 if string was fully qualified - * 0 is string was not fully qualified - * notes: - * Enforces label and domain length limits. - */ - -int -dns_ns_name_pton(const char *src, u_char *dst, size_t dstsiz) { - u_char *label, *bp, *eom; - int c, n, escaped; - char *cp; - - escaped = 0; - bp = dst; - eom = dst + dstsiz; - label = bp++; - - while ((c = *src++) != 0) { - if (escaped) { - if ((cp = strchr(digits, c)) != NULL) { - n = (cp - digits) * 100; - if ((c = *src++) == 0 || - (cp = strchr(digits, c)) == NULL) { - return (-1); - } - n += (cp - digits) * 10; - if ((c = *src++) == 0 || - (cp = strchr(digits, c)) == NULL) { - return (-1); - } - n += (cp - digits); - if (n > 255) { - return (-1); - } - c = n; - } else if (c == '[' && label == bp - 1 && *src == 'x') { - /* Theoretically we would have to handle \[o - as well but we do not since we do not need - it internally. */ - *label = 0x41; - label = bp++; - ++src; - while (isxdigit (*src)) { - n = *src > '9' ? *src - 'a' + 10 : *src - '0'; - ++src; - if (! isxdigit(*src)) { - return (-1); - } - n <<= 4; - n += *src > '9' ? *src - 'a' + 10 : *src - '0'; - if (bp + 1 >= eom) { - return (-1); - } - *bp++ = n; - ++src; - } - *label = (bp - label - 1) * 8; - if (*src++ != ']' || *src++ != '.') { - return (-1); - } - escaped = 0; - label = bp++; - if (bp >= eom) { - return (-1); - } - continue; - } - escaped = 0; - } else if (c == '\\') { - escaped = 1; - continue; - } else if (c == '.') { - c = (bp - label - 1); - if ((c & NS_CMPRSFLGS) != 0) { /* Label too big. */ - return (-1); - } - if (label >= eom) { - return (-1); - } - *label = c; - /* Fully qualified ? */ - if (*src == '\0') { - if (c != 0) { - if (bp >= eom) { - return (-1); - } - *bp++ = '\0'; - } - if ((bp - dst) > NS_MAXCDNAME) { - return (-1); - } - return (1); - } - if (c == 0 || *src == '.') { - return (-1); - } - label = bp++; - continue; - } - if (bp >= eom) { - return (-1); - } - *bp++ = (u_char)c; - } - c = (bp - label - 1); - if ((c & NS_CMPRSFLGS) != 0) { /* Label too big. */ - return (-1); - } - if (label >= eom) { - return (-1); - } - *label = c; - if (c != 0) { - if (bp >= eom) { - return (-1); - } - *bp++ = 0; - } - if ((bp - dst) > NS_MAXCDNAME) { /* src too big */ - return (-1); - } - return (0); -} - /* * dns_ns_name_unpack(msg, eom, src, dst, dstsiz)

1 0

Francois Gouget : dnsapi: Reorder a couple of functions to avoid forward declarations.
by Alexandre Julliard 07 Jan '09

07 Jan '09

Module: wine Branch: master Commit: a9597698a8916ec0d66660db57f232b62daa9cd2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9597698a8916ec0d66660db5… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jan 7 12:45:00 2009 +0100 dnsapi: Reorder a couple of functions to avoid forward declarations. --- dlls/dnsapi/ns_name.c | 75 +++++++++++++++++++++++-------------------------- 1 files changed, 35 insertions(+), 40 deletions(-) diff --git a/dlls/dnsapi/ns_name.c b/dlls/dnsapi/ns_name.c index c8e8187..994aef9 100644 --- a/dlls/dnsapi/ns_name.c +++ b/dlls/dnsapi/ns_name.c @@ -39,10 +39,42 @@ static const char digits[] = "0123456789"; -/* Forward. */ +/* Private. */ + +/* + * special(ch) + * Thinking in noninternationalized USASCII (per the DNS spec), + * is this character special ("in need of quoting") ? + * return: + * boolean. + */ +static int +special(int ch) { + switch (ch) { + case 0x22: /* '"' */ + case 0x2E: /* '.' */ + case 0x3B: /* ';' */ + case 0x5C: /* '\\' */ + /* Special modifiers in zone files. */ + case 0x40: /* '@' */ + case 0x24: /* '$' */ + return (1); + default: + return (0); + } +} -static int special(int); -static int printable(int); +/* + * printable(ch) + * Thinking in noninternationalized USASCII (per the DNS spec), + * is this character visible and not a space when printed ? + * return: + * boolean. + */ +static int +printable(int ch) { + return (ch > 0x20 && ch < 0x7f); +} /* Public. */ @@ -278,41 +310,4 @@ dns_ns_name_skip(const u_char **ptrptr, const u_char *eom) { return (0); } -/* Private. */ - -/* - * special(ch) - * Thinking in noninternationalized USASCII (per the DNS spec), - * is this character special ("in need of quoting") ? - * return: - * boolean. - */ -static int -special(int ch) { - switch (ch) { - case 0x22: /* '"' */ - case 0x2E: /* '.' */ - case 0x3B: /* ';' */ - case 0x5C: /* '\\' */ - /* Special modifiers in zone files. */ - case 0x40: /* '@' */ - case 0x24: /* '$' */ - return (1); - default: - return (0); - } -} - -/* - * printable(ch) - * Thinking in noninternationalized USASCII (per the DNS spec), - * is this character visible and not a space when printed ? - * return: - * boolean. - */ -static int -printable(int ch) { - return (ch > 0x20 && ch < 0x7f); -} - #endif /* HAVE_RESOLV */

1 0

Francois Gouget : d3dxof: Reorder some functions to avoid forward declarations.
by Alexandre Julliard 07 Jan '09

07 Jan '09

Module: wine Branch: master Commit: e30bb829b39f07bbabca0d73158d5fade79f39b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e30bb829b39f07bbabca0d731… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jan 7 12:35:08 2009 +0100 d3dxof: Reorder some functions to avoid forward declarations. --- dlls/d3dxof/parsing.c | 83 +++++++++++++++++++++++------------------------- 1 files changed, 40 insertions(+), 43 deletions(-) diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index 06a1385..d4c71d1 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -36,10 +36,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3dxof); -static const char* get_primitive_string(WORD token); -static BOOL parse_object_parts(parse_buffer * buf, BOOL allow_optional); -static WORD check_TOKEN(parse_buffer * buf); - #define TOKEN_NAME 1 #define TOKEN_STRING 2 #define TOKEN_INTEGER 3 @@ -74,6 +70,40 @@ static WORD check_TOKEN(parse_buffer * buf); #define CLSIDFMT "<%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X>" +static const char* get_primitive_string(WORD token) +{ + switch(token) + { + case TOKEN_WORD: + return "WORD"; + case TOKEN_DWORD: + return "DWORD"; + case TOKEN_FLOAT: + return "FLOAT"; + case TOKEN_DOUBLE: + return "DOUBLE"; + case TOKEN_CHAR: + return "CHAR"; + case TOKEN_UCHAR: + return "UCHAR"; + case TOKEN_SWORD: + return "SWORD"; + case TOKEN_SDWORD: + return "SDWORD"; + case TOKEN_VOID: + return "VOID"; + case TOKEN_LPSTR: + return "STRING"; + case TOKEN_UNICODE: + return "UNICODE"; + case TOKEN_CSTRING: + return "CSTRING "; + default: + break; + } + return NULL; +} + void dump_template(xtemplate* templates_array, xtemplate* ptemplate) { int j, k; @@ -115,11 +145,6 @@ void dump_template(xtemplate* templates_array, xtemplate* ptemplate) DPRINTF("}\n"); } -BOOL is_template_available(parse_buffer * buf) -{ - return check_TOKEN(buf) == TOKEN_TEMPLATE; -} - BOOL read_bytes(parse_buffer * buf, LPVOID data, DWORD size) { if (buf->rem_bytes < size) @@ -683,40 +708,6 @@ static WORD parse_TOKEN(parse_buffer * buf) return token; } -static const char* get_primitive_string(WORD token) -{ - switch(token) - { - case TOKEN_WORD: - return "WORD"; - case TOKEN_DWORD: - return "DWORD"; - case TOKEN_FLOAT: - return "FLOAT"; - case TOKEN_DOUBLE: - return "DOUBLE"; - case TOKEN_CHAR: - return "CHAR"; - case TOKEN_UCHAR: - return "UCHAR"; - case TOKEN_SWORD: - return "SWORD"; - case TOKEN_SDWORD: - return "SDWORD"; - case TOKEN_VOID: - return "VOID"; - case TOKEN_LPSTR: - return "STRING"; - case TOKEN_UNICODE: - return "UNICODE"; - case TOKEN_CSTRING: - return "CSTRING "; - default: - break; - } - return NULL; -} - static WORD get_TOKEN(parse_buffer * buf) { if (buf->token_present) @@ -741,6 +732,11 @@ static WORD check_TOKEN(parse_buffer * buf) return buf->current_token; } +BOOL is_template_available(parse_buffer * buf) +{ + return check_TOKEN(buf) == TOKEN_TEMPLATE; +} + static inline BOOL is_primitive_type(WORD token) { BOOL ret; @@ -984,6 +980,7 @@ BOOL parse_template(parse_buffer * buf) return TRUE; } +static BOOL parse_object_parts(parse_buffer * buf, BOOL allow_optional); static BOOL parse_object_members_list(parse_buffer * buf) { DWORD token;

1 0

Francois Gouget : view: Make FileIsPlaceable() and GetPlaceableMetaFile() static.
by Alexandre Julliard 07 Jan '09

07 Jan '09

Module: wine Branch: master Commit: 8d771576cff610973de6d107badb416c98e05240 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d771576cff610973de6d107b… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jan 7 12:35:16 2009 +0100 view: Make FileIsPlaceable() and GetPlaceableMetaFile() static. --- programs/view/view.c | 161 ++++++++++++++++++++++++------------------------- 1 files changed, 79 insertions(+), 82 deletions(-) diff --git a/programs/view/view.c b/programs/view/view.c index 0a5497d..e28901d 100644 --- a/programs/view/view.c +++ b/programs/view/view.c @@ -23,9 +23,6 @@ #include "globals.h" #include <stdio.h> -BOOL FileIsPlaceable( LPCSTR szFileName ); -HMETAFILE GetPlaceableMetaFile( HWND hwnd, LPCSTR szFileName ); - HMETAFILE hmf; int deltax = 0, deltay = 0; int width = 0, height = 0; @@ -46,6 +43,85 @@ static BOOL FileOpen(HWND hWnd, char *fn, int fnsz) return GetOpenFileName(&ofn); } +static BOOL FileIsPlaceable( LPCSTR szFileName ) +{ + HFILE hInFile; + APMFILEHEADER apmh; + + if( (hInFile = _lopen( szFileName, OF_READ ) ) == HFILE_ERROR ) + return FALSE; + + if( _lread( hInFile, &apmh, sizeof(APMFILEHEADER) ) + != sizeof(APMFILEHEADER) ) + { + _lclose( hInFile ); + return FALSE; + } + _lclose( hInFile ); + + /* Is it placeable? */ + return (apmh.key == APMHEADER_KEY); +} + +static HMETAFILE GetPlaceableMetaFile( HWND hwnd, LPCSTR szFileName ) +{ + LPBYTE lpData; + METAHEADER mfHeader; + APMFILEHEADER APMHeader; + HFILE fh; + HMETAFILE hmf; + WORD checksum, *p; + HDC hdc; + int i; + + if( (fh = _lopen( szFileName, OF_READ ) ) == HFILE_ERROR ) return 0; + _llseek(fh, 0, 0); + if (!_lread(fh, (LPSTR)&APMHeader, sizeof(APMFILEHEADER))) return 0; + _llseek(fh, sizeof(APMFILEHEADER), 0); + checksum = 0; + p = (WORD *) &APMHeader; + + for(i=0; i<10; i++) + checksum ^= *p++; + if (checksum != APMHeader.checksum) { + char msg[128]; + sprintf(msg, "Computed checksum %04x != stored checksum %04x\n", + checksum, APMHeader.checksum); + MessageBox(hwnd, msg, "Checksum failed", MB_OK); + return 0; + } + + if (!_lread(fh, (LPSTR)&mfHeader, sizeof(METAHEADER))) return 0; + + if (!(lpData = GlobalAlloc(GPTR, (mfHeader.mtSize * 2L)))) return 0; + + _llseek(fh, sizeof(APMFILEHEADER), 0); + if (!_lread(fh, lpData, (UINT)(mfHeader.mtSize * 2L))) + { + GlobalFree((HGLOBAL)lpData); + _lclose(fh); + return 0; + } + _lclose(fh); + + if (!(hmf = SetMetaFileBitsEx(mfHeader.mtSize*2, lpData))) + return 0; + + + width = APMHeader.bbox.Right - APMHeader.bbox.Left; + height = APMHeader.bbox.Bottom - APMHeader.bbox.Top; + + /* printf("Ok! width %d height %d inch %d\n", width, height, APMHeader.inch); */ + hdc = GetDC(hwnd); + width = width * GetDeviceCaps(hdc, LOGPIXELSX)/APMHeader.inch; + height = height * GetDeviceCaps(hdc,LOGPIXELSY)/APMHeader.inch; + ReleaseDC(hwnd, hdc); + + deltax = 0; + deltay = 0 ; + return hmf; +} + LRESULT CALLBACK WndProc(HWND hwnd, UINT uMessage, @@ -137,82 +213,3 @@ LRESULT CALLBACK WndProc(HWND hwnd, } return 0; } - -BOOL FileIsPlaceable( LPCSTR szFileName ) -{ - HFILE hInFile; - APMFILEHEADER apmh; - - if( (hInFile = _lopen( szFileName, OF_READ ) ) == HFILE_ERROR ) - return FALSE; - - if( _lread( hInFile, &apmh, sizeof(APMFILEHEADER) ) - != sizeof(APMFILEHEADER) ) - { - _lclose( hInFile ); - return FALSE; - } - _lclose( hInFile ); - - /* Is it placeable? */ - return (apmh.key == APMHEADER_KEY); -} - -HMETAFILE GetPlaceableMetaFile( HWND hwnd, LPCSTR szFileName ) -{ - LPBYTE lpData; - METAHEADER mfHeader; - APMFILEHEADER APMHeader; - HFILE fh; - HMETAFILE hmf; - WORD checksum, *p; - HDC hdc; - int i; - - if( (fh = _lopen( szFileName, OF_READ ) ) == HFILE_ERROR ) return 0; - _llseek(fh, 0, 0); - if (!_lread(fh, (LPSTR)&APMHeader, sizeof(APMFILEHEADER))) return 0; - _llseek(fh, sizeof(APMFILEHEADER), 0); - checksum = 0; - p = (WORD *) &APMHeader; - - for(i=0; i<10; i++) - checksum ^= *p++; - if (checksum != APMHeader.checksum) { - char msg[128]; - sprintf(msg, "Computed checksum %04x != stored checksum %04x\n", - checksum, APMHeader.checksum); - MessageBox(hwnd, msg, "Checksum failed", MB_OK); - return 0; - } - - if (!_lread(fh, (LPSTR)&mfHeader, sizeof(METAHEADER))) return 0; - - if (!(lpData = GlobalAlloc(GPTR, (mfHeader.mtSize * 2L)))) return 0; - - _llseek(fh, sizeof(APMFILEHEADER), 0); - if (!_lread(fh, lpData, (UINT)(mfHeader.mtSize * 2L))) - { - GlobalFree((HGLOBAL)lpData); - _lclose(fh); - return 0; - } - _lclose(fh); - - if (!(hmf = SetMetaFileBitsEx(mfHeader.mtSize*2, lpData))) - return 0; - - - width = APMHeader.bbox.Right - APMHeader.bbox.Left; - height = APMHeader.bbox.Bottom - APMHeader.bbox.Top; - - /* printf("Ok! width %d height %d inch %d\n", width, height, APMHeader.inch); */ - hdc = GetDC(hwnd); - width = width * GetDeviceCaps(hdc, LOGPIXELSX)/APMHeader.inch; - height = height * GetDeviceCaps(hdc,LOGPIXELSY)/APMHeader.inch; - ReleaseDC(hwnd, hdc); - - deltax = 0; - deltay = 0 ; - return hmf; -}

1 0

Francois Gouget : quartz: Reorder some functions to avoid forward declarations.
by Alexandre Julliard 07 Jan '09

07 Jan '09

Module: wine Branch: master Commit: 5b92b39b2cabae21a3fb3e5ee5b77ddce292afd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b92b39b2cabae21a3fb3e5ee… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jan 7 12:35:31 2009 +0100 quartz: Reorder some functions to avoid forward declarations. --- dlls/quartz/pin.c | 413 +++++++++++++++++++++++++++-------------------------- dlls/quartz/pin.h | 13 -- 2 files changed, 209 insertions(+), 217 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5b92b39b2cabae21a3fb3…

1 0

Francois Gouget : w32skrnl: _GetThunkBuff() is unused so remove it.
by Alexandre Julliard 07 Jan '09

07 Jan '09

Module: wine Branch: master Commit: cbe5d8e4944531554c2a266c4b1fe72b4bf0866d URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbe5d8e4944531554c2a266c4… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jan 7 12:40:13 2009 +0100 w32skrnl: _GetThunkBuff() is unused so remove it. --- dlls/w32skrnl/w32skernel.c | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-) diff --git a/dlls/w32skrnl/w32skernel.c b/dlls/w32skrnl/w32skernel.c index 988a47e..761d353 100644 --- a/dlls/w32skrnl/w32skernel.c +++ b/dlls/w32skrnl/w32skernel.c @@ -41,16 +41,6 @@ LPSTR WINAPI GetWin32sDirectory(void) } /*********************************************************************** - * _GetThunkBuff - * FIXME: ??? - */ -SEGPTR WINAPI _GetThunkBuff(void) -{ - return 0; -} - - -/*********************************************************************** * GetCurrentTask32 (W32SKRNL.3) */ HTASK16 WINAPI GetCurrentTask32(void)

1 0

Francois Gouget : winedos: VGA_SetQuadPalette() is unused so remove it.
by Alexandre Julliard 07 Jan '09

07 Jan '09

Module: wine Branch: master Commit: d27010511cc603f49abceb9f39f0f54b8476fb57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d27010511cc603f49abceb9f3… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jan 7 12:34:45 2009 +0100 winedos: VGA_SetQuadPalette() is unused so remove it. --- dlls/winedos/vga.c | 15 --------------- dlls/winedos/vga.h | 1 - 2 files changed, 0 insertions(+), 16 deletions(-) diff --git a/dlls/winedos/vga.c b/dlls/winedos/vga.c index f4cf276..6f71cf5 100644 --- a/dlls/winedos/vga.c +++ b/dlls/winedos/vga.c @@ -929,21 +929,6 @@ void VGA_Get16Palette(char *Table) memcpy( vga_16_palette, Table, 17 ); /* copy the entries into the table */ } -void VGA_SetQuadPalette(RGBQUAD*color,int start,int len) -{ - PALETTEENTRY pal[256]; - int c; - - if (!lpddraw) return; - for (c=0; c<len; c++) { - pal[c].peRed =color[c].rgbRed; - pal[c].peGreen=color[c].rgbGreen; - pal[c].peBlue =color[c].rgbBlue; - pal[c].peFlags=0; - } - IDirectDrawPalette_SetEntries(lpddpal,0,start,len,pal); -} - static LPSTR VGA_Lock(unsigned*Pitch,unsigned*Height,unsigned*Width,unsigned*Depth) { if (!lpddraw) return NULL; diff --git a/dlls/winedos/vga.h b/dlls/winedos/vga.h index cee6d49..2cd465b 100644 --- a/dlls/winedos/vga.h +++ b/dlls/winedos/vga.h @@ -35,7 +35,6 @@ void VGA_SetColor16(int reg,int color); char VGA_GetColor16(int reg); void VGA_Set16Palette(char *Table); void VGA_Get16Palette(char *Table); -void VGA_SetQuadPalette(RGBQUAD*color,int start,int len); void VGA_SetWindowStart(int start); int VGA_GetWindowStart(void); void VGA_ShowMouse(BOOL show);

1 0

Francois Gouget : winedos: Remove unused functions from devices.c.
by Alexandre Julliard 07 Jan '09

07 Jan '09

Module: wine Branch: master Commit: 7bf39d4b1433115c4834fda281cd639ea66efe88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bf39d4b1433115c4834fda28… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jan 7 12:29:47 2009 +0100 winedos: Remove unused functions from devices.c. --- dlls/winedos/devices.c | 134 ------------------------------------------------ dlls/winedos/dosexe.h | 7 --- 2 files changed, 0 insertions(+), 141 deletions(-) diff --git a/dlls/winedos/devices.c b/dlls/winedos/devices.c index 0ee6f6c..44bafbe 100644 --- a/dlls/winedos/devices.c +++ b/dlls/winedos/devices.c @@ -476,140 +476,6 @@ void DOSDEV_InstallDOSDevices(void) dataseg->lol.ptr_CON_dev_hdr = MAKESEGPTR(seg, DOS_DATASEG_OFF(dev[0])); } -DWORD DOSDEV_Console(void) -{ - return DOSMEM_LOL()->ptr_CON_dev_hdr; -} - -DWORD DOSDEV_FindCharDevice(char*name) -{ - SEGPTR cur_ptr = MAKESEGPTR(HIWORD(DOS_LOLSeg), FIELD_OFFSET(DOS_LISTOFLISTS,NUL_dev)); - DOS_DEVICE_HEADER *cur = PTR_REAL_TO_LIN(SELECTOROF(cur_ptr),OFFSETOF(cur_ptr)); - char dname[8]; - int cnt; - - /* get first 8 characters */ - /* if less than 8 characters, pad with spaces */ - for (cnt=0; name[cnt] && cnt<8; cnt++) - dname[cnt]=name[cnt]; - - while(cnt<8) dname[cnt++] = ' '; - - /* search for char devices with the right name */ - while (cur && - ((!(cur->attr & ATTR_CHAR)) || - memcmp(cur->name,dname,8))) { - cur_ptr = cur->next_dev; - if (cur_ptr == NONEXT) cur=NULL; - else cur = PTR_REAL_TO_LIN(SELECTOROF(cur_ptr),OFFSETOF(cur_ptr)); - } - return cur_ptr; -} - -static void DOSDEV_DoReq(void*req, DWORD dev) -{ - REQUEST_HEADER *hdr = (REQUEST_HEADER *)req; - DOS_DEVICE_HEADER *dhdr; - CONTEXT86 ctx; - char *phdr; - - dhdr = PTR_REAL_TO_LIN(SELECTOROF(dev),OFFSETOF(dev)); - phdr = ((char*)DOSMEM_LOL()) + DOS_DATASEG_OFF(req); - - /* copy request to request scratch area */ - memcpy(phdr, req, hdr->size); - - /* prepare to call device driver */ - memset(&ctx, 0, sizeof(ctx)); - ctx.EFlags |= V86_FLAG; - - /* ES:BX points to request for strategy routine */ - ctx.SegEs = HIWORD(DOS_LOLSeg); - ctx.Ebx = DOS_DATASEG_OFF(req); - - /* call strategy routine */ - ctx.SegCs = SELECTOROF(dev); - ctx.Eip = dhdr->strategy; - DPMI_CallRMProc(&ctx, 0, 0, 0); - - /* call interrupt routine */ - ctx.SegCs = SELECTOROF(dev); - ctx.Eip = dhdr->interrupt; - DPMI_CallRMProc(&ctx, 0, 0, 0); - - /* completed, copy request back */ - memcpy(req, phdr, hdr->size); - - if (hdr->status & STAT_ERROR) { - switch (hdr->status & STAT_MASK) { - case 0x0F: /* invalid disk change */ - /* this error seems to fit the bill */ - SetLastError(ERROR_NOT_SAME_DEVICE); - break; - default: - SetLastError((hdr->status & STAT_MASK) + 0x13); - break; - } - } -} - -static int DOSDEV_IO(unsigned cmd, DWORD dev, DWORD buf, int buflen) -{ - REQ_IO req; - - req.hdr.size=sizeof(req); - req.hdr.unit=0; /* not dealing with block devices yet */ - req.hdr.command=cmd; - req.hdr.status=STAT_BUSY; - req.media=0; /* not dealing with block devices yet */ - req.buffer=buf; - req.count=buflen; - req.sector=0; /* block devices */ - req.volume=0; /* block devices */ - - DOSDEV_DoReq(&req, dev); - - return req.count; -} - -int DOSDEV_Peek(DWORD dev, BYTE*data) -{ - REQ_SAFEINPUT req; - - req.hdr.size=sizeof(req); - req.hdr.unit=0; /* not dealing with block devices yet */ - req.hdr.command=CMD_SAFEINPUT; - req.hdr.status=STAT_BUSY; - req.data=0; - - DOSDEV_DoReq(&req, dev); - - if (req.hdr.status & STAT_BUSY) return 0; - - *data = req.data; - return 1; -} - -int DOSDEV_Read(DWORD dev, DWORD buf, int buflen) -{ - return DOSDEV_IO(CMD_INPUT, dev, buf, buflen); -} - -int DOSDEV_Write(DWORD dev, DWORD buf, int buflen, int verify) -{ - return DOSDEV_IO(verify?CMD_SAFEOUTPUT:CMD_OUTPUT, dev, buf, buflen); -} - -int DOSDEV_IoctlRead(DWORD dev, DWORD buf, int buflen) -{ - return DOSDEV_IO(CMD_INIOCTL, dev, buf, buflen); -} - -int DOSDEV_IoctlWrite(DWORD dev, DWORD buf, int buflen) -{ - return DOSDEV_IO(CMD_OUTIOCTL, dev, buf, buflen); -} - void DOSDEV_SetSharingRetry(WORD delay, WORD count) { DOSMEM_LOL()->sharing_retry_delay = delay; diff --git a/dlls/winedos/dosexe.h b/dlls/winedos/dosexe.h index 2a20de7..2ba0735 100644 --- a/dlls/winedos/dosexe.h +++ b/dlls/winedos/dosexe.h @@ -368,13 +368,6 @@ extern UINT WINAPI DOSVM_GetTimer( void ); extern void DOSDEV_InstallDOSDevices(void); extern void DOSDEV_SetupDevice(const WINEDEV * devinfo, WORD seg, WORD off_dev, WORD off_thunk); -extern DWORD DOSDEV_Console(void); -extern DWORD DOSDEV_FindCharDevice(char*name); -extern int DOSDEV_Peek(DWORD dev, BYTE*data); -extern int DOSDEV_Read(DWORD dev, DWORD buf, int buflen); -extern int DOSDEV_Write(DWORD dev, DWORD buf, int buflen, int verify); -extern int DOSDEV_IoctlRead(DWORD dev, DWORD buf, int buflen); -extern int DOSDEV_IoctlWrite(DWORD dev, DWORD buf, int buflen); extern void DOSDEV_SetSharingRetry(WORD delay, WORD count); extern SEGPTR DOSDEV_GetLOL(BOOL v86);

1 0