November 2008 - Wine-commits

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 : comdlg32: GetPrinterW and GetPrinterDriverW return the size in bytes so don' t multiply by sizeof(WCHAR).
by Alexandre Julliard 26 Nov '08

26 Nov '08

Module: wine Branch: master Commit: 31fd0d5d7a5a44868d5807596401e8878448c0e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31fd0d5d7a5a44868d5807596… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Nov 25 15:40:05 2008 +0000 comdlg32: GetPrinterW and GetPrinterDriverW return the size in bytes so don't multiply by sizeof(WCHAR). --- dlls/comdlg32/printdlg.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index 749f8e1..bdc2a0d 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -1125,11 +1125,11 @@ static BOOL PRINTDLG_ChangePrinterW(HWND hDlg, WCHAR *name, return FALSE; } GetPrinterW(hprn, 2, NULL, 0, &needed); - PrintStructures->lpPrinterInfo = HeapAlloc(GetProcessHeap(),0,sizeof(WCHAR)*needed); + PrintStructures->lpPrinterInfo = HeapAlloc(GetProcessHeap(),0,needed); GetPrinterW(hprn, 2, (LPBYTE)PrintStructures->lpPrinterInfo, needed, &needed); GetPrinterDriverW(hprn, NULL, 3, NULL, 0, &needed); - PrintStructures->lpDriverInfo = HeapAlloc(GetProcessHeap(),0,sizeof(WCHAR)*needed); + PrintStructures->lpDriverInfo = HeapAlloc(GetProcessHeap(),0,needed); if (!GetPrinterDriverW(hprn, NULL, 3, (LPBYTE)PrintStructures->lpDriverInfo, needed, &needed)) { ERR("GetPrinterDriverA failed for %s, fix your config!\n",debugstr_w(PrintStructures->lpPrinterInfo->pPrinterName)); @@ -2283,11 +2283,11 @@ BOOL WINAPI PrintDlgW(LPPRINTDLGW lppd) } GetPrinterW(hprn, 2, NULL, 0, &needed); - pbuf = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*needed); + pbuf = HeapAlloc(GetProcessHeap(), 0, needed); GetPrinterW(hprn, 2, (LPBYTE)pbuf, needed, &needed); GetPrinterDriverW(hprn, NULL, 3, NULL, 0, &needed); - dbuf = HeapAlloc(GetProcessHeap(),0,sizeof(WCHAR)*needed); + dbuf = HeapAlloc(GetProcessHeap(),0,needed); if (!GetPrinterDriverW(hprn, NULL, 3, (LPBYTE)dbuf, needed, &needed)) { ERR("GetPrinterDriverA failed, le %d, fix your config for printer %s!\n", GetLastError(),debugstr_w(pbuf->pPrinterName));

1 0

Francois Gouget : ole32: Remove __RPC_USER on static functions where not needed.
by Alexandre Julliard 26 Nov '08

26 Nov '08

Module: wine Branch: master Commit: c584c2d12c3db8ec50386c03e812c6f0ece4dfc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c584c2d12c3db8ec50386c03e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Nov 25 16:42:07 2008 +0100 ole32: Remove __RPC_USER on static functions where not needed. --- dlls/ole32/usrmarshal.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index e504485..4997ee1 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -260,7 +260,7 @@ void __RPC_USER CLIPFORMAT_UserFree(ULONG *pFlags, CLIPFORMAT *pCF) * so nothing to do */ } -static ULONG __RPC_USER handle_UserSize(ULONG *pFlags, ULONG StartingSize, HANDLE *handle) +static ULONG handle_UserSize(ULONG *pFlags, ULONG StartingSize, HANDLE *handle) { if (LOWORD(*pFlags) == MSHCTX_DIFFERENTMACHINE) { @@ -271,7 +271,7 @@ static ULONG __RPC_USER handle_UserSize(ULONG *pFlags, ULONG StartingSize, HANDL return StartingSize + sizeof(RemotableHandle); } -static unsigned char * __RPC_USER handle_UserMarshal(ULONG *pFlags, unsigned char *pBuffer, HANDLE *handle) +static unsigned char * handle_UserMarshal(ULONG *pFlags, unsigned char *pBuffer, HANDLE *handle) { RemotableHandle *remhandle = (RemotableHandle *)pBuffer; if (LOWORD(*pFlags) == MSHCTX_DIFFERENTMACHINE) @@ -285,7 +285,7 @@ static unsigned char * __RPC_USER handle_UserMarshal(ULONG *pFlags, unsigned cha return pBuffer + sizeof(RemotableHandle); } -static unsigned char * __RPC_USER handle_UserUnmarshal(ULONG *pFlags, unsigned char *pBuffer, HANDLE *handle) +static unsigned char * handle_UserUnmarshal(ULONG *pFlags, unsigned char *pBuffer, HANDLE *handle) { RemotableHandle *remhandle = (RemotableHandle *)pBuffer; if (remhandle->fContext != WDT_INPROC_CALL) @@ -294,7 +294,7 @@ static unsigned char * __RPC_USER handle_UserUnmarshal(ULONG *pFlags, unsigned c return pBuffer + sizeof(RemotableHandle); } -static void __RPC_USER handle_UserFree(ULONG *pFlags, HANDLE *phMenu) +static void handle_UserFree(ULONG *pFlags, HANDLE *phMenu) { /* nothing to do */ }

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 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: 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

Alexandre Julliard : widl: Make sure format strings for structure and union types are only output once .
by Alexandre Julliard 26 Nov '08

26 Nov '08

Module: wine Branch: master Commit: 0b7478a79fb0594daba5cee3c0288884c352ad39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b7478a79fb0594daba5cee3c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 25 21:47:47 2008 +0100 widl: Make sure format strings for structure and union types are only output once. --- tools/widl/typegen.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 45467e5..98145a7 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1864,8 +1864,9 @@ static size_t write_struct_tfs(FILE *file, type_t *type, nothing is written to file yet. On the actual writing pass, this will have been updated. */ unsigned int absoff = type->ptrdesc ? type->ptrdesc : *tfsoff; - short reloff = absoff - *tfsoff; - print_file(file, 2, "NdrFcShort(0x%hx),\t/* Offset= %hd (%u) */\n", + int reloff = absoff - *tfsoff; + assert( reloff >= 0 ); + print_file(file, 2, "NdrFcShort(0x%x),\t/* Offset= %d (%u) */\n", reloff, reloff, absoff); *tfsoff += 2; } @@ -2254,6 +2255,8 @@ static size_t write_typeformatstring_var(FILE *file, int indent, const func_t *f if (is_base_type(type->type)) return 0; + if (processed(type)) return type->typestring_offset; + switch (type->type) { case RPC_FC_STRUCT:

1 0

Alexandre Julliard : kernel32/tests: Fix the unimplemented check for EnumSystemLanguageGroupsA.
by Alexandre Julliard 26 Nov '08

26 Nov '08

Module: wine Branch: master Commit: f0483957ddc8d74070b7d6b3497bb56c0883ae32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0483957ddc8d74070b7d6b34… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 26 12:04:32 2008 +0100 kernel32/tests: Fix the unimplemented check for EnumSystemLanguageGroupsA. --- dlls/kernel32/tests/locale.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index c5f3ddb..4dce733 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -2163,7 +2163,7 @@ static void test_EnumSystemLanguageGroupsA(void) /* No enumeration proc */ SetLastError(0); ret = pEnumSystemLanguageGroupsA(0, LGRPID_INSTALLED, 0); - if (ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) { win_skip("EnumSystemLanguageGroupsA is not implemented\n"); return;

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