December 2010 - Wine-commits

Nikolay Sivov : oleaut32: Use function description layout instead of hardcoded byte offsets.
by Alexandre Julliard 28 Dec '10

28 Dec '10

Module: wine Branch: master Commit: b3514b4718cc87f5c0ceff479bf8c52906c00309 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3514b4718cc87f5c0ceff479… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 27 23:53:02 2010 +0300 oleaut32: Use function description layout instead of hardcoded byte offsets. --- dlls/oleaut32/typelib.c | 83 ++++++++++++++++++++-------------------------- dlls/oleaut32/typelib.h | 24 ++++++------- 2 files changed, 47 insertions(+), 60 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 72e1932..8482afe 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -1906,11 +1906,11 @@ MSFT_DoFuncs(TLBContext* pcx, * in the first part of this file segment. */ - int infolen, nameoffset, reclength, nrattributes, i; + int infolen, nameoffset, reclength, i; int recoffset = offset + sizeof(INT); char *recbuf = HeapAlloc(GetProcessHeap(), 0, 0xffff); - MSFT_FuncRecord * pFuncRec=(MSFT_FuncRecord *) recbuf; + MSFT_FuncRecord *pFuncRec = (MSFT_FuncRecord*)recbuf; TLBFuncDesc *ptfd_prev = NULL; TRACE_(typelib)("\n"); @@ -1919,6 +1919,8 @@ MSFT_DoFuncs(TLBContext* pcx, for ( i = 0; i < cFuncs ; i++ ) { + int optional; + *pptfd = TLB_Alloc(sizeof(TLBFuncDesc)); /* name, eventually add to a hash table */ @@ -1933,56 +1935,40 @@ MSFT_DoFuncs(TLBContext* pcx, (*pptfd)->Name = MSFT_ReadName(pcx, nameoffset); /* read the function information record */ - MSFT_ReadLEDWords(&reclength, sizeof(INT), pcx, recoffset); + MSFT_ReadLEDWords(&reclength, sizeof(pFuncRec->Info), pcx, recoffset); reclength &= 0xffff; - MSFT_ReadLEDWords(pFuncRec, reclength - sizeof(INT), pcx, DO_NOT_SEEK); + MSFT_ReadLEDWords(&pFuncRec->DataType, reclength - FIELD_OFFSET(MSFT_FuncRecord, DataType), pcx, DO_NOT_SEEK); - /* do the attributes */ - nrattributes = (reclength - pFuncRec->nrargs * 3 * sizeof(int) - 0x18) - / sizeof(int); + /* size without argument data */ + optional = reclength - pFuncRec->nrargs*sizeof(MSFT_ParameterInfo); - if ( nrattributes > 0 ) - { - (*pptfd)->helpcontext = pFuncRec->OptAttr[0] ; + if (optional > FIELD_OFFSET(MSFT_FuncRecord, HelpContext)) + (*pptfd)->helpcontext = pFuncRec->HelpContext; - if ( nrattributes > 1 ) - { - (*pptfd)->HelpString = MSFT_ReadString(pcx, - pFuncRec->OptAttr[1]) ; + if (optional > FIELD_OFFSET(MSFT_FuncRecord, oHelpString)) + (*pptfd)->HelpString = MSFT_ReadString(pcx, pFuncRec->oHelpString); - if ( nrattributes > 2 ) - { - if ( pFuncRec->FKCCIC & 0x2000 ) - { - if (!IS_INTRESOURCE(pFuncRec->OptAttr[2])) - ERR("ordinal 0x%08x invalid, IS_INTRESOURCE is false\n", pFuncRec->OptAttr[2]); - (*pptfd)->Entry = (BSTR)(DWORD_PTR)LOWORD(pFuncRec->OptAttr[2]); - } - else - { - (*pptfd)->Entry = MSFT_ReadString(pcx, - pFuncRec->OptAttr[2]); - } - if( nrattributes > 5 ) - { - (*pptfd)->HelpStringContext = pFuncRec->OptAttr[5] ; - - if ( nrattributes > 6 && pFuncRec->FKCCIC & 0x80 ) - { - MSFT_CustData(pcx, - pFuncRec->OptAttr[6], - &(*pptfd)->pCustData); - } - } - } - else - { - (*pptfd)->Entry = (BSTR)-1; - } + if (optional > FIELD_OFFSET(MSFT_FuncRecord, oEntry)) + { + if (pFuncRec->FKCCIC & 0x2000 ) + { + if (!IS_INTRESOURCE(pFuncRec->oEntry)) + ERR("ordinal 0x%08x invalid, IS_INTRESOURCE is false\n", pFuncRec->oEntry); + (*pptfd)->Entry = (BSTR)(DWORD_PTR)LOWORD(pFuncRec->oEntry); } + else + (*pptfd)->Entry = MSFT_ReadString(pcx, pFuncRec->oEntry); } + else + (*pptfd)->Entry = (BSTR)-1; + + if (optional > FIELD_OFFSET(MSFT_FuncRecord, HelpStringContext)) + (*pptfd)->HelpStringContext = pFuncRec->HelpStringContext; + + if (optional > FIELD_OFFSET(MSFT_FuncRecord, oCustData) && pFuncRec->FKCCIC & 0x80) + MSFT_CustData(pcx, pFuncRec->oCustData, &(*pptfd)->pCustData); /* fill the FuncDesc Structure */ MSFT_ReadLEDWords( & (*pptfd)->funcdesc.memid, sizeof(INT), pcx, @@ -2047,7 +2033,7 @@ MSFT_DoFuncs(TLBContext* pcx, { INT* pInt = (INT *)((char *)pFuncRec + reclength - - (pFuncRec->nrargs * 4 + 1) * sizeof(INT) ); + (pFuncRec->nrargs * 4) * sizeof(INT) ); PARAMDESC* pParamDesc = &elemdesc->u.paramdesc; @@ -2059,11 +2045,14 @@ MSFT_DoFuncs(TLBContext* pcx, } else elemdesc->u.paramdesc.pparamdescex = NULL; + /* custom info */ - if ( nrattributes > 7 + j && pFuncRec->FKCCIC & 0x80 ) + if (optional > (FIELD_OFFSET(MSFT_FuncRecord, oArgCustData) + + j*sizeof(pFuncRec->oArgCustData[0])) && + pFuncRec->FKCCIC & 0x80 ) { MSFT_CustData(pcx, - pFuncRec->OptAttr[7+j], + pFuncRec->oArgCustData[j], &(*pptfd)->pParamDesc[j].pCustData); } @@ -2120,7 +2109,7 @@ static void MSFT_DoVars(TLBContext *pcx, ITypeInfoImpl *pTI, int cFuncs, (*pptvd)->HelpContext = pVarRec->HelpContext; if(reclength > FIELD_OFFSET(MSFT_VarRecord, oHelpString)) - (*pptvd)->HelpString = MSFT_ReadString(pcx, pVarRec->oHelpString) ; + (*pptvd)->HelpString = MSFT_ReadString(pcx, pVarRec->oHelpString); if(reclength > FIELD_OFFSET(MSFT_VarRecord, HelpStringContext)) (*pptvd)->HelpStringContext = pVarRec->HelpStringContext; diff --git a/dlls/oleaut32/typelib.h b/dlls/oleaut32/typelib.h index 210db33..6649407 100644 --- a/dlls/oleaut32/typelib.h +++ b/dlls/oleaut32/typelib.h @@ -177,7 +177,7 @@ typedef struct tagMSFT_ImpInfo { /* function description data */ typedef struct { -/* INT recsize; record size including some xtra stuff */ + INT Info; /* record size including some extra stuff */ INT DataType; /* data type of the member, eg return of function */ INT Flags; /* something to do with attribute flags (LOWORD) */ #ifdef WORDS_BIGENDIAN @@ -202,19 +202,17 @@ typedef struct { INT16 nrargs; /* number of arguments (including optional ????) */ INT16 nroargs; /* nr of optional arguments */ #endif + /* optional attribute fields, the number of them is variable */ - INT OptAttr[1]; -/* -0* INT helpcontext; -1* INT oHelpString; -2* INT oEntry; // either offset in string table or numeric as it is // -3* INT res9; // unknown (-1) // -4* INT resA; // unknown (-1) // -5* INT HelpStringContext; - // these are controlled by a bit set in the FKCCIC field // -6* INT oCustData; // custom data for function // -7* INT oArgCustData[1]; // custom data per argument // -*/ + INT HelpContext; + INT oHelpString; + INT oEntry; /* either offset in string table or numeric as it is */ + INT res9; /* unknown (-1) */ + INT resA; /* unknown (-1) */ + INT HelpStringContext; + /* these are controlled by a bit set in the FKCCIC field */ + INT oCustData; /* custom data for function */ + INT oArgCustData[1]; /* custom data per argument */ } MSFT_FuncRecord; /* after this may follow an array with default value pointers if the

1 0

Michael Stefaniuc : msxml3: Standardize the COM usage in saxreader.c.
by Alexandre Julliard 28 Dec '10

28 Dec '10

Module: wine Branch: master Commit: 13e1997860503b8583d08548cfb3bfa6cca60fa8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13e1997860503b8583d08548c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 27 23:12:06 2010 +0100 msxml3: Standardize the COM usage in saxreader.c. --- dlls/msxml3/saxreader.c | 204 ++++++++++++++++++---------------------------- 1 files changed, 80 insertions(+), 124 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=13e1997860503b8583d08…

1 0

Eric Pouech : dbghelp: Factorize a bit the ELF enumeration callbacks.
by Alexandre Julliard 28 Dec '10

28 Dec '10

Module: wine Branch: master Commit: 8740f1dc1e4d0f2d831c0928f66456bfcaefe82d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8740f1dc1e4d0f2d831c0928f… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Dec 27 15:03:12 2010 +0100 dbghelp: Factorize a bit the ELF enumeration callbacks. --- dlls/dbghelp/elf_module.c | 128 +++++++++++++++++++++----------------------- 1 files changed, 61 insertions(+), 67 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index b3502ca..b8ddfcb 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -1279,65 +1279,6 @@ static BOOL elf_enum_modules_internal(const struct process* pcs, return TRUE; } -struct elf_sync -{ - struct process* pcs; - struct elf_info elf_info; -}; - -static BOOL elf_enum_sync_cb(const WCHAR* name, unsigned long load_addr, - unsigned long dyn_addr, void* user) -{ - struct elf_sync* es = user; - - elf_search_and_load_file(es->pcs, name, load_addr, dyn_addr, &es->elf_info); - return TRUE; -} - -/****************************************************************** - * elf_synchronize_module_list - * - * this functions rescans the debuggee module's list and synchronizes it with - * the one from 'pcs', ie: - * - if a module is in debuggee and not in pcs, it's loaded into pcs - * - if a module is in pcs and not in debuggee, it's unloaded from pcs - */ -BOOL elf_synchronize_module_list(struct process* pcs) -{ - struct module* module; - struct elf_sync es; - - for (module = pcs->lmodules; module; module = module->next) - { - if (module->type == DMT_ELF && !module->is_virtual) - module->format_info[DFI_ELF]->u.elf_info->elf_mark = 0; - } - - es.pcs = pcs; - es.elf_info.flags = ELF_INFO_MODULE; - if (!elf_enum_modules_internal(pcs, NULL, elf_enum_sync_cb, &es)) - return FALSE; - - module = pcs->lmodules; - while (module) - { - if (module->type == DMT_ELF && !module->is_virtual) - { - struct elf_module_info* elf_info = module->format_info[DFI_ELF]->u.elf_info; - - if (!elf_info->elf_mark && !elf_info->elf_loader) - { - module_remove(pcs, module); - /* restart all over */ - module = pcs->lmodules; - continue; - } - } - module = module->next; - } - return TRUE; -} - /****************************************************************** * elf_search_loader * @@ -1440,19 +1381,25 @@ static BOOL elf_load_cb(const WCHAR* name, unsigned long load_addr, unsigned long dyn_addr, void* user) { struct elf_load* el = user; + BOOL ret = TRUE; const WCHAR* p; - /* memcmp is needed for matches when bufstr contains also version information - * el->name: libc.so, name: libc.so.6.0 - */ - p = strrchrW(name, '/'); - if (!p++) p = name; - if (!memcmp(p, el->name, lstrlenW(el->name) * sizeof(WCHAR))) + if (el->name) + { + /* memcmp is needed for matches when bufstr contains also version information + * el->name: libc.so, name: libc.so.6.0 + */ + p = strrchrW(name, '/'); + if (!p++) p = name; + } + + if (!el->name || !memcmp(p, el->name, lstrlenW(el->name) * sizeof(WCHAR))) { el->ret = elf_search_and_load_file(el->pcs, name, load_addr, dyn_addr, &el->elf_info); - return FALSE; + if (el->name) ret = FALSE; } - return TRUE; + + return ret; } /****************************************************************** @@ -1494,6 +1441,53 @@ struct module* elf_load_module(struct process* pcs, const WCHAR* name, unsigned return el.elf_info.module; } +/****************************************************************** + * elf_synchronize_module_list + * + * this functions rescans the debuggee module's list and synchronizes it with + * the one from 'pcs', ie: + * - if a module is in debuggee and not in pcs, it's loaded into pcs + * - if a module is in pcs and not in debuggee, it's unloaded from pcs + */ +BOOL elf_synchronize_module_list(struct process* pcs) +{ + struct module* module; + struct elf_load el; + + for (module = pcs->lmodules; module; module = module->next) + { + if (module->type == DMT_ELF && !module->is_virtual) + module->format_info[DFI_ELF]->u.elf_info->elf_mark = 0; + } + + el.pcs = pcs; + el.elf_info.flags = ELF_INFO_MODULE; + el.ret = FALSE; + el.name = NULL; /* fetch all modules */ + + if (!elf_enum_modules_internal(pcs, NULL, elf_load_cb, &el)) + return FALSE; + + module = pcs->lmodules; + while (module) + { + if (module->type == DMT_ELF && !module->is_virtual) + { + struct elf_module_info* elf_info = module->format_info[DFI_ELF]->u.elf_info; + + if (!elf_info->elf_mark && !elf_info->elf_loader) + { + module_remove(pcs, module); + /* restart all over */ + module = pcs->lmodules; + continue; + } + } + module = module->next; + } + return TRUE; +} + #else /* !__ELF__ */ BOOL elf_find_section(struct image_file_map* fmap, const char* name,

1 0

Eric Pouech : dbghelp: Split elf_load_file into two functions ( one for creating a file-map, another one for loading info out of a file-map ).
by Alexandre Julliard 28 Dec '10

28 Dec '10

Module: wine Branch: master Commit: 655247354a5396147ac9ad766509020c2f2f6dee URL: http://source.winehq.org/git/wine.git/?a=commit;h=655247354a5396147ac9ad766… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Dec 27 15:03:18 2010 +0100 dbghelp: Split elf_load_file into two functions (one for creating a file-map, another one for loading info out of a file-map). --- dlls/dbghelp/elf_module.c | 97 +++++++++++++++++++++++++-------------------- 1 files changed, 54 insertions(+), 43 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index b8ddfcb..53b7f55 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -987,51 +987,27 @@ BOOL elf_fetch_file_info(const WCHAR* name, DWORD_PTR* base, return TRUE; } -/****************************************************************** - * elf_load_file - * - * Loads the information for ELF module stored in 'filename' - * the module has been loaded at 'load_offset' address - * returns - * -1 if the file cannot be found/opened - * 0 if the file doesn't contain symbolic info (or this info cannot be - * read or parsed) - * 1 on success - */ -static BOOL elf_load_file(struct process* pcs, const WCHAR* filename, - unsigned long load_offset, unsigned long dyn_addr, - struct elf_info* elf_info) +static BOOL elf_load_file_from_fmap(struct process* pcs, const WCHAR* filename, + struct image_file_map* fmap, unsigned long load_offset, + unsigned long dyn_addr, struct elf_info* elf_info) { - BOOL ret = FALSE; - struct image_file_map fmap; - - TRACE("Processing elf file '%s' at %08lx\n", debugstr_w(filename), load_offset); - - if (!elf_map_file(filename, &fmap)) return ret; - - /* Next, we need to find a few of the internal ELF headers within - * this thing. We need the main executable header, and the section - * table. - */ - if (!fmap.u.elf.elf_start && !load_offset) - ERR("Relocatable ELF %s, but no load address. Loading at 0x0000000\n", - debugstr_w(filename)); + BOOL ret = FALSE; if (elf_info->flags & ELF_INFO_DEBUG_HEADER) { struct image_section_map ism; - if (elf_find_section(&fmap, ".dynamic", SHT_DYNAMIC, &ism)) + if (elf_find_section(fmap, ".dynamic", SHT_DYNAMIC, &ism)) { Elf_Dyn dyn; - char* ptr = (char*)fmap.u.elf.sect[ism.sidx].shdr.sh_addr; + char* ptr = (char*)fmap->u.elf.sect[ism.sidx].shdr.sh_addr; unsigned long len; do { if (!ReadProcessMemory(pcs->handle, ptr, &dyn, sizeof(dyn), &len) || len != sizeof(dyn)) - goto leave; + return ret; if (dyn.d_tag == DT_DEBUG) { elf_info->dbg_hdr_addr = dyn.d_un.d_ptr; @@ -1042,9 +1018,9 @@ static BOOL elf_load_file(struct process* pcs, const WCHAR* filename, } ptr += sizeof(dyn); } while (dyn.d_tag != DT_NULL); - if (dyn.d_tag == DT_NULL) goto leave; + if (dyn.d_tag == DT_NULL) return ret; } - elf_end_find(&fmap); + elf_end_find(fmap); } if (elf_info->flags & ELF_INFO_MODULE) @@ -1054,12 +1030,12 @@ static BOOL elf_load_file(struct process* pcs, const WCHAR* filename, struct image_section_map ism; unsigned long modbase = load_offset; - if (elf_find_section(&fmap, ".dynamic", SHT_DYNAMIC, &ism)) + if (elf_find_section(fmap, ".dynamic", SHT_DYNAMIC, &ism)) { unsigned long rva_dyn = elf_get_map_rva(&ism); TRACE("For module %s, got ELF (start=%lx dyn=%lx), link_map (start=%lx dyn=%lx)\n", - debugstr_w(filename), (unsigned long)fmap.u.elf.elf_start, rva_dyn, + debugstr_w(filename), (unsigned long)fmap->u.elf.elf_start, rva_dyn, load_offset, dyn_addr); if (dyn_addr && load_offset + rva_dyn != dyn_addr) { @@ -1067,19 +1043,19 @@ static BOOL elf_load_file(struct process* pcs, const WCHAR* filename, modbase = dyn_addr - rva_dyn; } } else WARN("For module %s, no .dynamic section\n", debugstr_w(filename)); - elf_end_find(&fmap); + elf_end_find(fmap); modfmt = HeapAlloc(GetProcessHeap(), 0, sizeof(struct module_format) + sizeof(struct elf_module_info)); - if (!modfmt) goto leave; + if (!modfmt) return FALSE; elf_info->module = module_new(pcs, filename, DMT_ELF, FALSE, modbase, - fmap.u.elf.elf_size, 0, calc_crc32(fmap.u.elf.fd)); + fmap->u.elf.elf_size, 0, calc_crc32(fmap->u.elf.fd)); if (!elf_info->module) { HeapFree(GetProcessHeap(), 0, modfmt); - goto leave; + return FALSE; } - elf_info->module->reloc_delta = elf_info->module->module.BaseOfImage - fmap.u.elf.elf_start; + elf_info->module->reloc_delta = elf_info->module->module.BaseOfImage - fmap->u.elf.elf_start; elf_module_info = (void*)(modfmt + 1); elf_info->module->format_info[DFI_ELF] = modfmt; modfmt->module = elf_info->module; @@ -1089,8 +1065,8 @@ static BOOL elf_load_file(struct process* pcs, const WCHAR* filename, elf_module_info->elf_addr = load_offset; - elf_module_info->file_map = fmap; - elf_reset_file_map(&fmap); + elf_module_info->file_map = *fmap; + elf_reset_file_map(fmap); if (dbghelp_options & SYMOPT_DEFERRED_LOADS) { elf_info->module->module.SymType = SymDeferred; @@ -1113,7 +1089,42 @@ static BOOL elf_load_file(struct process* pcs, const WCHAR* filename, } else ret = FALSE; } -leave: + + return ret; +} + +/****************************************************************** + * elf_load_file + * + * Loads the information for ELF module stored in 'filename' + * the module has been loaded at 'load_offset' address + * returns + * -1 if the file cannot be found/opened + * 0 if the file doesn't contain symbolic info (or this info cannot be + * read or parsed) + * 1 on success + */ +static BOOL elf_load_file(struct process* pcs, const WCHAR* filename, + unsigned long load_offset, unsigned long dyn_addr, + struct elf_info* elf_info) +{ + BOOL ret = FALSE; + struct image_file_map fmap; + + TRACE("Processing elf file '%s' at %08lx\n", debugstr_w(filename), load_offset); + + if (!elf_map_file(filename, &fmap)) return ret; + + /* Next, we need to find a few of the internal ELF headers within + * this thing. We need the main executable header, and the section + * table. + */ + if (!fmap.u.elf.elf_start && !load_offset) + ERR("Relocatable ELF %s, but no load address. Loading at 0x0000000\n", + debugstr_w(filename)); + + ret = elf_load_file_from_fmap(pcs, filename, &fmap, load_offset, dyn_addr, elf_info); + elf_unmap_file(&fmap); return ret;

1 0

Andrew Nguyen : wined3d: Handle the swapchain presentation interval with wglSwapIntervalEXT.
by Alexandre Julliard 27 Dec '10

27 Dec '10

Module: wine Branch: master Commit: 12880784fea51b8f9f8e60c159f442a0f9f8e8e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12880784fea51b8f9f8e60c15… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Mon Dec 27 06:44:21 2010 -0600 wined3d: Handle the swapchain presentation interval with wglSwapIntervalEXT. --- dlls/wined3d/context.c | 31 +++++++++++++++++++++++++++++++ dlls/wined3d/directx.c | 4 ++++ dlls/wined3d/wined3d_gl.h | 6 +++++- 3 files changed, 40 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index d8988f8..f9b99b9 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1280,6 +1280,7 @@ struct wined3d_context *context_create(IWineD3DSwapChainImpl *swapchain, int numSamples = 0; int pixel_format; unsigned int s; + int swap_interval; DWORD state; HGLRC ctx; HDC hdc; @@ -1460,6 +1461,36 @@ struct wined3d_context *context_create(IWineD3DSwapChainImpl *swapchain, goto out; } + switch (swapchain->presentParms.PresentationInterval) + { + case WINED3DPRESENT_INTERVAL_IMMEDIATE: + swap_interval = 0; + break; + case WINED3DPRESENT_INTERVAL_DEFAULT: + case WINED3DPRESENT_INTERVAL_ONE: + swap_interval = 1; + break; + case WINED3DPRESENT_INTERVAL_TWO: + swap_interval = 2; + break; + case WINED3DPRESENT_INTERVAL_THREE: + swap_interval = 3; + break; + case WINED3DPRESENT_INTERVAL_FOUR: + swap_interval = 4; + break; + default: + FIXME("Unknown presentation interval %08x\n", swapchain->presentParms.PresentationInterval); + swap_interval = 1; + } + + if (gl_info->supported[WGL_EXT_SWAP_CONTROL]) + { + if (!GL_EXTCALL(wglSwapIntervalEXT(swap_interval))) + ERR("wglSwapIntervalEXT failed to set swap interval %d for context %p, last error %#x\n", + swap_interval, ret, GetLastError()); + } + ENTER_GL(); glGetIntegerv(GL_AUX_BUFFERS, &ret->aux_buffers); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 742627d..da179a7 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2572,6 +2572,10 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_adapter *adapter) gl_info->supported[WGL_ARB_PIXEL_FORMAT] = TRUE; TRACE_(d3d_caps)("FOUND: WGL_ARB_pixel_format support\n"); } + if (!strcmp(ThisExtn, "WGL_EXT_swap_control")) { + gl_info->supported[WGL_EXT_SWAP_CONTROL] = TRUE; + TRACE_(d3d_caps)("FOUND: WGL_EXT_swap_control support\n"); + } if (!strcmp(ThisExtn, "WGL_WINE_pixel_format_passthrough")) { gl_info->supported[WGL_WINE_PIXEL_FORMAT_PASSTHROUGH] = TRUE; TRACE_(d3d_caps)("FOUND: WGL_WINE_pixel_format_passthrough support\n"); diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 0635347..a2e0140 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -1836,6 +1836,7 @@ typedef enum wined3d_gl_extension SGIS_GENERATE_MIPMAP, /* WGL extensions */ WGL_ARB_PIXEL_FORMAT, + WGL_EXT_SWAP_CONTROL, WGL_WINE_PIXEL_FORMAT_PASSTHROUGH, /* Internally used */ WINED3D_GL_NORMALIZED_TEXRECT, @@ -3796,6 +3797,8 @@ typedef BOOL (WINAPI *WINED3D_PFNWGLCHOOSEPIXELFORMATARBPROC)(HDC hdc, const int typedef BOOL (WINAPI *WINED3D_PFNWGLSETPIXELFORMATWINE)(HDC hdc, int iPixelFormat, const PIXELFORMATDESCRIPTOR *ppfd); +typedef BOOL (WINAPI *WINED3D_PFNWGLSWAPINTERVALEXTPROC)(int interval); + #define GL_EXT_FUNCS_GEN \ /* GL_APPLE_fence */ \ USE_GL_FUNC(PGLFNGENFENCESAPPLEPROC, \ @@ -4531,6 +4534,7 @@ typedef BOOL (WINAPI *WINED3D_PFNWGLSETPIXELFORMATWINE)(HDC hdc, int iPixelForma USE_GL_FUNC(WINED3D_PFNWGLGETPIXELFORMATATTRIBIVARBPROC, wglGetPixelFormatAttribivARB, 0, NULL) \ USE_GL_FUNC(WINED3D_PFNWGLGETPIXELFORMATATTRIBFVARBPROC, wglGetPixelFormatAttribfvARB, 0, NULL) \ USE_GL_FUNC(WINED3D_PFNWGLCHOOSEPIXELFORMATARBPROC, wglChoosePixelFormatARB, 0, NULL) \ - USE_GL_FUNC(WINED3D_PFNWGLSETPIXELFORMATWINE, wglSetPixelFormatWINE, 0, NULL) + USE_GL_FUNC(WINED3D_PFNWGLSETPIXELFORMATWINE, wglSetPixelFormatWINE, 0, NULL) \ + USE_GL_FUNC(WINED3D_PFNWGLSWAPINTERVALEXTPROC, wglSwapIntervalEXT, 0, NULL) #endif /* __WINE_WINED3D_GL */

1 0

Andrew Nguyen : wineboot: Set a placeholder ProcessorNameString value in the volatile CPU registry keys .
by Alexandre Julliard 27 Dec '10

27 Dec '10

Module: wine Branch: master Commit: 1bffb577e33155bb153ee35886349029e35173d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bffb577e33155bb153ee3588… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Mon Dec 27 06:54:24 2010 -0600 wineboot: Set a placeholder ProcessorNameString value in the volatile CPU registry keys. --- programs/wineboot/wineboot.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 1793a68..47a9bf1 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -175,6 +175,7 @@ static void create_hardware_registry_keys(void) static const WCHAR cpuW[] = {'C','e','n','t','r','a','l','P','r','o','c','e','s','s','o','r',0}; static const WCHAR FeatureSetW[] = {'F','e','a','t','u','r','e','S','e','t',0}; static const WCHAR IdentifierW[] = {'I','d','e','n','t','i','f','i','e','r',0}; + static const WCHAR ProcessorNameStringW[] = {'P','r','o','c','e','s','s','o','r','N','a','m','e','S','t','r','i','n','g',0}; static const WCHAR SysidW[] = {'A','T',' ','c','o','m','p','a','t','i','b','l','e',0}; static const WCHAR mhzKeyW[] = {'~','M','H','z',0}; static const WCHAR VendorIdentifierW[] = {'V','e','n','d','o','r','I','d','e','n','t','i','f','i','e','r',0}; @@ -183,6 +184,8 @@ static void create_hardware_registry_keys(void) static const WCHAR PercentDW[] = {'%','d',0}; static const WCHAR IntelCpuDescrW[] = {'x','8','6',' ','F','a','m','i','l','y',' ','%','d',' ','M','o','d','e','l',' ','%','d', ' ','S','t','e','p','p','i','n','g',' ','%','d',0}; + static const WCHAR IntelCpuStringW[] = {'I','n','t','e','l','(','R',')',' ','P','e','n','t','i','u','m','(','R',')',' ','4',' ', + 'C','P','U',' ','2','.','4','0','G','H','z',0}; unsigned int i; HKEY hkey, system_key, cpu_key, fpu_key; SYSTEM_CPU_INFORMATION sci; @@ -220,6 +223,7 @@ static void create_hardware_registry_keys(void) RegSetValueExW( hkey, FeatureSetW, 0, REG_DWORD, (BYTE *)&sci.FeatureSet, sizeof(DWORD) ); set_reg_value( hkey, IdentifierW, idW ); /*TODO; report amd's properly*/ + set_reg_value( hkey, ProcessorNameStringW, IntelCpuStringW ); set_reg_value( hkey, VendorIdentifierW, VenidIntelW ); RegSetValueExW( hkey, mhzKeyW, 0, REG_DWORD, (BYTE *)&power_info.MaxMhz, sizeof(DWORD) ); RegCloseKey( hkey );

1 0

Michael Stefaniuc : mshtml: COM cleanup for the IHTMLWindow2 iface.
by Alexandre Julliard 27 Dec '10

27 Dec '10

Module: wine Branch: master Commit: 2e24de635d59e3709e2a38652ae759e09d7c5a4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e24de635d59e3709e2a38652… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 27 12:50:32 2010 +0100 mshtml: COM cleanup for the IHTMLWindow2 iface. --- dlls/mshtml/htmldoc.c | 12 +- dlls/mshtml/htmlframe.c | 2 +- dlls/mshtml/htmlframebase.c | 4 +- dlls/mshtml/htmlwindow.c | 228 +++++++++++++++++++++--------------------- dlls/mshtml/mshtml_private.h | 3 +- dlls/mshtml/nsio.c | 12 +- dlls/mshtml/nsservice.c | 2 +- dlls/mshtml/oleobj.c | 2 +- dlls/mshtml/persist.c | 2 +- dlls/mshtml/script.c | 2 +- 10 files changed, 135 insertions(+), 134 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2e24de635d59e3709e2a3…

1 0

Michael Stefaniuc : mshtml: COM cleanup for the rest of the *Window* ifaces in HTMLWindow.
by Alexandre Julliard 27 Dec '10

27 Dec '10

Module: wine Branch: master Commit: 6b90fc236ee4c6bbad4d8f54a0b7739fdb666bdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b90fc236ee4c6bbad4d8f54a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 27 14:22:27 2010 +0100 mshtml: COM cleanup for the rest of the *Window* ifaces in HTMLWindow. --- dlls/mshtml/htmlwindow.c | 115 +++++++++++++++++++++--------------------- dlls/mshtml/mshtml_private.h | 8 +-- 2 files changed, 61 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6b90fc236ee4c6bbad4d8…

1 0

Andrew Nguyen : wined3d: Remove references to GLX_SGI_video_sync.
by Alexandre Julliard 27 Dec '10

27 Dec '10

Module: wine Branch: master Commit: 7e13b1afaf11166710fb1c8a5474005559e8afef URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e13b1afaf11166710fb1c8a5… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Mon Dec 27 06:43:30 2010 -0600 wined3d: Remove references to GLX_SGI_video_sync. Usage of GLX_SGI_video_sync is problematic, and wined3d cannot use GLX extensions. --- dlls/wined3d/swapchain.c | 43 ------------------------------------------- dlls/wined3d/wined3d_gl.h | 10 ---------- 2 files changed, 0 insertions(+), 53 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index e5ff786..8f594ae 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -229,8 +229,6 @@ static HRESULT WINAPI IWineD3DSwapChainImpl_Present(IWineD3DSwapChain *iface, struct wined3d_context *context; RECT src_rect, dst_rect; BOOL render_to_fbo; - unsigned int sync; - int retval; IWineD3DSwapChain_SetDestWindowOverride(iface, hDestWindowOverride); @@ -453,47 +451,6 @@ static HRESULT WINAPI IWineD3DSwapChainImpl_Present(IWineD3DSwapChain *iface, } } - if (This->presentParms.PresentationInterval != WINED3DPRESENT_INTERVAL_IMMEDIATE - && gl_info->supported[SGI_VIDEO_SYNC]) - { - if ((retval = GL_EXTCALL(glXGetVideoSyncSGI(&sync)))) - ERR("glXGetVideoSyncSGI failed(retval = %d\n", retval); - - switch(This->presentParms.PresentationInterval) { - case WINED3DPRESENT_INTERVAL_DEFAULT: - case WINED3DPRESENT_INTERVAL_ONE: - if(sync <= This->vSyncCounter) { - retval = GL_EXTCALL(glXWaitVideoSyncSGI(1, 0, &This->vSyncCounter)); - } else { - This->vSyncCounter = sync; - } - break; - case WINED3DPRESENT_INTERVAL_TWO: - if(sync <= This->vSyncCounter + 1) { - retval = GL_EXTCALL(glXWaitVideoSyncSGI(2, This->vSyncCounter & 0x1, &This->vSyncCounter)); - } else { - This->vSyncCounter = sync; - } - break; - case WINED3DPRESENT_INTERVAL_THREE: - if(sync <= This->vSyncCounter + 2) { - retval = GL_EXTCALL(glXWaitVideoSyncSGI(3, This->vSyncCounter % 0x3, &This->vSyncCounter)); - } else { - This->vSyncCounter = sync; - } - break; - case WINED3DPRESENT_INTERVAL_FOUR: - if(sync <= This->vSyncCounter + 3) { - retval = GL_EXTCALL(glXWaitVideoSyncSGI(4, This->vSyncCounter & 0x3, &This->vSyncCounter)); - } else { - This->vSyncCounter = sync; - } - break; - default: - FIXME("Unknown presentation interval %08x\n", This->presentParms.PresentationInterval); - } - } - context_release(context); TRACE("returning\n"); diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 9c2c0c1..0532207 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -1834,7 +1834,6 @@ typedef enum wined3d_gl_extension NV_VERTEX_PROGRAM3, /* SGI */ SGIS_GENERATE_MIPMAP, - SGI_VIDEO_SYNC, /* WGL extensions */ WGL_ARB_PIXEL_FORMAT, WGL_WINE_PIXEL_FORMAT_PASSTHROUGH, @@ -3717,10 +3716,6 @@ typedef void (WINE_GLAPI *PGLFNGETCOMBINERSTAGEPARAMETERFVNVPROC)(GLenum stage, #define GL_GENERATE_MIPMAP_HINT_SGIS 0x8192 #endif -/* GLX_SGI_video_sync */ -typedef int (WINE_GLAPI *PGLXFNGETVIDEOSYNCSGIPROC)(unsigned int *); -typedef int (WINE_GLAPI *PGLXFNWAITVIDEOSYNCSGIPROC)(int, int, unsigned int *); - /* WGL_ARB_extensions_string */ typedef const char *(WINAPI *WINED3D_PFNWGLGETEXTENSIONSSTRINGARBPROC)(HDC hdc); @@ -4530,11 +4525,6 @@ typedef BOOL (WINAPI *WINED3D_PFNWGLSETPIXELFORMATWINE)(HDC hdc, int iPixelForma glCombinerParameterivNV, NV_REGISTER_COMBINERS, NULL) \ USE_GL_FUNC(PGLFNFINALCOMBINERINPUTNVPROC, \ glFinalCombinerInputNV, NV_REGISTER_COMBINERS, NULL) \ - /* GLX_SGI_video_sync */ \ - USE_GL_FUNC(PGLXFNGETVIDEOSYNCSGIPROC, \ - glXGetVideoSyncSGI, SGI_VIDEO_SYNC, NULL) \ - USE_GL_FUNC(PGLXFNWAITVIDEOSYNCSGIPROC, \ - glXWaitVideoSyncSGI, SGI_VIDEO_SYNC, NULL) #define WGL_EXT_FUNCS_GEN \ USE_GL_FUNC(WINED3D_PFNWGLGETEXTENSIONSSTRINGARBPROC, wglGetExtensionsStringARB, 0, NULL) \

1 0

Andrew Nguyen : wined3d: Fix typo in GL_SGIS_generate_mipmap preprocessor definition.
by Alexandre Julliard 27 Dec '10

27 Dec '10

Module: wine Branch: master Commit: 0f050b3ecb8aa77ffabf285248c2be70455999b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f050b3ecb8aa77ffabf28524… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Mon Dec 27 06:44:01 2010 -0600 wined3d: Fix typo in GL_SGIS_generate_mipmap preprocessor definition. --- dlls/wined3d/wined3d_gl.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 0532207..0635347 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -3710,8 +3710,8 @@ typedef void (WINE_GLAPI *PGLFNGETCOMBINERSTAGEPARAMETERFVNVPROC)(GLenum stage, #endif /* GL_SGIS_generate_mipmap */ -#ifndef GLX_SGIS_generate_mipmap -#define GLX_SGIS_generate_mipmap 1 +#ifndef GL_SGIS_generate_mipmap +#define GL_SGIS_generate_mipmap 1 #define GL_GENERATE_MIPMAP_SGIS 0x8191 #define GL_GENERATE_MIPMAP_HINT_SGIS 0x8192 #endif

1 0