June 2011 - Wine-Commits - list.winehq.org

Henri Verbeet : wined3d: Properly destroy contexts not owned by the implcit swapchain.
by Alexandre Julliard June 28, 2011

June 28, 2011

Module: wine Branch: master Commit: ebcf08e59a3317a997e0ff7bad03c888260b9991 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebcf08e59a3317a997e0ff7ba… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 28 02:26:20 2011 +0200 wined3d: Properly destroy contexts not owned by the implcit swapchain. In particular, set num_contexts to 0 in the swapchain that owns the contexts. --- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/swapchain.c | 11 +++++++++++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6314372..180fd49 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5547,11 +5547,11 @@ static void delete_opengl_contexts(struct wined3d_device *device, struct wined3d while (device->context_count) { - context_destroy(device, device->contexts[0]); + swapchain_destroy_contexts(device->contexts[0]->swapchain); } + HeapFree(GetProcessHeap(), 0, swapchain->context); swapchain->context = NULL; - swapchain->num_contexts = 0; } /* Do not call while under the GL lock. */ diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index fb09ccf..a64c0db 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1164,6 +1164,17 @@ static struct wined3d_context *swapchain_create_context(struct wined3d_swapchain return ctx; } +void swapchain_destroy_contexts(struct wined3d_swapchain *swapchain) +{ + unsigned int i; + + for (i = 0; i < swapchain->num_contexts; ++i) + { + context_destroy(swapchain->device, swapchain->context[i]); + } + swapchain->num_contexts = 0; +} + struct wined3d_context *swapchain_get_context(struct wined3d_swapchain *swapchain) { DWORD tid = GetCurrentThreadId(); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e96b7ad..a3e12ff 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2493,6 +2493,7 @@ struct wined3d_swapchain void x11_copy_to_screen(struct wined3d_swapchain *swapchain, const RECT *rect) DECLSPEC_HIDDEN; struct wined3d_context *swapchain_get_context(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; +void swapchain_destroy_contexts(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; #define DEFAULT_REFRESH_RATE 0

1 0

Henri Verbeet : wined3d: Make the target parameter to generate_rt_mask_from_surface() const.
by Alexandre Julliard June 28, 2011

June 28, 2011

Module: wine Branch: master Commit: b9721600dccdd13b9b61d425d2c6bba10dc4b22b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9721600dccdd13b9b61d425d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 28 02:26:17 2011 +0200 wined3d: Make the target parameter to generate_rt_mask_from_surface() const. --- dlls/wined3d/context.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index bbee5ee..169946a 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1238,7 +1238,7 @@ static inline DWORD generate_rt_mask(GLenum buffer) return buffer ? (1 << 31) | buffer : 0; } -static inline DWORD generate_rt_mask_from_surface(struct wined3d_surface *target) +static inline DWORD generate_rt_mask_from_surface(const struct wined3d_surface *target) { return (1 << 31) | surface_get_gl_buffer(target); }

1 0

Alexandre Julliard : ntdll: Encode the function pointers in the vectored handler list.
by Alexandre Julliard June 28, 2011

June 28, 2011

Module: wine Branch: master Commit: 30cb179fe2b9291de7ce9e8784768b70a82f593d URL: http://source.winehq.org/git/wine.git/?a=commit;h=30cb179fe2b9291de7ce9e878… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 28 08:01:48 2011 -0500 ntdll: Encode the function pointers in the vectored handler list. --- dlls/ntdll/exception.c | 10 ++++++---- include/winternl.h | 2 ++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index 41ffec9..faa9e0d 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -155,6 +155,7 @@ LONG call_vectored_handlers( EXCEPTION_RECORD *rec, CONTEXT *context ) struct list *ptr; LONG ret = EXCEPTION_CONTINUE_SEARCH; EXCEPTION_POINTERS except_ptrs; + PVECTORED_EXCEPTION_HANDLER func; VECTORED_HANDLER *handler, *to_free = NULL; except_ptrs.ExceptionRecord = rec; @@ -166,14 +167,15 @@ LONG call_vectored_handlers( EXCEPTION_RECORD *rec, CONTEXT *context ) { handler = LIST_ENTRY( ptr, VECTORED_HANDLER, entry ); handler->count++; + func = RtlDecodePointer( handler->func ); RtlLeaveCriticalSection( &vectored_handlers_section ); RtlFreeHeap( GetProcessHeap(), 0, to_free ); to_free = NULL; TRACE( "calling handler at %p code=%x flags=%x\n", - handler->func, rec->ExceptionCode, rec->ExceptionFlags ); - ret = handler->func( &except_ptrs ); - TRACE( "handler at %p returned %x\n", handler->func, ret ); + func, rec->ExceptionCode, rec->ExceptionFlags ); + ret = func( &except_ptrs ); + TRACE( "handler at %p returned %x\n", func, ret ); RtlEnterCriticalSection( &vectored_handlers_section ); ptr = list_next( &vectored_handlers, ptr ); @@ -226,7 +228,7 @@ PVOID WINAPI RtlAddVectoredExceptionHandler( ULONG first, PVECTORED_EXCEPTION_HA VECTORED_HANDLER *handler = RtlAllocateHeap( GetProcessHeap(), 0, sizeof(*handler) ); if (handler) { - handler->func = func; + handler->func = RtlEncodePointer( func ); handler->count = 1; RtlEnterCriticalSection( &vectored_handlers_section ); if (first) list_add_head( &vectored_handlers, &handler->entry ); diff --git a/include/winternl.h b/include/winternl.h index a1c9f0c..21879d0 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2298,6 +2298,7 @@ NTSYSAPI BOOLEAN WINAPI RtlCreateUnicodeString(PUNICODE_STRING,LPCWSTR); NTSYSAPI BOOLEAN WINAPI RtlCreateUnicodeStringFromAsciiz(PUNICODE_STRING,LPCSTR); NTSYSAPI NTSTATUS WINAPI RtlCreateUserThread(HANDLE,const SECURITY_DESCRIPTOR*,BOOLEAN,PVOID,SIZE_T,SIZE_T,PRTL_THREAD_START_ROUTINE,void*,HANDLE*,CLIENT_ID*); NTSYSAPI void WINAPI RtlDeactivateActivationContext(DWORD,ULONG_PTR); +NTSYSAPI PVOID WINAPI RtlDecodePointer(PVOID); NTSYSAPI NTSTATUS WINAPI RtlDecompressBuffer(USHORT,PUCHAR,ULONG,PUCHAR,ULONG,PULONG); NTSYSAPI NTSTATUS WINAPI RtlDeleteAce(PACL,DWORD); NTSYSAPI NTSTATUS WINAPI RtlDeleteAtomFromAtomTable(RTL_ATOM_TABLE,RTL_ATOM); @@ -2326,6 +2327,7 @@ NTSYSAPI NTSTATUS WINAPI RtlDowncaseUnicodeString(UNICODE_STRING*,const UNICODE NTSYSAPI void WINAPI RtlDumpResource(LPRTL_RWLOCK); NTSYSAPI NTSTATUS WINAPI RtlDuplicateUnicodeString(int,const UNICODE_STRING*,UNICODE_STRING*); NTSYSAPI NTSTATUS WINAPI RtlEmptyAtomTable(RTL_ATOM_TABLE,BOOLEAN); +NTSYSAPI PVOID WINAPI RtlEncodePointer(PVOID); NTSYSAPI NTSTATUS WINAPI RtlEnterCriticalSection(RTL_CRITICAL_SECTION *); NTSYSAPI void WINAPI RtlEraseUnicodeString(UNICODE_STRING*); NTSYSAPI NTSTATUS WINAPI RtlEqualComputerName(const UNICODE_STRING*,const UNICODE_STRING*);

1 0

Huw Davies : gdi32: Construct the EGA palette from the default palette.
by Alexandre Julliard June 28, 2011

June 28, 2011

Module: wine Branch: master Commit: aa34b2fb779592163b6e892e0b3dfc4b035c661d URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa34b2fb779592163b6e892e0… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jun 28 13:16:55 2011 +0100 gdi32: Construct the EGA palette from the default palette. --- dlls/gdi32/dib.c | 33 ++++++--------------------------- dlls/gdi32/tests/bitmap.c | 42 ++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 46 insertions(+), 29 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 962a1aa..3268086 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -415,32 +415,6 @@ UINT WINAPI GetDIBColorTable( HDC hdc, UINT startpos, UINT entries, RGBQUAD *col return result; } -/* FIXME the following two structs should be combined with __sysPalTemplate in - objects/color.c - this should happen after de-X11-ing both of these - files. - NB. RGBQUAD and PALETTEENTRY have different orderings of red, green - and blue - sigh */ - -static const RGBQUAD EGAColorsQuads[16] = { -/* rgbBlue, rgbGreen, rgbRed, rgbReserved */ - { 0x00, 0x00, 0x00, 0x00 }, - { 0x00, 0x00, 0x80, 0x00 }, - { 0x00, 0x80, 0x00, 0x00 }, - { 0x00, 0x80, 0x80, 0x00 }, - { 0x80, 0x00, 0x00, 0x00 }, - { 0x80, 0x00, 0x80, 0x00 }, - { 0x80, 0x80, 0x00, 0x00 }, - { 0x80, 0x80, 0x80, 0x00 }, - { 0xc0, 0xc0, 0xc0, 0x00 }, - { 0x00, 0x00, 0xff, 0x00 }, - { 0x00, 0xff, 0x00, 0x00 }, - { 0x00, 0xff, 0xff, 0x00 }, - { 0xff, 0x00, 0x00, 0x00 }, - { 0xff, 0x00, 0xff, 0x00 }, - { 0xff, 0xff, 0x00, 0x00 }, - { 0xff, 0xff, 0xff, 0x00 } -}; - static const RGBQUAD DefLogPaletteQuads[20] = { /* Copy of Default Logical Palette */ /* rgbBlue, rgbGreen, rgbRed, rgbReserved */ { 0x00, 0x00, 0x00, 0x00 }, @@ -635,7 +609,12 @@ INT WINAPI GetDIBits( break; case 4: - memcpy(rgbQuads, EGAColorsQuads, sizeof(EGAColorsQuads)); + /* The EGA palette is the first and last 8 colours of the default palette + with the innermost pair swapped */ + memcpy(rgbQuads, DefLogPaletteQuads, 7 * sizeof(RGBQUAD)); + memcpy(rgbQuads + 7, DefLogPaletteQuads + 12, 1 * sizeof(RGBQUAD)); + memcpy(rgbQuads + 8, DefLogPaletteQuads + 7, 1 * sizeof(RGBQUAD)); + memcpy(rgbQuads + 9, DefLogPaletteQuads + 13, 7 * sizeof(RGBQUAD)); break; case 8: diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index e107d7b..241ce89 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -1534,7 +1534,7 @@ static void test_GetDIBits(void) BYTE buf[1024]; char bi_buf[sizeof(BITMAPINFOHEADER) + sizeof(RGBQUAD) * 256]; BITMAPINFO *bi = (BITMAPINFO *)bi_buf; - PALETTEENTRY pal_ents[32]; + PALETTEENTRY pal_ents[20]; hdc = GetDC(0); @@ -1723,6 +1723,44 @@ todo_wine for (i = 2; i < 256; i++) ok(((WORD*)bi->bmiColors)[i] == 0xAAAA, "Color %d is %d\n", i, ((WORD*)bi->bmiColors)[i]); + /* retrieve 4-bit DIB data */ + memset(bi, 0, sizeof(*bi)); + bi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + bi->bmiHeader.biWidth = bm.bmWidth; + bi->bmiHeader.biHeight = bm.bmHeight; + bi->bmiHeader.biPlanes = 1; + bi->bmiHeader.biBitCount = 4; + bi->bmiHeader.biCompression = BI_RGB; + bi->bmiHeader.biSizeImage = 0; + memset(bi->bmiColors, 0xAA, sizeof(RGBQUAD) * 256); + memset(buf, 0xAA, sizeof(buf)); + SetLastError(0xdeadbeef); + lines = GetDIBits(hdc, hbmp, 0, bm.bmHeight, buf, bi, DIB_RGB_COLORS); + ok(lines == bm.bmHeight, "GetDIBits copied %d lines of %d, error %u\n", + lines, bm.bmHeight, GetLastError()); + + GetPaletteEntries( GetStockObject(DEFAULT_PALETTE), 0, 20, pal_ents ); + + for (i = 0; i < 16; i++) + { + RGBQUAD expect; + int entry = i < 8 ? i : i + 4; + + if(entry == 7) entry = 12; + else if(entry == 12) entry = 7; + + expect.rgbRed = pal_ents[entry].peRed; + expect.rgbGreen = pal_ents[entry].peGreen; + expect.rgbBlue = pal_ents[entry].peBlue; + expect.rgbReserved = 0; + + ok(!memcmp(bi->bmiColors + i, &expect, sizeof(expect)), + "expected bmiColors[%d] %x %x %x %x - got %x %x %x %x\n", i, + expect.rgbRed, expect.rgbGreen, expect.rgbBlue, expect.rgbReserved, + bi->bmiColors[i].rgbRed, bi->bmiColors[i].rgbGreen, + bi->bmiColors[i].rgbBlue, bi->bmiColors[i].rgbReserved); + } + /* retrieve 8-bit DIB data */ memset(bi, 0, sizeof(*bi)); bi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); @@ -1739,7 +1777,7 @@ todo_wine ok(lines == bm.bmHeight, "GetDIBits copied %d lines of %d, error %u\n", lines, bm.bmHeight, GetLastError()); - GetPaletteEntries( GetStockObject(DEFAULT_PALETTE), 0, 32, pal_ents ); + GetPaletteEntries( GetStockObject(DEFAULT_PALETTE), 0, 20, pal_ents ); for (i = 0; i < 256; i++) {

1 0

Henri Verbeet : wined3d: Make the generate_rt_mask_no_fbo() parameters const.
by Alexandre Julliard June 28, 2011

June 28, 2011

Module: wine Branch: master Commit: 64bf19d07b8ef8af20b7a184dbc43e66b5a0905a URL: http://source.winehq.org/git/wine.git/?a=commit;h=64bf19d07b8ef8af20b7a184d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 28 02:26:18 2011 +0200 wined3d: Make the generate_rt_mask_no_fbo() parameters const. --- dlls/wined3d/context.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 169946a..4a4b047 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2003,7 +2003,7 @@ static void context_validate_onscreen_formats(struct wined3d_device *device, context_set_render_offscreen(context, device->StateTable, TRUE); } -static DWORD generate_rt_mask_no_fbo(struct wined3d_device *device, struct wined3d_surface *rt) +static DWORD generate_rt_mask_no_fbo(const struct wined3d_device *device, const struct wined3d_surface *rt) { if (!rt || rt->resource.format->id == WINED3DFMT_NULL) return 0;

1 0

Austin English : kernel32: Stub a few of the numa functions.
by Alexandre Julliard June 28, 2011

June 28, 2011

Module: wine Branch: master Commit: 1344aec6420c05799839b24ce6891b2d0977245f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1344aec6420c05799839b24ce… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Jun 23 04:09:57 2011 -0500 kernel32: Stub a few of the numa functions. --- dlls/kernel32/kernel32.spec | 6 +++--- dlls/kernel32/process.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 8e2a5dd..f08ddea 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -568,9 +568,9 @@ @ stub GetNextVDMCommand @ stub GetNlsSectionName # @ stub GetNumaAvailableMemory -# @ stub GetNumaAvailableMemoryNode -# @ stub GetNumaHighestNodeNumber -# @ stub GetNumaNodeProcessorMask +@ stdcall GetNumaAvailableMemoryNode(long ptr) +@ stdcall GetNumaHighestNodeNumber(ptr) +@ stdcall GetNumaNodeProcessorMask(long ptr) # @ stub GetNumaProcessorMap # @ stub GetNumaProcessorNode @ stdcall GetNumberFormatA(long long str ptr ptr long) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index f3504af..9bc5070 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -3783,3 +3783,33 @@ HRESULT WINAPI RegisterApplicationRecoveryCallback(APPLICATION_RECOVERY_CALLBACK SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return E_FAIL; } + +/********************************************************************** + * GetNumaHighestNodeNumber (KERNEL32.@) + */ +BOOL WINAPI GetNumaHighestNodeNumber(PULONG highestnode) +{ + FIXME("(%p): stub\n", highestnode); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/********************************************************************** + * GetNumaNodeProcessorMask (KERNEL32.@) + */ +BOOL WINAPI GetNumaNodeProcessorMask(UCHAR node, PULONGLONG mask) +{ + FIXME("(%c %p): stub\n", node, mask); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/********************************************************************** + * GetNumaAvailableMemoryNode (KERNEL32.@) + */ +BOOL WINAPI GetNumaAvailableMemoryNode(UCHAR node, PULONGLONG available_bytes) +{ + FIXME("(%c %p): stub\n", node, available_bytes); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +}

1 0

Henri Verbeet : wined3d: Make the rts and ds parameters to context_validate_rt_config() const.
by Alexandre Julliard June 28, 2011

June 28, 2011

Module: wine Branch: master Commit: 560d5188b7f697452897cba89249ea07628fb216 URL: http://source.winehq.org/git/wine.git/?a=commit;h=560d5188b7f697452897cba89… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 28 02:26:19 2011 +0200 wined3d: Make the rts and ds parameters to context_validate_rt_config() const. --- dlls/wined3d/context.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 4a4b047..fa7242d 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2064,7 +2064,7 @@ void context_apply_blit_state(struct wined3d_context *context, struct wined3d_de } static BOOL context_validate_rt_config(UINT rt_count, - struct wined3d_surface **rts, struct wined3d_surface *ds) + struct wined3d_surface * const *rts, const struct wined3d_surface *ds) { unsigned int i;

1 0

Piotr Caban : comctl32: Make iterator_remove_common_items working on one range iterators.
by Alexandre Julliard June 28, 2011

June 28, 2011

Module: wine Branch: master Commit: 8669fa7308ebddf83884bbd648dc6ef420f427e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8669fa7308ebddf83884bbd64… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 28 10:18:54 2011 +0200 comctl32: Make iterator_remove_common_items working on one range iterators. --- dlls/comctl32/listview.c | 33 +++++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 1a71fed..033472c 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -1501,6 +1501,39 @@ static BOOL iterator_visibleitems(ITERATOR *i, const LISTVIEW_INFO *infoPtr, HDC /* Passed iterators have to point on the first elements */ static BOOL iterator_remove_common_items(ITERATOR *iter1, ITERATOR *iter2) { + if(!iter1->ranges || !iter2->ranges) { + int lower, upper; + + if(iter1->ranges || iter2->ranges || + (iter1->range.lower<iter2->range.lower && iter1->range.upper>iter2->range.upper) || + (iter1->range.lower>iter2->range.lower && iter1->range.upper<iter2->range.upper)) { + ERR("result is not a one range iterator\n"); + return FALSE; + } + + if(iter1->range.lower==-1 || iter2->range.lower==-1) + return TRUE; + + lower = iter1->range.lower; + upper = iter1->range.upper; + + if(lower < iter2->range.lower) + iter1->range.upper = iter2->range.lower; + else if(upper > iter2->range.upper) + iter1->range.lower = iter2->range.upper; + else + iter1->range.lower = iter1->range.upper = -1; + + if(iter2->range.lower < lower) + iter2->range.upper = lower; + else if(iter2->range.upper > upper) + iter2->range.lower = upper; + else + iter2->range.lower = iter2->range.upper = -1; + + return TRUE; + } + iterator_next(iter1); iterator_next(iter2);

1 0

Henri Verbeet : wined3d: Make the depth_stencil parameter to context_validate_onscreen_formats() const.
by Alexandre Julliard June 28, 2011

June 28, 2011

Module: wine Branch: master Commit: 4725d4bb992a4ab96edbae1c59c01764dbbf1089 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4725d4bb992a4ab96edbae1c5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 28 02:26:16 2011 +0200 wined3d: Make the depth_stencil parameter to context_validate_onscreen_formats() const. --- dlls/wined3d/context.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 3af69e8..bbee5ee 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1984,7 +1984,7 @@ static BOOL match_depth_stencil_format(const struct wined3d_format *existing, /* The caller provides a context */ static void context_validate_onscreen_formats(struct wined3d_device *device, - struct wined3d_context *context, struct wined3d_surface *depth_stencil) + struct wined3d_context *context, const struct wined3d_surface *depth_stencil) { /* Onscreen surfaces are always in a swapchain */ struct wined3d_swapchain *swapchain = context->current_rt->container.u.swapchain;

1 0

André Hentschel : about.template: Improved German translation
by Jeremy Newman June 28, 2011

June 28, 2011

Module: website Branch: master Commit: 1ef96b5014fa62dd880b285e4da63150cb8b1121 URL: http://source.winehq.org/git/website.git/?a=commit;h=1ef96b5014fa62dd880b28… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jun 28 23:07:56 2011 +0200 about.template: Improved German translation --- templates/de/about.template | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/templates/de/about.template b/templates/de/about.template index 613ea09..994b92c 100644 --- a/templates/de/about.template +++ b/templates/de/about.template @@ -1,22 +1,22 @@ - - + + -<h1 class="title">Über Wine</h1> +<h1 class="title">über Wine</h1> -<p>Wine ermöglicht es, Windows-Programme unter anderen Betriebssystemen laufen lassen. Mit Wine kannst Du diese Programme genauso installieren und laufen lassen, wie unter Windows.</p> +<p>Wine ermöglicht es, Windows-Programme unter anderen Betriebssystemen laufen lassen. Mit Wine kannst Du diese Programme genauso installieren und laufen lassen, wie unter Windows.</p> -<p>Wine wird aktiv weiterentwickelt. Noch läuft nicht jedes Programm, aber <a href="http://wiki.winehq.org/UsageStatistics" title="Statistik zur Wine-Benutzung">mehrere Millionen Anwender</a> nutzen Wine, um ihre Programme zu verwenden.</p> +<p>Wine wird aktiv weiterentwickelt. Noch läuft nicht jedes Programm, aber <a href="http://wiki.winehq.org/UsageStatistics" title="Statistik zur Wine-Benutzung">mehrere Millionen Anwender</a> nutzen Wine, um ihre Programme zu verwenden.</p> -<h3>Open Source und benutzergetrieben</h3> +<h3>Durch Open Source und Benutzer getrieben</h3> -<p>Wine wird immer <a href="http://wiki.winehq.org/Licensing" title="Wine-Lizensierung">Freie Software</a> sein. Ungefähr die Hälfte des Quellcodes von Wine wird von Freiwilligen geschrieben. Der Rest wird von Firmen gesponsort, insbesondere <a href="http://www.codeweavers.com/products/" title="Codeweavers Crossover Office">Codeweavers</a>, die eine eigene Version von Wine mit Unterstützung verkaufen.</p> +<p>Wine wird immer <a href="http://wiki.winehq.org/Licensing" title="Wine-Lizensierung">Freie Software</a> sein. Ungefähr die Hälfte des Quellcodes von Wine wird von Freiwilligen geschrieben. Der Rest wird von Firmen gesponsort, insbesondere <a href="http://www.codeweavers.com/products/" title="Codeweavers Crossover Office">Codeweavers</a>, die eine eigene Version von Wine mit Support verkaufen.</p> -<p>Wine ist stark von seinen Anwendern abhängig. Tests von Anwendern bevölkern unsere <a href="http://appdb.winehq.org/" title="Wine Anwendungsdatenbank">Anwendungsdatenbank (en)</a> zur Dokumentation davon, wie gut einzelne Programme funktionieren, und sämtliche Antworten in den <a href="http://forums.winehq.org/" title="WineHQ Foren">Foren</a> kommen von Freiwilligen.</p> +<p>Wine ist stark von seinen Anwendern abhängig. Tests von Anwendern füllen unsere <a href="http://appdb.winehq.org/" title="Wine Anwendungsdatenbank">Anwendungsdatenbank (en)</a> um verfolgen zu können, wie gut einzelne Programme funktionieren, und sämtliche Antworten in den <a href="http://forums.winehq.org/" title="WineHQ Foren">Foren</a> kommen von Freiwilligen.</p> <h3>Erfahre mehr:</h3> <ul> <li><a href="http://wiki.winehq.org/ImportanceOfWine">Warum Wine so wichtig ist (en)</a></li> - <li><a href="http://wiki.winehq.org/Debunking_Wine_Myths">Wine-Mythen entlarvt (en)</a></li> + <li><a href="http://wiki.winehq.org/Debunking_Wine_Myths">Wine-Mythen aufgedeckt (en)</a></li> <li><a href="http://wiki.winehq.org/WineHistory">Geschichte des Wine-Projekts (en)</a></li> <li><a href="http://wiki.winehq.org/ProjectOrganization">Organisation und Leitung (en)</a></li> </ul>

1 0