July 2012 - Wine-commits - list.winehq.org

Nikolay Sivov : kernel32: Single thread test for InitOnceExecuteOnce().
by Alexandre Julliard 23 Jul '12

23 Jul '12

Module: wine Branch: master Commit: 9318528702a62da5abf1553c4538f4be83701ea8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9318528702a62da5abf1553c4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jul 22 22:59:46 2012 +0400 kernel32: Single thread test for InitOnceExecuteOnce(). --- dlls/kernel32/tests/sync.c | 58 ++++++++++++++++++++++++++++++++++++++++++- include/winbase.h | 2 + 2 files changed, 58 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index ccb21bb..97139a9 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -38,6 +38,7 @@ static HANDLE (WINAPI *pOpenWaitableTimerA)(DWORD,BOOL,LPCSTR); static HANDLE (WINAPI *pCreateMemoryResourceNotification)(MEMORY_RESOURCE_NOTIFICATION_TYPE); static BOOL (WINAPI *pQueryMemoryResourceNotification)(HANDLE, PBOOL); static VOID (WINAPI *pInitOnceInitialize)(PINIT_ONCE); +static BOOL (WINAPI *pInitOnceExecuteOnce)(PINIT_ONCE,PINIT_ONCE_FN,PVOID,LPVOID*); static void test_signalandwait(void) { @@ -1136,19 +1137,71 @@ static void test_WaitForMultipleObjects(void) if (maxevents[i]) CloseHandle(maxevents[i]); } +static BOOL g_initcallback_ret, g_initcallback_called; + +BOOL CALLBACK initonce_callback(INIT_ONCE *initonce, void *parameter, void **ctxt) +{ + g_initcallback_called = TRUE; + /* zero bit set means here that initialization is taking place - initialization locked */ + ok(initonce->Ptr == (void*)0x1, "got %p\n", initonce->Ptr); + ok(parameter == (void*)0xdeadbeef, "got wrong parameter\n"); + return g_initcallback_ret; +} + static void test_initonce(void) { INIT_ONCE initonce; + void *ctxt; + BOOL ret; - if (!pInitOnceInitialize) + if (!pInitOnceInitialize || !pInitOnceExecuteOnce) { - win_skip("one-time initialization API not supported\n"); + skip("one-time initialization API not supported\n"); return; } initonce.Ptr = (void*)0xdeadbeef; pInitOnceInitialize(&initonce); ok(initonce.Ptr == NULL, "got %p\n", initonce.Ptr); + + /* initialisation completed successfully */ + g_initcallback_ret = TRUE; + ctxt = NULL; + ret = pInitOnceExecuteOnce(&initonce, &initonce_callback, (void*)0xdeadbeef, &ctxt); + ok(ret, "got wrong ret value %d\n", ret); + ok(initonce.Ptr == (void*)0x2, "got %p\n", initonce.Ptr); + ok(ctxt == (void*)0x0, "got %p\n", ctxt); + ok(g_initcallback_called, "got %d\n", g_initcallback_called); + + /* so it's been called already so won't be called again */ + ctxt = NULL; + g_initcallback_called = FALSE; + ret = pInitOnceExecuteOnce(&initonce, &initonce_callback, (void*)0xdeadbeef, &ctxt); + ok(ret, "got wrong ret value %d\n", ret); + ok(initonce.Ptr == (void*)0x2, "got %p\n", initonce.Ptr); + ok(ctxt == (void*)0, "got %p\n", ctxt); + ok(!g_initcallback_called, "got %d\n", g_initcallback_called); + + pInitOnceInitialize(&initonce); + g_initcallback_called = FALSE; + /* 2 lower order bits should never be used, you'll get a crash in result */ + ctxt = (void*)0xFFFFFFF0; + ret = pInitOnceExecuteOnce(&initonce, &initonce_callback, (void*)0xdeadbeef, &ctxt); + ok(ret, "got wrong ret value %d\n", ret); + ok(initonce.Ptr == (void*)0xFFFFFFF2, "got %p\n", initonce.Ptr); + ok(ctxt == (void*)0xFFFFFFF0, "got %p\n", ctxt); + ok(g_initcallback_called, "got %d\n", g_initcallback_called); + + /* callback failed */ + g_initcallback_ret = FALSE; + g_initcallback_called = FALSE; + ctxt = NULL; + pInitOnceInitialize(&initonce); + ret = pInitOnceExecuteOnce(&initonce, &initonce_callback, (void*)0xdeadbeef, &ctxt); + ok(!ret, "got wrong ret value %d\n", ret); + ok(initonce.Ptr == NULL, "got %p\n", initonce.Ptr); + ok(ctxt == NULL, "got %p\n", ctxt); + ok(g_initcallback_called, "got %d\n", g_initcallback_called); } START_TEST(sync) @@ -1164,6 +1217,7 @@ START_TEST(sync) pCreateMemoryResourceNotification = (void *)GetProcAddress(hdll, "CreateMemoryResourceNotification"); pQueryMemoryResourceNotification = (void *)GetProcAddress(hdll, "QueryMemoryResourceNotification"); pInitOnceInitialize = (void *)GetProcAddress(hdll, "InitOnceInitialize"); + pInitOnceExecuteOnce = (void *)GetProcAddress(hdll, "InitOnceExecuteOnce"); test_signalandwait(); test_mutex(); diff --git a/include/winbase.h b/include/winbase.h index 532dbcd..0bc5755 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1321,6 +1321,8 @@ typedef RTL_RUN_ONCE INIT_ONCE; typedef PRTL_RUN_ONCE PINIT_ONCE; typedef PRTL_RUN_ONCE LPINIT_ONCE; #define INIT_ONCE_STATIC_INIT RTL_RUN_ONCE_INIT +/* initialization callback prototype */ +typedef BOOL (WINAPI *PINIT_ONCE_FN)(PINIT_ONCE,PVOID,PVOID*); WINBASEAPI BOOL WINAPI ActivateActCtx(HANDLE,ULONG_PTR *); WINADVAPI BOOL WINAPI AddAccessAllowedAce(PACL,DWORD,DWORD,PSID);

1 0

Michael Stefaniuc : winedump: Simplify the "pointer to start of array" idiom.
by Alexandre Julliard 23 Jul '12

23 Jul '12

Module: wine Branch: master Commit: 19c9d083047f1af8517662a1687df353581d3e0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=19c9d083047f1af8517662a16… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jul 23 10:37:06 2012 +0200 winedump: Simplify the "pointer to start of array" idiom. --- tools/winedump/debug.c | 2 +- tools/winedump/minidump.c | 8 ++++---- tools/winedump/pdb.c | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tools/winedump/debug.c b/tools/winedump/debug.c index c59efa6..961cf42 100644 --- a/tools/winedump/debug.c +++ b/tools/winedump/debug.c @@ -500,7 +500,7 @@ static const char *get_coff_name( const IMAGE_SYMBOL *coff_sym, const char *coff { memcpy(namebuff, coff_sym->N.ShortName, 8); namebuff[8] = '\0'; - nampnt = &namebuff[0]; + nampnt = namebuff; } else { diff --git a/tools/winedump/minidump.c b/tools/winedump/minidump.c index ddd0ed6..aaa9dff 100644 --- a/tools/winedump/minidump.c +++ b/tools/winedump/minidump.c @@ -102,7 +102,7 @@ void mdmp_dump(void) case ThreadListStream: { const MINIDUMP_THREAD_LIST* mtl = (const MINIDUMP_THREAD_LIST*)stream; - const MINIDUMP_THREAD* mt = &mtl->Threads[0]; + const MINIDUMP_THREAD* mt = mtl->Threads; unsigned int i; printf("Threads: %u\n", mtl->NumberOfThreads); @@ -129,7 +129,7 @@ void mdmp_dump(void) case 0xFFF0: { const MINIDUMP_MODULE_LIST* mml = (const MINIDUMP_MODULE_LIST*)stream; - const MINIDUMP_MODULE* mm = &mml->Modules[0]; + const MINIDUMP_MODULE* mm = mml->Modules; unsigned int i; const char* p1; const char* p2; @@ -224,7 +224,7 @@ void mdmp_dump(void) case MemoryListStream: { const MINIDUMP_MEMORY_LIST* mml = (const MINIDUMP_MEMORY_LIST*)stream; - const MINIDUMP_MEMORY_DESCRIPTOR* mmd = &mml->MemoryRanges[0]; + const MINIDUMP_MEMORY_DESCRIPTOR* mmd = mml->MemoryRanges; unsigned int i; printf("Memory Ranges: %u\n", mml->NumberOfMemoryRanges); @@ -333,7 +333,7 @@ void mdmp_dump(void) if (msi->ProcessorArchitecture == PROCESSOR_ARCHITECTURE_INTEL) { printf(" x86.VendorId: %.12s\n", - (const char*)&msi->Cpu.X86CpuInfo.VendorId[0]); + (const char*)msi->Cpu.X86CpuInfo.VendorId); printf(" x86.VersionInformation: %x\n", msi->Cpu.X86CpuInfo.VersionInformation); printf(" x86.FeatureInformation: %x\n", diff --git a/tools/winedump/pdb.c b/tools/winedump/pdb.c index 7a0bd61..3513452 100644 --- a/tools/winedump/pdb.c +++ b/tools/winedump/pdb.c @@ -174,12 +174,12 @@ static unsigned get_stream_by_name(struct pdb_reader* reader, const char* name) if (reader->read_file == pdb_jg_read_file) { - str = &reader->u.jg.root->names[0]; + str = reader->u.jg.root->names; cbstr = reader->u.jg.root->cbNames; } else { - str = &reader->u.ds.root->names[0]; + str = reader->u.ds.root->names; cbstr = reader->u.ds.root->cbNames; } @@ -740,7 +740,7 @@ static void pdb_jg_dump(void) reader.u.jg.root->Age, (unsigned)reader.u.jg.root->cbNames); - pdw = (DWORD*)(&reader.u.jg.root->names[0] + reader.u.jg.root->cbNames); + pdw = (DWORD*)(reader.u.jg.root->names + reader.u.jg.root->cbNames); numok = *pdw++; count = *pdw++; printf("\tStreams directory:\n" @@ -895,7 +895,7 @@ static void pdb_ds_dump(void) reader.u.ds.root->Age, get_guid_str(&reader.u.ds.root->guid), reader.u.ds.root->cbNames); - pdw = (DWORD*)(&reader.u.ds.root->names[0] + reader.u.ds.root->cbNames); + pdw = (DWORD*)(reader.u.ds.root->names + reader.u.ds.root->cbNames); numok = *pdw++; count = *pdw++; printf("\tStreams directory:\n"

1 0

Jacek Caban : widl: Add IDL installation directory to include path.
by Alexandre Julliard 23 Jul '12

23 Jul '12

Module: wine Branch: master Commit: 80d3055869d5135b18308380b09c424baa514cc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80d3055869d5135b18308380b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 23 11:38:23 2012 +0200 widl: Add IDL installation directory to include path. --- tools/widl/Makefile.in | 1 + tools/widl/widl.c | 4 ++++ 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/tools/widl/Makefile.in b/tools/widl/Makefile.in index f2bd3f3..88558bb 100644 --- a/tools/widl/Makefile.in +++ b/tools/widl/Makefile.in @@ -21,6 +21,7 @@ C_SRCS = \ LEX_SRCS = parser.l BISON_SRCS = parser.y +EXTRADEFS = -DDEFAULT_INCLUDE_DIR=\"$(includedir)/windows/\" INSTALLDIRS = $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man$(prog_manext) all: $(PROGRAMS) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 85d66d7..fc3d0d9 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -643,6 +643,10 @@ int main(int argc,char *argv[]) } } +#ifdef DEFAULT_INCLUDE_DIR + wpp_add_include_path(DEFAULT_INCLUDE_DIR); +#endif + if(do_everything) { set_everything(TRUE); }

1 0

Dmitry Timoshkov : windowscodecs: Add support for generating WICBitmapPaletteTypeFixedHalftone27 palette.
by Alexandre Julliard 23 Jul '12

23 Jul '12

Module: wine Branch: master Commit: 6a7f97f98f394ef3f42f971266bd4840a5822e1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a7f97f98f394ef3f42f97126… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jul 23 12:43:45 2012 +0900 windowscodecs: Add support for generating WICBitmapPaletteTypeFixedHalftone27 palette. --- dlls/windowscodecs/palette.c | 27 +++++++++++++++++++++++++++ dlls/windowscodecs/tests/palette.c | 21 +++++++++++++++++++++ 2 files changed, 48 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/palette.c b/dlls/windowscodecs/palette.c index 4541c7c..74438f6 100644 --- a/dlls/windowscodecs/palette.c +++ b/dlls/windowscodecs/palette.c @@ -160,6 +160,28 @@ static WICColor *generate_halftone8_palette(UINT *count) return entries; } +static WICColor *generate_halftone27_palette(UINT *count) +{ + WICColor *entries; + UINT i; + + *count = 28; + entries = HeapAlloc(GetProcessHeap(), 0, 28 * sizeof(WICColor)); + if (!entries) return NULL; + + for (i = 0; i < 27; i++) + { + static const BYTE halftone_values[4] = { 0x00,0x80,0xff }; + entries[i] = 0xff000000; + entries[i] |= halftone_values[i%3]; + entries[i] |= halftone_values[(i/3)%3] << 8; + entries[i] |= halftone_values[(i/9)%3] << 16; + } + + entries[i] = 0xffc0c0c0; + return entries; +} + static WICColor *generate_halftone64_palette(UINT *count) { WICColor *entries; @@ -253,6 +275,11 @@ static HRESULT WINAPI PaletteImpl_InitializePredefined(IWICPalette *iface, if (!colors) return E_OUTOFMEMORY; break; + case WICBitmapPaletteTypeFixedHalftone27: + colors = generate_halftone27_palette(&count); + if (!colors) return E_OUTOFMEMORY; + break; + case WICBitmapPaletteTypeFixedHalftone64: colors = generate_halftone64_palette(&count); if (!colors) return E_OUTOFMEMORY; diff --git a/dlls/windowscodecs/tests/palette.c b/dlls/windowscodecs/tests/palette.c index 8e320c5..7c4c3d4 100644 --- a/dlls/windowscodecs/tests/palette.c +++ b/dlls/windowscodecs/tests/palette.c @@ -199,6 +199,24 @@ static void generate_halftone8_palette(DWORD *entries, UINT count) } } +static void generate_halftone27_palette(DWORD *entries, UINT count) +{ + static const BYTE halftone_values[4] = { 0x00,0x80,0xff }; + UINT i; + + assert(count == 28); + + for (i = 0; i < 27; i++) + { + entries[i] = 0xff000000; + entries[i] |= halftone_values[i%3]; + entries[i] |= halftone_values[(i/3)%3] << 8; + entries[i] |= halftone_values[(i/9)%3] << 16; + } + + entries[i] = 0xffc0c0c0; +} + static void generate_halftone64_palette(DWORD *entries, UINT count) { static const BYTE halftone_values[4] = { 0x00,0x55,0xaa,0xff }; @@ -256,6 +274,7 @@ static void test_predefined_palette(void) { WICBitmapPaletteTypeFixedGray16, 0, 1, 16, { 0 } }, { WICBitmapPaletteTypeFixedGray256, 0, 1, 256, { 0 } }, { WICBitmapPaletteTypeFixedHalftone8, 0, 0, 16, { 0 } }, + { WICBitmapPaletteTypeFixedHalftone27, 0, 0, 28, { 0 } }, { WICBitmapPaletteTypeFixedHalftone64, 0, 0, 72, { 0 } }, { WICBitmapPaletteTypeFixedHalftone256, 0, 0, 256, { 0 } }, }; @@ -314,6 +333,8 @@ static void test_predefined_palette(void) generate_gray256_palette(td[i].color, td[i].count); else if (td[i].type == WICBitmapPaletteTypeFixedHalftone8) generate_halftone8_palette(td[i].color, td[i].count); + else if (td[i].type == WICBitmapPaletteTypeFixedHalftone27) + generate_halftone27_palette(td[i].color, td[i].count); else if (td[i].type == WICBitmapPaletteTypeFixedHalftone64) generate_halftone64_palette(td[i].color, td[i].count); else if (td[i].type == WICBitmapPaletteTypeFixedHalftone256)

1 0

Dmitry Timoshkov : windowscodecs: Add support for generating WICBitmapPaletteTypeFixedHalftone125 palette.
by Alexandre Julliard 23 Jul '12

23 Jul '12

Module: wine Branch: master Commit: 97464c508fec781f2aa4ecfbdc8f88d55008f6b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97464c508fec781f2aa4ecfbd… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jul 23 12:44:54 2012 +0900 windowscodecs: Add support for generating WICBitmapPaletteTypeFixedHalftone125 palette. --- dlls/windowscodecs/palette.c | 27 +++++++++++++++++++++++++++ dlls/windowscodecs/tests/palette.c | 21 +++++++++++++++++++++ 2 files changed, 48 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/palette.c b/dlls/windowscodecs/palette.c index 74438f6..a4124a7 100644 --- a/dlls/windowscodecs/palette.c +++ b/dlls/windowscodecs/palette.c @@ -210,6 +210,28 @@ static WICColor *generate_halftone64_palette(UINT *count) return entries; } +static WICColor *generate_halftone125_palette(UINT *count) +{ + WICColor *entries; + UINT i; + + *count = 126; + entries = HeapAlloc(GetProcessHeap(), 0, 126 * sizeof(WICColor)); + if (!entries) return NULL; + + for (i = 0; i < 125; i++) + { + static const BYTE halftone_values[5] = { 0x00,0x40,0x80,0xbf,0xff }; + entries[i] = 0xff000000; + entries[i] |= halftone_values[i%5]; + entries[i] |= halftone_values[(i/5)%5] << 8; + entries[i] |= halftone_values[(i/25)%5] << 16; + } + + entries[i] = 0xffc0c0c0; + return entries; +} + static WICColor *generate_halftone256_palette(UINT *count) { WICColor *entries; @@ -285,6 +307,11 @@ static HRESULT WINAPI PaletteImpl_InitializePredefined(IWICPalette *iface, if (!colors) return E_OUTOFMEMORY; break; + case WICBitmapPaletteTypeFixedHalftone125: + colors = generate_halftone125_palette(&count); + if (!colors) return E_OUTOFMEMORY; + break; + case WICBitmapPaletteTypeFixedHalftone256: colors = generate_halftone256_palette(&count); if (!colors) return E_OUTOFMEMORY; diff --git a/dlls/windowscodecs/tests/palette.c b/dlls/windowscodecs/tests/palette.c index 7c4c3d4..32dbfc9 100644 --- a/dlls/windowscodecs/tests/palette.c +++ b/dlls/windowscodecs/tests/palette.c @@ -241,6 +241,24 @@ static void generate_halftone64_palette(DWORD *entries, UINT count) } } +static void generate_halftone125_palette(DWORD *entries, UINT count) +{ + static const BYTE halftone_values[5] = { 0x00,0x40,0x80,0xbf,0xff }; + UINT i; + + assert(count == 126); + + for (i = 0; i < 125; i++) + { + entries[i] = 0xff000000; + entries[i] |= halftone_values[i%5]; + entries[i] |= halftone_values[(i/5)%5] << 8; + entries[i] |= halftone_values[(i/25)%5] << 16; + } + + entries[i] = 0xffc0c0c0; +} + static void generate_halftone256_palette(DWORD *entries, UINT count) { static const BYTE halftone_values_b[4] = { 0x00,0x55,0xaa,0xff }; @@ -276,6 +294,7 @@ static void test_predefined_palette(void) { WICBitmapPaletteTypeFixedHalftone8, 0, 0, 16, { 0 } }, { WICBitmapPaletteTypeFixedHalftone27, 0, 0, 28, { 0 } }, { WICBitmapPaletteTypeFixedHalftone64, 0, 0, 72, { 0 } }, + { WICBitmapPaletteTypeFixedHalftone125, 0, 0, 126, { 0 } }, { WICBitmapPaletteTypeFixedHalftone256, 0, 0, 256, { 0 } }, }; IWICImagingFactory *factory; @@ -337,6 +356,8 @@ static void test_predefined_palette(void) generate_halftone27_palette(td[i].color, td[i].count); else if (td[i].type == WICBitmapPaletteTypeFixedHalftone64) generate_halftone64_palette(td[i].color, td[i].count); + else if (td[i].type == WICBitmapPaletteTypeFixedHalftone125) + generate_halftone125_palette(td[i].color, td[i].count); else if (td[i].type == WICBitmapPaletteTypeFixedHalftone256) generate_halftone256_palette(td[i].color, td[i].count);

1 0

Nozomi Kodama : d3dx9_36: Add more traces.
by Alexandre Julliard 23 Jul '12

23 Jul '12

Module: wine Branch: master Commit: c7bf5e09d58f12614e95e28201ef85c9abfb1d96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7bf5e09d58f12614e95e2820… Author: Nozomi Kodama <Nozomi.Kodama(a)yahoo.com> Date: Sat Jul 21 16:10:51 2012 +0800 d3dx9_36: Add more traces. --- dlls/d3dx9_36/math.c | 110 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 110 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c7bf5e09d58f12614e95e…

1 0

Henri Verbeet : wined3d: Get rid of APPLE_flush_render, it doesn't exist.
by Alexandre Julliard 23 Jul '12

23 Jul '12

Module: wine Branch: master Commit: 526901e307fddc5994e3a3aa22f8a92946f50a37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=526901e307fddc5994e3a3aa2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jul 22 14:59:52 2012 +0200 wined3d: Get rid of APPLE_flush_render, it doesn't exist. --- dlls/wined3d/directx.c | 2 -- dlls/wined3d/wined3d_gl.h | 10 ---------- 2 files changed, 0 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 2a6b83b..6b60966 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -91,7 +91,6 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_APPLE_fence", APPLE_FENCE, 0 }, {"GL_APPLE_float_pixels", APPLE_FLOAT_PIXELS, 0 }, {"GL_APPLE_flush_buffer_range", APPLE_FLUSH_BUFFER_RANGE, 0 }, - {"GL_APPLE_flush_render", APPLE_FLUSH_RENDER, 0 }, {"GL_APPLE_ycbcr_422", APPLE_YCBCR_422, 0 }, /* ARB */ @@ -1413,7 +1412,6 @@ static enum wined3d_gl_vendor wined3d_guess_gl_vendor(const struct wined3d_gl_in * DirectDraw, not OpenGL. */ if (gl_info->supported[APPLE_FENCE] && gl_info->supported[APPLE_CLIENT_STORAGE] - && gl_info->supported[APPLE_FLUSH_RENDER] && gl_info->supported[APPLE_YCBCR_422]) return GL_VENDOR_APPLE; diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 5bc3c63..f01cdb3 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -1720,7 +1720,6 @@ enum wined3d_gl_extension APPLE_FENCE, APPLE_FLOAT_PIXELS, APPLE_FLUSH_BUFFER_RANGE, - APPLE_FLUSH_RENDER, APPLE_YCBCR_422, /* ARB */ ARB_COLOR_BUFFER_FLOAT, @@ -1887,10 +1886,6 @@ typedef void (WINE_GLAPI *PGLFNFINISHOBJECTAPPLEPROC)(GLenum, GLuint); typedef void (WINE_GLAPI *PGLFNBUFFERPARAMETERIAPPLE)(GLenum target, GLenum pname, GLint param); typedef void (WINE_GLAPI *PGLFNFLUSHMAPPEDBUFFERRANGEAPPLE)(GLenum target, GLintptr offset, GLsizeiptr size); -/* GL_APPLE_flush_render */ -typedef void (WINE_GLAPI *PGLFNFLUSHRENDERAPPLEPROC)(void); -typedef void (WINE_GLAPI *PGLFNFINISHRENDERAPPLEPROC)(void); - /* GL_APPLE_ycbcr_422 */ #ifndef GL_APPLE_ycbcr_422 #define GL_APPLE_ycbcr_422 1 @@ -3712,11 +3707,6 @@ typedef BOOL (WINAPI *PFNWGLSETPIXELFORMATWINE)(HDC hdc, int iPixelFormat); glBufferParameteriAPPLE, APPLE_FLUSH_BUFFER_RANGE, NULL) \ USE_GL_FUNC(PGLFNFLUSHMAPPEDBUFFERRANGEAPPLE, \ glFlushMappedBufferRangeAPPLE, APPLE_FLUSH_BUFFER_RANGE, NULL) \ - /* GL_APPLE_flush_render */ \ - USE_GL_FUNC(PGLFNFLUSHRENDERAPPLEPROC, \ - glFlushRenderAPPLE, APPLE_FLUSH_RENDER, NULL) \ - USE_GL_FUNC(PGLFNFINISHRENDERAPPLEPROC, \ - glFinishRenderAPPLE, APPLE_FLUSH_RENDER, NULL) \ /* GL_ARB_color_buffer_float */ \ USE_GL_FUNC(PGLFNCLAMPCOLORARBPROC, \ glClampColorARB, ARB_COLOR_BUFFER_FLOAT, NULL) \

1 0

Henri Verbeet : wined3d: Fix some EXT_gpu_shader4 function names.
by Alexandre Julliard 23 Jul '12

23 Jul '12

Module: wine Branch: master Commit: 048edaf6a3834cb3139ab944e0670385877bd1aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=048edaf6a3834cb3139ab944e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jul 22 14:59:53 2012 +0200 wined3d: Fix some EXT_gpu_shader4 function names. --- dlls/wined3d/wined3d_gl.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index f01cdb3..2a67dff 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -4235,9 +4235,9 @@ typedef BOOL (WINAPI *PFNWGLSETPIXELFORMATWINE)(HDC hdc, int iPixelFormat); USE_GL_FUNC(PGLFNVERTEXATTRIBIPOINTEREXTPROC, \ glVertexAttribIPointerEXT, EXT_GPU_SHADER4, NULL) \ USE_GL_FUNC(PGLFNGETVERTEXATTRIBIIVEXTPROC, \ - glVertexAttribIivEXT, EXT_GPU_SHADER4, NULL) \ + glGetVertexAttribIivEXT, EXT_GPU_SHADER4, NULL) \ USE_GL_FUNC(PGLFNGETVERTEXATTRIBIUIVEXTPROC, \ - glVertexAttribIuivEXT, EXT_GPU_SHADER4, NULL) \ + glGetVertexAttribIuivEXT, EXT_GPU_SHADER4, NULL) \ USE_GL_FUNC(PGLFNUNIFORM1UIEXTPROC, \ glUniform1uiEXT, EXT_GPU_SHADER4, NULL) \ USE_GL_FUNC(PGLFNUNIFORM2UIEXTPROC, \

1 0

Henri Verbeet : d3d10: Add support for parsing depth/stencil states.
by Alexandre Julliard 23 Jul '12

23 Jul '12

Module: wine Branch: master Commit: ea05d7b92d4cdaa7d0cdf8b65e546b24932114b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea05d7b92d4cdaa7d0cdf8b65… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jul 22 14:59:55 2012 +0200 d3d10: Add support for parsing depth/stencil states. --- dlls/d3d10/effect.c | 48 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 47 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index cba50e2..dabe02c 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -138,6 +138,20 @@ static const struct d3d10_effect_state_property_info property_info[] = {0x13, "RasterizerState.ScissorEnable", D3D10_SVT_BOOL, 1, 1, D3D10_SVT_RASTERIZER, FIELD_OFFSET(D3D10_RASTERIZER_DESC, ScissorEnable) }, {0x14, "RasterizerState.MultisampleEnable", D3D10_SVT_BOOL, 1, 1, D3D10_SVT_RASTERIZER, FIELD_OFFSET(D3D10_RASTERIZER_DESC, MultisampleEnable) }, {0x15, "RasterizerState.AntialiasedLineEnable", D3D10_SVT_BOOL, 1, 1, D3D10_SVT_RASTERIZER, FIELD_OFFSET(D3D10_RASTERIZER_DESC, AntialiasedLineEnable) }, + {0x16, "DepthStencilState.DepthEnable", D3D10_SVT_BOOL, 1, 1, D3D10_SVT_DEPTHSTENCIL, FIELD_OFFSET(D3D10_DEPTH_STENCIL_DESC, DepthEnable) }, + {0x17, "DepthStencilState.DepthWriteMask", D3D10_SVT_INT, 1, 1, D3D10_SVT_DEPTHSTENCIL, FIELD_OFFSET(D3D10_DEPTH_STENCIL_DESC, DepthWriteMask) }, + {0x18, "DepthStencilState.DepthFunc", D3D10_SVT_INT, 1, 1, D3D10_SVT_DEPTHSTENCIL, FIELD_OFFSET(D3D10_DEPTH_STENCIL_DESC, DepthFunc) }, + {0x19, "DepthStencilState.StencilEnable", D3D10_SVT_BOOL, 1, 1, D3D10_SVT_DEPTHSTENCIL, FIELD_OFFSET(D3D10_DEPTH_STENCIL_DESC, StencilEnable) }, + {0x1a, "DepthStencilState.StencilReadMask", D3D10_SVT_UINT8, 1, 1, D3D10_SVT_DEPTHSTENCIL, FIELD_OFFSET(D3D10_DEPTH_STENCIL_DESC, StencilReadMask) }, + {0x1b, "DepthStencilState.StencilWriteMask", D3D10_SVT_UINT8, 1, 1, D3D10_SVT_DEPTHSTENCIL, FIELD_OFFSET(D3D10_DEPTH_STENCIL_DESC, StencilWriteMask) }, + {0x1c, "DepthStencilState.FrontFaceStencilFail", D3D10_SVT_INT, 1, 1, D3D10_SVT_DEPTHSTENCIL, FIELD_OFFSET(D3D10_DEPTH_STENCIL_DESC, FrontFace.StencilFailOp) }, + {0x1d, "DepthStencilState.FrontFaceStencilDepthFail", D3D10_SVT_INT, 1, 1, D3D10_SVT_DEPTHSTENCIL, FIELD_OFFSET(D3D10_DEPTH_STENCIL_DESC, FrontFace.StencilDepthFailOp)}, + {0x1e, "DepthStencilState.FrontFaceStencilPass", D3D10_SVT_INT, 1, 1, D3D10_SVT_DEPTHSTENCIL, FIELD_OFFSET(D3D10_DEPTH_STENCIL_DESC, FrontFace.StencilPassOp) }, + {0x1f, "DepthStencilState.FrontFaceStencilFunc", D3D10_SVT_INT, 1, 1, D3D10_SVT_DEPTHSTENCIL, FIELD_OFFSET(D3D10_DEPTH_STENCIL_DESC, FrontFace.StencilFunc) }, + {0x20, "DepthStencilState.BackFaceStencilFail", D3D10_SVT_INT, 1, 1, D3D10_SVT_DEPTHSTENCIL, FIELD_OFFSET(D3D10_DEPTH_STENCIL_DESC, BackFace.StencilFailOp) }, + {0x21, "DepthStencilState.BackFaceStencilDepthFail", D3D10_SVT_INT, 1, 1, D3D10_SVT_DEPTHSTENCIL, FIELD_OFFSET(D3D10_DEPTH_STENCIL_DESC, BackFace.StencilDepthFailOp) }, + {0x22, "DepthStencilState.BackFaceStencilPass", D3D10_SVT_INT, 1, 1, D3D10_SVT_DEPTHSTENCIL, FIELD_OFFSET(D3D10_DEPTH_STENCIL_DESC, BackFace.StencilPassOp) }, + {0x23, "DepthStencilState.BackFaceStencilFunc", D3D10_SVT_INT, 1, 1, D3D10_SVT_DEPTHSTENCIL, FIELD_OFFSET(D3D10_DEPTH_STENCIL_DESC, BackFace.StencilFunc) }, }; static const D3D10_RASTERIZER_DESC default_rasterizer_desc = @@ -154,6 +168,18 @@ static const D3D10_RASTERIZER_DESC default_rasterizer_desc = FALSE, }; +static const D3D10_DEPTH_STENCIL_DESC default_depth_stencil_desc = +{ + TRUE, + D3D10_DEPTH_WRITE_MASK_ALL, + D3D10_COMPARISON_LESS, + FALSE, + D3D10_DEFAULT_STENCIL_READ_MASK, + D3D10_DEFAULT_STENCIL_WRITE_MASK, + {D3D10_STENCIL_OP_KEEP, D3D10_STENCIL_OP_KEEP, D3D10_STENCIL_OP_KEEP, D3D10_COMPARISON_ALWAYS}, + {D3D10_STENCIL_OP_KEEP, D3D10_STENCIL_OP_KEEP, D3D10_STENCIL_OP_KEEP, D3D10_COMPARISON_ALWAYS}, +}; + struct d3d10_effect_state_storage_info { D3D_SHADER_VARIABLE_TYPE id; @@ -164,6 +190,7 @@ struct d3d10_effect_state_storage_info static const struct d3d10_effect_state_storage_info d3d10_effect_state_storage_info[] = { {D3D10_SVT_RASTERIZER, sizeof(default_rasterizer_desc), &default_rasterizer_desc }, + {D3D10_SVT_DEPTHSTENCIL, sizeof(default_depth_stencil_desc), &default_depth_stencil_desc}, }; static BOOL copy_name(const char *ptr, char **name) @@ -1013,6 +1040,20 @@ static BOOL read_int32_value(DWORD value, D3D_SHADER_VARIABLE_TYPE in_type, INT } } +static BOOL read_int8_value(DWORD value, D3D_SHADER_VARIABLE_TYPE in_type, INT8 *out_data, UINT idx) +{ + switch (in_type) + { + case D3D10_SVT_INT: + out_data[idx] = value; + return TRUE; + + default: + FIXME("Unhandled in_type %#x.\n", in_type); + return FALSE; + } +} + static BOOL read_value_list(const char *ptr, D3D_SHADER_VARIABLE_TYPE out_type, UINT out_base, UINT out_size, void *out_data) { @@ -1049,6 +1090,11 @@ static BOOL read_value_list(const char *ptr, D3D_SHADER_VARIABLE_TYPE out_type, return FALSE; break; + case D3D10_SVT_UINT8: + if (!read_int8_value(value, in_type, out_data, out_idx)) + return FALSE; + break; + default: FIXME("Unhandled out_type %#x.\n", out_type); return FALSE; @@ -1502,7 +1548,6 @@ static HRESULT parse_fx10_local_variable(struct d3d10_effect_variable *v, const } break; - case D3D10_SVT_DEPTHSTENCIL: case D3D10_SVT_BLEND: case D3D10_SVT_SAMPLER: TRACE("SVT is a state.\n"); @@ -1521,6 +1566,7 @@ static HRESULT parse_fx10_local_variable(struct d3d10_effect_variable *v, const } break; + case D3D10_SVT_DEPTHSTENCIL: case D3D10_SVT_RASTERIZER: { const struct d3d10_effect_state_storage_info *storage_info;

1 0

Henri Verbeet : d3d10: Implement d3d10_effect_depth_stencil_variable_GetBackingStore().
by Alexandre Julliard 23 Jul '12

23 Jul '12

Module: wine Branch: master Commit: 6feffa6ee2d8bdf043f9a35471a5b4a66abba90d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6feffa6ee2d8bdf043f9a3547… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jul 22 14:59:56 2012 +0200 d3d10: Implement d3d10_effect_depth_stencil_variable_GetBackingStore(). --- dlls/d3d10/effect.c | 14 ++++++++++- dlls/d3d10/tests/effect.c | 52 +++++++++++++++++++++----------------------- 2 files changed, 37 insertions(+), 29 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index dabe02c..eb82512 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -6091,9 +6091,19 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_depth_stencil_variable_GetDepthSte static HRESULT STDMETHODCALLTYPE d3d10_effect_depth_stencil_variable_GetBackingStore(ID3D10EffectDepthStencilVariable *iface, UINT index, D3D10_DEPTH_STENCIL_DESC *desc) { - FIXME("iface %p, index %u, desc %p stub!\n", iface, index, desc); + struct d3d10_effect_variable *v = impl_from_ID3D10EffectVariable((ID3D10EffectVariable *)iface); - return E_NOTIMPL; + TRACE("iface %p, index %u, desc %p.\n", iface, index, desc); + + if (index >= max(v->type->element_count, 1)) + { + WARN("Invalid index %u.\n", index); + return E_FAIL; + } + + *desc = ((D3D10_DEPTH_STENCIL_DESC *)v->data)[index]; + + return S_OK; } diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index 089ded6..b1b3816 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -3866,30 +3866,29 @@ static void test_effect_state_groups(ID3D10Device *device) v = effect->lpVtbl->GetVariableByName(effect, "ds_state"); d = v->lpVtbl->AsDepthStencil(v); - memset(&ds_desc, 0, sizeof(ds_desc)); d->lpVtbl->GetBackingStore(d, 0, &ds_desc); ok(!ds_desc.DepthEnable, "Got unexpected DepthEnable %#x.\n", ds_desc.DepthEnable); ok(ds_desc.DepthWriteMask == D3D10_DEPTH_WRITE_MASK_ZERO, "Got unexpected DepthWriteMask %#x.\n", ds_desc.DepthWriteMask); - todo_wine ok(ds_desc.DepthFunc == D3D10_COMPARISON_EQUAL, "Got unexpected DepthFunc %#x.\n", ds_desc.DepthFunc); - todo_wine ok(ds_desc.StencilEnable, "Got unexpected StencilEnable %#x.\n", ds_desc.StencilEnable); - todo_wine ok(ds_desc.StencilReadMask == 0x4, "Got unexpected StencilReadMask %#x.\n", ds_desc.StencilReadMask); - todo_wine ok(ds_desc.StencilWriteMask == 0x5, "Got unexpected StencilWriteMask %#x.\n", ds_desc.StencilWriteMask); - todo_wine ok(ds_desc.FrontFace.StencilFailOp == D3D10_STENCIL_OP_INVERT, "Got unexpected FrontFaceStencilFail %#x.\n", + ok(ds_desc.DepthFunc == D3D10_COMPARISON_EQUAL, "Got unexpected DepthFunc %#x.\n", ds_desc.DepthFunc); + ok(ds_desc.StencilEnable, "Got unexpected StencilEnable %#x.\n", ds_desc.StencilEnable); + ok(ds_desc.StencilReadMask == 0x4, "Got unexpected StencilReadMask %#x.\n", ds_desc.StencilReadMask); + ok(ds_desc.StencilWriteMask == 0x5, "Got unexpected StencilWriteMask %#x.\n", ds_desc.StencilWriteMask); + ok(ds_desc.FrontFace.StencilFailOp == D3D10_STENCIL_OP_INVERT, "Got unexpected FrontFaceStencilFail %#x.\n", ds_desc.FrontFace.StencilFailOp); - todo_wine ok(ds_desc.FrontFace.StencilDepthFailOp == D3D10_STENCIL_OP_INCR, + ok(ds_desc.FrontFace.StencilDepthFailOp == D3D10_STENCIL_OP_INCR, "Got unexpected FrontFaceStencilDepthFail %#x.\n", ds_desc.FrontFace.StencilDepthFailOp); - todo_wine ok(ds_desc.FrontFace.StencilPassOp == D3D10_STENCIL_OP_DECR, "Got unexpected FrontFaceStencilPass %#x.\n", + ok(ds_desc.FrontFace.StencilPassOp == D3D10_STENCIL_OP_DECR, "Got unexpected FrontFaceStencilPass %#x.\n", ds_desc.FrontFace.StencilPassOp); - todo_wine ok(ds_desc.FrontFace.StencilFunc == D3D10_COMPARISON_LESS_EQUAL, "Got unexpected FrontFaceStencilFunc %#x.\n", + ok(ds_desc.FrontFace.StencilFunc == D3D10_COMPARISON_LESS_EQUAL, "Got unexpected FrontFaceStencilFunc %#x.\n", ds_desc.FrontFace.StencilFunc); - todo_wine ok(ds_desc.BackFace.StencilFailOp == D3D10_STENCIL_OP_REPLACE, "Got unexpected BackFaceStencilFail %#x.\n", + ok(ds_desc.BackFace.StencilFailOp == D3D10_STENCIL_OP_REPLACE, "Got unexpected BackFaceStencilFail %#x.\n", ds_desc.BackFace.StencilFailOp); - todo_wine ok(ds_desc.BackFace.StencilDepthFailOp == D3D10_STENCIL_OP_INCR_SAT, + ok(ds_desc.BackFace.StencilDepthFailOp == D3D10_STENCIL_OP_INCR_SAT, "Got unexpected BackFaceStencilDepthFail %#x.\n", ds_desc.BackFace.StencilDepthFailOp); - todo_wine ok(ds_desc.BackFace.StencilPassOp == D3D10_STENCIL_OP_DECR_SAT, "Got unexpected BackFaceStencilPass %#x.\n", + ok(ds_desc.BackFace.StencilPassOp == D3D10_STENCIL_OP_DECR_SAT, "Got unexpected BackFaceStencilPass %#x.\n", ds_desc.BackFace.StencilPassOp); - todo_wine ok(ds_desc.BackFace.StencilFunc == D3D10_COMPARISON_GREATER_EQUAL, "Got unexpected BackFaceStencilFunc %#x.\n", + ok(ds_desc.BackFace.StencilFunc == D3D10_COMPARISON_GREATER_EQUAL, "Got unexpected BackFaceStencilFunc %#x.\n", ds_desc.BackFace.StencilFunc); v = effect->lpVtbl->GetVariableByName(effect, "rast_state"); @@ -4116,30 +4115,29 @@ static void test_effect_state_group_defaults(ID3D10Device *device) v = effect->lpVtbl->GetVariableByName(effect, "ds_state"); d = v->lpVtbl->AsDepthStencil(v); - memset(&ds_desc, 0, sizeof(ds_desc)); d->lpVtbl->GetBackingStore(d, 0, &ds_desc); - todo_wine ok(ds_desc.DepthEnable, "Got unexpected DepthEnable %#x.\n", ds_desc.DepthEnable); - todo_wine ok(ds_desc.DepthWriteMask == D3D10_DEPTH_WRITE_MASK_ALL, "Got unexpected DepthWriteMask %#x.\n", + ok(ds_desc.DepthEnable, "Got unexpected DepthEnable %#x.\n", ds_desc.DepthEnable); + ok(ds_desc.DepthWriteMask == D3D10_DEPTH_WRITE_MASK_ALL, "Got unexpected DepthWriteMask %#x.\n", ds_desc.DepthWriteMask); - todo_wine ok(ds_desc.DepthFunc == D3D10_COMPARISON_LESS, "Got unexpected DepthFunc %#x.\n", ds_desc.DepthFunc); + ok(ds_desc.DepthFunc == D3D10_COMPARISON_LESS, "Got unexpected DepthFunc %#x.\n", ds_desc.DepthFunc); ok(!ds_desc.StencilEnable, "Got unexpected StencilEnable %#x.\n", ds_desc.StencilEnable); - todo_wine ok(ds_desc.StencilReadMask == 0xff, "Got unexpected StencilReadMask %#x.\n", ds_desc.StencilReadMask); - todo_wine ok(ds_desc.StencilWriteMask == 0xff, "Got unexpected StencilWriteMask %#x.\n", ds_desc.StencilWriteMask); - todo_wine ok(ds_desc.FrontFace.StencilFailOp == D3D10_STENCIL_OP_KEEP, "Got unexpected FrontFaceStencilFail %#x.\n", + ok(ds_desc.StencilReadMask == 0xff, "Got unexpected StencilReadMask %#x.\n", ds_desc.StencilReadMask); + ok(ds_desc.StencilWriteMask == 0xff, "Got unexpected StencilWriteMask %#x.\n", ds_desc.StencilWriteMask); + ok(ds_desc.FrontFace.StencilFailOp == D3D10_STENCIL_OP_KEEP, "Got unexpected FrontFaceStencilFail %#x.\n", ds_desc.FrontFace.StencilFailOp); - todo_wine ok(ds_desc.FrontFace.StencilDepthFailOp == D3D10_STENCIL_OP_KEEP, + ok(ds_desc.FrontFace.StencilDepthFailOp == D3D10_STENCIL_OP_KEEP, "Got unexpected FrontFaceStencilDepthFail %#x.\n", ds_desc.FrontFace.StencilDepthFailOp); - todo_wine ok(ds_desc.FrontFace.StencilPassOp == D3D10_STENCIL_OP_KEEP, "Got unexpected FrontFaceStencilPass %#x.\n", + ok(ds_desc.FrontFace.StencilPassOp == D3D10_STENCIL_OP_KEEP, "Got unexpected FrontFaceStencilPass %#x.\n", ds_desc.FrontFace.StencilPassOp); - todo_wine ok(ds_desc.FrontFace.StencilFunc == D3D10_COMPARISON_ALWAYS, "Got unexpected FrontFaceStencilFunc %#x.\n", + ok(ds_desc.FrontFace.StencilFunc == D3D10_COMPARISON_ALWAYS, "Got unexpected FrontFaceStencilFunc %#x.\n", ds_desc.FrontFace.StencilFunc); - todo_wine ok(ds_desc.BackFace.StencilFailOp == D3D10_STENCIL_OP_KEEP, "Got unexpected BackFaceStencilFail %#x.\n", + ok(ds_desc.BackFace.StencilFailOp == D3D10_STENCIL_OP_KEEP, "Got unexpected BackFaceStencilFail %#x.\n", ds_desc.BackFace.StencilFailOp); - todo_wine ok(ds_desc.BackFace.StencilDepthFailOp == D3D10_STENCIL_OP_KEEP, + ok(ds_desc.BackFace.StencilDepthFailOp == D3D10_STENCIL_OP_KEEP, "Got unexpected BackFaceStencilDepthFail %#x.\n", ds_desc.BackFace.StencilDepthFailOp); - todo_wine ok(ds_desc.BackFace.StencilPassOp == D3D10_STENCIL_OP_KEEP, "Got unexpected BackFaceStencilPass %#x.\n", + ok(ds_desc.BackFace.StencilPassOp == D3D10_STENCIL_OP_KEEP, "Got unexpected BackFaceStencilPass %#x.\n", ds_desc.BackFace.StencilPassOp); - todo_wine ok(ds_desc.BackFace.StencilFunc == D3D10_COMPARISON_ALWAYS, "Got unexpected BackFaceStencilFunc %#x.\n", + ok(ds_desc.BackFace.StencilFunc == D3D10_COMPARISON_ALWAYS, "Got unexpected BackFaceStencilFunc %#x.\n", ds_desc.BackFace.StencilFunc); v = effect->lpVtbl->GetVariableByName(effect, "rast_state");

1 0