wine-commits October 2013

wine-commits@winehq.org

2 participants
757 discussions

Piotr Caban : msvcrt: Don't forward wcsncmp to ntdll.
by Alexandre Julliard 01 Oct '13

01 Oct '13

Module: wine Branch: master Commit: 26721c25f6e3e070b0c7c7cd6fb62c94a4a55811 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26721c25f6e3e070b0c7c7cd6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 1 11:29:22 2013 +0200 msvcrt: Don't forward wcsncmp to ntdll. --- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index f8a4b73..43daf0f 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1492,7 +1492,7 @@ @ cdecl wcslen(wstr) MSVCRT_wcslen @ cdecl wcsncat(wstr wstr long) ntdll.wcsncat @ cdecl wcsncat_s(wstr long wstr long) MSVCRT_wcsncat_s -@ cdecl wcsncmp(wstr wstr long) ntdll.wcsncmp +@ cdecl wcsncmp(wstr wstr long) MSVCRT_wcsncmp @ cdecl wcsncpy(ptr wstr long) MSVCRT_wcsncpy @ cdecl wcsncpy_s(ptr long wstr long) MSVCRT_wcsncpy_s @ cdecl wcsnlen(wstr long) MSVCRT_wcsnlen diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 4b23671..97d916f 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1923,3 +1923,11 @@ __int64 CDECL _wtoi64(const MSVCRT_wchar_t *str) { return _wtoi64_l(str, NULL); } + +/********************************************************************* + * wcsncmp (MSVCRT.@) + */ +int CDECL MSVCRT_wcsncmp(const MSVCRT_wchar_t *str1, const MSVCRT_wchar_t *str2, int n) +{ + return strncmpW(str1, str2, n); +}

1 0

Piotr Caban : msvcrt: Don't forward qsort to ntdll.
by Alexandre Julliard 01 Oct '13

01 Oct '13

Module: wine Branch: master Commit: 7fb5cca3e4bc50d5a02f4be500915a98372869a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fb5cca3e4bc50d5a02f4be50… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 1 11:29:10 2013 +0200 msvcrt: Don't forward qsort to ntdll. --- dlls/msvcrt/misc.c | 9 +++++++++ dlls/msvcrt/msvcrt.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/misc.c b/dlls/msvcrt/misc.c index effca2b..069f733 100644 --- a/dlls/msvcrt/misc.c +++ b/dlls/msvcrt/misc.c @@ -294,6 +294,15 @@ void CDECL MSVCRT_qsort_s(void *base, MSVCRT_size_t nmemb, MSVCRT_size_t size, } /********************************************************************* + * qsort (MSVCRT.@) + */ +void CDECL MSVCRT_qsort(void *base, MSVCRT_size_t nmemb, MSVCRT_size_t size, + int (CDECL *compar)(const void*, const void*)) +{ + return MSVCRT_qsort_s(base, nmemb, size, compare_wrapper, compar); +} + +/********************************************************************* * _get_output_format (MSVCRT.@) */ unsigned int CDECL _get_output_format(void) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 63e4f4c..f8a4b73 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1389,7 +1389,7 @@ @ cdecl puts(str) MSVCRT_puts @ cdecl putwc(long ptr) MSVCRT_fputwc @ cdecl putwchar(long) MSVCRT__fputwchar -@ cdecl qsort(ptr long long ptr) ntdll.qsort +@ cdecl qsort(ptr long long ptr) MSVCRT_qsort @ cdecl qsort_s(ptr long long ptr ptr) MSVCRT_qsort_s @ cdecl raise(long) MSVCRT_raise @ cdecl rand() MSVCRT_rand

1 0

Piotr Caban : msvcrt: Don't forward bsearch to ntdll.
by Alexandre Julliard 01 Oct '13

01 Oct '13

Module: wine Branch: master Commit: 5fce0724ed53b78fb8fc93c69e1db783db91387a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fce0724ed53b78fb8fc93c69… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 1 11:28:54 2013 +0200 msvcrt: Don't forward bsearch to ntdll. --- dlls/msvcrt/misc.c | 14 ++++++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- 2 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/misc.c b/dlls/msvcrt/misc.c index 75e75e6..effca2b 100644 --- a/dlls/msvcrt/misc.c +++ b/dlls/msvcrt/misc.c @@ -151,6 +151,20 @@ void* CDECL MSVCRT_bsearch_s(const void *key, const void *base, return NULL; } +static int CDECL compare_wrapper(void *ctx, const void *e1, const void *e2) +{ + int (__cdecl *compare)(const void *, const void *) = ctx; + return compare(e1, e2); +} + +/********************************************************************* + * bsearch (msvcrt.@) + */ +void* CDECL MSVCRT_bsearch(const void *key, const void *base, MSVCRT_size_t nmemb, + MSVCRT_size_t size, int (__cdecl *compar)(const void *, const void *)) +{ + return MSVCRT_bsearch_s(key, base, nmemb, size, compare_wrapper, compar); +} /********************************************************************* * _chkesp (MSVCRT.@) * diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index acf53aa..63e4f4c 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1257,7 +1257,7 @@ @ cdecl atof(str) MSVCRT_atof @ cdecl atoi(str) MSVCRT_atoi @ cdecl atol(str) ntdll.atol -@ cdecl bsearch(ptr ptr long long ptr) ntdll.bsearch +@ cdecl bsearch(ptr ptr long long ptr) MSVCRT_bsearch @ cdecl bsearch_s(ptr ptr long long ptr ptr) MSVCRT_bsearch_s @ cdecl btowc(long) MSVCRT_btowc @ cdecl calloc(long long) MSVCRT_calloc

1 0

Piotr Caban : msvcrt: Add _wtoi64_l implementation.
by Alexandre Julliard 01 Oct '13

01 Oct '13

Module: wine Branch: master Commit: 3868bf06b25b16ab8e92f0c51416a2eb325d0fd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3868bf06b25b16ab8e92f0c51… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 1 11:28:29 2013 +0200 msvcrt: Add _wtoi64_l implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 4 ++-- dlls/msvcrt/wcs.c | 35 +++++++++++++++++++++++++++++++++++ 6 files changed, 41 insertions(+), 6 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 4323e45..646137d 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1609,7 +1609,7 @@ @ cdecl _wtof_l(wstr ptr) msvcrt._wtof_l @ cdecl _wtoi(wstr) msvcrt._wtoi @ cdecl -ret64 _wtoi64(wstr) msvcrt._wtoi64 -@ stub _wtoi64_l +@ cdecl -ret64 _wtoi64_l(wstr ptr) msvcrt._wtoi64_l @ cdecl _wtoi_l(wstr ptr) msvcrt._wtoi_l @ cdecl _wtol(wstr) msvcrt._wtol @ cdecl _wtol_l(wstr ptr) msvcrt._wtol_l diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 57bd107..b82a58e 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1967,7 +1967,7 @@ @ cdecl _wtof_l(wstr ptr) msvcrt._wtof_l @ cdecl _wtoi(wstr) msvcrt._wtoi @ cdecl -ret64 _wtoi64(wstr) msvcrt._wtoi64 -@ stub _wtoi64_l +@ cdecl -ret64 _wtoi64_l(wstr ptr) msvcrt._wtoi64_l @ cdecl _wtoi_l(wstr ptr) msvcrt._wtoi_l @ cdecl _wtol(wstr) msvcrt._wtol @ cdecl _wtol_l(wstr ptr) msvcrt._wtol_l diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index b70d4fb..0a0adf6 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1291,7 +1291,7 @@ @ cdecl _wtof_l(wstr ptr) msvcrt._wtof_l @ cdecl _wtoi(wstr) msvcrt._wtoi @ cdecl -ret64 _wtoi64(wstr) msvcrt._wtoi64 -@ stub _wtoi64_l +@ cdecl -ret64 _wtoi64_l(wstr ptr) msvcrt._wtoi64_l @ cdecl _wtoi_l(wstr ptr) msvcrt._wtoi_l @ cdecl _wtol(wstr) msvcrt._wtol @ cdecl _wtol_l(wstr ptr) msvcrt._wtol_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 36cf2e4..382a52e 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1264,7 +1264,7 @@ @ cdecl _wtof_l(wstr ptr) msvcrt._wtof_l @ cdecl _wtoi(wstr) msvcrt._wtoi @ cdecl -ret64 _wtoi64(wstr) msvcrt._wtoi64 -@ stub _wtoi64_l +@ cdecl -ret64 _wtoi64_l(wstr ptr) msvcrt._wtoi64_l @ cdecl _wtoi_l(wstr ptr) msvcrt._wtoi_l @ cdecl _wtol(wstr) msvcrt._wtol @ cdecl _wtol_l(wstr ptr) msvcrt._wtol_l diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 7cfc370..acf53aa 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1229,8 +1229,8 @@ @ cdecl _wtof(wstr) MSVCRT__wtof @ cdecl _wtof_l(wstr ptr) MSVCRT__wtof_l @ cdecl _wtoi(wstr) MSVCRT__wtoi -@ cdecl -ret64 _wtoi64(wstr) ntdll._wtoi64 -# stub -ret64 _wtoi64_l(wstr ptr) +@ cdecl -ret64 _wtoi64(wstr) +@ cdecl -ret64 _wtoi64_l(wstr ptr) @ cdecl _wtoi_l(wstr ptr) MSVCRT__wtoi_l @ cdecl _wtol(wstr) MSVCRT__wtol @ cdecl _wtol_l(wstr ptr) MSVCRT__wtol_l diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 1cf2276..4b23671 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1888,3 +1888,38 @@ MSVCRT_wchar_t* CDECL MSVCRT_wcsstr(const MSVCRT_wchar_t *str, const MSVCRT_wcha { return strstrW(str, sub); } + +/********************************************************************* + * _wtoi64_l (MSVCRT.@) + */ +__int64 CDECL _wtoi64_l(const MSVCRT_wchar_t *str, MSVCRT__locale_t locale) +{ + ULONGLONG RunningTotal = 0; + char bMinus = 0; + + while (isspaceW(*str)) { + str++; + } /* while */ + + if (*str == '+') { + str++; + } else if (*str == '-') { + bMinus = 1; + str++; + } /* if */ + + while (*str >= '0' && *str <= '9') { + RunningTotal = RunningTotal * 10 + *str - '0'; + str++; + } /* while */ + + return bMinus ? -RunningTotal : RunningTotal; +} + +/********************************************************************* + * _wtoi64 (MSVCRT.@) + */ +__int64 CDECL _wtoi64(const MSVCRT_wchar_t *str) +{ + return _wtoi64_l(str, NULL); +}

1 0

Piotr Caban : msvcrt: Don't forward _itoa to ntdll.
by Alexandre Julliard 01 Oct '13

01 Oct '13

Module: wine Branch: master Commit: d99090aff87b603b1d55b570629d7fc5bc56cff4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d99090aff87b603b1d55b5706… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 1 11:28:09 2013 +0200 msvcrt: Don't forward _itoa to ntdll. --- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/string.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 6089656..7cfc370 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -646,7 +646,7 @@ # stub _iswupper_l(long ptr) # stub _iswxdigit_l(long ptr) @ cdecl _isxdigit_l(long ptr) MSVCRT__isxdigit_l -@ cdecl _itoa(long ptr long) ntdll._itoa +@ cdecl _itoa(long ptr long) @ cdecl _itoa_s(long ptr long long) @ cdecl _itow(long ptr long) ntdll._itow @ cdecl _itow_s(long ptr long long) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 5678a89..a6b328b 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -1139,6 +1139,14 @@ int CDECL _itoa_s(int value, char *str, MSVCRT_size_t size, int radix) } /********************************************************************* + * _itoa (MSVCRT.@) + */ +char* CDECL _itoa(int value, char *str, int radix) +{ + return _itoa_s(value, str, MSVCRT_SIZE_MAX, radix) ? NULL : str; +} + +/********************************************************************* * _itow_s (MSVCRT.@) */ int CDECL _itow_s(int value, MSVCRT_wchar_t *str, MSVCRT_size_t size, int radix)

1 0

Piotr Caban : msvcr80: Don't forward some function to msvcrt.
by Alexandre Julliard 01 Oct '13

01 Oct '13

Module: wine Branch: master Commit: 1a3546e54b00994462bf468874a3ece74b17bc90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a3546e54b00994462bf46887… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 1 11:24:11 2013 +0200 msvcr80: Don't forward some function to msvcrt. --- dlls/msvcr80/msvcr80.c | 152 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcr80/msvcr80.spec | 38 ++++++------ 2 files changed, 171 insertions(+), 19 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1a3546e54b00994462bf4…

1 0

Alistair Leslie-Hughes : oledb32: Implement IDataSourceLocator get/put hWnd .
by Alexandre Julliard 01 Oct '13

01 Oct '13

Module: wine Branch: master Commit: 05a807af49e027422afb8f9c8e39bb5e4c09494d URL: http://source.winehq.org/git/wine.git/?a=commit;h=05a807af49e027422afb8f9c8… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Sep 30 14:05:01 2013 +1000 oledb32: Implement IDataSourceLocator get/put hWnd. --- dlls/oledb32/dslocator.c | 14 ++++++++--- dlls/oledb32/tests/database.c | 48 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 4 deletions(-) diff --git a/dlls/oledb32/dslocator.c b/dlls/oledb32/dslocator.c index f8a98f5..4af4ab4 100644 --- a/dlls/oledb32/dslocator.c +++ b/dlls/oledb32/dslocator.c @@ -42,6 +42,7 @@ typedef struct DSLocatorImpl IDataSourceLocator IDataSourceLocator_iface; LONG ref; + HWND hwnd; } DSLocatorImpl; static inline DSLocatorImpl *impl_from_IDataSourceLocator( IDataSourceLocator *iface ) @@ -139,18 +140,22 @@ static HRESULT WINAPI dslocator_get_hWnd(IDataSourceLocator *iface, COMPATIBLE_L { DSLocatorImpl *This = impl_from_IDataSourceLocator(iface); - FIXME("(%p)->(%p)\n",This, phwndParent); + TRACE("(%p)->(%p)\n",This, phwndParent); - return E_NOTIMPL; + *phwndParent = (COMPATIBLE_LONG)This->hwnd; + + return S_OK; } static HRESULT WINAPI dslocator_put_hWnd(IDataSourceLocator *iface, COMPATIBLE_LONG hwndParent) { DSLocatorImpl *This = impl_from_IDataSourceLocator(iface); - FIXME("(%p)->(%p)\n",This, (HWND)hwndParent); + TRACE("(%p)->(%p)\n",This, (HWND)hwndParent); - return E_NOTIMPL; + This->hwnd = (HWND)hwndParent; + + return S_OK; } static HRESULT WINAPI dslocator_PromptNew(IDataSourceLocator *iface, IDispatch **ppADOConnection) @@ -201,6 +206,7 @@ HRESULT create_dslocator(IUnknown *outer, void **obj) This->IDataSourceLocator_iface.lpVtbl = &DSLocatorVtbl; This->ref = 1; + This->hwnd = 0; *obj = &This->IDataSourceLocator_iface; diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index d0eb9ff..13637c1 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -547,6 +547,53 @@ static void test_rowpos_setrowposition(void) IRowPosition_Release(rowpos); } +static void test_dslocator(void) +{ + IDataSourceLocator *dslocator = NULL; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_DataLinks, NULL, CLSCTX_INPROC_SERVER, &IID_IDataSourceLocator,(void**)&dslocator); + ok(hr == S_OK, "got %08x\n", hr); + if(SUCCEEDED(hr)) + { + COMPATIBLE_LONG hwnd = 0; + + /* Crashes under Window 7 + hr = IDataSourceLocator_get_hWnd(dslocator, NULL); + ok(hr == E_INVALIDARG, "got %08x\n", hr); + */ + + hr = IDataSourceLocator_get_hWnd(dslocator, &hwnd); + ok(hr == S_OK, "got %08x\n", hr); + ok(hwnd == 0, "got %p\n", (HWND)hwnd); + + hwnd = 0xDEADBEEF; + hr = IDataSourceLocator_get_hWnd(dslocator, &hwnd); + ok(hr == S_OK, "got %08x\n", hr); + ok(hwnd == 0, "got %p\n", (HWND)hwnd); + + hwnd = 0xDEADBEEF; + hr = IDataSourceLocator_put_hWnd(dslocator, hwnd); + ok(hr == S_OK, "got %08x\n", hr); + + hwnd = 0xDEADBEEF; + hr = IDataSourceLocator_get_hWnd(dslocator, &hwnd); + ok(hr == S_OK, "got %08x\n", hr); + ok(hwnd == 0xDEADBEEF, "got %p\n", (HWND)hwnd); + + hwnd = 0; + hr = IDataSourceLocator_put_hWnd(dslocator, hwnd); + ok(hr == S_OK, "got %08x\n", hr); + + hwnd = 0xDEADBEEF; + hr = IDataSourceLocator_get_hWnd(dslocator, &hwnd); + ok(hr == S_OK, "got %08x\n", hr); + ok(hwnd == 0, "got %p\n", (HWND)hwnd); + + IDataSourceLocator_Release(dslocator); + } +} + START_TEST(database) { OleInitialize(NULL); @@ -554,6 +601,7 @@ START_TEST(database) test_database(); test_errorinfo(); test_initializationstring(); + test_dslocator(); /* row position */ test_rowposition();

1 0

Henri Verbeet : d3dcompiler: Get rid of the BWRITERSHADER_PARAM_REGISTER_TYPE typedef.
by Alexandre Julliard 01 Oct '13

01 Oct '13

Module: wine Branch: master Commit: b34755493726126d1ee2eac0420f3151837d089a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b34755493726126d1ee2eac04… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 1 10:38:33 2013 +0200 d3dcompiler: Get rid of the BWRITERSHADER_PARAM_REGISTER_TYPE typedef. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index a6ee6b5..284bf8f 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -459,7 +459,8 @@ enum bwritershader_instruction_opcode_type BWRITERSIO_END, }; -typedef enum _BWRITERSHADER_PARAM_REGISTER_TYPE { +enum bwritershader_param_register_type +{ BWRITERSPR_TEMP, BWRITERSPR_INPUT, BWRITERSPR_CONST, @@ -478,7 +479,7 @@ typedef enum _BWRITERSHADER_PARAM_REGISTER_TYPE { BWRITERSPR_MISCTYPE, BWRITERSPR_LABEL, BWRITERSPR_PREDICATE -} BWRITERSHADER_PARAM_REGISTER_TYPE; +}; typedef enum _BWRITERVS_RASTOUT_OFFSETS {

1 0

Henri Verbeet : d3dcompiler: Get rid of the BWRITERSHADER_INSTRUCTION_OPCODE_TYPE typedef.
by Alexandre Julliard 01 Oct '13

01 Oct '13

Module: wine Branch: master Commit: a8aa199c363cbb850cd05f386339e3767ed62481 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8aa199c363cbb850cd05f386… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 1 10:38:32 2013 +0200 d3dcompiler: Get rid of the BWRITERSHADER_INSTRUCTION_OPCODE_TYPE typedef. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 3489162..a6ee6b5 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -365,11 +365,10 @@ const char *debug_print_opcode(DWORD opcode) DECLSPEC_HIDDEN; /* Used to signal an incorrect swizzle/writemask */ #define SWIZZLE_ERR ~0U -/* - Enumerations and defines used in the bytecode writer - intermediate representation -*/ -typedef enum _BWRITERSHADER_INSTRUCTION_OPCODE_TYPE { +/* Enumerations and defines used in the bytecode writer intermediate + * representation. */ +enum bwritershader_instruction_opcode_type +{ BWRITERSIO_NOP, BWRITERSIO_MOV, BWRITERSIO_ADD, @@ -458,7 +457,7 @@ typedef enum _BWRITERSHADER_INSTRUCTION_OPCODE_TYPE { BWRITERSIO_PHASE, BWRITERSIO_COMMENT, BWRITERSIO_END, -} BWRITERSHADER_INSTRUCTION_OPCODE_TYPE; +}; typedef enum _BWRITERSHADER_PARAM_REGISTER_TYPE { BWRITERSPR_TEMP,

1 0

Henri Verbeet : wined3d: Send vertex declaration binding updates through the command stream.
by Alexandre Julliard 01 Oct '13

01 Oct '13

Module: wine Branch: master Commit: 1f864bc9c3ae7b9e659aaec4d809eacac6e7490b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f864bc9c3ae7b9e659aaec4d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 1 10:38:31 2013 +0200 wined3d: Send vertex declaration binding updates through the command stream. --- dlls/wined3d/cs.c | 27 +++++++++++++++++++++++++++ dlls/wined3d/device.c | 23 +++++++---------------- dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 36 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 3d155f1..1e427f4 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -32,6 +32,7 @@ enum wined3d_cs_op WINED3D_CS_OP_SET_SCISSOR_RECT, WINED3D_CS_OP_SET_RENDER_TARGET, WINED3D_CS_OP_SET_DEPTH_STENCIL, + WINED3D_CS_OP_SET_VERTEX_DECLARATION, }; struct wined3d_cs_present @@ -91,6 +92,12 @@ struct wined3d_cs_set_depth_stencil struct wined3d_surface *depth_stencil; }; +struct wined3d_cs_set_vertex_declaration +{ + enum wined3d_cs_op opcode; + struct wined3d_vertex_declaration *declaration; +}; + static void wined3d_cs_exec_present(struct wined3d_cs *cs, const void *data) { const struct wined3d_cs_present *op = data; @@ -284,6 +291,25 @@ void wined3d_cs_emit_set_depth_stencil(struct wined3d_cs *cs, struct wined3d_sur cs->ops->submit(cs); } +static void wined3d_cs_exec_set_vertex_declaration(struct wined3d_cs *cs, const void *data) +{ + const struct wined3d_cs_set_vertex_declaration *op = data; + + cs->state.vertex_declaration = op->declaration; + device_invalidate_state(cs->device, STATE_VDECL); +} + +void wined3d_cs_emit_set_vertex_declaration(struct wined3d_cs *cs, struct wined3d_vertex_declaration *declaration) +{ + struct wined3d_cs_set_vertex_declaration *op; + + op = cs->ops->require_space(cs, sizeof(*op)); + op->opcode = WINED3D_CS_OP_SET_VERTEX_DECLARATION; + op->declaration = declaration; + + cs->ops->submit(cs); +} + static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void *data) = { /* WINED3D_CS_OP_PRESENT */ wined3d_cs_exec_present, @@ -293,6 +319,7 @@ static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void /* WINED3D_CS_OP_SET_SCISSOR_RECT */ wined3d_cs_exec_set_scissor_rect, /* WINED3D_CS_OP_SET_RENDER_TARGET */ wined3d_cs_exec_set_render_target, /* WINED3D_CS_OP_SET_DEPTH_STENCIL */ wined3d_cs_exec_set_depth_stencil, + /* WINED3D_CS_OP_SET_VERTEX_DECLARATION */ wined3d_cs_exec_set_vertex_declaration, }; static void *wined3d_cs_st_require_space(struct wined3d_cs *cs, size_t size) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 12d0239..d581479 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2078,28 +2078,19 @@ void CDECL wined3d_device_set_vertex_declaration(struct wined3d_device *device, TRACE("device %p, declaration %p.\n", device, declaration); - if (declaration) - wined3d_vertex_declaration_incref(declaration); - if (prev) - wined3d_vertex_declaration_decref(prev); - - device->update_state->vertex_declaration = declaration; - if (device->recording) - { - TRACE("Recording... not performing anything.\n"); device->recording->changed.vertexDecl = TRUE; - return; - } if (declaration == prev) - { - /* Checked after the assignment to allow proper stateblock recording. */ - TRACE("Application is setting the old declaration over, nothing to do.\n"); return; - } - device_invalidate_state(device, STATE_VDECL); + if (declaration) + wined3d_vertex_declaration_incref(declaration); + device->update_state->vertex_declaration = declaration; + if (!device->recording) + wined3d_cs_emit_set_vertex_declaration(device->cs, declaration); + if (prev) + wined3d_vertex_declaration_decref(prev); } struct wined3d_vertex_declaration * CDECL wined3d_device_get_vertex_declaration(const struct wined3d_device *device) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7409807..648780f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2490,6 +2490,8 @@ void wined3d_cs_emit_set_depth_stencil(struct wined3d_cs *cs, struct wined3d_sur void wined3d_cs_emit_set_render_target(struct wined3d_cs *cs, UINT render_target_idx, struct wined3d_surface *render_target) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_scissor_rect(struct wined3d_cs *cs, const RECT *rect) DECLSPEC_HIDDEN; +void wined3d_cs_emit_set_vertex_declaration(struct wined3d_cs *cs, + struct wined3d_vertex_declaration *declaration) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_viewport(struct wined3d_cs *cs, const struct wined3d_viewport *viewport) DECLSPEC_HIDDEN; /* Direct3D terminology with little modifications. We do not have an issued state

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2013