wine-commits November 2008

wine-commits@winehq.org

2 participants
734 discussions

Henri Verbeet : d3d10core: Allow ID3D10Device to be aggregated.
by Alexandre Julliard 13 Nov '08

13 Nov '08

Module: wine Branch: master Commit: ed418dc815120264672221a76e577b45dbf7685e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed418dc815120264672221a76… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 12 15:43:46 2008 +0100 d3d10core: Allow ID3D10Device to be aggregated. --- dlls/d3d10core/d3d10core_private.h | 3 ++ dlls/d3d10core/device.c | 54 ++++++++++++++++++++++++++++++----- 2 files changed, 49 insertions(+), 8 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 0eea663..a3e2755 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -34,9 +34,12 @@ const char *debug_dxgi_format(DXGI_FORMAT format); /* IDirect3D10Device */ extern const struct ID3D10DeviceVtbl d3d10_device_vtbl; +extern const struct IUnknownVtbl d3d10_device_inner_unkown_vtbl; struct d3d10_device { const struct ID3D10DeviceVtbl *vtbl; + const struct IUnknownVtbl *inner_unknown_vtbl; + IUnknown *outer_unknown; LONG refcount; }; diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index a0cf37c..ab92c47 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -24,17 +24,24 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d10core); -/* IUnknown methods */ +/* Inner IUnknown methods */ -static HRESULT STDMETHODCALLTYPE d3d10_device_QueryInterface(ID3D10Device *iface, REFIID riid, void **object) +static inline struct d3d10_device *d3d10_device_from_inner_unknown(IUnknown *iface) +{ + return (struct d3d10_device *)((char*)iface - FIELD_OFFSET(struct d3d10_device, inner_unknown_vtbl)); +} + +static HRESULT STDMETHODCALLTYPE d3d10_device_inner_QueryInterface(IUnknown *iface, REFIID riid, void **object) { + struct d3d10_device *This = d3d10_device_from_inner_unknown(iface); + TRACE("iface %p, riid %s, object %p\n", iface, debugstr_guid(riid), object); if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_ID3D10Device)) { - IUnknown_AddRef(iface); - *object = iface; + IUnknown_AddRef((IUnknown *)This); + *object = This; return S_OK; } @@ -44,9 +51,9 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_QueryInterface(ID3D10Device *iface return E_NOINTERFACE; } -static ULONG STDMETHODCALLTYPE d3d10_device_AddRef(ID3D10Device *iface) +static ULONG STDMETHODCALLTYPE d3d10_device_inner_AddRef(IUnknown *iface) { - struct d3d10_device *This = (struct d3d10_device *)iface; + struct d3d10_device *This = d3d10_device_from_inner_unknown(iface); ULONG refcount = InterlockedIncrement(&This->refcount); TRACE("%p increasing refcount to %u\n", This, refcount); @@ -54,9 +61,9 @@ static ULONG STDMETHODCALLTYPE d3d10_device_AddRef(ID3D10Device *iface) return refcount; } -static ULONG STDMETHODCALLTYPE d3d10_device_Release(ID3D10Device *iface) +static ULONG STDMETHODCALLTYPE d3d10_device_inner_Release(IUnknown *iface) { - struct d3d10_device *This = (struct d3d10_device *)iface; + struct d3d10_device *This = d3d10_device_from_inner_unknown(iface); ULONG refcount = InterlockedDecrement(&This->refcount); TRACE("%p decreasing refcount to %u\n", This, refcount); @@ -64,6 +71,29 @@ static ULONG STDMETHODCALLTYPE d3d10_device_Release(ID3D10Device *iface) return refcount; } +/* IUnknown methods */ + +static HRESULT STDMETHODCALLTYPE d3d10_device_QueryInterface(ID3D10Device *iface, REFIID riid, void **object) +{ + struct d3d10_device *This = (struct d3d10_device *)iface; + TRACE("Forwarding to outer IUnknown\n"); + return IUnknown_QueryInterface(This->outer_unknown, riid, object); +} + +static ULONG STDMETHODCALLTYPE d3d10_device_AddRef(ID3D10Device *iface) +{ + struct d3d10_device *This = (struct d3d10_device *)iface; + TRACE("Forwarding to outer IUnknown\n"); + return IUnknown_AddRef(This->outer_unknown); +} + +static ULONG STDMETHODCALLTYPE d3d10_device_Release(ID3D10Device *iface) +{ + struct d3d10_device *This = (struct d3d10_device *)iface; + TRACE("Forwarding to outer IUnknown\n"); + return IUnknown_Release(This->outer_unknown); +} + /* ID3D10Device methods */ static void STDMETHODCALLTYPE d3d10_device_VSSetConstantBuffers(ID3D10Device *iface, @@ -845,3 +875,11 @@ const struct ID3D10DeviceVtbl d3d10_device_vtbl = d3d10_device_SetTextFilterSize, d3d10_device_GetTextFilterSize, }; + +const struct IUnknownVtbl d3d10_device_inner_unkown_vtbl = +{ + /* IUnknown methods */ + d3d10_device_inner_QueryInterface, + d3d10_device_inner_AddRef, + d3d10_device_inner_Release, +};

1 0

Henri Verbeet : d3d10core: Implement ID3D10Device in d3d10core instead of d3d10.
by Alexandre Julliard 13 Nov '08

13 Nov '08

Module: wine Branch: master Commit: ccf48fff3361cf1046bdbe6d2799a3220f7492b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccf48fff3361cf1046bdbe6d2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 12 15:43:46 2008 +0100 d3d10core: Implement ID3D10Device in d3d10core instead of d3d10. --- dlls/d3d10/Makefile.in | 1 - dlls/d3d10/d3d10_main.c | 19 +---- dlls/d3d10/d3d10_private.h | 10 --- dlls/d3d10/utils.c | 119 ----------------------------- dlls/d3d10core/Makefile.in | 6 +- dlls/d3d10core/d3d10core_private.h | 17 ++++ dlls/{d3d10 => d3d10core}/device.c | 9 +-- dlls/d3d10core/utils.c | 148 ++++++++++++++++++++++++++++++++++++ 8 files changed, 173 insertions(+), 156 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ccf48fff3361cf1046bdb…

1 0

Vincent Povirk : msiexec: Build with -mwindows.
by Alexandre Julliard 13 Nov '08

13 Nov '08

Module: wine Branch: master Commit: 69496947403ceef3fefaf656d5b6af1f3cb61ba1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69496947403ceef3fefaf656d… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Nov 12 10:16:24 2008 -0600 msiexec: Build with -mwindows. --- programs/msiexec/Makefile.in | 2 +- programs/msiexec/msiexec.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/programs/msiexec/Makefile.in b/programs/msiexec/Makefile.in index ef0af91..f9cb570 100644 --- a/programs/msiexec/Makefile.in +++ b/programs/msiexec/Makefile.in @@ -4,7 +4,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = msiexec.exe -APPMODE = -mconsole +APPMODE = -mwindows IMPORTS = msi ole32 advapi32 user32 kernel32 C_SRCS = \ diff --git a/programs/msiexec/msiexec.c b/programs/msiexec/msiexec.c index 7b00eb7..9221fa2 100644 --- a/programs/msiexec/msiexec.c +++ b/programs/msiexec/msiexec.c @@ -493,7 +493,7 @@ static BOOL process_args_from_reg( LPWSTR ident, int *pargc, WCHAR ***pargv ) return ret; } -int main(int argc, char **argv) +int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow) { int i; BOOL FunctionInstall = FALSE; @@ -529,9 +529,10 @@ int main(int argc, char **argv) LPWSTR DllName = NULL; DWORD ReturnCode; + int argc; LPWSTR *argvW = NULL; - /* overwrite the command line */ + /* parse the command line */ process_args( GetCommandLineW(), &argc, &argvW ); /*

1 0

Vitaliy Margolen : user32/tests: Print line numbers of callers in check_wnd_state to help debugging.
by Alexandre Julliard 13 Nov '08

13 Nov '08

Module: wine Branch: master Commit: a4b62b17814ea43d6b5a9ad659bee29ebc6fa08f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4b62b17814ea43d6b5a9ad65… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Wed Nov 12 08:40:27 2008 -0700 user32/tests: Print line numbers of callers in check_wnd_state to help debugging. --- dlls/user32/tests/win.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 84a2780..827d0e3 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -2258,13 +2258,15 @@ todo_wine DestroyWindow( child ); } -static void check_wnd_state(HWND active, HWND foreground, HWND focus, HWND capture) +#define check_wnd_state(a,b,c,d) check_wnd_state_(__FILE__,__LINE__,a,b,c,d) +static void check_wnd_state_(const char *file, int line, + HWND active, HWND foreground, HWND focus, HWND capture) { - ok(active == GetActiveWindow(), "GetActiveWindow() = %p\n", GetActiveWindow()); + ok_(file, line)(active == GetActiveWindow(), "GetActiveWindow() = %p\n", GetActiveWindow()); if (foreground) - ok(foreground == GetForegroundWindow(), "GetForegroundWindow() = %p\n", GetForegroundWindow()); - ok(focus == GetFocus(), "GetFocus() = %p\n", GetFocus()); - ok(capture == GetCapture(), "GetCapture() = %p\n", GetCapture()); + ok_(file, line)(foreground == GetForegroundWindow(), "GetForegroundWindow() = %p\n", GetForegroundWindow()); + ok_(file, line)(focus == GetFocus(), "GetFocus() = %p\n", GetFocus()); + ok_(file, line)(capture == GetCapture(), "GetCapture() = %p\n", GetCapture()); } static void test_SetActiveWindow(HWND hwnd)

1 0

Juan Lang : crypt32: Fix indenting for szOID_CRL_DIST_POINTS.
by Alexandre Julliard 13 Nov '08

13 Nov '08

Module: wine Branch: master Commit: 5922150e2f728fead96ee05f9c3f2401f98aa5f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5922150e2f728fead96ee05f9… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Nov 12 20:41:23 2008 -0800 crypt32: Fix indenting for szOID_CRL_DIST_POINTS. --- dlls/crypt32/object.c | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/object.c b/dlls/crypt32/object.c index b31576c..6e79038 100644 --- a/dlls/crypt32/object.c +++ b/dlls/crypt32/object.c @@ -1539,13 +1539,15 @@ static BOOL WINAPI CRYPT_FormatCRLDistPoints(DWORD dwCertEncodingType, CRL_DIST_POINT_NO_NAME) { bytesNeeded += strlenW(distPointName) * sizeof(WCHAR); - bytesNeeded += strlenW(colon) * sizeof(WCHAR); + bytesNeeded += strlenW(nameSep) * sizeof(WCHAR); if (distPoint->DistPointName.dwDistPointNameChoice == CRL_DIST_POINT_FULL_NAME) bytesNeeded += strlenW(fullName) * sizeof(WCHAR); else bytesNeeded += strlenW(rdnName) * sizeof(WCHAR); bytesNeeded += strlenW(nameSep) * sizeof(WCHAR); + if (dwFormatStrType & CRYPT_FORMAT_STR_MULTI_LINE) + bytesNeeded += 2 * strlenW(indent) * sizeof(WCHAR); /* The indent level (3) is higher than when used as the issuer, * because the name is subordinate to the name type (full vs. * RDN.) @@ -1648,8 +1650,15 @@ static BOOL WINAPI CRYPT_FormatCRLDistPoints(DWORD dwCertEncodingType, strcpyW(str, distPointName); str += strlenW(distPointName); - strcpyW(str, colon); - str += strlenW(colon); + strcpyW(str, nameSep); + str += strlenW(nameSep); + if (dwFormatStrType & CRYPT_FORMAT_STR_MULTI_LINE) + { + strcpyW(str, indent); + str += strlenW(indent); + strcpyW(str, indent); + str += strlenW(indent); + } if (distPoint->DistPointName.dwDistPointNameChoice == CRL_DIST_POINT_FULL_NAME) {

1 0

Juan Lang : crypt32: Fix comment typo.
by Alexandre Julliard 13 Nov '08

13 Nov '08

Module: wine Branch: master Commit: ea81720f8f7279fcad5c406c4c6523623b053361 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea81720f8f7279fcad5c406c4… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Nov 12 20:37:15 2008 -0800 crypt32: Fix comment typo. --- dlls/crypt32/object.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/object.c b/dlls/crypt32/object.c index 596c8e3..b31576c 100644 --- a/dlls/crypt32/object.c +++ b/dlls/crypt32/object.c @@ -1547,7 +1547,7 @@ static BOOL WINAPI CRYPT_FormatCRLDistPoints(DWORD dwCertEncodingType, bytesNeeded += strlenW(rdnName) * sizeof(WCHAR); bytesNeeded += strlenW(nameSep) * sizeof(WCHAR); /* The indent level (3) is higher than when used as the issuer, - * because the name is suppordinate to the name type (full vs. + * because the name is subordinate to the name type (full vs. * RDN.) */ ret = CRYPT_FormatAltNameInfo(dwFormatStrType, 3,

1 0

Juan Lang : crypt32: Implement formatting an alt name entry with type CERT_ALT_NAME_DIRECTORY_NAME .
by Alexandre Julliard 13 Nov '08

13 Nov '08

Module: wine Branch: master Commit: 7fb0ce553294e300bd6c697f851672941fcf465f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fb0ce553294e300bd6c697f8… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Nov 12 20:37:02 2008 -0800 crypt32: Implement formatting an alt name entry with type CERT_ALT_NAME_DIRECTORY_NAME. --- dlls/crypt32/object.c | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/object.c b/dlls/crypt32/object.c index d639630..596c8e3 100644 --- a/dlls/crypt32/object.c +++ b/dlls/crypt32/object.c @@ -778,6 +778,19 @@ static BOOL CRYPT_FormatAltNameEntry(DWORD dwFormatStrType, DWORD indentLevel, bytesNeeded += strlenW(entry->u.pwszDNSName) * sizeof(WCHAR); ret = TRUE; break; + case CERT_ALT_NAME_DIRECTORY_NAME: + { + DWORD strType = dwFormatStrType & CRYPT_FORMAT_STR_MULTI_LINE + ? CERT_NAME_STR_CRLF_FLAG : 0; + DWORD directoryNameLen = CertNameToStrW(X509_ASN_ENCODING, + &entry->u.DirectoryName, strType, NULL, 0); + + LoadStringW(hInstance, IDS_ALT_NAME_OTHER_NAME, buf, + sizeof(buf) / sizeof(buf[0])); + bytesNeeded += (directoryNameLen - 1) * sizeof(WCHAR); + ret = TRUE; + break; + } case CERT_ALT_NAME_URL: LoadStringW(hInstance, IDS_ALT_NAME_URL, buf, sizeof(buf) / sizeof(buf[0])); @@ -877,6 +890,15 @@ static BOOL CRYPT_FormatAltNameEntry(DWORD dwFormatStrType, DWORD indentLevel, case CERT_ALT_NAME_URL: strcpyW(str, entry->u.pwszURL); break; + case CERT_ALT_NAME_DIRECTORY_NAME: + { + DWORD strType = dwFormatStrType & CRYPT_FORMAT_STR_MULTI_LINE + ? CERT_NAME_STR_CRLF_FLAG : 0; + + CertNameToStrW(X509_ASN_ENCODING, &entry->u.DirectoryName, + strType, str, bytesNeeded / sizeof(WCHAR)); + break; + } case CERT_ALT_NAME_IP_ADDRESS: if (dwFormatStrType & CRYPT_FORMAT_STR_MULTI_LINE) {

1 0

Juan Lang : crypt32: Fix off-by-one error in formatting szOID_AUTHORITY_KEY_IDENTIFIER2.
by Alexandre Julliard 13 Nov '08

13 Nov '08

Module: wine Branch: master Commit: a82454b2ee082c12f6fcd94385e34c7655ea291d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a82454b2ee082c12f6fcd9438… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Nov 12 20:36:33 2008 -0800 crypt32: Fix off-by-one error in formatting szOID_AUTHORITY_KEY_IDENTIFIER2. --- dlls/crypt32/object.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/object.c b/dlls/crypt32/object.c index f5a6483..d639630 100644 --- a/dlls/crypt32/object.c +++ b/dlls/crypt32/object.c @@ -1095,7 +1095,7 @@ static BOOL WINAPI CRYPT_FormatAuthorityKeyId2(DWORD dwCertEncodingType, size = bytesNeeded; ret = CRYPT_FormatKeyId(&info->KeyId, str, &size); if (ret) - str += size / sizeof(WCHAR); + str += size / sizeof(WCHAR) - 1; } if (info->AuthorityCertIssuer.cAltEntry) { @@ -1112,7 +1112,7 @@ static BOOL WINAPI CRYPT_FormatAuthorityKeyId2(DWORD dwCertEncodingType, ret = CRYPT_FormatCertIssuer(dwFormatStrType, &info->AuthorityCertIssuer, str, &size); if (ret) - str += size / sizeof(WCHAR); + str += size / sizeof(WCHAR) - 1; } if (info->AuthorityCertSerialNumber.cbData) {

1 0

Juan Lang : crypt32: Don' t underreport the size available when formatting szOID_AUTHORITY_KEY_IDENTIFIER2 .
by Alexandre Julliard 13 Nov '08

13 Nov '08

Module: wine Branch: master Commit: 1c35b251e87445eac0aa9c6a6797f65a6c9f5c6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c35b251e87445eac0aa9c6a6… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Nov 12 20:22:32 2008 -0800 crypt32: Don't underreport the size available when formatting szOID_AUTHORITY_KEY_IDENTIFIER2. --- dlls/crypt32/object.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/object.c b/dlls/crypt32/object.c index 19a3217..f5a6483 100644 --- a/dlls/crypt32/object.c +++ b/dlls/crypt32/object.c @@ -1089,6 +1089,10 @@ static BOOL WINAPI CRYPT_FormatAuthorityKeyId2(DWORD dwCertEncodingType, if (info->KeyId.cbData) { needSeparator = TRUE; + /* Overestimate size available, it's already been checked + * above. + */ + size = bytesNeeded; ret = CRYPT_FormatKeyId(&info->KeyId, str, &size); if (ret) str += size / sizeof(WCHAR); @@ -1101,6 +1105,10 @@ static BOOL WINAPI CRYPT_FormatAuthorityKeyId2(DWORD dwCertEncodingType, str += sepLen / sizeof(WCHAR); } needSeparator = TRUE; + /* Overestimate size available, it's already been checked + * above. + */ + size = bytesNeeded; ret = CRYPT_FormatCertIssuer(dwFormatStrType, &info->AuthorityCertIssuer, str, &size); if (ret) @@ -1113,6 +1121,10 @@ static BOOL WINAPI CRYPT_FormatAuthorityKeyId2(DWORD dwCertEncodingType, strcpyW(str, sep); str += sepLen / sizeof(WCHAR); } + /* Overestimate size available, it's already been checked + * above. + */ + size = bytesNeeded; ret = CRYPT_FormatCertSerialNumber( &info->AuthorityCertSerialNumber, str, &size); }

1 0

Peter Dons Tychsen : winedos: Implement mode control register, and the 160x200x4 display mode that it opens.
by Alexandre Julliard 13 Nov '08

13 Nov '08

Module: wine Branch: master Commit: b627dd2afc1816c79ab4d9cfe9aecd4dd52ad5ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=b627dd2afc1816c79ab4d9cfe… Author: Peter Dons Tychsen <donpedro(a)tdcadsl.dk> Date: Thu Nov 13 04:02:42 2008 +0100 winedos: Implement mode control register, and the 160x200x4 display mode that it opens. --- dlls/winedos/vga.c | 94 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 90 insertions(+), 4 deletions(-) diff --git a/dlls/winedos/vga.c b/dlls/winedos/vga.c index 772038c..5d4dcca 100644 --- a/dlls/winedos/vga.c +++ b/dlls/winedos/vga.c @@ -101,7 +101,9 @@ static int vga_fb_window_size; static char *vga_fb_window_data; static PALETTEENTRY *vga_fb_palette; static unsigned vga_fb_palette_index; +static unsigned vga_fb_palette_size; static BOOL vga_fb_bright; +static BOOL vga_fb_enabled; /* * VGA text mode data. @@ -768,7 +770,7 @@ static void WINAPI VGA_DoSetMode(ULONG_PTR arg) return; } - res=IDirectDrawPalette_SetEntries(lpddpal,0,0,4,vga_fb_palette); + res=IDirectDrawPalette_SetEntries(lpddpal,0,0,vga_fb_palette_size,vga_fb_palette); if (res != S_OK) { ERR("Could not set default palette entries (res = 0x%x)\n", res); } @@ -828,12 +830,25 @@ int VGA_SetMode(unsigned Xres,unsigned Yres,unsigned Depth) vga_fb_window_data = VGA_WINDOW_START; vga_fb_window_size = VGA_WINDOW_SIZE; vga_fb_palette = vga_def_palette; + vga_fb_palette_size = 256; } else { vga_fb_window_data = CGA_WINDOW_START; vga_fb_window_size = CGA_WINDOW_SIZE; - vga_fb_palette = cga_palette1; + if(Depth == 2) + { + /* Select default 2 bit CGA palette */ + vga_fb_palette = cga_palette1; + vga_fb_palette_size = 4; + } + else + { + /* Top of VGA palette is same as 4 bit CGA palette */ + vga_fb_palette = vga_def_palette; + vga_fb_palette_size = 16; + } + vga_fb_palette_index = 0; vga_fb_bright = 0; } @@ -1070,6 +1085,27 @@ void VGA_SetBright(BOOL bright) } /********************************************************************** + * VGA_SetEnabled + * + * Select if output is enabled or disabled + * This is a property of the CGA controller + */ +void VGA_SetEnabled(BOOL enabled) +{ + TRACE("%i\n", enabled); + + /* Check if going from enabled to disabled */ + if(vga_fb_enabled == TRUE && enabled == FALSE) + { + /* Clear frame buffer */ + memset(vga_fb_window_data, 0x00, vga_fb_window_size); + } + + /* Remember the "enabled" value */ + vga_fb_enabled = enabled; +} + +/********************************************************************** * VGA_SetPaletteIndex * * Select the index of the palette which is currently in use @@ -1425,9 +1461,44 @@ static void VGA_Poll_Graphics(void) VGA_SyncWindow( TRUE ); /* - * CGA framebuffer + * CGA framebuffer (160x200) + * This buffer is encoded as following: + * - 4 bit pr. pixel, 2 pixels per byte + * - 80 bytes per row + * - Every second line has an offset of 8096 */ - if(vga_fb_depth == 2 && vga_fb_width == 320 && vga_fb_height == 200){ + if(vga_fb_depth == 4 && vga_fb_width == 160 && vga_fb_height == 200){ + WORD off = 0; + BYTE bits = 4; + BYTE value; + for(Y=0; Y<vga_fb_height; Y++, surf+=(Pitch*2)){ + for(X=0; X<vga_fb_width; X++){ + off = Y & 1 ? (8 * 1024) : 0; + off += (80 * (Y/2)); + off += X/2; + value = (dat[off] >> bits) & 0xF; + surf[(X*4)+0] = value; + surf[(X*4)+1] = value; + surf[(X*4)+2] = value; + surf[(X*4)+3] = value; + surf[(X*4)+Pitch+0] = value; + surf[(X*4)+Pitch+1] = value; + surf[(X*4)+Pitch+2] = value; + surf[(X*4)+Pitch+3] = value; + bits -= 4; + bits &= 7; + } + } + } + + /* + * CGA framebuffer (320x200) + * This buffer is encoded as following: + * - 2 bits per color, 4 pixels per byte + * - 80 bytes per row + * - Every second line has an offset of 8096 + */ + else if(vga_fb_depth == 2 && vga_fb_width == 320 && vga_fb_height == 200){ WORD off = 0; BYTE bits = 6; BYTE value; @@ -1605,6 +1676,21 @@ void VGA_ioport_out( WORD port, BYTE val ) FIXME("Unsupported index, VGA crt controller register 0x3b4/0x3d4: 0x%02x (value 0x%02x)\n", vga_index_3d4, val); break; + + /* Mode control register (CGA) */ + case 0x3d8: + + /* Detect 160x200, 16 color mode (composite) */ + if((val & 0x02) && (val & 0x10)) + { + /* Switch to 160x200x4 composite mode */ + VGA_SetMode(160, 200, 4); + } + + /* Set the enabled bit */ + VGA_SetEnabled((val & 0x08) && 1); + break; + /* Colour control register (CGA) */ case 0x3d9: /* Set bright */

1 0

← Newer
1
...
39
40
41
42
43
44
45
...
74
Older →

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 November 2008