November 2011 - Wine-Commits

Henri Verbeet : wined3d: Get rid of the wineD3DSurface_DIB typedef.
by Alexandre Julliard Nov. 8, 2011

Nov. 8, 2011

Module: wine Branch: master Commit: 1e1c442aca52d001f27b7a5455abb9322a876933 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e1c442aca52d001f27b7a545… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 7 21:20:00 2011 +0100 wined3d: Get rid of the wineD3DSurface_DIB typedef. --- dlls/wined3d/wined3d_private.h | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d573d9f..b5b335f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1942,14 +1942,12 @@ void volume_add_dirty_box(struct wined3d_volume *volume, const WINED3DBOX *dirty void volume_load(const struct wined3d_volume *volume, struct wined3d_context *context, UINT level, BOOL srgb_mode) DECLSPEC_HIDDEN; void volume_set_container(struct wined3d_volume *volume, struct wined3d_texture *container) DECLSPEC_HIDDEN; -/***************************************************************************** - * Structure for DIB Surfaces (GetDC and GDI surfaces) - */ -typedef struct wineD3DSurface_DIB { +struct wined3d_surface_dib +{ HBITMAP DIBsection; - void* bitmap_data; + void *bitmap_data; UINT bitmap_size; -} wineD3DSurface_DIB; +}; struct wined3d_renderbuffer_entry { @@ -2035,7 +2033,7 @@ struct wined3d_surface #define MAXLOCKCOUNT 50 /* After this amount of locks do not free the sysmem copy */ /* For GetDC */ - wineD3DSurface_DIB dib; + struct wined3d_surface_dib dib; HDC hDC; /* Color keys for DDraw */

1 0

Henri Verbeet : wined3d: Get rid of client_memory from wineD3DSurface_DIB.
by Alexandre Julliard Nov. 8, 2011

Nov. 8, 2011

Module: wine Branch: master Commit: d6b432b06893888c530c7ad9c28527595c146f7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6b432b06893888c530c7ad9c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 7 21:19:59 2011 +0100 wined3d: Get rid of client_memory from wineD3DSurface_DIB. --- dlls/wined3d/surface.c | 8 -------- dlls/wined3d/swapchain.c | 8 -------- dlls/wined3d/wined3d_private.h | 1 - 3 files changed, 0 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 7af21b4..5d32512 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4800,14 +4800,6 @@ void flip_surface(struct wined3d_surface *front, struct wined3d_surface *back) back->pbo = tmp_pbo; } - /* client_memory should not be different, but just in case */ - { - BOOL tmp; - tmp = front->dib.client_memory; - front->dib.client_memory = back->dib.client_memory; - back->dib.client_memory = tmp; - } - /* Flip the opengl texture */ { GLuint tmp; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 7d7be5b..a02a189 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -787,14 +787,6 @@ static HRESULT swapchain_gdi_present(struct wined3d_swapchain *swapchain, const ERR("GDI Surface %p has heap memory allocated.\n", back); } - /* Client_memory should not be different, but just in case. */ - { - BOOL tmp; - tmp = front->dib.client_memory; - front->dib.client_memory = back->dib.client_memory; - back->dib.client_memory = tmp; - } - /* FPS support */ if (TRACE_ON(fps)) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e81ff88..d573d9f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1949,7 +1949,6 @@ typedef struct wineD3DSurface_DIB { HBITMAP DIBsection; void* bitmap_data; UINT bitmap_size; - BOOL client_memory; } wineD3DSurface_DIB; struct wined3d_renderbuffer_entry

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard Nov. 8, 2011

Nov. 8, 2011

Module: wine Branch: master Commit: 3abd9354695a69d086ef5bfe7a5b6116a32f169f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3abd9354695a69d086ef5bfe7… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Mon Oct 31 20:16:19 2011 +0200 po: Update Lithuanian translation. --- po/lt.po | 38 ++++++++++++++++++-------------------- 1 files changed, 18 insertions(+), 20 deletions(-) diff --git a/po/lt.po b/po/lt.po index 1f6f589..fe3f460 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-10-31 20:15+0300\n" +"PO-Revision-Date: 2011-11-07 22:04+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -2039,73 +2039,71 @@ msgstr "%u MB sunaudota, %u MB laisva" #: gdi32.rc:25 msgid "Western" -msgstr "" +msgstr "Vakarų Europos" #: gdi32.rc:26 msgid "Central European" -msgstr "" +msgstr "Vidurio Europos" #: gdi32.rc:27 msgid "Cyrillic" -msgstr "" +msgstr "Kirilica" #: gdi32.rc:28 -#, fuzzy msgid "Greek" -msgstr "Tamsiai žalia" +msgstr "Graikų" #: gdi32.rc:29 msgid "Turkish" -msgstr "" +msgstr "Turkų" #: gdi32.rc:30 msgid "Hebrew" -msgstr "" +msgstr "Hebrajų" #: gdi32.rc:31 msgid "Arabic" -msgstr "" +msgstr "Arabų" #: gdi32.rc:32 msgid "Baltic" -msgstr "" +msgstr "Baltų" #: gdi32.rc:33 msgid "Vietnamese" -msgstr "" +msgstr "Vietnamiečių" #: gdi32.rc:34 msgid "Thai" -msgstr "" +msgstr "Tajų" #: gdi32.rc:35 -#, fuzzy msgid "Japanese" -msgstr "polangis" +msgstr "Japonų" #: gdi32.rc:36 msgid "CHINESE_GB2312" -msgstr "" +msgstr "CHINESE_GB2312" #: gdi32.rc:37 msgid "Hangul" -msgstr "" +msgstr "Hangul" #: gdi32.rc:38 msgid "CHINESE_BIG5" -msgstr "" +msgstr "CHINESE_BIG5" #: gdi32.rc:39 msgid "Hangul(Johab)" -msgstr "" +msgstr "Hangul (Johab)" #: gdi32.rc:40 msgid "Symbol" -msgstr "" +msgstr "Simboliai" #: gdi32.rc:41 msgid "OEM/DOS" -msgstr "" +msgstr "OEM/DOS" #: hhctrl.rc:56 msgid "S&ync"

1 0

Henri Verbeet : wined3d: Get rid of holdbitmap from wineD3DSurface_DIB.
by Alexandre Julliard Nov. 8, 2011

Nov. 8, 2011

Module: wine Branch: master Commit: 896aaa67ca28d2a40ce21a92f14776f80f29de89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=896aaa67ca28d2a40ce21a92f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 7 21:19:58 2011 +0100 wined3d: Get rid of holdbitmap from wineD3DSurface_DIB. --- dlls/wined3d/device.c | 3 --- dlls/wined3d/surface.c | 7 +------ dlls/wined3d/wined3d_private.h | 1 - 3 files changed, 1 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 05a0ad8..b271f5b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5220,10 +5220,7 @@ static HRESULT updateSurfaceDesc(struct wined3d_surface *surface, /* Reallocate proper memory for the front and back buffer and adjust their sizes */ if (surface->flags & SFLAG_DIBSECTION) { - /* Release the DC */ - SelectObject(surface->hDC, surface->dib.holdbitmap); DeleteDC(surface->hDC); - /* Release the DIB section */ DeleteObject(surface->dib.DIBsection); surface->dib.bitmap_data = NULL; surface->resource.allocatedMemory = NULL; diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 4529ad0..7af21b4 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -97,10 +97,7 @@ static void surface_cleanup(struct wined3d_surface *surface) if (surface->flags & SFLAG_DIBSECTION) { - /* Release the DC. */ - SelectObject(surface->hDC, surface->dib.holdbitmap); DeleteDC(surface->hDC); - /* Release the DIB section. */ DeleteObject(surface->dib.DIBsection); surface->dib.bitmap_data = NULL; surface->resource.allocatedMemory = NULL; @@ -511,7 +508,7 @@ static HRESULT surface_create_dib_section(struct wined3d_surface *surface) /* Now allocate a DC. */ surface->hDC = CreateCompatibleDC(0); - surface->dib.holdbitmap = SelectObject(surface->hDC, surface->dib.DIBsection); + SelectObject(surface->hDC, surface->dib.DIBsection); TRACE("Using wined3d palette %p.\n", surface->palette); SelectPalette(surface->hDC, surface->palette ? surface->palette->hpal : 0, FALSE); @@ -3139,9 +3136,7 @@ HRESULT CDECL wined3d_surface_set_mem(struct wined3d_surface *surface, void *mem /* Do I have to copy the old surface content? */ if (surface->flags & SFLAG_DIBSECTION) { - SelectObject(surface->hDC, surface->dib.holdbitmap); DeleteDC(surface->hDC); - /* Release the DIB section. */ DeleteObject(surface->dib.DIBsection); surface->dib.bitmap_data = NULL; surface->resource.allocatedMemory = NULL; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2e3fef1..e81ff88 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1949,7 +1949,6 @@ typedef struct wineD3DSurface_DIB { HBITMAP DIBsection; void* bitmap_data; UINT bitmap_size; - HGDIOBJ holdbitmap; BOOL client_memory; } wineD3DSurface_DIB;

1 0

Dmitry Timoshkov : kernel32: Add a bunch of tests for protections accepted by VirtualAlloc, make it pass under Wine.
by Alexandre Julliard Nov. 8, 2011

Nov. 8, 2011

Module: wine Branch: master Commit: a93f86716f6a20de66c4c1bc3ef1fc513f3539c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a93f86716f6a20de66c4c1bc3… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Nov 8 17:10:05 2011 +0800 kernel32: Add a bunch of tests for protections accepted by VirtualAlloc, make it pass under Wine. --- dlls/kernel32/tests/virtual.c | 80 +++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/virtual.c | 1 + 2 files changed, 81 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index d0b9f4f..aefa9d0 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -1523,6 +1523,85 @@ static void test_VirtualProtect(void) VirtualFree(base, 0, MEM_FREE); } +static void test_VirtualAlloc_protection(void) +{ + static const struct test_data + { + DWORD prot; + BOOL success; + } td[] = + { + { 0, FALSE }, /* 0x00 */ + { PAGE_NOACCESS, TRUE }, /* 0x01 */ + { PAGE_READONLY, TRUE }, /* 0x02 */ + { PAGE_READONLY | PAGE_NOACCESS, FALSE }, /* 0x03 */ + { PAGE_READWRITE, TRUE }, /* 0x04 */ + { PAGE_READWRITE | PAGE_NOACCESS, FALSE }, /* 0x05 */ + { PAGE_READWRITE | PAGE_READONLY, FALSE }, /* 0x06 */ + { PAGE_READWRITE | PAGE_READONLY | PAGE_NOACCESS, FALSE }, /* 0x07 */ + { PAGE_WRITECOPY, FALSE }, /* 0x08 */ + { PAGE_WRITECOPY | PAGE_NOACCESS, FALSE }, /* 0x09 */ + { PAGE_WRITECOPY | PAGE_READONLY, FALSE }, /* 0x0a */ + { PAGE_WRITECOPY | PAGE_NOACCESS | PAGE_READONLY, FALSE }, /* 0x0b */ + { PAGE_WRITECOPY | PAGE_READWRITE, FALSE }, /* 0x0c */ + { PAGE_WRITECOPY | PAGE_READWRITE | PAGE_NOACCESS, FALSE }, /* 0x0d */ + { PAGE_WRITECOPY | PAGE_READWRITE | PAGE_READONLY, FALSE }, /* 0x0e */ + { PAGE_WRITECOPY | PAGE_READWRITE | PAGE_READONLY | PAGE_NOACCESS, FALSE }, /* 0x0f */ + + { PAGE_EXECUTE, TRUE }, /* 0x10 */ + { PAGE_EXECUTE_READ, TRUE }, /* 0x20 */ + { PAGE_EXECUTE_READ | PAGE_EXECUTE, FALSE }, /* 0x30 */ + { PAGE_EXECUTE_READWRITE, TRUE }, /* 0x40 */ + { PAGE_EXECUTE_READWRITE | PAGE_EXECUTE, FALSE }, /* 0x50 */ + { PAGE_EXECUTE_READWRITE | PAGE_EXECUTE_READ, FALSE }, /* 0x60 */ + { PAGE_EXECUTE_READWRITE | PAGE_EXECUTE_READ | PAGE_EXECUTE, FALSE }, /* 0x70 */ + { PAGE_EXECUTE_WRITECOPY, FALSE }, /* 0x80 */ + { PAGE_EXECUTE_WRITECOPY | PAGE_EXECUTE, FALSE }, /* 0x90 */ + { PAGE_EXECUTE_WRITECOPY | PAGE_EXECUTE_READ, FALSE }, /* 0xa0 */ + { PAGE_EXECUTE_WRITECOPY | PAGE_EXECUTE_READ | PAGE_EXECUTE, FALSE }, /* 0xb0 */ + { PAGE_EXECUTE_WRITECOPY | PAGE_EXECUTE_READWRITE, FALSE }, /* 0xc0 */ + { PAGE_EXECUTE_WRITECOPY | PAGE_EXECUTE_READWRITE | PAGE_EXECUTE, FALSE }, /* 0xd0 */ + { PAGE_EXECUTE_WRITECOPY | PAGE_EXECUTE_READWRITE | PAGE_EXECUTE_READ, FALSE }, /* 0xe0 */ + { PAGE_EXECUTE_WRITECOPY | PAGE_EXECUTE_READWRITE | PAGE_EXECUTE_READ | PAGE_EXECUTE, FALSE } /* 0xf0 */ + }; + char *base; + DWORD ret, i; + MEMORY_BASIC_INFORMATION info; + SYSTEM_INFO si; + + GetSystemInfo(&si); + trace("system page size %#x\n", si.dwPageSize); + + for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) + { + SetLastError(0xdeadbeef); + base = VirtualAlloc(0, si.dwPageSize, MEM_RESERVE | MEM_COMMIT, td[i].prot); + + if (td[i].success) + { + ok(base != NULL, "%d: VirtualAlloc failed %d\n", i, GetLastError()); + + SetLastError(0xdeadbeef); + ret = VirtualQuery(base, &info, sizeof(info)); + ok(ret, "VirtualQuery failed %d\n", GetLastError()); + ok(info.BaseAddress == base, "%d: got %p != expected %p\n", i, info.BaseAddress, base); + ok(info.RegionSize == si.dwPageSize, "%d: got %#lx != expected %#x\n", i, info.RegionSize, si.dwPageSize); + ok(info.Protect == td[i].prot, "%d: got %#x != expected %#x\n", i, info.Protect, td[i].prot); + ok(info.AllocationBase == base, "%d: %p != %p\n", i, info.AllocationBase, base); + ok(info.AllocationProtect == td[i].prot, "%d: %#x != %#x\n", i, info.AllocationProtect, td[i].prot); + ok(info.State == MEM_COMMIT, "%d: %#x != MEM_COMMIT\n", i, info.State); + ok(info.Type == MEM_PRIVATE, "%d: %#x != MEM_PRIVATE\n", i, info.Type); + + VirtualFree(base, 0, MEM_FREE); + } + else + { + ok(!base, "%d: VirtualAlloc should fail\n", i); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "%d: expected ERROR_INVALID_PARAMETER, got %d\n", i, GetLastError()); + } + } +} + START_TEST(virtual) { int argc; @@ -1558,6 +1637,7 @@ START_TEST(virtual) pResetWriteWatch = (void *) GetProcAddress(hkernel32, "ResetWriteWatch"); pNtAreMappedFilesTheSame = (void *)GetProcAddress( GetModuleHandle("ntdll.dll"), "NtAreMappedFilesTheSame" ); + test_VirtualAlloc_protection(); test_VirtualProtect(); test_VirtualAllocEx(); test_VirtualAlloc(); diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 8c5e773..fb8786f 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1870,6 +1870,7 @@ NTSTATUS WINAPI NtAllocateVirtualMemory( HANDLE process, PVOID *ret, ULONG zero_ if (is_beyond_limit( 0, size, working_set_limit )) return STATUS_WORKING_SET_LIMIT_RANGE; if ((status = get_vprot_flags( protect, &vprot ))) return status; + if (vprot & VPROT_WRITECOPY) return STATUS_INVALID_PAGE_PROTECTION; vprot |= VPROT_VALLOC; if (type & MEM_COMMIT) vprot |= VPROT_COMMITTED;

1 0

Dmitry Timoshkov : ntdll: Use PAGE_EXECUTE_READWRITE protection when allocating stubs.
by Alexandre Julliard Nov. 8, 2011

Nov. 8, 2011

Module: wine Branch: master Commit: 26f4ff1a389a7f38fcd29c25cea297efa8315795 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26f4ff1a389a7f38fcd29c25c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Nov 8 17:09:17 2011 +0800 ntdll: Use PAGE_EXECUTE_READWRITE protection when allocating stubs. --- dlls/ntdll/loader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 314813f..311fd38 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -242,7 +242,7 @@ static ULONG_PTR allocate_stub( const char *dll, const char *name ) { SIZE_T size = MAX_SIZE; if (NtAllocateVirtualMemory( NtCurrentProcess(), (void **)&stubs, 0, &size, - MEM_COMMIT, PAGE_EXECUTE_WRITECOPY ) != STATUS_SUCCESS) + MEM_COMMIT, PAGE_EXECUTE_READWRITE ) != STATUS_SUCCESS) return 0xdeadbeef; } stub = &stubs[nb_stubs++];

1 0

Henri Verbeet : wined3d: Only report a broken pitch in wined3d_surface_map( ).
by Alexandre Julliard Nov. 8, 2011

Nov. 8, 2011

Module: wine Branch: master Commit: 604d15400274a07f3eb0231688e2e09b6edb8355 URL: http://source.winehq.org/git/wine.git/?a=commit;h=604d15400274a07f3eb023168… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 7 21:19:57 2011 +0100 wined3d: Only report a broken pitch in wined3d_surface_map(). We'd like the correct pitch for internal calls to wined3d_surface_get_pitch(). --- dlls/wined3d/surface.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 1a44f72..4529ad0 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3096,7 +3096,7 @@ DWORD CDECL wined3d_surface_get_pitch(const struct wined3d_surface *surface) TRACE("surface %p.\n", surface); - if ((format->flags & (WINED3DFMT_FLAG_BLOCKS | WINED3DFMT_FLAG_BROKEN_PITCH)) == WINED3DFMT_FLAG_BLOCKS) + if (format->flags & WINED3DFMT_FLAG_BLOCKS) { /* Since compressed formats are block based, pitch means the amount of * bytes to the next row of block rather than the next row of pixels. */ @@ -3743,7 +3743,10 @@ HRESULT CDECL wined3d_surface_map(struct wined3d_surface *surface, surface->surface_ops->surface_map(surface, rect, flags); - locked_rect->Pitch = wined3d_surface_get_pitch(surface); + if (format->flags & WINED3DFMT_FLAG_BROKEN_PITCH) + locked_rect->Pitch = surface->resource.width * format->byte_count; + else + locked_rect->Pitch = wined3d_surface_get_pitch(surface); if (!rect) {

1 0

Nikolay Sivov : msxml3: Implement get_srcText().
by Alexandre Julliard Nov. 8, 2011

Nov. 8, 2011

Module: wine Branch: master Commit: 9397fb2ad76f4ea581313f3b28e90dc7eb5eb909 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9397fb2ad76f4ea581313f3b2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 4 23:27:39 2011 +0300 msxml3: Implement get_srcText(). --- dlls/msxml3/parseerror.c | 10 ++++++++-- dlls/msxml3/tests/domdoc.c | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/parseerror.c b/dlls/msxml3/parseerror.c index c461095..3d32b32 100644 --- a/dlls/msxml3/parseerror.c +++ b/dlls/msxml3/parseerror.c @@ -243,8 +243,14 @@ static HRESULT WINAPI parseError_get_srcText( BSTR *srcText ) { parse_error_t *This = impl_from_IXMLDOMParseError( iface ); - FIXME("(%p)->(%p)\n", This, srcText); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, srcText); + + if (!srcText) return E_INVALIDARG; + + *srcText = SysAllocString(This->srcText); + + return S_OK; } static HRESULT WINAPI parseError_get_line( diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index eeff419..197a5ac 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -10767,7 +10767,7 @@ static void test_parseerror(void) EXPECT_HR(hr, E_INVALIDARG); hr = IXMLDOMParseError_get_srcText(error, NULL); - todo_wine EXPECT_HR(hr, E_INVALIDARG); + EXPECT_HR(hr, E_INVALIDARG); hr = IXMLDOMParseError_get_linepos(error, NULL); EXPECT_HR(hr, E_INVALIDARG);

1 0

Francois Gouget : winealsa.drv: Delete the g_sessions_lock critical section when unloading the dll.
by Alexandre Julliard Nov. 8, 2011

Nov. 8, 2011

Module: wine Branch: master Commit: 9b55cc9e6fdd33c4c9a11ea21e0683b0952fe666 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b55cc9e6fdd33c4c9a11ea21… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Nov 7 16:52:40 2011 +0100 winealsa.drv: Delete the g_sessions_lock critical section when unloading the dll. --- dlls/winealsa.drv/mmdevdrv.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 25693c0..bc1ca94 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -219,12 +219,19 @@ static inline SessionMgr *impl_from_IAudioSessionManager2(IAudioSessionManager2 BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) { - if(reason == DLL_PROCESS_ATTACH){ + switch (reason) + { + case DLL_PROCESS_ATTACH: g_timer_q = CreateTimerQueue(); if(!g_timer_q) return FALSE; - } + break; + case DLL_PROCESS_DETACH: + g_sessions_lock.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&g_sessions_lock); + break; + } return TRUE; }

1 0

Alexandre Julliard : gdi32: Return the original brush data in GetObject.
by Alexandre Julliard Nov. 8, 2011

Nov. 8, 2011

Module: wine Branch: master Commit: b47debddf533db275d19dbad9b230a283cef1cd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b47debddf533db275d19dbad9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 3 20:18:59 2011 +0100 gdi32: Return the original brush data in GetObject. --- dlls/gdi32/brush.c | 5 ++--- dlls/gdi32/tests/brush.c | 16 ++++++++-------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/gdi32/brush.c b/dlls/gdi32/brush.c index 19372d1..5cbae61 100644 --- a/dlls/gdi32/brush.c +++ b/dlls/gdi32/brush.c @@ -161,7 +161,6 @@ HBRUSH WINAPI CreateBrushIndirect( const LOGBRUSH * brush ) case BS_PATTERN: ptr->bitmap = BITMAP_CopyBitmap( (HBITMAP)ptr->logbrush.lbHatch ); if (!ptr->bitmap) goto error; - ptr->logbrush.lbHatch = (ULONG_PTR)ptr->bitmap; ptr->logbrush.lbColor = 0; break; @@ -176,7 +175,7 @@ HBRUSH WINAPI CreateBrushIndirect( const LOGBRUSH * brush ) if (!ptr->info) goto error; ptr->bits.ptr = (char *)ptr->info + bitmap_info_size( ptr->info, ptr->usage ); ptr->logbrush.lbStyle = BS_DIBPATTERN; - ptr->logbrush.lbHatch = (ULONG_PTR)ptr->info; + ptr->logbrush.lbColor = 0; break; case BS_DIBPATTERN8X8: @@ -446,7 +445,7 @@ static HGDIOBJ BRUSH_SelectObject( HGDIOBJ handle, HDC hdc ) if(pattern_dev == dc->dibdrv) pattern_dev = GET_NEXT_PHYSDEV( physdev, pSelectBrush ); - BITMAP_SetOwnerDC( (HBITMAP)brush->logbrush.lbHatch, pattern_dev ); + BITMAP_SetOwnerDC( bitmap, pattern_dev ); } info = brush->info; diff --git a/dlls/gdi32/tests/brush.c b/dlls/gdi32/tests/brush.c index a02209f..f0ef2df 100644 --- a/dlls/gdi32/tests/brush.c +++ b/dlls/gdi32/tests/brush.c @@ -100,7 +100,7 @@ static void test_pattern_brush(void) ok( ret == sizeof(br), "wrong size %u\n", ret ); ok( br.lbStyle == BS_PATTERN, "wrong style %u\n", br.lbStyle ); ok( br.lbColor == 0, "wrong color %u\n", br.lbColor ); - todo_wine ok( (HBITMAP)br.lbHatch == bitmap, "wrong handle %p/%p\n", (HBITMAP)br.lbHatch, bitmap ); + ok( (HBITMAP)br.lbHatch == bitmap, "wrong handle %p/%p\n", (HBITMAP)br.lbHatch, bitmap ); DeleteObject( brush ); br.lbStyle = BS_PATTERN8X8; @@ -113,7 +113,7 @@ static void test_pattern_brush(void) ok( ret == sizeof(br), "wrong size %u\n", ret ); ok( br.lbStyle == BS_PATTERN, "wrong style %u\n", br.lbStyle ); ok( br.lbColor == 0, "wrong color %u\n", br.lbColor ); - todo_wine ok( (HBITMAP)br.lbHatch == bitmap, "wrong handle %p/%p\n", (HBITMAP)br.lbHatch, bitmap ); + ok( (HBITMAP)br.lbHatch == bitmap, "wrong handle %p/%p\n", (HBITMAP)br.lbHatch, bitmap ); ret = GetObjectW( bitmap, sizeof(dib), &dib ); ok( ret == sizeof(dib.dsBm), "wrong size %u\n", ret ); DeleteObject( bitmap ); @@ -139,7 +139,7 @@ static void test_pattern_brush(void) ok( ret == sizeof(br), "wrong size %u\n", ret ); ok( br.lbStyle == BS_PATTERN, "wrong style %u\n", br.lbStyle ); ok( br.lbColor == 0, "wrong color %u\n", br.lbColor ); - todo_wine ok( (HBITMAP)br.lbHatch == bitmap, "wrong handle %p/%p\n", (HBITMAP)br.lbHatch, bitmap ); + ok( (HBITMAP)br.lbHatch == bitmap, "wrong handle %p/%p\n", (HBITMAP)br.lbHatch, bitmap ); ret = GetObjectW( bitmap, sizeof(dib), &dib ); ok( ret == sizeof(dib), "wrong size %u\n", ret ); DeleteObject( brush ); @@ -152,7 +152,7 @@ static void test_pattern_brush(void) ok( ret == sizeof(br), "wrong size %u\n", ret ); ok( br.lbStyle == BS_DIBPATTERN, "wrong style %u\n", br.lbStyle ); ok( br.lbColor == 0, "wrong color %u\n", br.lbColor ); - todo_wine ok( (BITMAPINFO *)br.lbHatch == info || broken(!br.lbHatch), /* nt4 */ + ok( (BITMAPINFO *)br.lbHatch == info || broken(!br.lbHatch), /* nt4 */ "wrong handle %p/%p\n", (BITMAPINFO *)br.lbHatch, info ); DeleteObject( brush ); @@ -165,8 +165,8 @@ static void test_pattern_brush(void) ret = GetObjectW( brush, sizeof(br), &br ); ok( ret == sizeof(br), "wrong size %u\n", ret ); ok( br.lbStyle == BS_DIBPATTERN, "wrong style %u\n", br.lbStyle ); - todo_wine ok( br.lbColor == 0, "wrong color %u\n", br.lbColor ); - todo_wine ok( (BITMAPINFO *)br.lbHatch == info || broken(!br.lbHatch), /* nt4 */ + ok( br.lbColor == 0, "wrong color %u\n", br.lbColor ); + ok( (BITMAPINFO *)br.lbHatch == info || broken(!br.lbHatch), /* nt4 */ "wrong handle %p/%p\n", (BITMAPINFO *)br.lbHatch, info ); mem = GlobalAlloc( GMEM_MOVEABLE, sizeof(buffer) ); @@ -181,10 +181,10 @@ static void test_pattern_brush(void) ret = GetObjectW( brush, sizeof(br), &br ); ok( ret == sizeof(br), "wrong size %u\n", ret ); ok( br.lbStyle == BS_DIBPATTERN, "wrong style %u\n", br.lbStyle ); - todo_wine ok( br.lbColor == 0, "wrong color %u\n", br.lbColor ); + ok( br.lbColor == 0, "wrong color %u\n", br.lbColor ); ok( (HGLOBAL)br.lbHatch != mem, "wrong handle %p/%p\n", (HGLOBAL)br.lbHatch, mem ); bits = GlobalLock( mem ); - todo_wine ok( (HGLOBAL)br.lbHatch == bits || broken(!br.lbHatch), /* nt4 */ + ok( (HGLOBAL)br.lbHatch == bits || broken(!br.lbHatch), /* nt4 */ "wrong handle %p/%p\n", (HGLOBAL)br.lbHatch, bits ); ret = GlobalFlags( mem ); ok( ret == 2, "wrong flags %x\n", ret );

1 0