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

Piotr Caban : server: Don' t create new handle when DUP_HANDLE_CLOSE_SOURCE is used if possible.
by Alexandre Julliard June 5, 2013

June 5, 2013

Module: wine Branch: master Commit: 76bfbf43e99d102a2ae701b5e1a9cc9682f2494a URL: http://source.winehq.org/git/wine.git/?a=commit;h=76bfbf43e99d102a2ae701b5e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 5 11:33:17 2013 +0200 server: Don't create new handle when DUP_HANDLE_CLOSE_SOURCE is used if possible. --- dlls/ntdll/om.c | 11 +++-------- server/handle.c | 12 ++++++++++-- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/om.c b/dlls/ntdll/om.c index 18da18d..8b92f1b 100644 --- a/dlls/ntdll/om.c +++ b/dlls/ntdll/om.c @@ -332,16 +332,11 @@ NTSTATUS WINAPI NtDuplicateObject( HANDLE source_process, HANDLE source, if (!(ret = wine_server_call( req ))) { if (dest) *dest = wine_server_ptr_handle( reply->handle ); - if (reply->closed) + if (reply->closed && reply->self) { - if (reply->self) - { - int fd = server_remove_fd_from_cache( source ); - if (fd != -1) close( fd ); - } + int fd = server_remove_fd_from_cache( source ); + if (fd != -1) close( fd ); } - else if (options & DUPLICATE_CLOSE_SOURCE) - WARN( "failed to close handle %p in process %p\n", source, source_process ); } } SERVER_END_REQ; diff --git a/server/handle.c b/server/handle.c index 1d8087b..28c49c2 100644 --- a/server/handle.c +++ b/server/handle.c @@ -531,6 +531,13 @@ obj_handle_t duplicate_handle( struct process *src, obj_handle_t src_handle, str { if (options & DUP_HANDLE_MAKE_GLOBAL) res = alloc_global_handle_no_access_check( obj, access ); + else if ((options & DUP_HANDLE_CLOSE_SOURCE) && src == dst && + entry && !(entry->access & RESERVED_CLOSE_PROTECT)) + { + if (attr & OBJ_INHERIT) access |= RESERVED_INHERIT; + entry->access = access; + res = src_handle; + } else res = alloc_handle_no_access_check( dst, obj, access, attr ); } @@ -581,7 +588,7 @@ DECL_HANDLER(set_handle_info) /* duplicate a handle */ DECL_HANDLER(dup_handle) { - struct process *src, *dst; + struct process *src, *dst = NULL; reply->handle = 0; if ((src = get_process_from_handle( req->src_process, PROCESS_DUP_HANDLE ))) @@ -598,7 +605,8 @@ DECL_HANDLER(dup_handle) release_object( dst ); } /* close the handle no matter what happened */ - if (req->options & DUP_HANDLE_CLOSE_SOURCE) reply->closed = !close_handle( src, req->src_handle ); + if ((req->options & DUP_HANDLE_CLOSE_SOURCE) && (src != dst || req->src_handle != reply->handle)) + reply->closed = !close_handle( src, req->src_handle ); reply->self = (src == current->process); release_object( src ); }

1 0

Henri Verbeet : wined3d: Pass a wined3d_resource_desc structure to wined3d_texture_create_2d().
by Alexandre Julliard June 5, 2013

June 5, 2013

Module: wine Branch: master Commit: 9d4cbd6195ab2b73113040a449cc4416597b8c81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d4cbd6195ab2b73113040a44… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 5 11:06:11 2013 +0200 wined3d: Pass a wined3d_resource_desc structure to wined3d_texture_create_2d(). --- dlls/d3d10core/texture.c | 18 ++++++++-- dlls/d3d8/texture.c | 15 +++++++- dlls/d3d9/texture.c | 15 +++++++- dlls/ddraw/surface.c | 20 ++++++++++- dlls/wined3d/texture.c | 81 +++++++++++++++++++-------------------------- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 5 +-- 7 files changed, 95 insertions(+), 61 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9d4cbd6195ab2b7311304…

1 0

Austin English : api-ms-win-core-localregistry-l1-1-0: Add stub dll.
by Alexandre Julliard June 5, 2013

June 5, 2013

Module: wine Branch: master Commit: 1648340d09847903ad6e7e7abcd870c46bd329c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1648340d09847903ad6e7e7ab… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Jun 4 13:20:00 2013 -0700 api-ms-win-core-localregistry-l1-1-0: Add stub dll. --- configure | 1 + configure.ac | 1 + .../Makefile.in | 3 + .../api-ms-win-core-localregistry-l1-1-0.spec | 40 ++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 46 insertions(+), 0 deletions(-) diff --git a/configure b/configure index d72d2df..df05f1f 100755 --- a/configure +++ b/configure @@ -15750,6 +15750,7 @@ wine_fn_config_dll advpack enable_advpack implib wine_fn_config_test dlls/advpack/tests advpack_test wine_fn_config_dll amstream enable_amstream wine_fn_config_test dlls/amstream/tests amstream_test +wine_fn_config_dll api-ms-win-core-localregistry-l1-1-0 enable_api_ms_win_core_localregistry_l1_1_0 wine_fn_config_dll api-ms-win-core-winrt-error-l1-1-0 enable_api_ms_win_core_winrt_error_l1_1_0 wine_fn_config_dll api-ms-win-core-winrt-string-l1-1-0 enable_api_ms_win_core_winrt_string_l1_1_0 wine_fn_config_dll api-ms-win-downlevel-advapi32-l1-1-0 enable_api_ms_win_downlevel_advapi32_l1_1_0 diff --git a/configure.ac b/configure.ac index 0a8c316..57d76d9 100644 --- a/configure.ac +++ b/configure.ac @@ -2574,6 +2574,7 @@ WINE_CONFIG_DLL(advpack,,[implib]) WINE_CONFIG_TEST(dlls/advpack/tests) WINE_CONFIG_DLL(amstream) WINE_CONFIG_TEST(dlls/amstream/tests) +WINE_CONFIG_DLL(api-ms-win-core-localregistry-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-winrt-error-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-winrt-string-l1-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-advapi32-l1-1-0) diff --git a/dlls/api-ms-win-core-localregistry-l1-1-0/Makefile.in b/dlls/api-ms-win-core-localregistry-l1-1-0/Makefile.in new file mode 100644 index 0000000..57d3e80 --- /dev/null +++ b/dlls/api-ms-win-core-localregistry-l1-1-0/Makefile.in @@ -0,0 +1,3 @@ +MODULE = api-ms-win-core-localregistry-l1-1-0.dll + +(a)MAKE_DLL_RULES@ diff --git a/dlls/api-ms-win-core-localregistry-l1-1-0/api-ms-win-core-localregistry-l1-1-0.spec b/dlls/api-ms-win-core-localregistry-l1-1-0/api-ms-win-core-localregistry-l1-1-0.spec new file mode 100644 index 0000000..fcf4f00 --- /dev/null +++ b/dlls/api-ms-win-core-localregistry-l1-1-0/api-ms-win-core-localregistry-l1-1-0.spec @@ -0,0 +1,40 @@ +@ stdcall RegCloseKey(long) advapi32.RegCloseKey +@ stdcall RegCreateKeyExA(long str long ptr long long ptr ptr ptr) advapi32.RegCreateKeyExA +@ stdcall RegCreateKeyExW(long wstr long ptr long long ptr ptr ptr) advapi32.RegCreateKeyExW +@ stdcall RegDeleteKeyExA(long str long long) advapi32.RegDeleteKeyExA +@ stdcall RegDeleteKeyExW(long wstr long long) advapi32.RegDeleteKeyExW +@ stdcall RegDeleteTreeA(long str) advapi32.RegDeleteTreeA +@ stdcall RegDeleteTreeW(long wstr) advapi32.RegDeleteTreeW +@ stdcall RegDeleteValueA(long str) advapi32.RegDeleteValueA +@ stdcall RegDeleteValueW(long wstr) advapi32.RegDeleteValueW +@ stub RegDisablePredefinedCacheEx +@ stdcall RegEnumKeyExA(long long ptr ptr ptr ptr ptr ptr) advapi32.RegEnumKeyExA +@ stdcall RegEnumKeyExW(long long ptr ptr ptr ptr ptr ptr) advapi32.RegEnumKeyExW +@ stdcall RegEnumValueA(long long ptr ptr ptr ptr ptr ptr) advapi32.RegEnumValueA +@ stdcall RegEnumValueW(long long ptr ptr ptr ptr ptr ptr) advapi32.RegEnumValueW +@ stdcall RegFlushKey(long) advapi32.RegFlushKey +@ stdcall RegGetKeySecurity(long long ptr ptr) advapi32.RegGetKeySecurity +@ stdcall RegGetValueA(long str str long ptr ptr ptr) advapi32.RegGetValueA +@ stdcall RegGetValueW(long wstr wstr long ptr ptr ptr) advapi32.RegGetValueW +@ stdcall RegLoadKeyA(long str str) advapi32.RegLoadKeyA +@ stdcall RegLoadKeyW(long wstr wstr) advapi32.RegLoadKeyW +@ stdcall RegLoadMUIStringA(long str str long ptr long str) advapi32.RegLoadMUIStringA +@ stdcall RegLoadMUIStringW(long wstr wstr long ptr long wstr) advapi32.RegLoadMUIStringW +@ stdcall RegNotifyChangeKeyValue(long long long long long) advapi32.RegNotifyChangeKeyValue +@ stdcall RegOpenCurrentUser(long ptr) advapi32.RegOpenCurrentUser +@ stdcall RegOpenKeyExA(long str long long ptr) advapi32.RegOpenKeyExA +@ stdcall RegOpenKeyExW(long wstr long long ptr) advapi32.RegOpenKeyExW +@ stdcall RegOpenUserClassesRoot(ptr long long ptr) advapi32.RegOpenUserClassesRoot +@ stdcall RegQueryInfoKeyA(long ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) advapi32.RegQueryInfoKeyA +@ stdcall RegQueryInfoKeyW(long ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) advapi32.RegQueryInfoKeyW +@ stdcall RegQueryValueExA(long str ptr ptr ptr ptr) advapi32.RegQueryValueExA +@ stdcall RegQueryValueExW(long wstr ptr ptr ptr ptr) advapi32.RegQueryValueExW +@ stdcall RegRestoreKeyA(long str long) advapi32.RegRestoreKeyA +@ stdcall RegRestoreKeyW(long wstr long) advapi32.RegRestoreKeyW +@ stub RegSaveKeyExA +@ stub RegSaveKeyExW +@ stdcall RegSetKeySecurity(long long ptr) advapi32.RegSetKeySecurity +@ stdcall RegSetValueExA(long str long long ptr long) advapi32.RegSetValueExA +@ stdcall RegSetValueExW(long wstr long long ptr long) advapi32.RegSetValueExW +@ stdcall RegUnLoadKeyA(long str) advapi32.RegUnLoadKeyA +@ stdcall RegUnLoadKeyW(long wstr) advapi32.RegUnLoadKeyW diff --git a/tools/make_specfiles b/tools/make_specfiles index 44e0fa0..002d252 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -120,6 +120,7 @@ my @dll_groups = ], [ "advapi32", + "api-ms-win-core-localregistry-l1-1-0", "api-ms-win-downlevel-advapi32-l1-1-0", "api-ms-win-downlevel-advapi32-l2-1-0", "api-ms-win-security-base-l1-1-0",

1 0

Henri Verbeet : wined3d: Pass a wined3d_resource_desc structure to wined3d_texture_create_cube().
by Alexandre Julliard June 5, 2013

June 5, 2013

Module: wine Branch: master Commit: b23739316c103719f20c89aef5e70c3153789c68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b23739316c103719f20c89aef… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 5 11:06:12 2013 +0200 wined3d: Pass a wined3d_resource_desc structure to wined3d_texture_create_cube(). --- dlls/d3d8/texture.c | 17 ++++++++++-- dlls/d3d9/texture.c | 17 ++++++++++-- dlls/ddraw/surface.c | 27 +++++++++---------- dlls/wined3d/texture.c | 62 ++++++++++++++++---------------------------- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 5 +-- 6 files changed, 67 insertions(+), 63 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b23739316c103719f20c8…

1 0

Henri Verbeet : d3drm: Avoid LPDIRECT3DRMVIEWPORTARRAY.
by Alexandre Julliard June 5, 2013

June 5, 2013

Module: wine Branch: master Commit: 31f9cae2bdc74e00a5883d080e63902728063cde URL: http://source.winehq.org/git/wine.git/?a=commit;h=31f9cae2bdc74e00a5883d080… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 5 11:06:13 2013 +0200 d3drm: Avoid LPDIRECT3DRMVIEWPORTARRAY. --- dlls/d3drm/device.c | 14 ++++---------- include/d3drmobj.h | 6 +++--- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/dlls/d3drm/device.c b/dlls/d3drm/device.c index e6e0d71..c2458ac 100644 --- a/dlls/d3drm/device.c +++ b/dlls/d3drm/device.c @@ -319,12 +319,9 @@ static HRESULT WINAPI IDirect3DRMDevice2Impl_SetTextureQuality(IDirect3DRMDevice return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMDevice2Impl_GetViewports(IDirect3DRMDevice2* iface, - LPDIRECT3DRMVIEWPORTARRAY *return_views) +static HRESULT WINAPI IDirect3DRMDevice2Impl_GetViewports(IDirect3DRMDevice2 *iface, IDirect3DRMViewportArray **array) { - IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice2(iface); - - FIXME("(%p/%p)->(%p): stub\n", iface, This, return_views); + FIXME("iface %p, array %p stub!\n", iface, array); return E_NOTIMPL; } @@ -751,12 +748,9 @@ static HRESULT WINAPI IDirect3DRMDevice3Impl_SetTextureQuality(IDirect3DRMDevice return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMDevice3Impl_GetViewports(IDirect3DRMDevice3* iface, - LPDIRECT3DRMVIEWPORTARRAY *return_views) +static HRESULT WINAPI IDirect3DRMDevice3Impl_GetViewports(IDirect3DRMDevice3 *iface, IDirect3DRMViewportArray **array) { - IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice3(iface); - - FIXME("(%p/%p)->(%p): stub\n", iface, This, return_views); + FIXME("iface %p, array %p stub!\n", iface, array); return E_NOTIMPL; } diff --git a/include/d3drmobj.h b/include/d3drmobj.h index a26427d..ea85d76 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -388,7 +388,7 @@ DECLARE_INTERFACE_(IDirect3DRMDevice,IUnknown) STDMETHOD(SetShades)(THIS_ DWORD) PURE; STDMETHOD(SetQuality)(THIS_ D3DRMRENDERQUALITY) PURE; STDMETHOD(SetTextureQuality)(THIS_ D3DRMTEXTUREQUALITY) PURE; - STDMETHOD(GetViewports)(THIS_ LPDIRECT3DRMVIEWPORTARRAY *return_views) PURE; + STDMETHOD(GetViewports)(THIS_ struct IDirect3DRMViewportArray **array) PURE; STDMETHOD_(BOOL, GetDither)(THIS) PURE; STDMETHOD_(DWORD, GetShades)(THIS) PURE; STDMETHOD_(DWORD, GetHeight)(THIS) PURE; @@ -515,7 +515,7 @@ DECLARE_INTERFACE_(IDirect3DRMDevice2,IDirect3DRMDevice) STDMETHOD(SetShades)(THIS_ DWORD) PURE; STDMETHOD(SetQuality)(THIS_ D3DRMRENDERQUALITY) PURE; STDMETHOD(SetTextureQuality)(THIS_ D3DRMTEXTUREQUALITY) PURE; - STDMETHOD(GetViewports)(THIS_ LPDIRECT3DRMVIEWPORTARRAY *return_views) PURE; + STDMETHOD(GetViewports)(THIS_ struct IDirect3DRMViewportArray **array) PURE; STDMETHOD_(BOOL, GetDither)(THIS) PURE; STDMETHOD_(DWORD, GetShades)(THIS) PURE; STDMETHOD_(DWORD, GetHeight)(THIS) PURE; @@ -660,7 +660,7 @@ DECLARE_INTERFACE_(IDirect3DRMDevice3,IDirect3DRMObject) STDMETHOD(SetShades)(THIS_ DWORD) PURE; STDMETHOD(SetQuality)(THIS_ D3DRMRENDERQUALITY) PURE; STDMETHOD(SetTextureQuality)(THIS_ D3DRMTEXTUREQUALITY) PURE; - STDMETHOD(GetViewports)(THIS_ LPDIRECT3DRMVIEWPORTARRAY *return_views) PURE; + STDMETHOD(GetViewports)(THIS_ struct IDirect3DRMViewportArray **array) PURE; STDMETHOD_(BOOL, GetDither)(THIS) PURE; STDMETHOD_(DWORD, GetShades)(THIS) PURE; STDMETHOD_(DWORD, GetHeight)(THIS) PURE;

1 0

Jason Edmeades : cmd: Avoid infinite loop running batch program.
by Alexandre Julliard June 5, 2013

June 5, 2013

Module: wine Branch: master Commit: dd0b719a3a1419f34774fc4cd921f3378d8c237b URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd0b719a3a1419f34774fc4cd… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Tue Jun 4 21:27:48 2013 +0100 cmd: Avoid infinite loop running batch program. --- programs/cmd/tests/test_cmdline.cmd | 8 +++++++- programs/cmd/tests/test_cmdline.cmd.exp | 1 + programs/cmd/wcmdmain.c | 21 +++++---------------- 3 files changed, 13 insertions(+), 17 deletions(-) diff --git a/programs/cmd/tests/test_cmdline.cmd b/programs/cmd/tests/test_cmdline.cmd index e563341..32a1ef2 100644 --- a/programs/cmd/tests/test_cmdline.cmd +++ b/programs/cmd/tests/test_cmdline.cmd @@ -95,6 +95,7 @@ echo @echo 1 > "say one.bat" echo @echo 2 > "saytwo.bat" echo @echo 3 > "say (3).bat" echo @echo 4 > "say .bat" +echo @echo 5 > "bazbaz(5).bat" echo ------ Testing invocation of batch files ---------- call say one @@ -144,6 +145,11 @@ if errorlevel 2 echo error %ErrorLevel% call :setError 0 cmd /c say" "(3) prints 4?! if errorlevel 2 echo error %ErrorLevel% +call :setError 0 +rem Deliberately invoking a fully qualified batch name containing a bracket +rem should fail, as a bracket is a command delimiter. +cmd /c "bazbaz(5).bat" +if errorlevel 1 echo Passed echo ---------- Testing CMD /C quoting ----------------- cmd /c @echo "hi" @@ -261,7 +267,7 @@ call tell(1234) call tell(12(34) call tell(12;34) echo --------- Finished -------------- -del tell.bat say*.* +del tell.bat say*.* bazbaz*.bat exit :setError exit /B %1 diff --git a/programs/cmd/tests/test_cmdline.cmd.exp b/programs/cmd/tests/test_cmdline.cmd.exp index 38e17a5..980f674 100644 --- a/programs/cmd/tests/test_cmdline.cmd.exp +++ b/programs/cmd/tests/test_cmdline.cmd.exp @@ -70,6 +70,7 @@ var=33(a)space@ 0(a)space@ 3(a)space@ 4(a)space@ +Passed ---------- Testing CMD /C quoting ----------------- "hi" 1(a)space@ diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 0d4575b..a211efa 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1048,7 +1048,6 @@ void WCMD_run_program (WCHAR *command, BOOL called) BOOL extensionsupplied = FALSE; BOOL launched = FALSE; BOOL status; - BOOL assumeInternal = FALSE; DWORD len; static const WCHAR envPath[] = {'P','A','T','H','\0'}; static const WCHAR delims[] = {'/','\\',':','\0'}; @@ -1168,20 +1167,8 @@ void WCMD_run_program (WCHAR *command, BOOL called) } } - /* Internal programs won't be picked up by this search, so even - though not found, try one last createprocess and wait for it - to complete. - Note: Ideally we could tell between a console app (wait) and a - windows app, but the API's for it fail in this case */ - if (!found && pathposn == NULL) { - WINE_TRACE("ASSUMING INTERNAL\n"); - assumeInternal = TRUE; - } else { - WINE_TRACE("Found as %s\n", wine_dbgstr_w(thisDir)); - } - /* Once found, launch it */ - if (found || assumeInternal) { + if (found) { STARTUPINFOW st; PROCESS_INFORMATION pe; SHFILEINFOW psfi; @@ -1191,6 +1178,8 @@ void WCMD_run_program (WCHAR *command, BOOL called) static const WCHAR batExt[] = {'.','b','a','t','\0'}; static const WCHAR cmdExt[] = {'.','c','m','d','\0'}; + WINE_TRACE("Found as %s\n", wine_dbgstr_w(thisDir)); + /* Special case BAT and CMD */ if (ext && (!strcmpiW(ext, batExt) || !strcmpiW(ext, cmdExt))) { BOOL oldinteractive = interactive; @@ -1214,7 +1203,7 @@ void WCMD_run_program (WCHAR *command, BOOL called) /* Launch the process and if a CUI wait on it to complete Note: Launching internal wine processes cannot specify a full path to exe */ - status = CreateProcessW(assumeInternal?NULL : thisDir, + status = CreateProcessW(thisDir, command, NULL, NULL, TRUE, 0, NULL, NULL, &st, &pe); heap_free(st.lpReserved2); if ((opt_c || opt_k) && !opt_s && !status @@ -1231,7 +1220,7 @@ void WCMD_run_program (WCHAR *command, BOOL called) /* Always wait when non-interactive (cmd /c or in batch program), or for console applications */ - if (assumeInternal || !interactive || (console && !HIWORD(console))) + if (!interactive || (console && !HIWORD(console))) WaitForSingleObject (pe.hProcess, INFINITE); GetExitCodeProcess (pe.hProcess, &errorlevel); if (errorlevel == STILL_ACTIVE) errorlevel = 0;

1 0

Andrew Eikum : oleaut32: Only copy previous function name if both are property accessors.
by Alexandre Julliard June 4, 2013

June 4, 2013

Module: wine Branch: master Commit: 0210cb93856df5432101a8df71da1f9060ed3860 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0210cb93856df5432101a8df7… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Jun 4 08:18:58 2013 -0500 oleaut32: Only copy previous function name if both are property accessors. --- dlls/oleaut32/typelib.c | 23 ++++++++++++++++------- 1 files changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 725bf2f..bb3be43 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -2240,6 +2240,13 @@ static void MSFT_ResolveReferencedTypes(TLBContext *pcx, ITypeInfoImpl *pTI, TYP } } +static int TLB_is_propgetput(INVOKEKIND invkind) +{ + return (invkind == INVOKE_PROPERTYGET || + invkind == INVOKE_PROPERTYPUT || + invkind == INVOKE_PROPERTYPUTREF); +} + static void MSFT_DoFuncs(TLBContext* pcx, ITypeInfoImpl* pTI, @@ -2294,13 +2301,6 @@ MSFT_DoFuncs(TLBContext* pcx, MSFT_ReadLEDWords(&nameoffset, sizeof(INT), pcx, offset + infolen + (cFuncs + cVars + i + 1) * sizeof(INT)); - /* nameoffset is sometimes -1 on the second half of a propget/propput - * pair of functions */ - if ((nameoffset == -1) && (i > 0)) - ptfd->Name = ptfd_prev->Name; - else - ptfd->Name = MSFT_ReadName(pcx, nameoffset); - /* read the function information record */ MSFT_ReadLEDWords(&reclength, sizeof(pFuncRec->Info), pcx, recoffset); @@ -2351,6 +2351,15 @@ MSFT_DoFuncs(TLBContext* pcx, ptfd->funcdesc.oVft = pFuncRec->VtableOffset & ~1; ptfd->funcdesc.wFuncFlags = LOWORD(pFuncRec->Flags) ; + /* nameoffset is sometimes -1 on the second half of a propget/propput + * pair of functions */ + if ((nameoffset == -1) && (i > 0) && + TLB_is_propgetput(ptfd_prev->funcdesc.invkind) && + TLB_is_propgetput(ptfd->funcdesc.invkind)) + ptfd->Name = ptfd_prev->Name; + else + ptfd->Name = MSFT_ReadName(pcx, nameoffset); + MSFT_GetTdesc(pcx, pFuncRec->DataType, &ptfd->funcdesc.elemdescFunc.tdesc,

1 0

Andrew Eikum : oleaut32: When loading typelibs, skip over function default parameters as well.
by Alexandre Julliard June 4, 2013

June 4, 2013

Module: wine Branch: master Commit: 09d787d2d552baa184f72ed86a02ba98081e66b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09d787d2d552baa184f72ed86… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Jun 4 08:18:55 2013 -0500 oleaut32: When loading typelibs, skip over function default parameters as well. --- dlls/oleaut32/typelib.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 295cac3..725bf2f 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -2310,6 +2310,8 @@ MSFT_DoFuncs(TLBContext* pcx, /* size without argument data */ optional = reclength - pFuncRec->nrargs*sizeof(MSFT_ParameterInfo); + if (pFuncRec->FKCCIC & 0x1000) + optional -= pFuncRec->nrargs * sizeof(INT); if (optional > FIELD_OFFSET(MSFT_FuncRecord, HelpContext)) ptfd->helpcontext = pFuncRec->HelpContext;

1 0

Hans Leidekker : wbemprox: Use the right allocator for BSTR values in get_owner.
by Alexandre Julliard June 4, 2013

June 4, 2013

Module: wine Branch: master Commit: 9a14d5d024ec4f95663b74a0e8a5c1e5a571f651 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a14d5d024ec4f95663b74a0e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 4 13:27:08 2013 +0200 wbemprox: Use the right allocator for BSTR values in get_owner. --- dlls/wbemprox/process.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/process.c b/dlls/wbemprox/process.c index 918ba91..d3552b7 100644 --- a/dlls/wbemprox/process.c +++ b/dlls/wbemprox/process.c @@ -40,14 +40,14 @@ static HRESULT get_owner( VARIANT *user, VARIANT *domain, VARIANT *retval ) len = 0; GetUserNameW( NULL, &len ); if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) goto done; - if (!(V_BSTR( user ) = heap_alloc( len * sizeof(WCHAR) ))) goto done; + if (!(V_BSTR( user ) = SysAllocStringLen( NULL, len - 1 ))) goto done; if (!GetUserNameW( V_BSTR( user ), &len )) goto done; V_VT( user ) = VT_BSTR; len = 0; GetComputerNameW( NULL, &len ); if (GetLastError() != ERROR_BUFFER_OVERFLOW) goto done; - if (!(V_BSTR( domain ) = heap_alloc( len * sizeof(WCHAR) ))) goto done; + if (!(V_BSTR( domain ) = SysAllocStringLen( NULL, len - 1 ))) goto done; if (!GetComputerNameW( V_BSTR( domain ), &len )) goto done; V_VT( domain ) = VT_BSTR;

1 0

Ken Thomases : winemac: Allow Cocoa to make minimized windows key; it will unminimize them as necessary.
by Alexandre Julliard June 4, 2013

June 4, 2013

Module: wine Branch: master Commit: b15f412e14ec3160ba2c9b2afe42102355f64a89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b15f412e14ec3160ba2c9b2af… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Jun 4 04:59:49 2013 -0500 winemac: Allow Cocoa to make minimized windows key; it will unminimize them as necessary. --- dlls/winemac.drv/window.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index eacc0b6..a04f1e2 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -93,7 +93,6 @@ static inline BOOL can_activate_window(HWND hwnd) if (!(style & WS_VISIBLE)) return FALSE; if ((style & (WS_POPUP|WS_CHILD)) == WS_CHILD) return FALSE; - if (style & WS_MINIMIZE) return FALSE; if (GetWindowLongW(hwnd, GWL_EXSTYLE) & WS_EX_NOACTIVATE) return FALSE; if (hwnd == GetDesktopWindow()) return FALSE; if (GetWindowRect(hwnd, &rect) && IsRectEmpty(&rect)) return FALSE; @@ -1548,14 +1547,15 @@ void macdrv_window_frame_changed(HWND hwnd, CGRect frame) */ void macdrv_window_got_focus(HWND hwnd, const macdrv_event *event) { + LONG style = GetWindowLongW(hwnd, GWL_STYLE); + if (!hwnd) return; TRACE("win %p/%p serial %lu enabled %d visible %d style %08x focus %p active %p fg %p\n", hwnd, event->window, event->window_got_focus.serial, IsWindowEnabled(hwnd), - IsWindowVisible(hwnd), GetWindowLongW(hwnd, GWL_STYLE), GetFocus(), - GetActiveWindow(), GetForegroundWindow()); + IsWindowVisible(hwnd), style, GetFocus(), GetActiveWindow(), GetForegroundWindow()); - if (can_activate_window(hwnd)) + if (can_activate_window(hwnd) && !(style & WS_MINIMIZE)) { /* simulate a mouse click on the caption to find out * whether the window wants to be activated */

1 0