wine-commits April 2013

wine-commits@winehq.org

2 participants
579 discussions

Matteo Bruni : wined3d: Use 0 as GL internal format for WINED3DFMT_NULL.
by Alexandre Julliard 11 Apr '13

11 Apr '13

Module: wine Branch: master Commit: 3e564b1e935ccc39699094903e1666831a70f8b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e564b1e935ccc39699094903… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Apr 11 16:34:30 2013 +0200 wined3d: Use 0 as GL internal format for WINED3DFMT_NULL. --- dlls/wined3d/utils.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index d7cec9b..da8fc7b 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -925,7 +925,7 @@ static const struct wined3d_format_texture_info format_texture_info[] = WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL, ARB_FRAMEBUFFER_OBJECT, NULL}, - {WINED3DFMT_NULL, GL_RGBA8, GL_RGBA8, 0, + {WINED3DFMT_NULL, 0, 0, 0, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8_REV, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_RENDERTARGET, ARB_FRAMEBUFFER_OBJECT, NULL},

1 0

Sergey Guralnik : extrac32: Avoid appending redundant backslash to path end .
by Alexandre Julliard 11 Apr '13

11 Apr '13

Module: wine Branch: master Commit: 80bc3838a73aa057624880758d81e476a58e1c88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80bc3838a73aa057624880758… Author: Sergey Guralnik <serhio(a)etersoft.ru> Date: Thu Apr 11 10:54:02 2013 +0300 extrac32: Avoid appending redundant backslash to path end. --- programs/extrac32/extrac32.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/programs/extrac32/extrac32.c b/programs/extrac32/extrac32.c index 644f885..2126c04 100644 --- a/programs/extrac32/extrac32.c +++ b/programs/extrac32/extrac32.c @@ -200,7 +200,6 @@ int PASCAL wWinMain(HINSTANCE hInstance, HINSTANCE prev, LPWSTR cmdline, int sho int i; WCHAR check, cmd = 0; WCHAR path[MAX_PATH]; - WCHAR backslash[] = {'\\',0}; LPCWSTR cabfile = NULL; path[0] = 0; @@ -273,7 +272,7 @@ int PASCAL wWinMain(HINSTANCE hInstance, HINSTANCE prev, LPWSTR cmdline, int sho if (cmd == 'E' && !path[0]) GetCurrentDirectoryW(MAX_PATH, path); - lstrcatW(path, backslash); + PathAddBackslashW(path); /* Execute the specified command */ switch(cmd)

1 0

Sergey Guralnik : extrac32: Create directory for extracted file if need.
by Alexandre Julliard 11 Apr '13

11 Apr '13

Module: wine Branch: master Commit: 7925c9b0287e1fe28108afe879d454b18681369b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7925c9b0287e1fe28108afe87… Author: Sergey Guralnik <serhio(a)etersoft.ru> Date: Thu Apr 11 10:45:58 2013 +0300 extrac32: Create directory for extracted file if need. --- programs/extrac32/extrac32.c | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/programs/extrac32/extrac32.c b/programs/extrac32/extrac32.c index 111d2a7..644f885 100644 --- a/programs/extrac32/extrac32.c +++ b/programs/extrac32/extrac32.c @@ -23,6 +23,7 @@ #include <shellapi.h> #include <setupapi.h> #include <shlwapi.h> +#include <shlobj.h> #include "wine/unicode.h" #include "wine/debug.h" @@ -31,6 +32,21 @@ WINE_DEFAULT_DEBUG_CHANNEL(extrac32); static BOOL force_mode; +static void create_target_directory(LPWSTR Target) +{ + WCHAR dir[MAX_PATH]; + int res; + + strcpyW(dir, Target); + *PathFindFileNameW(dir) = 0; /* Truncate file name */ + if(!PathIsDirectoryW(dir)) + { + res = SHCreateDirectoryExW(NULL, dir, NULL); + if(res != ERROR_SUCCESS && res != ERROR_ALREADY_EXISTS) + WINE_ERR("Can't create directory: %s\n", wine_dbgstr_w(dir)); + } +} + static UINT WINAPI ExtCabCallback(PVOID Context, UINT Notification, UINT_PTR Param1, UINT_PTR Param2) { FILE_IN_CABINET_INFO_W *pInfo; @@ -42,6 +58,9 @@ static UINT WINAPI ExtCabCallback(PVOID Context, UINT Notification, UINT_PTR Par pInfo = (FILE_IN_CABINET_INFO_W*)Param1; lstrcpyW(pInfo->FullTargetName, (LPCWSTR)Context); lstrcatW(pInfo->FullTargetName, pInfo->NameInCabinet); + /* SetupIterateCabinet() doesn't create full path to target by itself, + so we should do it manually */ + create_target_directory(pInfo->FullTargetName); return FILEOP_DOIT; case SPFILENOTIFY_FILEEXTRACTED: pFilePaths = (FILEPATHS_W*)Param1;

1 0

Erich Hoover : server: Report administrator ownership by default for registry objects.
by Alexandre Julliard 11 Apr '13

11 Apr '13

Module: wine Branch: master Commit: 56c1a8b06293cfef2cb39e1f04e9e725d81982e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56c1a8b06293cfef2cb39e1f0… Author: Erich Hoover <ehoover(a)mines.edu> Date: Tue Mar 5 09:52:38 2013 -0700 server: Report administrator ownership by default for registry objects. --- dlls/advapi32/tests/security.c | 31 +++++++++++++++++++++++++++---- server/registry.c | 25 ++++++++++++++++++++++++- server/security.h | 1 + server/token.c | 8 ++++++++ 4 files changed, 60 insertions(+), 5 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index e4adab1..7dd0501 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -3005,10 +3005,12 @@ static void test_SetEntriesInAclA(void) static void test_GetNamedSecurityInfoA(void) { - char admin_ptr[sizeof(SID)+sizeof(ULONG)*SID_MAX_SUB_AUTHORITIES], dacl[100], *user; + char admin_ptr[sizeof(SID)+sizeof(ULONG)*SID_MAX_SUB_AUTHORITIES], *user; + char system_ptr[sizeof(SID)+sizeof(ULONG)*SID_MAX_SUB_AUTHORITIES]; + PSID admin_sid = (PSID) admin_ptr, system_sid = (PSID) system_ptr, user_sid; DWORD sid_size = sizeof(admin_ptr), user_size; char invalid_path[] = "/an invalid file path"; - PSID admin_sid = (PSID) admin_ptr, user_sid; + char software_key[] = "MACHINE\\Software"; char sd[SECURITY_DESCRIPTOR_MIN_LENGTH]; SECURITY_DESCRIPTOR_CONTROL control; ACL_SIZE_INFORMATION acl_size; @@ -3113,10 +3115,10 @@ static void test_GetNamedSecurityInfoA(void) /* Create security descriptor information and test that it comes back the same */ pSD = &sd; - pDacl = (PACL)&dacl; + pDacl = HeapAlloc(GetProcessHeap(), 0, 100); InitializeSecurityDescriptor(pSD, SECURITY_DESCRIPTOR_REVISION); pCreateWellKnownSid(WinBuiltinAdministratorsSid, NULL, admin_sid, &sid_size); - bret = InitializeAcl(pDacl, sizeof(dacl), ACL_REVISION); + bret = InitializeAcl(pDacl, 100, ACL_REVISION); ok(bret, "Failed to initialize ACL.\n"); bret = pAddAccessAllowedAceEx(pDacl, ACL_REVISION, 0, GENERIC_ALL, user_sid); ok(bret, "Failed to add Current User to ACL.\n"); @@ -3130,6 +3132,7 @@ static void test_GetNamedSecurityInfoA(void) SetLastError(0xdeadbeef); error = pSetNamedSecurityInfoA(tmpfile, SE_FILE_OBJECT, DACL_SECURITY_INFORMATION, NULL, NULL, pDacl, NULL); + HeapFree(GetProcessHeap(), 0, pDacl); if (error != ERROR_SUCCESS && (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)) { win_skip("SetNamedSecurityInfoA is not implemented\n"); @@ -3178,6 +3181,26 @@ static void test_GetNamedSecurityInfoA(void) LocalFree(pSD); HeapFree(GetProcessHeap(), 0, user); CloseHandle(hTemp); + + /* Test querying the ownership of a built-in registry key */ + sid_size = sizeof(system_ptr); + pCreateWellKnownSid(WinLocalSystemSid, NULL, system_sid, &sid_size); + error = pGetNamedSecurityInfoA(software_key, SE_REGISTRY_KEY, + OWNER_SECURITY_INFORMATION|GROUP_SECURITY_INFORMATION, + NULL, NULL, NULL, NULL, &pSD); + ok(!error, "GetNamedSecurityInfo failed with error %d\n", error); + + bret = GetSecurityDescriptorOwner(pSD, &owner, &owner_defaulted); + ok(bret, "GetSecurityDescriptorOwner failed with error %d\n", GetLastError()); + ok(owner != NULL, "owner should not be NULL\n"); + ok(EqualSid(owner, admin_sid), "MACHINE\\Software owner SID != Administrators SID.\n"); + + bret = GetSecurityDescriptorGroup(pSD, &group, &group_defaulted); + ok(bret, "GetSecurityDescriptorGroup failed with error %d\n", GetLastError()); + ok(group != NULL, "group should not be NULL\n"); + ok(EqualSid(group, admin_sid) || broken(EqualSid(group, system_sid)) /* before Win7 */, + "MACHINE\\Software group SID != Local System SID.\n"); + LocalFree(pSD); } static void test_ConvertStringSecurityDescriptor(void) diff --git a/server/registry.c b/server/registry.c index a144c26..efc2005 100644 --- a/server/registry.c +++ b/server/registry.c @@ -147,6 +147,7 @@ struct file_load_info static void key_dump( struct object *obj, int verbose ); static unsigned int key_map_access( struct object *obj, unsigned int access ); +static struct security_descriptor *key_get_sd( struct object *obj ); static int key_close_handle( struct object *obj, struct process *process, obj_handle_t handle ); static void key_destroy( struct object *obj ); @@ -162,7 +163,7 @@ static const struct object_ops key_ops = no_signal, /* signal */ no_get_fd, /* get_fd */ key_map_access, /* map_access */ - default_get_sd, /* get_sd */ + key_get_sd, /* get_sd */ default_set_sd, /* set_sd */ no_lookup_name, /* lookup_name */ no_open_file, /* open_file */ @@ -336,6 +337,28 @@ static unsigned int key_map_access( struct object *obj, unsigned int access ) KEY_WOW64_64KEY | KEY_WOW64_32KEY); } +static struct security_descriptor *key_get_sd( struct object *obj ) +{ + static struct security_descriptor *key_default_sd; + + if (obj->sd) return obj->sd; + + if (!key_default_sd) + { + size_t sid_len = security_sid_len( security_builtin_admins_sid ); + + key_default_sd = mem_alloc( sizeof(*key_default_sd) + 2 * sid_len ); + key_default_sd->control = 0; + key_default_sd->owner_len = sid_len; + key_default_sd->group_len = sid_len; + key_default_sd->sacl_len = 0; + key_default_sd->dacl_len = 0; + memcpy( key_default_sd + 1, security_builtin_admins_sid, sid_len ); + memcpy( (char *)(key_default_sd + 1) + sid_len, security_builtin_admins_sid, sid_len ); + } + return key_default_sd; +} + /* close the notification associated with a handle */ static int key_close_handle( struct object *obj, struct process *process, obj_handle_t handle ) { diff --git a/server/security.h b/server/security.h index 03fd74e..9856f96 100644 --- a/server/security.h +++ b/server/security.h @@ -42,6 +42,7 @@ extern const LUID SeCreateGlobalPrivilege; extern const PSID security_world_sid; extern const PSID security_local_user_sid; extern const PSID security_local_system_sid; +extern const PSID security_builtin_admins_sid; /* token functions */ diff --git a/server/token.c b/server/token.c index 5e0493a..7d6086d 100644 --- a/server/token.c +++ b/server/token.c @@ -77,6 +77,13 @@ static const struct /* same fields as struct SID */ SID_IDENTIFIER_AUTHORITY IdentifierAuthority; DWORD SubAuthority[5]; } local_user_sid = { SID_REVISION, 5, { SECURITY_NT_AUTHORITY }, { SECURITY_NT_NON_UNIQUE, 0, 0, 0, 1000 } }; +static const struct /* same fields as struct SID */ +{ + BYTE Revision; + BYTE SubAuthorityCount; + SID_IDENTIFIER_AUTHORITY IdentifierAuthority; + DWORD SubAuthority[2]; +} builtin_admins_sid = { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_ADMINS } }; const PSID security_world_sid = (PSID)&world_sid; static const PSID security_local_sid = (PSID)&local_sid; @@ -84,6 +91,7 @@ static const PSID security_interactive_sid = (PSID)&interactive_sid; static const PSID security_authenticated_user_sid = (PSID)&authenticated_user_sid; const PSID security_local_system_sid = (PSID)&local_system_sid; const PSID security_local_user_sid = (PSID)&local_user_sid; +const PSID security_builtin_admins_sid = (PSID)&builtin_admins_sid; static luid_t prev_luid_value = { 1000, 0 };

1 0

Alexandre Julliard : server: Add a helper function to compute an SID length .
by Alexandre Julliard 11 Apr '13

11 Apr '13

Module: wine Branch: master Commit: 62beef5a72dc6895d07c850140945d9d4dffe79b URL: http://source.winehq.org/git/wine.git/?a=commit;h=62beef5a72dc6895d07c85014… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 11 12:52:08 2013 +0200 server: Add a helper function to compute an SID length. --- server/file.c | 38 +++++++++++++++----------------------- server/object.c | 4 ++-- server/security.h | 7 ++++++- server/token.c | 26 ++++++++++++-------------- 4 files changed, 35 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=62beef5a72dc6895d07c8…

1 0

Sam Edwards : wined3d: Properly handle backbuffer_width/_height= 0 in wined3d_device_reset.
by Alexandre Julliard 11 Apr '13

11 Apr '13

Module: wine Branch: master Commit: 33d31a3547b51eddbf9fe835285577541b91c05c URL: http://source.winehq.org/git/wine.git/?a=commit;h=33d31a3547b51eddbf9fe8352… Author: Sam Edwards <CFSworks(a)gmail.com> Date: Tue Apr 9 00:48:43 2013 -0600 wined3d: Properly handle backbuffer_width/_height=0 in wined3d_device_reset. --- dlls/d3d8/tests/device.c | 21 +++++++++++++++------ dlls/d3d9/tests/d3d9ex.c | 10 +++++----- dlls/d3d9/tests/device.c | 18 ++++++++++++++---- dlls/wined3d/device.c | 36 ++++++++++++++++++++++++++++++------ 4 files changed, 64 insertions(+), 21 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index ba7e5e6..2f281d2 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -1265,8 +1265,8 @@ static void test_reset(void) { ok(vp.X == 0, "D3DVIEWPORT->X = %u, expected 0.\n", vp.X); ok(vp.Y == 0, "D3DVIEWPORT->Y = %u, expected 0.\n", vp.Y); - todo_wine ok(vp.Width == 200, "D3DVIEWPORT->Width = %u, expected 200.\n", vp.Width); - todo_wine ok(vp.Height == 150, "D3DVIEWPORT->Height = %u, expected 150.\n", vp.Height); + ok(vp.Width == 200, "D3DVIEWPORT->Width = %u, expected 200.\n", vp.Width); + ok(vp.Height == 150, "D3DVIEWPORT->Height = %u, expected 150.\n", vp.Height); ok(vp.MinZ == 0, "D3DVIEWPORT->MinZ = %.8e, expected 0.\n", vp.MinZ); ok(vp.MaxZ == 1, "D3DVIEWPORT->MaxZ = %.8e, expected 1.\n", vp.MaxZ); } @@ -1275,10 +1275,8 @@ static void test_reset(void) ok(SUCCEEDED(hr), "GetRenderTarget failed, hr %#x.\n", hr); hr = IDirect3DSurface8_GetDesc(surface, &surface_desc); ok(hr == D3D_OK, "GetDesc failed, hr %#x.\n", hr); - todo_wine ok(surface_desc.Width == 200, "Back buffer width is %u, expected 200.\n", - surface_desc.Width); - todo_wine ok(surface_desc.Height == 150, "Back buffer height is %u, expected 150.\n", - surface_desc.Height); + ok(surface_desc.Width == 200, "Back buffer width is %u, expected 200.\n", surface_desc.Width); + ok(surface_desc.Height == 150, "Back buffer height is %u, expected 150.\n", surface_desc.Height); IDirect3DSurface8_Release(surface); memset(&d3dpp, 0, sizeof(d3dpp)); @@ -1443,6 +1441,17 @@ static void test_reset(void) hr = IDirect3DDevice8_TestCooperativeLevel(device1); ok(hr == D3DERR_DEVICENOTRESET, "TestCooperativeLevel returned %#x, expected %#x.\n", hr, D3DERR_DEVICENOTRESET); + memset(&d3dpp, 0, sizeof(d3dpp)); + d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; + d3dpp.Windowed = FALSE; + d3dpp.BackBufferWidth = 0; + d3dpp.BackBufferHeight = 0; + d3dpp.BackBufferFormat = d3ddm.Format; + hr = IDirect3DDevice8_Reset(device1, &d3dpp); + ok(hr == D3DERR_INVALIDCALL, "Reset returned %#x, expected %#x.\n", hr, D3DERR_INVALIDCALL); + hr = IDirect3DDevice8_TestCooperativeLevel(device1); + ok(hr == D3DERR_DEVICENOTRESET, "TestCooperativeLevel returned %#x, expected %#x.\n", hr, D3DERR_DEVICENOTRESET); + hr = IDirect3D8_GetAdapterDisplayMode(d3d8, D3DADAPTER_DEFAULT, &d3ddm); ok(SUCCEEDED(hr), "GetAdapterDisplayMode failed, hr %#x.\n", hr); diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index a55f9e5..5e5524e 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -690,7 +690,7 @@ static void test_reset(void) hr = IDirect3DDevice9Ex_GetScissorRect(device, &rect); ok(SUCCEEDED(hr), "Failed to get scissor rect, hr %#x.\n", hr); - todo_wine ok(rect.left == 0 && rect.top == 0 && rect.right == 200 && rect.bottom == 150, + ok(rect.left == 0 && rect.top == 0 && rect.right == 200 && rect.bottom == 150, "Got unexpected scissor rect {%d, %d, %d, %d}.\n", rect.left, rect.top, rect.right, rect.bottom); @@ -698,8 +698,8 @@ static void test_reset(void) ok(SUCCEEDED(hr), "Failed to get viewport, hr %#x.\n", hr); ok(vp.X == 0, "Got unexpected vp.X %u.\n", vp.X); ok(vp.Y == 0, "Got unexpected vp.Y %u.\n", vp.Y); - todo_wine ok(vp.Width == 200, "Got unexpected vp.Width %u.\n", vp.Width); - todo_wine ok(vp.Height == 150, "Got unexpected vp.Height %u.\n", vp.Height); + ok(vp.Width == 200, "Got unexpected vp.Width %u.\n", vp.Width); + ok(vp.Height == 150, "Got unexpected vp.Height %u.\n", vp.Height); ok(vp.MinZ == 2.0f, "Got unexpected vp.MinZ %.8e.\n", vp.MinZ); ok(vp.MaxZ == 3.0f, "Got unexpected vp,MaxZ %.8e.\n", vp.MaxZ); @@ -707,8 +707,8 @@ static void test_reset(void) ok(SUCCEEDED(hr), "Failed to get swapchain, hr %#x.\n", hr); hr = IDirect3DSwapChain9_GetPresentParameters(swapchain, &d3dpp); ok(SUCCEEDED(hr), "Failed to get present parameters, hr %#x.\n", hr); - todo_wine ok(d3dpp.BackBufferWidth == 200, "Got unexpected backbuffer width %u.\n", d3dpp.BackBufferWidth); - todo_wine ok(d3dpp.BackBufferHeight == 150, "Got unexpected backbuffer height %u.\n", d3dpp.BackBufferHeight); + ok(d3dpp.BackBufferWidth == 200, "Got unexpected backbuffer width %u.\n", d3dpp.BackBufferWidth); + ok(d3dpp.BackBufferHeight == 150, "Got unexpected backbuffer height %u.\n", d3dpp.BackBufferHeight); IDirect3DSwapChain9_Release(swapchain); memset(&d3dpp, 0, sizeof(d3dpp)); diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index f30938b..e1f3c63 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -1110,8 +1110,8 @@ static void test_reset(void) { ok(vp.X == 0, "D3DVIEWPORT->X = %d\n", vp.X); ok(vp.Y == 0, "D3DVIEWPORT->Y = %d\n", vp.Y); - todo_wine ok(vp.Width == 200, "D3DVIEWPORT->Width = %d\n", vp.Width); - todo_wine ok(vp.Height == 150, "D3DVIEWPORT->Height = %d\n", vp.Height); + ok(vp.Width == 200, "D3DVIEWPORT->Width = %d\n", vp.Width); + ok(vp.Height == 150, "D3DVIEWPORT->Height = %d\n", vp.Height); ok(vp.MinZ == 0, "D3DVIEWPORT->MinZ = %f\n", vp.MinZ); ok(vp.MaxZ == 1, "D3DVIEWPORT->MaxZ = %f\n", vp.MaxZ); } @@ -1125,8 +1125,8 @@ static void test_reset(void) ok(hr == D3D_OK, "IDirect3DSwapChain9_GetPresentParameters returned %08x\n", hr); if(SUCCEEDED(hr)) { - todo_wine ok(d3dpp.BackBufferWidth == 200, "Back buffer width is %d\n", d3dpp.BackBufferWidth); - todo_wine ok(d3dpp.BackBufferHeight == 150, "Back buffer height is %d\n", d3dpp.BackBufferHeight); + ok(d3dpp.BackBufferWidth == 200, "Back buffer width is %d\n", d3dpp.BackBufferWidth); + ok(d3dpp.BackBufferHeight == 150, "Back buffer height is %d\n", d3dpp.BackBufferHeight); } IDirect3DSwapChain9_Release(pSwapchain); } @@ -1291,6 +1291,16 @@ static void test_reset(void) hr = IDirect3DDevice9_TestCooperativeLevel(device1); ok(hr == D3DERR_DEVICENOTRESET, "IDirect3DDevice9_TestCooperativeLevel after a failed reset returned %#x\n", hr); + ZeroMemory( &d3dpp, sizeof(d3dpp) ); + d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; + d3dpp.Windowed = FALSE; + d3dpp.BackBufferWidth = 0; + d3dpp.BackBufferHeight = 0; + hr = IDirect3DDevice9_Reset(device1, &d3dpp); + ok(hr == D3DERR_INVALIDCALL, "IDirect3DDevice9_Reset to w=0, h=0, windowed=FALSE failed with %08x\n", hr); + hr = IDirect3DDevice9_TestCooperativeLevel(device1); + ok(hr == D3DERR_DEVICENOTRESET, "IDirect3DDevice9_TestCooperativeLevel after a failed reset returned %#x\n", hr); + IDirect3D9_GetAdapterDisplayMode( pD3d, D3DADAPTER_DEFAULT, &d3ddm ); ZeroMemory( &d3dpp, sizeof(d3dpp) ); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 34a58aa..3ae5eae 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4904,6 +4904,8 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, struct wined3d_display_mode m; BOOL DisplayModeChanged = FALSE; BOOL update_desc = FALSE; + UINT backbuffer_width = swapchain_desc->backbuffer_width; + UINT backbuffer_height = swapchain_desc->backbuffer_height; HRESULT hr = WINED3D_OK; unsigned int i; @@ -5034,16 +5036,38 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, m.scanline_ordering = WINED3D_SCANLINE_ORDERING_UNKNOWN; } - /* Should Width == 800 && Height == 0 set 800x600? */ - if (swapchain_desc->backbuffer_width && swapchain_desc->backbuffer_height - && (swapchain_desc->backbuffer_width != swapchain->desc.backbuffer_width - || swapchain_desc->backbuffer_height != swapchain->desc.backbuffer_height)) + if (!backbuffer_width || !backbuffer_height) + { + /* The application is requesting that either the swapchain width or + * height be set to the corresponding dimension in the window's + * client rect. */ + + RECT client_rect; + + if (!swapchain_desc->windowed) + return WINED3DERR_INVALIDCALL; + + if (!GetClientRect(swapchain->device_window, &client_rect)) + { + ERR("Failed to get client rect, last error %#x.\n", GetLastError()); + return WINED3DERR_INVALIDCALL; + } + + if (!backbuffer_width) + backbuffer_width = client_rect.right; + + if (!backbuffer_height) + backbuffer_height = client_rect.bottom; + } + + if (backbuffer_width != swapchain->desc.backbuffer_width + || backbuffer_height != swapchain->desc.backbuffer_height) { if (!swapchain_desc->windowed) DisplayModeChanged = TRUE; - swapchain->desc.backbuffer_width = swapchain_desc->backbuffer_width; - swapchain->desc.backbuffer_height = swapchain_desc->backbuffer_height; + swapchain->desc.backbuffer_width = backbuffer_width; + swapchain->desc.backbuffer_height = backbuffer_height; update_desc = TRUE; }

1 0

Ken Thomases : winemac: Don't order the window on-screen in -[ WineWindow adjustWindowLevel].
by Alexandre Julliard 11 Apr '13

11 Apr '13

Module: wine Branch: master Commit: 2e226b9ad8cd86b4ad6b5a73effa9fa7d5d03958 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e226b9ad8cd86b4ad6b5a73e… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Apr 10 15:32:23 2013 -0500 winemac: Don't order the window on-screen in -[WineWindow adjustWindowLevel]. --- dlls/winemac.drv/cocoa_window.m | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 6a85d74..c13a57d 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -437,7 +437,7 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) Also, any windows which are supposed to be in front of it had better have the same or higher window level. If not, bump them up. */ - if (index != NSNotFound) + if (index != NSNotFound && [self isVisible]) { for (; index > 0; index--) {

1 0

Alexandre Julliard : kernel32: Make event/mutex/ semaphore functions hotpatchable.
by Alexandre Julliard 11 Apr '13

11 Apr '13

Module: wine Branch: master Commit: d8c72febc823c6076a58a7d1bb166ff240db8326 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8c72febc823c6076a58a7d1b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 10 23:54:08 2013 +0200 kernel32: Make event/mutex/semaphore functions hotpatchable. --- dlls/kernel32/sync.c | 55 ++++++++++++++++++++++++------------------------- 1 files changed, 27 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d8c72febc823c6076a58a…

1 0

Francois Gouget : wininet: Make urlcache_{entry_create, get_entry_info}() static.
by Alexandre Julliard 10 Apr '13

10 Apr '13

Module: wine Branch: master Commit: cabbc4d983aa167076fa9b6ebaaa93485ef541bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=cabbc4d983aa167076fa9b6eb… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Apr 10 16:50:21 2013 +0200 wininet: Make urlcache_{entry_create,get_entry_info}() static. --- dlls/wininet/urlcache.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index ce74577..7f58a69 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -1780,7 +1780,7 @@ static BOOL urlcache_hash_entry_is_locked(struct hash_entry *hash_entry, entry_u return TRUE; } -BOOL urlcache_get_entry_info(const char *url, void *entry_info, +static BOOL urlcache_get_entry_info(const char *url, void *entry_info, DWORD *size, DWORD flags, BOOL unicode) { urlcache_header *header; @@ -2622,7 +2622,7 @@ BOOL WINAPI UnlockUrlCacheEntryFileW(LPCWSTR lpszUrlName, DWORD dwReserved) return ret; } -BOOL urlcache_entry_create(const char *url, const char *ext, WCHAR *full_path) +static BOOL urlcache_entry_create(const char *url, const char *ext, WCHAR *full_path) { cache_container *container; urlcache_header *header;

1 0

Alexandre Julliard : icinfo: Fix vsnprintfW usage.
by Alexandre Julliard 10 Apr '13

10 Apr '13

Module: wine Branch: master Commit: b3b498b5cc3a7f97e923c3144a6a3608350f679c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3b498b5cc3a7f97e923c3144… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 10 16:16:35 2013 +0200 icinfo: Fix vsnprintfW usage. --- programs/icinfo/icinfo.c | 15 ++++----------- 1 files changed, 4 insertions(+), 11 deletions(-) diff --git a/programs/icinfo/icinfo.c b/programs/icinfo/icinfo.c index 1801d09..bfbef6b 100644 --- a/programs/icinfo/icinfo.c +++ b/programs/icinfo/icinfo.c @@ -29,33 +29,26 @@ static int mywprintf(const WCHAR *format, ...) static WCHAR output_bufW[sizeof(output_bufA) / sizeof(WCHAR)]; va_list parms; DWORD nOut; - int len; BOOL res = FALSE; HANDLE hout = GetStdHandle(STD_OUTPUT_HANDLE); va_start(parms, format); - len = vsnprintfW(output_bufW, sizeof(output_bufW), format, parms); + vsnprintfW(output_bufW, sizeof(output_bufW), format, parms); va_end(parms); - if (len < 0) - { - /* String too long */ - return 0; - } /* Try to write as unicode whenever we think it's a console */ if (((DWORD_PTR)hout & 3) == 3) { - res = WriteConsoleW(hout, output_bufW, len, &nOut, NULL); + res = WriteConsoleW(hout, output_bufW, strlenW(output_bufW), &nOut, NULL); } else { - BOOL usedDefaultChar = FALSE; DWORD convertedChars; /* Convert to OEM, then output */ - convertedChars = WideCharToMultiByte(GetConsoleOutputCP(), 0, output_bufW, len, + convertedChars = WideCharToMultiByte(GetConsoleOutputCP(), 0, output_bufW, -1, output_bufA, sizeof(output_bufA), - "?", &usedDefaultChar); + NULL, NULL); res = WriteFile(hout, output_bufA, convertedChars, &nOut, FALSE); }

1 0

← Newer
1
...
30
31
32
33
34
35
36
...
58
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2013