October 2008 - Wine-Commits

Henri Verbeet : dxgi: Add a stub IDXGIDevice implementation.
by Alexandre Julliard Oct. 23, 2008

Oct. 23, 2008

Module: wine Branch: master Commit: 9e6f21463e9b6d31259a390c713854a01aad48b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e6f21463e9b6d31259a390c7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 22 17:41:16 2008 +0200 dxgi: Add a stub IDXGIDevice implementation. --- dlls/dxgi/Makefile.in | 1 + dlls/dxgi/device.c | 162 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/dxgi/dxgi_private.h | 8 ++ 3 files changed, 171 insertions(+), 0 deletions(-) diff --git a/dlls/dxgi/Makefile.in b/dlls/dxgi/Makefile.in index 77b2b97..2b01f9d 100644 --- a/dlls/dxgi/Makefile.in +++ b/dlls/dxgi/Makefile.in @@ -7,6 +7,7 @@ IMPORTLIB = dxgi IMPORTS = dxguid uuid kernel32 C_SRCS = \ + device.c \ dxgi_main.c \ factory.c diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c new file mode 100644 index 0000000..9c7f252 --- /dev/null +++ b/dlls/dxgi/device.c @@ -0,0 +1,162 @@ +/* + * Copyright 2008 Henri Verbeet for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include "config.h" +#include "wine/port.h" + +#include "dxgi_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dxgi); + +/* IUnknown methods */ + +HRESULT STDMETHODCALLTYPE dxgi_device_QueryInterface(IDXGIDevice* iface, REFIID riid, void **object) +{ + TRACE("iface %p, riid %s, object %p\n", iface, debugstr_guid(riid), object); + + if (IsEqualGUID(riid, &IID_IUnknown) + || IsEqualGUID(riid, &IID_IDXGIObject) + || IsEqualGUID(riid, &IID_IDXGIDevice)) + { + IUnknown_AddRef(iface); + *object = iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE\n", debugstr_guid(riid)); + + *object = NULL; + return E_NOINTERFACE; +} + +ULONG STDMETHODCALLTYPE dxgi_device_AddRef(IDXGIDevice* iface) +{ + struct dxgi_device *This = (struct dxgi_device *)iface; + ULONG refcount = InterlockedIncrement(&This->refcount); + + TRACE("%p increasing refcount to %u\n", This, refcount); + + return refcount; +} + +ULONG STDMETHODCALLTYPE dxgi_device_Release(IDXGIDevice* iface) +{ + struct dxgi_device *This = (struct dxgi_device *)iface; + ULONG refcount = InterlockedDecrement(&This->refcount); + + TRACE("%p decreasing refcount to %u\n", This, refcount); + + if (!refcount) + { + HeapFree(GetProcessHeap(), 0, This); + } + + return refcount; +} + +/* IDXGIObject methods */ + +HRESULT STDMETHODCALLTYPE dxgi_device_SetPrivateData(IDXGIDevice* iface, REFGUID guid, UINT data_size, const void *data) +{ + FIXME("iface %p, guid %s, data_size %u, data %p stub!\n", iface, debugstr_guid(guid), data_size, data); + + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE dxgi_device_SetPrivateDataInterface(IDXGIDevice* iface, REFGUID guid, const IUnknown *object) +{ + FIXME("iface %p, guid %s, object %p stub!\n", iface, debugstr_guid(guid), object); + + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE dxgi_device_GetPrivateData(IDXGIDevice* iface, REFGUID guid, UINT *data_size, void *data) +{ + FIXME("iface %p, guid %s, data_size %p, data %p stub!\n", iface, debugstr_guid(guid), data_size, data); + + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE dxgi_device_GetParent(IDXGIDevice* iface, REFIID riid, void **parent) +{ + FIXME("iface %p, riid %s, parent %p stub!\n", iface, debugstr_guid(riid), parent); + + return E_NOTIMPL; +} + +/* IDXGIDevice methods */ + +HRESULT STDMETHODCALLTYPE dxgi_device_GetAdapter(IDXGIDevice* iface, IDXGIAdapter **adapter) +{ + FIXME("iface %p, adapter %p stub!\n", iface, adapter); + + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE dxgi_device_CreateSurface(IDXGIDevice* iface, + const DXGI_SURFACE_DESC *desc, UINT surface_count, DXGI_USAGE usage, + const DXGI_SHARED_RESOURCE *shared_resource, IDXGISurface **surface) +{ + FIXME("iface %p, desc %p, surface_count %u, usage %#x, shared_resource %p, surface %p stub!\n", + iface, desc, surface_count, usage, shared_resource, surface); + + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE dxgi_device_QueryResourceResidency(IDXGIDevice* iface, + IUnknown *const *resources, DXGI_RESIDENCY *residency, UINT resource_count) +{ + FIXME("iface %p, resources %p, residency %p, resource_count %u stub!\n", + iface, resources, residency, resource_count); + + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE dxgi_device_SetGPUThreadPriority(IDXGIDevice* iface, INT priority) +{ + FIXME("iface %p, priority %d stub!\n", iface, priority); + + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE dxgi_device_GetGPUThreadPriority(IDXGIDevice* iface, INT *priority) +{ + FIXME("iface %p, priority %p stub!\n", iface, priority); + + return E_NOTIMPL; +} + +const struct IDXGIDeviceVtbl dxgi_device_vtbl = +{ + /* IUnknown methods */ + dxgi_device_QueryInterface, + dxgi_device_AddRef, + dxgi_device_Release, + /* IDXGIObject methods */ + dxgi_device_SetPrivateData, + dxgi_device_SetPrivateDataInterface, + dxgi_device_GetPrivateData, + dxgi_device_GetParent, + /* IDXGIDevice methods */ + dxgi_device_GetAdapter, + dxgi_device_CreateSurface, + dxgi_device_QueryResourceResidency, + dxgi_device_SetGPUThreadPriority, + dxgi_device_GetGPUThreadPriority, +}; diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 0ca3b41..2d6fbc2 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -36,4 +36,12 @@ struct dxgi_factory LONG refcount; }; +/* IDXGIDevice */ +extern const struct IDXGIDeviceVtbl dxgi_device_vtbl; +struct dxgi_device +{ + const struct IDXGIDeviceVtbl *vtbl; + LONG refcount; +}; + #endif /* __WINE_DXGI_PRIVATE_H */

1 0

Juan Lang : crypt32: Add stub for CertEnumPhysicalStore.
by Alexandre Julliard Oct. 23, 2008

Oct. 23, 2008

Module: wine Branch: master Commit: 5aacc1df9f3ea4965f6d9757d62c708902ae776b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5aacc1df9f3ea4965f6d9757d… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 22 13:27:31 2008 -0700 crypt32: Add stub for CertEnumPhysicalStore. --- dlls/crypt32/crypt32.spec | 1 + dlls/crypt32/store.c | 13 +++++++++++++ 2 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index c820612..5c0c9a0 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -35,6 +35,7 @@ @ stdcall CertEnumCTLsInStore(ptr ptr) @ stdcall CertEnumCertificateContextProperties(ptr long) @ stdcall CertEnumCertificatesInStore(long ptr) +@ stdcall CertEnumPhysicalStore(ptr long ptr ptr) @ stdcall CertEnumSystemStore(long ptr ptr ptr) @ stdcall CertFindAttribute(str long ptr) @ stdcall CertFindCRLInStore(long long long long ptr ptr) diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index 391a95e..834cc1d 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -1330,3 +1330,16 @@ BOOL WINAPI CertEnumSystemStore(DWORD dwFlags, void *pvSystemStoreLocationPara, SetLastError(rc); return ret; } + +BOOL WINAPI CertEnumPhysicalStore(const void *pvSystemStore, DWORD dwFlags, + void *pvArg, PFN_CERT_ENUM_PHYSICAL_STORE pfnEnum) +{ + if (dwFlags & CERT_SYSTEM_STORE_RELOCATE_FLAG) + FIXME("(%p, %08x, %p, %p): stub\n", pvSystemStore, dwFlags, pvArg, + pfnEnum); + else + FIXME("(%s, %08x, %p, %p): stub\n", debugstr_w((LPCWSTR)pvSystemStore), + dwFlags, pvArg, + pfnEnum); + return FALSE; +}

1 0

Juan Lang : include: Fix typos.
by Alexandre Julliard Oct. 23, 2008

Oct. 23, 2008

Module: wine Branch: master Commit: 5a36d4892631863f3ad5c673a2e83111d05567da URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a36d4892631863f3ad5c673a… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 22 14:58:59 2008 -0700 include: Fix typos. --- include/wincrypt.h | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/wincrypt.h b/include/wincrypt.h index fa40266..e6ce84a 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -860,10 +860,10 @@ typedef struct _CERT_TRUST_LIST_INFO { #define CERT_TRUST_IS_OFFLINE_REVOCATION 0x01000000 #define CERT_TRUST_NO_ISSUANCE_CHAIN_POLICY 0x02000000 -#define CERT_TRUST_IS_PARTIAL_CHAIN 0x00001000 -#define CERT_TRUST_CTL_IS_NOT_TIME_VALID 0x00002000 -#define CERT_TRUST_CTL_IS_NOT_SIGNATURE_VALID 0x00004000 -#define CERT_TRUST_CTL_IS_NOT_VALID_FOR_USAGE 0x00008000 +#define CERT_TRUST_IS_PARTIAL_CHAIN 0x00010000 +#define CERT_TRUST_CTL_IS_NOT_TIME_VALID 0x00020000 +#define CERT_TRUST_CTL_IS_NOT_SIGNATURE_VALID 0x00040000 +#define CERT_TRUST_CTL_IS_NOT_VALID_FOR_USAGE 0x00080000 #define CERT_TRUST_HAS_EXACT_MATCH_ISSUER 0x00000001 #define CERT_TRUST_HAS_KEY_MATCH_ISSUER 0x00000002

1 0

Henri Verbeet : dxgi: Add the IDXGIDevice interface.
by Alexandre Julliard Oct. 23, 2008

Oct. 23, 2008

Module: wine Branch: master Commit: 5f2b9fafce72e36587f20eb43a824a2d1ec6fad1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f2b9fafce72e36587f20eb43… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 22 17:41:16 2008 +0200 dxgi: Add the IDXGIDevice interface. --- include/dxgi.idl | 40 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 40 insertions(+), 0 deletions(-) diff --git a/include/dxgi.idl b/include/dxgi.idl index 8e5563e..1f0c25e 100644 --- a/include/dxgi.idl +++ b/include/dxgi.idl @@ -38,6 +38,12 @@ typedef enum DXGI_SWAP_EFFECT { DXGI_SWAP_EFFECT_SEQUENTIAL = 1, } DXGI_SWAP_EFFECT; +typedef enum DXGI_RESIDENCY { + DXGI_RESIDENCY_FULLY_RESIDENT = 1, + DXGI_RESIDENCY_RESIDENT_IN_SHARED_MEMORY = 2, + DXGI_RESIDENCY_EVICTED_TO_DISK = 3, +} DXGI_RESIDENCY; + typedef struct DXGI_SURFACE_DESC { UINT Width; UINT Height; @@ -89,6 +95,10 @@ typedef struct DXGI_SWAP_CHAIN_DESC { UINT Flags; } DXGI_SWAP_CHAIN_DESC; +typedef struct DXGI_SHARED_RESOURCE { + HANDLE Handle; +} DXGI_SHARED_RESOURCE; + [ object, local, @@ -294,3 +304,33 @@ interface IDXGIFactory : IDXGIObject } [local] HRESULT CreateDXGIFactory(REFIID riid, void **factory); + +[ + object, + local, + uuid(54ec77fa-1377-44e6-8c32-88fd5f44c84c) +] +interface IDXGIDevice : IDXGIObject +{ + HRESULT GetAdapter( + [out] IDXGIAdapter **adapter + ); + HRESULT CreateSurface( + [in] const DXGI_SURFACE_DESC *desc, + [in] UINT surface_count, + [in] DXGI_USAGE usage, + [in] const DXGI_SHARED_RESOURCE *shared_resource, + [out] IDXGISurface **surface + ); + HRESULT QueryResourceResidency( + [in] IUnknown *const *resources, + [out] DXGI_RESIDENCY *residency, + [in] UINT resource_count + ); + HRESULT SetGPUThreadPriority( + [in] INT priority + ); + HRESULT GetGPUThreadPriority( + [out] INT *priority + ); +}

1 0

Dylan Smith : richedit: Fixed pointer syntax in helper functions for tests.
by Alexandre Julliard Oct. 23, 2008

Oct. 23, 2008

Module: wine Branch: master Commit: 242b1bc1091aa5f81b956327586106ec01264216 URL: http://source.winehq.org/git/wine.git/?a=commit;h=242b1bc1091aa5f81b9563275… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed Oct 22 11:11:06 2008 -0400 richedit: Fixed pointer syntax in helper functions for tests. --- dlls/riched20/tests/editor.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index a6c4a82..72e57c3 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -116,11 +116,11 @@ static BOOL hold_key(int vk) BYTE key_state[256]; BOOL result; - result = GetKeyboardState((LPBYTE)&key_state); + result = GetKeyboardState(key_state); ok(result, "GetKeyboardState failed.\n"); if (!result) return FALSE; key_state[vk] |= 0x80; - result = SetKeyboardState((LPBYTE)&key_state); + result = SetKeyboardState(key_state); ok(result, "SetKeyboardState failed.\n"); return result != 0; } @@ -130,11 +130,11 @@ static BOOL release_key(int vk) BYTE key_state[256]; BOOL result; - result = GetKeyboardState((LPBYTE)&key_state); + result = GetKeyboardState(key_state); ok(result, "GetKeyboardState failed.\n"); if (!result) return FALSE; key_state[vk] &= ~0x80; - result = SetKeyboardState((LPBYTE)&key_state); + result = SetKeyboardState(key_state); ok(result, "SetKeyboardState failed.\n"); return result != 0; }

1 0

Henri Verbeet : dxgi: Fix a typo.
by Alexandre Julliard Oct. 23, 2008

Oct. 23, 2008

Module: wine Branch: master Commit: d756cc73d85d45a62cf62b74b358f4241ce75b71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d756cc73d85d45a62cf62b74b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 22 17:41:16 2008 +0200 dxgi: Fix a typo. --- include/dxgi.idl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/dxgi.idl b/include/dxgi.idl index c1eae50..8e5563e 100644 --- a/include/dxgi.idl +++ b/include/dxgi.idl @@ -251,7 +251,7 @@ interface IDXGISwapChain : IDXGIDeviceSubObject [in] UINT flags ); HRESULT ResizeTarget( - [in] const DXGI_MODE_DESC target_mode_desc + [in] const DXGI_MODE_DESC *target_mode_desc ); HRESULT GetContainingOutput( [out] IDXGIOutput **output

1 0

Aric Stewart : ntdll: Update behavior of ActivationContextBasicInformation.
by Alexandre Julliard Oct. 22, 2008

Oct. 22, 2008

Module: wine Branch: master Commit: 65e677735e24ab79ecd708ce62340f8b9d92fc69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65e677735e24ab79ecd708ce6… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Oct 21 11:36:45 2008 -0500 ntdll: Update behavior of ActivationContextBasicInformation. --- dlls/kernel32/tests/actctx.c | 47 ++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/actctx.c | 12 ++++++++-- 2 files changed, 56 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index 60d1f70..1215ef5 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -851,6 +851,42 @@ static void test_find_string_fail(void) ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetLastError()=%u\n", GetLastError()); } + +static void test_basic_info(HANDLE handle) +{ + ACTIVATION_CONTEXT_BASIC_INFORMATION basic; + SIZE_T size; + BOOL b; + + b = pQueryActCtxW(0, handle, NULL, + ActivationContextBasicInformation, &basic, + sizeof(basic), &size); + + ok (b,"ActivationContextBasicInformation failed\n"); + ok (size == sizeof(ACTIVATION_CONTEXT_BASIC_INFORMATION),"size mismatch\n"); + ok (basic.dwFlags == 0, "unexpected flags %x\n",basic.dwFlags); + ok (basic.hActCtx == handle, "unexpected handle\n"); + + b = pQueryActCtxW(QUERY_ACTCTX_FLAG_USE_ACTIVE_ACTCTX, handle, NULL, + ActivationContextBasicInformation, &basic, + sizeof(basic), &size); + if (handle) + { + ok (!b,"ActivationContextBasicInformation succeeded\n"); + ok (size == 0,"size mismatch\n"); + ok (GetLastError() == ERROR_INVALID_PARAMETER, "Wrong last error\n"); + ok (basic.dwFlags == 0, "unexpected flags %x\n",basic.dwFlags); + ok (basic.hActCtx == handle, "unexpected handle\n"); + } + else + { + ok (b,"ActivationContextBasicInformation failed\n"); + ok (size == sizeof(ACTIVATION_CONTEXT_BASIC_INFORMATION),"size mismatch\n"); + ok (basic.dwFlags == 0, "unexpected flags %x\n",basic.dwFlags); + ok (basic.hActCtx == handle, "unexpected handle\n"); + } +} + static void test_actctx(void) { ULONG_PTR cookie; @@ -865,6 +901,7 @@ static void test_actctx(void) ok(handle == NULL, "handle = %p, expected NULL\n", handle); ok(b, "GetCurrentActCtx failed: %u\n", GetLastError()); if(b) { + test_basic_info(handle); test_detailed_info(handle, &detailed_info0); pReleaseActCtx(handle); } @@ -879,6 +916,7 @@ static void test_actctx(void) handle = test_create("test1.manifest", manifest1); DeleteFileA("test1.manifest"); if(handle != INVALID_HANDLE_VALUE) { + test_basic_info(handle); test_detailed_info(handle, &detailed_info1); test_info_in_assembly(handle, 1, &manifest1_info); @@ -904,6 +942,7 @@ static void test_actctx(void) DeleteFileA("test2.manifest"); DeleteFileA("testdep.manifest"); if(handle != INVALID_HANDLE_VALUE) { + test_basic_info(handle); test_detailed_info(handle, &detailed_info2); test_info_in_assembly(handle, 1, &manifest2_info); test_info_in_assembly(handle, 2, &depmanifest1_info); @@ -921,6 +960,7 @@ static void test_actctx(void) DeleteFileA("test3.manifest"); DeleteFileA("testdep.manifest"); if(handle != INVALID_HANDLE_VALUE) { + test_basic_info(handle); test_detailed_info(handle, &detailed_info2); test_info_in_assembly(handle, 1, &manifest2_info); test_info_in_assembly(handle, 2, &depmanifest2_info); @@ -948,6 +988,7 @@ static void test_actctx(void) DeleteFileA("test2-3.manifest"); DeleteFileA("testdep.manifest"); if(handle != INVALID_HANDLE_VALUE) { + test_basic_info(handle); test_detailed_info(handle, &detailed_info2); test_info_in_assembly(handle, 1, &manifest2_info); test_info_in_assembly(handle, 2, &depmanifest3_info); @@ -976,6 +1017,7 @@ static void test_actctx(void) handle = test_create("test3.manifest", manifest3); DeleteFileA("test3.manifest"); if(handle != INVALID_HANDLE_VALUE) { + test_basic_info(handle); test_detailed_info(handle, &detailed_info1); test_info_in_assembly(handle, 1, &manifest3_info); test_file_info(handle, 0, 0, testlib_dll); @@ -1002,6 +1044,7 @@ static void test_actctx(void) DeleteFileA("test4.manifest"); DeleteFileA("testdep.manifest"); if(handle != INVALID_HANDLE_VALUE) { + test_basic_info(handle); test_detailed_info(handle, &detailed_info2); test_info_in_assembly(handle, 1, &manifest4_info); test_info_in_assembly(handle, 2, &manifest_comctrl_info); @@ -1020,6 +1063,7 @@ static void test_actctx(void) handle = test_create("..\\test1.manifest", manifest1); DeleteFileA("..\\test1.manifest"); if(handle != INVALID_HANDLE_VALUE) { + test_basic_info(handle); test_detailed_info(handle, &detailed_info1); test_info_in_assembly(handle, 1, &manifest1_info); pReleaseActCtx(handle); @@ -1039,6 +1083,7 @@ static void test_actctx(void) handle = test_create("test1.manifest", manifest1); DeleteFileA("test1.manifest"); if (handle != INVALID_HANDLE_VALUE) { + test_basic_info(handle); test_detailed_info(handle, &detailed_info1); test_info_in_assembly(handle, 1, &manifest1_info); pReleaseActCtx(handle); @@ -1053,6 +1098,7 @@ static void test_actctx(void) handle = test_create("test1.manifest", manifest1); DeleteFileA("test1.manifest"); if (handle != INVALID_HANDLE_VALUE) { + test_basic_info(handle); test_detailed_info(handle, &detailed_info1); test_info_in_assembly(handle, 1, &manifest1_info); pReleaseActCtx(handle); @@ -1071,6 +1117,7 @@ static void test_app_manifest(void) ok(handle == NULL, "handle != NULL\n"); ok(b, "GetCurrentActCtx failed: %u\n", GetLastError()); if(b) { + test_basic_info(handle); test_detailed_info(handle, &detailed_info1_child); test_info_in_assembly(handle, 1, &manifest1_child_info); pReleaseActCtx(handle); diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 80e9e03..f1f9ad7 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -2028,12 +2028,14 @@ static NTSTATUS parse_depend_manifests(struct actctx_loader* acl) } /* find the appropriate activation context for RtlQueryInformationActivationContext */ -static NTSTATUS find_query_actctx( HANDLE *handle, DWORD flags ) +static NTSTATUS find_query_actctx( HANDLE *handle, DWORD flags, ULONG class ) { NTSTATUS status = STATUS_SUCCESS; if (flags & QUERY_ACTCTX_FLAG_USE_ACTIVE_ACTCTX) { + if (*handle) return STATUS_INVALID_PARAMETER; + if (NtCurrentTeb()->ActivationContextStack.ActiveFrame) *handle = NtCurrentTeb()->ActivationContextStack.ActiveFrame->ActivationContext; } @@ -2042,6 +2044,8 @@ static NTSTATUS find_query_actctx( HANDLE *handle, DWORD flags ) ULONG magic; LDR_MODULE *pldr; + if (!*handle) return STATUS_INVALID_PARAMETER; + LdrLockLoaderLock( 0, NULL, &magic ); if (!LdrFindEntryForAddress( *handle, &pldr )) { @@ -2053,7 +2057,8 @@ static NTSTATUS find_query_actctx( HANDLE *handle, DWORD flags ) else status = STATUS_DLL_NOT_FOUND; LdrUnlockLoaderLock( 0, magic ); } - else if (!*handle) *handle = process_actctx; + else if (!*handle && (class != ActivationContextBasicInformation)) + *handle = process_actctx; return status; } @@ -2430,7 +2435,8 @@ NTSTATUS WINAPI RtlQueryInformationActivationContext( ULONG flags, HANDLE handle TRACE("%08x %p %p %u %p %ld %p\n", flags, handle, subinst, class, buffer, bufsize, retlen); - if ((status = find_query_actctx( &handle, flags ))) return status; + if (retlen) *retlen = 0; + if ((status = find_query_actctx( &handle, flags, class ))) return status; switch (class) {

1 0

Hans Leidekker : wldap32: Skip tests when the server can't be reached.
by Alexandre Julliard Oct. 22, 2008

Oct. 22, 2008

Module: wine Branch: master Commit: 0c82af8a278588526bac7d65777220a5b8a3722b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c82af8a278588526bac7d657… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 22 13:27:00 2008 +0200 wldap32: Skip tests when the server can't be reached. --- dlls/wldap32/tests/parse.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wldap32/tests/parse.c b/dlls/wldap32/tests/parse.c index ade3061..22390a5 100644 --- a/dlls/wldap32/tests/parse.c +++ b/dlls/wldap32/tests/parse.c @@ -48,12 +48,13 @@ static void test_ldap_parse_sort_control( LDAP *ld ) timeout.tv_sec = 20; timeout.tv_usec = 0; ret = ldap_search_ext_sA( ld, (char *)"", LDAP_SCOPE_ONELEVEL, (char *)"(ou=*)", NULL, 0, ctrls, NULL, &timeout, 10, &res ); - ok( !ret, "ldap_search_ext_sA failed 0x%x\n", ret ); - if (ret) + if (ret == LDAP_SERVER_DOWN) { + skip("test server can't be reached\n"); ldap_control_free( sort ); return; } + ok( !ret, "ldap_search_ext_sA failed 0x%x\n", ret ); ok( res != NULL, "expected res != NULL\n" ); ret = ldap_parse_resultA( NULL, res, &result, NULL, NULL, NULL, &server_ctrls, 1 );

1 0

Ricardo Filipe : mshtml: Added Portuguese translation.
by Alexandre Julliard Oct. 22, 2008

Oct. 22, 2008

Module: wine Branch: master Commit: f6fe073bcf48ec2ee775f96accaebd831856e0cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6fe073bcf48ec2ee775f96ac… Author: Ricardo Filipe <ricardo_barbano(a)hotmail.com> Date: Tue Oct 21 02:27:46 2008 -0700 mshtml: Added Portuguese translation. --- dlls/mshtml/Pt.rc | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/rsrc.rc | 1 + 2 files changed, 56 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/Pt.rc b/dlls/mshtml/Pt.rc new file mode 100644 index 0000000..fae6d18 --- /dev/null +++ b/dlls/mshtml/Pt.rc @@ -0,0 +1,55 @@ +/* + * Copyright 2008 Ricardo Filipe + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + + +LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +{ + IDS_HTMLDISABLED "A interpreta��o de HTML est� desactivada." + IDS_HTMLDOCUMENT "Documento HTML" + IDS_DOWNLOADING "Descarregando..." + IDS_INSTALLING "Instalando..." +} + +ID_DWL_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 260, 85 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Instalador Wine Gecko" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Esta aplica��o est� a tentar mostrar uma p�gina HTML. O Wine precisa que o Gecko " \ + "(Motor HTML Mozilla) seja instalado para mostrar a p�gina. Clique em Instalar se deseja que o Wine " \ + "descarregue e instale o Gecko automaticamente.", ID_DWL_STATUS, 10, 10, 240, 30, SS_LEFT + CONTROL "Progresso", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 40, 240, 12 + DEFPUSHBUTTON "&Instalar", ID_DWL_INSTALL, 200, 60, 50, 15, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Cancelar", IDCANCEL, 140, 60, 50, 15, WS_GROUP | WS_TABSTOP +} + +IDD_HYPERLINK DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 250, 65 +STYLE DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Hiperliga��o" +FONT 8, "MS Shell Dlg" +{ + GROUPBOX "Informa��o da Hiperliga��o", IDC_STATIC, 5, 5, 190, 55 + LTEXT "&Tipo:", IDC_STATIC, 10, 22, 20, 10 + COMBOBOX IDC_TYPE, 35, 20, 45, 100, WS_TABSTOP | WS_GROUP | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_HASSTRINGS + LTEXT "&URL:", IDC_STATIC, 10, 42, 20, 10 + EDITTEXT IDC_URL, 35, 40, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 200, 10, 45, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Cancelar", IDCANCEL, 200, 28, 45, 14, WS_GROUP | WS_TABSTOP +} diff --git a/dlls/mshtml/rsrc.rc b/dlls/mshtml/rsrc.rc index b932fb9..17c0233 100644 --- a/dlls/mshtml/rsrc.rc +++ b/dlls/mshtml/rsrc.rc @@ -46,6 +46,7 @@ #include "Nl.rc" #include "No.rc" #include "Pl.rc" +#include "Pt.rc" #include "Ru.rc" #include "Si.rc" #include "Sv.rc"

1 0

Ricardo Filipe : iccvid: Added Portuguese translation.
by Alexandre Julliard Oct. 22, 2008

Oct. 22, 2008

Module: wine Branch: master Commit: ffc09241184dc9a162ed223a27579fb79b2cfefa URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffc09241184dc9a162ed223a2… Author: Ricardo Filipe <ricardo_barbano(a)hotmail.com> Date: Tue Oct 21 03:05:11 2008 -0700 iccvid: Added Portuguese translation. --- dlls/iccvid/iccvid_Pt.rc | 25 +++++++++++++++++++++++++ dlls/iccvid/rsrc.rc | 1 + 2 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/iccvid/iccvid_Pt.rc b/dlls/iccvid/iccvid_Pt.rc new file mode 100644 index 0000000..5e4ad5c --- /dev/null +++ b/dlls/iccvid/iccvid_Pt.rc @@ -0,0 +1,25 @@ +/* + * Copyright 2008 Ricardo Filipe + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +{ + IDS_NAME "Codec Video Cinepak" + IDS_DESCRIPTION "Codec Video Cinepak" +} diff --git a/dlls/iccvid/rsrc.rc b/dlls/iccvid/rsrc.rc index c45fb82..e751220 100644 --- a/dlls/iccvid/rsrc.rc +++ b/dlls/iccvid/rsrc.rc @@ -28,6 +28,7 @@ #include "iccvid_Nl.rc" #include "iccvid_No.rc" #include "iccvid_Pl.rc" +#include "iccvid_Pt.rc" #include "iccvid_Ro.rc" #include "iccvid_Ru.rc" #include "iccvid_Si.rc"

1 0