wine-commits October 2017

wine-commits@winehq.org

2 participants
478 discussions

Fabian Maurer : ole32: Don't redefine htole32/htole16.
by Alexandre Julliard 10 Oct '17

10 Oct '17

Module: wine Branch: master Commit: 0736e4e302aded8791ce1e9a6c0fc805bcd55aff URL: http://source.winehq.org/git/wine.git/?a=commit;h=0736e4e302aded8791ce1e9a6… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat Oct 7 18:14:53 2017 +0200 ole32: Don't redefine htole32/htole16. On some systems these macros are already defined in usr/include/endian.h Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/storage32.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index 4fcfd9c..c628523 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -528,15 +528,23 @@ StgStreamImpl* StgStreamImpl_Construct( */ #ifdef WORDS_BIGENDIAN +#ifndef htole32 #define htole32(x) RtlUlongByteSwap(x) +#endif +#ifndef htole16 #define htole16(x) RtlUshortByteSwap(x) +#endif #define lendian32toh(x) RtlUlongByteSwap(x) #define lendian16toh(x) RtlUshortByteSwap(x) #else +#ifndef htole32 #define htole32(x) (x) +#endif +#ifndef htole16 #define htole16(x) (x) +#endif #define lendian32toh(x) (x) #define lendian16toh(x) (x)

1 0

Zebediah Figura : server: FSCTL_PIPE_LISTEN on a pipe client should return STATUS_ILLEGAL_FUNCTION.
by Alexandre Julliard 10 Oct '17

10 Oct '17

Module: wine Branch: master Commit: 7477792b4cf9e089388a18cacfb69567ddc310f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7477792b4cf9e089388a18cac… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Oct 10 18:40:43 2017 +0200 server: FSCTL_PIPE_LISTEN on a pipe client should return STATUS_ILLEGAL_FUNCTION. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/pipe.c | 6 ++++++ dlls/ntdll/tests/pipe.c | 3 +++ server/named_pipe.c | 4 ++++ 3 files changed, 13 insertions(+) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 13afa10..9ecb916 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -224,6 +224,12 @@ static void test_CreateNamedPipe(int pipemode) ok(GetLastError() == ERROR_SEM_TIMEOUT, "wrong error %u\n", GetLastError()); + /* Test ConnectNamedPipe() in both directions */ + ok(!ConnectNamedPipe(hnp, NULL), "ConnectNamedPipe(server) succeeded\n"); + ok(GetLastError() == ERROR_PIPE_CONNECTED, "expected ERROR_PIPE_CONNECTED, got %u\n", GetLastError()); + ok(!ConnectNamedPipe(hFile, NULL), "ConnectNamedPipe(client) succeeded\n"); + ok(GetLastError() == ERROR_INVALID_FUNCTION, "expected ERROR_INVALID_FUNCTION, got %u\n", GetLastError()); + /* don't try to do i/o if one side couldn't be opened, as it hangs */ if (hFile != INVALID_HANDLE_VALUE) { HANDLE hFile2; diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index acead4e..824eed7 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -256,6 +256,9 @@ static void test_create(void) res, access[k], sharing[j]); ok(info.NamedPipeConfiguration == pipe_config[j], "wrong duplex status for pipe: %d, expected %d\n", info.NamedPipeConfiguration, pipe_config[j]); + + res = listen_pipe(hclient, hEvent, &iosb, FALSE); + ok(res == STATUS_ILLEGAL_FUNCTION, "expected STATUS_ILLEGAL_FUNCTION, got %x\n", res); CloseHandle(hclient); } diff --git a/server/named_pipe.c b/server/named_pipe.c index 5796089..f594664 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -876,6 +876,10 @@ static int pipe_client_ioctl( struct fd *fd, ioctl_code_t code, struct async *as switch(code) { + case FSCTL_PIPE_LISTEN: + set_error( STATUS_ILLEGAL_FUNCTION ); + return 0; + case FSCTL_PIPE_PEEK: return pipe_end_peek( &client->pipe_end );

1 0

Zebediah Figura : ntdll/tests: Don't abort if NtCancelFileIoEx() is missing.
by Alexandre Julliard 10 Oct '17

10 Oct '17

Module: wine Branch: master Commit: cd4dc08b30eeb66e24bc29a632200604a9af8e70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd4dc08b30eeb66e24bc29a63… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Oct 9 11:48:03 2017 -0500 ntdll/tests: Don't abort if NtCancelFileIoEx() is missing. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/pipe.c | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index a619fee..acead4e 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -98,10 +98,10 @@ static BOOL init_func_ptrs(void) loadfunc(NtQueryVolumeInformationFile) loadfunc(NtSetInformationFile) loadfunc(NtCancelIoFile) - loadfunc(NtCancelIoFileEx) loadfunc(RtlInitUnicodeString) /* not fatal */ + pNtCancelIoFileEx = (void *)GetProcAddress(module, "NtCancelIoFileEx"); module = GetModuleHandleA("kernel32.dll"); pOpenThread = (void *)GetProcAddress(module, "OpenThread"); pQueueUserAPC = (void *)GetProcAddress(module, "QueueUserAPC"); @@ -516,21 +516,27 @@ static void test_cancelio(void) CloseHandle(hPipe); - res = create_pipe(&hPipe, FILE_SHARE_READ | FILE_SHARE_WRITE, 0 /* OVERLAPPED */); - ok(!res, "NtCreateNamedPipeFile returned %x\n", res); + if (pNtCancelIoFileEx) + { + res = create_pipe(&hPipe, FILE_SHARE_READ | FILE_SHARE_WRITE, 0 /* OVERLAPPED */); + ok(!res, "NtCreateNamedPipeFile returned %x\n", res); - memset(&iosb, 0x55, sizeof(iosb)); - res = listen_pipe(hPipe, hEvent, &iosb, FALSE); - ok(res == STATUS_PENDING, "NtFsControlFile returned %x\n", res); + memset(&iosb, 0x55, sizeof(iosb)); + res = listen_pipe(hPipe, hEvent, &iosb, FALSE); + ok(res == STATUS_PENDING, "NtFsControlFile returned %x\n", res); - res = pNtCancelIoFileEx(hPipe, &iosb, &cancel_sb); - ok(!res, "NtCancelIoFileEx returned %x\n", res); + res = pNtCancelIoFileEx(hPipe, &iosb, &cancel_sb); + ok(!res, "NtCancelIoFileEx returned %x\n", res); - ok(U(iosb).Status == STATUS_CANCELLED, "Wrong iostatus %x\n", U(iosb).Status); - ok(WaitForSingleObject(hEvent, 0) == 0, "hEvent not signaled\n"); + ok(U(iosb).Status == STATUS_CANCELLED, "Wrong iostatus %x\n", U(iosb).Status); + ok(WaitForSingleObject(hEvent, 0) == 0, "hEvent not signaled\n"); + + CloseHandle(hPipe); + } + else + win_skip("NtCancelIoFileEx not available\n"); CloseHandle(hEvent); - CloseHandle(hPipe); } static void _check_pipe_handle_state(int line, HANDLE handle, ULONG read, ULONG completion) @@ -1094,6 +1100,8 @@ static void read_pipe_test(ULONG pipe_flags, ULONG pipe_type) CloseHandle( read ); CloseHandle( write ); } + else + win_skip("NtCancelIoFileEx not available\n"); CloseHandle(event); }

1 0

Andrey Gusev : usp10: Remove redundant comparison.
by Alexandre Julliard 10 Oct '17

10 Oct '17

Module: wine Branch: master Commit: a34adbefe452769d47377904c8269a08f02f3c05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a34adbefe452769d47377904c… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue Oct 10 16:44:17 2017 +0300 usp10: Remove redundant comparison. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/usp10.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 0b8c28e..59abbad 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -2641,7 +2641,7 @@ HRESULT WINAPI ScriptCPtoX(int iCP, iPosX = 0.0; for (item=0; item < iCP && item < cChars; item++) { - if (iSpecial == -1 && (iCluster == -1 || (iCluster != -1 && iCluster+clust_size <= item))) + if (iSpecial == -1 && (iCluster == -1 || iCluster+clust_size <= item)) { int check; int clust = pwLogClust[item];

1 0

Gijs Vermeulen : msvcrt: Add vf[w]printf_s_l.
by Alexandre Julliard 10 Oct '17

10 Oct '17

Module: wine Branch: master Commit: 1ae09d5fb29260b4de72add7a2cdd0244912d00a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ae09d5fb29260b4de72add7a… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Tue Oct 10 16:14:03 2017 +0200 msvcrt: Add vf[w]printf_s_l. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr100/msvcr100.spec | 4 ++-- dlls/msvcr110/msvcr110.spec | 4 ++-- dlls/msvcr120/msvcr120.spec | 4 ++-- dlls/msvcr120_app/msvcr120_app.spec | 4 ++-- dlls/msvcr80/msvcr80.spec | 4 ++-- dlls/msvcr90/msvcr90.spec | 4 ++-- dlls/msvcrt/file.c | 22 ++++++++++++++++++++-- dlls/msvcrt/msvcrt.spec | 4 ++-- 8 files changed, 34 insertions(+), 16 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index ef49177..f963c3b 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1436,11 +1436,11 @@ @ cdecl _vfprintf_l(ptr str ptr ptr) MSVCRT__vfprintf_l @ stub _vfprintf_p @ stub _vfprintf_p_l -@ stub _vfprintf_s_l +@ cdecl _vfprintf_s_l(ptr str ptr ptr) MSVCRT__vfprintf_s_l @ cdecl _vfwprintf_l(ptr wstr ptr ptr) MSVCRT__vfwprintf_l @ stub _vfwprintf_p @ stub _vfwprintf_p_l -@ stub _vfwprintf_s_l +@ cdecl _vfwprintf_s_l(ptr wstr ptr ptr) MSVCRT__vfwprintf_s_l @ stub _vprintf_l @ stub _vprintf_p @ stub _vprintf_p_l diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index be4d8c1..721886e 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1793,11 +1793,11 @@ @ cdecl _vfprintf_l(ptr str ptr ptr) MSVCRT__vfprintf_l @ stub _vfprintf_p @ stub _vfprintf_p_l -@ stub _vfprintf_s_l +@ cdecl _vfprintf_s_l(ptr str ptr ptr) MSVCRT__vfprintf_s_l @ cdecl _vfwprintf_l(ptr wstr ptr ptr) MSVCRT__vfwprintf_l @ stub _vfwprintf_p @ stub _vfwprintf_p_l -@ stub _vfwprintf_s_l +@ cdecl _vfwprintf_s_l(ptr wstr ptr ptr) MSVCRT__vfwprintf_s_l @ stub _vprintf_l @ stub _vprintf_p @ stub _vprintf_p_l diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 60e0a32..2416144 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1811,11 +1811,11 @@ @ cdecl _vfprintf_l(ptr str ptr ptr) MSVCRT__vfprintf_l @ stub _vfprintf_p @ stub _vfprintf_p_l -@ stub _vfprintf_s_l +@ cdecl _vfprintf_s_l(ptr str ptr ptr) MSVCRT__vfprintf_s_l @ cdecl _vfwprintf_l(ptr wstr ptr ptr) MSVCRT__vfwprintf_l @ stub _vfwprintf_p @ stub _vfwprintf_p_l -@ stub _vfwprintf_s_l +@ cdecl _vfwprintf_s_l(ptr wstr ptr ptr) MSVCRT__vfwprintf_s_l @ stub _vprintf_l @ stub _vprintf_p @ stub _vprintf_p_l diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 38c2707..fc7f72c 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1505,11 +1505,11 @@ @ cdecl _vfprintf_l(ptr str ptr ptr) msvcr120._vfprintf_l @ stub _vfprintf_p @ stub _vfprintf_p_l -@ stub _vfprintf_s_l +@ cdecl _vfprintf_s_l(ptr str ptr ptr) msvcr120._vfprintf_s_l @ cdecl _vfwprintf_l(ptr wstr ptr ptr) msvcr120._vfwprintf_l @ stub _vfwprintf_p @ stub _vfwprintf_p_l -@ stub _vfwprintf_s_l +@ cdecl _vfwprintf_s_l(ptr wstr ptr ptr) msvcr120._vfwprintf_s_l @ stub _vprintf_l @ stub _vprintf_p @ stub _vprintf_p_l diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 4d97db0..1f87e2a 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1115,11 +1115,11 @@ @ cdecl _vfprintf_l(ptr str ptr ptr) MSVCRT__vfprintf_l @ stub _vfprintf_p @ stub _vfprintf_p_l -@ stub _vfprintf_s_l +@ cdecl _vfprintf_s_l(ptr str ptr ptr) MSVCRT__vfprintf_s_l @ cdecl _vfwprintf_l(ptr wstr ptr ptr) MSVCRT__vfwprintf_l @ stub _vfwprintf_p @ stub _vfwprintf_p_l -@ stub _vfwprintf_s_l +@ cdecl _vfwprintf_s_l(ptr wstr ptr ptr) MSVCRT__vfwprintf_s_l @ stub _vprintf_l @ stub _vprintf_p @ stub _vprintf_p_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index eccbf3c..f63f979 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1091,11 +1091,11 @@ @ cdecl _vfprintf_l(ptr str ptr ptr) MSVCRT__vfprintf_l @ stub _vfprintf_p @ stub _vfprintf_p_l -@ stub _vfprintf_s_l +@ cdecl _vfprintf_s_l(ptr str ptr ptr) MSVCRT__vfprintf_s_l @ cdecl _vfwprintf_l(ptr wstr ptr ptr) MSVCRT__vfwprintf_l @ stub _vfwprintf_p @ stub _vfwprintf_p_l -@ stub _vfwprintf_s_l +@ cdecl _vfwprintf_s_l(ptr wstr ptr ptr) MSVCRT__vfwprintf_s_l @ stub _vprintf_l @ stub _vprintf_p @ stub _vprintf_p_l diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index db8cd5c..0746cf2 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -5085,6 +5085,24 @@ static int vfwprintf_helper(DWORD options, MSVCRT_FILE* file, const MSVCRT_wchar } /********************************************************************* + * _vfprintf_s_l (MSVCRT.@) + */ +int CDECL MSVCRT__vfprintf_s_l(MSVCRT_FILE* file, const char *format, + MSVCRT__locale_t locale, __ms_va_list valist) +{ + return vfprintf_helper(MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER, file, format, locale, valist); +} + +/********************************************************************* + * _vfwprintf_s_l (MSVCRT.@) + */ +int CDECL MSVCRT__vfwprintf_s_l(MSVCRT_FILE* file, const MSVCRT_wchar_t *format, + MSVCRT__locale_t locale, __ms_va_list valist) +{ + return vfwprintf_helper(MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER, file, format, locale, valist); +} + +/********************************************************************* * vfprintf (MSVCRT.@) */ int CDECL MSVCRT_vfprintf(MSVCRT_FILE* file, const char *format, __ms_va_list valist) @@ -5097,7 +5115,7 @@ int CDECL MSVCRT_vfprintf(MSVCRT_FILE* file, const char *format, __ms_va_list va */ int CDECL MSVCRT_vfprintf_s(MSVCRT_FILE* file, const char *format, __ms_va_list valist) { - return vfprintf_helper(MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER, file, format, NULL, valist); + return MSVCRT__vfprintf_s_l(file, format, NULL, valist); } /********************************************************************* @@ -5113,7 +5131,7 @@ int CDECL MSVCRT_vfwprintf(MSVCRT_FILE* file, const MSVCRT_wchar_t *format, __ms */ int CDECL MSVCRT_vfwprintf_s(MSVCRT_FILE* file, const MSVCRT_wchar_t *format, __ms_va_list valist) { - return vfwprintf_helper(MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER, file, format, NULL, valist); + return MSVCRT__vfwprintf_s_l(file, format, NULL, valist); } /********************************************************************* diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 50d051d..fcfa8fc 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1047,11 +1047,11 @@ @ cdecl _vfprintf_l(ptr str ptr ptr) MSVCRT__vfprintf_l # stub _vfprintf_p(ptr str ptr) # stub _vfprintf_p_l(ptr str ptr ptr) -# stub _vfprintf_s_l(ptr str ptr ptr) +@ cdecl _vfprintf_s_l(ptr str ptr ptr) MSVCRT__vfprintf_s_l @ cdecl _vfwprintf_l(ptr wstr ptr ptr) MSVCRT__vfwprintf_l # stub _vfwprintf_p(ptr wstr ptr) # stub _vfwprintf_p_l(ptr wstr ptr ptr) -# stub _vfwprintf_s_l(ptr wstr ptr ptr) +@ cdecl _vfwprintf_s_l(ptr wstr ptr ptr) MSVCRT__vfwprintf_s_l # stub _vprintf_l(str ptr ptr) # stub _vprintf_p(str ptr) # stub _vprintf_p_l(str ptr ptr)

1 0

Andrey Gusev : oleaut32: Remove redundant comparison.
by Alexandre Julliard 10 Oct '17

10 Oct '17

Module: wine Branch: master Commit: 307b3c8ed59acf2de2a049d27b5784a6a97733e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=307b3c8ed59acf2de2a049d27… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue Oct 10 17:20:52 2017 +0300 oleaut32: Remove redundant comparison. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/vartype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index 881fe20..eeef992 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -5372,7 +5372,7 @@ static HRESULT VARIANT_DI_normalize(VARIANT_DI * val, int exponent2, BOOL isDoub end of the bit representation, down to the precision guaranteed by the floating point number. */ if (isDouble) { - while (exponent10 < 0 && (val->bitsnum[2] != 0 || (val->bitsnum[2] == 0 && (val->bitsnum[1] & 0xFFE00000) != 0))) { + while (exponent10 < 0 && (val->bitsnum[2] != 0 || (val->bitsnum[1] & 0xFFE00000) != 0)) { int rem10; rem10 = VARIANT_int_divbychar(val->bitsnum, 3, 10);

1 0

Alexandre Julliard : opengl32: Get type definitions from the XML files.
by Alexandre Julliard 10 Oct '17

10 Oct '17

Module: wine Branch: master Commit: bbb71620cd32cfde52337f5f62eea5a362ca8b98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbb71620cd32cfde52337f5f6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 9 15:21:31 2017 +0200 opengl32: Get type definitions from the XML files. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opengl32/make_opengl | 234 ++++++++++++++++--------------------------- dlls/opengl32/opengl_ext.c | 14 +-- dlls/opengl32/opengl_norm.c | 14 +-- dlls/opengl32/tests/opengl.c | 1 - dlls/opengl32/winegl.xml | 18 ++++ include/wine/wgl.h | 90 +++++++++++------ include/wine/wgl_driver.h | 14 +-- include/wine/wglext.h | 28 ------ 8 files changed, 186 insertions(+), 227 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bbb71620cd32cfde52337…

1 0

Alexandre Julliard : opengl32: Convert the XML parser to use XML::LibXML.
by Alexandre Julliard 10 Oct '17

10 Oct '17

Module: wine Branch: master Commit: fd3d5d6f829fe64f46f71960c108393daf6f9190 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd3d5d6f829fe64f46f71960c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 10 10:16:03 2017 +0200 opengl32: Convert the XML parser to use XML::LibXML. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opengl32/make_opengl | 369 +- dlls/opengl32/opengl_ext.c | 13233 +++++++++++++++++++++++++----------------- dlls/opengl32/opengl_norm.c | 5062 ++++++++-------- include/wine/wgl.h | 653 +-- include/wine/wgl_driver.h | 5888 +++++++++---------- 5 files changed, 14045 insertions(+), 11160 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fd3d5d6f829fe64f46f71…

1 0

Alexandre Julliard : opengl32: Remove no longer used support for generating thread-safe thunks.
by Alexandre Julliard 10 Oct '17

10 Oct '17

Module: wine Branch: master Commit: 2abeb7634c07892606d7252d673e8a4300b13e08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2abeb7634c07892606d7252d6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 10 10:10:41 2017 +0200 opengl32: Remove no longer used support for generating thread-safe thunks. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opengl32/make_opengl | 29 ++++------------------------- 1 file changed, 4 insertions(+), 25 deletions(-) diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index 502b9ae..81b7291 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -67,10 +67,6 @@ my $ext_file = "opengl_ext.c"; my $wgl_driver_file = "../../include/wine/wgl_driver.h"; my $wgl_file = "../../include/wine/wgl.h"; -# Set to 0 for removing the ENTER / LEAVE GL calls -my $gen_thread_safe = 0; -# Prefix used for the local variables -my $ext_prefix = "func_"; # If set to 1, generate TRACEs for each OpenGL function my $gen_traces = 1; @@ -299,9 +295,6 @@ sub GenerateThunk($$$) return "$ret) DECLSPEC_HIDDEN;\n" if $name eq "glGetStringi"; $ret .= ") {\n"; $ret .= " const struct opengl_funcs *funcs = NtCurrentTeb()->glTable;\n"; - if ($func_ref->[0] ne "void" && $gen_thread_safe) { - $ret .= " " . ConvertType($func_ref->[0]) . " ret_value;\n"; - } if ($gen_traces) { $ret .= " TRACE(\"($trace_arg)\\n\""; if ($trace_arg ne "") { @@ -309,25 +302,11 @@ sub GenerateThunk($$$) } $ret .= ");\n"; } - if ($gen_thread_safe) { - $ret .= " ENTER_GL();\n"; - $ret .= " "; - if ($func_ref->[0] ne "void") { - $ret .= "ret_value = "; - } - $ret .= "funcs->$prefix.p_$name( $call_arg);\n"; - $ret .= " LEAVE_GL();\n"; - if ($func_ref->[0] ne "void") { - $ret .= " return ret_value;\n" - } - } - else { - $ret .= " "; - if ($func_ref->[0] ne "void") { - $ret .= "return "; - } - $ret .= "funcs->$prefix.p_$name( $call_arg);\n"; + $ret .= " "; + if ($func_ref->[0] ne "void") { + $ret .= "return "; } + $ret .= "funcs->$prefix.p_$name( $call_arg);\n"; $ret .= "}\n"; # Return this string....

1 0

Alexandre Julliard : opengl32: Get WGL function definitions from the XML files.
by Alexandre Julliard 10 Oct '17

10 Oct '17

Module: wine Branch: master Commit: 17dffaac7d5a8fc595775d456bb85e343d5aa195 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17dffaac7d5a8fc595775d456… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 10 10:06:10 2017 +0200 opengl32: Get WGL function definitions from the XML files. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dibdrv/opengl.c | 4 +- dlls/opengl32/make_opengl | 147 ++++++++++++++++++++++++------------------ dlls/opengl32/opengl32.spec | 5 +- dlls/opengl32/opengl_norm.c | 18 +++--- dlls/opengl32/winegl.xml | 14 ++++ dlls/wineandroid.drv/opengl.c | 4 +- dlls/winemac.drv/opengl.c | 4 +- dlls/winex11.drv/opengl.c | 4 +- include/wine/wgl_driver.h | 10 +-- 9 files changed, 122 insertions(+), 88 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=17dffaac7d5a8fc595775…

1 0

← Newer
1
...
31
32
33
34
35
36
37
...
48
Older →

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 2017