wine-commits October 2011

wine-commits@winehq.org

3 participants
783 discussions

Henri Verbeet : ddraw: Only update primary_lock when we' re actually locking the frontbuffer.
by Alexandre Julliard 27 Oct '11

27 Oct '11

Module: wine Branch: master Commit: 38abddca68c2cb7ef8ed35bc2332a2f3baa15a1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=38abddca68c2cb7ef8ed35bc2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 27 17:06:24 2011 +0200 ddraw: Only update primary_lock when we're actually locking the frontbuffer. This fixes a regression introduced by commit 8330558e125c9073068ffbd7741f1128c17c1e08. --- dlls/ddraw/surface.c | 15 +++++++++------ 1 files changed, 9 … [View More]

1 0

Henri Verbeet : wined3d: Use the correct pitch in surface_upload_data().
by Alexandre Julliard 27 Oct '11

27 Oct '11

Module: wine Branch: master Commit: 61550ff1decf346692deb6ae7c908926015789ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=61550ff1decf346692deb6ae7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 27 17:06:23 2011 +0200 wined3d: Use the correct pitch in surface_upload_data(). This fixes a regression introduced by commit 2da4f87a7e7551f17cd650ef6d8596f595efc13b. --- dlls/wined3d/surface.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 … [View More]deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 0bee46d..91c0f60 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2412,14 +2412,14 @@ static void surface_download_data(struct wined3d_surface *surface, const struct * correct texture. */ /* Context activation is done by the caller. */ static void surface_upload_data(const struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info, - const struct wined3d_format *format, const RECT *src_rect, UINT src_w, const POINT *dst_point, + const struct wined3d_format *format, const RECT *src_rect, UINT src_pitch, const POINT *dst_point, BOOL srgb, const struct wined3d_bo_address *data) { UINT update_w = src_rect->right - src_rect->left; UINT update_h = src_rect->bottom - src_rect->top; - TRACE("surface %p, gl_info %p, format %s, src_rect %s, src_w %u, dst_point %p, srgb %#x, data {%#x:%p}.\n", - surface, gl_info, debug_d3dformat(format->id), wine_dbgstr_rect(src_rect), src_w, + TRACE("surface %p, gl_info %p, format %s, src_rect %s, src_pitch %u, dst_point %s, srgb %#x, data {%#x:%p}.\n", + surface, gl_info, debug_d3dformat(format->id), wine_dbgstr_rect(src_rect), src_pitch, wine_dbgstr_point(dst_point), srgb, data->buffer_object, data->addr); if (format->heightscale != 1.0f && format->heightscale != 0.0f) @@ -2437,7 +2437,6 @@ static void surface_upload_data(const struct wined3d_surface *surface, const str { UINT row_length = wined3d_format_calculate_size(format, 1, update_w, 1); UINT row_count = (update_h + format->block_height - 1) / format->block_height; - UINT src_pitch = wined3d_format_calculate_size(format, 1, src_w, 1); const BYTE *addr = data->addr; GLenum internal; @@ -2480,14 +2479,14 @@ static void surface_upload_data(const struct wined3d_surface *surface, const str { const BYTE *addr = data->addr; - addr += src_rect->top * src_w * format->byte_count; + addr += src_rect->top * src_pitch; addr += src_rect->left * format->byte_count; TRACE("glTexSubImage2D, target %#x, level %d, x %d, y %d, w %d, h %d, format %#x, type %#x, addr %p.\n", surface->texture_target, surface->texture_level, dst_point->x, dst_point->y, update_w, update_h, format->glFormat, format->glType, addr); - glPixelStorei(GL_UNPACK_ROW_LENGTH, src_w); + glPixelStorei(GL_UNPACK_ROW_LENGTH, src_pitch / format->byte_count); glTexSubImage2D(surface->texture_target, surface->texture_level, dst_point->x, dst_point->y, update_w, update_h, format->glFormat, format->glType, addr); glPixelStorei(GL_UNPACK_ROW_LENGTH, 0); @@ -2530,6 +2529,7 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P CONVERT_TYPES convert; UINT dst_w, dst_h; UINT src_w, src_h; + UINT src_pitch; POINT p; RECT r; @@ -2620,8 +2620,9 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P data.buffer_object = src_surface->pbo; data.addr = src_surface->resource.allocatedMemory; + src_pitch = wined3d_surface_get_pitch(src_surface); - surface_upload_data(dst_surface, gl_info, src_format, src_rect, src_w, dst_point, FALSE, &data); + surface_upload_data(dst_surface, gl_info, src_format, src_rect, src_pitch, dst_point, FALSE, &data); invalidate_active_texture(dst_surface->resource.device, context); @@ -6177,7 +6178,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, data.buffer_object = surface->flags & SFLAG_PBO ? surface->pbo : 0; data.addr = mem; - surface_upload_data(surface, gl_info, &format, &src_rect, width, &dst_point, srgb, &data); + surface_upload_data(surface, gl_info, &format, &src_rect, src_pitch, &dst_point, srgb, &data); context_release(context); [View Less]

1 0

Hans Leidekker : msi/tests: Fix a skip message.
by Alexandre Julliard 27 Oct '11

27 Oct '11

Module: wine Branch: master Commit: 392bd2b7a23f17d31d3609e8c57ea543d2a4175e URL: http://source.winehq.org/git/wine.git/?a=commit;h=392bd2b7a23f17d31d3609e8c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 27 13:36:21 2011 +0200 msi/tests: Fix a skip message. --- dlls/msi/tests/action.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 6e35fe9..3743e50 100644 --- a/dlls/msi/tests/… [View More]

1 0

Hans Leidekker : msi/tests: Fix some test failures on win2k.
by Alexandre Julliard 27 Oct '11

27 Oct '11

Module: wine Branch: master Commit: 841a747409378c72ee7a158d6f6638c790da1030 URL: http://source.winehq.org/git/wine.git/?a=commit;h=841a747409378c72ee7a158d6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 27 13:35:57 2011 +0200 msi/tests: Fix some test failures on win2k. --- dlls/msi/tests/action.c | 20 ++++++++++++-------- 1 files changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 95fc15c..6e35fe9 … [View More]100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -5891,14 +5891,16 @@ static void test_publish_assemblies(void) RegCloseKey(hkey); res = RegOpenKeyA(HKEY_CURRENT_USER, path_win32, &hkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - CHECK_REG_STR(hkey, name_win32, "rcHQPHq?CA@Uv-XqMI1e>}NJjwR'%D9v1p!v{WV(%"); + ok(res == ERROR_SUCCESS || res == ERROR_FILE_NOT_FOUND /* win2k without sxs support */, + "Expected ERROR_SUCCESS, got %d\n", res); + if (res == ERROR_SUCCESS) CHECK_REG_STR(hkey, name_win32, "rcHQPHq?CA@Uv-XqMI1e>}NJjwR'%D9v1p!v{WV(%"); RegCloseKey(hkey); path = (is_wow64 || is_64bit) ? path_win32_local_wow64 : path_win32_local; res = RegOpenKeyA(HKEY_CURRENT_USER, path, &hkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - CHECK_REG_STR(hkey, name_win32_local, "rcHQPHq?CA@Uv-XqMI1e>C)Uvlj*53A)u(QQ9=)X!"); + ok(res == ERROR_SUCCESS || res == ERROR_FILE_NOT_FOUND /* win2k without sxs support */, + "Expected ERROR_SUCCESS, got %d\n", res); + if (res == ERROR_SUCCESS) CHECK_REG_STR(hkey, name_win32_local, "rcHQPHq?CA@Uv-XqMI1e>C)Uvlj*53A)u(QQ9=)X!"); RegCloseKey(hkey); r = MsiInstallProductA(msifile, "REMOVE=ALL"); @@ -5952,14 +5954,16 @@ static void test_publish_assemblies(void) RegCloseKey(hkey); res = RegOpenKeyExA(HKEY_CLASSES_ROOT, classes_path_win32, 0, access, &hkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - CHECK_REG_STR(hkey, name_win32, "rcHQPHq?CA@Uv-XqMI1e>}NJjwR'%D9v1p!v{WV(%"); + ok(res == ERROR_SUCCESS || res == ERROR_FILE_NOT_FOUND /* win2k without sxs support */, + "Expected ERROR_SUCCESS, got %d\n", res); + if (res == ERROR_SUCCESS) CHECK_REG_STR(hkey, name_win32, "rcHQPHq?CA@Uv-XqMI1e>}NJjwR'%D9v1p!v{WV(%"); RegCloseKey(hkey); path = (is_wow64 || is_64bit) ? classes_path_win32_local_wow64 : classes_path_win32_local; res = RegOpenKeyExA(HKEY_CLASSES_ROOT, path, 0, access, &hkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - CHECK_REG_STR(hkey, name_win32_local, "rcHQPHq?CA@Uv-XqMI1e>C)Uvlj*53A)u(QQ9=)X!"); + ok(res == ERROR_SUCCESS || res == ERROR_FILE_NOT_FOUND /* win2k without sxs support */, + "Expected ERROR_SUCCESS, got %d\n", res); + if (res == ERROR_SUCCESS) CHECK_REG_STR(hkey, name_win32_local, "rcHQPHq?CA@Uv-XqMI1e>C)Uvlj*53A)u(QQ9=)X!"); RegCloseKey(hkey); r = MsiInstallProductA(msifile, "REMOVE=ALL ALLUSERS=1"); [View Less]

1 0

Hans Leidekker : msi: Wait up to 30 seconds for services to start up.
by Alexandre Julliard 27 Oct '11

27 Oct '11

Module: wine Branch: master Commit: 319081cbf680b86e234c084942e130e99d72924e URL: http://source.winehq.org/git/wine.git/?a=commit;h=319081cbf680b86e234c08494… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 27 13:35:29 2011 +0200 msi: Wait up to 30 seconds for services to start up. --- dlls/msi/action.c | 34 ++++++++++++++++++++++++++++++++-- 1 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 72d431a..… [View More]6bc4fff 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -5649,8 +5649,10 @@ static UINT ITERATE_StartService(MSIRECORD *rec, LPVOID param) SC_HANDLE scm = NULL, service = NULL; LPCWSTR component, *vector = NULL; LPWSTR name, args, display_name = NULL; - DWORD event, numargs, len; + DWORD event, numargs, len, wait, dummy; UINT r = ERROR_FUNCTION_FAILED; + SERVICE_STATUS_PROCESS status; + ULONGLONG start_time; component = MSI_RecordGetString(rec, 6); comp = msi_get_loaded_component(package, component); @@ -5667,6 +5669,7 @@ static UINT ITERATE_StartService(MSIRECORD *rec, LPVOID param) deformat_string(package, MSI_RecordGetString(rec, 2), &name); deformat_string(package, MSI_RecordGetString(rec, 4), &args); event = MSI_RecordGetInteger(rec, 3); + wait = MSI_RecordGetInteger(rec, 5); if (!(event & msidbServiceControlEventStart)) { @@ -5689,7 +5692,7 @@ static UINT ITERATE_StartService(MSIRECORD *rec, LPVOID param) GetServiceDisplayNameW( scm, name, display_name, &len ); } - service = OpenServiceW(scm, name, SERVICE_START); + service = OpenServiceW(scm, name, SERVICE_START|SERVICE_QUERY_STATUS); if (!service) { ERR("Failed to open service %s (%u)\n", debugstr_w(name), GetLastError()); @@ -5706,6 +5709,33 @@ static UINT ITERATE_StartService(MSIRECORD *rec, LPVOID param) } r = ERROR_SUCCESS; + if (wait) + { + /* wait for at most 30 seconds for the service to be up and running */ + if (!QueryServiceStatusEx(service, SC_STATUS_PROCESS_INFO, + (BYTE *)&status, sizeof(SERVICE_STATUS_PROCESS), &dummy)) + { + TRACE("failed to query service status (%u)\n", GetLastError()); + goto done; + } + start_time = GetTickCount64(); + while (status.dwCurrentState == SERVICE_START_PENDING) + { + if (GetTickCount64() - start_time > 30000) break; + Sleep(1000); + if (!QueryServiceStatusEx(service, SC_STATUS_PROCESS_INFO, + (BYTE *)&status, sizeof(SERVICE_STATUS_PROCESS), &dummy)) + { + TRACE("failed to query service status (%u)\n", GetLastError()); + goto done; + } + } + if (status.dwCurrentState != SERVICE_RUNNING) + { + WARN("service failed to start %u\n", status.dwCurrentState); + r = ERROR_FUNCTION_FAILED; + } + } done: uirow = MSI_CreateRecord( 2 ); [View Less]

1 0

Jacek Caban : mshtml: Reimplement nsIURL:: GetFileExtension on top of IUri API.
by Alexandre Julliard 27 Oct '11

27 Oct '11

Module: wine Branch: master Commit: d1e49da2f5e99ccbdf87e4992b14c47ea07ad70f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1e49da2f5e99ccbdf87e4992… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 27 13:08:11 2011 +0200 mshtml: Reimplement nsIURL::GetFileExtension on top of IUri API. --- dlls/mshtml/nsio.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 0571659..f127bbc 100644 --- a/… [View More]

1 0

Francois Gouget : wineconsole: Give a name to the curses backend critical section.
by Alexandre Julliard 27 Oct '11

27 Oct '11

Module: wine Branch: master Commit: fc2b645d296cd5d3559e17e1977a2f7169c8be30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc2b645d296cd5d3559e17e19… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Oct 27 12:36:27 2011 +0200 wineconsole: Give a name to the curses backend critical section. --- programs/wineconsole/curses.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/programs/wineconsole/curses.c b/programs/wineconsole/curses.c … [View More]

1 0

Francois Gouget : services: Give a name to the scmdatabase critical section .
by Alexandre Julliard 27 Oct '11

27 Oct '11

Module: wine Branch: master Commit: 97ab9cc7e537a0a042b3f128fcfefb0021f49924 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97ab9cc7e537a0a042b3f128f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Oct 27 12:36:16 2011 +0200 services: Give a name to the scmdatabase critical section. --- programs/services/services.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/programs/services/services.c b/programs/services/services.c index … [View More]

1 0

Francois Gouget : winealsa.drv: Give a name to the mmdevapi critical sections.
by Alexandre Julliard 27 Oct '11

27 Oct '11

Module: wine Branch: master Commit: 39e12238e95c0e793adae70e187e90a41fab08f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39e12238e95c0e793adae70e1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Oct 27 12:36:01 2011 +0200 winealsa.drv: Give a name to the mmdevapi critical sections. Also statically initialize g_sessions_lock. --- dlls/winealsa.drv/mmdevdrv.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/… [View More]

1 0

Francois Gouget : msvcp90: Add a space before an implementation function name in the spec file.
by Alexandre Julliard 27 Oct '11

27 Oct '11

Module: wine Branch: master Commit: 23e0ae83c26d25b4ca98be2701086bf036cd7779 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23e0ae83c26d25b4ca98be270… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Oct 27 12:31:10 2011 +0200 msvcp90: Add a space before an implementation function name in the spec file. --- dlls/msvcp90/msvcp90.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index … [View More]

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
79
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 October 2011