wine-commits May 2011

wine-commits@winehq.org

2 participants
945 discussions

Nikolay Sivov : comctl32/listview: Don't forward HDN_ITEMCHANGING/ HDN_ITEMCHANGED to listview parent.
by Alexandre Julliard 11 May '11

11 May '11

Module: wine Branch: master Commit: 69bcdb7aad96c6ad21d8a28dd712a7159a974d68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69bcdb7aad96c6ad21d8a28dd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 11 11:10:24 2011 +0400 comctl32/listview: Don't forward HDN_ITEMCHANGING/HDN_ITEMCHANGED to listview parent. --- dlls/comctl32/listview.c | 9 --------- dlls/comctl32/tests/listview.c | 24 ++++++++++++++++++++++++ 2 files changed, 24 insertions(+), 9 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 6f7d7f3..8f7745f 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -10141,7 +10141,6 @@ static LRESULT LISTVIEW_NCDestroy(LISTVIEW_INFO *infoPtr) */ static LRESULT LISTVIEW_Notify(LISTVIEW_INFO *infoPtr, const NMHDR *lpnmhdr) { - HWND hwndSelf = infoPtr->hwndSelf; const NMHEADERW *lpnmh; TRACE("(lpnmhdr=%p)\n", lpnmhdr); @@ -10194,10 +10193,6 @@ static LRESULT LISTVIEW_Notify(LISTVIEW_INFO *infoPtr, const NMHDR *lpnmhdr) LISTVIEW_InvalidateList(infoPtr); notify_forward_header(infoPtr, lpnmh); return FALSE; - - case HDN_ITEMCHANGINGW: - case HDN_ITEMCHANGINGA: - return notify_forward_header(infoPtr, lpnmh); case HDN_ITEMCHANGEDW: case HDN_ITEMCHANGEDA: @@ -10205,10 +10200,6 @@ static LRESULT LISTVIEW_Notify(LISTVIEW_INFO *infoPtr, const NMHDR *lpnmhdr) COLUMN_INFO *lpColumnInfo; HDITEMW hdi; INT dx, cxy; - - notify_forward_header(infoPtr, lpnmh); - if (!IsWindow(hwndSelf)) - break; if (!lpnmh->pitem || !(lpnmh->pitem->mask & HDI_WIDTH)) { diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 3bf3dcb..20f231e 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -305,6 +305,13 @@ static const struct message listview_destroy[] = { { 0 } }; +static const struct message listview_header_changed_seq[] = { + { LVM_SETCOLUMNA, sent }, + { WM_NOTIFY, sent|id|defwinproc, 0, 0, LISTVIEW_ID }, + { WM_NOTIFY, sent|id|defwinproc, 0, 0, LISTVIEW_ID }, + { 0 } +}; + static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { static LONG defwndproc_counter = 0; @@ -4593,11 +4600,13 @@ static void test_destroynotify(void) static void test_header_notification(void) { + static char textA[] = "newtext"; HWND list, header; HDITEMA item; NMHEADER nmh; LVCOLUMNA col; LRESULT ret; + BOOL r; list = create_listview_control(LVS_REPORT); ok(list != NULL, "failed to create listview window\n"); @@ -4608,6 +4617,21 @@ static void test_header_notification(void) ret = SendMessage(list, LVM_INSERTCOLUMNA, 0, (LPARAM)&col); ok(!ret, "expected 0, got %ld\n", ret); + /* check list parent notification after header item changed, + this test should be placed before header subclassing to avoid + Listview -> Header messages to be logged */ + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + col.mask = LVCF_TEXT; + col.pszText = textA; + r = SendMessage(list, LVM_SETCOLUMNA, 0, (LPARAM)&col); + ok(r == TRUE, "got %d\n", r); + + ok_sequence(sequences, LISTVIEW_SEQ_INDEX, listview_header_changed_seq, + "header notify, listview", FALSE); + ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, + "header notify, parent", FALSE); + header = subclass_header(list); ret = SendMessage(header, HDM_GETITEMCOUNT, 0, 0);

1 0

Paul Chitescu : qcap: Initialize to NULL the content of ppPin, not the pointer itself.
by Alexandre Julliard 11 May '11

11 May '11

Module: wine Branch: master Commit: 84a39b4f636fe84d0470ac60b4182b384842c971 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84a39b4f636fe84d0470ac60b… Author: Paul Chitescu <paulc(a)voip.null.ro> Date: Wed May 11 04:45:59 2011 +0300 qcap: Initialize to NULL the content of ppPin, not the pointer itself. --- dlls/qcap/vfwcapture.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 8997480..1138a64 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -726,7 +726,7 @@ VfwPin_Construct( IBaseFilter * pBaseFilter, LPCRITICAL_SECTION pCritSec, PIN_INFO piOutput; HRESULT hr; - ppPin = NULL; + *ppPin = NULL; piOutput.dir = PINDIR_OUTPUT; piOutput.pFilter = pBaseFilter;

1 0

Eric Pouech : kernel32: In CreateFile, when trying to open the CON special DOS file, force OPEN_EXISTING as creation flag.
by Alexandre Julliard 11 May '11

11 May '11

Module: wine Branch: master Commit: 8a529d60e285308023bc56e7300a2a864289ae60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a529d60e285308023bc56e73… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue May 10 22:02:35 2011 +0200 kernel32: In CreateFile, when trying to open the CON special DOS file, force OPEN_EXISTING as creation flag. --- dlls/kernel32/file.c | 4 ++-- dlls/kernel32/tests/console.c | 18 ------------------ 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 6ee243e..537ea0a 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -1322,10 +1322,10 @@ HANDLE WINAPI CreateFileW( LPCWSTR filename, DWORD access, DWORD sharing, switch (access & (GENERIC_READ|GENERIC_WRITE)) { case GENERIC_READ: - ret = OpenConsoleW(coninW, access, (sa && sa->bInheritHandle), creation); + ret = OpenConsoleW(coninW, access, (sa && sa->bInheritHandle), OPEN_EXISTING); goto done; case GENERIC_WRITE: - ret = OpenConsoleW(conoutW, access, (sa && sa->bInheritHandle), creation); + ret = OpenConsoleW(conoutW, access, (sa && sa->bInheritHandle), OPEN_EXISTING); goto done; default: SetLastError( ERROR_FILE_NOT_FOUND ); diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 0cd88a3..07a090b 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -1002,7 +1002,6 @@ static void test_OpenCON(void) for (i = 0; i < sizeof(accesses) / sizeof(accesses[0]); i++) { - if (accesses[i] != OPEN_EXISTING) todo_wine { h = CreateFileW(conW, GENERIC_WRITE, 0, NULL, accesses[i], 0, NULL); ok(h != INVALID_HANDLE_VALUE, "Expected to open the CON device on write (%x)\n", accesses[i]); CloseHandle(h); @@ -1018,23 +1017,6 @@ static void test_OpenCON(void) ok(h != INVALID_HANDLE_VALUE, "Expected to open the CON device on read (%x)\n", accesses[i]); } CloseHandle(h); - } else { - h = CreateFileW(conW, GENERIC_WRITE, 0, NULL, accesses[i], 0, NULL); - ok(h != INVALID_HANDLE_VALUE, "Expected to open the CON device on write (%x)\n", accesses[i]); - CloseHandle(h); - - h = CreateFileW(conW, GENERIC_READ, 0, NULL, accesses[i], 0, NULL); - /* Windows versions differ here: - * MSDN states in CreateFile that TRUNCATE_EXISTING requires GENERIC_WRITE - * NT, XP, Vista comply, but Win7 doesn't and allows to open CON with TRUNCATE_EXISTING - * So don't test when disposition is TRUNCATE_EXISTING - */ - if (accesses[i] != TRUNCATE_EXISTING) - { - ok(h != INVALID_HANDLE_VALUE, "Expected to open the CON device on read (%x)\n", accesses[i]); - } - CloseHandle(h); - } h = CreateFileW(conW, GENERIC_READ|GENERIC_WRITE, 0, NULL, accesses[i], 0, NULL); ok(h == INVALID_HANDLE_VALUE, "Expected not to open the CON device on read-write (%x)\n", accesses[i]); ok(GetLastError() == ERROR_FILE_NOT_FOUND, "Unexpected error %x\n", GetLastError());

1 0

Eric Pouech : kernel32: Added some tests about CON special file treatment in CreateFile.
by Alexandre Julliard 11 May '11

11 May '11

Module: wine Branch: master Commit: fa8d5d166c4dd51de7c363c9928b1f95b36a114a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa8d5d166c4dd51de7c363c99… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue May 10 22:02:26 2011 +0200 kernel32: Added some tests about CON special file treatment in CreateFile. --- dlls/kernel32/tests/console.c | 50 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 50 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 15bb838..0cd88a3 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -992,6 +992,55 @@ static void test_GetConsoleProcessList(void) HeapFree(GetProcessHeap(), 0, list); } +static void test_OpenCON(void) +{ + static const WCHAR conW[] = {'C','O','N',0}; + static const DWORD accesses[] = {CREATE_NEW, CREATE_ALWAYS, OPEN_EXISTING, + OPEN_ALWAYS, TRUNCATE_EXISTING}; + unsigned i; + HANDLE h; + + for (i = 0; i < sizeof(accesses) / sizeof(accesses[0]); i++) + { + if (accesses[i] != OPEN_EXISTING) todo_wine { + h = CreateFileW(conW, GENERIC_WRITE, 0, NULL, accesses[i], 0, NULL); + ok(h != INVALID_HANDLE_VALUE, "Expected to open the CON device on write (%x)\n", accesses[i]); + CloseHandle(h); + + h = CreateFileW(conW, GENERIC_READ, 0, NULL, accesses[i], 0, NULL); + /* Windows versions differ here: + * MSDN states in CreateFile that TRUNCATE_EXISTING requires GENERIC_WRITE + * NT, XP, Vista comply, but Win7 doesn't and allows to open CON with TRUNCATE_EXISTING + * So don't test when disposition is TRUNCATE_EXISTING + */ + if (accesses[i] != TRUNCATE_EXISTING) + { + ok(h != INVALID_HANDLE_VALUE, "Expected to open the CON device on read (%x)\n", accesses[i]); + } + CloseHandle(h); + } else { + h = CreateFileW(conW, GENERIC_WRITE, 0, NULL, accesses[i], 0, NULL); + ok(h != INVALID_HANDLE_VALUE, "Expected to open the CON device on write (%x)\n", accesses[i]); + CloseHandle(h); + + h = CreateFileW(conW, GENERIC_READ, 0, NULL, accesses[i], 0, NULL); + /* Windows versions differ here: + * MSDN states in CreateFile that TRUNCATE_EXISTING requires GENERIC_WRITE + * NT, XP, Vista comply, but Win7 doesn't and allows to open CON with TRUNCATE_EXISTING + * So don't test when disposition is TRUNCATE_EXISTING + */ + if (accesses[i] != TRUNCATE_EXISTING) + { + ok(h != INVALID_HANDLE_VALUE, "Expected to open the CON device on read (%x)\n", accesses[i]); + } + CloseHandle(h); + } + h = CreateFileW(conW, GENERIC_READ|GENERIC_WRITE, 0, NULL, accesses[i], 0, NULL); + ok(h == INVALID_HANDLE_VALUE, "Expected not to open the CON device on read-write (%x)\n", accesses[i]); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "Unexpected error %x\n", GetLastError()); + } +} + static void test_OpenConsoleW(void) { static const WCHAR coninW[] = {'C','O','N','I','N','$',0}; @@ -2515,6 +2564,7 @@ START_TEST(console) test_GetConsoleProcessList(); test_OpenConsoleW(); + test_OpenCON(); test_VerifyConsoleIoHandle(hConOut); test_GetSetStdHandle(); test_GetNumberOfConsoleInputEvents(hConIn);

1 0

Henri Verbeet : wined3d: Get rid of the SHADER_LIMITS typedef.
by Alexandre Julliard 11 May '11

11 May '11

Module: wine Branch: master Commit: 26dd1ed0e93e990ede0f340be42c4d0dee692163 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26dd1ed0e93e990ede0f340be… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 10 21:18:48 2011 +0200 wined3d: Get rid of the SHADER_LIMITS typedef. --- dlls/wined3d/wined3d_private.h | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4d1ce8b..599f449 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2557,7 +2557,8 @@ typedef struct local_constant { DWORD value[4]; } local_constant; -typedef struct SHADER_LIMITS { +struct wined3d_shader_limits +{ unsigned int temporary; unsigned int texcoord; unsigned int sampler; @@ -2569,7 +2570,7 @@ typedef struct SHADER_LIMITS { unsigned int packed_input; unsigned int attributes; unsigned int label; -} SHADER_LIMITS; +}; #ifdef __GNUC__ #define PRINTF_ATTR(fmt,args) __attribute__((format (printf,fmt,args))) @@ -2606,7 +2607,7 @@ struct wined3d_pixel_shader struct wined3d_shader { LONG ref; - SHADER_LIMITS limits; + struct wined3d_shader_limits limits; DWORD *function; UINT functionLength; BOOL load_local_constsF;

1 0

Henri Verbeet : wined3d: Remove object creation methods from the IWineD3DDevice interface.
by Alexandre Julliard 11 May '11

11 May '11

1 0

Henri Verbeet : ddraw: Skip redundant mode setting calls.
by Alexandre Julliard 11 May '11

11 May '11

Module: wine Branch: master Commit: 5e4145d0ffc9856d3aceb4f5260f233a18a1ee3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e4145d0ffc9856d3aceb4f52… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 10 21:18:46 2011 +0200 ddraw: Skip redundant mode setting calls. --- dlls/ddraw/ddraw.c | 34 ++++++++++++++++++++++++++-------- dlls/ddraw/tests/d3d.c | 2 +- 2 files changed, 27 insertions(+), 9 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 9b87b95..fb032cb 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -830,6 +830,7 @@ static HRESULT WINAPI ddraw1_SetCooperativeLevel(IDirectDraw *iface, HWND window static HRESULT ddraw_set_display_mode(IDirectDrawImpl *ddraw, DWORD Width, DWORD Height, DWORD BPP, DWORD RefreshRate, DWORD Flags) { + enum wined3d_format_id format; WINED3DDISPLAYMODE Mode; HRESULT hr; @@ -845,6 +846,30 @@ static HRESULT ddraw_set_display_mode(IDirectDrawImpl *ddraw, DWORD Width, DWORD return DD_OK; } + switch(BPP) + { + case 8: format = WINED3DFMT_P8_UINT; break; + case 15: format = WINED3DFMT_B5G5R5X1_UNORM; break; + case 16: format = WINED3DFMT_B5G6R5_UNORM; break; + case 24: format = WINED3DFMT_B8G8R8_UNORM; break; + case 32: format = WINED3DFMT_B8G8R8X8_UNORM; break; + default: format = WINED3DFMT_UNKNOWN; break; + } + + if (FAILED(hr = IWineD3DDevice_GetDisplayMode(ddraw->wineD3DDevice, 0, &Mode))) + { + ERR("Failed to get current display mode, hr %#x.\n", hr); + } + else if (Mode.Width == Width + && Mode.Height == Height + && Mode.Format == format + && Mode.RefreshRate == RefreshRate) + { + TRACE("Skipping redundant mode setting call.\n"); + LeaveCriticalSection(&ddraw_cs); + return DD_OK; + } + /* Check the exclusive mode if(!(ddraw->cooperative_level & DDSCL_EXCLUSIVE)) return DDERR_NOEXCLUSIVEMODE; @@ -857,14 +882,7 @@ static HRESULT ddraw_set_display_mode(IDirectDrawImpl *ddraw, DWORD Width, DWORD Mode.Width = Width; Mode.Height = Height; Mode.RefreshRate = RefreshRate; - switch(BPP) - { - case 8: Mode.Format = WINED3DFMT_P8_UINT; break; - case 15: Mode.Format = WINED3DFMT_B5G5R5X1_UNORM; break; - case 16: Mode.Format = WINED3DFMT_B5G6R5_UNORM; break; - case 24: Mode.Format = WINED3DFMT_B8G8R8_UNORM; break; - case 32: Mode.Format = WINED3DFMT_B8G8R8X8_UNORM; break; - } + Mode.Format = format; /* TODO: The possible return values from msdn suggest that * the screen mode can't be changed if a surface is locked diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index e301fff..6511a26 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -3974,7 +3974,7 @@ static void test_redundant_mode_set(void) ok(SUCCEEDED(hr), "SetDipslayMode failed, hr %#x.\n", hr); GetWindowRect(window, &s); - todo_wine ok(EqualRect(&r, &s), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", + ok(EqualRect(&r, &s), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", r.left, r.top, r.right, r.bottom, s.left, s.top, s.right, s.bottom);

1 0

Henri Verbeet : ddraw/tests: Add a small test for redundant mode setting calls.
by Alexandre Julliard 11 May '11

11 May '11

Module: wine Branch: master Commit: 87b45c3545ec231d868ccdf26ec859751346f3bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=87b45c3545ec231d868ccdf26… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 10 21:18:45 2011 +0200 ddraw/tests: Add a small test for redundant mode setting calls. --- dlls/ddraw/tests/d3d.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 60 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 7ad7492..e301fff 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -3924,6 +3924,65 @@ static void test_window_style(void) DestroyWindow(window); } +static void test_redundant_mode_set(void) +{ + DDSURFACEDESC2 surface_desc = {0}; + IDirectDraw7 *ddraw7; + HWND window; + HRESULT hr; + RECT r, s; + ULONG ref; + + hr = pDirectDrawCreateEx(NULL, (void **)&ddraw7, &IID_IDirectDraw7, NULL); + if (FAILED(hr)) + { + skip("Failed to create IDirectDraw7 object (%#x), skipping tests.\n", hr); + return; + } + + window = CreateWindowA("static", "d3d7_test", WS_OVERLAPPEDWINDOW, + 0, 0, 100, 100, 0, 0, 0, 0); + + hr = IDirectDraw7_SetCooperativeLevel(ddraw7, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + if (FAILED(hr)) + { + IDirectDraw7_Release(ddraw7); + DestroyWindow(window); + return; + } + + surface_desc.dwSize = sizeof(surface_desc); + hr = IDirectDraw7_GetDisplayMode(ddraw7, &surface_desc); + ok(SUCCEEDED(hr), "GetDipslayMode failed, hr %#x.\n", hr); + + hr = IDirectDraw7_SetDisplayMode(ddraw7, surface_desc.dwWidth, surface_desc.dwHeight, + U1(U4(surface_desc).ddpfPixelFormat).dwRGBBitCount, 0, 0); + ok(SUCCEEDED(hr), "SetDipslayMode failed, hr %#x.\n", hr); + + GetWindowRect(window, &r); + r.right /= 2; + r.bottom /= 2; + SetWindowPos(window, HWND_TOP, r.left, r.top, r.right, r.bottom, 0); + GetWindowRect(window, &s); + ok(EqualRect(&r, &s), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", + r.left, r.top, r.right, r.bottom, + s.left, s.top, s.right, s.bottom); + + hr = IDirectDraw7_SetDisplayMode(ddraw7, surface_desc.dwWidth, surface_desc.dwHeight, + U1(U4(surface_desc).ddpfPixelFormat).dwRGBBitCount, 0, 0); + ok(SUCCEEDED(hr), "SetDipslayMode failed, hr %#x.\n", hr); + + GetWindowRect(window, &s); + todo_wine ok(EqualRect(&r, &s), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", + r.left, r.top, r.right, r.bottom, + s.left, s.top, s.right, s.bottom); + + ref = IDirectDraw7_Release(ddraw7); + ok(ref == 0, "The ddraw object was not properly freed: refcount %u.\n", ref); + + DestroyWindow(window); +} START_TEST(d3d) { init_function_pointers(); @@ -3966,4 +4025,5 @@ START_TEST(d3d) test_wndproc(); test_window_style(); + test_redundant_mode_set(); }

1 0

Henri Verbeet : wined3d: Set SFLAG_DYNLOCK for lockable render targets.
by Alexandre Julliard 11 May '11

11 May '11

Module: wine Branch: master Commit: e6ab3832b20707108f8611a32ae61085ee4f76d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6ab3832b20707108f8611a32… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 10 21:18:44 2011 +0200 wined3d: Set SFLAG_DYNLOCK for lockable render targets. --- dlls/wined3d/surface.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index ff84102..9891b96 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -7423,6 +7423,15 @@ HRESULT surface_init(struct wined3d_surface *surface, WINED3DSURFTYPE surface_ty surface->flags |= SFLAG_DISCARD; if (lockable || format_id == WINED3DFMT_D16_LOCKABLE) surface->flags |= SFLAG_LOCKABLE; + /* I'm not sure if this qualifies as a hack or as an optimization. It + * seems reasonable to assume that lockable render targets will get + * locked, so we might as well set SFLAG_DYNLOCK right at surface + * creation. However, the other reason we want to do this is that several + * ddraw applications access surface memory while the surface isn't + * mapped. The SFLAG_DYNLOCK behaviour of keeping SYSMEM around for + * future locks prevents these from crashing. */ + if (lockable && (usage & WINED3DUSAGE_RENDERTARGET)) + surface->flags |= SFLAG_DYNLOCK; /* Mark the texture as dirty so that it gets loaded first time around. */ surface_add_dirty_rect(surface, NULL);

1 0

André Hentschel : include: Fall back to little endian when it's not specified on ARM.
by Alexandre Julliard 11 May '11

11 May '11

Module: wine Branch: master Commit: a1950b9669c6b1d8455b904c1ac63b856ca6f34c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1950b9669c6b1d8455b904c1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue May 10 20:49:58 2011 +0200 include: Fall back to little endian when it's not specified on ARM. --- include/basetsd.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/basetsd.h b/include/basetsd.h index 1259ad9..852f6f4 100644 --- a/include/basetsd.h +++ b/include/basetsd.h @@ -295,7 +295,7 @@ typedef ULONG_PTR KAFFINITY, *PKAFFINITY; # define WORDS_BIGENDIAN # define BITFIELDS_BIGENDIAN # undef ALLOW_UNALIGNED_ACCESS -#elif defined(__ARMEL__) +#elif defined(__ARMEL__) || defined(__arm__) # undef WORDS_BIGENDIAN # undef BITFIELDS_BIGENDIAN # undef ALLOW_UNALIGNED_ACCESS

1 0

← Newer
1
...
64
65
66
67
68
69
70
...
95
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 May 2011