wine-commits November 2008

wine-commits@winehq.org

2 participants
734 discussions

Huw Davies : oleaut32: Add support for loading typelibs from NE files.
by Alexandre Julliard 26 Nov '08

26 Nov '08

Module: wine Branch: master Commit: 49368cb14bd5d627f8bd8a6abca59951f5501876 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49368cb14bd5d627f8bd8a6ab… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Nov 25 13:52:24 2008 +0000 oleaut32: Add support for loading typelibs from NE files. --- dlls/oleaut32/typelib.c | 218 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 218 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index f807c05..bbdebae 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -64,7 +64,9 @@ #include "winnls.h" #include "winreg.h" #include "winuser.h" +#include "lzexpand.h" +#include "wine/winbase16.h" #include "wine/unicode.h" #include "objbase.h" #include "typelib.h" @@ -2326,6 +2328,220 @@ static HRESULT TLB_PEFile_Open(LPCWSTR path, INT index, LPVOID *ppBase, DWORD *p return TYPE_E_CANTLOADLIBRARY; } +typedef struct TLB_NEFile +{ + const IUnknownVtbl *lpvtbl; + LONG refs; + LPVOID typelib_base; +} TLB_NEFile; + +static HRESULT WINAPI TLB_NEFile_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) +{ + if (IsEqualIID(riid, &IID_IUnknown)) + { + *ppv = iface; + IUnknown_AddRef(iface); + return S_OK; + } + *ppv = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI TLB_NEFile_AddRef(IUnknown *iface) +{ + TLB_NEFile *This = (TLB_NEFile *)iface; + return InterlockedIncrement(&This->refs); +} + +static ULONG WINAPI TLB_NEFile_Release(IUnknown *iface) +{ + TLB_NEFile *This = (TLB_NEFile *)iface; + ULONG refs = InterlockedDecrement(&This->refs); + if (!refs) + { + HeapFree(GetProcessHeap(), 0, This->typelib_base); + HeapFree(GetProcessHeap(), 0, This); + } + return refs; +} + +static const IUnknownVtbl TLB_NEFile_Vtable = +{ + TLB_NEFile_QueryInterface, + TLB_NEFile_AddRef, + TLB_NEFile_Release +}; + +/*********************************************************************** + * read_xx_header [internal] + */ +static int read_xx_header( HFILE lzfd ) +{ + IMAGE_DOS_HEADER mzh; + char magic[3]; + + LZSeek( lzfd, 0, SEEK_SET ); + if ( sizeof(mzh) != LZRead( lzfd, (LPSTR)&mzh, sizeof(mzh) ) ) + return 0; + if ( mzh.e_magic != IMAGE_DOS_SIGNATURE ) + return 0; + + LZSeek( lzfd, mzh.e_lfanew, SEEK_SET ); + if ( 2 != LZRead( lzfd, magic, 2 ) ) + return 0; + + LZSeek( lzfd, mzh.e_lfanew, SEEK_SET ); + + if ( magic[0] == 'N' && magic[1] == 'E' ) + return IMAGE_OS2_SIGNATURE; + if ( magic[0] == 'P' && magic[1] == 'E' ) + return IMAGE_NT_SIGNATURE; + + magic[2] = '\0'; + WARN("Can't handle %s files.\n", magic ); + return 0; +} + + +/*********************************************************************** + * find_ne_resource [internal] + */ +static BOOL find_ne_resource( HFILE lzfd, LPCSTR typeid, LPCSTR resid, + DWORD *resLen, DWORD *resOff ) +{ + IMAGE_OS2_HEADER nehd; + NE_TYPEINFO *typeInfo; + NE_NAMEINFO *nameInfo; + DWORD nehdoffset; + LPBYTE resTab; + DWORD resTabSize; + int count; + + /* Read in NE header */ + nehdoffset = LZSeek( lzfd, 0, SEEK_CUR ); + if ( sizeof(nehd) != LZRead( lzfd, (LPSTR)&nehd, sizeof(nehd) ) ) return 0; + + resTabSize = nehd.ne_restab - nehd.ne_rsrctab; + if ( !resTabSize ) + { + TRACE("No resources in NE dll\n" ); + return FALSE; + } + + /* Read in resource table */ + resTab = HeapAlloc( GetProcessHeap(), 0, resTabSize ); + if ( !resTab ) return FALSE; + + LZSeek( lzfd, nehd.ne_rsrctab + nehdoffset, SEEK_SET ); + if ( resTabSize != LZRead( lzfd, (char*)resTab, resTabSize ) ) + { + HeapFree( GetProcessHeap(), 0, resTab ); + return FALSE; + } + + /* Find resource */ + typeInfo = (NE_TYPEINFO *)(resTab + 2); + + if (HIWORD(typeid) != 0) /* named type */ + { + BYTE len = strlen( typeid ); + while (typeInfo->type_id) + { + if (!(typeInfo->type_id & 0x8000)) + { + BYTE *p = resTab + typeInfo->type_id; + if ((*p == len) && !strncasecmp( (char*)p+1, typeid, len )) goto found_type; + } + typeInfo = (NE_TYPEINFO *)((char *)(typeInfo + 1) + + typeInfo->count * sizeof(NE_NAMEINFO)); + } + } + else /* numeric type id */ + { + WORD id = LOWORD(typeid) | 0x8000; + while (typeInfo->type_id) + { + if (typeInfo->type_id == id) goto found_type; + typeInfo = (NE_TYPEINFO *)((char *)(typeInfo + 1) + + typeInfo->count * sizeof(NE_NAMEINFO)); + } + } + TRACE("No typeid entry found for %p\n", typeid ); + HeapFree( GetProcessHeap(), 0, resTab ); + return FALSE; + + found_type: + nameInfo = (NE_NAMEINFO *)(typeInfo + 1); + + if (HIWORD(resid) != 0) /* named resource */ + { + BYTE len = strlen( resid ); + for (count = typeInfo->count; count > 0; count--, nameInfo++) + { + BYTE *p = resTab + nameInfo->id; + if (nameInfo->id & 0x8000) continue; + if ((*p == len) && !strncasecmp( (char*)p+1, resid, len )) goto found_name; + } + } + else /* numeric resource id */ + { + WORD id = LOWORD(resid) | 0x8000; + for (count = typeInfo->count; count > 0; count--, nameInfo++) + if (nameInfo->id == id) goto found_name; + } + TRACE("No resid entry found for %p\n", typeid ); + HeapFree( GetProcessHeap(), 0, resTab ); + return FALSE; + + found_name: + /* Return resource data */ + if ( resLen ) *resLen = nameInfo->length << *(WORD *)resTab; + if ( resOff ) *resOff = nameInfo->offset << *(WORD *)resTab; + + HeapFree( GetProcessHeap(), 0, resTab ); + return TRUE; +} + +static HRESULT TLB_NEFile_Open(LPCWSTR path, INT index, LPVOID *ppBase, DWORD *pdwTLBLength, IUnknown **ppFile){ + + HFILE lzfd = -1; + OFSTRUCT ofs; + HRESULT hr = TYPE_E_CANTLOADLIBRARY; + TLB_NEFile *This = NULL; + + This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + if (!This) return E_OUTOFMEMORY; + + This->lpvtbl = &TLB_NEFile_Vtable; + This->refs = 1; + This->typelib_base = NULL; + + lzfd = LZOpenFileW( (LPWSTR)path, &ofs, OF_READ ); + if ( lzfd >= 0 && read_xx_header( lzfd ) == IMAGE_OS2_SIGNATURE ) + { + DWORD reslen, offset; + if( find_ne_resource( lzfd, "TYPELIB", MAKEINTRESOURCEA(index), &reslen, &offset ) ) + { + This->typelib_base = HeapAlloc(GetProcessHeap(), 0, reslen); + if( !This->typelib_base ) + hr = E_OUTOFMEMORY; + else + { + LZSeek( lzfd, offset, SEEK_SET ); + reslen = LZRead( lzfd, This->typelib_base, reslen ); + LZClose( lzfd ); + *ppBase = This->typelib_base; + *pdwTLBLength = reslen; + *ppFile = (IUnknown *)&This->lpvtbl; + return S_OK; + } + } + } + + if( lzfd >= 0) LZClose( lzfd ); + TLB_NEFile_Release((IUnknown *)&This->lpvtbl); + return hr; +} typedef struct TLB_Mapping { @@ -2486,6 +2702,8 @@ static HRESULT TLB_ReadTypeLib(LPCWSTR pszFileName, LPWSTR pszPath, UINT cchPath ret = TLB_PEFile_Open(pszPath, index, &pBase, &dwTLBLength, &pFile); if (ret == TYPE_E_CANTLOADLIBRARY) + ret = TLB_NEFile_Open(pszPath, index, &pBase, &dwTLBLength, &pFile); + if (ret == TYPE_E_CANTLOADLIBRARY) ret = TLB_Mapping_Open(pszPath, &pBase, &dwTLBLength, &pFile); if (SUCCEEDED(ret)) {

1 0

Huw Davies : version: Fixed comments.
by Alexandre Julliard 26 Nov '08

26 Nov '08

Module: wine Branch: master Commit: 559112d472b977fafe8a564f557a11534cefa127 URL: http://source.winehq.org/git/wine.git/?a=commit;h=559112d472b977fafe8a564f5… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Nov 25 14:48:49 2008 +0000 version: Fixed comments. --- dlls/version/resource.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/version/resource.c b/dlls/version/resource.c index 03076d8..fdfd3ba 100644 --- a/dlls/version/resource.c +++ b/dlls/version/resource.c @@ -169,7 +169,7 @@ static int read_xx_header( HFILE lzfd ) } /*********************************************************************** - * load_ne_resource [internal] + * find_ne_resource [internal] */ static BOOL find_ne_resource( HFILE lzfd, LPCSTR typeid, LPCSTR resid, DWORD *resLen, DWORD *resOff ) @@ -268,7 +268,7 @@ static BOOL find_ne_resource( HFILE lzfd, LPCSTR typeid, LPCSTR resid, } /*********************************************************************** - * load_pe_resource [internal] + * find_pe_resource [internal] */ static BOOL find_pe_resource( HFILE lzfd, LPCSTR typeid, LPCSTR resid, DWORD *resLen, DWORD *resOff )

1 0

Maarten Lankhorst : tools: Add calling conventions for win64 to winegcc.
by Alexandre Julliard 26 Nov '08

26 Nov '08

Module: wine Branch: master Commit: cd360cc00713569604966748a3a7061d8fcc7115 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd360cc00713569604966748a… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Jul 3 00:00:31 2008 -0700 tools: Add calling conventions for win64 to winegcc. --- tools/winegcc/winegcc.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 113819d..40dacf8 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -287,7 +287,14 @@ static void compile(struct options* opts, const char* lang) if (gcc_defs) { -#ifdef __APPLE__ /* Mac OS X uses a 16-byte aligned stack and not a 4-byte one */ +#ifdef __x86_64__ + strarray_add(comp_args, "-D__stdcall=__attribute__((ms_abi))"); + strarray_add(comp_args, "-D__cdecl=__attribute__((ms_abi))"); + strarray_add(comp_args, "-D_stdcall=__attribute__((ms_abi))"); + strarray_add(comp_args, "-D_cdecl=__attribute__((ms_abi))"); + strarray_add(comp_args, "-D__fastcall=__attribute__((ms_abi))"); + strarray_add(comp_args, "-D_fastcall=__attribute__((ms_abi))"); +#elif defined(__APPLE__) /* Mac OS X uses a 16-byte aligned stack and not a 4-byte one */ strarray_add(comp_args, "-D__stdcall=__attribute__((__stdcall__)) __attribute__((__force_align_arg_pointer__))"); strarray_add(comp_args, "-D__cdecl=__attribute__((__cdecl__)) __attribute__((__force_align_arg_pointer__))"); strarray_add(comp_args, "-D_stdcall=__attribute__((__stdcall__)) __attribute__((__force_align_arg_pointer__))");

1 0

Maarten Lankhorst : wldap32: Fix winldap_private header compatibility with 64-bit.
by Alexandre Julliard 26 Nov '08

26 Nov '08

Module: wine Branch: master Commit: 39d80a3c96daf440696ea49f6da9478c18c6d14b URL: http://source.winehq.org/git/wine.git/?a=commit;h=39d80a3c96daf440696ea49f6… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Nov 25 09:05:46 2008 +0100 wldap32: Fix winldap_private header compatibility with 64-bit. --- dlls/wldap32/winldap_private.h | 338 ++++++++++++++++++++-------------------- 1 files changed, 169 insertions(+), 169 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=39d80a3c96daf440696ea…

1 0

Henri Verbeet : wined3d: Const correctness fixes for surface.c.
by Alexandre Julliard 26 Nov '08

26 Nov '08

Module: wine Branch: master Commit: 4cea13dec75e007566adc7345d3cafa2e12db10e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cea13dec75e007566adc7345… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 25 14:36:09 2008 +0100 wined3d: Const correctness fixes for surface.c. --- dlls/wined3d/surface.c | 84 ++++++++++++++++++++++++++--------------------- 1 files changed, 46 insertions(+), 38 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4cea13dec75e007566adc…

1 0

Henri Verbeet : wined3d: Const correctness fixes for glsl_shader.c.
by Alexandre Julliard 26 Nov '08

26 Nov '08

Module: wine Branch: master Commit: fecfddfb3a598eef5382bba21abee60acba550d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fecfddfb3a598eef5382bba21… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 25 14:36:09 2008 +0100 wined3d: Const correctness fixes for glsl_shader.c. --- dlls/wined3d/glsl_shader.c | 161 +++++++++++++++++++--------------------- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 77 insertions(+), 86 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fecfddfb3a598eef5382b…

1 0

Henri Verbeet : wined3d: Const correctness fixes for arb_program_shader.c.
by Alexandre Julliard 26 Nov '08

26 Nov '08

Module: wine Branch: master Commit: d8f6e63541ea8fcb1b3a2499ac17bae567c80249 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8f6e63541ea8fcb1b3a2499a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 25 14:36:09 2008 +0100 wined3d: Const correctness fixes for arb_program_shader.c. --- dlls/wined3d/arb_program_shader.c | 84 +++++++++++++++++----------------- dlls/wined3d/ati_fragment_shader.c | 3 +- dlls/wined3d/baseshader.c | 14 ++--- dlls/wined3d/glsl_shader.c | 6 ++- dlls/wined3d/nvidia_texture_shader.c | 3 +- dlls/wined3d/state.c | 3 +- dlls/wined3d/wined3d_private.h | 15 ++---- 7 files changed, 64 insertions(+), 64 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d8f6e63541ea8fcb1b3a2…

1 0

Henri Verbeet : wined3d: Make the SHADER_OPCODE_ARG parameter to shader handlers const.
by Alexandre Julliard 26 Nov '08

26 Nov '08

Module: wine Branch: master Commit: cfb3bea895c58bd541797788668260c0b7d46d88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfb3bea895c58bd5417977886… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 25 14:36:09 2008 +0100 wined3d: Make the SHADER_OPCODE_ARG parameter to shader handlers const. --- dlls/wined3d/arb_program_shader.c | 110 +++++++++++++--------- dlls/wined3d/glsl_shader.c | 186 +++++++++++++++++++++++-------------- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 180 insertions(+), 118 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cfb3bea895c58bd541797…

1 0

Henri Verbeet : wined3d: Const correctness fixes for utils.c.
by Alexandre Julliard 26 Nov '08

26 Nov '08

Module: wine Branch: master Commit: eb78c2a0822039a34959f8d4571492a1646a1da4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb78c2a0822039a34959f8d45… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 25 14:36:08 2008 +0100 wined3d: Const correctness fixes for utils.c. --- dlls/wined3d/arb_program_shader.c | 22 ++++++++++++---------- dlls/wined3d/ati_fragment_shader.c | 22 ++++++++++++---------- dlls/wined3d/glsl_shader.c | 12 +++++++----- dlls/wined3d/utils.c | 30 ++++++++++++++++++------------ dlls/wined3d/wined3d_private.h | 16 ++++++++-------- 5 files changed, 57 insertions(+), 45 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=eb78c2a0822039a34959f…

1 0

Alexandre Julliard : user32/tests: Fix a number of window tests on Win9x and Vista.
by Alexandre Julliard 26 Nov '08

26 Nov '08

Module: wine Branch: master Commit: 5118108c826c79f927e12c535d730a787c7b38d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5118108c826c79f927e12c535… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 26 12:04:51 2008 +0100 user32/tests: Fix a number of window tests on Win9x and Vista. --- dlls/user32/tests/win.c | 81 ++++++++++++++++++++++++++++++---------------- 1 files changed, 53 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5118108c826c79f927e12…

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
74
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 November 2008