wine-commits June 2006

wine-commits@winehq.org

3 participants
854 discussions

Hans Leidekker : shell32: Add a stub implementation for SHIsFileAvailableOffline.
by Alexandre Julliard 27 Jun '06

27 Jun '06

Module: wine Branch: refs/heads/master Commit: ca9f266ac0207365df315bca0aa61221115f51ae URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ca9f266ac0207365df315bc… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Mon Jun 26 20:54:09 2006 +0200 shell32: Add a stub implementation for SHIsFileAvailableOffline. --- dlls/shell32/shell.c | 6 ++++++ dlls/shell32/shell32.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shell.c b/dlls/shell32/shell.c index 533ccdb..c8a78f8 100644 --- a/dlls/shell32/shell.c +++ b/dlls/shell32/shell.c @@ -86,6 +86,12 @@ BOOL WINAPI SHELL_DllEntryPoint(DWORD Re return TRUE; } +HRESULT WINAPI SHIsFileAvailableOffline(LPCWSTR path, LPDWORD status) +{ + FIXME("(%s, %p) stub\n", debugstr_w(path), status); + return E_FAIL; +} + /************************************************************************* * DragAcceptFiles [SHELL.9] */ diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index 83f6df6..c6a307d 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -359,7 +359,7 @@ #300 stub Shl3216_ThunkData32 @ stdcall SHHelpShortcuts_RunDLLW(long long long long) @ stub SHInvokePrinterCommandA @ stub SHInvokePrinterCommandW -@ stub SHIsFileAvailableOffline +@ stdcall SHIsFileAvailableOffline(wstr ptr) @ stdcall SHLoadInProc(long) @ stub SHLoadNonloadedIconOverlayIdentifiers @ stub SHPathPrepareForWriteA

1 0

Eric Pouech : winedbg: Module info.
by Alexandre Julliard 27 Jun '06

27 Jun '06

Module: wine Branch: refs/heads/master Commit: 6cff43fd72d5434623b74b557d0cfdaefd0728dc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6cff43fd72d5434623b74b5… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Mon Jun 26 21:37:42 2006 +0200 winedbg: Module info. when requesting info on a module by address, always print the module ELF/PE pair (if this applies) (and not only the embedded PE), which can be confusing. --- programs/winedbg/info.c | 100 ++++++++++++++++++++++------------------------- 1 files changed, 46 insertions(+), 54 deletions(-) diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c index 8584d47..d2042bf 100644 --- a/programs/winedbg/info.c +++ b/programs/winedbg/info.c @@ -146,6 +146,7 @@ static const char* get_symtype_str(const struct info_module { IMAGEHLP_MODULE64* mi; + DWORD base; unsigned num_alloc; unsigned num_used; }; @@ -199,79 +200,70 @@ static BOOL CALLBACK info_mod_cb(PSTR mo */ void info_win32_module(DWORD base) { + struct info_module im; + int i, j, num_printed = 0; + DWORD opt; + if (!dbg_curr_process || !dbg_curr_thread) { dbg_printf("Cannot get info on module while no process is loaded\n"); return; } - if (base) - { - IMAGEHLP_MODULE64 mi; - - mi.SizeOfStruct = sizeof(mi); - - if (!SymGetModuleInfo64(dbg_curr_process->handle, base, &mi)) - { - dbg_printf("'0x%08lx' is not a valid module address\n", base); - return; - } - module_print_info(&mi, FALSE); - } - else - { - struct info_module im; - int i, j; - DWORD opt; - - im.mi = NULL; - im.num_alloc = im.num_used = 0; + im.mi = NULL; + im.num_alloc = im.num_used = 0; - /* this is a wine specific options to return also ELF modules in the - * enumeration - */ - SymSetOptions((opt = SymGetOptions()) | 0x40000000); - SymEnumerateModules64(dbg_curr_process->handle, info_mod_cb, (void*)&im); - SymSetOptions(opt); + /* this is a wine specific options to return also ELF modules in the + * enumeration + */ + SymSetOptions((opt = SymGetOptions()) | 0x40000000); + SymEnumerateModules64(dbg_curr_process->handle, info_mod_cb, (void*)&im); + SymSetOptions(opt); - qsort(im.mi, im.num_used, sizeof(im.mi[0]), module_compare); + qsort(im.mi, im.num_used, sizeof(im.mi[0]), module_compare); - dbg_printf("Module\tAddress\t\t\tDebug info\tName (%d modules)\n", im.num_used); + dbg_printf("Module\tAddress\t\t\tDebug info\tName (%d modules)\n", im.num_used); - for (i = 0; i < im.num_used; i++) + for (i = 0; i < im.num_used; i++) + { + if (base && + (base < im.mi[i].BaseOfImage || base >= im.mi[i].BaseOfImage + im.mi[i].ImageSize)) + continue; + if (strstr(im.mi[i].ModuleName, "<elf>")) { - if (strstr(im.mi[i].ModuleName, "<elf>")) + dbg_printf("ELF\t"); + module_print_info(&im.mi[i], FALSE); + /* print all modules embedded in this one */ + for (j = 0; j < im.num_used; j++) { - dbg_printf("ELF\t"); - module_print_info(&im.mi[i], FALSE); - /* print all modules embedded in this one */ - for (j = 0; j < im.num_used; j++) + if (!strstr(im.mi[j].ModuleName, "<elf>") && module_is_container(&im.mi[i], &im.mi[j])) { - if (!strstr(im.mi[j].ModuleName, "<elf>") && module_is_container(&im.mi[i], &im.mi[j])) - { - dbg_printf(" \\-PE\t"); - module_print_info(&im.mi[j], TRUE); - } + dbg_printf(" \\-PE\t"); + module_print_info(&im.mi[j], TRUE); } } - else + } + else + { + /* check module is not embedded in another module */ + for (j = 0; j < im.num_used; j++) { - /* check module is not embedded in another module */ - for (j = 0; j < im.num_used; j++) - { - if (strstr(im.mi[j].ModuleName, "<elf>") && module_is_container(&im.mi[j], &im.mi[i])) - break; - } - if (j < im.num_used) continue; - if (strstr(im.mi[i].ModuleName, ".so") || strchr(im.mi[i].ModuleName, '<')) - dbg_printf("ELF\t"); - else - dbg_printf("PE\t"); - module_print_info(&im.mi[i], FALSE); + if (strstr(im.mi[j].ModuleName, "<elf>") && module_is_container(&im.mi[j], &im.mi[i])) + break; } + if (j < im.num_used) continue; + if (strstr(im.mi[i].ModuleName, ".so") || strchr(im.mi[i].ModuleName, '<')) + dbg_printf("ELF\t"); + else + dbg_printf("PE\t"); + module_print_info(&im.mi[i], FALSE); } - HeapFree(GetProcessHeap(), 0, im.mi); + num_printed++; } + HeapFree(GetProcessHeap(), 0, im.mi); + + if (base && !num_printed) + dbg_printf("'0x%08lx' is not a valid module address\n", base); } struct class_walker

1 0

Eric Pouech : winedbg: Use 64 bit version of imagehlp_module.
by Alexandre Julliard 27 Jun '06

27 Jun '06

Module: wine Branch: refs/heads/master Commit: 82ed6a45786c6abdc5dbcb76c7171812fc5af61f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=82ed6a45786c6abdc5dbcb7… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Mon Jun 26 21:37:39 2006 +0200 winedbg: Use 64 bit version of imagehlp_module. This allows reimplementing the module list command and do less black magic to guess the ELF debug format. --- programs/winedbg/info.c | 62 ++++++++++++++++++++++++++++------------------- 1 files changed, 37 insertions(+), 25 deletions(-) diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c index 6fc5b3f..8584d47 100644 --- a/programs/winedbg/info.c +++ b/programs/winedbg/info.c @@ -117,11 +117,10 @@ void info_help(void) while (infotext[i]) dbg_printf("%s\n", infotext[i++]); } -static const char* get_symtype_str(SYM_TYPE st) +static const char* get_symtype_str(const IMAGEHLP_MODULE64* mi) { - switch (st) + switch (mi->SymType) { - case -1: return "\\"; default: case SymNone: return "--none--"; case SymCoff: return "COFF"; @@ -130,40 +129,53 @@ static const char* get_symtype_str(SYM_T case SymExport: return "Export"; case SymDeferred: return "Deferred"; case SymSym: return "Sym"; - case SymDia: return "DIA"; - case NumSymTypes: return "Stabs"; + case SymDia: + switch (mi->CVSig) + { + case 'S' | ('T' << 8) | ('A' << 16) | ('B' << 24): + return "Stabs"; + case 'D' | ('W' << 8) | ('A' << 16) | ('R' << 24): + return "Dwarf"; + default: + return "DIA"; + + } } } struct info_module { - IMAGEHLP_MODULE* mi; + IMAGEHLP_MODULE64* mi; unsigned num_alloc; unsigned num_used; }; -static void module_print_info(const IMAGEHLP_MODULE* mi, SYM_TYPE st) +static void module_print_info(const IMAGEHLP_MODULE64* mi, BOOL is_embedded) { - dbg_printf("0x%08lx-%08lx\t%-16s%s\n", - mi->BaseOfImage, mi->BaseOfImage + mi->ImageSize, - get_symtype_str(st), mi->ModuleName); + dbg_printf("%s-%s\t%-16s%s\n", + wine_dbgstr_longlong(mi->BaseOfImage), + wine_dbgstr_longlong(mi->BaseOfImage + mi->ImageSize), + is_embedded ? "\\" : get_symtype_str(mi), mi->ModuleName); } static int module_compare(const void* p1, const void* p2) { - return (char*)(((const IMAGEHLP_MODULE*)p1)->BaseOfImage) - - (char*)(((const IMAGEHLP_MODULE*)p2)->BaseOfImage); + LONGLONG val = ((const IMAGEHLP_MODULE64*)p1)->BaseOfImage - + ((const IMAGEHLP_MODULE64*)p2)->BaseOfImage; + if (val < 0) return -1; + else if (val > 0) return 1; + else return 0; } -static inline BOOL module_is_container(const IMAGEHLP_MODULE* wmod_cntnr, - const IMAGEHLP_MODULE* wmod_child) +static inline BOOL module_is_container(const IMAGEHLP_MODULE64* wmod_cntnr, + const IMAGEHLP_MODULE64* wmod_child) { return wmod_cntnr->BaseOfImage <= wmod_child->BaseOfImage && - (DWORD)wmod_cntnr->BaseOfImage + wmod_cntnr->ImageSize >= - (DWORD)wmod_child->BaseOfImage + wmod_child->ImageSize; + wmod_cntnr->BaseOfImage + wmod_cntnr->ImageSize >= + wmod_child->BaseOfImage + wmod_child->ImageSize; } -static BOOL CALLBACK info_mod_cb(PSTR mod_name, DWORD base, void* ctx) +static BOOL CALLBACK info_mod_cb(PSTR mod_name, DWORD64 base, void* ctx) { struct info_module* im = (struct info_module*)ctx; @@ -173,7 +185,7 @@ static BOOL CALLBACK info_mod_cb(PSTR mo im->mi = dbg_heap_realloc(im->mi, im->num_alloc * sizeof(*im->mi)); } im->mi[im->num_used].SizeOfStruct = sizeof(im->mi[im->num_used]); - if (SymGetModuleInfo(dbg_curr_process->handle, base, &im->mi[im->num_used])) + if (SymGetModuleInfo64(dbg_curr_process->handle, base, &im->mi[im->num_used])) { im->num_used++; } @@ -195,16 +207,16 @@ void info_win32_module(DWORD base) if (base) { - IMAGEHLP_MODULE mi; + IMAGEHLP_MODULE64 mi; mi.SizeOfStruct = sizeof(mi); - if (!SymGetModuleInfo(dbg_curr_process->handle, base, &mi)) + if (!SymGetModuleInfo64(dbg_curr_process->handle, base, &mi)) { dbg_printf("'0x%08lx' is not a valid module address\n", base); return; } - module_print_info(&mi, mi.SymType); + module_print_info(&mi, FALSE); } else { @@ -219,7 +231,7 @@ void info_win32_module(DWORD base) * enumeration */ SymSetOptions((opt = SymGetOptions()) | 0x40000000); - SymEnumerateModules(dbg_curr_process->handle, info_mod_cb, (void*)&im); + SymEnumerateModules64(dbg_curr_process->handle, info_mod_cb, (void*)&im); SymSetOptions(opt); qsort(im.mi, im.num_used, sizeof(im.mi[0]), module_compare); @@ -231,14 +243,14 @@ void info_win32_module(DWORD base) if (strstr(im.mi[i].ModuleName, "<elf>")) { dbg_printf("ELF\t"); - module_print_info(&im.mi[i], (im.mi[i].SymType == SymDia) ? NumSymTypes : im.mi[i].SymType); + module_print_info(&im.mi[i], FALSE); /* print all modules embedded in this one */ for (j = 0; j < im.num_used; j++) { if (!strstr(im.mi[j].ModuleName, "<elf>") && module_is_container(&im.mi[i], &im.mi[j])) { dbg_printf(" \\-PE\t"); - module_print_info(&im.mi[j], -1); + module_print_info(&im.mi[j], TRUE); } } } @@ -255,7 +267,7 @@ void info_win32_module(DWORD base) dbg_printf("ELF\t"); else dbg_printf("PE\t"); - module_print_info(&im.mi[i], im.mi[i].SymType); + module_print_info(&im.mi[i], FALSE); } } HeapFree(GetProcessHeap(), 0, im.mi);

1 0

Eric Pouech : dbghelp: Implemented SymEnumerateModules64.
by Alexandre Julliard 27 Jun '06

27 Jun '06

Module: wine Branch: refs/heads/master Commit: 1a5f7f59263d9afc083bcad17b70139f6b709081 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1a5f7f59263d9afc083bcad… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Mon Jun 26 21:37:36 2006 +0200 dbghelp: Implemented SymEnumerateModules64. --- dlls/dbghelp/dbghelp.spec | 2 +- dlls/dbghelp/module.c | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/dbghelp.spec b/dlls/dbghelp/dbghelp.spec index b15aae7..ca688ee 100644 --- a/dlls/dbghelp/dbghelp.spec +++ b/dlls/dbghelp/dbghelp.spec @@ -45,7 +45,7 @@ @ stdcall SymEnumTypes(ptr double ptr ptr) @ stub SymEnumTypesW @ stdcall SymEnumerateModules(long ptr ptr) -@ stub SymEnumerateModules64 +@ stdcall SymEnumerateModules64(long ptr ptr) @ stub SymEnumerateModulesW64 @ stdcall SymEnumerateSymbols(long long ptr ptr) @ stub SymEnumerateSymbols64 diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index c1c5ded..a08cf12 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -608,6 +608,30 @@ BOOL WINAPI SymEnumerateModules(HANDLE } /****************************************************************** + * SymEnumerateModules64 (DBGHELP.@) + * + */ +BOOL WINAPI SymEnumerateModules64(HANDLE hProcess, + PSYM_ENUMMODULES_CALLBACK64 EnumModulesCallback, + PVOID UserContext) +{ + struct process* pcs = process_find_by_handle(hProcess); + struct module* module; + + if (!pcs) return FALSE; + + for (module = pcs->lmodules; module; module = module->next) + { + if (!(dbghelp_options & SYMOPT_WINE_WITH_ELF_MODULES) && module->type == DMT_ELF) + continue; + if (!EnumModulesCallback(module->module.ModuleName, + module->module.BaseOfImage, UserContext)) + break; + } + return TRUE; +} + +/****************************************************************** * EnumerateLoadedModules (DBGHELP.@) * */

1 0

Eric Pouech : dbghelp: Module info.
by Alexandre Julliard 27 Jun '06

27 Jun '06

Module: wine Branch: refs/heads/master Commit: e4441d7e6f4c3fe5a2a8c87f27255d379be3e325 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e4441d7e6f4c3fe5a2a8c87… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Mon Jun 26 21:37:32 2006 +0200 dbghelp: Module info. - now internally storing module info as a 64bit module structure (the interest in not in the 64 bit side of things, but because it allows storing lots of usefull information) - fixed SymGetModuleInfo64W which wasn't returning the LoadedPdbName field - now filling for MSC files with the extended information (instead of guessing it) - reused the extended module info to store wine ELF module information (link for map link, stabs vs dwarf symbol info) --- dlls/dbghelp/coff.c | 14 ++++++-- dlls/dbghelp/dbghelp_private.h | 2 + dlls/dbghelp/dwarf.c | 7 ++++ dlls/dbghelp/elf_module.c | 4 ++ dlls/dbghelp/module.c | 70 +++++++++++++++++++--------------------- dlls/dbghelp/msc.c | 31 +++++++++++++++++- dlls/dbghelp/stabs.c | 7 ++++ 7 files changed, 91 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=e4441d7e6f4c3fe5a2a…

1 0

Alexandre Julliard : winetest: Portability fix in the maketest script. Added support for git.
by Alexandre Julliard 27 Jun '06

27 Jun '06

Module: wine Branch: refs/heads/master Commit: 40b411824ef3b7e4161a4442aa7ef4c25d155d62 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=40b411824ef3b7e4161a444… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 27 11:17:22 2006 +0200 winetest: Portability fix in the maketest script. Added support for git. --- programs/winetest/maketest | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/programs/winetest/maketest b/programs/winetest/maketest index 4d18b39..527a3b4 100755 --- a/programs/winetest/maketest +++ b/programs/winetest/maketest @@ -16,11 +16,17 @@ done i=0 cd $TOPSRCDIR -for dir in dlls/*/tests; do - sed -ne "s|^/$[^.]*.c$/$[^/]*$.*|$dir/\1:\2|p" $dir/CVS/Entries 2>/dev/null -done |\ -while read; do - echo "REV_INFO+$i \"$REPLY\"" +if [ -d .git ] +then + git-ls-files -c -s --abbrev=10 -- "dlls/*/tests/*.c" |\ + sed -ne "s|^[0-7]* $[0-9a-f]*$ [0-9] $.*$$|\2:\1|p" +else + for dir in dlls/*/tests; do + sed -ne "s|^/$[^.]*.c$/$[^/]*$.*|$dir/\1:\2|p" $dir/CVS/Entries 2>/dev/null + done +fi |\ +while read line; do + echo "REV_INFO+$i \"$line\"" i=`expr $i + 1` done

1 0

Andrew Talbot : winex11.drv: Write-strings warning fix.
by Alexandre Julliard 27 Jun '06

27 Jun '06

Module: wine Branch: refs/heads/master Commit: 55e20a7482bc1aee592c39189e1c815973a3992e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=55e20a7482bc1aee592c391… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon Jun 26 20:56:16 2006 +0100 winex11.drv: Write-strings warning fix. --- dlls/winex11.drv/window.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index b47e474..6d7c595 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -411,8 +411,10 @@ void X11DRV_set_wm_hints( Display *displ /* class hints */ if ((class_hints = XAllocClassHint())) { + static char wine[] = "Wine"; + class_hints->res_name = process_name; - class_hints->res_class = "Wine"; + class_hints->res_class = wine; XSetClassHint( display, data->whole_window, class_hints ); XFree( class_hints ); }

1 0

Jason Green : wined3d: Implement more GLSL instructions and a little cleanup.
by Alexandre Julliard 27 Jun '06

27 Jun '06

Module: wine Branch: refs/heads/master Commit: baf38b30077aee92ba60fd705e17b78889e28d66 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=baf38b30077aee92ba60fd7… Author: Jason Green <jave27(a)gmail.com> Date: Tue Jun 27 02:00:02 2006 -0400 wined3d: Implement more GLSL instructions and a little cleanup. - Implement D3DSIO_DP2ADD, D3DSIO_TEXKILL, D3DSIO_TEXM3X3PAD - Partially implement D3DSIO_TEXBEM, D3DSIO_TEXM3X3VSPEC (as much as they are implemented in ARB_fragment_program at least). - Stop copying the SHADER_PARSE_STATE struct in each ARB shader routine - use a pointer instead. --- dlls/wined3d/baseshader.c | 1 dlls/wined3d/glsl_shader.c | 100 +++++++++++++++++++++++++++++++++++++++- dlls/wined3d/pixelshader.c | 32 ++++++------- dlls/wined3d/wined3d_private.h | 5 ++ 4 files changed, 120 insertions(+), 18 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=baf38b30077aee92ba6…

1 0

H. Verbeet : wined3d: Remove some redundant code.
by Alexandre Julliard 27 Jun '06

27 Jun '06

Module: wine Branch: refs/heads/master Commit: 3489f1b9b1143433366a7d562e188dd2559ef6e3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3489f1b9b1143433366a7d5… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Jun 27 00:32:32 2006 +0200 wined3d: Remove some redundant code. --- dlls/wined3d/device.c | 13 ++++--------- 1 files changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 9e0f00f..2be5692 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1582,16 +1582,11 @@ #endif XFree(object->visInfo); object->visInfo = NULL; - if (NULL == object->glCtx) { - ERR("cannot create glxContext\n"); - LEAVE_GL(); - return WINED3DERR_NOTAVAILABLE; - } - LEAVE_GL(); - if (object->glCtx == NULL) { - ERR("Error in context creation !\n"); - return WINED3DERR_INVALIDCALL; + + if (!object->glCtx) { + ERR("Failed to create GLX context\n"); + return WINED3DERR_NOTAVAILABLE; } else { TRACE("Context created (HWND=%p, glContext=%p, Window=%ld, VisInfo=%p)\n", object->win_handle, object->glCtx, object->win, object->visInfo);

1 0

H. Verbeet : wined3d: Fix compilation (VBO constants).
by Alexandre Julliard 27 Jun '06

27 Jun '06

Module: wine Branch: refs/heads/master Commit: f460b3861216cd123e2ee6eb53b441e46943cd6a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f460b3861216cd123e2ee6e… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Jun 27 00:32:25 2006 +0200 wined3d: Fix compilation (VBO constants). --- dlls/wined3d/device.c | 6 +++--- dlls/wined3d/vertexbuffer.c | 22 +++++++++++----------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 755cb19..9e0f00f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5012,7 +5012,7 @@ process_vertices_strided(IWineD3DDeviceI void *src; GL_EXTCALL(glBindBufferARB(GL_ARRAY_BUFFER_ARB, dest->vbo)); checkGLcall("glBindBufferARB"); - src = GL_EXTCALL(glMapBufferARB(GL_ARRAY_BUFFER_ARB, GL_READ_ONLY)); + src = GL_EXTCALL(glMapBufferARB(GL_ARRAY_BUFFER_ARB, GL_READ_ONLY_ARB)); if(src) { memcpy(dest->resource.allocatedMemory, src, dest->resource.size); } @@ -5030,7 +5030,7 @@ process_vertices_strided(IWineD3DDeviceI if(dest->vbo) { GL_EXTCALL(glBindBufferARB(GL_ARRAY_BUFFER_ARB, dest->vbo)); - dest_conv = GL_EXTCALL(glMapBufferARB(GL_ARRAY_BUFFER_ARB, GL_WRITE_ONLY)); + dest_conv = GL_EXTCALL(glMapBufferARB(GL_ARRAY_BUFFER_ARB, GL_WRITE_ONLY_ARB)); if(!dest_conv) { ERR("glMapBuffer failed\n"); /* Continue without storing converted vertices */ @@ -5349,7 +5349,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl GL_EXTCALL(glBindBufferARB(GL_ARRAY_BUFFER_ARB, SrcImpl->vbo)); checkGLcall("glBindBufferARB"); - src = GL_EXTCALL(glMapBufferARB(GL_ARRAY_BUFFER_ARB, GL_READ_ONLY)); + src = GL_EXTCALL(glMapBufferARB(GL_ARRAY_BUFFER_ARB, GL_READ_ONLY_ARB)); if(src) { memcpy(SrcImpl->resource.allocatedMemory, src, SrcImpl->resource.size); } diff --git a/dlls/wined3d/vertexbuffer.c b/dlls/wined3d/vertexbuffer.c index 1d8c0cf..c669a6b 100644 --- a/dlls/wined3d/vertexbuffer.c +++ b/dlls/wined3d/vertexbuffer.c @@ -142,9 +142,9 @@ static void WINAPI IWineD3DVertexBuf /* Using shaders? No conversion needed, the shaders handle this */ TRACE("Using vertex shaders, not doing any vertex conversion\n"); ENTER_GL(); - GL_EXTCALL(glBindBufferARB(GL_ARRAY_BUFFER, This->vbo)); + GL_EXTCALL(glBindBufferARB(GL_ARRAY_BUFFER_ARB, This->vbo)); checkGLcall("glBindBufferARB"); - GL_EXTCALL(glBufferSubDataARB(GL_ARRAY_BUFFER, 0, This->resource.size, This->resource.allocatedMemory)); + GL_EXTCALL(glBufferSubDataARB(GL_ARRAY_BUFFER_ARB, 0, This->resource.size, This->resource.allocatedMemory)); checkGLcall("glUnmapBuffer glBufferSubDataARB"); LEAVE_GL(); HeapFree(GetProcessHeap(), 0, This->resource.allocatedMemory); @@ -299,9 +299,9 @@ static void WINAPI IWineD3DVertexBuf } ENTER_GL(); - GL_EXTCALL(glBindBufferARB(GL_ARRAY_BUFFER, This->vbo)); + GL_EXTCALL(glBindBufferARB(GL_ARRAY_BUFFER_ARB, This->vbo)); checkGLcall("glBindBufferARB"); - GL_EXTCALL(glBufferSubDataARB(GL_ARRAY_BUFFER, start, end - start, data)); + GL_EXTCALL(glBufferSubDataARB(GL_ARRAY_BUFFER_ARB, start, end - start, data)); checkGLcall("glBufferSubDataARB"); LEAVE_GL(); @@ -346,21 +346,21 @@ static HRESULT WINAPI IWineD3DVertexBuf data = This->resource.allocatedMemory; This->Flags |= VBFLAG_DIRTY; } else { - GLenum mode = GL_READ_WRITE; + GLenum mode = GL_READ_WRITE_ARB; /* Return data to the VBO */ TRACE("Locking directly into the buffer\n"); if((This->resource.usage & WINED3DUSAGE_WRITEONLY) || ( Flags & D3DLOCK_DISCARD) ) { - mode = GL_WRITE_ONLY; + mode = GL_WRITE_ONLY_ARB; } else if( Flags & (D3DLOCK_READONLY | D3DLOCK_NO_DIRTY_UPDATE) ) { - mode = GL_READ_ONLY; + mode = GL_READ_ONLY_ARB; } ENTER_GL(); - GL_EXTCALL(glBindBufferARB(GL_ARRAY_BUFFER, This->vbo)); + GL_EXTCALL(glBindBufferARB(GL_ARRAY_BUFFER_ARB, This->vbo)); checkGLcall("glBindBufferARB"); - data = GL_EXTCALL(glMapBufferARB(GL_ARRAY_BUFFER, mode)); + data = GL_EXTCALL(glMapBufferARB(GL_ARRAY_BUFFER_ARB, mode)); LEAVE_GL(); if(!data) { ERR("glMapBuffer failed\n"); @@ -378,9 +378,9 @@ HRESULT WINAPI IWineD3DVertexBufferImpl TRACE("(%p)\n", This); if(!This->resource.allocatedMemory) { ENTER_GL(); - GL_EXTCALL(glBindBufferARB(GL_ARRAY_BUFFER, This->vbo)); + GL_EXTCALL(glBindBufferARB(GL_ARRAY_BUFFER_ARB, This->vbo)); checkGLcall("glBindBufferARB"); - GL_EXTCALL(glUnmapBufferARB(GL_ARRAY_BUFFER)); + GL_EXTCALL(glUnmapBufferARB(GL_ARRAY_BUFFER_ARB)); checkGLcall("glUnmapBufferARB"); LEAVE_GL(); } else {

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
86
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 June 2006