January 2006 - Wine-Commits

Eric Pouech : winedbg: Added a more decent scheme for handling segmented addresses.
by Alexandre Julliard Jan. 23, 2006

Jan. 23, 2006

Module: wine Branch: refs/heads/master Commit: 9d0b5f53727c783a59f31f11874584d4707f39b5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9d0b5f53727c783a59f31f1… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Mon Jan 23 16:26:40 2006 +0100 winedbg: Added a more decent scheme for handling segmented addresses. --- programs/winedbg/break.c | 6 ++--- programs/winedbg/debugger.h | 2 ++ programs/winedbg/expr.c | 7 ++--- programs/winedbg/memory.c | 34 +++++++------------------- programs/winedbg/stack.c | 2 +- programs/winedbg/types.c | 57 ++++++++++++++++++++++++++++++++----------- programs/winedbg/winedbg.c | 2 -- 7 files changed, 60 insertions(+), 50 deletions(-) diff --git a/programs/winedbg/break.c b/programs/winedbg/break.c index 8f502b5..086d1e5 100644 --- a/programs/winedbg/break.c +++ b/programs/winedbg/break.c @@ -195,8 +195,7 @@ BOOL break_add_break_from_lvalue(const s { ADDRESS addr; - addr.Mode = AddrModeFlat; - addr.Offset = types_extract_as_integer(lvalue); + types_extract_as_address(lvalue, &addr); if (!break_add_break(&addr, TRUE)) { @@ -400,8 +399,7 @@ void break_add_watch_from_lvalue(const s { struct dbg_lvalue lval; - lval.addr.Mode = AddrModeFlat; - lval.addr.Offset = types_extract_as_integer(lvalue); + types_extract_as_address(lvalue, &lval.addr); lval.type.id = dbg_itype_none; break_add_watch(&lval, TRUE); diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index d26bbc0..111a58a 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -81,6 +81,7 @@ enum dbg_internal_types dbg_itype_long_real, /* aka long double */ dbg_itype_astring, dbg_itype_ustring, + dbg_itype_segptr, /* hack for segmented pointers */ dbg_itype_none = 0xffffffff }; @@ -369,6 +370,7 @@ extern void print_value(cons extern int types_print_type(const struct dbg_type*, BOOL details); extern int print_types(void); extern long int types_extract_as_integer(const struct dbg_lvalue*); +extern void types_extract_as_address(const struct dbg_lvalue*, ADDRESS*); extern BOOL types_deref(const struct dbg_lvalue* value, struct dbg_lvalue* result); extern BOOL types_udt_find_element(struct dbg_lvalue* value, const char* name, long int* tmpbuf); extern BOOL types_array_index(const struct dbg_lvalue* value, int index, struct dbg_lvalue* result); diff --git a/programs/winedbg/expr.c b/programs/winedbg/expr.c index 5815298..89d23df 100644 --- a/programs/winedbg/expr.c +++ b/programs/winedbg/expr.c @@ -545,11 +545,10 @@ struct dbg_lvalue expr_eval(struct expr* types_extract_as_integer(&exp2) * (DWORD)scale2) / (DWORD)scale3; break; case EXP_OP_SEG: - rtn.type.id = dbg_itype_none; + rtn.type.id = dbg_itype_segptr; rtn.type.module = 0; - rtn.addr.Mode = AddrMode1632; - rtn.addr.Segment = types_extract_as_integer(&exp1); - rtn.addr.Offset = types_extract_as_integer(&exp2); + be_cpu->build_addr(dbg_curr_thread->handle, &dbg_context, &rtn.addr, + types_extract_as_integer(&exp1), types_extract_as_integer(&exp2)); break; case EXP_OP_LOR: exp->un.binop.result = (types_extract_as_integer(&exp1) || types_extract_as_integer(&exp2)); diff --git a/programs/winedbg/memory.c b/programs/winedbg/memory.c index 3bda720..8e8b984 100644 --- a/programs/winedbg/memory.c +++ b/programs/winedbg/memory.c @@ -151,17 +151,8 @@ void memory_examine(const struct dbg_lva ADDRESS addr; void *linear; - if (lvalue->type.id == dbg_itype_none) - { - be_cpu->build_addr(dbg_curr_thread->handle, &dbg_context, - &addr, lvalue->addr.Segment, lvalue->addr.Offset); - } - else - { - addr.Mode = AddrModeFlat; - addr.Offset = types_extract_as_integer( lvalue ); - } - linear = memory_to_linear_addr( &addr ); + types_extract_as_address(lvalue, &addr); + linear = memory_to_linear_addr(&addr); if (format != 'i' && count > 1) { @@ -449,7 +440,8 @@ void print_basic(const struct dbg_lvalue switch (format) { case 'x': - if (lvalue->addr.Mode != AddrModeFlat) + if (lvalue->addr.Mode == AddrMode1616 || + lvalue->addr.Mode == AddrModeReal) dbg_printf("0x%04lx", res); else dbg_printf("0x%08lx", res); @@ -478,7 +470,10 @@ void print_basic(const struct dbg_lvalue case 'b': dbg_printf("Format specifier '%c' is meaningless in 'print' command\n", format); case 0: - print_typed_basic(lvalue); + if (lvalue->type.id == dbg_itype_segptr) + dbg_printf("%ld", res); + else + print_typed_basic(lvalue); break; } } @@ -567,18 +562,7 @@ void memory_disassemble(const struct dbg else { if (xstart) - { - if (xstart->type.id == dbg_itype_none) - { - be_cpu->build_addr(dbg_curr_thread->handle, &dbg_context, - &last, xstart->addr.Segment, xstart->addr.Offset); - } - else - { - last.Mode = AddrModeFlat; - last.Offset = types_extract_as_integer( xstart ); - } - } + types_extract_as_address(xstart, &last); if (xend) stop = types_extract_as_integer(xend); } diff --git a/programs/winedbg/stack.c b/programs/winedbg/stack.c index b33cf60..abb943a 100644 --- a/programs/winedbg/stack.c +++ b/programs/winedbg/stack.c @@ -177,7 +177,7 @@ static BOOL WINAPI sym_enum_cb(SYMBOL_IN DWORD addr; unsigned val; - if ((sym_info->Flags & (SYMFLAG_PARAMETER|SYMFLAG_FRAMEREL)) == (SYMFLAG_PARAMETER|SYMFLAG_FRAMEREL)) + if ((sym_info->Flags & (SYMFLAG_PARAMETER|SYMFLAG_REGREL)) == (SYMFLAG_PARAMETER|SYMFLAG_REGREL)) { if (se->tmp[0]) strcat(se->tmp, ", "); addr = se->frame + sym_info->Address; diff --git a/programs/winedbg/types.c b/programs/winedbg/types.c index e9b9358..bb05422 100644 --- a/programs/winedbg/types.c +++ b/programs/winedbg/types.c @@ -38,41 +38,43 @@ WINE_DEFAULT_DEBUG_CHANNEL(winedbg); long int types_extract_as_integer(const struct dbg_lvalue* lvalue) { long int rtn = 0; - DWORD tag, size, bt; - DWORD64 size64; + long long int val; + DWORD tag, bt; + DWORD64 size; if (lvalue->type.id == dbg_itype_none || !types_get_info(&lvalue->type, TI_GET_SYMTAG, &tag)) return 0; + if (lvalue->type.id == dbg_itype_segptr) + { + return (long int)memory_to_linear_addr(&lvalue->addr); + } + switch (tag) { case SymTagBaseType: - if (!types_get_info(&lvalue->type, TI_GET_LENGTH, &size64) || + if (!types_get_info(&lvalue->type, TI_GET_LENGTH, &size) || !types_get_info(&lvalue->type, TI_GET_BASETYPE, &bt)) { WINE_ERR("Couldn't get information\n"); RaiseException(DEBUG_STATUS_INTERNAL_ERROR, 0, 0, NULL); } - if (size64 > sizeof(rtn)) + if (size > sizeof(rtn)) { - WINE_ERR("Size too large (%s)\n", wine_dbgstr_longlong(size64)); + WINE_ERR("Size too large (%s)\n", wine_dbgstr_longlong(size)); return 0; } - size = (DWORD)size64; - /* FIXME: we have an ugly & non portable thing here !!! */ - if (!memory_read_value(lvalue, size, &rtn)) return 0; - - /* now let's do some promotions !! */ switch (bt) { + case btChar: case btInt: - /* propagate sign information */ - if (((size & 3) != 0) && (rtn >> (size * 8 - 1)) != 0) - rtn |= (-1) << (size * 8); + if (!be_cpu->fetch_integer(lvalue, (unsigned)size, TRUE, &val)) return 0; + rtn = (long)val; break; case btUInt: - case btChar: + if (!be_cpu->fetch_integer(lvalue, (unsigned)size, FALSE, &val)) return 0; + rtn = (DWORD)(DWORD64)val; break; case btFloat: RaiseException(DEBUG_STATUS_NOT_AN_INTEGER, 0, 0, NULL); @@ -100,6 +102,24 @@ long int types_extract_as_integer(const } /****************************************************************** + * types_extract_as_address + * + * + */ +void types_extract_as_address(const struct dbg_lvalue* lvalue, ADDRESS* addr) +{ + if (lvalue->type.id == dbg_itype_segptr && lvalue->type.module == 0) + { + *addr = lvalue->addr; + } + else + { + addr->Mode = AddrModeFlat; + addr->Offset = types_extract_as_integer( lvalue ); + } +} + +/****************************************************************** * types_deref * */ @@ -773,6 +793,15 @@ BOOL types_get_info(const struct dbg_typ default: WINE_FIXME("unsupported %u for a string\n", ti); return FALSE; } break; + case dbg_itype_segptr: + switch (ti) + { + case TI_GET_SYMTAG: X(DWORD) = SymTagBaseType; break; + case TI_GET_LENGTH: X(DWORD64) = 4; break; + case TI_GET_BASETYPE: X(DWORD) = btInt; break; + default: WINE_FIXME("unsupported %u for seg-ptr\n", ti); return FALSE; + } + break; default: WINE_FIXME("unsupported type id 0x%lx\n", type->id); } diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index e891514..87f9a02 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -58,8 +58,6 @@ * o bitfield size is on a 4-bytes * + array_index and deref should be the same function (or should share the same * core) - * + segmented pointers are not correctly handled (and are hacked throughout the - * code by testing against itype_none) * - execution: * + set a better fix for gdb (proxy mode) than the step-mode hack * + implement function call in debuggee

1 0

Alexandre Julliard : libwine: Added LDT support for MacOS/x86.
by Alexandre Julliard Jan. 23, 2006

Jan. 23, 2006

Module: wine Branch: refs/heads/master Commit: 4d3996d51572fec9ff26a421fa95d64393983cf6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4d3996d51572fec9ff26a42… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 23 12:02:58 2006 +0100 libwine: Added LDT support for MacOS/x86. --- libs/wine/ldt.c | 33 +++++++-------------------------- 1 files changed, 7 insertions(+), 26 deletions(-) diff --git a/libs/wine/ldt.c b/libs/wine/ldt.c index 9f70f11..ab277e1 100644 --- a/libs/wine/ldt.c +++ b/libs/wine/ldt.c @@ -117,22 +117,8 @@ extern int i386_set_ldt(int, union descr #endif /* __NetBSD__ || __FreeBSD__ || __OpenBSD__ */ #ifdef __APPLE__ - -static inline int thread_set_user_ldt( const void *addr, unsigned int size, unsigned int flags ) -{ - int ret; - __asm__ __volatile__ ("pushl %4\n\t" - "pushl %3\n\t" - "pushl %2\n\t" - "pushl $0\n\t" - "lcall $0x3b,$0\n\t" - "leal 16(%%esp),%%esp" - : "=a" (ret) - : "0" (4 /*thread_set_user_ldt*/), "r" (addr), "r" (size), "r" (flags) ); - return ret; -} - -#endif /* __APPLE__ */ +#include <i386/user_ldt.h> +#endif #endif /* __i386__ */ @@ -242,6 +228,9 @@ static int internal_set_entry( unsigned ldt_mod.acc2 = entry->HighWord.Bytes.Flags2 >> 4; if ((ret = sysi86(SI86DSCR, &ldt_mod)) == -1) perror("sysi86"); } +#elif defined(__APPLE__) + if ((ret = i386_set_ldt(index, (union ldt_entry *)entry, 1)) < 0) + perror("i386_set_ldt"); #else fprintf( stderr, "No LDT support on this platform\n" ); exit(1); @@ -423,11 +412,7 @@ unsigned short wine_ldt_alloc_fs(void) if (errno != ENOSYS) perror( "set_thread_area" ); } else global_fs_sel = (ldt_info.entry_number << 3) | 3; -#elif defined(__APPLE__) - int ret = thread_set_user_ldt( NULL, 0, 0 ); - if (ret != -1) global_fs_sel = ret; - else global_fs_sel = 0; -#endif /* __APPLE__ */ +#endif } if (global_fs_sel > 0) return global_fs_sel; return wine_ldt_alloc_entries( 1 ); @@ -453,11 +438,7 @@ void wine_ldt_init_fs( unsigned short se ldt_info.entry_number = sel >> 3; fill_modify_ldt_struct( &ldt_info, entry ); if ((ret = set_thread_area( &ldt_info ) < 0)) perror( "set_thread_area" ); -#elif defined(__APPLE__) - int ret = thread_set_user_ldt( wine_ldt_get_base(entry), wine_ldt_get_limit(entry), 0 ); - if (ret == -1) perror( "thread_set_user_ldt" ); - else assert( ret == global_fs_sel ); -#endif /* __APPLE__ */ +#endif } else /* LDT selector */ {

1 0

Dmitry Timoshkov : user32: Make GetMenuItemInfo tests pass under Wine.
by Alexandre Julliard Jan. 23, 2006

Jan. 23, 2006

Module: wine Branch: refs/heads/master Commit: 9b1ea63bf9422e12ef126627a9cf42740baf62ec URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9b1ea63bf9422e12ef12662… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Jan 23 11:59:21 2006 +0100 user32: Make GetMenuItemInfo tests pass under Wine. - Change menu item search algorithm to recurse into a submenu first. - Fallback to a found submenu if nothing else was found. --- dlls/user/menu.c | 17 +++++++---- dlls/user/tests/menu.c | 73 ++++++++++++++++++++---------------------------- 2 files changed, 41 insertions(+), 49 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=9b1ea63bf9422e12ef1…

1 0

Robert Shearman : msi: Support msidbControlAttributesSunken.
by Alexandre Julliard Jan. 23, 2006

Jan. 23, 2006

Module: wine Branch: refs/heads/master Commit: 04f547dc50afd3ca3624270866c7e282a893749c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=04f547dc50afd3ca3624270… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Jan 23 11:55:33 2006 +0100 msi: Support msidbControlAttributesSunken. --- dlls/msi/dialog.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index c3b305e..ebdfb7d 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -314,7 +314,7 @@ static UINT msi_dialog_build_font_list( } static msi_control *msi_dialog_create_window( msi_dialog *dialog, - MSIRECORD *rec, LPCWSTR szCls, LPCWSTR name, LPCWSTR text, + MSIRECORD *rec, DWORD exstyle, LPCWSTR szCls, LPCWSTR name, LPCWSTR text, DWORD style, HWND parent ) { DWORD x, y, width, height; @@ -351,7 +351,7 @@ static msi_control *msi_dialog_create_wi font = msi_dialog_get_style( title_font, &title ); } - control->hwnd = CreateWindowW( szCls, title, style, + control->hwnd = CreateWindowExW( exstyle, szCls, title, style, x, y, width, height, parent, NULL, NULL, NULL ); TRACE("Dialog %s control %s hwnd %p\n", @@ -520,6 +520,7 @@ static msi_control *msi_dialog_add_contr { DWORD attributes; LPCWSTR text, name; + DWORD exstyle = 0; name = MSI_RecordGetString( rec, 2 ); attributes = MSI_RecordGetInteger( rec, 8 ); @@ -528,11 +529,13 @@ static msi_control *msi_dialog_add_contr style |= WS_VISIBLE; if( ~attributes & msidbControlAttributesEnabled ) style |= WS_DISABLED; + if( attributes & msidbControlAttributesSunken ) + exstyle |= WS_EX_CLIENTEDGE; msi_dialog_map_events(dialog, name); - return msi_dialog_create_window( dialog, rec, szCls, name, text, - style, dialog->hwnd ); + return msi_dialog_create_window( dialog, rec, exstyle, szCls, name, + text, style, dialog->hwnd ); } struct msi_text_info @@ -1335,7 +1338,7 @@ static UINT msi_dialog_create_radiobutto if( ~attributes & 2 ) style |= WS_DISABLED; - control = msi_dialog_create_window( dialog, rec, szButton, name, text, + control = msi_dialog_create_window( dialog, rec, 0, szButton, name, text, style, group->parent->hwnd ); if (!control) return ERROR_FUNCTION_FAILED;

1 0

Robert Shearman : msi: Only print fixme for progress attribute once.
by Alexandre Julliard Jan. 23, 2006

Jan. 23, 2006

Module: wine Branch: refs/heads/master Commit: 33fa9d08dd02ddcd4ac05ee61f2f1b907600dd94 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=33fa9d08dd02ddcd4ac05ee… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Jan 23 11:55:19 2006 +0100 msi: Only print fixme for progress attribute once. Since setting the Progress attribute is done quite frequently, don't flood the user with messages about it being unimplemented. --- dlls/msi/dialog.c | 26 +++++++++++++++++++------- 1 files changed, 19 insertions(+), 7 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 76d4d06..c3b305e 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -111,6 +111,7 @@ const WCHAR szMsiHiddenWindow[] = { static const WCHAR szStatic[] = { 'S','t','a','t','i','c',0 }; static const WCHAR szButton[] = { 'B','U','T','T','O','N', 0 }; static const WCHAR szButtonData[] = { 'M','S','I','D','A','T','A',0 }; +static const WCHAR szProgress[] = { 'P','r','o','g','r','e','s','s',0 }; static const WCHAR szText[] = { 'T','e','x','t',0 }; static const WCHAR szPushButton[] = { 'P','u','s','h','B','u','t','t','o','n',0 }; static const WCHAR szLine[] = { 'L','i','n','e',0 }; @@ -467,16 +468,27 @@ void msi_dialog_handle_event( msi_dialog ctrl = msi_dialog_find_control( dialog, control ); if (!ctrl) return; - if( lstrcmpW(attribute, szText) ) + if( !lstrcmpW(attribute, szText) ) { - ERR("Attribute %s\n", debugstr_w(attribute)); + font_text = MSI_RecordGetString( rec , 1 ); + font = msi_dialog_get_style( font_text, &text ); + SetWindowTextW( ctrl->hwnd, text ); + msi_free( font ); + msi_dialog_check_messages( NULL ); + } + else if( !lstrcmpW(attribute, szProgress) ) + { + /* FIXME: should forward to progress bar */ + static int display_fixme = 1; + if (display_fixme) + FIXME("Attribute %s not being set\n", debugstr_w(attribute)); + display_fixme = 0; + } + else + { + FIXME("Attribute %s not being set\n", debugstr_w(attribute)); return; } - font_text = MSI_RecordGetString( rec , 1 ); - font = msi_dialog_get_style( font_text, &text ); - SetWindowTextW( ctrl->hwnd, text ); - msi_free( font ); - msi_dialog_check_messages( NULL ); } static void msi_dialog_map_events(msi_dialog* dialog, LPCWSTR control)

1 0

Mike McCormack : crypt32: Add stub implementations of some crypto functions used by IE6 install.
by Alexandre Julliard Jan. 23, 2006

Jan. 23, 2006

Module: wine Branch: refs/heads/master Commit: e2020e1b7e06ba1e386ff4bc419419d648dce95c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e2020e1b7e06ba1e386ff4b… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon Jan 23 11:54:58 2006 +0100 crypt32: Add stub implementations of some crypto functions used by IE6 install. --- dlls/crypt32/crypt32.spec | 4 ++-- dlls/crypt32/main.c | 12 ++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index 0bf70de..52395d2 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -175,10 +175,10 @@ @ stdcall I_CryptFreeTls(long long) @ stub I_CryptGetDefaultCryptProv @ stub I_CryptGetDefaultCryptProvForEncrypt -@ stub I_CryptGetOssGlobal +@ stdcall I_CryptGetOssGlobal(long) @ stdcall I_CryptGetTls(long) @ stub I_CryptInsertLruEntry -@ stub I_CryptInstallOssGlobal +@ stdcall I_CryptInstallOssGlobal(long long long) @ stub I_CryptReleaseLruEntry @ stdcall I_CryptSetTls(long ptr) @ stub I_CryptUninstallOssGlobal diff --git a/dlls/crypt32/main.c b/dlls/crypt32/main.c index 53c6000..7a9c6f1 100644 --- a/dlls/crypt32/main.c +++ b/dlls/crypt32/main.c @@ -352,3 +352,15 @@ BOOL WINAPI I_CryptFreeTls(DWORD dwTlsIn TRACE("(%ld, %ld)\n", dwTlsIndex, unknown); return TlsFree(dwTlsIndex); } + +BOOL WINAPI I_CryptGetOssGlobal(DWORD x) +{ + FIXME("%08lx\n", x); + return FALSE; +} + +BOOL WINAPI I_CryptInstallOssGlobal(DWORD x, DWORD y, DWORD z) +{ + FIXME("%08lx %08lx %08lx\n", x, y, z); + return FALSE; +}

1 0

Alexandre Julliard : winebuild: Always import atof, the MS version is different.
by Alexandre Julliard Jan. 23, 2006

Jan. 23, 2006

Module: wine Branch: refs/heads/master Commit: 3f0a473fb787da1c4833052b41d2a1c7290eb20f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3f0a473fb787da1c4833052… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 23 11:27:04 2006 +0100 winebuild: Always import atof, the MS version is different. --- tools/winebuild/import.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 80c3d25..d97d58d 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -78,7 +78,6 @@ static const char * const default_ignore "asin", "atan", "atan2", - "atof", "atoi", "atol", "bsearch",

1 0

H. Verbeet : d3d8: For render states D3DRS_POINTSPRITEENABLE and
by Alexandre Julliard Jan. 23, 2006

Jan. 23, 2006

Module: wine Branch: refs/heads/master Commit: ac1618179054c1e7f8a2e89f676d83ac879ea413 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ac1618179054c1e7f8a2e89… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Jan 23 11:26:25 2006 +0100 d3d8: For render states D3DRS_POINTSPRITEENABLE and D3DRS_MULTISAMPLEANTIALIAS, use GL_SUPPORT correctly. --- dlls/d3d8/device.c | 44 +++++++++++++++++++------------------------- 1 files changed, 19 insertions(+), 25 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 363052d..4952d6e 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -3083,39 +3083,33 @@ HRESULT WINAPI IDirect3DDevice8Impl_Se } case D3DRS_POINTSPRITEENABLE : { - if(Value) { - if(GL_SUPPORT(GL_ARB_point_sprite)) { - glEnable(GL_POINT_SPRITE_ARB); - checkGLcall("glEnable GL_POINT_SPRITE_ARB"); - } else { - TRACE("Point sprites cannot be enabled in this version of opengl\n"); - } + if (!GL_SUPPORT(ARB_POINT_SPRITE)) { + TRACE("Point sprites not supported\n"); + break; + } + + if (Value) { + glEnable(GL_POINT_SPRITE_ARB); + checkGLcall("glEnable GL_POINT_SPRITE_ARB"); } else { - if(GL_SUPPORT(GL_ARB_point_sprite)) { - glDisable(GL_POINT_SPRITE_ARB); - checkGLcall("glDisable GL_POINT_SPRITE_ARB"); - } else { - TRACE("Point sprites cannot be disabled in this version of opengl\n"); - } + glDisable(GL_POINT_SPRITE_ARB); + checkGLcall("glDisable GL_POINT_SPRITE_ARB"); } break; } case D3DRS_MULTISAMPLEANTIALIAS : { + if (!GL_SUPPORT(ARB_MULTISAMPLE)) { + TRACE("Multisample antialiasing not supported\n"); + break; + } + if(Value) { - if(GL_SUPPORT(GL_ARB_multisample)) { - glEnable(GL_MULTISAMPLE_ARB); - checkGLcall("glEnable GL_MULTISAMPLE_ARB"); - } else { - TRACE("Multisample antialiasing cannot be enabled in this version of opengl\n"); - } + glEnable(GL_MULTISAMPLE_ARB); + checkGLcall("glEnable GL_MULTISAMPLE_ARB"); } else { - if(GL_SUPPORT(GL_ARB_multisample)) { - glDisable(GL_MULTISAMPLE_ARB); - checkGLcall("glDisable GL_MULTISAMPLE_ARB"); - } else { - TRACE("Multisample antialiasing cannot be disabled in this version of opengl\n"); - } + glDisable(GL_MULTISAMPLE_ARB); + checkGLcall("glDisable GL_MULTISAMPLE_ARB"); } break; }

1 0

H. Verbeet : d3d8: Add GL_ARB_multisample definitions.
by Alexandre Julliard Jan. 23, 2006

Jan. 23, 2006

Module: wine Branch: refs/heads/master Commit: 66770e4ca0a06429d76c557e2a4716b2369b5fc6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=66770e4ca0a06429d76c557… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Jan 23 11:26:15 2006 +0100 d3d8: Add GL_ARB_multisample definitions. --- dlls/d3d8/d3dcore_gl.h | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/d3dcore_gl.h b/dlls/d3d8/d3dcore_gl.h index 6bacc5f..31d72ae 100644 --- a/dlls/d3d8/d3dcore_gl.h +++ b/dlls/d3d8/d3dcore_gl.h @@ -599,6 +599,21 @@ typedef void (APIENTRY * PGLFNGETCOMBINE #define GL_COORD_REPLACE_ARB 0x8862 #endif +/* GL_ARB_multisample */ +#ifndef GL_ARB_multisample +#define GL_ARB_multisample 1 +#define GL_MULTISAMPLE_ARB 0x809D +#define GL_SAMPLE_ALPHA_TO_COVERAGE_ARB 0x809E +#define GL_SAMPLE_ALPHA_TO_ONE_ARB 0x809F +#define GL_SAMPLE_COVERAGE_ARB 0x80A0 +#define GL_SAMPLE_BUFFERS_ARB 0x80A8 +#define GL_SAMPLES_ARB 0x80A9 +#define GL_SAMPLE_COVERAGE_VALUE_ARB 0x80AA +#define GL_SAMPLE_COVERAGE_INVERT_ARB 0x80AB +#define GL_MULTISAMPLE_BIT_ARB 0x20000000 +#endif +typedef void (APIENTRY * PGLFNSAMPLECOVERAGEARBPROC) (GLclampf value, GLboolean invert); + /******* * OpenGL Official Version * defines

1 0

H. Verbeet : d3d8: Add detection for GL_ARB_point_sprite support.
by Alexandre Julliard Jan. 23, 2006

Jan. 23, 2006

Module: wine Branch: refs/heads/master Commit: 76319f7c8daf5bd59991042916482144fea8e794 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=76319f7c8daf5bd59991042… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Jan 23 11:24:27 2006 +0100 d3d8: Add detection for GL_ARB_point_sprite support. --- dlls/d3d8/d3dcore_gl.h | 1 + dlls/d3d8/directx.c | 3 +++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/d3dcore_gl.h b/dlls/d3d8/d3dcore_gl.h index 173ee74..6bacc5f 100644 --- a/dlls/d3d8/d3dcore_gl.h +++ b/dlls/d3d8/d3dcore_gl.h @@ -656,6 +656,7 @@ typedef enum _GL_SupportedExt { ARB_MULTISAMPLE, ARB_MULTITEXTURE, ARB_POINT_PARAMETERS, + ARB_POINT_SPRITE, ARB_TEXTURE_COMPRESSION, ARB_TEXTURE_CUBE_MAP, ARB_TEXTURE_ENV_ADD, diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index 9454aa8..a324855 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -398,6 +398,9 @@ static void IDirect3D8Impl_FillGLCaps(LP TRACE_(d3d_caps)(" FOUND: ARB Multitexture support - GL_MAX_TEXTURE_UNITS_ARB=%u\n", gl_max); This->gl_info.supported[ARB_MULTITEXTURE] = TRUE; This->gl_info.max_textures = min(8, gl_max); + } else if (strcmp(ThisExtn, "GL_ARB_point_sprite") == 0) { + TRACE_(d3d_caps)(" FOUND: ARB Point sprite support\n"); + This->gl_info.supported[ARB_POINT_SPRITE] = TRUE; } else if (strcmp(ThisExtn, "GL_ARB_texture_cube_map") == 0) { TRACE_(d3d_caps)(" FOUND: ARB Texture Cube Map support\n"); This->gl_info.supported[ARB_TEXTURE_CUBE_MAP] = TRUE;

1 0