wine-commits June 2009

wine-commits@winehq.org

5 participants
1115 discussions

Francois Gouget : cmd: Introduce a WCMD_strsubstW() function to simplify string substitutions.
by Alexandre Julliard 15 Jun '09

15 Jun '09

Module: wine Branch: master Commit: c48e5e048f776466b8e55a50ce28a73a6ba89f68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c48e5e048f776466b8e55a50c… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jun 15 10:59:31 2009 +0200 cmd: Introduce a WCMD_strsubstW() function to simplify string substitutions. --- programs/cmd/batch.c | 5 +-- programs/cmd/wcmd.h | 1 + programs/cmd/wcmdmain.c | 75 +++++++++++++++++++++------------------------- 3 files changed, 36 insertions(+), 45 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index 0044f70..4c089ca 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -571,10 +571,7 @@ void WCMD_HandleTildaModifiers(WCHAR **start, WCHAR *forVariable, WCHAR *forValu if (!doneModifier) strcpyW(finaloutput, outputparam); /* Finish by inserting the replacement into the string */ - pos = WCMD_strdupW(lastModifier+1); - strcpyW(*start, finaloutput); - strcatW(*start, pos); - free(pos); + WCMD_strsubstW(*start, lastModifier+1, finaloutput, -1); } /******************************************************************* diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 67aab42..4d3bab6 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -101,6 +101,7 @@ void WCMD_HandleTildaModifiers(WCHAR **start, WCHAR *forVariable, WCHAR *forValu void WCMD_splitpath(const WCHAR* path, WCHAR* drv, WCHAR* dir, WCHAR* name, WCHAR* ext); WCHAR *WCMD_LoadMessage(UINT id); WCHAR *WCMD_strdupW(WCHAR *input); +void WCMD_strsubstW(WCHAR *start, WCHAR* next, WCHAR* insert, int len); BOOL WCMD_ReadFile(const HANDLE hIn, WCHAR *intoBuf, const DWORD maxChars, LPDWORD charsRead, const LPOVERLAPPED unused); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index c58077b..7d3e526 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -422,6 +422,22 @@ WCHAR *WCMD_strdupW(WCHAR *input) { return result; } +/************************************************************************* + * WCMD_strsubstW + * Replaces a portion of a Unicode string with the specified string. + * It's up to the caller to ensure there is enough space in the + * destination buffer. + */ +void WCMD_strsubstW(WCHAR* start, WCHAR* next, WCHAR* insert, int len) { + + if (len < 0) + len=insert ? lstrlenW(insert) : 0; + if (start+len != next) + memmove(start+len, next, (strlenW(next) + 1) * sizeof(*next)); + if (insert) + memcpy(start, insert, len * sizeof(*insert)); +} + /*************************************************************************** * WCMD_strtrim_leading_spaces * @@ -493,9 +509,7 @@ static WCHAR *WCMD_expand_envvar(WCHAR *start, WCHAR *forVar, WCHAR *forVal) { /* In batch program, missing terminator for % and no following ':' just removes the '%' */ if (context) { - s = WCMD_strdupW(start + 1); - strcpyW (start, s); - free(s); + WCMD_strsubstW(start, start + 1, NULL, 0); return start; } else { @@ -608,24 +622,20 @@ static WCHAR *WCMD_expand_envvar(WCHAR *start, WCHAR *forVar, WCHAR *forVal) { /* Command line - just ignore this */ if (context == NULL) return endOfVar+1; - s = WCMD_strdupW(endOfVar + 1); /* Batch - replace unknown env var with nothing */ if (colonpos == NULL) { - strcpyW (start, s); - + WCMD_strsubstW(start, endOfVar + 1, NULL, 0); } else { len = strlenW(thisVar); thisVar[len-1] = 0x00; /* If %:...% supplied, : is retained */ if (colonpos == thisVar+1) { - strcpyW (start, colonpos); + WCMD_strsubstW(start, endOfVar + 1, colonpos, -1); } else { - strcpyW (start, colonpos+1); + WCMD_strsubstW(start, endOfVar + 1, colonpos + 1, -1); } - strcatW (start, s); } - free (s); return start; } @@ -633,10 +643,7 @@ static WCHAR *WCMD_expand_envvar(WCHAR *start, WCHAR *forVar, WCHAR *forVal) { /* See if we need to do complex substitution (any ':'s), if not then our work here is done */ if (colonpos == NULL) { - s = WCMD_strdupW(endOfVar + 1); - strcpyW (start, thisVarContents); - strcatW (start, s); - free(s); + WCMD_strsubstW(start, endOfVar + 1, thisVarContents, -1); return start; } @@ -664,8 +671,6 @@ static WCHAR *WCMD_expand_envvar(WCHAR *start, WCHAR *forVar, WCHAR *forVal) { substrposition = atolW(colonpos+2); if (commapos) substrlength = atolW(commapos+1); - s = WCMD_strdupW(endOfVar + 1); - /* Check bounds */ if (substrposition >= 0) { startCopy = &thisVarContents[min(substrposition, len)]; @@ -674,21 +679,18 @@ static WCHAR *WCMD_expand_envvar(WCHAR *start, WCHAR *forVar, WCHAR *forVal) { } if (commapos == NULL) { - strcpyW (start, startCopy); /* Copy the lot */ + /* Copy the lot */ + WCMD_strsubstW(start, endOfVar + 1, startCopy, -1); } else if (substrlength < 0) { int copybytes = (len+substrlength-1)-(startCopy-thisVarContents); if (copybytes > len) copybytes = len; else if (copybytes < 0) copybytes = 0; - memcpy (start, startCopy, copybytes * sizeof(WCHAR)); /* Copy the lot */ - start[copybytes] = 0x00; + WCMD_strsubstW(start, endOfVar + 1, startCopy, copybytes); } else { - memcpy (start, startCopy, substrlength * sizeof(WCHAR)); /* Copy the lot */ - start[substrlength] = 0x00; + WCMD_strsubstW(start, endOfVar + 1, startCopy, substrlength); } - strcatW (start, s); - free(s); return start; /* search and replace manipulation */ @@ -723,7 +725,7 @@ static WCHAR *WCMD_expand_envvar(WCHAR *start, WCHAR *forVar, WCHAR *forVal) { strcatW(start, thisVarContents + (found-searchIn) + strlenW(searchFor+1)); strcatW(start, s); } else { - /* Copy as it */ + /* Copy as is */ strcpyW(start, thisVarContents); strcatW(start, s); } @@ -772,7 +774,7 @@ static void handleExpansion(WCHAR *cmd, BOOL justFors, WCHAR *forVariable, WCHAR /* manual expansion of environment variables here */ WCHAR *p = cmd; - WCHAR *s, *t; + WCHAR *t; int i; while ((p = strchrW(p, '%'))) { @@ -784,9 +786,7 @@ static void handleExpansion(WCHAR *cmd, BOOL justFors, WCHAR *forVariable, WCHAR /* Don't touch %% unless its in Batch */ if (!justFors && *(p+1) == '%') { if (context) { - s = WCMD_strdupW(p+1); - strcpyW (p, s); - free (s); + WCMD_strsubstW(p, p+1, NULL, 0); } p+=1; @@ -797,21 +797,17 @@ static void handleExpansion(WCHAR *cmd, BOOL justFors, WCHAR *forVariable, WCHAR /* Replace use of %0...%9 if in batch program*/ } else if (!justFors && context && (i >= 0) && (i <= 9)) { - s = WCMD_strdupW(p+2); t = WCMD_parameter (context -> command, i + context -> shift_count[i], NULL); - strcpyW (p, t); - strcatW (p, s); - free (s); + WCMD_strsubstW(p, p+2, t, -1); /* Replace use of %* if in batch program*/ } else if (!justFors && context && *(p+1)=='*') { WCHAR *startOfParms = NULL; - s = WCMD_strdupW(p+2); t = WCMD_parameter (context -> command, 1, &startOfParms); - if (startOfParms != NULL) strcpyW (p, startOfParms); - else *p = 0x00; - strcatW (p, s); - free (s); + if (startOfParms != NULL) + WCMD_strsubstW(p, p+2, startOfParms, -1); + else + WCMD_strsubstW(p, p+2, NULL, 0); } else if (forVariable && (CompareString (LOCALE_USER_DEFAULT, @@ -819,10 +815,7 @@ static void handleExpansion(WCHAR *cmd, BOOL justFors, WCHAR *forVariable, WCHAR p, strlenW(forVariable), forVariable, -1) == 2)) { - s = WCMD_strdupW(p + strlenW(forVariable)); - strcpyW(p, forValue); - strcatW(p, s); - free(s); + WCMD_strsubstW(p, p + strlenW(forVariable), forValue, -1); } else if (!justFors) { p = WCMD_expand_envvar(p, forVariable, forValue);

1 0

Francois Gouget : rpcrt4/tests: Replace malloc() with HeapAlloc().
by Alexandre Julliard 15 Jun '09

15 Jun '09

Module: wine Branch: master Commit: d51d209b5f4275d7e90cc2508c39254323689f4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d51d209b5f4275d7e90cc2508… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jun 15 11:04:57 2009 +0200 rpcrt4/tests: Replace malloc() with HeapAlloc(). --- dlls/rpcrt4/tests/server.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index 0d41a62..34ef797 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -56,13 +56,13 @@ static void InitFunctionPointers(void) void __RPC_FAR *__RPC_USER midl_user_allocate(SIZE_T n) { - return malloc(n); + return HeapAlloc(GetProcessHeap(), 0, n); } void __RPC_USER midl_user_free(void __RPC_FAR *p) { - free(p); + HeapFree(GetProcessHeap(), 0, p); } static char * @@ -1218,21 +1218,21 @@ array_tests(void) ok(sum_toplev_conf_cond(c, 5, 6, 1) == 10, "RPC sum_toplev_conf_cond\n"); ok(sum_toplev_conf_cond(c, 5, 6, 0) == 15, "RPC sum_toplev_conf_cond\n"); - dc = malloc(FIELD_OFFSET(doub_carr_t, a[2])); + dc = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(doub_carr_t, a[2])); dc->n = 2; - dc->a[0] = malloc(FIELD_OFFSET(doub_carr_1_t, a[3])); + dc->a[0] = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(doub_carr_1_t, a[3])); dc->a[0]->n = 3; dc->a[0]->a[0] = 5; dc->a[0]->a[1] = 1; dc->a[0]->a[2] = 8; - dc->a[1] = malloc(FIELD_OFFSET(doub_carr_1_t, a[2])); + dc->a[1] = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(doub_carr_1_t, a[2])); dc->a[1]->n = 2; dc->a[1]->a[0] = 2; dc->a[1]->a[1] = 3; ok(sum_doub_carr(dc) == 19, "RPC sum_doub_carr\n"); - free(dc->a[0]); - free(dc->a[1]); - free(dc); + HeapFree(GetProcessHeap(), 0, dc->a[0]); + HeapFree(GetProcessHeap(), 0, dc->a[1]); + HeapFree(GetProcessHeap(), 0, dc); dc = NULL; make_pyramid_doub_carr(4, &dc);

1 0

Francois Gouget : winapi/c_parser: Remove some dead code.
by Alexandre Julliard 15 Jun '09

15 Jun '09

Module: wine Branch: master Commit: dcfd048e2c8310efbca39467427bfce8382ff8e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcfd048e2c8310efbca394674… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jun 15 11:03:04 2009 +0200 winapi/c_parser: Remove some dead code. --- tools/winapi/c_parser.pm | 16 +--------------- 1 files changed, 1 insertions(+), 15 deletions(-) diff --git a/tools/winapi/c_parser.pm b/tools/winapi/c_parser.pm index b93e461..17d74d7 100644 --- a/tools/winapi/c_parser.pm +++ b/tools/winapi/c_parser.pm @@ -242,11 +242,6 @@ sub _parse_c_warning($$$$$$) { $current .= $lines[1] . "\n" if $lines[1]; } - if (0) { - (my $package, my $filename, my $line) = caller(0); - $output->write("*** caller ***: $filename:$line\n"); - } - if($current) { $output->write("$$file:$line." . ($column + 1) . ": $context: $message: \\\n$current"); } else { @@ -854,8 +849,6 @@ sub parse_c_file($$$$) { if($line != $previous_line) { &$$found_line($line); - } elsif(0 && $column == $previous_column) { - $self->_parse_c_error($_, $line, $column, "file", "no progress"); } else { # &$$found_line("$line.$column"); } @@ -1098,14 +1091,7 @@ sub parse_c_file($$$$) { } } elsif(s/^;//) { $declaration .= $&; - if(0 && $blevel == 1 && - $declaration !~ /^typedef/ && - $declaration !~ /^(?:const\s+|extern\s+|static\s+|volatile\s+)?(?:interface|struct|union)(?:\s+\w+)?\s*\{/s && - $declaration =~ /^(?:\w+(?:\s*\*)*\s+)*(\w+)\s*$\s*(?:(?:\w+\s*,\s*)*(\w+))?\s*$\s*(.*?);$/s && - $1 ne "ICOM_VTABLE" && defined($2) && $2 ne "void" && $3) # K&R - { - $self->_parse_c_warning("", $line, $column, "file", "function $1: warning: function has K&R format"); - } elsif($plevel == 1 && $blevel == 1) { + if($plevel == 1 && $blevel == 1) { $declaration =~ s/\s*;$//; if($declaration && !$self->parse_c_declaration(\$declaration, \$declaration_line, \$declaration_column)) { return 0;

1 0

Francois Gouget : gdiplus: Remove spaces before '\n's.
by Alexandre Julliard 15 Jun '09

15 Jun '09

Module: wine Branch: master Commit: 489bd52afff56727a99da8e0e06ccf27cce8c043 URL: http://source.winehq.org/git/wine.git/?a=commit;h=489bd52afff56727a99da8e0e… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jun 15 11:00:03 2009 +0200 gdiplus: Remove spaces before '\n's. --- dlls/gdiplus/graphics.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 85ecf43..a9adac1 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3875,6 +3875,6 @@ GpStatus WINGDIPAPI GdipDrawDriverString(GpGraphics *graphics, GDIPCONST UINT16 GDIPCONST PointF *positions, INT flags, GDIPCONST GpMatrix *matrix ) { - FIXME("(%p %p %d %p %p %p %d %p): stub \n", graphics, text, length, font, brush, positions, flags, matrix); + FIXME("(%p %p %d %p %p %p %d %p): stub\n", graphics, text, length, font, brush, positions, flags, matrix); return NotImplemented; }

1 0

Francois Gouget : msctf: Make the CompartmentMgr functions static.
by Alexandre Julliard 15 Jun '09

15 Jun '09

Module: wine Branch: master Commit: 1ba95da66f4e0d06a47839023ba284329a65fb26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ba95da66f4e0d06a47839023… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jun 15 10:53:24 2009 +0200 msctf: Make the CompartmentMgr functions static. --- dlls/msctf/compartmentmgr.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msctf/compartmentmgr.c b/dlls/msctf/compartmentmgr.c index 33369c2..ecbe3b1 100644 --- a/dlls/msctf/compartmentmgr.c +++ b/dlls/msctf/compartmentmgr.c @@ -129,7 +129,7 @@ static ULONG WINAPI CompartmentMgr_Release(ITfCompartmentMgr *iface) } } -HRESULT WINAPI CompartmentMgr_GetCompartment(ITfCompartmentMgr *iface, +static HRESULT WINAPI CompartmentMgr_GetCompartment(ITfCompartmentMgr *iface, REFGUID rguid, ITfCompartment **ppcomp) { CompartmentMgr *This = (CompartmentMgr *)iface; @@ -137,7 +137,7 @@ HRESULT WINAPI CompartmentMgr_GetCompartment(ITfCompartmentMgr *iface, return E_NOTIMPL; } -HRESULT WINAPI CompartmentMgr_ClearCompartment(ITfCompartmentMgr *iface, +static HRESULT WINAPI CompartmentMgr_ClearCompartment(ITfCompartmentMgr *iface, TfClientId tid, REFGUID rguid) { CompartmentMgr *This = (CompartmentMgr *)iface; @@ -145,7 +145,7 @@ HRESULT WINAPI CompartmentMgr_ClearCompartment(ITfCompartmentMgr *iface, return E_NOTIMPL; } -HRESULT WINAPI CompartmentMgr_EnumCompartments(ITfCompartmentMgr *iface, +static HRESULT WINAPI CompartmentMgr_EnumCompartments(ITfCompartmentMgr *iface, IEnumGUID **ppEnum) { CompartmentMgr *This = (CompartmentMgr *)iface;

1 0

Francois Gouget : msctf/tests: Make EditSession_Constructor() static.
by Alexandre Julliard 15 Jun '09

15 Jun '09

Module: wine Branch: master Commit: 125131aea479a30c57c7e40a4d6116bc4b2ff813 URL: http://source.winehq.org/git/wine.git/?a=commit;h=125131aea479a30c57c7e40a4… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jun 15 10:53:20 2009 +0200 msctf/tests: Make EditSession_Constructor() static. --- dlls/msctf/tests/inputprocessor.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index c4be695..90d6989 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -1479,10 +1479,11 @@ static const ITfEditSessionVtbl EditSession_EditSessionVtbl = EditSession_DoEditSession }; -HRESULT EditSession_Constructor(ITfEditSession **ppOut) +static HRESULT EditSession_Constructor(ITfEditSession **ppOut) { EditSession *This; + *ppOut = NULL; This = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(EditSession)); if (This == NULL) return E_OUTOFMEMORY;

1 0

Francois Gouget : gdi32/tests: Small indentation fix.
by Alexandre Julliard 15 Jun '09

15 Jun '09

Module: wine Branch: master Commit: 34accb382b39aea268033b49a834e4f0422710bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=34accb382b39aea268033b49a… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jun 15 10:53:05 2009 +0200 gdi32/tests: Small indentation fix. --- dlls/gdi32/tests/clipping.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/tests/clipping.c b/dlls/gdi32/tests/clipping.c index eff87c3..06cb22a 100644 --- a/dlls/gdi32/tests/clipping.c +++ b/dlls/gdi32/tests/clipping.c @@ -189,13 +189,13 @@ static void test_ExtCreateRegion(void) HRGN hrgn; XFORM xform; -if (0) /* crashes under Win9x */ -{ - SetLastError(0xdeadbeef); - hrgn = ExtCreateRegion(NULL, 0, NULL); - ok(!hrgn, "ExtCreateRegion should fail\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, "ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); -} + if (0) /* crashes under Win9x */ + { + SetLastError(0xdeadbeef); + hrgn = ExtCreateRegion(NULL, 0, NULL); + ok(!hrgn, "ExtCreateRegion should fail\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + } rgn.data.rdh.dwSize = 0; rgn.data.rdh.iType = 0;

1 0

Francois Gouget : winedos: DOSVM_GetTimer() is not used so remove it.
by Alexandre Julliard 15 Jun '09

15 Jun '09

Module: wine Branch: master Commit: 8396dad5c2f4cbeed23ef9d1f6886e603b7d8c9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8396dad5c2f4cbeed23ef9d1f… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jun 15 10:52:36 2009 +0200 winedos: DOSVM_GetTimer() is not used so remove it. --- dlls/winedos/dosexe.h | 1 - dlls/winedos/timer.c | 21 --------------------- 2 files changed, 0 insertions(+), 22 deletions(-) diff --git a/dlls/winedos/dosexe.h b/dlls/winedos/dosexe.h index 11e92e2..a1be04a 100644 --- a/dlls/winedos/dosexe.h +++ b/dlls/winedos/dosexe.h @@ -363,7 +363,6 @@ extern DWORD WINAPI DOSVM_Loop( HANDLE hThread ); extern void WINAPI DOSVM_QueueEvent( INT irq, INT priority, DOSRELAY relay, LPVOID data ); extern void WINAPI DOSVM_PIC_ioport_out( WORD port, BYTE val ); extern void WINAPI DOSVM_SetTimer( UINT ticks ); -extern UINT WINAPI DOSVM_GetTimer( void ); /* devices.c */ extern void DOSDEV_InstallDOSDevices(void); diff --git a/dlls/winedos/timer.c b/dlls/winedos/timer.c index 0a504af..a7067aa 100644 --- a/dlls/winedos/timer.c +++ b/dlls/winedos/timer.c @@ -142,27 +142,6 @@ static void WINAPI TIMER_DoSetTimer( ULONG_PTR arg ) /*********************************************************************** - * DOSVM_GetTimer - */ -UINT WINAPI DOSVM_GetTimer( void ) -{ - if (!DOSVM_IsWin16()) - { - DWORD millis = GetTickCount() - TIMER_stamp; - INT ticks = MulDiv( millis, TIMER_FREQ, 1000 ); - - /* sanity check - tick wrap or suspended process or update race */ - if (ticks < 0 || ticks >= TIMER_ticks) - ticks = 0; - - return ticks; - } - - return 0; -} - - -/*********************************************************************** * DOSVM_SetTimer */ void WINAPI DOSVM_SetTimer( UINT ticks )

1 0

Francois Gouget : winedos: DPMI_FreeInternalRMCB() is not used so remove it .
by Alexandre Julliard 15 Jun '09

15 Jun '09

Module: wine Branch: master Commit: c54031960a9e3e86db373ae6098749d7ae9e9f6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c54031960a9e3e86db373ae60… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jun 15 10:49:40 2009 +0200 winedos: DPMI_FreeInternalRMCB() is not used so remove it. --- dlls/winedos/dosexe.h | 1 - dlls/winedos/int31.c | 6 ------ 2 files changed, 0 insertions(+), 7 deletions(-) diff --git a/dlls/winedos/dosexe.h b/dlls/winedos/dosexe.h index 77eed9e..11e92e2 100644 --- a/dlls/winedos/dosexe.h +++ b/dlls/winedos/dosexe.h @@ -450,7 +450,6 @@ extern void WINAPI DOSVM_Int31Handler(CONTEXT86*); extern void WINAPI DOSVM_RawModeSwitchHandler(CONTEXT86*); extern BOOL DOSVM_IsDos32(void); extern FARPROC16 WINAPI DPMI_AllocInternalRMCB(RMCBPROC); -extern void WINAPI DPMI_FreeInternalRMCB(FARPROC16); extern int DPMI_CallRMProc(CONTEXT86*,LPWORD,int,int); extern BOOL DOSVM_CheckWrappers(CONTEXT86*); diff --git a/dlls/winedos/int31.c b/dlls/winedos/int31.c index 9cc9e90..905d7e6 100644 --- a/dlls/winedos/int31.c +++ b/dlls/winedos/int31.c @@ -705,12 +705,6 @@ static int DPMI_FreeRMCB( DWORD address ) } -void WINAPI DPMI_FreeInternalRMCB( FARPROC16 proc ) -{ - DPMI_FreeRMCB( (DWORD)proc ); -} - - /********************************************************************** * DOSVM_RawModeSwitchHandler *

1 0

Francois Gouget : winedos: Move VGA_SetGraphicMode() up a bit and make it static. VGA_GetModeInfoList() is unused so remove it.
by Alexandre Julliard 15 Jun '09

15 Jun '09

Module: wine Branch: master Commit: c772cdfca545322d8b4ada1a8541b145133d0b8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c772cdfca545322d8b4ada1a8… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jun 15 10:47:17 2009 +0200 winedos: Move VGA_SetGraphicMode() up a bit and make it static. VGA_GetModeInfoList() is unused so remove it. --- dlls/winedos/vga.c | 65 ++++++++++++++++++++++++---------------------------- dlls/winedos/vga.h | 1 - 2 files changed, 30 insertions(+), 36 deletions(-) diff --git a/dlls/winedos/vga.c b/dlls/winedos/vga.c index 6c9085e..bc3f8c3 100644 --- a/dlls/winedos/vga.c +++ b/dlls/winedos/vga.c @@ -884,41 +884,7 @@ const VGA_MODE *VGA_GetModeInfo(WORD mode) return NULL; } -const VGA_MODE *VGA_GetModeInfoList(void) -{ - return VGA_modelist; -} - -int VGA_SetMode(WORD mode) -{ - const VGA_MODE *ModeInfo; - /* get info on VGA mode & set appropriately */ - VGA_CurrentMode = mode; - ModeInfo = VGA_GetModeInfo(VGA_CurrentMode); - - /* check if mode is supported */ - if (ModeInfo->Supported) - { - FIXME("Setting VGA mode %i - Supported mode - Improve reporting of missing capabilities for modes & modetypes.\n", mode); - } - else - { - FIXME("Setting VGA mode %i - Unsupported mode - Will doubtfully work at all, but we'll try anyways.\n", mode); - } - - /* set up graphic or text display */ - if (ModeInfo->ModeType == TEXT) - { - VGA_SetAlphaMode(ModeInfo->TextCols, ModeInfo->TextRows); - } - else - { - return VGA_SetGraphicMode(mode); - } - return 0; /* assume all good & return zero */ -} - -int VGA_SetGraphicMode(WORD mode) +static int VGA_SetGraphicMode(WORD mode) { ModeSet par; int newSize; @@ -1000,6 +966,35 @@ int VGA_SetGraphicMode(WORD mode) return par.ret; } +int VGA_SetMode(WORD mode) +{ + const VGA_MODE *ModeInfo; + /* get info on VGA mode & set appropriately */ + VGA_CurrentMode = mode; + ModeInfo = VGA_GetModeInfo(VGA_CurrentMode); + + /* check if mode is supported */ + if (ModeInfo->Supported) + { + FIXME("Setting VGA mode %i - Supported mode - Improve reporting of missing capabilities for modes & modetypes.\n", mode); + } + else + { + FIXME("Setting VGA mode %i - Unsupported mode - Will doubtfully work at all, but we'll try anyways.\n", mode); + } + + /* set up graphic or text display */ + if (ModeInfo->ModeType == TEXT) + { + VGA_SetAlphaMode(ModeInfo->TextCols, ModeInfo->TextRows); + } + else + { + return VGA_SetGraphicMode(mode); + } + return 0; /* assume all good & return zero */ +} + int VGA_GetMode(unsigned*Height,unsigned*Width,unsigned*Depth) { if (!lpddraw) return 1; diff --git a/dlls/winedos/vga.h b/dlls/winedos/vga.h index f3169f8..5d79567 100644 --- a/dlls/winedos/vga.h +++ b/dlls/winedos/vga.h @@ -55,7 +55,6 @@ const VGA_MODE *VGA_GetModeInfo(WORD mode); int VGA_SetMode(WORD mode); /* graphics mode */ -int VGA_SetGraphicMode(WORD mode); int VGA_GetMode(unsigned*Height,unsigned*Width,unsigned*Depth); void VGA_SetPalette(PALETTEENTRY*pal,int start,int len); void VGA_SetColor16(int reg,int color);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2009