June 2013 - Wine-commits - list.winehq.org

Hans Leidekker : winhttp/tests: Add some tests for WinHttpDetectAutoProxyConfigUrl.
by Alexandre Julliard 25 Jun '13

25 Jun '13

Module: wine Branch: master Commit: d285629cf4fcf5521a0fb5086ceddc010bfc4e00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d285629cf4fcf5521a0fb5086… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 25 12:46:55 2013 +0200 winhttp/tests: Add some tests for WinHttpDetectAutoProxyConfigUrl. --- dlls/winhttp/tests/winhttp.c | 20 +++++++++++++++++++- 1 files changed, 19 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 2f1df0f..6b946a9 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -2679,12 +2679,30 @@ if (0) /* crashes on some win2k systems */ ok( !ret, "expected failure\n" ); ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); } - url = NULL; + url = (WCHAR *)0xdeadbeef; SetLastError(0xdeadbeef); ret = WinHttpDetectAutoProxyConfigUrl( WINHTTP_AUTO_DETECT_TYPE_DNS_A, &url ); error = GetLastError(); if (!ret) + { ok( error == ERROR_WINHTTP_AUTODETECTION_FAILED, "got %u\n", error ); + ok( url == (WCHAR *)0xdeadbeef, "got %p\n", url ); + } + else + { + trace("%s\n", wine_dbgstr_w(url)); + GlobalFree( url ); + } + + url = (WCHAR *)0xdeadbeef; + SetLastError(0xdeadbeef); + ret = WinHttpDetectAutoProxyConfigUrl( WINHTTP_AUTO_DETECT_TYPE_DHCP, &url ); + error = GetLastError(); + if (!ret) + { + ok( error == ERROR_WINHTTP_AUTODETECTION_FAILED, "got %u\n", error ); + ok( url == (WCHAR *)0xdeadbeef, "got %p\n", url ); + } else { trace("%s\n", wine_dbgstr_w(url));

1 0

Huw Davies : comdlg32: Don't call the callback if it's not set.
by Alexandre Julliard 25 Jun '13

25 Jun '13

Module: wine Branch: master Commit: ec37a87e95945451dde85be3622162db34ab6ca5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec37a87e95945451dde85be36… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jun 25 11:48:16 2013 +0100 comdlg32: Don't call the callback if it's not set. --- dlls/comdlg32/printdlg.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index 3c3fab3..292f764 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -3994,8 +3994,11 @@ static UINT_PTR CALLBACK pdlgex_hook_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM PRINTDLGW *pd = (PRINTDLGW *)lp; struct callback_data *cb = (struct callback_data *)pd->lCustData; - cb->callback->lpVtbl->SelectionChange(cb->callback); - cb->callback->lpVtbl->InitDone(cb->callback); + if (cb->callback) + { + cb->callback->lpVtbl->SelectionChange(cb->callback); + cb->callback->lpVtbl->InitDone(cb->callback); + } } else {

1 0

Bruno Jesus : po: Update Brazilian Portuguese translation.
by Alexandre Julliard 25 Jun '13

25 Jun '13

Module: wine Branch: master Commit: 031c4e2d0e1f36b0f91ded0b353d280edfd6d35a URL: http://source.winehq.org/git/wine.git/?a=commit;h=031c4e2d0e1f36b0f91ded0b3… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Jun 25 00:36:51 2013 -0300 po: Update Brazilian Portuguese translation. --- po/pt_BR.po | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index 517410a..6ad9576 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -1985,7 +1985,7 @@ msgstr "Assinatura de Certificados" #: crypt32.rc:227 msgid "Off-line CRL Signing" -msgstr "Assinatura CRL Off-line" +msgstr "Assinatura CRL Offline" #: crypt32.rc:228 msgid "CRL Signing" @@ -3505,7 +3505,7 @@ msgstr "Argumento ou chamada de procedimento inválida" #: jscript.rc:27 msgid "Subscript out of range" -msgstr "Subscript fora de alcance" +msgstr "Índice fora do intervalo" #: jscript.rc:28 msgid "Object required" @@ -4373,7 +4373,7 @@ msgstr "Chamador não possui o Mutex.\n" #: winerror.mc:946 msgid "Too many posts to semaphore.\n" -msgstr "Demasiados posts ao semáforo.\n" +msgstr "Muitas mensagens ao semáforo.\n" #: winerror.mc:951 msgid "Read/WriteProcessMemory partially completed.\n" @@ -4381,11 +4381,11 @@ msgstr "Read/WriteProcessMemory parcialmente completo.\n" #: winerror.mc:956 msgid "The oplock wasn't granted.\n" -msgstr "O oplock não foi garantido.\n" +msgstr "O bloqueio não foi garantido.\n" #: winerror.mc:961 msgid "Invalid oplock message received.\n" -msgstr "Mensagem inválida de oplock recebida.\n" +msgstr "Mensagem inválida de bloqueio recebida.\n" #: winerror.mc:966 msgid "Message 0x%1 not found in file %2.\n" @@ -4777,7 +4777,7 @@ msgstr "Memória do servidor insuficiente.\n" #: winerror.mc:1451 msgid "Possible deadlock.\n" -msgstr "Possível deadlock.\n" +msgstr "Possível bloqueio.\n" #: winerror.mc:1456 msgid "Incorrect alignment.\n" @@ -9343,7 +9343,7 @@ msgstr "" "\n" " + Define um atributo.\n" " - Limpa um atributo.\n" -" R Atributo de arquivo somente-leitura.\n" +" R Atributo de arquivo somente leitura.\n" " A Atributo de arquivo.\n" " S Atributo de arquivo de sistema.\n" " H Atribute de arquivo oculto.\n" @@ -9764,7 +9764,7 @@ msgstr "" "\"title\" Especifica o título da janela da janela filha.\n" "/d directory Inicia o programa no diretório especificado.\n" "/b Não criar um console novo para o programa.\n" -"/i Inicia o programa com variáveis de ambinete novas.\n" +"/i Inicia o programa com variáveis de ambiente novas.\n" "/min Inicia o programa minimizado.\n" "/max Inicia o programa maximizado.\n" "/low Inicia o programa com prioridade baixa.\n" @@ -10196,7 +10196,7 @@ msgid "" "Badly formed number - must be one of decimal (12),\n" " hexadecimal (0x34) or octal (056).\n" msgstr "" -"Número mal-formado - deve ser decimal (12),\n" +"Número malformado - deve ser decimal (12),\n" " hexadecimal (0x34) ou octal (056).\n" #: dxdiag.rc:27 @@ -11534,7 +11534,7 @@ msgstr "Editar Multi-frase" #: regedit.rc:134 msgid "Contains commands for working with the whole registry" -msgstr "Contém comandos para trabalhar com o Registro inteiro" +msgstr "Contém comandos para trabalhar com o registro inteiro" #: regedit.rc:135 msgid "Contains commands for editing values or keys"

1 0

Piotr Caban : msvcrt: Added _wcsicmp_l implementation.
by Alexandre Julliard 25 Jun '13

25 Jun '13

Module: wine Branch: master Commit: c66d94bfd949b997f7488c6fa3d2e00d2b5f1dff URL: http://source.winehq.org/git/wine.git/?a=commit;h=c66d94bfd949b997f7488c6fa… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 25 16:14:23 2013 +0200 msvcrt: Added _wcsicmp_l implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 8 ++++++++ 6 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 8e728c1..9479d5e 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1484,7 +1484,7 @@ @ cdecl _wcserror_s(ptr long long) msvcrt._wcserror_s @ stub _wcsftime_l @ cdecl _wcsicmp(wstr wstr) msvcrt._wcsicmp -@ stub _wcsicmp_l +@ cdecl _wcsicmp_l(wstr wstr ptr) msvcrt._wcsicmp_l @ cdecl _wcsicoll(wstr wstr) msvcrt._wcsicoll @ cdecl _wcsicoll_l(wstr wstr ptr) msvcrt._wcsicoll_l @ cdecl _wcslwr(wstr) msvcrt._wcslwr diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 7b43159..b83bfe0 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1847,7 +1847,7 @@ @ cdecl _wcserror_s(ptr long long) msvcrt._wcserror_s @ stub _wcsftime_l @ cdecl _wcsicmp(wstr wstr) msvcrt._wcsicmp -@ stub _wcsicmp_l +@ cdecl _wcsicmp_l(wstr wstr ptr) msvcrt._wcsicmp_l @ cdecl _wcsicoll(wstr wstr) msvcrt._wcsicoll @ cdecl _wcsicoll_l(wstr wstr ptr) msvcrt._wcsicoll_l @ cdecl _wcslwr(wstr) msvcrt._wcslwr diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 2344f0f..b8118a9 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1162,7 +1162,7 @@ @ cdecl _wcserror_s(ptr long long) msvcrt._wcserror_s @ stub _wcsftime_l @ cdecl _wcsicmp(wstr wstr) msvcrt._wcsicmp -@ stub _wcsicmp_l +@ cdecl _wcsicmp_l(wstr wstr ptr) msvcrt._wcsicmp_l @ cdecl _wcsicoll(wstr wstr) msvcrt._wcsicoll @ cdecl _wcsicoll_l(wstr wstr ptr) msvcrt._wcsicoll_l @ cdecl _wcslwr(wstr) msvcrt._wcslwr diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index e31da91..8467b91 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1138,7 +1138,7 @@ @ cdecl _wcserror_s(ptr long long) msvcrt._wcserror_s @ stub _wcsftime_l @ cdecl _wcsicmp(wstr wstr) msvcrt._wcsicmp -@ stub _wcsicmp_l +@ cdecl _wcsicmp_l(wstr wstr ptr) msvcrt._wcsicmp_l @ cdecl _wcsicoll(wstr wstr) msvcrt._wcsicoll @ cdecl _wcsicoll_l(wstr wstr ptr) msvcrt._wcsicoll_l @ cdecl _wcslwr(wstr) msvcrt._wcslwr diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index afb12bf..e12d87f 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1102,7 +1102,7 @@ @ cdecl _wcserror_s(ptr long long) # stub _wcsftime_l(ptr long wstr ptr ptr) @ cdecl _wcsicmp(wstr wstr) MSVCRT__wcsicmp -# stub _wcsicmp_l(wstr wstr ptr) +@ cdecl _wcsicmp_l(wstr wstr ptr) MSVCRT__wcsicmp_l @ cdecl _wcsicoll(wstr wstr) MSVCRT__wcsicoll @ cdecl _wcsicoll_l(wstr wstr ptr) MSVCRT__wcsicoll_l @ cdecl _wcslwr(wstr) ntdll._wcslwr diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index a5795bd..c5b630f 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -69,6 +69,14 @@ MSVCRT_wchar_t* CDECL MSVCRT__wcsdup( const MSVCRT_wchar_t* str ) return ret; } +INT CDECL MSVCRT__wcsicmp_l(const MSVCRT_wchar_t *str1, const MSVCRT_wchar_t *str2, MSVCRT__locale_t locale) +{ + if(!MSVCRT_CHECK_PMT(str1 != NULL) || !MSVCRT_CHECK_PMT(str2 != NULL)) + return MSVCRT__NLSCMPERROR; + + return strcmpiW(str1, str2); +} + /********************************************************************* * _wcsicmp (MSVCRT.@) */

1 0

André Hentschel : winedev: Update architecture chapter .
by Alexandre Julliard 25 Jun '13

25 Jun '13

Module: docs Branch: master Commit: 03ae8589a037e30655a094f18534c3fa0a81f314 URL: http://source.winehq.org/git/docs.git/?a=commit;h=03ae8589a037e30655a094f18… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Jun 22 14:21:13 2013 +0200 winedev: Update architecture chapter. --- en/winedev-architecture.sgml | 20 +++++++------------- 1 files changed, 7 insertions(+), 13 deletions(-) diff --git a/en/winedev-architecture.sgml b/en/winedev-architecture.sgml index bb8638b..d4bf8e1 100644 --- a/en/winedev-architecture.sgml +++ b/en/winedev-architecture.sgml @@ -218,8 +218,8 @@ exist, as Windows has support for different VDM (Virtual Dos Machines) in order to have Win16 processes running in different address spaces. Wine also uses the same architecture to run DOS - programs (in this case, the DOS emulation is provided by a Wine only - DLL called <filename>winedos</filename>. + programs (in this case, the DOS emulation is provided by + <filename>KRNL386.EXE</filename>). </para> </sect2> </sect1> @@ -368,7 +368,7 @@ +---------------------------------------+ +--------+ +---------------------------------------+ \ -| Wine executable (wine-?thread) | } unix executable +| Wine executable | } unix executable +---------------------------------------+ / +---------------------------------------------------+ \ | Wine drivers | } Wine specific DLLs @@ -418,7 +418,7 @@ provide a driver (in Windows sense) to a physical hardware device. This driver will be a proxy to the Unix driver (this is the case, for example, for the graphical part - with X11 or SDL drivers, audio with OSS or ALSA drivers...). + with X11 or Mac drivers, audio with OSS or ALSA drivers...). </para> <para> All DLLs provided by Wine try to stick as much as possible @@ -452,12 +452,7 @@ terminated). </para> <para> - In earlier versions of Wine the master socket mentioned - above was actually created in the configuration directory; - either your home directory's <filename>/wine</filename> - subdirectory or wherever the - <envar>WINEPREFIX</envar> environment variable points>. - Since that might not be possible the socket is actually + The master socket mentioned above is created within the <filename>/tmp</filename> directory with a name that reflects the configuration directory. This means that there can actually be several separate @@ -545,8 +540,7 @@ </para> <para> The DLL descriptor and entry point table is generated by - the <command>winebuild</command> tool (previously just - named <command>build</command>), taking DLL specification + the <command>winebuild</command> tool, taking DLL specification files with the extension <filename>.spec</filename> as input. Resources (after compilation by <command>wrc</command>) or message tables (after @@ -730,7 +724,7 @@ work much worse than the corresponding built-in one, if at all. For example, the native Windows <filename>GDI</filename> library must be paired with a Windows display driver, which - of course is not present under Intel Unix and Wine. + of course is not present under Unix and Wine. </para> <para> Finally, occasionally built-in Wine DLLs implement more

1 0

Andrew Eikum : winbase.h: Add GetFileInformationByHandleEx.
by Alexandre Julliard 24 Jun '13

24 Jun '13

Module: wine Branch: master Commit: 1f508587d629ab2bbc6634cb629cab224c2d6f8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f508587d629ab2bbc6634cb6… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Jun 21 14:27:00 2013 -0500 winbase.h: Add GetFileInformationByHandleEx. --- include/winbase.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/winbase.h b/include/winbase.h index 4e21049..88b5e4f 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1746,6 +1746,7 @@ WINBASEAPI BOOL WINAPI GetFileAttributesExA(LPCSTR,GET_FILEEX_INFO_LEVELS WINBASEAPI BOOL WINAPI GetFileAttributesExW(LPCWSTR,GET_FILEEX_INFO_LEVELS,LPVOID); #define GetFileAttributesEx WINELIB_NAME_AW(GetFileAttributesEx) WINBASEAPI BOOL WINAPI GetFileInformationByHandle(HANDLE,BY_HANDLE_FILE_INFORMATION*); +WINBASEAPI BOOL WINAPI GetFileInformationByHandleEx(HANDLE,FILE_INFO_BY_HANDLE_CLASS,LPVOID,DWORD); WINADVAPI BOOL WINAPI GetFileSecurityA(LPCSTR,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR,DWORD,LPDWORD); WINADVAPI BOOL WINAPI GetFileSecurityW(LPCWSTR,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR,DWORD,LPDWORD); #define GetFileSecurity WINELIB_NAME_AW(GetFileSecurity)

1 0

Andrew Eikum : oleaut32: Register the typelib' s path without WOW64 redirection.
by Alexandre Julliard 24 Jun '13

24 Jun '13

Module: wine Branch: master Commit: 82376431e8ffd2456e7883ed5040b93ee2937a77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82376431e8ffd2456e7883ed5… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Jun 21 14:27:11 2013 -0500 oleaut32: Register the typelib's path without WOW64 redirection. --- dlls/oleaut32/typelib.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index bc7ee56..acf495f 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -66,6 +66,7 @@ #include "winnls.h" #include "winreg.h" #include "winuser.h" +#include "winternl.h" #include "lzexpand.h" #include "wine/unicode.h" @@ -3128,6 +3129,7 @@ static HRESULT TLB_ReadTypeLib(LPCWSTR pszFileName, LPWSTR pszPath, UINT cchPath LPVOID pBase = NULL; DWORD dwTLBLength = 0; IUnknown *pFile = NULL; + HANDLE h; *ppTypeLib = NULL; @@ -3162,6 +3164,24 @@ static HRESULT TLB_ReadTypeLib(LPCWSTR pszFileName, LPWSTR pszPath, UINT cchPath if(file != pszFileName) heap_free(file); + h = CreateFileW(pszPath, GENERIC_READ, 0, NULL, OPEN_ALWAYS, + FILE_ATTRIBUTE_NORMAL, NULL); + if(h != INVALID_HANDLE_VALUE){ + FILE_NAME_INFORMATION *info; + char data[MAX_PATH * sizeof(WCHAR) + sizeof(info->FileNameLength)]; + BOOL br; + + info = (FILE_NAME_INFORMATION*)data; + /* GetFileInformationByHandleEx returns the path of the file without + * WOW64 redirection */ + br = GetFileInformationByHandleEx(h, FileNameInfo, data, sizeof(data)); + if(br){ + info->FileName[info->FileNameLength / sizeof(WCHAR)] = 0; + lstrcpynW(pszPath + 2, info->FileName, cchPath - 2); + } + CloseHandle(h); + } + TRACE_(typelib)("File %s index %d\n", debugstr_w(pszPath), index); /* We look the path up in the typelib cache. If found, we just addref it, and return the pointer. */

1 0

Andrew Eikum : oleaut32: Load referenced typelibs in the same architecture.
by Alexandre Julliard 24 Jun '13

24 Jun '13

Module: wine Branch: master Commit: 2fa16df55109bd01498c9cf572399dc288512a92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fa16df55109bd01498c9cf57… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Jun 21 14:27:16 2013 -0500 oleaut32: Load referenced typelibs in the same architecture. --- dlls/oleaut32/tests/typelib.c | 16 ++++++++++++++++ dlls/oleaut32/typelib.c | 25 ++++++++++++++----------- 2 files changed, 30 insertions(+), 11 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 1919ea8..30468c1 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -1550,6 +1550,11 @@ static void test_CreateTypeLib(void) { hres = ITypeLib_GetTypeInfoOfGuid(stdole, &IID_IUnknown, &unknown); ok(hres == S_OK, "got %08x\n", hres); + hres = ITypeInfo_GetTypeAttr(unknown, &typeattr); + ok(hres == S_OK, "got %08x\n", hres); + ok(typeattr->cbSizeVft == 3 * sizeof(void*), "Got wrong cbSizeVft: %u\n", typeattr->cbSizeVft); + ITypeInfo_ReleaseTypeAttr(unknown, typeattr); + hres = ITypeLib_GetTypeInfoOfGuid(stdole, &IID_IDispatch, &dispatch); ok(hres == S_OK, "got %08x\n", hres); @@ -1684,6 +1689,17 @@ static void test_CreateTypeLib(void) { ok(hres == S_OK, "got %08x\n", hres); ok(hreftype == 3, "hreftype = %d\n", hreftype); + hres = ITypeInfo_GetRefTypeInfo(interface1, hreftype, &ti); + ok(hres == S_OK, "got %08x\n", hres); + + hres = ITypeInfo_GetTypeAttr(ti, &typeattr); + ok(hres == S_OK, "got %08x\n", hres); + ok(typeattr->cbSizeVft == 12 || broken(typeattr->cbSizeVft == 24) /* xp64 */, + "retrieved IUnknown gave wrong cbSizeVft: %u\n", typeattr->cbSizeVft); + ITypeInfo_ReleaseTypeAttr(ti, typeattr); + + ITypeInfo_Release(ti); + hres = ITypeInfo_GetRefTypeOfImplType(interface1, -1, &hreftype); ok(hres == TYPE_E_ELEMENTNOTFOUND, "got %08x\n", hres); diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index acf495f..24d250c 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -7433,18 +7433,21 @@ static HRESULT WINAPI ITypeInfo_fnGetRefTypeInfo( ITypeLib_AddRef(pTLib); result = S_OK; } else { + BSTR libnam; + TRACE("typeinfo in imported typelib that isn't already loaded\n"); - result = LoadRegTypeLib( TLB_get_guid_null(ref_type->pImpTLInfo->guid), - ref_type->pImpTLInfo->wVersionMajor, - ref_type->pImpTLInfo->wVersionMinor, - ref_type->pImpTLInfo->lcid, - &pTLib); - - if(FAILED(result)) { - BSTR libnam=SysAllocString(ref_type->pImpTLInfo->name); - result=LoadTypeLib(libnam, &pTLib); - SysFreeString(libnam); - } + + result = query_typelib_path(TLB_get_guid_null(ref_type->pImpTLInfo->guid), + ref_type->pImpTLInfo->wVersionMajor, + ref_type->pImpTLInfo->wVersionMinor, + This->pTypeLib->syskind, + ref_type->pImpTLInfo->lcid, &libnam); + if(FAILED(result)) + libnam = SysAllocString(ref_type->pImpTLInfo->name); + + result = LoadTypeLib(libnam, &pTLib); + SysFreeString(libnam); + if(SUCCEEDED(result)) { ref_type->pImpTLInfo->pImpTypeLib = impl_from_ITypeLib(pTLib); ITypeLib_AddRef(pTLib);

1 0

Andrew Eikum : oleaut32: Use typelib's pointer size, not system's.
by Alexandre Julliard 24 Jun '13

24 Jun '13

Module: wine Branch: master Commit: d3b896358aae13c980467288a7b4edf1a818927a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3b896358aae13c980467288a… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Jun 21 14:27:20 2013 -0500 oleaut32: Use typelib's pointer size, not system's. --- dlls/oleaut32/typelib.c | 30 ++++++++++++++++++++++++------ 1 files changed, 24 insertions(+), 6 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 24d250c..2bd9437 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -1005,6 +1005,7 @@ typedef struct tagITypeLibImpl TLBGuid *guid; LCID lcid; SYSKIND syskind; + int ptr_size; WORD ver_major; WORD ver_minor; WORD libflags; @@ -1246,6 +1247,20 @@ static inline const GUID *TLB_get_guid_null(const TLBGuid *guid) return guid != NULL ? &guid->guid : &GUID_NULL; } +static int get_ptr_size(SYSKIND syskind) +{ + switch(syskind){ + case SYS_WIN64: + return 8; + case SYS_WIN32: + case SYS_MAC: + case SYS_WIN16: + return 4; + } + WARN("Unhandled syskind: 0x%x\n", syskind); + return 4; +} + /* debug */ @@ -3340,6 +3355,7 @@ static ITypeLib2* ITypeLib2_Constructor_MSFT(LPVOID pLib, DWORD dwTLBLength) pTypeLibImpl->guid = MSFT_ReadGuid(tlbHeader.posguid, &cx); pTypeLibImpl->syskind = tlbHeader.varflags & 0x0f; /* check the mask */ + pTypeLibImpl->ptr_size = get_ptr_size(pTypeLibImpl->syskind); pTypeLibImpl->ver_major = LOWORD(tlbHeader.version); pTypeLibImpl->ver_minor = HIWORD(tlbHeader.version); pTypeLibImpl->libflags = (WORD) tlbHeader.flags & 0xffff;/* check mask */ @@ -3589,6 +3605,7 @@ static DWORD SLTG_ReadLibBlk(LPVOID pLibBlk, ITypeLibImpl *pTypeLibImpl) ptr += 4; pTypeLibImpl->syskind = *(WORD*)ptr; + pTypeLibImpl->ptr_size = get_ptr_size(pTypeLibImpl->syskind); ptr += 2; if(SUBLANGID(*(WORD*)ptr) == SUBLANG_NEUTRAL) @@ -4163,7 +4180,7 @@ static void SLTG_ProcessDispatch(char *pBlk, ITypeInfoImpl *pTI, /* this is necessary to cope with MSFT typelibs that set cFuncs to the number * of dispinterface functions including the IDispatch ones, so * ITypeInfo::GetFuncDesc takes the real value for cFuncs from cbSizeVft */ - pTI->cbSizeVft = pTI->cFuncs * sizeof(void *); + pTI->cbSizeVft = pTI->cFuncs * pTI->pTypeLib->ptr_size; heap_free(ref_lookup); if (TRACE_ON(typelib)) @@ -5518,7 +5535,7 @@ static HRESULT WINAPI ITypeInfo_fnGetTypeAttr( ITypeInfo2 *iface, if((*ppTypeAttr)->typekind == TKIND_DISPATCH) { /* This should include all the inherited funcs */ - (*ppTypeAttr)->cFuncs = (*ppTypeAttr)->cbSizeVft / sizeof(void *); + (*ppTypeAttr)->cFuncs = (*ppTypeAttr)->cbSizeVft / This->pTypeLib->ptr_size; /* This is always the size of IDispatch's vtbl */ (*ppTypeAttr)->cbSizeVft = sizeof(IDispatchVtbl); (*ppTypeAttr)->wTypeFlags &= ~TYPEFLAG_FOLEAUTOMATION; @@ -8378,6 +8395,7 @@ HRESULT WINAPI CreateTypeLib2(SYSKIND syskind, LPCOLESTR szFile, This->lcid = GetSystemDefaultLCID(); This->syskind = syskind; + This->ptr_size = get_ptr_size(syskind); This->path = heap_alloc((lstrlenW(szFile) + 1) * sizeof(WCHAR)); if (!This->path) { @@ -10601,7 +10619,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnLayOut(ICreateTypeInfo2 *iface) ITypeInfo_Release(tinfo); return hres; } - This->cbSizeVft = attr->cbSizeVft * 4 / sizeof(void*); + This->cbSizeVft = attr->cbSizeVft; ITypeInfo_ReleaseTypeAttr(inh, attr); do{ @@ -10634,7 +10652,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnLayOut(ICreateTypeInfo2 *iface) return hres; } } else if (This->typekind == TKIND_DISPATCH) - This->cbSizeVft = 7 * sizeof(void*); + This->cbSizeVft = 7 * This->pTypeLib->ptr_size; else This->cbSizeVft = 0; @@ -10647,7 +10665,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnLayOut(ICreateTypeInfo2 *iface) if ((func_desc->funcdesc.oVft & 0xFFFC) > user_vft) user_vft = func_desc->funcdesc.oVft & 0xFFFC; - This->cbSizeVft += sizeof(void*); + This->cbSizeVft += This->pTypeLib->ptr_size; if (func_desc->funcdesc.memid == MEMBERID_NIL) { TLBFuncDesc *iter; @@ -10678,7 +10696,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnLayOut(ICreateTypeInfo2 *iface) } if (user_vft > This->cbSizeVft) - This->cbSizeVft = user_vft + sizeof(void*); + This->cbSizeVft = user_vft + This->pTypeLib->ptr_size; ITypeInfo_Release(tinfo); return hres;

1 0

Marcus Meissner : dbghelp: Free root in error case (Coverity).
by Alexandre Julliard 24 Jun '13

24 Jun '13

Module: wine Branch: master Commit: 7a406d0adf6852fa6c5b03b2f1f49af5488b9c7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a406d0adf6852fa6c5b03b2f… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Jun 22 17:16:22 2013 +0200 dbghelp: Free root in error case (Coverity). --- dlls/dbghelp/msc.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index ddabd07..4978acf 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -2528,6 +2528,7 @@ static BOOL pdb_init(const struct pdb_lookup* pdb_lookup, struct pdb_file_info* if (pdb_lookup->kind != PDB_JG) { WARN("Found %s, but wrong PDB kind\n", pdb_lookup->filename); + pdb_free(root); return FALSE; } pdb_file->kind = PDB_JG;

1 0