January 2007 - Wine-commits

Francois Gouget : ws2_32/tests: Use '%d' to print GetLastError().
by Alexandre Julliard 04 Jan '07

04 Jan '07

Module: wine Branch: master Commit: f54caadc49d38242dde335539530f4ff547caf40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f54caadc49d38242dde335539… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jan 4 10:55:24 2007 +0100 ws2_32/tests: Use '%d' to print GetLastError(). --- dlls/ws2_32/tests/sock.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 3a7c4db..970e27a 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1157,7 +1157,7 @@ static void test_WSAAddressToStringW(voi sockaddr.sin_addr.s_addr = 0; ret = WSAAddressToStringW( (SOCKADDR*)&sockaddr, sizeof(sockaddr), NULL, address, &len ); - ok( !ret, "WSAAddressToStringW() failed unexpectedly: %x\n", WSAGetLastError() ); + ok( !ret, "WSAAddressToStringW() failed unexpectedly: %d\n", WSAGetLastError() ); ok( !lstrcmpW( address, expect1 ), "Expected different address string\n" ); @@ -1168,7 +1168,7 @@ static void test_WSAAddressToStringW(voi sockaddr.sin_addr.s_addr = 0xffffffff; ret = WSAAddressToStringW( (SOCKADDR*)&sockaddr, sizeof(sockaddr), NULL, address, &len ); - ok( !ret, "WSAAddressToStringW() failed unexpectedly: %x\n", WSAGetLastError() ); + ok( !ret, "WSAAddressToStringW() failed unexpectedly: %d\n", WSAGetLastError() ); ok( !lstrcmpW( address, expect2 ), "Expected different address string\n" ); @@ -1179,7 +1179,7 @@ static void test_WSAAddressToStringW(voi sockaddr.sin_addr.s_addr = 0; ret = WSAAddressToStringW( (SOCKADDR*)&sockaddr, sizeof(sockaddr), NULL, address, &len ); - ok( !ret, "WSAAddressToStringW() failed unexpectedly: %x\n", WSAGetLastError() ); + ok( !ret, "WSAAddressToStringW() failed unexpectedly: %d\n", WSAGetLastError() ); ok( !lstrcmpW( address, expect3 ), "Expected different address string\n" ); @@ -1190,7 +1190,7 @@ static void test_WSAAddressToStringW(voi sockaddr.sin_addr.s_addr = 0xffffffff; ret = WSAAddressToStringW( (SOCKADDR*)&sockaddr, sizeof(sockaddr), NULL, address, &len ); - ok( !ret, "WSAAddressToStringW() failed unexpectedly: %x\n", WSAGetLastError() ); + ok( !ret, "WSAAddressToStringW() failed unexpectedly: %d\n", WSAGetLastError() ); ok( !lstrcmpW( address, expect4 ), "Expected different address string\n" ); } @@ -1211,7 +1211,7 @@ static void test_WSAStringToAddressA(voi sockaddr.sin_family = AF_INET; ret = WSAStringToAddressA( address1, AF_INET, NULL, (SOCKADDR*)&sockaddr, &len ); - ok( ret == SOCKET_ERROR, "WSAStringToAddressA() succeeded unexpectedly: %x\n", + ok( ret == SOCKET_ERROR, "WSAStringToAddressA() succeeded unexpectedly: %d\n", WSAGetLastError() ); len = sizeof(sockaddr); @@ -1502,7 +1502,7 @@ static void test_extendedSocketOptions() LINGER linger_val; if(WSAStartup(MAKEWORD(2,0), &wsa)){ - trace("Winsock failed: 0x%08x. Aborting test\n", WSAGetLastError()); + trace("Winsock failed: %d. Aborting test\n", WSAGetLastError()); return; } @@ -1513,13 +1513,13 @@ static void test_extendedSocketOptions() sa.sin_addr.s_addr = htonl(INADDR_ANY); if((sock = socket(PF_INET, SOCK_DGRAM, IPPROTO_IP)) < 0){ - trace("Creating the socket failed: 0x%08x\n", WSAGetLastError()); + trace("Creating the socket failed: %d\n", WSAGetLastError()); WSACleanup(); return; } if(bind(sock, (struct sockaddr *) &sa, sa_len) < 0){ - trace("Failed to bind socket: 0x%08x\n", WSAGetLastError()); + trace("Failed to bind socket: %d\n", WSAGetLastError()); closesocket(sock); WSACleanup(); return; @@ -1539,13 +1539,13 @@ static void test_extendedSocketOptions() closesocket(sock); if((sock = socket(PF_INET, SOCK_STREAM, IPPROTO_IP)) < 0){ - trace("Creating the socket failed: 0x%08x\n", WSAGetLastError()); + trace("Creating the socket failed: %d\n", WSAGetLastError()); WSACleanup(); return; } if(bind(sock, (struct sockaddr *) &sa, sa_len) < 0){ - trace("Failed to bind socket: 0x%08x\n", WSAGetLastError()); + trace("Failed to bind socket: %d\n", WSAGetLastError()); closesocket(sock); WSACleanup(); return; @@ -1575,7 +1575,7 @@ static void test_getsockname() static const unsigned char null_padding[] = {0,0,0,0,0,0,0,0}; if(WSAStartup(MAKEWORD(2,0), &wsa)){ - trace("Winsock failed: 0x%08x. Aborting test\n", WSAGetLastError()); + trace("Winsock failed: %d. Aborting test\n", WSAGetLastError()); return; } @@ -1586,20 +1586,20 @@ static void test_getsockname() sa_set.sin_addr.s_addr = htonl(INADDR_ANY); if((sock = socket(PF_INET, SOCK_STREAM, IPPROTO_IP)) < 0){ - trace("Creating the socket failed: 0x%08x\n", WSAGetLastError()); + trace("Creating the socket failed: %d\n", WSAGetLastError()); WSACleanup(); return; } if(bind(sock, (struct sockaddr *) &sa_set, sa_set_len) < 0){ - trace("Failed to bind socket: 0x%08x\n", WSAGetLastError()); + trace("Failed to bind socket: %d\n", WSAGetLastError()); closesocket(sock); WSACleanup(); return; } if(getsockname(sock, (struct sockaddr *) &sa_get, &sa_get_len) != 0){ - trace("Failed to call getsockname: 0x%08X\n", WSAGetLastError()); + trace("Failed to call getsockname: %d\n", WSAGetLastError()); closesocket(sock); WSACleanup(); return;

1 0

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard 04 Jan '07

04 Jan '07

Module: wine Branch: master Commit: bbb2b7fd98ee9e867c40a9e779cf2fc2121735b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbb2b7fd98ee9e867c40a9e77… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jan 4 10:47:11 2007 +0100 Assorted spelling fixes. --- dlls/dinput/tests/device.c | 2 +- dlls/mshtml/olecmd.c | 2 +- dlls/wined3d/device.c | 2 +- dlls/wined3d/state.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dinput/tests/device.c b/dlls/dinput/tests/device.c index cc79b45..58c9d8f 100644 --- a/dlls/dinput/tests/device.c +++ b/dlls/dinput/tests/device.c @@ -104,7 +104,7 @@ static void test_object_info(LPDIRECTINP hr = IDirectInputDevice_SetProperty(device, DIPROP_AXISMODE, &dp.diph); ok(hr == DI_OK, "SetProperty() failed: %s\n", DXGetErrorString8(hr)); - /* Can not change mode while acquired */ + /* Cannot change mode while acquired */ hr = IDirectInputDevice_Acquire(device); ok(hr == DI_OK, "Acquire() failed: %s\n", DXGetErrorString8(hr)); hr = IDirectInputDevice_SetProperty(device, DIPROP_AXISMODE, &dp.diph); diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index 60518a1..1b6f71b 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -286,7 +286,7 @@ static HRESULT exec_print(HTMLDocument * } if(opts_cnt >= 3) - FIXME("Unsuported opts_cnt %d\n", opts_cnt); + FIXME("Unsupported opts_cnt %d\n", opts_cnt); SafeArrayUnaccessData(V_ARRAY(pvaIn)); break; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c22dba9..14e305a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3486,7 +3486,7 @@ static void IWineD3DDeviceImpl_FindTexUn This->oneToOneTexUnitMap = TRUE; return; } else { - /* No pixel shader, and we do not have enought texture units available. Try to skip NULL textures + /* No pixel shader, and we do not have enough texture units available. Try to skip NULL textures * First, see if we can succeed at all */ tex = 0; diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 1ab686f..c99be0e 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1748,7 +1748,7 @@ static void sampler(DWORD state, IWineD3 activate_dimensions(sampler, stateblock); if(stateblock->renderState[WINED3DRS_COLORKEYENABLE] && sampler == 0) { - /* If color keying is enabled update the alpha test, it depends on the existance + /* If color keying is enabled update the alpha test, it depends on the existence * of a color key in stage 0 */ state_alpha(WINED3DRS_COLORKEYENABLE, stateblock);

1 0

Francois Gouget : itss: Fix spelling of the dwOrigin variables.
by Alexandre Julliard 04 Jan '07

04 Jan '07

Module: wine Branch: master Commit: b84417ee11b449dff352b2158203c169153f4e82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b84417ee11b449dff352b2158… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jan 4 10:52:22 2007 +0100 itss: Fix spelling of the dwOrigin variables. --- dlls/itss/protocol.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/itss/protocol.c b/dlls/itss/protocol.c index c278954..51fad3c 100644 --- a/dlls/itss/protocol.c +++ b/dlls/itss/protocol.c @@ -268,10 +268,10 @@ static HRESULT WINAPI ITSProtocol_Read(I } static HRESULT WINAPI ITSProtocol_Seek(IInternetProtocol *iface, LARGE_INTEGER dlibMove, - DWORD dwOrgin, ULARGE_INTEGER *plibNewPosition) + DWORD dwOrigin, ULARGE_INTEGER *plibNewPosition) { ITSProtocol *This = PROTOCOL_THIS(iface); - FIXME("(%p)->(%d %d %p)\n", This, dlibMove.u.LowPart, dwOrgin, plibNewPosition); + FIXME("(%p)->(%d %d %p)\n", This, dlibMove.u.LowPart, dwOrigin, plibNewPosition); return E_NOTIMPL; }

1 0

Francois Gouget : kernel32/tests: Use '%d' to print GetLastError().
by Alexandre Julliard 04 Jan '07

04 Jan '07

Module: wine Branch: master Commit: 14918e293aacf9b035f96af17c3cde5f3b352fdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=14918e293aacf9b035f96af17… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jan 4 10:54:10 2007 +0100 kernel32/tests: Use '%d' to print GetLastError(). --- dlls/kernel32/tests/comm.c | 46 ++++++++++++++++++++-------------------- dlls/kernel32/tests/module.c | 14 ++++++------ dlls/kernel32/tests/path.c | 28 ++++++++++++------------ dlls/kernel32/tests/pipe.c | 4 +- dlls/kernel32/tests/time.c | 8 +++--- dlls/kernel32/tests/virtual.c | 22 +++++++++--------- 6 files changed, 61 insertions(+), 61 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=14918e293aacf9b035f96…

1 0

Eric Pouech : winedbg: Added a maintenance command to load a given module ( for debug purposes).
by Alexandre Julliard 04 Jan '07

04 Jan '07

Module: wine Branch: master Commit: b2557f25d90380a58593f4753f188b9e116905db URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2557f25d90380a58593f4753… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Tue Jan 2 14:23:48 2007 +0100 winedbg: Added a maintenance command to load a given module (for debug purposes). --- programs/winedbg/Makefile.in | 1 + programs/winedbg/dbg.y | 6 ++- programs/winedbg/debug.l | 5 +- programs/winedbg/debugger.h | 3 + programs/winedbg/tgt_module.c | 90 +++++++++++++++++++++++++++++++++++++++++ 5 files changed, 101 insertions(+), 4 deletions(-) diff --git a/programs/winedbg/Makefile.in b/programs/winedbg/Makefile.in index dd343db..b340ecb 100644 --- a/programs/winedbg/Makefile.in +++ b/programs/winedbg/Makefile.in @@ -25,6 +25,7 @@ C_SRCS = \ stack.c \ tgt_active.c \ tgt_minidump.c \ + tgt_module.c \ types.c \ winedbg.c diff --git a/programs/winedbg/dbg.y b/programs/winedbg/dbg.y index 3b5414a..aea48bd 100644 --- a/programs/winedbg/dbg.y +++ b/programs/winedbg/dbg.y @@ -54,8 +54,8 @@ static int dbg_error(const char*); %token tENABLE tDISABLE tBREAK tHBREAK tWATCH tDELETE tSET tPRINT tEXAM %token tABORT tECHO %token tCLASS tMAPS tSTACK tSEGMENTS tSYMBOL tREGS tALLREGS tWND tQUEUE tLOCAL tEXCEPTION -%token tPROCESS tTHREAD tMODREF tEOL tEOF -%token tFRAME tSHARE tCOND tDISPLAY tUNDISPLAY tDISASSEMBLE +%token tPROCESS tTHREAD tEOL tEOF +%token tFRAME tSHARE tMODULE tCOND tDISPLAY tUNDISPLAY tDISASSEMBLE %token tSTEPI tNEXTI tFINISH tSHOW tDIR tWHATIS tSOURCE %token <string> tPATH tIDENTIFIER tSTRING tDEBUGSTR tINTVAR %token <integer> tNUM tFORMAT @@ -285,6 +285,8 @@ info_command: maintenance_command: tMAINTENANCE tTYPE { print_types(); } + | tMAINTENANCE tMODULE tSTRING { tgt_module_load($3, FALSE); } + | tMAINTENANCE '*' tMODULE tSTRING { tgt_module_load($4, TRUE); } ; noprocess_state: diff --git a/programs/winedbg/debug.l b/programs/winedbg/debug.l index 451c96d..9613fed 100644 --- a/programs/winedbg/debug.l +++ b/programs/winedbg/debug.l @@ -177,11 +177,12 @@ STRING \"[^\n"]+\" <INITIAL>whatis|whati|what { BEGIN(NOCMD); return tWHATIS; } <INITIAL,NOPROCESS>run|ru|r { BEGIN(ASTRING_EXPECTED); return tRUN;} <INITIAL>detach|detac|deta|det { BEGIN(NOCMD); return tDETACH; } -<INITIAL>maintenance|maint { BEGIN(MAINT_CMD); return tMAINTENANCE; } +<INITIAL,NOPROCESS>maintenance|maint { BEGIN(MAINT_CMD); return tMAINTENANCE; } <INITIAL>minidump|mdmp { BEGIN(PATH_EXPECTED); return tMINIDUMP; } <INITIAL>echo { BEGIN(ASTRING_EXPECTED); return tECHO; } <NOPROCESS>attach|attac|atta|att { BEGIN(NOCMD); return tATTACH; } -<INFO_CMD>share|shar|sha { return tSHARE; } +<INFO_CMD>share|shar|sha { return tSHARE; } +<MAINT_CMD>module|modul|mod { BEGIN(ASTRING_EXPECTED); return tMODULE; } <INFO_CMD>locals|local|loca|loc { return tLOCAL; } <INFO_CMD>class|clas|cla { return tCLASS; } <INFO_CMD>process|proces|proce|proc { return tPROCESS; } diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index 91d5a78..0317247 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -393,6 +393,9 @@ extern BOOL dbg_attach_debug extern void minidump_write(const char*, const EXCEPTION_RECORD*); extern enum dbg_start minidump_reload(int argc, char* argv[]); + /* tgt_module.c */ +extern enum dbg_start tgt_module_load(const char* name, BOOL keep); + /* types.c */ extern void print_value(const struct dbg_lvalue* addr, char format, int level); extern int types_print_type(const struct dbg_type*, BOOL details); diff --git a/programs/winedbg/tgt_module.c b/programs/winedbg/tgt_module.c new file mode 100644 index 0000000..0f72510 --- /dev/null +++ b/programs/winedbg/tgt_module.c @@ -0,0 +1,90 @@ +/* + * Wine debugger - loading a module for debug purposes + * + * Copyright 2006 Eric Pouech + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + +#include "config.h" + +#include <stdlib.h> +#include <stdio.h> +#include <string.h> +#include <stdarg.h> + +#include "debugger.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(winedbg); + +static struct be_process_io be_process_module_io; + +static BOOL WINAPI tgt_process_module_read(HANDLE hProcess, const void* addr, + void* buffer, SIZE_T len, SIZE_T* rlen) +{ + return FALSE; +} + +static BOOL WINAPI tgt_process_module_write(HANDLE hProcess, void* addr, + const void* buffer, SIZE_T len, SIZE_T* wlen) +{ + return FALSE; +} + +enum dbg_start tgt_module_load(const char* name, BOOL keep) +{ + DWORD opts = SymGetOptions(); + HANDLE hDummy = (HANDLE)0x87654321; + + SymSetOptions((opts & ~(SYMOPT_UNDNAME|SYMOPT_DEFERRED_LOADS)) | + SYMOPT_LOAD_LINES | SYMOPT_AUTO_PUBLICS | 0x40000000); + SymInitialize(hDummy, NULL, FALSE); + SymLoadModule(hDummy, NULL, name, NULL, 0, 0); + + if (keep) + { + dbg_printf("Non supported mode... errors may occur\n" + "Use at your own risks\n"); + SymSetOptions(SymGetOptions() | 0x40000000); + dbg_curr_process = dbg_add_process(&be_process_module_io, 1, hDummy); + dbg_curr_pid = 1; + /* FIXME: missing thread creation, fetching frames, restoring dbghelp's options... */ + } + else + { + SymCleanup(hDummy); + SymSetOptions(opts); + } + + return start_ok; +} + +static BOOL tgt_process_module_close_process(struct dbg_process* pcs, BOOL kill) +{ + SymCleanup(pcs->handle); + dbg_del_process(pcs); + return TRUE; +} + +static struct be_process_io be_process_module_io = +{ + tgt_process_module_close_process, + tgt_process_module_read, + tgt_process_module_write, +};

1 0

Eric Pouech : dbghelp: Implemented 64 bit versions of EnumerateLoadedModules.
by Alexandre Julliard 04 Jan '07

04 Jan '07

Module: wine Branch: master Commit: 883732281ec94dc4e8728ef925fd87fab9e27443 URL: http://source.winehq.org/git/wine.git/?a=commit;h=883732281ec94dc4e8728ef92… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Tue Jan 2 14:24:10 2007 +0100 dbghelp: Implemented 64 bit versions of EnumerateLoadedModules. --- dlls/dbghelp/dbghelp.spec | 4 +- dlls/dbghelp/module.c | 72 +++++++++++++++++++++++++++++++++++++++++--- include/dbghelp.h | 2 + 3 files changed, 71 insertions(+), 7 deletions(-) diff --git a/dlls/dbghelp/dbghelp.spec b/dlls/dbghelp/dbghelp.spec index 8457a35..7ceefb7 100644 --- a/dlls/dbghelp/dbghelp.spec +++ b/dlls/dbghelp/dbghelp.spec @@ -3,8 +3,8 @@ @ stdcall EnumDirTree(long str str ptr ptr ptr) @ stub EnumDirTreeW @ stdcall EnumerateLoadedModules(long ptr ptr) -@ stub EnumerateLoadedModules64 -@ stub EnumerateLoadedModulesW64 +@ stdcall EnumerateLoadedModules64(long ptr ptr) +@ stdcall EnumerateLoadedModulesW64(long ptr ptr) @ stdcall ExtensionApiVersion() @ stdcall FindDebugInfoFile(str str ptr) @ stdcall FindDebugInfoFileEx(str str ptr ptr ptr) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index ce1cc07..e7214b3 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -620,12 +620,12 @@ BOOL WINAPI SymEnumerateModules64(HANDL } /****************************************************************** - * EnumerateLoadedModules (DBGHELP.@) + * EnumerateLoadedModules64 (DBGHELP.@) * */ -BOOL WINAPI EnumerateLoadedModules(HANDLE hProcess, - PENUMLOADED_MODULES_CALLBACK EnumLoadedModulesCallback, - PVOID UserContext) +BOOL WINAPI EnumerateLoadedModules64(HANDLE hProcess, + PENUMLOADED_MODULES_CALLBACK64 EnumLoadedModulesCallback, + PVOID UserContext) { HMODULE* hMods; char base[256], mod[256]; @@ -649,7 +649,7 @@ BOOL WINAPI EnumerateLoadedModules(HAND !GetModuleBaseNameA(hProcess, hMods[i], base, sizeof(base))) continue; module_fill_module(base, mod, sizeof(mod)); - EnumLoadedModulesCallback(mod, (DWORD)mi.lpBaseOfDll, mi.SizeOfImage, + EnumLoadedModulesCallback(mod, (DWORD_PTR)mi.lpBaseOfDll, mi.SizeOfImage, UserContext); } HeapFree(GetProcessHeap(), 0, hMods); @@ -658,6 +658,68 @@ BOOL WINAPI EnumerateLoadedModules(HAND } /****************************************************************** + * EnumerateLoadedModules (DBGHELP.@) + * + */ +struct enum_load_mod64_32 +{ + PENUMLOADED_MODULES_CALLBACK cb; + PVOID user; +}; + +static BOOL CALLBACK enum_load_mod64_32(PSTR name, DWORD64 base, ULONG size, + PVOID user) +{ + struct enum_load_mod64_32* x = user; + return x->cb(name, (DWORD)base, size, x->user); +} + +BOOL WINAPI EnumerateLoadedModules(HANDLE hProcess, + PENUMLOADED_MODULES_CALLBACK EnumLoadedModulesCallback, + PVOID UserContext) +{ + struct enum_load_mod64_32 x; + + x.cb = EnumLoadedModulesCallback; + x.user = UserContext; + + return EnumerateLoadedModules64(hProcess, enum_load_mod64_32, &x); +} + +/****************************************************************** + * EnumerateLoadedModulesW64 (DBGHELP.@) + * + */ +struct enum_load_mod64_W64 +{ + PENUMLOADED_MODULES_CALLBACKW64 cb; + PVOID user; + WCHAR module[MAX_PATH]; +}; + +static BOOL CALLBACK enum_load_mod64_W64(PSTR name, DWORD64 base, ULONG size, + PVOID user) +{ + struct enum_load_mod64_W64* x = user; + + MultiByteToWideChar(CP_ACP, 0, name, -1, + x->module, sizeof(x->module) / sizeof(WCHAR)); + return x->cb(x->module, base, size, x->user); +} + +BOOL WINAPI EnumerateLoadedModulesW64(HANDLE hProcess, + PENUMLOADED_MODULES_CALLBACKW64 EnumLoadedModulesCallback, + PVOID UserContext) +{ + struct enum_load_mod64_W64 x; + + x.cb = EnumLoadedModulesCallback; + x.user = UserContext; + + return EnumerateLoadedModules64(hProcess, enum_load_mod64_W64, &x); +} + +/****************************************************************** * SymGetModuleInfo (DBGHELP.@) * */ diff --git a/include/dbghelp.h b/include/dbghelp.h index 9afaa90..3840a1e 100644 --- a/include/dbghelp.h +++ b/include/dbghelp.h @@ -758,6 +758,8 @@ typedef BOOL (CALLBACK *PENUMLOADED_MODU BOOL WINAPI EnumerateLoadedModules(HANDLE, PENUMLOADED_MODULES_CALLBACK, PVOID); typedef BOOL (CALLBACK *PENUMLOADED_MODULES_CALLBACK64)(PSTR, DWORD64, ULONG, PVOID); BOOL WINAPI EnumerateLoadedModules64(HANDLE, PENUMLOADED_MODULES_CALLBACK64, PVOID); +typedef BOOL (CALLBACK *PENUMLOADED_MODULES_CALLBACKW64)(PWSTR, DWORD64, ULONG, PVOID); +BOOL WINAPI EnumerateLoadedModulesW64(HANDLE, PENUMLOADED_MODULES_CALLBACKW64, PVOID); typedef BOOL (CALLBACK *PSYM_ENUMMODULES_CALLBACK)(PSTR, ULONG, PVOID); BOOL WINAPI SymEnumerateModules(HANDLE, PSYM_ENUMMODULES_CALLBACK, PVOID); typedef BOOL (CALLBACK *PSYM_ENUMMODULES_CALLBACK64)(PSTR, DWORD64, PVOID);

1 0

Francois Gouget : rsabase/tests: Remove unneeded casts.
by Alexandre Julliard 04 Jan '07

04 Jan '07

Module: wine Branch: master Commit: c3ddf0a1484eedb8490f1eb09736fc8575bdfdca URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3ddf0a1484eedb8490f1eb09… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jan 4 10:51:38 2007 +0100 rsabase/tests: Remove unneeded casts. --- dlls/rsabase/tests/rsabase.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/rsabase/tests/rsabase.c b/dlls/rsabase/tests/rsabase.c index 089e9ca..b7746b1 100644 --- a/dlls/rsabase/tests/rsabase.c +++ b/dlls/rsabase/tests/rsabase.c @@ -39,13 +39,13 @@ static int init_environment(void) { if(!CryptAcquireContext(&hProv, szContainer, szProvider, PROV_RSA_FULL, CRYPT_NEWKEYSET)) { - trace("%08x\n", (unsigned int)GetLastError()); + trace("%08x\n", GetLastError()); return 0; } } else { - trace("%08x\n", (unsigned int)GetLastError()); + trace("%08x\n", GetLastError()); return 0; } } @@ -67,10 +67,10 @@ static void test_gen_random(void) memset(rnd2, 0, sizeof(rnd2)); result = CryptGenRandom(hProv, sizeof(rnd1), rnd1); - ok(result, "%08x\n", (unsigned int)GetLastError()); + ok(result, "%08x\n", GetLastError()); result = CryptGenRandom(hProv, sizeof(rnd2), rnd2); - ok(result, "%08x\n", (unsigned int)GetLastError()); + ok(result, "%08x\n", GetLastError()); ok(memcmp(rnd1, rnd2, sizeof(rnd1)), "CryptGenRandom generates non random data\n"); }

1 0

Stefan Dösinger : wined3d: Move decoding the streams to their own inline function.
by Alexandre Julliard 04 Jan '07

04 Jan '07

Module: wine Branch: master Commit: 51a9810693a0b052b33618b1018abddbdf35ba31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51a9810693a0b052b33618b10… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jan 4 00:13:15 2007 +0100 wined3d: Move decoding the streams to their own inline function. --- dlls/wined3d/state.c | 54 +++++++++++++++++++++++++++---------------------- 1 files changed, 30 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 38d7883..1ab686f 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1973,36 +1973,15 @@ static void transform_projection(DWORD s } } -static void vertexdeclaration(DWORD state, IWineD3DStateBlockImpl *stateblock) { - BOOL useVertexShaderFunction = FALSE, updateFog = FALSE; - BOOL transformed; - /* Some stuff is in the device until we have per context tracking */ +/* Helper for vertexdeclaration() */ +static inline void handleStreams(IWineD3DStateBlockImpl *stateblock, BOOL useVertexShaderFunction) { IWineD3DDeviceImpl *device = stateblock->wineD3DDevice; - BOOL wasrhw = device->last_was_rhw; - - device->streamFixedUp = FALSE; - - /* Shaders can be implemented using ARB_PROGRAM, GLSL, or software - - * here simply check whether a shader was set, or the user disabled shaders - */ - if (device->vs_selected_mode != SHADER_NONE && stateblock->vertexShader && - ((IWineD3DVertexShaderImpl *)stateblock->vertexShader)->baseShader.function != NULL) { - useVertexShaderFunction = TRUE; - - if(((IWineD3DVertexShaderImpl *)stateblock->vertexShader)->usesFog != device->last_was_foggy_shader) { - updateFog = TRUE; - } - } else if(device->last_was_foggy_shader) { - updateFog = TRUE; - } if(device->up_strided) { - /* Note: this is a ddraw fixed-function code path */ TRACE("================ Strided Input ===================\n"); memcpy(&device->strided_streams, device->up_strided, sizeof(device->strided_streams)); - } - else if (stateblock->vertexDecl || stateblock->vertexShader) { + } else if (stateblock->vertexDecl || stateblock->vertexShader) { /* Note: This is a fixed function or shader codepath. * This means it must handle both types of strided data. * Shaders must go through here to zero the strided data, even if they @@ -2027,6 +2006,33 @@ static void vertexdeclaration(DWORD stat primitiveConvertToStridedData((IWineD3DDevice *) device, &device->strided_streams, &device->streamFixedUp); } +} + +static void vertexdeclaration(DWORD state, IWineD3DStateBlockImpl *stateblock) { + BOOL useVertexShaderFunction = FALSE, updateFog = FALSE; + BOOL transformed; + /* Some stuff is in the device until we have per context tracking */ + IWineD3DDeviceImpl *device = stateblock->wineD3DDevice; + BOOL wasrhw = device->last_was_rhw; + + device->streamFixedUp = FALSE; + + /* Shaders can be implemented using ARB_PROGRAM, GLSL, or software - + * here simply check whether a shader was set, or the user disabled shaders + */ + if (device->vs_selected_mode != SHADER_NONE && stateblock->vertexShader && + ((IWineD3DVertexShaderImpl *)stateblock->vertexShader)->baseShader.function != NULL) { + useVertexShaderFunction = TRUE; + + if(((IWineD3DVertexShaderImpl *)stateblock->vertexShader)->usesFog != device->last_was_foggy_shader) { + updateFog = TRUE; + } + } else if(device->last_was_foggy_shader) { + updateFog = TRUE; + } + + handleStreams(stateblock, useVertexShaderFunction); + /* Do I have to use ? TRUE : FALSE ? Or can I rely on 15==15 beeing equal to TRUE(=1)? */ transformed = ((device->strided_streams.u.s.position.lpData != NULL || device->strided_streams.u.s.position.VBO != 0) &&

1 0

Stefan Dösinger : wined3d: Dirtify the stream sources in DrawPrimitiveUP.
by Alexandre Julliard 04 Jan '07

04 Jan '07

Module: wine Branch: master Commit: 2ffc90d670361011b7e2140e32c5d31e6cfba568 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ffc90d670361011b7e2140e3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jan 4 00:14:20 2007 +0100 wined3d: Dirtify the stream sources in DrawPrimitiveUP. --- dlls/wined3d/device.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e8397e3..c22dba9 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4741,6 +4741,9 @@ static HRESULT WINAPI IWineD3DDeviceImpl This->stateBlock->streamStride[0] = VertexStreamZeroStride; This->stateBlock->streamIsUP = TRUE; + /* TODO: Only mark dirty if drawing from a different UP address */ + IWineD3DDeviceImpl_MarkStateDirty(This, STATE_STREAMSRC); + drawPrimitive(iface, PrimitiveType, PrimitiveCount, -This->stateBlock->baseVertexIndex /* start vertex */, 0 /* NumVertices */, 0 /* indxStart*/, 0 /* indxSize*/, NULL /* indxData */, 0 /* indxMin */); @@ -4748,7 +4751,9 @@ static HRESULT WINAPI IWineD3DDeviceImpl This->stateBlock->streamStride[0] = 0; This->stateBlock->streamSource[0] = NULL; - /*stream zero settings set to null at end, as per the msdn */ + /* stream zero settings set to null at end, as per the msdn. No need to mark dirty here, the app has to set + * the new stream sources or use UP drawing again + */ return WINED3D_OK; }

1 0

Stefan Dösinger : wined3d: Catch NOP SetStreamSource changes.
by Alexandre Julliard 04 Jan '07

04 Jan '07

Module: wine Branch: master Commit: 5d2ce97136c2b7227f7afe581b44605cccbf3c37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d2ce97136c2b7227f7afe581… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jan 4 00:08:20 2007 +0100 wined3d: Catch NOP SetStreamSource changes. --- dlls/wined3d/device.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index f53f339..e8397e3 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2211,6 +2211,15 @@ static HRESULT WINAPI IWineD3DDeviceImpl This->updateStateBlock->changed.streamSource[StreamNumber] = TRUE; This->updateStateBlock->set.streamSource[StreamNumber] = TRUE; + + if(oldSrc == pStreamData && + This->updateStateBlock->streamStride[StreamNumber] == Stride && + This->updateStateBlock->streamOffset[StreamNumber] == OffsetInBytes && + This->updateStateBlock->streamFlags[StreamNumber] == streamFlags) { + TRACE("Application is setting the old values over, nothing to do\n"); + return WINED3D_OK; + } + This->updateStateBlock->streamSource[StreamNumber] = pStreamData; if (pStreamData) { This->updateStateBlock->streamStride[StreamNumber] = Stride;

1 0