January 2013 - Wine-Commits

Hans Leidekker : msi: Extend registry helpers to support opening the features key for a specific user .
by Alexandre Julliard Jan. 9, 2013

Jan. 9, 2013

Module: wine Branch: master Commit: 6488a6a5e4e70f00a988d951e6877a576d07ce20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6488a6a5e4e70f00a988d951e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 9 11:43:48 2013 +0100 msi: Extend registry helpers to support opening the features key for a specific user. --- dlls/msi/action.c | 8 ++++---- dlls/msi/msi.c | 10 +++++----- dlls/msi/msipriv.h | 4 ++-- dlls/msi/registry.c | 36 ++++++++++++++++++++++-------------- 4 files changed, 33 insertions(+), 25 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index babf0f0..22fa388 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -4852,12 +4852,12 @@ static UINT ACTION_PublishFeatures(MSIPACKAGE *package) if (!msi_check_publish(package)) return ERROR_SUCCESS; - rc = MSIREG_OpenFeaturesKey(package->ProductCode, package->Context, + rc = MSIREG_OpenFeaturesKey(package->ProductCode, NULL, package->Context, &hkey, TRUE); if (rc != ERROR_SUCCESS) goto end; - rc = MSIREG_OpenUserDataFeaturesKey(package->ProductCode, package->Context, + rc = MSIREG_OpenUserDataFeaturesKey(package->ProductCode, NULL, package->Context, &userdata, TRUE); if (rc != ERROR_SUCCESS) goto end; @@ -4957,7 +4957,7 @@ static UINT msi_unpublish_feature(MSIPACKAGE *package, MSIFEATURE *feature) TRACE("unpublishing feature %s\n", debugstr_w(feature->Feature)); - r = MSIREG_OpenFeaturesKey(package->ProductCode, package->Context, + r = MSIREG_OpenFeaturesKey(package->ProductCode, NULL, package->Context, &hkey, FALSE); if (r == ERROR_SUCCESS) { @@ -4965,7 +4965,7 @@ static UINT msi_unpublish_feature(MSIPACKAGE *package, MSIFEATURE *feature) RegCloseKey(hkey); } - r = MSIREG_OpenUserDataFeaturesKey(package->ProductCode, package->Context, + r = MSIREG_OpenUserDataFeaturesKey(package->ProductCode, NULL, package->Context, &hkey, FALSE); if (r == ERROR_SUCCESS) { diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 92ef52c..0e57f09 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -2982,12 +2982,12 @@ INSTALLSTATE WINAPI MsiQueryFeatureStateW(LPCWSTR szProduct, LPCWSTR szFeature) SetLastError( ERROR_SUCCESS ); - if (MSIREG_OpenFeaturesKey(szProduct, MSIINSTALLCONTEXT_USERMANAGED, + if (MSIREG_OpenFeaturesKey(szProduct, NULL, MSIINSTALLCONTEXT_USERMANAGED, &hkey, FALSE) != ERROR_SUCCESS && - MSIREG_OpenFeaturesKey(szProduct, MSIINSTALLCONTEXT_USERUNMANAGED, + MSIREG_OpenFeaturesKey(szProduct, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, &hkey, FALSE) != ERROR_SUCCESS) { - rc = MSIREG_OpenFeaturesKey(szProduct, MSIINSTALLCONTEXT_MACHINE, + rc = MSIREG_OpenFeaturesKey(szProduct, NULL, MSIINSTALLCONTEXT_MACHINE, &hkey, FALSE); if (rc != ERROR_SUCCESS) return INSTALLSTATE_UNKNOWN; @@ -3007,11 +3007,11 @@ INSTALLSTATE WINAPI MsiQueryFeatureStateW(LPCWSTR szProduct, LPCWSTR szFeature) return r; if (machine) - rc = MSIREG_OpenUserDataFeaturesKey(szProduct, + rc = MSIREG_OpenUserDataFeaturesKey(szProduct, NULL, MSIINSTALLCONTEXT_MACHINE, &hkey, FALSE); else - rc = MSIREG_OpenUserDataFeaturesKey(szProduct, + rc = MSIREG_OpenUserDataFeaturesKey(szProduct, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, &hkey, FALSE); diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index c7a42cb..a3e1e0d 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -885,10 +885,10 @@ extern UINT MSIREG_OpenUninstallKey(const WCHAR *, enum platform, HKEY *, BOOL) extern UINT MSIREG_DeleteUninstallKey(const WCHAR *, enum platform) DECLSPEC_HIDDEN; extern UINT MSIREG_OpenProductKey(LPCWSTR szProduct, LPCWSTR szUserSid, MSIINSTALLCONTEXT context, HKEY* key, BOOL create) DECLSPEC_HIDDEN; -extern UINT MSIREG_OpenFeaturesKey(LPCWSTR szProduct, MSIINSTALLCONTEXT context, +extern UINT MSIREG_OpenFeaturesKey(LPCWSTR szProduct, LPCWSTR szUserSid, MSIINSTALLCONTEXT context, HKEY *key, BOOL create) DECLSPEC_HIDDEN; extern UINT MSIREG_OpenUserPatchesKey(LPCWSTR szPatch, HKEY* key, BOOL create) DECLSPEC_HIDDEN; -UINT MSIREG_OpenUserDataFeaturesKey(LPCWSTR szProduct, MSIINSTALLCONTEXT context, +UINT MSIREG_OpenUserDataFeaturesKey(LPCWSTR szProduct, LPCWSTR szUserSid, MSIINSTALLCONTEXT context, HKEY *key, BOOL create) DECLSPEC_HIDDEN; extern UINT MSIREG_OpenUserComponentsKey(LPCWSTR szComponent, HKEY* key, BOOL create) DECLSPEC_HIDDEN; extern UINT MSIREG_OpenUserDataComponentKey(LPCWSTR szComponent, LPCWSTR szUserSid, diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index 388c077..bb564d8 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -562,12 +562,12 @@ UINT MSIREG_OpenUserPatchesKey(LPCWSTR szPatch, HKEY *key, BOOL create) return RegOpenKeyW(HKEY_CURRENT_USER, keypath, key); } -UINT MSIREG_OpenFeaturesKey(LPCWSTR szProduct, MSIINSTALLCONTEXT context, HKEY *key, BOOL create) +UINT MSIREG_OpenFeaturesKey(LPCWSTR szProduct, LPCWSTR szUserSid, MSIINSTALLCONTEXT context, + HKEY *key, BOOL create) { - LPWSTR usersid; HKEY root = HKEY_LOCAL_MACHINE; REGSAM access = KEY_WOW64_64KEY | KEY_ALL_ACCESS; - WCHAR squished_pc[GUID_SIZE], keypath[MAX_PATH]; + WCHAR squished_pc[GUID_SIZE], keypath[MAX_PATH], *usersid = NULL; if (!squash_guid(szProduct, squished_pc)) return ERROR_FUNCTION_FAILED; TRACE("%s squished %s\n", debugstr_w(szProduct), debugstr_w(squished_pc)); @@ -585,12 +585,16 @@ UINT MSIREG_OpenFeaturesKey(LPCWSTR szProduct, MSIINSTALLCONTEXT context, HKEY * } else { - if (!(usersid = get_user_sid())) + if (!szUserSid) { - ERR("Failed to retrieve user SID\n"); - return ERROR_FUNCTION_FAILED; + if (!(usersid = get_user_sid())) + { + ERR("Failed to retrieve user SID\n"); + return ERROR_FUNCTION_FAILED; + } + szUserSid = usersid; } - sprintfW(keypath, szInstaller_LocalManagedFeat_fmt, usersid, squished_pc); + sprintfW(keypath, szInstaller_LocalManagedFeat_fmt, szUserSid, squished_pc); LocalFree(usersid); } if (create) return RegCreateKeyExW(root, keypath, 0, NULL, 0, access, NULL, key, NULL); @@ -624,11 +628,11 @@ static UINT MSIREG_OpenInstallerFeaturesKey(LPCWSTR szProduct, HKEY *key, BOOL c return RegOpenKeyExW(HKEY_LOCAL_MACHINE, keypath, 0, access, key); } -UINT MSIREG_OpenUserDataFeaturesKey(LPCWSTR szProduct, MSIINSTALLCONTEXT context, HKEY *key, BOOL create) +UINT MSIREG_OpenUserDataFeaturesKey(LPCWSTR szProduct, LPCWSTR szUserSid, MSIINSTALLCONTEXT context, + HKEY *key, BOOL create) { - LPWSTR usersid; REGSAM access = KEY_WOW64_64KEY | KEY_ALL_ACCESS; - WCHAR squished_pc[GUID_SIZE], keypath[0x200]; + WCHAR squished_pc[GUID_SIZE], keypath[0x200], *usersid = NULL; if (!squash_guid(szProduct, squished_pc)) return ERROR_FUNCTION_FAILED; TRACE("%s squished %s\n", debugstr_w(szProduct), debugstr_w(squished_pc)); @@ -639,12 +643,16 @@ UINT MSIREG_OpenUserDataFeaturesKey(LPCWSTR szProduct, MSIINSTALLCONTEXT context } else { - if (!(usersid = get_user_sid())) + if (!szUserSid) { - ERR("Failed to retrieve user SID\n"); - return ERROR_FUNCTION_FAILED; + if (!(usersid = get_user_sid())) + { + ERR("Failed to retrieve user SID\n"); + return ERROR_FUNCTION_FAILED; + } + szUserSid = usersid; } - sprintfW(keypath, szUserDataFeatures_fmt, usersid, squished_pc); + sprintfW(keypath, szUserDataFeatures_fmt, szUserSid, squished_pc); LocalFree(usersid); } if (create) return RegCreateKeyExW(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, key, NULL);

1 0

Marcus Meissner : comctl32: Avoid leak of hShell32 (Coverity).
by Alexandre Julliard Jan. 9, 2013

Jan. 9, 2013

Module: wine Branch: master Commit: d8d83d2eb3401db0d5be0a188cba3e145e95fb6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8d83d2eb3401db0d5be0a188… Author: Marcus Meissner <meissner(a)suse.de> Date: Wed Jan 9 02:42:13 2013 +0100 comctl32: Avoid leak of hShell32 (Coverity). --- dlls/comctl32/tests/imagelist.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index f2da3c2..19d2437 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -1160,6 +1160,7 @@ static void test_shell_imagelist(void) if (!pSHGetImageList) { win_skip("SHGetImageList not available, skipping test\n"); + FreeLibrary(hShell32); return; } @@ -1168,8 +1169,10 @@ static void test_shell_imagelist(void) ok(SUCCEEDED(hr), "SHGetImageList failed, hr=%x\n", hr); - if (hr != S_OK) + if (hr != S_OK) { + FreeLibrary(hShell32); return; + } IImageList_GetImageCount(iml, &out); ok(out > 0, "IImageList_GetImageCount returned out <= 0\n");

1 0

Henri Verbeet : ddraw: Avoid LPD3DMATERIAL7.
by Alexandre Julliard Jan. 9, 2013

Jan. 9, 2013

Module: wine Branch: master Commit: 06796a639d25f0c7807c6d67a30267ad03e4efb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06796a639d25f0c7807c6d67a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 9 11:27:14 2013 +0100 ddraw: Avoid LPD3DMATERIAL7. --- include/d3d.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/d3d.h b/include/d3d.h index 9e4ccf2..ba860a4 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -1309,8 +1309,8 @@ DECLARE_INTERFACE_(IDirect3DDevice7,IUnknown) STDMETHOD(SetViewport)(THIS_ D3DVIEWPORT7 *data) PURE; STDMETHOD(MultiplyTransform)(THIS_ D3DTRANSFORMSTATETYPE state, D3DMATRIX *matrix) PURE; STDMETHOD(GetViewport)(THIS_ D3DVIEWPORT7 *data) PURE; - STDMETHOD(SetMaterial)(THIS_ LPD3DMATERIAL7 lpMat) PURE; - STDMETHOD(GetMaterial)(THIS_ LPD3DMATERIAL7 lpMat) PURE; + STDMETHOD(SetMaterial)(THIS_ D3DMATERIAL7 *data) PURE; + STDMETHOD(GetMaterial)(THIS_ D3DMATERIAL7 *data) PURE; STDMETHOD(SetLight)(THIS_ DWORD dwLightIndex,LPD3DLIGHT7 lpLight) PURE; STDMETHOD(GetLight)(THIS_ DWORD dwLightIndex,LPD3DLIGHT7 lpLight) PURE; STDMETHOD(SetRenderState)(THIS_ D3DRENDERSTATETYPE dwRenderStateType, DWORD dwRenderState) PURE;

1 0

Henri Verbeet : d3d8/tests: Merge buffer.c into device.c.
by Alexandre Julliard Jan. 9, 2013

Jan. 9, 2013

Module: wine Branch: master Commit: 19cb2e21a34830decae47b6090b6c4809bae4dd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19cb2e21a34830decae47b609… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 9 11:27:15 2013 +0100 d3d8/tests: Merge buffer.c into device.c. --- dlls/d3d8/tests/Makefile.in | 1 - dlls/d3d8/tests/buffer.c | 136 ------------------------------------------- dlls/d3d8/tests/device.c | 69 ++++++++++++++++++++++ 3 files changed, 69 insertions(+), 137 deletions(-) diff --git a/dlls/d3d8/tests/Makefile.in b/dlls/d3d8/tests/Makefile.in index def2c04..976e2ba 100644 --- a/dlls/d3d8/tests/Makefile.in +++ b/dlls/d3d8/tests/Makefile.in @@ -2,7 +2,6 @@ TESTDLL = d3d8.dll IMPORTS = user32 C_SRCS = \ - buffer.c \ device.c \ stateblock.c \ surface.c \ diff --git a/dlls/d3d8/tests/buffer.c b/dlls/d3d8/tests/buffer.c deleted file mode 100644 index a4082c5..0000000 --- a/dlls/d3d8/tests/buffer.c +++ /dev/null @@ -1,136 +0,0 @@ -/* - * Copyright (C) 2010 Stefan Dösinger(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 - */ - -#define COBJMACROS -#include <d3d8.h> -#include "wine/test.h" - -static HWND create_window(void) -{ - WNDCLASS wc = {0}; - wc.lpfnWndProc = DefWindowProc; - wc.lpszClassName = "d3d8_test_wc"; - RegisterClass(&wc); - - return CreateWindow("d3d8_test_wc", "d3d8_test", - 0, 0, 0, 0, 0, 0, 0, 0, 0); -} - -static IDirect3DDevice8 *init_d3d8(HMODULE d3d8_handle) -{ - IDirect3D8 * (__stdcall * d3d8_create)(UINT SDKVersion) = 0; - IDirect3D8 *d3d8_ptr = 0; - IDirect3DDevice8 *device_ptr = 0; - D3DPRESENT_PARAMETERS present_parameters; - D3DDISPLAYMODE d3ddm; - HRESULT hr; - - d3d8_create = (void *)GetProcAddress(d3d8_handle, "Direct3DCreate8"); - ok(d3d8_create != NULL, "Failed to get address of Direct3DCreate8\n"); - if (!d3d8_create) return NULL; - - d3d8_ptr = d3d8_create(D3D_SDK_VERSION); - if (!d3d8_ptr) - { - skip("could not create D3D8\n"); - return NULL; - } - - IDirect3D8_GetAdapterDisplayMode(d3d8_ptr, D3DADAPTER_DEFAULT, &d3ddm ); - ZeroMemory(&present_parameters, sizeof(present_parameters)); - present_parameters.Windowed = TRUE; - present_parameters.hDeviceWindow = create_window(); - present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; - present_parameters.BackBufferFormat = d3ddm.Format; - - hr = IDirect3D8_CreateDevice(d3d8_ptr, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, NULL, D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device_ptr); - - if(FAILED(hr)) - { - skip("could not create device, IDirect3D8_CreateDevice returned %#x\n", hr); - return NULL; - } - - return device_ptr; -} - -static void lock_flag_test(IDirect3DDevice8 *device) -{ - HRESULT hr; - IDirect3DVertexBuffer8 *buffer; - unsigned int i; - BYTE *data; - const struct - { - DWORD flags; - const char *debug_string; - HRESULT result; - } - test_data[] = - { - {D3DLOCK_READONLY, "D3DLOCK_READONLY", D3D_OK }, - {D3DLOCK_DISCARD, "D3DLOCK_DISCARD", D3D_OK }, - {D3DLOCK_NOOVERWRITE, "D3DLOCK_NOOVERWRITE", D3D_OK }, - {D3DLOCK_NOOVERWRITE | D3DLOCK_DISCARD, "D3DLOCK_NOOVERWRITE | D3DLOCK_DISCARD", D3D_OK }, - {D3DLOCK_NOOVERWRITE | D3DLOCK_READONLY, "D3DLOCK_NOOVERWRITE | D3DLOCK_READONLY", D3D_OK }, - {D3DLOCK_READONLY | D3DLOCK_DISCARD, "D3DLOCK_READONLY | D3DLOCK_DISCARD", D3D_OK }, - /* Completely bogous flags aren't an error */ - {0xdeadbeef, "0xdeadbeef", D3D_OK }, - }; - - hr = IDirect3DDevice8_CreateVertexBuffer(device, 1024, D3DUSAGE_DYNAMIC, 0, D3DPOOL_DEFAULT, &buffer); - ok(hr == D3D_OK, "IDirect3DDevice8_CreateBuffer failed, 0x%08x\n", hr); - - for(i = 0; i < (sizeof(test_data) / sizeof(*test_data)); i++) - { - hr = IDirect3DVertexBuffer8_Lock(buffer, 0, 0, &data, test_data[i].flags); - ok(hr == test_data[i].result, "Lock flags %s returned 0x%08x, expected 0x%08x\n", - test_data[i].debug_string, hr, test_data[i].result); - - if(SUCCEEDED(hr)) - { - ok(data != NULL, "The data pointer returned by Lock is NULL\n"); - hr = IDirect3DVertexBuffer8_Unlock(buffer); - ok(hr == D3D_OK, "IDirect3DVertexBuffer8_Unlock failed, 0x%08x\n", hr); - } - } - - IDirect3DVertexBuffer8_Release(buffer); -} - -START_TEST(buffer) -{ - IDirect3DDevice8 *device_ptr; - ULONG refcount; - HMODULE d3d8_handle = 0; - - d3d8_handle = LoadLibraryA("d3d8.dll"); - if (!d3d8_handle) - { - skip("Could not load d3d8.dll\n"); - return; - } - - device_ptr = init_d3d8(d3d8_handle); - if (!device_ptr) return; - - lock_flag_test(device_ptr); - - refcount = IDirect3DDevice8_Release(device_ptr); - ok(!refcount, "Device has %u references left\n", refcount); -} diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index e20c883..f85d577 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -3,6 +3,7 @@ * Copyright (C) 2006 Chris Robinson * Copyright (C) 2006 Louis Lenders * Copyright 2006 Henri Verbeet + * Copyright 2010 Stefan Dösinger for CodeWeavers * Copyright 2013 Henri Verbeet for CodeWeavers * * This library is free software; you can redistribute it and/or @@ -3553,6 +3554,73 @@ static void test_volume_get_container(void) DestroyWindow(window); } +static void test_vb_lock_flags(void) +{ + static const struct + { + DWORD flags; + const char *debug_string; + HRESULT result; + } + test_data[] = + { + {D3DLOCK_READONLY, "D3DLOCK_READONLY", D3D_OK }, + {D3DLOCK_DISCARD, "D3DLOCK_DISCARD", D3D_OK }, + {D3DLOCK_NOOVERWRITE, "D3DLOCK_NOOVERWRITE", D3D_OK }, + {D3DLOCK_NOOVERWRITE | D3DLOCK_DISCARD, "D3DLOCK_NOOVERWRITE | D3DLOCK_DISCARD", D3D_OK }, + {D3DLOCK_NOOVERWRITE | D3DLOCK_READONLY, "D3DLOCK_NOOVERWRITE | D3DLOCK_READONLY", D3D_OK }, + {D3DLOCK_READONLY | D3DLOCK_DISCARD, "D3DLOCK_READONLY | D3DLOCK_DISCARD", D3D_OK }, + /* Completely bogus flags aren't an error. */ + {0xdeadbeef, "0xdeadbeef", D3D_OK }, + }; + IDirect3DVertexBuffer8 *buffer; + IDirect3DDevice8 *device; + IDirect3D8 *d3d8; + unsigned int i; + ULONG refcount; + HWND window; + HRESULT hr; + BYTE *data; + + if (!(d3d8 = pDirect3DCreate8(D3D_SDK_VERSION))) + { + skip("Failed to create d3d8 object, skipping tests.\n"); + return; + } + + window = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + if (!(device = create_device(d3d8, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + IDirect3D8_Release(d3d8); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice8_CreateVertexBuffer(device, 1024, D3DUSAGE_DYNAMIC, 0, D3DPOOL_DEFAULT, &buffer); + ok(SUCCEEDED(hr), "Failed to create vertex buffer, hr %#x.\n", hr); + + for (i = 0; i < (sizeof(test_data) / sizeof(*test_data)); ++i) + { + hr = IDirect3DVertexBuffer8_Lock(buffer, 0, 0, &data, test_data[i].flags); + ok(hr == test_data[i].result, "Got unexpected hr %#x for %s.\n", + hr, test_data[i].debug_string); + if (SUCCEEDED(hr)) + { + ok(!!data, "Got unexpected data %p.\n", data); + hr = IDirect3DVertexBuffer8_Unlock(buffer); + ok(SUCCEEDED(hr), "Failed to unlock vertex buffer, hr %#x.\n", hr); + } + } + + IDirect3DVertexBuffer8_Release(buffer); + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D8_Release(d3d8); + DestroyWindow(window); +} + START_TEST(device) { HMODULE d3d8_handle = LoadLibraryA( "d3d8.dll" ); @@ -3615,6 +3683,7 @@ START_TEST(device) test_validate_vs(); test_validate_ps(); test_volume_get_container(); + test_vb_lock_flags(); } UnregisterClassA("d3d8_test_wc", GetModuleHandleA(NULL)); }

1 0

Alexandre Julliard : winedevice: Retrieve the page size from ntdll.
by Alexandre Julliard Jan. 9, 2013

Jan. 9, 2013

Module: wine Branch: master Commit: 58176bba105c4e9af54f0ea9ef13fe06ce886819 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58176bba105c4e9af54f0ea9e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 8 22:01:48 2013 +0100 winedevice: Retrieve the page size from ntdll. --- programs/winedevice/device.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/programs/winedevice/device.c b/programs/winedevice/device.c index e48218e..72bc124 100644 --- a/programs/winedevice/device.c +++ b/programs/winedevice/device.c @@ -66,7 +66,7 @@ static HMODULE load_driver_module( const WCHAR *name ) { IMAGE_NT_HEADERS *nt; const IMAGE_IMPORT_DESCRIPTOR *imports; - size_t page_size = getpagesize(); + SYSTEM_BASIC_INFORMATION info; int i; INT_PTR delta; ULONG size; @@ -80,7 +80,8 @@ static HMODULE load_driver_module( const WCHAR *name ) /* the loader does not apply relocations to non page-aligned binaries or executables, * we have to do it ourselves */ - if (nt->OptionalHeader.SectionAlignment < page_size || + NtQuerySystemInformation( SystemBasicInformation, &info, sizeof(info), NULL ); + if (nt->OptionalHeader.SectionAlignment < info.PageSize || !(nt->FileHeader.Characteristics & IMAGE_FILE_DLL)) { DWORD old; @@ -94,10 +95,10 @@ static HMODULE load_driver_module( const WCHAR *name ) while (rel < end && rel->SizeOfBlock) { void *page = (char *)module + rel->VirtualAddress; - VirtualProtect( page, page_size, PAGE_EXECUTE_READWRITE, &old ); + VirtualProtect( page, info.PageSize, PAGE_EXECUTE_READWRITE, &old ); rel = LdrProcessRelocationBlock( page, (rel->SizeOfBlock - sizeof(*rel)) / sizeof(USHORT), (USHORT *)(rel + 1), delta ); - if (old != PAGE_EXECUTE_READWRITE) VirtualProtect( page, page_size, old, NULL ); + if (old != PAGE_EXECUTE_READWRITE) VirtualProtect( page, info.PageSize, old, NULL ); if (!rel) goto error; } /* make sure we don't try again */

1 0

Alexandre Julliard : dbghelp: Use sysconf() instead of getpagesize().
by Alexandre Julliard Jan. 9, 2013

Jan. 9, 2013

Module: wine Branch: master Commit: a81996d757a484cb4f3a41651b1ececb3889dfc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a81996d757a484cb4f3a41651… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 8 22:01:40 2013 +0100 dbghelp: Use sysconf() instead of getpagesize(). --- dlls/dbghelp/elf_module.c | 16 ++++++---------- dlls/dbghelp/macho_module.c | 4 ++-- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 92b4a31..874835d 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -102,9 +102,7 @@ struct elf_module_info const char* elf_map_section(struct image_section_map* ism) { struct elf_file_map* fmap = &ism->fmap->u.elf; - - unsigned long pgsz = getpagesize(); - unsigned long ofst, size; + size_t ofst, size, pgsz = sysconf( _SC_PAGESIZE ); assert(ism->fmap->modtype == DMT_ELF); if (ism->sidx < 0 || ism->sidx >= ism->fmap->u.elf.elfhdr.e_shnum || @@ -174,12 +172,10 @@ void elf_unmap_section(struct image_section_map* ism) if (ism->sidx >= 0 && ism->sidx < fmap->elfhdr.e_shnum && !fmap->target_copy && fmap->sect[ism->sidx].mapped != IMAGE_NO_MAP) { - unsigned long pgsz = getpagesize(); - unsigned long ofst, size; - - ofst = fmap->sect[ism->sidx].shdr.sh_offset & ~(pgsz - 1); - size = ((fmap->sect[ism->sidx].shdr.sh_offset + - fmap->sect[ism->sidx].shdr.sh_size + pgsz - 1) & ~(pgsz - 1)) - ofst; + size_t pgsz = sysconf( _SC_PAGESIZE ); + size_t ofst = fmap->sect[ism->sidx].shdr.sh_offset & ~(pgsz - 1); + size_t size = ((fmap->sect[ism->sidx].shdr.sh_offset + + fmap->sect[ism->sidx].shdr.sh_size + pgsz - 1) & ~(pgsz - 1)) - ofst; if (munmap((char*)fmap->sect[ism->sidx].mapped, size) < 0) WARN("Couldn't unmap the section\n"); fmap->sect[ism->sidx].mapped = IMAGE_NO_MAP; @@ -279,7 +275,7 @@ static BOOL elf_map_file(struct elf_map_file_data* emfd, struct image_file_map* struct stat statbuf; int i; Elf_Phdr phdr; - unsigned long tmp, page_mask = getpagesize() - 1; + size_t tmp, page_mask = sysconf( _SC_PAGESIZE ) - 1; char* filename; unsigned len; BOOL ret = FALSE; diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index 4d908a6..1aaa7f1 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -135,7 +135,7 @@ static void macho_calc_range(const struct macho_file_map* fmap, unsigned offset, unsigned* out_aligned_end, unsigned* out_aligned_len, unsigned* out_misalign) { - unsigned pagemask = getpagesize() - 1; + unsigned pagemask = sysconf( _SC_PAGESIZE ) - 1; unsigned file_offset, misalign; file_offset = fmap->arch_offset + offset; @@ -383,7 +383,7 @@ static int macho_accum_segs_range(struct macho_file_map* fmap, const struct load_command* lc, void* user) { const struct segment_command* sc = (const struct segment_command*)lc; - unsigned tmp, page_mask = getpagesize() - 1; + unsigned tmp, page_mask = sysconf( _SC_PAGESIZE ) - 1; TRACE("(%p/%d, %p, %p) before: 0x%08x - 0x%08x\n", fmap, fmap->fd, lc, user, (unsigned)fmap->segs_start, (unsigned)fmap->segs_size);

1 0

Dmitry Timoshkov : windowscodecs: BMP decoder should always return valid image resolution.
by Alexandre Julliard Jan. 9, 2013

Jan. 9, 2013

Module: wine Branch: master Commit: 8d72c2771dd134c2595c83a383b3c1fb3ab506eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d72c2771dd134c2595c83a38… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jan 9 15:46:52 2013 +0800 windowscodecs: BMP decoder should always return valid image resolution. --- dlls/windowscodecs/bmpdecode.c | 29 +++++++++++++++++++++-------- dlls/windowscodecs/tests/bmpformat.c | 2 -- 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/dlls/windowscodecs/bmpdecode.c b/dlls/windowscodecs/bmpdecode.c index e029369..d9e3a45 100644 --- a/dlls/windowscodecs/bmpdecode.c +++ b/dlls/windowscodecs/bmpdecode.c @@ -163,22 +163,35 @@ static HRESULT WINAPI BmpFrameDecode_GetPixelFormat(IWICBitmapFrameDecode *iface static HRESULT BmpHeader_GetResolution(BITMAPV5HEADER *bih, double *pDpiX, double *pDpiY) { + LONG resx = 0, resy = 0; + switch (bih->bV5Size) { + default: case sizeof(BITMAPCOREHEADER): - *pDpiX = 96.0; - *pDpiY = 96.0; - return S_OK; + break; + case sizeof(BITMAPCOREHEADER2): case sizeof(BITMAPINFOHEADER): case sizeof(BITMAPV4HEADER): case sizeof(BITMAPV5HEADER): - *pDpiX = bih->bV5XPelsPerMeter * 0.0254; - *pDpiY = bih->bV5YPelsPerMeter * 0.0254; - return S_OK; - default: - return E_FAIL; + resx = bih->bV5XPelsPerMeter; + resy = bih->bV5YPelsPerMeter; + break; + } + + if (!resx || !resy) + { + *pDpiX = 96.0; + *pDpiY = 96.0; + } + else + { + *pDpiX = resx * 0.0254; + *pDpiY = resy * 0.0254; } + + return S_OK; } static HRESULT WINAPI BmpFrameDecode_GetResolution(IWICBitmapFrameDecode *iface, diff --git a/dlls/windowscodecs/tests/bmpformat.c b/dlls/windowscodecs/tests/bmpformat.c index 5140577..48985b9 100644 --- a/dlls/windowscodecs/tests/bmpformat.c +++ b/dlls/windowscodecs/tests/bmpformat.c @@ -138,9 +138,7 @@ static void test_decode_24bpp(void) hr = IWICBitmapFrameDecode_GetResolution(framedecode, &dpiX, &dpiY); ok(SUCCEEDED(hr), "GetResolution failed, hr=%x\n", hr); -todo_wine ok(dpiX == 96.0, "expected dpiX=96.0, got %f\n", dpiX); -todo_wine ok(dpiY == 96.0, "expected dpiY=96.0, got %f\n", dpiY); hr = IWICBitmapFrameDecode_GetPixelFormat(framedecode, &guidresult);

1 0

Jacek Caban : winegecko: Added 1.9 release.
by Alexandre Julliard Jan. 9, 2013

Jan. 9, 2013

Module: tools Branch: master Commit: 381335d0e6de554d74d34b2a26909e7e720aca57 URL: http://source.winehq.org/git/tools.git/?a=commit;h=381335d0e6de554d74d34b2a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 9 14:20:57 2013 +0100 winegecko: Added 1.9 release. --- winegecko.php | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/winegecko.php b/winegecko.php index c311be7..8f4186e 100644 --- a/winegecko.php +++ b/winegecko.php @@ -70,7 +70,9 @@ $aFileSizes = array( '1.7-x86'=>16995328, '1.7-x86_64'=>17438720, '1.8-x86'=>17774592, - '1.8-x86_64'=>18238976 + '1.8-x86_64'=>18238976, + '1.9-x86'=>19060224, + '1.9-x86_64'=>19622400 ); // Exact size of the file:

1 0

Marcus Meissner : dmloader: Check return of CoCreateInstance (Coverity).
by Alexandre Julliard Jan. 8, 2013

Jan. 8, 2013

Module: wine Branch: master Commit: b27027ef09a15bbdf40328107647be813faced46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b27027ef09a15bbdf40328107… Author: Marcus Meissner <meissner(a)suse.de> Date: Mon Jan 7 22:17:25 2013 +0100 dmloader: Check return of CoCreateInstance (Coverity). --- dlls/dmloader/loader.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c index 9a4bddc..39f00a0 100644 --- a/dlls/dmloader/loader.c +++ b/dlls/dmloader/loader.c @@ -463,7 +463,11 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_SetObject(IDirectMusicLoader8 *ifac } /* create object */ - CoCreateInstance (&pDesc->guidClass, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicObject, (LPVOID*)&pObject); + hr = CoCreateInstance (&pDesc->guidClass, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicObject, (LPVOID*)&pObject); + if (FAILED(hr)) { + ERR("Object creation of %s failed 0x%08x\n", debugstr_guid(&pDesc->guidClass),hr); + return DMUS_E_LOADER_FAILEDOPEN; + } /* *sigh*... some ms objects have lousy implementation of ParseDescriptor that clears input descriptor :( */ #ifdef NOW_WE_ARE_FREE

1 0

Marcus Meissner : dplayx: Check return of CoCreateInstance (Coverity).
by Alexandre Julliard Jan. 8, 2013

Jan. 8, 2013

Module: wine Branch: master Commit: 2cd1fed6ee48e7ff2f919b10cdc0ecc1982847fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cd1fed6ee48e7ff2f919b10c… Author: Marcus Meissner <meissner(a)suse.de> Date: Mon Jan 7 22:17:28 2013 +0100 dplayx: Check return of CoCreateInstance (Coverity). --- dlls/dplayx/tests/dplayx.c | 204 ++++++++++++++++++++++++++++++-------------- 1 files changed, 139 insertions(+), 65 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2cd1fed6ee48e7ff2f919…

1 0