November 2005 - Wine-Commits

wine/ dlls/wined3d/device.c dlls/wined3d/drawp ...
by Alexandre Julliard Nov. 29, 2005

Nov. 29, 2005

ChangeSet ID: 21550 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/29 10:41:26 Modified files: dlls/wined3d : device.c drawprim.c stateblock.c wined3d_private.h include/wine : wined3d_interface.h Log message: Oliver Stieber <oliver_stieber(a)yahoo.co.uk> Added support for vertex and pixel shader constants that have no type i.e. they haven't been set yet or are clear. Patch: http://cvs.winehq.org/patch.py?id=21550 Old revision New revision Changes Path 1.101 1.102 +30 -1 wine/dlls/wined3d/device.c 1.34 1.35 +5 -3 wine/dlls/wined3d/drawprim.c 1.27 1.28 +6 -0 wine/dlls/wined3d/stateblock.c 1.70 1.71 +4 -3 wine/dlls/wined3d/wined3d_private.h 1.46 1.47 +4 -0 wine/include/wine/wined3d_interface.h Index: wine/dlls/wined3d/device.c diff -u -p wine/dlls/wined3d/device.c:1.101 wine/dlls/wined3d/device.c:1.102 --- wine/dlls/wined3d/device.c:1.101 29 Nov 2005 16:41:26 -0000 +++ wine/dlls/wined3d/device.c 29 Nov 2005 16:41:26 -0000 @@ -3899,10 +3899,22 @@ HRESULT WINAPI IWineD3DDeviceImpl_GetVer return D3D_OK; } +HRESULT WINAPI IWineD3DDeviceImpl_SetVertexShaderConstantN(IWineD3DDevice *iface, UINT StartRegister, UINT VectorNCount){ + IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; + int i; + /* populate the bitmap that says which constant type we should load */ + for (i = StartRegister; i < StartRegister + VectorNCount; ++i) { + This->updateStateBlock->changed.vertexShaderConstants[i] = TRUE; + This->updateStateBlock->set.vertexShaderConstants[i] = TRUE; + This->updateStateBlock->vertexShaderConstantT[i] = WINESHADERCNST_NONE; + TRACE("(%p) : Setting vsf %d\n", This, i); + } + return D3D_OK; +} + #undef SET_SHADER_CONSTANT #undef GET_SHADER_CONSTANT - HRESULT WINAPI IWineD3DDeviceImpl_SetPixelShader(IWineD3DDevice *iface, IWineD3DPixelShader *pShader) { IUnknown *parent; IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; @@ -4082,6 +4094,21 @@ HRESULT WINAPI IWineD3DDeviceImpl_GetPix return D3D_OK; } +HRESULT WINAPI IWineD3DDeviceImpl_SetPixelShaderConstantN(IWineD3DDevice *iface, UINT StartRegister, UINT VectorNCount){ + IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; + int i; + + /* populate the bitmap that says which constant type we should load */ + for (i = StartRegister; i < StartRegister + VectorNCount; ++i) { + This->updateStateBlock->changed.pixelShaderConstants[i] = TRUE; + This->updateStateBlock->set.pixelShaderConstants[i] = TRUE; + This->updateStateBlock->pixelShaderConstantT[i] = WINESHADERCNST_NONE; + TRACE("(%p) : Setting vsf %d\n", This, i); + } + + return D3D_OK; +} + #undef SET_SHADER_CONSTANT #undef GET_SHADER_CONSTANT @@ -6443,6 +6470,7 @@ const IWineD3DDeviceVtbl IWineD3DDevice_ IWineD3DDeviceImpl_GetPixelShaderConstantI, IWineD3DDeviceImpl_SetPixelShaderConstantF, IWineD3DDeviceImpl_GetPixelShaderConstantF, + IWineD3DDeviceImpl_SetPixelShaderConstantN, IWineD3DDeviceImpl_SetRenderState, IWineD3DDeviceImpl_GetRenderState, IWineD3DDeviceImpl_SetRenderTarget, @@ -6473,6 +6501,7 @@ const IWineD3DDeviceVtbl IWineD3DDevice_ IWineD3DDeviceImpl_GetVertexShaderConstantI, IWineD3DDeviceImpl_SetVertexShaderConstantF, IWineD3DDeviceImpl_GetVertexShaderConstantF, + IWineD3DDeviceImpl_SetVertexShaderConstantN, IWineD3DDeviceImpl_SetViewport, IWineD3DDeviceImpl_GetViewport, IWineD3DDeviceImpl_MultiplyTransform, Index: wine/dlls/wined3d/drawprim.c diff -u -p wine/dlls/wined3d/drawprim.c:1.34 wine/dlls/wined3d/drawprim.c:1.35 --- wine/dlls/wined3d/drawprim.c:1.34 29 Nov 2005 16:41:26 -0000 +++ wine/dlls/wined3d/drawprim.c 29 Nov 2005 16:41:26 -0000 @@ -1743,9 +1743,11 @@ UINT numberOfvertices, UINT numberOfIndi /* Update the constants */ for (i = 0; i < WINED3D_VSHADER_MAX_CONSTANTS; i++) { /* TODO: add support for Integer and Boolean constants */ - GL_EXTCALL(glProgramEnvParameter4fvARB(GL_VERTEX_PROGRAM_ARB, i, &This->stateBlock->vertexShaderConstantF[i * 4])); - TRACE_(d3d_shader)("Loading constants %u = %f %f %f %f\n",i, This->stateBlock->vertexShaderConstantF[i *4 ], This->stateBlock->vertexShaderConstantF[i * 4 + 1], This->stateBlock->vertexShaderConstantF[i *4 + 2], This->stateBlock->vertexShaderConstantF[i * 4 + 3]); - checkGLcall("glProgramEnvParameter4fvARB(GL_VERTEX_PROGRAM_ARB"); + if (WINESHADERCNST_FLOAT == This->stateBlock->vertexShaderConstantT[i]) { + GL_EXTCALL(glProgramEnvParameter4fvARB(GL_VERTEX_PROGRAM_ARB, i, &This->stateBlock->vertexShaderConstantF[i * 4])); + TRACE_(d3d_shader)("Loading constants %u = %f %f %f %f\n",i, This->stateBlock->vertexShaderConstantF[i *4 ], This->stateBlock->vertexShaderConstantF[i * 4 + 1], This->stateBlock->vertexShaderConstantF[i *4 + 2], This->stateBlock->vertexShaderConstantF[i * 4 + 3]); + checkGLcall("glProgramEnvParameter4fvARB(GL_VERTEX_PROGRAM_ARB"); + } } /* TODO: Vertex Shader 8 constants*/ Index: wine/dlls/wined3d/stateblock.c diff -u -p wine/dlls/wined3d/stateblock.c:1.27 wine/dlls/wined3d/stateblock.c:1.28 --- wine/dlls/wined3d/stateblock.c:1.27 29 Nov 2005 16:41:26 -0000 +++ wine/dlls/wined3d/stateblock.c 29 Nov 2005 16:41:26 -0000 @@ -393,6 +393,9 @@ should really perform a delta so that on case WINESHADERCNST_INTEGER: IWineD3DDevice_SetVertexShaderConstantI(pDevice, i, This->vertexShaderConstantI + i * 4, 1); break; + case WINESHADERCNST_NONE: + IWineD3DDevice_SetVertexShaderConstantN(pDevice, i, 1); + break; } } } @@ -419,6 +422,9 @@ should really perform a delta so that on case WINESHADERCNST_INTEGER: IWineD3DDevice_SetPixelShaderConstantI(pDevice, i, This->pixelShaderConstantI + i * 4, 1); break; + case WINESHADERCNST_NONE: + IWineD3DDevice_SetPixelShaderConstantN(pDevice, i, 1); + break; } } } Index: wine/dlls/wined3d/wined3d_private.h diff -u -p wine/dlls/wined3d/wined3d_private.h:1.70 wine/dlls/wined3d/wined3d_private.h:1.71 --- wine/dlls/wined3d/wined3d_private.h:1.70 29 Nov 2005 16:41:26 -0000 +++ wine/dlls/wined3d/wined3d_private.h 29 Nov 2005 16:41:26 -0000 @@ -888,9 +888,10 @@ typedef struct SAVEDSTATES { } SAVEDSTATES; typedef enum { - WINESHADERCNST_FLOAT = 0, - WINESHADERCNST_INTEGER = 1, - WINESHADERCNST_BOOL = 2 + WINESHADERCNST_NONE = 0, + WINESHADERCNST_FLOAT = 1, + WINESHADERCNST_INTEGER = 2, + WINESHADERCNST_BOOL = 3 } WINESHADERCNST; struct IWineD3DStateBlockImpl Index: wine/include/wine/wined3d_interface.h diff -u -p wine/include/wine/wined3d_interface.h:1.46 wine/include/wine/wined3d_interface.h:1.47 --- wine/include/wine/wined3d_interface.h:1.46 29 Nov 2005 16:41:26 -0000 +++ wine/include/wine/wined3d_interface.h 29 Nov 2005 16:41:26 -0000 @@ -332,6 +332,7 @@ DECLARE_INTERFACE_(IWineD3DDevice,IUnkno STDMETHOD(GetPixelShaderConstantI)(THIS_ UINT StartRegister, int* pConstantData, UINT Vector4iCount) PURE; STDMETHOD(SetPixelShaderConstantF)(THIS_ UINT StartRegister, CONST float* pConstantData, UINT Vector4fCount) PURE; STDMETHOD(GetPixelShaderConstantF)(THIS_ UINT StartRegister, float* pConstantData, UINT Vector4fCount) PURE; + STDMETHOD(SetPixelShaderConstantN)(THIS_ UINT StartRegister, UINT VectorNCount) PURE; STDMETHOD(SetRenderState)(THIS_ D3DRENDERSTATETYPE State,DWORD Value) PURE; STDMETHOD(GetRenderState)(THIS_ D3DRENDERSTATETYPE State,DWORD * pValue) PURE; STDMETHOD(SetRenderTarget)(THIS_ DWORD RenderTargetIndex, struct IWineD3DSurface* pRenderTarget) PURE; @@ -362,6 +363,7 @@ DECLARE_INTERFACE_(IWineD3DDevice,IUnkno STDMETHOD(GetVertexShaderConstantI)(THIS_ UINT StartRegister, int* pConstantData, UINT Vector4iCount) PURE; STDMETHOD(SetVertexShaderConstantF)(THIS_ UINT StartRegister, CONST float* pConstantData, UINT Vector4fCount) PURE; STDMETHOD(GetVertexShaderConstantF)(THIS_ UINT StartRegister, float* pConstantData, UINT Vector4fCount) PURE; + STDMETHOD(SetVertexShaderConstantN)(THIS_ UINT StartRegister, UINT VectorNCount) PURE; STDMETHOD(SetViewport)(THIS_ CONST WINED3DVIEWPORT * pViewport) PURE; STDMETHOD(GetViewport)(THIS_ WINED3DVIEWPORT * pViewport) PURE; STDMETHOD(MultiplyTransform)(THIS_ D3DTRANSFORMSTATETYPE State, CONST D3DMATRIX * pMatrix) PURE; @@ -460,6 +462,7 @@ DECLARE_INTERFACE_(IWineD3DDevice,IUnkno #define IWineD3DDevice_GetPixelShaderConstantI(p,a,b,c) (p)->lpVtbl->GetPixelShaderConstantI(p,a,b,c) #define IWineD3DDevice_SetPixelShaderConstantF(p,a,b,c) (p)->lpVtbl->SetPixelShaderConstantF(p,a,b,c) #define IWineD3DDevice_GetPixelShaderConstantF(p,a,b,c) (p)->lpVtbl->GetPixelShaderConstantF(p,a,b,c) +#define IWineD3DDevice_SetPixelShaderConstantN(p,a,b) (p)->lpVtbl->SetPixelShaderConstantN(p,a,b) #define IWineD3DDevice_GetRasterStatus(p,a,b) (p)->lpVtbl->GetRasterStatus(p,a,b) #define IWineD3DDevice_SetRenderState(p,a,b) (p)->lpVtbl->SetRenderState(p,a,b) #define IWineD3DDevice_GetRenderState(p,a,b) (p)->lpVtbl->GetRenderState(p,a,b) @@ -492,6 +495,7 @@ DECLARE_INTERFACE_(IWineD3DDevice,IUnkno #define IWineD3DDevice_GetVertexShaderConstantI(p,a,b,c) (p)->lpVtbl->GetVertexShaderConstantI(p,a,b,c) #define IWineD3DDevice_SetVertexShaderConstantF(p,a,b,c) (p)->lpVtbl->SetVertexShaderConstantF(p,a,b,c) #define IWineD3DDevice_GetVertexShaderConstantF(p,a,b,c) (p)->lpVtbl->GetVertexShaderConstantF(p,a,b,c) +#define IWineD3DDevice_SetVertexShaderConstantN(p,a,b) (p)->lpVtbl->SetVertexShaderConstantN(p,a,b) #define IWineD3DDevice_SetViewport(p,a) (p)->lpVtbl->SetViewport(p,a) #define IWineD3DDevice_GetViewport(p,a) (p)->lpVtbl->GetViewport(p,a) #define IWineD3DDevice_MultiplyTransform(p,a,b) (p)->lpVtbl->MultiplyTransform(p,a,b)

1 0

wine/ dlls/netapi32/Makefile.in dlls/netapi32/ ...
by Alexandre Julliard Nov. 29, 2005

Nov. 29, 2005

ChangeSet ID: 21549 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/29 05:09:32 Modified files: dlls/netapi32 : Makefile.in netapi32.spec dlls/netapi32/tests: .cvsignore Makefile.in include : Makefile.in Added files: dlls/netapi32 : ds.c dlls/netapi32/tests: ds.c include : dsrole.h Log message: Paul Vriens <Paul.Vriens(a)xs4all.nl> Added some stubbed Ds-calls Start of conformance tests for these Ds-calls. Patch: http://cvs.winehq.org/patch.py?id=21549 Old revision New revision Changes Path 1.12 1.13 +1 -0 wine/dlls/netapi32/Makefile.in 1.21 1.22 +15 -0 wine/dlls/netapi32/netapi32.spec Added 1.1 +0 -0 wine/dlls/netapi32/ds.c 1.3 1.4 +1 -0 wine/dlls/netapi32/tests/.cvsignore 1.3 1.4 +1 -0 wine/dlls/netapi32/tests/Makefile.in Added 1.1 +0 -0 wine/dlls/netapi32/tests/ds.c 1.192 1.193 +1 -0 wine/include/Makefile.in Added 1.1 +0 -0 wine/include/dsrole.h

1 0

wine/ dlls/dbghelp/dbghelp.spec dlls/dbghelp/s ...
by Alexandre Julliard Nov. 29, 2005

Nov. 29, 2005

ChangeSet ID: 21548 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/29 05:09:21 Modified files: dlls/dbghelp : dbghelp.spec stack.c include : dbghelp.h Log message: Vitaliy Margolen <wine-patch(a)kievinfo.com> Stub StackWalk64. Patch: http://cvs.winehq.org/patch.py?id=21548 Old revision New revision Changes Path 1.17 1.18 +1 -1 wine/dlls/dbghelp/dbghelp.spec 1.11 1.12 +18 -0 wine/dlls/dbghelp/stack.c 1.23 1.24 +46 -0 wine/include/dbghelp.h Index: wine/dlls/dbghelp/dbghelp.spec diff -u -p wine/dlls/dbghelp/dbghelp.spec:1.17 wine/dlls/dbghelp/dbghelp.spec:1.18 --- wine/dlls/dbghelp/dbghelp.spec:1.17 29 Nov 2005 11: 9:21 -0000 +++ wine/dlls/dbghelp/dbghelp.spec 29 Nov 2005 11: 9:21 -0000 @@ -23,7 +23,7 @@ @ stdcall MiniDumpReadDumpStream(ptr long ptr ptr ptr) @ stdcall MiniDumpWriteDump(ptr long ptr long long long long) @ stdcall SearchTreeForFile(str str str) -@ stub StackWalk64 +@ stdcall StackWalk64(long long long ptr ptr ptr ptr ptr ptr) @ stdcall StackWalk(long long long ptr ptr ptr ptr ptr ptr) @ stdcall SymCleanup(long) @ stdcall SymEnumLines(ptr double str str ptr ptr) Index: wine/dlls/dbghelp/stack.c diff -u -p wine/dlls/dbghelp/stack.c:1.11 wine/dlls/dbghelp/stack.c:1.12 --- wine/dlls/dbghelp/stack.c:1.11 29 Nov 2005 11: 9:21 -0000 +++ wine/dlls/dbghelp/stack.c 29 Nov 2005 11: 9:21 -0000 @@ -401,6 +401,24 @@ done_err: return FALSE; } +/*********************************************************************** + * StackWalk64 (DBGHELP.@) + */ +BOOL WINAPI StackWalk64(DWORD MachineType, HANDLE hProcess, HANDLE hThread, + LPSTACKFRAME64 frame, LPVOID ctx, + PREAD_PROCESS_MEMORY_ROUTINE64 f_read_mem, + PFUNCTION_TABLE_ACCESS_ROUTINE64 FunctionTableAccessRoutine, + PGET_MODULE_BASE_ROUTINE64 GetModuleBaseRoutine, + PTRANSLATE_ADDRESS_ROUTINE64 f_xlat_adr) +{ + FIXME("(%ld, %p, %p, %p, %p, %p, %p, %p, %p) - stub!\n", + MachineType, hProcess, hThread, frame, ctx, + f_read_mem, FunctionTableAccessRoutine, + GetModuleBaseRoutine, f_xlat_adr); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + /****************************************************************** * SymRegisterFunctionEntryCallback (DBGHELP.@) * Index: wine/include/dbghelp.h diff -u -p wine/include/dbghelp.h:1.23 wine/include/dbghelp.h:1.24 --- wine/include/dbghelp.h:1.23 29 Nov 2005 11: 9:21 -0000 +++ wine/include/dbghelp.h 29 Nov 2005 11: 9:21 -0000 @@ -60,6 +60,13 @@ typedef struct _tagADDRESS ADDRESS_MODE Mode; } ADDRESS, *LPADDRESS; +typedef struct _tagADDRESS64 +{ + DWORD64 Offset; + WORD Segment; + ADDRESS_MODE Mode; +} ADDRESS64, *LPADDRESS64; + #define SYMF_OMAP_GENERATED 0x00000001 #define SYMF_OMAP_MODIFIED 0x00000002 #define SYMF_USER_GENERATED 0x00000004 @@ -864,6 +871,19 @@ typedef struct _KDHELP DWORD SystemRangeStart; } KDHELP, *PKDHELP; +typedef struct _KDHELP64 +{ + DWORD64 Thread; + DWORD ThCallbackStack; + DWORD ThCallbackBStore; + DWORD NextCallback; + DWORD FramePointer; + DWORD64 KiCallUserMode; + DWORD64 KeUserCallbackDispatcher; + DWORD64 SystemRangeStart; + DWORD64 Reserved[8]; +} KDHELP64, *PKDHELP64; + typedef struct _STACKFRAME { ADDRESS AddrPC; @@ -879,6 +899,21 @@ typedef struct _STACKFRAME ADDRESS AddrBStore; } STACKFRAME, *LPSTACKFRAME; +typedef struct _STACKFRAME64 +{ + ADDRESS64 AddrPC; + ADDRESS64 AddrReturn; + ADDRESS64 AddrFrame; + ADDRESS64 AddrStack; + ADDRESS64 AddrBStore; + PVOID FuncTableEntry; + DWORD64 Params[4]; + BOOL Far; + BOOL Virtual; + DWORD64 Reserved[3]; + KDHELP64 KdHelp; +} STACKFRAME64, *LPSTACKFRAME64; + typedef BOOL (CALLBACK *PREAD_PROCESS_MEMORY_ROUTINE) (HANDLE, DWORD, PVOID, DWORD, PDWORD); typedef PVOID (CALLBACK *PFUNCTION_TABLE_ACCESS_ROUTINE)(HANDLE, DWORD); @@ -890,6 +925,17 @@ BOOL WINAPI StackWalk(DWORD, HANDLE, HAN PGET_MODULE_BASE_ROUTINE, PTRANSLATE_ADDRESS_ROUTINE); +typedef BOOL (CALLBACK *PREAD_PROCESS_MEMORY_ROUTINE64) + (HANDLE, DWORD64, PVOID, DWORD, PDWORD); +typedef PVOID (CALLBACK *PFUNCTION_TABLE_ACCESS_ROUTINE64)(HANDLE, DWORD64); +typedef DWORD (CALLBACK *PGET_MODULE_BASE_ROUTINE64)(HANDLE, DWORD64); +typedef DWORD (CALLBACK *PTRANSLATE_ADDRESS_ROUTINE64)(HANDLE, HANDLE, LPADDRESS64); +BOOL WINAPI StackWalk64(DWORD, HANDLE, HANDLE, LPSTACKFRAME64, PVOID, + PREAD_PROCESS_MEMORY_ROUTINE64, + PFUNCTION_TABLE_ACCESS_ROUTINE64, + PGET_MODULE_BASE_ROUTINE64, + PTRANSLATE_ADDRESS_ROUTINE64); + PVOID WINAPI SymFunctionTableAccess(HANDLE, DWORD); typedef PVOID (CALLBACK *PSYMBOL_FUNCENTRY_CALLBACK)(HANDLE, DWORD, PVOID);

1 0

wine/ dlls/dbghelp/dbghelp_private.h dlls/dbgh ...
by Alexandre Julliard Nov. 29, 2005

Nov. 29, 2005

ChangeSet ID: 21547 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/29 05:09:13 Modified files: dlls/dbghelp : dbghelp_private.h module.c path.c include : dbghelp.h Log message: Eric Pouech <eric.pouech(a)wanadoo.fr> Added support for 'loading' virtual modules. Patch: http://cvs.winehq.org/patch.py?id=21547 Old revision New revision Changes Path 1.19 1.20 +1 -0 wine/dlls/dbghelp/dbghelp_private.h 1.17 1.18 +36 -10 wine/dlls/dbghelp/module.c 1.7 1.8 +1 -0 wine/dlls/dbghelp/path.c 1.22 1.23 +5 -0 wine/include/dbghelp.h Index: wine/dlls/dbghelp/dbghelp_private.h diff -u -p wine/dlls/dbghelp/dbghelp_private.h:1.19 wine/dlls/dbghelp/dbghelp_private.h:1.20 --- wine/dlls/dbghelp/dbghelp_private.h:1.19 29 Nov 2005 11: 9:13 -0000 +++ wine/dlls/dbghelp/dbghelp_private.h 29 Nov 2005 11: 9:13 -0000 @@ -257,6 +257,7 @@ enum module_type DMT_ELF, /* a real ELF shared module */ DMT_PE, /* a native or builtin PE module */ DMT_PDB, /* PDB file */ + DMT_VIRTUAL, /* a virtual module (ie defined by caller) */ }; struct module Index: wine/dlls/dbghelp/module.c diff -u -p wine/dlls/dbghelp/module.c:1.17 wine/dlls/dbghelp/module.c:1.18 --- wine/dlls/dbghelp/module.c:1.17 29 Nov 2005 11: 9:13 -0000 +++ wine/dlls/dbghelp/module.c 29 Nov 2005 11: 9:13 -0000 @@ -68,6 +68,17 @@ static void module_fill_module(const cha while ((*out = tolower(*out))) out++; } +static const char* get_module_type(enum module_type type) +{ + switch (type) + { + case DMT_ELF: return "ELF"; + case DMT_PE: return "PE"; + case DMT_VIRTUAL: return "Virtual"; + default: return "---"; + } +} + /*********************************************************************** * Creates and links a new module to a process */ @@ -78,7 +89,7 @@ struct module* module_new(struct process { struct module* module; - assert(type == DMT_ELF || type == DMT_PE); + assert(type == DMT_ELF || type == DMT_PE || type == DMT_VIRTUAL); if (!(module = HeapAlloc(GetProcessHeap(), 0, sizeof(*module)))) return NULL; @@ -88,8 +99,7 @@ struct module* module_new(struct process pcs->lmodules = module; TRACE("=> %s %08lx-%08lx %s\n", - type == DMT_ELF ? "ELF" : (type == DMT_PE ? "PE" : "---"), - mod_addr, mod_addr + size, name); + get_module_type(type), mod_addr, mod_addr + size, name); pool_init(&module->pool, 65536); @@ -134,7 +144,8 @@ struct module* module_find_by_name(const if (type == DMT_UNKNOWN) { if ((module = module_find_by_name(pcs, name, DMT_PE)) || - (module = module_find_by_name(pcs, name, DMT_ELF))) + (module = module_find_by_name(pcs, name, DMT_ELF)) || + (module = module_find_by_name(pcs, name, DMT_VIRTUAL))) return module; } else @@ -226,6 +237,7 @@ struct module* module_get_debug(const st { case DMT_ELF: ret = elf_load_debug_info(module, NULL); break; case DMT_PE: ret = pe_load_debug_info(pcs, module); break; + case DMT_VIRTUAL: /* fall through */ default: ret = FALSE; break; } if (!ret) module->module.SymType = SymNone; @@ -248,7 +260,8 @@ struct module* module_find_by_addr(const if (type == DMT_UNKNOWN) { if ((module = module_find_by_addr(pcs, addr, DMT_PE)) || - (module = module_find_by_addr(pcs, addr, DMT_ELF))) + (module = module_find_by_addr(pcs, addr, DMT_ELF)) || + (module = module_find_by_addr(pcs, addr, DMT_VIRTUAL))) return module; } else @@ -381,12 +394,25 @@ DWORD64 WINAPI SymLoadModuleEx(HANDLE h PCSTR ModuleName, DWORD64 BaseOfDll, DWORD DllSize, PMODLOAD_DATA Data, DWORD Flags) { - if (Data || Flags) + if (Data) + FIXME("Unsupported load data parameter %p for %s\n", Data, ImageName); + if (!validate_addr64(BaseOfDll)) return FALSE; + if (Flags & SLMFLAG_VIRTUAL) { - FIXME("Unsupported parameters (%p, %lx) for %s\n", Data, Flags, ImageName); - if (Flags & 1) return TRUE; + struct process* pcs = process_find_by_handle(hProcess); + struct module* module; + if (!pcs) return FALSE; + + module = module_new(pcs, ImageName, DMT_VIRTUAL, (DWORD)BaseOfDll, DllSize, 0, 0); + if (!module) return FALSE; + if (ModuleName) + lstrcpynA(module->module.ModuleName, ModuleName, sizeof(module->module.ModuleName)); + + return TRUE; } - if (!validate_addr64(BaseOfDll)) return FALSE; + if (Flags & ~(SLMFLAG_VIRTUAL)) + FIXME("Unsupported Flags %08lx for %s\n", Flags, ImageName); + return SymLoadModule(hProcess, hFile, (char*)ImageName, (char*)ModuleName, (DWORD)BaseOfDll, DllSize); } @@ -477,7 +503,7 @@ BOOL WINAPI SymEnumerateModules(HANDLE for (module = pcs->lmodules; module; module = module->next) { - if (!(dbghelp_options & SYMOPT_WINE_WITH_ELF_MODULES) && module->type != DMT_PE) + if (!(dbghelp_options & SYMOPT_WINE_WITH_ELF_MODULES) && module->type == DMT_ELF) continue; if (!EnumModulesCallback(module->module.ModuleName, module->module.BaseOfImage, UserContext)) Index: wine/dlls/dbghelp/path.c diff -u -p wine/dlls/dbghelp/path.c:1.7 wine/dlls/dbghelp/path.c:1.8 --- wine/dlls/dbghelp/path.c:1.7 29 Nov 2005 11: 9:13 -0000 +++ wine/dlls/dbghelp/path.c 29 Nov 2005 11: 9:13 -0000 @@ -276,6 +276,7 @@ static BOOL CALLBACK sffip_cb(LPCSTR buf } break; case DMT_PDB: + case DMT_VIRTUAL: FIXME("NIY on '%s'\n", buffer); break; default: Index: wine/include/dbghelp.h diff -u -p wine/include/dbghelp.h:1.22 wine/include/dbghelp.h:1.23 --- wine/include/dbghelp.h:1.22 29 Nov 2005 11: 9:13 -0000 +++ wine/include/dbghelp.h 29 Nov 2005 11: 9:13 -0000 @@ -643,6 +643,11 @@ BOOL WINAPI MiniDumpReadDumpStream(PVOID /************************* * MODULE handling * *************************/ + +/* flags for SymLoadModuleEx */ +#define SLMFLAG_VIRTUAL 0x1 +#define SLMFLAG_NO_SYMBOLS 0x4 + typedef BOOL (CALLBACK *PENUMLOADED_MODULES_CALLBACK)(PSTR, DWORD, ULONG, PVOID); BOOL WINAPI EnumerateLoadedModules(HANDLE, PENUMLOADED_MODULES_CALLBACK, PVOID); typedef BOOL (CALLBACK *PSYM_ENUMMODULES_CALLBACK)(PSTR, DWORD, PVOID);

1 0

wine/ dlls/dbghelp/dbghelp.spec dlls/dbghelp/s ...
by Alexandre Julliard Nov. 29, 2005

Nov. 29, 2005

ChangeSet ID: 21546 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/29 05:09:03 Modified files: dlls/dbghelp : dbghelp.spec symbol.c include : dbghelp.h Log message: Eric Pouech <eric.pouech(a)wanadoo.fr> Implemented SymGet{Next|Prev}Line64. Patch: http://cvs.winehq.org/patch.py?id=21546 Old revision New revision Changes Path 1.16 1.17 +3 -3 wine/dlls/dbghelp/dbghelp.spec 1.20 1.21 +74 -0 wine/dlls/dbghelp/symbol.c 1.21 1.22 +13 -0 wine/include/dbghelp.h Index: wine/dlls/dbghelp/dbghelp.spec diff -u -p wine/dlls/dbghelp/dbghelp.spec:1.16 wine/dlls/dbghelp/dbghelp.spec:1.17 --- wine/dlls/dbghelp/dbghelp.spec:1.16 29 Nov 2005 11: 9: 3 -0000 +++ wine/dlls/dbghelp/dbghelp.spec 29 Nov 2005 11: 9: 3 -0000 @@ -43,13 +43,13 @@ @ stub SymFunctionTableAccess64 @ stdcall SymFunctionTableAccess(long long) @ stub SymGetFileLineOffsets64 -@ stub SymGetLineFromAddr64 +@ stdcall SymGetLineFromAddr64(long double ptr ptr) @ stdcall SymGetLineFromAddr(long long ptr ptr) @ stub SymGetLineFromName64 @ stub SymGetLineFromName -@ stub SymGetLineNext64 +@ stdcall SymGetLineNext64(long ptr) @ stdcall SymGetLineNext(long ptr) -@ stub SymGetLinePrev64 +@ stdcall SymGetLinePrev64(long ptr) @ stdcall SymGetLinePrev(long ptr) @ stub SymGetModuleBase64 @ stdcall SymGetModuleBase(long long) Index: wine/dlls/dbghelp/symbol.c diff -u -p wine/dlls/dbghelp/symbol.c:1.20 wine/dlls/dbghelp/symbol.c:1.21 --- wine/dlls/dbghelp/symbol.c:1.20 29 Nov 2005 11: 9: 3 -0000 +++ wine/dlls/dbghelp/symbol.c 29 Nov 2005 11: 9: 3 -0000 @@ -1073,6 +1073,50 @@ BOOL WINAPI SymGetLineFromAddr(HANDLE hP } /****************************************************************** + * copy_line_64_from_32 (internal) + * + */ +static void copy_line_64_from_32(IMAGEHLP_LINE64* l64, const IMAGEHLP_LINE* l32) + +{ + l64->Key = l32->Key; + l64->LineNumber = l32->LineNumber; + l64->FileName = l32->FileName; + l64->Address = l32->Address; +} + +/****************************************************************** + * copy_line_32_from_64 (internal) + * + */ +static void copy_line_32_from_64(IMAGEHLP_LINE* l32, const IMAGEHLP_LINE64* l64) + +{ + l32->Key = l64->Key; + l32->LineNumber = l64->LineNumber; + l32->FileName = l64->FileName; + l32->Address = l64->Address; +} + +/****************************************************************** + * SymGetLineFromAddr64 (DBGHELP.@) + * + */ +BOOL WINAPI SymGetLineFromAddr64(HANDLE hProcess, DWORD64 dwAddr, + PDWORD pdwDisplacement, PIMAGEHLP_LINE64 Line) +{ + IMAGEHLP_LINE line32; + + if (Line->SizeOfStruct < sizeof(*Line)) return FALSE; + if (!validate_addr64(dwAddr)) return FALSE; + line32.SizeOfStruct = sizeof(line32); + if (!SymGetLineFromAddr(hProcess, (DWORD)dwAddr, pdwDisplacement, &line32)) + return FALSE; + copy_line_64_from_32(Line, &line32); + return TRUE; +} + +/****************************************************************** * SymGetLinePrev (DBGHELP.@) * */ @@ -1122,6 +1166,21 @@ BOOL WINAPI SymGetLinePrev(HANDLE hProce return FALSE; } +/****************************************************************** + * SymGetLinePrev64 (DBGHELP.@) + * + */ +BOOL WINAPI SymGetLinePrev64(HANDLE hProcess, PIMAGEHLP_LINE64 Line) +{ + IMAGEHLP_LINE line32; + + line32.SizeOfStruct = sizeof(line32); + copy_line_32_from_64(&line32, Line); + if (!SymGetLinePrev(hProcess, &line32)) return FALSE; + copy_line_64_from_32(Line, &line32); + return TRUE; +} + BOOL symt_get_func_line_next(struct module* module, PIMAGEHLP_LINE line) { struct line_info* li; @@ -1164,6 +1223,21 @@ BOOL WINAPI SymGetLineNext(HANDLE hProce return FALSE; } +/****************************************************************** + * SymGetLineNext64 (DBGHELP.@) + * + */ +BOOL WINAPI SymGetLineNext64(HANDLE hProcess, PIMAGEHLP_LINE64 Line) +{ + IMAGEHLP_LINE line32; + + line32.SizeOfStruct = sizeof(line32); + copy_line_32_from_64(&line32, Line); + if (!SymGetLineNext(hProcess, &line32)) return FALSE; + copy_line_64_from_32(Line, &line32); + return TRUE; +} + /*********************************************************************** * SymFunctionTableAccess (DBGHELP.@) */ Index: wine/include/dbghelp.h diff -u -p wine/include/dbghelp.h:1.21 wine/include/dbghelp.h:1.22 --- wine/include/dbghelp.h:1.21 29 Nov 2005 11: 9: 3 -0000 +++ wine/include/dbghelp.h 29 Nov 2005 11: 9: 3 -0000 @@ -163,6 +163,15 @@ typedef struct _IMAGEHLP_LINE DWORD Address; } IMAGEHLP_LINE, *PIMAGEHLP_LINE; +typedef struct _IMAGEHLP_LINE64 +{ + DWORD SizeOfStruct; + PVOID Key; + DWORD LineNumber; + PCHAR FileName; + DWORD64 Address; +} IMAGEHLP_LINE64, *PIMAGEHLP_LINE64; + typedef struct _SOURCEFILE { DWORD64 ModBase; @@ -779,8 +788,12 @@ typedef BOOL (CALLBACK *PSYM_ENUMSOURCEF BOOL WINAPI SymEnumSourceFiles(HANDLE, ULONG64, LPSTR, PSYM_ENUMSOURCEFILES_CALLBACK, PVOID); BOOL WINAPI SymGetLineFromAddr(HANDLE, DWORD, PDWORD, PIMAGEHLP_LINE); +BOOL WINAPI SymGetLineFromAddr64(HANDLE, DWORD64, PDWORD, PIMAGEHLP_LINE64); BOOL WINAPI SymGetLinePrev(HANDLE, PIMAGEHLP_LINE); +BOOL WINAPI SymGetLinePrev64(HANDLE, PIMAGEHLP_LINE64); BOOL WINAPI SymGetLineNext(HANDLE, PIMAGEHLP_LINE); +BOOL WINAPI SymGetLineNext64(HANDLE, PIMAGEHLP_LINE64); + typedef struct _SRCCODEINFO { DWORD SizeOfStruct;

1 0

wine/dlls/dbghelp module.c
by Alexandre Julliard Nov. 29, 2005

Nov. 29, 2005

ChangeSet ID: 21545 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/29 05:08:53 Modified files: dlls/dbghelp : module.c Log message: Eric Pouech <eric.pouech(a)wanadoo.fr> Now correctly checking calling down to 32 bit version. Patch: http://cvs.winehq.org/patch.py?id=21545 Old revision New revision Changes Path 1.16 1.17 +1 -2 wine/dlls/dbghelp/module.c Index: wine/dlls/dbghelp/module.c diff -u -p wine/dlls/dbghelp/module.c:1.16 wine/dlls/dbghelp/module.c:1.17 --- wine/dlls/dbghelp/module.c:1.16 29 Nov 2005 11: 8:53 -0000 +++ wine/dlls/dbghelp/module.c 29 Nov 2005 11: 8:53 -0000 @@ -397,8 +397,7 @@ DWORD64 WINAPI SymLoadModuleEx(HANDLE h DWORD WINAPI SymLoadModule64(HANDLE hProcess, HANDLE hFile, char* ImageName, char* ModuleName, DWORD64 BaseOfDll, DWORD SizeOfDll) { - FIXME("SymLoadModule should probably reference SymLoadModule64 instead of this way\n"); - + if (!validate_addr64(BaseOfDll)) return FALSE; return SymLoadModule(hProcess, hFile, ImageName, ModuleName, (DWORD)BaseOfDll, SizeOfDll); }

1 0

wine/dlls/wininet http.c tests/http.c
by Alexandre Julliard Nov. 29, 2005

Nov. 29, 2005

ChangeSet ID: 21544 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/29 05:08:46 Modified files: dlls/wininet : http.c dlls/wininet/tests: http.c Log message: Robert Shearman <rob(a)codeweavers.com> HttpSendRequestExA/W doesn't touch lpBuffersIn->Next, so simplify the code a bit. Modify test case to demonstrate this. Patch: http://cvs.winehq.org/patch.py?id=21544 Old revision New revision Changes Path 1.127 1.128 +31 -61 wine/dlls/wininet/http.c 1.35 1.36 +1 -1 wine/dlls/wininet/tests/http.c Index: wine/dlls/wininet/http.c diff -u -p wine/dlls/wininet/http.c:1.127 wine/dlls/wininet/http.c:1.128 --- wine/dlls/wininet/http.c:1.127 29 Nov 2005 11: 8:46 -0000 +++ wine/dlls/wininet/http.c 29 Nov 2005 11: 8:46 -0000 @@ -1506,62 +1506,43 @@ BOOL WINAPI HttpSendRequestExA(HINTERNET LPINTERNET_BUFFERSA lpBuffersOut, DWORD dwFlags, DWORD dwContext) { - LPINTERNET_BUFFERSA ptr; - LPINTERNET_BUFFERSW lpBuffersInW,ptrW; + INTERNET_BUFFERSW BuffersInW; BOOL rc = FALSE; + DWORD headerlen; TRACE("(%p, %p, %p, %08lx, %08lx): stub\n", hRequest, lpBuffersIn, lpBuffersOut, dwFlags, dwContext); - ptr = lpBuffersIn; - if (ptr) - lpBuffersInW = (LPINTERNET_BUFFERSW)HeapAlloc(GetProcessHeap(), - HEAP_ZERO_MEMORY, sizeof(INTERNET_BUFFERSW)); - else - lpBuffersInW = NULL; - - ptrW = lpBuffersInW; - while (ptr) + if (lpBuffersIn) { - DWORD headerlen; - ptrW->dwStructSize = sizeof(LPINTERNET_BUFFERSW); - if (ptr->lpcszHeader) + BuffersInW.dwStructSize = sizeof(LPINTERNET_BUFFERSW); + if (lpBuffersIn->lpcszHeader) { - headerlen = MultiByteToWideChar(CP_ACP,0,ptr->lpcszHeader, - ptr->dwHeadersLength,0,0); - headerlen++; - ptrW->lpcszHeader = HeapAlloc(GetProcessHeap(),0,headerlen* + headerlen = MultiByteToWideChar(CP_ACP,0,lpBuffersIn->lpcszHeader, + lpBuffersIn->dwHeadersLength,0,0); + BuffersInW.lpcszHeader = HeapAlloc(GetProcessHeap(),0,headerlen* sizeof(WCHAR)); - ptrW->dwHeadersLength = MultiByteToWideChar(CP_ACP, 0, - ptr->lpcszHeader, ptr->dwHeadersLength, - (LPWSTR)ptrW->lpcszHeader, headerlen); + if (!BuffersInW.lpcszHeader) + { + SetLastError(ERROR_OUTOFMEMORY); + return FALSE; + } + BuffersInW.dwHeadersLength = MultiByteToWideChar(CP_ACP, 0, + lpBuffersIn->lpcszHeader, lpBuffersIn->dwHeadersLength, + (LPWSTR)BuffersInW.lpcszHeader, headerlen); } - ptrW->dwHeadersTotal = ptr->dwHeadersTotal; - ptrW->lpvBuffer = ptr->lpvBuffer; - ptrW->dwBufferLength = ptr->dwBufferLength; - ptrW->dwBufferTotal= ptr->dwBufferTotal; + BuffersInW.dwHeadersTotal = lpBuffersIn->dwHeadersTotal; + BuffersInW.lpvBuffer = lpBuffersIn->lpvBuffer; + BuffersInW.dwBufferLength = lpBuffersIn->dwBufferLength; + BuffersInW.dwBufferTotal = lpBuffersIn->dwBufferTotal; + BuffersInW.Next = NULL; + } - if (ptr->Next) - ptrW->Next = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY, - sizeof(INTERNET_BUFFERSW)); + rc = HttpSendRequestExW(hRequest, lpBuffersIn ? &BuffersInW : NULL, NULL, dwFlags, dwContext); - ptr = ptr->Next; - ptrW = ptrW->Next; - } + if (lpBuffersIn) + HeapFree(GetProcessHeap(),0,(LPVOID)BuffersInW.lpcszHeader); - rc = HttpSendRequestExW(hRequest, lpBuffersInW, NULL, dwFlags, dwContext); - if (lpBuffersInW) - { - ptrW = lpBuffersInW; - while (ptrW) - { - LPINTERNET_BUFFERSW ptrW2; - HeapFree(GetProcessHeap(),0,(LPVOID)ptrW->lpcszHeader); - ptrW2 = ptrW->Next; - HeapFree(GetProcessHeap(),0,ptrW); - ptrW = ptrW2; - } - } return rc; } @@ -1576,8 +1557,6 @@ BOOL WINAPI HttpSendRequestExW(HINTERNET LPINTERNET_BUFFERSW lpBuffersOut, DWORD dwFlags, DWORD dwContext) { - LPINTERNET_BUFFERSW buf_ptr; - DWORD bufferlen = 0; BOOL rc; LPWININETHTTPREQW lpwhr; LPWSTR requestString = NULL; @@ -1599,30 +1578,21 @@ BOOL WINAPI HttpSendRequestExW(HINTERNET HTTP_FixVerb(lpwhr); /* add headers */ - buf_ptr = lpBuffersIn; - while(buf_ptr) + if (lpBuffersIn->lpcszHeader) { - if (buf_ptr->lpcszHeader) - { - HTTP_HttpAddRequestHeadersW(lpwhr, buf_ptr->lpcszHeader, - buf_ptr->dwHeadersLength, HTTP_ADDREQ_FLAG_ADD | - HTTP_ADDHDR_FLAG_REPLACE); - } - bufferlen += buf_ptr->dwBufferTotal; - buf_ptr = buf_ptr->Next; + HTTP_HttpAddRequestHeadersW(lpwhr, lpBuffersIn->lpcszHeader, + lpBuffersIn->dwHeadersLength, HTTP_ADDREQ_FLAG_ADD | + HTTP_ADDHDR_FLAG_REPLACE); } - lpwhr->hdr.dwFlags |= dwFlags; - lpwhr->hdr.dwContext = dwContext; - - if (bufferlen > 0) + if (lpBuffersIn->dwBufferTotal > 0) { static const WCHAR szContentLength[] = { 'C','o','n','t','e','n','t','-','L','e','n','g','t','h',':',' ', '%','l','i','\r','\n',0}; WCHAR contentLengthStr[sizeof szContentLength/2 /* includes \n\r */ + 20 /* int */ ]; - sprintfW(contentLengthStr, szContentLength, bufferlen); + sprintfW(contentLengthStr, szContentLength, lpBuffersIn->dwBufferTotal); HTTP_HttpAddRequestHeadersW(lpwhr, contentLengthStr, -1L, HTTP_ADDREQ_FLAG_ADD); } Index: wine/dlls/wininet/tests/http.c diff -u -p wine/dlls/wininet/tests/http.c:1.35 wine/dlls/wininet/tests/http.c:1.36 --- wine/dlls/wininet/tests/http.c:1.35 29 Nov 2005 11: 8:46 -0000 +++ wine/dlls/wininet/tests/http.c 29 Nov 2005 11: 8:46 -0000 @@ -1083,7 +1083,7 @@ static void HttpSendRequestEx_test(void) BufferIn.dwStructSize = sizeof( INTERNET_BUFFERS); - BufferIn.Next = NULL; + BufferIn.Next = (LPINTERNET_BUFFERS)0xdeadcab; BufferIn.lpcszHeader = szContentType; BufferIn.dwHeadersLength = sizeof(szContentType); BufferIn.dwHeadersTotal = sizeof(szContentType);

1 0

wine/ dlls/dbghelp/dbghelp.spec dlls/dbghelp/m ...
by Alexandre Julliard Nov. 29, 2005

Nov. 29, 2005

ChangeSet ID: 21543 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/29 05:08:28 Modified files: dlls/dbghelp : dbghelp.spec module.c include : dbghelp.h Log message: Eric Pouech <eric.pouech(a)wanadoo.fr> Implemented SymGetModuleInfo64. Patch: http://cvs.winehq.org/patch.py?id=21543 Old revision New revision Changes Path 1.15 1.16 +1 -1 wine/dlls/dbghelp/dbghelp.spec 1.15 1.16 +55 -0 wine/dlls/dbghelp/module.c 1.20 1.21 +30 -1 wine/include/dbghelp.h Index: wine/dlls/dbghelp/dbghelp.spec diff -u -p wine/dlls/dbghelp/dbghelp.spec:1.15 wine/dlls/dbghelp/dbghelp.spec:1.16 --- wine/dlls/dbghelp/dbghelp.spec:1.15 29 Nov 2005 11: 8:28 -0000 +++ wine/dlls/dbghelp/dbghelp.spec 29 Nov 2005 11: 8:28 -0000 @@ -53,7 +53,7 @@ @ stdcall SymGetLinePrev(long ptr) @ stub SymGetModuleBase64 @ stdcall SymGetModuleBase(long long) -@ stub SymGetModuleInfo64 +@ stdcall SymGetModuleInfo64(long double ptr) @ stdcall SymGetModuleInfo(long long ptr) @ stub SymGetModuleInfoW64 @ stub SymGetModuleInfoW Index: wine/dlls/dbghelp/module.c diff -u -p wine/dlls/dbghelp/module.c:1.15 wine/dlls/dbghelp/module.c:1.16 --- wine/dlls/dbghelp/module.c:1.15 29 Nov 2005 11: 8:28 -0000 +++ wine/dlls/dbghelp/module.c 29 Nov 2005 11: 8:28 -0000 @@ -551,6 +551,61 @@ BOOL WINAPI SymGetModuleInfo(HANDLE hPr return TRUE; } +/****************************************************************** + * SymGetModuleInfo64 (DBGHELP.@) + * + */ +BOOL WINAPI SymGetModuleInfo64(HANDLE hProcess, DWORD64 dwAddr, + PIMAGEHLP_MODULE64 ModuleInfo) +{ + struct process* pcs = process_find_by_handle(hProcess); + struct module* module; + DWORD sz; + IMAGEHLP_MODULE64 mod; + + TRACE("%p %s %p\n", hProcess, wine_dbgstr_longlong(dwAddr), ModuleInfo); + + if (!pcs) return FALSE; + if (ModuleInfo->SizeOfStruct > sizeof(*ModuleInfo)) return FALSE; + module = module_find_by_addr(pcs, dwAddr, DMT_UNKNOWN); + if (!module) return FALSE; + + mod.BaseOfImage = module->module.BaseOfImage; + mod.ImageSize = module->module.ImageSize; + mod.TimeDateStamp = module->module.TimeDateStamp; + mod.CheckSum = module->module.CheckSum; + mod.NumSyms = module->module.NumSyms; + mod.SymType = module->module.SymType; + strcpy(mod.ModuleName, module->module.ModuleName); + strcpy(mod.ImageName, module->module.ImageName); + strcpy(mod.LoadedImageName, module->module.LoadedImageName); + /* FIXME: all following attributes need to be set */ + mod.LoadedPdbName[0] = '\0'; + mod.CVSig = 0; + memset(mod.CVData, 0, sizeof(mod.CVData)); + mod.PdbSig = 0; + memset(&mod.PdbSig70, 0, sizeof(mod.PdbSig70)); + mod.PdbAge = 0; + mod.PdbUnmatched = 0; + mod.DbgUnmatched = 0; + mod.LineNumbers = 0; + mod.GlobalSymbols = 0; + mod.TypeInfo = 0; + mod.SourceIndexed = 0; + mod.Publics = 0; + + if (module->module.SymType == SymNone) + { + module = module_get_container(pcs, module); + if (module && module->module.SymType != SymNone) + mod.SymType = module->module.SymType; + } + sz = ModuleInfo->SizeOfStruct; + memcpy(ModuleInfo, &mod, sz); + ModuleInfo->SizeOfStruct = sz; + return TRUE; +} + /*********************************************************************** * SymGetModuleBase (IMAGEHLP.@) */ Index: wine/include/dbghelp.h diff -u -p wine/include/dbghelp.h:1.20 wine/include/dbghelp.h:1.21 --- wine/include/dbghelp.h:1.20 29 Nov 2005 11: 8:28 -0000 +++ wine/include/dbghelp.h 29 Nov 2005 11: 8:28 -0000 @@ -113,7 +113,8 @@ typedef struct _IMAGEHLP_MODULE CHAR LoadedImageName[256]; } IMAGEHLP_MODULE, *PIMAGEHLP_MODULE; -typedef struct _IMAGEHLP_MODULEW { +typedef struct _IMAGEHLP_MODULEW +{ DWORD SizeOfStruct; DWORD BaseOfImage; DWORD ImageSize; @@ -126,6 +127,33 @@ typedef struct _IMAGEHLP_MODULEW { WCHAR LoadedImageName[256]; } IMAGEHLP_MODULEW, *PIMAGEHLP_MODULEW; +typedef struct _IMAGEHLP_MODULE64 +{ + DWORD SizeOfStruct; + DWORD64 BaseOfImage; + DWORD ImageSize; + DWORD TimeDateStamp; + DWORD CheckSum; + DWORD NumSyms; + SYM_TYPE SymType; + CHAR ModuleName[32]; + CHAR ImageName[256]; + CHAR LoadedImageName[256]; + CHAR LoadedPdbName[256]; + DWORD CVSig; + CHAR CVData[MAX_PATH*3]; + DWORD PdbSig; + GUID PdbSig70; + DWORD PdbAge; + BOOL PdbUnmatched; + BOOL DbgUnmatched; + BOOL LineNumbers; + BOOL GlobalSymbols; + BOOL TypeInfo; + BOOL SourceIndexed; + BOOL Publics; +} IMAGEHLP_MODULE64, *PIMAGEHLP_MODULE64; + typedef struct _IMAGEHLP_LINE { DWORD SizeOfStruct; @@ -612,6 +640,7 @@ typedef BOOL (CALLBACK *PSYM_ENUMMODULES BOOL WINAPI SymEnumerateModules(HANDLE, PSYM_ENUMMODULES_CALLBACK, PVOID); BOOL WINAPI SymGetModuleInfo(HANDLE, DWORD, PIMAGEHLP_MODULE); BOOL WINAPI SymGetModuleInfoW(HANDLE, DWORD, PIMAGEHLP_MODULEW); +BOOL WINAPI SymGetModuleInfo64(HANDLE, DWORD64, PIMAGEHLP_MODULE64); DWORD WINAPI SymGetModuleBase(HANDLE, DWORD); DWORD WINAPI SymLoadModule(HANDLE, HANDLE, PSTR, PSTR, DWORD, DWORD); DWORD64 WINAPI SymLoadModuleEx(HANDLE, HANDLE, PCSTR, PCSTR, DWORD64, DWORD,

1 0

wine/dlls/ole32 Makefile.in ole32.spec tests/M ...
by Alexandre Julliard Nov. 29, 2005

Nov. 29, 2005

ChangeSet ID: 21542 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/29 05:08:17 Modified files: dlls/ole32 : Makefile.in ole32.spec dlls/ole32/tests: Makefile.in marshal.c Added files: dlls/ole32 : usrmarshal.c Log message: Robert Shearman <rob(a)codeweavers.com> Implement some user marshal functions and add tests. Patch: http://cvs.winehq.org/patch.py?id=21542 Old revision New revision Changes Path 1.44 1.45 +2 -1 wine/dlls/ole32/Makefile.in 1.67 1.68 +44 -40 wine/dlls/ole32/ole32.spec Added 1.1 +0 -0 wine/dlls/ole32/usrmarshal.c 1.7 1.8 +1 -1 wine/dlls/ole32/tests/Makefile.in 1.28 1.29 +189 -0 wine/dlls/ole32/tests/marshal.c

1 0

wine/dlls/wininet http.c
by Alexandre Julliard Nov. 29, 2005

Nov. 29, 2005

ChangeSet ID: 21541 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/29 05:08:02 Modified files: dlls/wininet : http.c Log message: Robert Shearman <rob(a)codeweavers.com> More lpszServerName -> lpszHostName fixes. Patch: http://cvs.winehq.org/patch.py?id=21541 Old revision New revision Changes Path 1.126 1.127 +7 -7 wine/dlls/wininet/http.c Index: wine/dlls/wininet/http.c diff -u -p wine/dlls/wininet/http.c:1.126 wine/dlls/wininet/http.c:1.127 --- wine/dlls/wininet/http.c:1.126 29 Nov 2005 11: 8: 2 -0000 +++ wine/dlls/wininet/http.c 29 Nov 2005 11: 8: 2 -0000 @@ -1874,23 +1874,23 @@ static BOOL HTTP_HandleRedirect(LPWININE HTTP_ADDHDR_FLAG_ADD_IF_NEW); #endif - HeapFree(GetProcessHeap(), 0, lpwhs->lpszHostName); - lpwhs->lpszHostName = WININET_strdupW(hostName); HeapFree(GetProcessHeap(), 0, lpwhs->lpszServerName); + lpwhs->lpszServerName = WININET_strdupW(hostName); + HeapFree(GetProcessHeap(), 0, lpwhs->lpszHostName); if (urlComponents.nPort != INTERNET_DEFAULT_HTTP_PORT && urlComponents.nPort != INTERNET_DEFAULT_HTTPS_PORT) { int len; static WCHAR fmt[] = {'%','s',':','%','i',0}; len = lstrlenW(hostName); - len+=6; - lpwhs->lpszServerName = HeapAlloc(GetProcessHeap(),0,len*sizeof(WCHAR)); - sprintfW(lpwhs->lpszServerName,fmt,hostName,urlComponents.nPort); + len += 7; /* 5 for strlen("65535") + 1 for ":" + 1 for '\0' */ + lpwhs->lpszHostName = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); + sprintfW(lpwhs->lpszHostName, fmt, hostName, urlComponents.nPort); } else - lpwhs->lpszServerName = WININET_strdupW(hostName); + lpwhs->lpszHostName = WININET_strdupW(hostName); - HTTP_ProcessHeader(lpwhr, g_szHost, lpwhs->lpszServerName, HTTP_ADDREQ_FLAG_ADD | HTTP_ADDREQ_FLAG_REPLACE | HTTP_ADDHDR_FLAG_REQ); + HTTP_ProcessHeader(lpwhr, g_szHost, lpwhs->lpszHostName, HTTP_ADDREQ_FLAG_ADD | HTTP_ADDREQ_FLAG_REPLACE | HTTP_ADDHDR_FLAG_REQ); HeapFree(GetProcessHeap(), 0, lpwhs->lpszUserName);

1 0