February 2016 - Wine-Commits

Alexandre Julliard : libwine: Move the decomposition table to a separate file.
by Alexandre Julliard Feb. 19, 2016

Feb. 19, 2016

Module: wine Branch: master Commit: a951d533946b870e6be3912b35fd90f67e6e5a89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a951d533946b870e6be3912b3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 19 11:33:39 2016 +0900 libwine: Move the decomposition table to a separate file. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/wine/Makefile.in | 1 + libs/wine/compose.c | 746 +------------------------------------------------ libs/wine/decompose.c | 748 ++++++++++++++++++++++++++++++++++++++++++++++++++ tools/make_unicode | 40 ++- 4 files changed, 778 insertions(+), 757 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a951d533946b870e6be39…

1 0

Henri Verbeet : d3d8: Use wined3d_texture_get_sub_resource_parent() in d3d8_texture_3d_UnlockBox().
by Alexandre Julliard Feb. 19, 2016

Feb. 19, 2016

Module: wine Branch: master Commit: e580d74829b9e01cbcf4349ef4e5cc50d73b6e71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e580d74829b9e01cbcf4349ef… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 18 17:30:00 2016 +0100 d3d8: Use wined3d_texture_get_sub_resource_parent() in d3d8_texture_3d_UnlockBox(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/texture.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index 2b9df09..b9f5824 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -1029,20 +1029,16 @@ static HRESULT WINAPI d3d8_texture_3d_LockBox(IDirect3DVolumeTexture8 *iface, static HRESULT WINAPI d3d8_texture_3d_UnlockBox(IDirect3DVolumeTexture8 *iface, UINT level) { struct d3d8_texture *texture = impl_from_IDirect3DVolumeTexture8(iface); - struct wined3d_resource *sub_resource; struct d3d8_volume *volume_impl; HRESULT hr; TRACE("iface %p, level %u.\n", iface, level); wined3d_mutex_lock(); - if (!(sub_resource = wined3d_texture_get_sub_resource(texture->wined3d_texture, level))) + if (!(volume_impl = wined3d_texture_get_sub_resource_parent(texture->wined3d_texture, level))) hr = D3DERR_INVALIDCALL; else - { - volume_impl = wined3d_resource_get_parent(sub_resource); hr = IDirect3DVolume8_UnlockBox(&volume_impl->IDirect3DVolume8_iface); - } wined3d_mutex_unlock(); return hr;

1 0

Henri Verbeet : d3d8: Use wined3d_texture_get_sub_resource_parent() in d3d8_texture_3d_LockBox().
by Alexandre Julliard Feb. 19, 2016

Feb. 19, 2016

Module: wine Branch: master Commit: 4ddf51dab16202c57f6050c5421854af5c3eef5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ddf51dab16202c57f6050c54… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 18 17:29:59 2016 +0100 d3d8: Use wined3d_texture_get_sub_resource_parent() in d3d8_texture_3d_LockBox(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/texture.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index cf5827d..2b9df09 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -1010,7 +1010,6 @@ static HRESULT WINAPI d3d8_texture_3d_LockBox(IDirect3DVolumeTexture8 *iface, UINT level, D3DLOCKED_BOX *locked_box, const D3DBOX *box, DWORD flags) { struct d3d8_texture *texture = impl_from_IDirect3DVolumeTexture8(iface); - struct wined3d_resource *sub_resource; struct d3d8_volume *volume_impl; HRESULT hr; @@ -1018,13 +1017,10 @@ static HRESULT WINAPI d3d8_texture_3d_LockBox(IDirect3DVolumeTexture8 *iface, iface, level, locked_box, box, flags); wined3d_mutex_lock(); - if (!(sub_resource = wined3d_texture_get_sub_resource(texture->wined3d_texture, level))) + if (!(volume_impl = wined3d_texture_get_sub_resource_parent(texture->wined3d_texture, level))) hr = D3DERR_INVALIDCALL; else - { - volume_impl = wined3d_resource_get_parent(sub_resource); hr = IDirect3DVolume8_LockBox(&volume_impl->IDirect3DVolume8_iface, locked_box, box, flags); - } wined3d_mutex_unlock(); return hr;

1 0

Piotr Caban : msvcrt: Don' t use isdigit in places where only 0-9 digits are handled.
by Alexandre Julliard Feb. 19, 2016

Feb. 19, 2016

Module: wine Branch: master Commit: aff5d2c1f3d70b94feaaf964b887e4f11727c729 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aff5d2c1f3d70b94feaaf964b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Feb 18 16:09:55 2016 +0100 msvcrt: Don't use isdigit in places where only 0-9 digits are handled. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/string.c | 20 ++++++++++---------- dlls/msvcrt/wcs.c | 16 ++++++++-------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 59da5bd..1946b27 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -364,12 +364,12 @@ static double strtod_helper(const char *str, char **end, MSVCRT__locale_t locale } #endif - while(isdigit(*p) || + while((*p>='0' && *p<='9') || (base == 16 && ((*p >= 'a' && *p <= 'f') || (*p >= 'A' && *p <= 'F')))) { char c = *p++; int val; found_digit = TRUE; - if (isdigit(c)) + if (c>='0' && c<='9') val = c - '0'; else if (c >= 'a' && c <= 'f') val = 10 + c - 'a'; @@ -382,7 +382,7 @@ static double strtod_helper(const char *str, char **end, MSVCRT__locale_t locale } else d = hlp; } - while(isdigit(*p) || + while((*p>='0' && *p<='9') || (base == 16 && ((*p >= 'a' && *p <= 'f') || (*p >= 'A' && *p <= 'F')))) { exp++; p++; @@ -391,12 +391,12 @@ static double strtod_helper(const char *str, char **end, MSVCRT__locale_t locale if(*p == *locinfo->lconv->decimal_point) p++; - while(isdigit(*p) || + while((*p>='0' && *p<='9') || (base == 16 && ((*p >= 'a' && *p <= 'f') || (*p >= 'A' && *p <= 'F')))) { char c = *p++; int val; found_digit = TRUE; - if (isdigit(c)) + if (c>='0' && c<='9') val = c - '0'; else if (c >= 'a' && c <= 'f') val = 10 + c - 'a'; @@ -408,7 +408,7 @@ static double strtod_helper(const char *str, char **end, MSVCRT__locale_t locale d = hlp; exp--; } - while(isdigit(*p) || + while((*p>='0' && *p<='9') || (base == 16 && ((*p >= 'a' && *p <= 'f') || (*p >= 'A' && *p <= 'F')))) p++; @@ -432,8 +432,8 @@ static double strtod_helper(const char *str, char **end, MSVCRT__locale_t locale } else if(*p == '+') p++; - if(isdigit(*p)) { - while(isdigit(*p)) { + if(*p>='0' && *p<='9') { + while(*p>='0' && *p<='9') { if(e>INT_MAX/10 || (e=e*10+*p-'0')<0) e = INT_MAX; p++; @@ -925,7 +925,7 @@ __int64 CDECL MSVCRT_strtoi64_l(const char *nptr, char **endptr, int base, MSVCR char cur = tolower(*nptr); int v; - if(isdigit(cur)) { + if(cur>='0' && cur<='9') { if(cur >= '0'+base) break; v = cur-'0'; @@ -1128,7 +1128,7 @@ unsigned __int64 CDECL MSVCRT_strtoui64_l(const char *nptr, char **endptr, int b char cur = tolower(*nptr); int v; - if(isdigit(cur)) { + if(cur>='0' && cur<='9') { if(cur >= '0'+base) break; v = *nptr-'0'; diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index b6946a3..0f80d3b 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -374,7 +374,7 @@ double CDECL MSVCRT__wcstod_l(const MSVCRT_wchar_t* str, MSVCRT_wchar_t** end, } else if(*p == '+') p++; - while(isdigitW(*p)) { + while(*p>='0' && *p<='9') { found_digit = TRUE; hlp = d*10+*(p++)-'0'; if(d>MSVCRT_UI64_MAX/10 || hlp<d) { @@ -383,14 +383,14 @@ double CDECL MSVCRT__wcstod_l(const MSVCRT_wchar_t* str, MSVCRT_wchar_t** end, } else d = hlp; } - while(isdigitW(*p)) { + while(*p>='0' && *p<='9') { exp++; p++; } if(*p == *locinfo->lconv->decimal_point) p++; - while(isdigitW(*p)) { + while(*p>='0' && *p<='9') { found_digit = TRUE; hlp = d*10+*(p++)-'0'; if(d>MSVCRT_UI64_MAX/10 || hlp<d) @@ -399,7 +399,7 @@ double CDECL MSVCRT__wcstod_l(const MSVCRT_wchar_t* str, MSVCRT_wchar_t** end, d = hlp; exp--; } - while(isdigitW(*p)) + while(*p>='0' && *p<='9') p++; if(!found_digit) { @@ -418,8 +418,8 @@ double CDECL MSVCRT__wcstod_l(const MSVCRT_wchar_t* str, MSVCRT_wchar_t** end, } else if(*p == '+') p++; - if(isdigitW(*p)) { - while(isdigitW(*p)) { + if(*p>='0' && *p<='9') { + while(*p>='0' && *p<='9') { if(e>INT_MAX/10 || (e=e*10+*p-'0')<0) e = INT_MAX; p++; @@ -1974,7 +1974,7 @@ __int64 CDECL MSVCRT__wcstoi64_l(const MSVCRT_wchar_t *nptr, MSVCRT_wchar_t cur = tolowerW(*nptr); int v; - if(isdigitW(cur)) { + if(cur>='0' && cur<='9') { if(cur >= '0'+base) break; v = cur-'0'; @@ -2139,7 +2139,7 @@ unsigned __int64 CDECL MSVCRT__wcstoui64_l(const MSVCRT_wchar_t *nptr, MSVCRT_wchar_t cur = tolowerW(*nptr); int v; - if(isdigitW(cur)) { + if(cur>='0' && cur<='9') { if(cur >= '0'+base) break; v = *nptr-'0';

1 0

Alexandre Julliard : libwine: Move the wide char to multi-byte conversion functions to libwine_port.
by Alexandre Julliard Feb. 19, 2016

Feb. 19, 2016

Module: wine Branch: master Commit: 52333e9c5d735c2be40f17991c84956e98eae896 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52333e9c5d735c2be40f17991… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 19 11:43:35 2016 +0900 libwine: Move the wide char to multi-byte conversion functions to libwine_port. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/port/Makefile.in | 5 ++++- libs/{wine => port}/compose.c | 0 libs/{wine => port}/utf8.c | 0 libs/{wine => port}/wctomb.c | 0 libs/wine/Makefile.in | 3 --- libs/wine/port.c | 5 ++++- tools/make_unicode | 2 +- 7 files changed, 9 insertions(+), 6 deletions(-) diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index 1db8418..9d7e44f 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -73,6 +73,7 @@ C_SRCS = \ c_936.c \ c_949.c \ c_950.c \ + compose.c \ cpsymbol.c \ cptable.c \ decompose.c \ @@ -101,4 +102,6 @@ C_SRCS = \ strerror.c \ strncasecmp.c \ symlink.c \ - usleep.c + usleep.c \ + utf8.c \ + wctomb.c diff --git a/libs/wine/compose.c b/libs/port/compose.c similarity index 100% rename from libs/wine/compose.c rename to libs/port/compose.c diff --git a/libs/wine/utf8.c b/libs/port/utf8.c similarity index 100% rename from libs/wine/utf8.c rename to libs/port/utf8.c diff --git a/libs/wine/wctomb.c b/libs/port/wctomb.c similarity index 100% rename from libs/wine/wctomb.c rename to libs/port/wctomb.c diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index baddb8d..4e96b12 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -5,7 +5,6 @@ STATICLIB = libwine_static.a C_SRCS = \ casemap.c \ collation.c \ - compose.c \ config.c \ debug.c \ ldt.c \ @@ -14,8 +13,6 @@ C_SRCS = \ port.c \ sortkey.c \ string.c \ - utf8.c \ - wctomb.c \ wctype.c EXTRA_OBJS = version.o diff --git a/libs/wine/port.c b/libs/wine/port.c index 53fe6df..e05e166 100644 --- a/libs/wine/port.c +++ b/libs/wine/port.c @@ -34,9 +34,12 @@ const void *libwine_port_functions[] = wine_cp_enum_table, wine_cp_get_table, wine_cp_mbstowcs, + wine_cp_wcstombs, wine_cpsymbol_mbstowcs, wine_cpsymbol_wcstombs, - wine_fold_string + wine_fold_string, + wine_utf8_mbstowcs, + wine_utf8_wcstombs }; /* no longer used, for backwards compatibility only */ diff --git a/tools/make_unicode b/tools/make_unicode index 361eb92..60aeb19 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -2465,7 +2465,7 @@ chdir ".." if -f "./make_unicode"; READ_DEFAULTS( $DEFAULTS ); DUMP_CASE_MAPPINGS( "libs/wine/casemap.c" ); DUMP_SORTKEYS( "libs/wine/collation.c", READ_SORTKEYS_FILE() ); -dump_compose_table( "libs/wine/compose.c" ); +dump_compose_table( "libs/port/compose.c" ); dump_decompose_table( "libs/port/decompose.c" ); DUMP_CTYPE_TABLES( "libs/wine/wctype.c" ); dump_digit_folding( "libs/port/digitmap.c" );

1 0

Alexandre Julliard : libwine: Move the multi-byte to wide char conversion functions to libwine_port.
by Alexandre Julliard Feb. 19, 2016

Feb. 19, 2016

Module: wine Branch: master Commit: f7368aaa97002759676a0f9b8c3806f62a55f6bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7368aaa97002759676a0f9b8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 19 11:41:44 2016 +0900 libwine: Move the multi-byte to wide char conversion functions to libwine_port. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/port/Makefile.in | 2 ++ libs/{wine => port}/decompose.c | 0 libs/{wine => port}/mbtowc.c | 0 libs/wine/Makefile.in | 2 -- libs/wine/port.c | 1 + tools/make_unicode | 2 +- 6 files changed, 4 insertions(+), 3 deletions(-) diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index 67fb999..1db8418 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -75,6 +75,7 @@ C_SRCS = \ c_950.c \ cpsymbol.c \ cptable.c \ + decompose.c \ digitmap.c \ ffs.c \ fold.c \ @@ -86,6 +87,7 @@ C_SRCS = \ isinf.c \ isnan.c \ lstat.c \ + mbtowc.c \ memcpy_unaligned.c \ memmove.c \ mkstemps.c \ diff --git a/libs/wine/decompose.c b/libs/port/decompose.c similarity index 100% rename from libs/wine/decompose.c rename to libs/port/decompose.c diff --git a/libs/wine/mbtowc.c b/libs/port/mbtowc.c similarity index 100% rename from libs/wine/mbtowc.c rename to libs/port/mbtowc.c diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index b2b250e..baddb8d 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -8,10 +8,8 @@ C_SRCS = \ compose.c \ config.c \ debug.c \ - decompose.c \ ldt.c \ loader.c \ - mbtowc.c \ mmap.c \ port.c \ sortkey.c \ diff --git a/libs/wine/port.c b/libs/wine/port.c index 070dfd9..53fe6df 100644 --- a/libs/wine/port.c +++ b/libs/wine/port.c @@ -33,6 +33,7 @@ const void *libwine_port_functions[] = { wine_cp_enum_table, wine_cp_get_table, + wine_cp_mbstowcs, wine_cpsymbol_mbstowcs, wine_cpsymbol_wcstombs, wine_fold_string diff --git a/tools/make_unicode b/tools/make_unicode index de008fc..361eb92 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -2466,7 +2466,7 @@ READ_DEFAULTS( $DEFAULTS ); DUMP_CASE_MAPPINGS( "libs/wine/casemap.c" ); DUMP_SORTKEYS( "libs/wine/collation.c", READ_SORTKEYS_FILE() ); dump_compose_table( "libs/wine/compose.c" ); -dump_decompose_table( "libs/wine/decompose.c" ); +dump_decompose_table( "libs/port/decompose.c" ); DUMP_CTYPE_TABLES( "libs/wine/wctype.c" ); dump_digit_folding( "libs/port/digitmap.c" ); dump_mirroring( "dlls/usp10/mirror.c" );

1 0

Sebastian Lackner : ntdll: Set correct number of arguments for breakpoint exceptions.
by Alexandre Julliard Feb. 19, 2016

Feb. 19, 2016

Module: wine Branch: master Commit: 123185c3a20a42b55b58e466de281d1162513e3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=123185c3a20a42b55b58e466d… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Feb 19 03:09:17 2016 +0100 ntdll: Set correct number of arguments for breakpoint exceptions. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_i386.c | 4 ++++ dlls/ntdll/signal_x86_64.c | 2 ++ dlls/ntdll/tests/exception.c | 4 ---- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 5708aae..59dca6c 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -2170,6 +2170,10 @@ static void trap_handler( int signal, siginfo_t *siginfo, void *sigcontext ) /* fall through */ default: rec->ExceptionCode = EXCEPTION_BREAKPOINT; + rec->NumberParameters = is_wow64 ? 1 : 3; + rec->ExceptionInformation[0] = 0; + rec->ExceptionInformation[1] = 0; /* FIXME */ + rec->ExceptionInformation[2] = 0; /* FIXME */ break; } } diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 84802b2..1e88df3 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -2658,6 +2658,8 @@ static void trap_handler( int signal, siginfo_t *siginfo, void *sigcontext ) /* fall through */ default: rec->ExceptionCode = EXCEPTION_BREAKPOINT; + rec->NumberParameters = 1; + rec->ExceptionInformation[0] = 0; break; } } diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 670c37b..64f3dff 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -2073,20 +2073,16 @@ static LONG CALLBACK breakpoint_handler(EXCEPTION_POINTERS *ExceptionInfo) #ifdef __i386__ ok(ExceptionInfo->ContextRecord->Eip == (DWORD)code_mem + 1, "expected Eip = %x, got %x\n", (DWORD)code_mem + 1, ExceptionInfo->ContextRecord->Eip); - todo_wine ok(rec->NumberParameters == (is_wow64 ? 1 : 3), "ExceptionParameters is %d instead of %d\n", rec->NumberParameters, is_wow64 ? 1 : 3); - todo_wine ok(rec->ExceptionInformation[0] == 0, "got ExceptionInformation[0] = %lx\n", rec->ExceptionInformation[0]); ExceptionInfo->ContextRecord->Eip = (DWORD)code_mem + 2; #else ok(ExceptionInfo->ContextRecord->Rip == (DWORD_PTR)code_mem + 1, "expected Rip = %lx, got %lx\n", (DWORD_PTR)code_mem + 1, ExceptionInfo->ContextRecord->Rip); - todo_wine ok(rec->NumberParameters == 1, "ExceptionParameters is %d instead of 1\n", rec->NumberParameters); - todo_wine ok(rec->ExceptionInformation[0] == 0, "got ExceptionInformation[0] = %lx\n", rec->ExceptionInformation[0]); ExceptionInfo->ContextRecord->Rip = (DWORD_PTR)code_mem + 2;

1 0

Sebastian Lackner : ntdll: Fix up instruction pointer in context for EXCEPTION_BREAKPOINT on x86_64.
by Alexandre Julliard Feb. 19, 2016

Feb. 19, 2016

Module: wine Branch: master Commit: d0cc0dd69f029fcd54275784d3edc0f1426fc568 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0cc0dd69f029fcd54275784d… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Feb 19 03:08:42 2016 +0100 ntdll: Fix up instruction pointer in context for EXCEPTION_BREAKPOINT on x86_64. Similar to eab168cf9eaa6ed9f8800b25155d329376f2343f for x86. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 3 +++ dlls/ntdll/tests/exception.c | 6 ------ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index be5a342..84802b2 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -2482,6 +2482,9 @@ static NTSTATUS raise_exception( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL f if (status == DBG_CONTINUE || status == DBG_EXCEPTION_HANDLED) return STATUS_SUCCESS; + /* fix up instruction pointer in context for EXCEPTION_BREAKPOINT */ + if (rec->ExceptionCode == EXCEPTION_BREAKPOINT) context->Rip--; + if (call_vectored_handlers( rec, context ) == EXCEPTION_CONTINUE_EXECUTION) return STATUS_SUCCESS; diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 0f07404..670c37b 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -1911,7 +1911,6 @@ static LONG CALLBACK debug_service_handler(EXCEPTION_POINTERS *ExceptionInfo) "got ExceptionInformation[2] = %lx\n", rec->ExceptionInformation[2]); } #else - todo_wine ok(ExceptionInfo->ContextRecord->Rip == (DWORD_PTR)code_mem + 0x2f, "expected Rip = %lx, got %lx\n", (DWORD_PTR)code_mem + 0x2f, ExceptionInfo->ContextRecord->Rip); ok(rec->NumberParameters == 1, @@ -1978,7 +1977,6 @@ static const BYTE call_debug_service_code[] = { static void test_debug_service(DWORD numexc) { - const BOOL is_win64 = (sizeof(void *) > sizeof(int)); DWORD (CDECL *func)(DWORD_PTR) = code_mem; DWORD expected_exc, expected_ret; void *vectored_handler; @@ -1999,7 +1997,6 @@ static void test_debug_service(DWORD numexc) ok(debug_service_exceptions == expected_exc, "BREAKPOINT_BREAK generated %u exceptions, expected %u\n", debug_service_exceptions, expected_exc); - todo_wine_if(is_win64) ok(ret == expected_ret, "BREAKPOINT_BREAK returned %u, expected %u\n", ret, expected_ret); @@ -2009,7 +2006,6 @@ static void test_debug_service(DWORD numexc) ok(debug_service_exceptions == expected_exc, "BREAKPOINT_PROMPT generated %u exceptions, expected %u\n", debug_service_exceptions, expected_exc); - todo_wine_if(is_win64) ok(ret == expected_ret, "BREAKPOINT_PROMPT returned %u, expected %u\n", ret, expected_ret); @@ -2019,7 +2015,6 @@ static void test_debug_service(DWORD numexc) ok(debug_service_exceptions == expected_exc, "invalid debug service generated %u exceptions, expected %u\n", debug_service_exceptions, expected_exc); - todo_wine_if(is_win64) ok(ret == expected_ret, "invalid debug service returned %u, expected %u\n", ret, expected_ret); @@ -2086,7 +2081,6 @@ static LONG CALLBACK breakpoint_handler(EXCEPTION_POINTERS *ExceptionInfo) "got ExceptionInformation[0] = %lx\n", rec->ExceptionInformation[0]); ExceptionInfo->ContextRecord->Eip = (DWORD)code_mem + 2; #else - todo_wine ok(ExceptionInfo->ContextRecord->Rip == (DWORD_PTR)code_mem + 1, "expected Rip = %lx, got %lx\n", (DWORD_PTR)code_mem + 1, ExceptionInfo->ContextRecord->Rip); todo_wine

1 0

Qian Hong : advapi32/tests: Add more invalid parameter tests for AccessCheck.
by Alexandre Julliard Feb. 19, 2016

Feb. 19, 2016

Module: wine Branch: master Commit: 954ca154ac0b2e944df2daa1b13ca9587b126577 URL: http://source.winehq.org/git/wine.git/?a=commit;h=954ca154ac0b2e944df2daa1b… Author: Qian Hong <qhong(a)codeweavers.com> Date: Thu Feb 18 14:58:26 2016 +0800 advapi32/tests: Add more invalid parameter tests for AccessCheck. Signed-off-by: Qian Hong <qhong(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 166 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 162 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 3e1ced0..8b86d45 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1437,6 +1437,45 @@ todo_wine ok(Access == 0x1abe11ed && AccessStatus == 0x1abe11ed, "Access and/or AccessStatus were changed!\n"); + /* Null PrivSet with insufficient PrivSetLen */ + SetLastError(0xdeadbeef); + Access = AccessStatus = 0x1abe11ed; + PrivSetLen = 1; + ret = AccessCheck(SecurityDescriptor, Token, KEY_READ, &Mapping, + 0, &PrivSetLen, &Access, &AccessStatus); + err = GetLastError(); + ok(!ret && err == ERROR_NOACCESS, "AccessCheck should have " + "failed with ERROR_NOACCESS, instead of %d\n", err); + ok(PrivSetLen == 1, "PrivSetLen returns %d\n", PrivSetLen); + ok(Access == 0x1abe11ed && AccessStatus == 0x1abe11ed, + "Access and/or AccessStatus were changed!\n"); + + /* Null PrivSet with insufficient PrivSetLen */ + SetLastError(0xdeadbeef); + Access = AccessStatus = 0x1abe11ed; + PrivSetLen = sizeof(PRIVILEGE_SET) - 1; + ret = AccessCheck(SecurityDescriptor, Token, KEY_READ, &Mapping, + 0, &PrivSetLen, &Access, &AccessStatus); + err = GetLastError(); + ok(!ret && err == ERROR_NOACCESS, "AccessCheck should have " + "failed with ERROR_NOACCESS, instead of %d\n", err); + ok(PrivSetLen == sizeof(PRIVILEGE_SET) - 1, "PrivSetLen returns %d\n", PrivSetLen); + ok(Access == 0x1abe11ed && AccessStatus == 0x1abe11ed, + "Access and/or AccessStatus were changed!\n"); + + /* Null PrivSet with minimal sufficient PrivSetLen */ + SetLastError(0xdeadbeef); + Access = AccessStatus = 0x1abe11ed; + PrivSetLen = sizeof(PRIVILEGE_SET); + ret = AccessCheck(SecurityDescriptor, Token, KEY_READ, &Mapping, + 0, &PrivSetLen, &Access, &AccessStatus); + err = GetLastError(); + ok(!ret && err == ERROR_NOACCESS, "AccessCheck should have " + "failed with ERROR_NOACCESS, instead of %d\n", err); + ok(PrivSetLen == sizeof(PRIVILEGE_SET), "PrivSetLen returns %d\n", PrivSetLen); + ok(Access == 0x1abe11ed && AccessStatus == 0x1abe11ed, + "Access and/or AccessStatus were changed!\n"); + /* Valid PrivSet with zero PrivSetLen */ SetLastError(0xdeadbeef); Access = AccessStatus = 0x1abe11ed; @@ -1448,9 +1487,75 @@ todo_wine ok(!ret && err == ERROR_INSUFFICIENT_BUFFER, "AccessCheck should have " "failed with ERROR_INSUFFICIENT_BUFFER, instead of %d\n", err); todo_wine + ok(PrivSetLen == sizeof(PRIVILEGE_SET), "PrivSetLen returns %d\n", PrivSetLen); +todo_wine + ok(Access == 0x1abe11ed && AccessStatus == 0x1abe11ed, + "Access and/or AccessStatus were changed!\n"); + + /* Valid PrivSet with insufficient PrivSetLen */ + SetLastError(0xdeadbeef); + Access = AccessStatus = 0x1abe11ed; + PrivSetLen = 1; + ret = AccessCheck(SecurityDescriptor, Token, KEY_READ, &Mapping, + PrivSet, &PrivSetLen, &Access, &AccessStatus); + err = GetLastError(); +todo_wine + ok(!ret && err == ERROR_INSUFFICIENT_BUFFER, "AccessCheck should have " + "failed with ERROR_INSUFFICIENT_BUFFER, instead of %d\n", err); +todo_wine + ok(PrivSetLen == sizeof(PRIVILEGE_SET), "PrivSetLen returns %d\n", PrivSetLen); +todo_wine ok(Access == 0x1abe11ed && AccessStatus == 0x1abe11ed, "Access and/or AccessStatus were changed!\n"); + /* Valid PrivSet with insufficient PrivSetLen */ + SetLastError(0xdeadbeef); + Access = AccessStatus = 0x1abe11ed; + PrivSetLen = sizeof(PRIVILEGE_SET) - 1; + ret = AccessCheck(SecurityDescriptor, Token, KEY_READ, &Mapping, + PrivSet, &PrivSetLen, &Access, &AccessStatus); + err = GetLastError(); +todo_wine + ok(!ret && err == ERROR_INSUFFICIENT_BUFFER, "AccessCheck should have " + "failed with ERROR_INSUFFICIENT_BUFFER, instead of %d\n", err); +todo_wine + ok(PrivSetLen == sizeof(PRIVILEGE_SET), "PrivSetLen returns %d\n", PrivSetLen); +todo_wine + ok(Access == 0x1abe11ed && AccessStatus == 0x1abe11ed, + "Access and/or AccessStatus were changed!\n"); + + /* Valid PrivSet with minimal sufficient PrivSetLen */ + SetLastError(0xdeadbeef); + Access = AccessStatus = 0x1abe11ed; + PrivSetLen = sizeof(PRIVILEGE_SET); + memset(PrivSet, 0xcc, PrivSetLen); + ret = AccessCheck(SecurityDescriptor, Token, KEY_READ, &Mapping, + PrivSet, &PrivSetLen, &Access, &AccessStatus); + err = GetLastError(); + ok(ret, "AccessCheck failed with error %d\n", GetLastError()); +todo_wine + ok(PrivSetLen == sizeof(PRIVILEGE_SET), "PrivSetLen returns %d\n", PrivSetLen); + ok(AccessStatus && (Access == KEY_READ), + "AccessCheck failed to grant access with error %d\n", GetLastError()); + ok(PrivSet->PrivilegeCount == 0, "PrivilegeCount returns %d, expects 0\n", + PrivSet->PrivilegeCount); + + /* Valid PrivSet with sufficient PrivSetLen */ + SetLastError(0xdeadbeef); + Access = AccessStatus = 0x1abe11ed; + PrivSetLen = sizeof(PRIVILEGE_SET) + 1; + memset(PrivSet, 0xcc, PrivSetLen); + ret = AccessCheck(SecurityDescriptor, Token, KEY_READ, &Mapping, + PrivSet, &PrivSetLen, &Access, &AccessStatus); + err = GetLastError(); + ok(ret, "AccessCheck failed with error %d\n", GetLastError()); +todo_wine + ok(PrivSetLen == sizeof(PRIVILEGE_SET) + 1, "PrivSetLen returns %d\n", PrivSetLen); + ok(AccessStatus && (Access == KEY_READ), + "AccessCheck failed to grant access with error %d\n", GetLastError()); + ok(PrivSet->PrivilegeCount == 0, "PrivilegeCount returns %d, expects 0\n", + PrivSet->PrivilegeCount); + PrivSetLen = FIELD_OFFSET(PRIVILEGE_SET, Privilege[16]); /* Null PrivSet with valid PrivSetLen */ @@ -1475,7 +1580,7 @@ todo_wine "with ERROR_ACCESS_DENIED, instead of %d\n", err); ok(!Access, "Should have failed to grant any access, got 0x%08x\n", Access); - SetLastError(0); + SetLastError(0xdeadbeef); PrivSet->PrivilegeCount = 16; ret = AccessCheck(SecurityDescriptor, Token, ACCESS_SYSTEM_SECURITY, &Mapping, PrivSet, &PrivSetLen, &Access, &AccessStatus); @@ -1488,16 +1593,69 @@ todo_wine ret = pRtlAdjustPrivilege(SE_SECURITY_PRIVILEGE, TRUE, TRUE, &Enabled); if (!ret) { - SetLastError(0); - PrivSet->PrivilegeCount = 16; + /* Valid PrivSet with zero PrivSetLen */ + SetLastError(0xdeadbeef); + Access = AccessStatus = 0x1abe11ed; + PrivSetLen = 0; + ret = AccessCheck(SecurityDescriptor, Token, KEY_READ, &Mapping, + PrivSet, &PrivSetLen, &Access, &AccessStatus); + err = GetLastError(); + todo_wine + ok(!ret && err == ERROR_INSUFFICIENT_BUFFER, "AccessCheck should have " + "failed with ERROR_INSUFFICIENT_BUFFER, instead of %d\n", err); + todo_wine + ok(PrivSetLen == sizeof(PRIVILEGE_SET), "PrivSetLen returns %d\n", PrivSetLen); + todo_wine + ok(Access == 0x1abe11ed && AccessStatus == 0x1abe11ed, + "Access and/or AccessStatus were changed!\n"); + + /* Valid PrivSet with insufficient PrivSetLen */ + SetLastError(0xdeadbeef); + Access = AccessStatus = 0x1abe11ed; + PrivSetLen = sizeof(PRIVILEGE_SET) - 1; + ret = AccessCheck(SecurityDescriptor, Token, KEY_READ, &Mapping, + PrivSet, &PrivSetLen, &Access, &AccessStatus); + err = GetLastError(); + todo_wine + ok(!ret && err == ERROR_INSUFFICIENT_BUFFER, "AccessCheck should have " + "failed with ERROR_INSUFFICIENT_BUFFER, instead of %d\n", err); + todo_wine + ok(PrivSetLen == sizeof(PRIVILEGE_SET), "PrivSetLen returns %d\n", PrivSetLen); + todo_wine + ok(Access == 0x1abe11ed && AccessStatus == 0x1abe11ed, + "Access and/or AccessStatus were changed!\n"); + + /* Valid PrivSet with minimal sufficient PrivSetLen */ + SetLastError(0xdeadbeef); + Access = AccessStatus = 0x1abe11ed; + PrivSetLen = sizeof(PRIVILEGE_SET); + memset(PrivSet, 0xcc, PrivSetLen); + ret = AccessCheck(SecurityDescriptor, Token, ACCESS_SYSTEM_SECURITY, &Mapping, + PrivSet, &PrivSetLen, &Access, &AccessStatus); + ok(ret && AccessStatus && GetLastError() == 0xdeadbeef, + "AccessCheck should have succeeded, error %d\n", + GetLastError()); + ok(Access == ACCESS_SYSTEM_SECURITY, + "Access should be equal to ACCESS_SYSTEM_SECURITY instead of 0x%08x\n", + Access); + ok(PrivSet->PrivilegeCount == 1, "PrivilegeCount returns %d, expects 1\n", + PrivSet->PrivilegeCount); + + /* Valid PrivSet with large PrivSetLen */ + SetLastError(0xdeadbeef); + Access = AccessStatus = 0x1abe11ed; + PrivSetLen = FIELD_OFFSET(PRIVILEGE_SET, Privilege[16]); + memset(PrivSet, 0xcc, PrivSetLen); ret = AccessCheck(SecurityDescriptor, Token, ACCESS_SYSTEM_SECURITY, &Mapping, PrivSet, &PrivSetLen, &Access, &AccessStatus); - ok(ret && AccessStatus && GetLastError() == 0, + ok(ret && AccessStatus && GetLastError() == 0xdeadbeef, "AccessCheck should have succeeded, error %d\n", GetLastError()); ok(Access == ACCESS_SYSTEM_SECURITY, "Access should be equal to ACCESS_SYSTEM_SECURITY instead of 0x%08x\n", Access); + ok(PrivSet->PrivilegeCount == 1, "PrivilegeCount returns %d, expects 1\n", + PrivSet->PrivilegeCount); } else trace("Couldn't get SE_SECURITY_PRIVILEGE (0x%08x), skipping ACCESS_SYSTEM_SECURITY test\n",

1 0

Stefan Dösinger : wined3d: Track SFLAG_NONPOW2 per-texture.
by Alexandre Julliard Feb. 19, 2016

Feb. 19, 2016

Module: wine Branch: master Commit: cdefb5ccb7db1ed801fb8a3a8c55774d375b4b7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdefb5ccb7db1ed801fb8a3a8… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Feb 18 17:30:01 2016 +0100 wined3d: Track SFLAG_NONPOW2 per-texture. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 17 +++-------------- dlls/wined3d/texture.c | 6 ++++++ dlls/wined3d/wined3d_private.h | 22 +++++++++++----------- 3 files changed, 20 insertions(+), 25 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 7858d15..88acca5 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -594,7 +594,7 @@ static BOOL surface_use_pbo(const struct wined3d_surface *surface) && gl_info->supported[ARB_PIXEL_BUFFER_OBJECT] && !texture->resource.format->convert && !(texture->flags & WINED3D_TEXTURE_PIN_SYSMEM) - && !(surface->flags & SFLAG_NONPOW2); + && !(texture->flags & WINED3D_TEXTURE_COND_NP2_EMULATED); } static HRESULT surface_private_setup(struct wined3d_surface *surface) @@ -635,12 +635,6 @@ static HRESULT surface_private_setup(struct wined3d_surface *surface) } } - if (pow2Width != surface->resource.width - || pow2Height != surface->resource.height) - { - surface->flags |= SFLAG_NONPOW2; - } - if ((surface->pow2Width > gl_info->limits.texture_size || surface->pow2Height > gl_info->limits.texture_size) && !(surface->resource.usage & (WINED3DUSAGE_RENDERTARGET | WINED3DUSAGE_DEPTHSTENCIL))) { @@ -1321,7 +1315,7 @@ static void surface_download_data(struct wined3d_surface *surface, const struct GLenum gl_type = format->glType; void *mem; - if (surface->flags & SFLAG_NONPOW2) + if (surface->container->flags & WINED3D_TEXTURE_COND_NP2_EMULATED) { wined3d_texture_get_pitch(surface->container, surface->texture_level, &dst_row_pitch, &dst_slice_pitch); wined3d_format_calculate_pitch(format, surface->resource.device->surface_alignment, @@ -1355,7 +1349,7 @@ static void surface_download_data(struct wined3d_surface *surface, const struct checkGLcall("glGetTexImage"); } - if (surface->flags & SFLAG_NONPOW2) + if (surface->container->flags & WINED3D_TEXTURE_COND_NP2_EMULATED) { const BYTE *src_data; BYTE *dst_data; @@ -1880,11 +1874,6 @@ HRESULT wined3d_surface_update_desc(struct wined3d_surface *surface, const struc surface->pow2Height <<= 1; } - if (surface->pow2Width != width || surface->pow2Height != height) - surface->flags |= SFLAG_NONPOW2; - else - surface->flags &= ~SFLAG_NONPOW2; - if (surface->container->user_memory) { surface->resource.map_binding = WINED3D_LOCATION_USER_MEMORY; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 804856b..c3bae83 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -663,6 +663,11 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT wined3d_format_calculate_pitch(format, 1, width, height, &texture->row_pitch, &texture->slice_pitch); + texture->flags &= ~WINED3D_TEXTURE_COND_NP2_EMULATED; + if (((width & (width - 1)) || (height & (height - 1))) && !gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO] + && !gl_info->supported[ARB_TEXTURE_RECTANGLE] && !gl_info->supported[WINED3D_GL_NORMALIZED_TEXRECT]) + texture->flags |= WINED3D_TEXTURE_COND_NP2_EMULATED; + return wined3d_surface_update_desc(surface, gl_info); } @@ -1074,6 +1079,7 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 texture->pow2_matrix[0] = (((float)desc->width) / ((float)pow2_width)); texture->pow2_matrix[5] = (((float)desc->height) / ((float)pow2_height)); texture->flags &= ~WINED3D_TEXTURE_POW2_MAT_IDENT; + texture->flags |= WINED3D_TEXTURE_COND_NP2_EMULATED; } texture->pow2_matrix[10] = 1.0f; texture->pow2_matrix[15] = 1.0f; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a20bc65..35ece12 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2336,16 +2336,17 @@ struct wined3d_texture_ops }; #define WINED3D_TEXTURE_COND_NP2 0x00000001 -#define WINED3D_TEXTURE_POW2_MAT_IDENT 0x00000002 -#define WINED3D_TEXTURE_IS_SRGB 0x00000004 -#define WINED3D_TEXTURE_RGB_ALLOCATED 0x00000008 -#define WINED3D_TEXTURE_RGB_VALID 0x00000010 -#define WINED3D_TEXTURE_SRGB_ALLOCATED 0x00000020 -#define WINED3D_TEXTURE_SRGB_VALID 0x00000040 -#define WINED3D_TEXTURE_CONVERTED 0x00000080 -#define WINED3D_TEXTURE_PIN_SYSMEM 0x00000100 -#define WINED3D_TEXTURE_DYNAMIC_MAP 0x00000200 -#define WINED3D_TEXTURE_NORMALIZED_COORDS 0x00000400 +#define WINED3D_TEXTURE_COND_NP2_EMULATED 0x00000002 +#define WINED3D_TEXTURE_POW2_MAT_IDENT 0x00000004 +#define WINED3D_TEXTURE_IS_SRGB 0x00000008 +#define WINED3D_TEXTURE_RGB_ALLOCATED 0x00000010 +#define WINED3D_TEXTURE_RGB_VALID 0x00000020 +#define WINED3D_TEXTURE_SRGB_ALLOCATED 0x00000040 +#define WINED3D_TEXTURE_SRGB_VALID 0x00000080 +#define WINED3D_TEXTURE_CONVERTED 0x00000100 +#define WINED3D_TEXTURE_PIN_SYSMEM 0x00000200 +#define WINED3D_TEXTURE_DYNAMIC_MAP 0x00000400 +#define WINED3D_TEXTURE_NORMALIZED_COORDS 0x00000800 #define WINED3D_TEXTURE_ASYNC_COLOR_KEY 0x00000001 @@ -2596,7 +2597,6 @@ void draw_textured_quad(const struct wined3d_surface *src_surface, struct wined3 /* Surface flags: */ #define SFLAG_DIBSECTION 0x00000001 /* Has a DIB section attached for GetDC. */ #define SFLAG_DISCARD 0x00000002 /* ??? */ -#define SFLAG_NONPOW2 0x00000004 /* Surface sizes are not a power of 2 */ #define SFLAG_DCINUSE 0x00000020 /* Set between GetDC and ReleaseDC calls. */ struct wined3d_sampler

1 0