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

Detlef Riekenberg : avifil32: The array index is 0-based.
by Alexandre Julliard June 23, 2008

June 23, 2008

Module: wine Branch: master Commit: dda737f36a5574942f9eeed3745d161a50c4a512 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dda737f36a5574942f9eeed37… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Jun 22 22:23:28 2008 +0200 avifil32: The array index is 0-based. --- dlls/avifil32/api.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/avifil32/api.c b/dlls/avifil32/api.c index b7b21b9..12eb1b7 100644 --- a/dlls/avifil32/api.c +++ b/dlls/avifil32/api.c @@ -1524,7 +1524,7 @@ HRESULT WINAPI AVISaveOptionsFree(INT nStreams,LPAVICOMPRESSOPTIONS*ppOptions) if (nStreams < 0 || ppOptions == NULL) return AVIERR_BADPARAM; - for (; nStreams > 0; nStreams--) { + for (nStreams--; nStreams >= 0; nStreams--) { if (ppOptions[nStreams] != NULL) { ppOptions[nStreams]->dwFlags &= ~AVICOMPRESSF_VALID;

1 0

Rob Shearman : rpcrt4: Add test for using a conformant varying structure with pointers.
by Alexandre Julliard June 23, 2008

June 23, 2008

Module: wine Branch: master Commit: f82488823bc904a199327b7f3031046d2a01799b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f82488823bc904a199327b7f3… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Jun 23 09:25:25 2008 +0100 rpcrt4: Add test for using a conformant varying structure with pointers. --- dlls/rpcrt4/tests/server.c | 35 +++++++++++++++++++++++++++++++++-- dlls/rpcrt4/tests/server.idl | 9 +++++++++ 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index 6c0527f..91c87bf 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -654,6 +654,24 @@ s_get_numbers(int length, int size, pints_t n[]) } void +s_get_numbers_struct(numbers_struct_t **ns) +{ + int i; + *ns = midl_user_allocate(FIELD_OFFSET(numbers_struct_t, numbers[5])); + if (!*ns) return; + (*ns)->length = 5; + (*ns)->size = 5; + for (i = 0; i < (*ns)->length; i++) + { + (*ns)->numbers[i].pi = NULL; + (*ns)->numbers[i].ppi = NULL; + (*ns)->numbers[i].pppi = NULL; + } + (*ns)->numbers[0].pi = midl_user_allocate(sizeof(*(*ns)->numbers[i].pi)); + *(*ns)->numbers[0].pi = 5; +} + +void s_stop(void) { ok(RPC_S_OK == RpcMgmtStopServerListening(NULL), "RpcMgmtStopServerListening\n"); @@ -1096,6 +1114,7 @@ array_tests(void) doub_carr_t *dc; int *pi; pints_t api[5]; + numbers_struct_t *ns; ok(cstr_length(str1, sizeof str1) == strlen(str1), "RPC cstr_length\n"); @@ -1177,12 +1196,24 @@ array_tests(void) api[0].pi = pi; get_5numbers(1, api); ok(api[0].pi == pi, "RPC varying array [out] pointer changed from %p to %p\n", pi, api[0].pi); - ok(*api[0].pi == 0, "pi unmarshalled incorrectly %d\n", *pi); + ok(*api[0].pi == 0, "pi unmarshalled incorrectly %d\n", *api[0].pi); api[0].pi = pi; get_numbers(1, 1, api); ok(api[0].pi == pi, "RPC conformant varying array [out] pointer changed from %p to %p\n", pi, api[0].pi); - ok(*api[0].pi == 0, "pi unmarshalled incorrectly %d\n", *pi); + ok(*api[0].pi == 0, "pi unmarshalled incorrectly %d\n", *api[0].pi); + + ns = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, FIELD_OFFSET(numbers_struct_t, numbers[5])); + ns->length = 5; + ns->size = 5; + ns->numbers[0].pi = pi; + get_numbers_struct(&ns); + todo_wine { + ok(ns->numbers[0].pi == pi, "RPC conformant varying struct embedded pointer changed from %p to %p\n", pi, ns->numbers[0].pi); + } + ok(*ns->numbers[0].pi == 5, "pi unmarshalled incorrectly %d\n", *ns->numbers[0].pi); + + HeapFree(GetProcessHeap(), 0, ns); HeapFree(GetProcessHeap(), 0, pi); } diff --git a/dlls/rpcrt4/tests/server.idl b/dlls/rpcrt4/tests/server.idl index 33e3a48..378b205 100644 --- a/dlls/rpcrt4/tests/server.idl +++ b/dlls/rpcrt4/tests/server.idl @@ -319,8 +319,17 @@ cpp_quote("#endif") type as a return value. */ s123_t *get_s123(void); + typedef struct + { + unsigned int length; + unsigned int size; + [size_is(size), length_is(length)] pints_t numbers[]; + } numbers_struct_t; + void get_5numbers([in] int count, [out, length_is(count)] pints_t pn[5]); void get_numbers([in] int length, [in] int size, [out, length_is(length), size_is(size)] pints_t pn[]); + void get_numbers_struct([out] numbers_struct_t **ns); + str_t get_filename(void); void context_handle_test(void); void stop(void);

1 0

Dan Hipschman : kernel32/tests: Add tests for TLS functions.
by Alexandre Julliard June 23, 2008

June 23, 2008

Module: wine Branch: master Commit: e22af18e7a3b0b44512d780dc9ff664c63665dcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=e22af18e7a3b0b44512d780dc… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Fri Jun 20 16:10:31 2008 -0700 kernel32/tests: Add tests for TLS functions. --- dlls/kernel32/tests/thread.c | 228 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 228 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index 7d83b25..d1ac617 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -21,6 +21,7 @@ /* Define _WIN32_WINNT to get SetThreadIdealProcessor on Windows */ #define _WIN32_WINNT 0x0500 +#include <assert.h> #include <stdarg.h> #include <stdio.h> @@ -99,6 +100,57 @@ In addition there are no checks that the inheritance works properly in CreateThread */ +/* Functions to ensure that from a group of threads, only one executes + certain chunks of code at a time, and we know which one is executing + it. It basically makes multithreaded execution linear, which defeats + the purpose of multiple threads, but makes testing easy. */ +static HANDLE all_synced; +static LONG num_syncing_threads, num_synced; + +static void init_thread_sync_helpers(LONG num_threads) +{ + all_synced = CreateEvent(NULL, FALSE, FALSE, NULL); + ok(all_synced != NULL, "CreateEvent failed\n"); + num_syncing_threads = num_threads; + num_synced = 0; +} + +static BOOL sync_threads_and_run_one(DWORD sync_id, DWORD my_id) +{ + LONG num = InterlockedIncrement(&num_synced); + assert(0 < num && num <= num_syncing_threads); + if (num == num_syncing_threads) + /* FIXME: MSDN claims PulseEvent is unreliable. For a test this isn't + so important, but we could use condition variables with more effort. + The given approach is clearer, though. */ + PulseEvent(all_synced); + else + { + DWORD ret = WaitForSingleObject(all_synced, 60000); + ok(ret == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); + } + return sync_id == my_id; +} + +static void resync_after_run(void) +{ + LONG num = InterlockedDecrement(&num_synced); + assert(0 <= num && num < num_syncing_threads); + if (num == 0) + PulseEvent(all_synced); + else + { + DWORD ret = WaitForSingleObject(all_synced, 60000); + ok(ret == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); + } +} + +static void cleanup_thread_sync_helpers(void) +{ + CloseHandle(all_synced); + all_synced = NULL; +} + DWORD tlsIndex; typedef struct { @@ -953,6 +1005,181 @@ static void test_RegisterWaitForSingleObject(void) ok(ret, "UnregisterWait failed with error %d\n", GetLastError()); } +static DWORD TLS_main; +static DWORD TLS_index0, TLS_index1; + +static DWORD WINAPI TLS_InheritanceProc(LPVOID p) +{ + /* We should NOT inherit the TLS values from our parent or from the + main thread. */ + LPVOID val; + + val = TlsGetValue(TLS_main); + ok(val == NULL, "TLS inheritance failed\n"); + + val = TlsGetValue(TLS_index0); + ok(val == NULL, "TLS inheritance failed\n"); + + val = TlsGetValue(TLS_index1); + ok(val == NULL, "TLS inheritance failed\n"); + + return 0; +} + +/* Basic TLS usage test. Make sure we can create slots and the values we + store in them are separate among threads. Also test TLS value + inheritance with TLS_InheritanceProc. */ +static DWORD WINAPI TLS_ThreadProc(LPVOID p) +{ + LONG id = (LONG) p; + LPVOID val; + BOOL ret; + + if (sync_threads_and_run_one(0, id)) + { + TLS_index0 = TlsAlloc(); + ok(TLS_index0 != TLS_OUT_OF_INDEXES, "TlsAlloc failed\n"); + } + resync_after_run(); + + if (sync_threads_and_run_one(1, id)) + { + TLS_index1 = TlsAlloc(); + ok(TLS_index1 != TLS_OUT_OF_INDEXES, "TlsAlloc failed\n"); + + /* Slot indices should be different even if created in different + threads. */ + ok(TLS_index0 != TLS_index1, "TlsAlloc failed\n"); + + /* Both slots should be initialized to NULL */ + val = TlsGetValue(TLS_index0); + ok(GetLastError() == ERROR_SUCCESS, "TlsGetValue failed\n"); + ok(val == NULL, "TLS slot not initialized correctly\n"); + + val = TlsGetValue(TLS_index1); + ok(GetLastError() == ERROR_SUCCESS, "TlsGetValue failed\n"); + ok(val == NULL, "TLS slot not initialized correctly\n"); + } + resync_after_run(); + + if (sync_threads_and_run_one(0, id)) + { + val = TlsGetValue(TLS_index0); + ok(GetLastError() == ERROR_SUCCESS, "TlsGetValue failed\n"); + ok(val == NULL, "TLS slot not initialized correctly\n"); + + val = TlsGetValue(TLS_index1); + ok(GetLastError() == ERROR_SUCCESS, "TlsGetValue failed\n"); + ok(val == NULL, "TLS slot not initialized correctly\n"); + + ret = TlsSetValue(TLS_index0, (LPVOID) 1); + ok(ret, "TlsSetValue failed\n"); + + ret = TlsSetValue(TLS_index1, (LPVOID) 2); + ok(ret, "TlsSetValue failed\n"); + + val = TlsGetValue(TLS_index0); + ok(GetLastError() == ERROR_SUCCESS, "TlsGetValue failed\n"); + ok(val == (LPVOID) 1, "TLS slot not initialized correctly\n"); + + val = TlsGetValue(TLS_index1); + ok(GetLastError() == ERROR_SUCCESS, "TlsGetValue failed\n"); + ok(val == (LPVOID) 2, "TLS slot not initialized correctly\n"); + } + resync_after_run(); + + if (sync_threads_and_run_one(1, id)) + { + val = TlsGetValue(TLS_index0); + ok(GetLastError() == ERROR_SUCCESS, "TlsGetValue failed\n"); + ok(val == NULL, "TLS slot not initialized correctly\n"); + + val = TlsGetValue(TLS_index1); + ok(GetLastError() == ERROR_SUCCESS, "TlsGetValue failed\n"); + ok(val == NULL, "TLS slot not initialized correctly\n"); + + ret = TlsSetValue(TLS_index0, (LPVOID) 3); + ok(ret, "TlsSetValue failed\n"); + + ret = TlsSetValue(TLS_index1, (LPVOID) 4); + ok(ret, "TlsSetValue failed\n"); + + val = TlsGetValue(TLS_index0); + ok(GetLastError() == ERROR_SUCCESS, "TlsGetValue failed\n"); + ok(val == (LPVOID) 3, "TLS slot not initialized correctly\n"); + + val = TlsGetValue(TLS_index1); + ok(GetLastError() == ERROR_SUCCESS, "TlsGetValue failed\n"); + ok(val == (LPVOID) 4, "TLS slot not initialized correctly\n"); + } + resync_after_run(); + + if (sync_threads_and_run_one(0, id)) + { + HANDLE thread; + DWORD waitret; + + val = TlsGetValue(TLS_index0); + ok(GetLastError() == ERROR_SUCCESS, "TlsGetValue failed\n"); + ok(val == (LPVOID) 1, "TLS slot not initialized correctly\n"); + + val = TlsGetValue(TLS_index1); + ok(GetLastError() == ERROR_SUCCESS, "TlsGetValue failed\n"); + ok(val == (LPVOID) 2, "TLS slot not initialized correctly\n"); + + thread = CreateThread(NULL, 0, TLS_InheritanceProc, 0, 0, NULL); + ok(thread != NULL, "CreateThread failed\n"); + waitret = WaitForSingleObject(thread, 60000); + ok(waitret == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); + CloseHandle(thread); + + ret = TlsFree(TLS_index0); + ok(ret, "TlsFree failed\n"); + } + resync_after_run(); + + if (sync_threads_and_run_one(1, id)) + { + ret = TlsFree(TLS_index1); + ok(ret, "TlsFree failed\n"); + } + resync_after_run(); + + return 0; +} + +static void test_TLS(void) +{ + HANDLE threads[2]; + LONG i; + DWORD ret; + BOOL suc; + + init_thread_sync_helpers(2); + + /* Allocate a TLS slot in the main thread to test for inheritance. */ + TLS_main = TlsAlloc(); + ok(TLS_main != TLS_OUT_OF_INDEXES, "TlsAlloc failed\n"); + suc = TlsSetValue(TLS_main, (LPVOID) 4114); + ok(suc, "TlsSetValue failed\n"); + + for (i = 0; i < 2; ++i) + { + threads[i] = CreateThread(NULL, 0, TLS_ThreadProc, (LPVOID) i, 0, NULL); + ok(threads[i] != NULL, "CreateThread failed\n"); + } + + ret = WaitForMultipleObjects(2, threads, TRUE, 60000); + ok(ret == WAIT_OBJECT_0, "WaitForMultipleObjects failed\n"); + + for (i = 0; i < 2; ++i) + CloseHandle(threads[i]); + + suc = TlsFree(TLS_main); + ok(suc, "TlsFree failed\n"); + cleanup_thread_sync_helpers(); +} + START_TEST(thread) { HINSTANCE lib; @@ -1012,4 +1239,5 @@ START_TEST(thread) #endif test_QueueUserWorkItem(); test_RegisterWaitForSingleObject(); + test_TLS(); }

1 0

Jon Griffiths : ntdll: Implement [Rtl]InitializeCriticalSectionEx.
by Alexandre Julliard June 23, 2008

June 23, 2008

Module: wine Branch: master Commit: 1ad733e4e0a589bf2713121cf12c3cbf57799608 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ad733e4e0a589bf2713121cf… Author: Jon Griffiths <jon_p_griffiths(a)yahoo.com> Date: Fri Jun 20 00:19:09 2008 -0700 ntdll: Implement [Rtl]InitializeCriticalSectionEx. --- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/sync.c | 27 +++++++++++++++++++-- dlls/ntdll/critsection.c | 52 +++++++++++++++++++++++++++++++++++++++++- dlls/ntdll/ntdll.spec | 1 + include/winbase.h | 3 ++ include/winnt.h | 6 +++++ include/winternl.h | 3 +- 7 files changed, 87 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1ad733e4e0a589bf27131…

1 0

Eric Pouech : winhelp: Removed the main history button, and use the item in Options menu instead.
by Alexandre Julliard June 23, 2008

June 23, 2008

Module: wine Branch: master Commit: cd8b30f1dd1e614125ffccc48834093336ac49e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd8b30f1dd1e614125ffccc48… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Jun 21 11:00:16 2008 +0200 winhelp: Removed the main history button, and use the item in Options menu instead. --- programs/winhlp32/Bg.rc | 1 - programs/winhlp32/Cs.rc | 1 - programs/winhlp32/Da.rc | 1 - programs/winhlp32/De.rc | 1 - programs/winhlp32/En.rc | 1 - programs/winhlp32/Eo.rc | 1 - programs/winhlp32/Es.rc | 1 - programs/winhlp32/Fi.rc | 1 - programs/winhlp32/Fr.rc | 1 - programs/winhlp32/Hu.rc | 1 - programs/winhlp32/It.rc | 1 - programs/winhlp32/Ko.rc | 1 - programs/winhlp32/Nl.rc | 1 - programs/winhlp32/No.rc | 1 - programs/winhlp32/Pl.rc | 1 - programs/winhlp32/Pt.rc | 2 -- programs/winhlp32/Rm.rc | 1 - programs/winhlp32/Ru.rc | 1 - programs/winhlp32/Si.rc | 1 - programs/winhlp32/Sk.rc | 1 - programs/winhlp32/Sv.rc | 1 - programs/winhlp32/Tr.rc | 1 - programs/winhlp32/Wa.rc | 1 - programs/winhlp32/Zh.rc | 1 - programs/winhlp32/winhelp.c | 3 +-- programs/winhlp32/winhelp_res.h | 1 - 26 files changed, 1 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cd8b30f1dd1e614125ffc…

1 0

Eric Pouech : winhelp: Added the options menu.
by Alexandre Julliard June 23, 2008

June 23, 2008

Module: wine Branch: master Commit: 2ecb36709ee3c09e1974c426a3a5eaaa075114ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ecb36709ee3c09e1974c426a… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Jun 21 11:00:07 2008 +0200 winhelp: Added the options menu. --- programs/winhlp32/Bg.rc | 16 ++++++++++++++++ programs/winhlp32/Cs.rc | 16 ++++++++++++++++ programs/winhlp32/Da.rc | 16 ++++++++++++++++ programs/winhlp32/De.rc | 16 ++++++++++++++++ programs/winhlp32/En.rc | 16 ++++++++++++++++ programs/winhlp32/Eo.rc | 16 ++++++++++++++++ programs/winhlp32/Es.rc | 16 ++++++++++++++++ programs/winhlp32/Fi.rc | 16 ++++++++++++++++ programs/winhlp32/Fr.rc | 16 ++++++++++++++++ programs/winhlp32/Hu.rc | 16 ++++++++++++++++ programs/winhlp32/It.rc | 16 ++++++++++++++++ programs/winhlp32/Ko.rc | 16 ++++++++++++++++ programs/winhlp32/Nl.rc | 16 ++++++++++++++++ programs/winhlp32/No.rc | 16 ++++++++++++++++ programs/winhlp32/Pl.rc | 16 ++++++++++++++++ programs/winhlp32/Pt.rc | 32 ++++++++++++++++++++++++++++++++ programs/winhlp32/Rm.rc | 16 ++++++++++++++++ programs/winhlp32/Ru.rc | 16 ++++++++++++++++ programs/winhlp32/Si.rc | 18 +++++++++++++++++- programs/winhlp32/Sk.rc | 16 ++++++++++++++++ programs/winhlp32/Sv.rc | 16 ++++++++++++++++ programs/winhlp32/Tr.rc | 16 ++++++++++++++++ programs/winhlp32/Wa.rc | 16 ++++++++++++++++ programs/winhlp32/Zh.rc | 16 ++++++++++++++++ programs/winhlp32/winhelp.c | 17 +++++++++++++++++ programs/winhlp32/winhelp_res.h | 17 +++++++++++++---- 26 files changed, 431 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2ecb36709ee3c09e1974c…

1 0

H. Verbeet : wined3d: Half float formats need ARB_TEXTURE_FLOAT as well.
by Alexandre Julliard June 23, 2008

June 23, 2008

Module: wine Branch: master Commit: ebcb5f23a1a397d3db012d85cc3a56020d11b406 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebcb5f23a1a397d3db012d85c… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Jun 23 00:22:29 2008 +0200 wined3d: Half float formats need ARB_TEXTURE_FLOAT as well. Currently we only check if ARB_HALF_FLOAT_PIXEL is supported. This is not enough, we need ARB_TEXTURE_FLOAT as well. This fixes some errors when running the d3d9 visual test with Mesa swrast. --- dlls/wined3d/directx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index db23f0f..e293d7d 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2321,7 +2321,7 @@ static BOOL CheckTextureCapability(UINT Adapter, WINED3DFORMAT CheckFormat) /* Floating point formats */ case WINED3DFMT_R16F: case WINED3DFMT_A16B16G16R16F: - if(GL_SUPPORT(ARB_HALF_FLOAT_PIXEL)) { + if(GL_SUPPORT(ARB_TEXTURE_FLOAT) && GL_SUPPORT(ARB_HALF_FLOAT_PIXEL)) { TRACE_(d3d_caps)("[OK]\n"); return TRUE; }

1 0

H. Verbeet : wined3d: Report post pixelshader blending on WINED3DFMT_A16B16G16R16F.
by Alexandre Julliard June 23, 2008

June 23, 2008

Module: wine Branch: master Commit: 02a2ba9d2f8f02d85873e9b7a30c71f1ac08990d URL: http://source.winehq.org/git/wine.git/?a=commit;h=02a2ba9d2f8f02d85873e9b7a… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Jun 23 00:22:19 2008 +0200 wined3d: Report post pixelshader blending on WINED3DFMT_A16B16G16R16F. --- dlls/wined3d/utils.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index d2883da..5a02717 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -168,7 +168,7 @@ static const GlPixelFormatDescTemplate gl_formats_template[] = { {WINED3DFMT_G16R16F ,0 ,0 , 0, 0 ,0 ,WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_RENDERTARGET }, {WINED3DFMT_A16B16G16R16F ,GL_RGBA16F_ARB ,GL_RGBA16F_ARB , 0, GL_RGBA ,GL_HALF_FLOAT_ARB - ,WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_RENDERTARGET }, + ,WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_RENDERTARGET }, /* Palettized formats */ {WINED3DFMT_A8P8, 0 ,0 , 0, 0 ,0 ,0 },

1 0

Roderick Colenbrander : wined3d: Fix a usage flags conflict.
by Alexandre Julliard June 23, 2008

June 23, 2008

Module: wine Branch: master Commit: 2b2a5d7fbc2d97e557c2b387c9e5f701ff3740b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b2a5d7fbc2d97e557c2b387c… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sun Jun 22 20:53:36 2008 +0000 wined3d: Fix a usage flags conflict. Both WINED3DUSAGE_OVERLAY and WINED3DUSAGE_QUERY_SRGBBLEND were using the same value. All usage flags except for OVERLAY are directly mapped to d3d9, so give OVERLAY its own value. --- include/wine/wined3d_types.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/wine/wined3d_types.h b/include/wine/wined3d_types.h index 81599ec..45a947d 100644 --- a/include/wine/wined3d_types.h +++ b/include/wine/wined3d_types.h @@ -1334,7 +1334,7 @@ typedef enum { #define WINED3DUSAGE_AUTOGENMIPMAP 0x00000400L #define WINED3DUSAGE_DMAP 0x00004000L #define WINED3DUSAGE_MASK 0x00004FFFL -#define WINED3DUSAGE_OVERLAY 0x00010000L +#define WINED3DUSAGE_OVERLAY 0x80000000L #define WINED3DUSAGE_QUERY_LEGACYBUMPMAP 0x00008000L #define WINED3DUSAGE_QUERY_FILTER 0x00020000L

1 0

Roderick Colenbrander : wined3d: Update the d3dusage query mask with 0x100000 (vertextexture).
by Alexandre Julliard June 23, 2008

June 23, 2008

Module: wine Branch: master Commit: 5cc5d8a070d643bed9f581dca67ae799daf43a49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cc5d8a070d643bed9f581dca… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sun Jun 22 13:41:39 2008 +0000 wined3d: Update the d3dusage query mask with 0x100000 (vertextexture). --- include/wine/wined3d_types.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/wine/wined3d_types.h b/include/wine/wined3d_types.h index d85e343..81599ec 100644 --- a/include/wine/wined3d_types.h +++ b/include/wine/wined3d_types.h @@ -1343,7 +1343,7 @@ typedef enum { #define WINED3DUSAGE_QUERY_SRGBWRITE 0x00040000L #define WINED3DUSAGE_QUERY_VERTEXTEXTURE 0x00100000L #define WINED3DUSAGE_QUERY_WRAPANDMIP 0x00200000L -#define WINED3DUSAGE_QUERY_MASK 0x002F8000L +#define WINED3DUSAGE_QUERY_MASK 0x003F8000L typedef enum _WINED3DSURFTYPE { SURFACE_UNKNOWN = 0, /* Default / Unknown surface type */

1 0