December 2022 - Wine-Commits

Alexandre Julliard : png: Import upstream release 1.6.39.
by Alexandre Julliard Dec. 6, 2022

Dec. 6, 2022

Module: wine Branch: master Commit: 967b29d39dd6046573ce3e99834fb306e0dd1bd0 URL: https://gitlab.winehq.org/wine/wine/-/commit/967b29d39dd6046573ce3e99834fb3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 6 16:31:19 2022 +0100 png: Import upstream release 1.6.39. --- libs/png/AUTHORS | 3 ++- libs/png/png.c | 6 +++--- libs/png/png.h | 16 ++++++++-------- libs/png/pngconf.h | 2 +- libs/png/pngpriv.h | 2 +- libs/png/pngread.c | 4 ++-- libs/png/pngrutil.c | 2 +- libs/png/pngwrite.c | 8 ++++---- libs/png/pngwutil.c | 6 +++--- 9 files changed, 25 insertions(+), 24 deletions(-) diff --git a/libs/png/AUTHORS b/libs/png/AUTHORS index e6a58d245d6..9a8e3869ec3 100644 --- a/libs/png/AUTHORS +++ b/libs/png/AUTHORS @@ -35,9 +35,10 @@ Authors, for copyright and licensing purposes. * Arm Holdings - Richard Townsend * Google Inc. + - Dan Field + - Leon Scroggins III - Matt Sarett - Mike Klein - - Dan Field - Sami Boukortt The build projects, the build scripts, the test scripts, and other diff --git a/libs/png/png.c b/libs/png/png.c index fc095642621..4f3e8bbd31f 100644 --- a/libs/png/png.c +++ b/libs/png/png.c @@ -14,7 +14,7 @@ #include "pngpriv.h" /* Generate a compiler error if there is an old png.h in the search path. */ -typedef png_libpng_version_1_6_38 Your_png_h_is_not_version_1_6_38; +typedef png_libpng_version_1_6_39 Your_png_h_is_not_version_1_6_39; #ifdef __GNUC__ /* The version tests may need to be added to, but the problem warning has @@ -815,7 +815,7 @@ png_get_copyright(png_const_structrp png_ptr) return PNG_STRING_COPYRIGHT #else return PNG_STRING_NEWLINE \ - "libpng version 1.6.38" PNG_STRING_NEWLINE \ + "libpng version 1.6.39" PNG_STRING_NEWLINE \ "Copyright (c) 2018-2022 Cosmin Truta" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson" \ PNG_STRING_NEWLINE \ @@ -2710,7 +2710,7 @@ png_check_IHDR(png_const_structrp png_ptr, int /* PRIVATE */ png_check_fp_number(png_const_charp string, size_t size, int *statep, - png_size_tp whereami) + size_t *whereami) { int state = *statep; size_t i = *whereami; diff --git a/libs/png/png.h b/libs/png/png.h index 5fb494fb1aa..f109cdf3365 100644 --- a/libs/png/png.h +++ b/libs/png/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.38 - September 14, 2022 + * libpng version 1.6.39 - November 20, 2022 * * Copyright (c) 2018-2022 Cosmin Truta * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson @@ -15,7 +15,7 @@ * libpng versions 0.89, June 1996, through 0.96, May 1997: Andreas Dilger * libpng versions 0.97, January 1998, through 1.6.35, July 2018: * Glenn Randers-Pehrson - * libpng versions 1.6.36, December 2018, through 1.6.38, September 2022: + * libpng versions 1.6.36, December 2018, through 1.6.39, November 2022: * Cosmin Truta * See also "Contributing Authors", below. */ @@ -239,7 +239,7 @@ * ... * 1.5.30 15 10530 15.so.15.30[.0] * ... - * 1.6.38 16 10638 16.so.16.38[.0] + * 1.6.39 16 10639 16.so.16.39[.0] * * Henceforth the source version will match the shared-library major and * minor numbers; the shared-library major version number will be used for @@ -278,8 +278,8 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.6.38" -#define PNG_HEADER_VERSION_STRING " libpng version 1.6.38 - September 14, 2022\n" +#define PNG_LIBPNG_VER_STRING "1.6.39" +#define PNG_HEADER_VERSION_STRING " libpng version 1.6.39 - November 20, 2022\n" #define PNG_LIBPNG_VER_SONUM 16 #define PNG_LIBPNG_VER_DLLNUM 16 @@ -287,7 +287,7 @@ /* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */ #define PNG_LIBPNG_VER_MAJOR 1 #define PNG_LIBPNG_VER_MINOR 6 -#define PNG_LIBPNG_VER_RELEASE 38 +#define PNG_LIBPNG_VER_RELEASE 39 /* This should be zero for a public release, or non-zero for a * development version. [Deprecated] @@ -318,7 +318,7 @@ * From version 1.0.1 it is: * XXYYZZ, where XX=major, YY=minor, ZZ=release */ -#define PNG_LIBPNG_VER 10638 /* 1.6.38 */ +#define PNG_LIBPNG_VER 10639 /* 1.6.39 */ /* Library configuration: these options cannot be changed after * the library has been built. @@ -428,7 +428,7 @@ extern "C" { /* This triggers a compiler error in png.c, if png.c and png.h * do not agree upon the version number. */ -typedef char* png_libpng_version_1_6_38; +typedef char* png_libpng_version_1_6_39; /* Basic control structions. Read libpng-manual.txt or libpng.3 for more info. * diff --git a/libs/png/pngconf.h b/libs/png/pngconf.h index 89d28f83a05..fcb4b430698 100644 --- a/libs/png/pngconf.h +++ b/libs/png/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine-configurable file for libpng * - * libpng version 1.6.38 + * libpng version 1.6.39 * * Copyright (c) 2018-2022 Cosmin Truta * Copyright (c) 1998-2002,2004,2006-2016,2018 Glenn Randers-Pehrson diff --git a/libs/png/pngpriv.h b/libs/png/pngpriv.h index 2e426cf47d6..b8a73b685df 100644 --- a/libs/png/pngpriv.h +++ b/libs/png/pngpriv.h @@ -1946,7 +1946,7 @@ PNG_INTERNAL_FUNCTION(void,png_ascii_from_fixed,(png_const_structrp png_ptr, * the problem character.) This has not been tested within libpng. */ PNG_INTERNAL_FUNCTION(int,png_check_fp_number,(png_const_charp string, - size_t size, int *statep, png_size_tp whereami),PNG_EMPTY); + size_t size, int *statep, size_t *whereami),PNG_EMPTY); /* This is the same but it checks a complete string and returns true * only if it just contains a floating point number. As of 1.5.4 this diff --git a/libs/png/pngread.c b/libs/png/pngread.c index 5ab92240382..96996ced5ba 100644 --- a/libs/png/pngread.c +++ b/libs/png/pngread.c @@ -3762,13 +3762,13 @@ png_image_read_direct(png_voidp argument) mode = PNG_ALPHA_PNG; output_gamma = PNG_DEFAULT_sRGB; } - + if ((change & PNG_FORMAT_FLAG_ASSOCIATED_ALPHA) != 0) { mode = PNG_ALPHA_OPTIMIZED; change &= ~PNG_FORMAT_FLAG_ASSOCIATED_ALPHA; } - + /* If 'do_local_background' is set check for the presence of gamma * correction; this is part of the work-round for the libpng bug * described above. diff --git a/libs/png/pngrutil.c b/libs/png/pngrutil.c index ca060dd15f0..068ab193a33 100644 --- a/libs/png/pngrutil.c +++ b/libs/png/pngrutil.c @@ -3186,7 +3186,7 @@ png_check_chunk_length(png_const_structrp png_ptr, png_uint_32 length) { png_debug2(0," length = %lu, limit = %lu", (unsigned long)length,(unsigned long)limit); - png_chunk_error(png_ptr, "chunk data is too large"); + png_benign_error(png_ptr, "chunk data is too large"); } } diff --git a/libs/png/pngwrite.c b/libs/png/pngwrite.c index 06c45d16ab4..4e58d776a96 100644 --- a/libs/png/pngwrite.c +++ b/libs/png/pngwrite.c @@ -75,10 +75,10 @@ write_unknown_chunks(png_structrp png_ptr, png_const_inforp info_ptr, * library. If you have a new chunk to add, make a function to write it, * and put it in the correct location here. If you want the chunk written * after the image data, put it in png_write_end(). I strongly encourage - * you to supply a PNG_INFO_ flag, and check info_ptr->valid before writing - * the chunk, as that will keep the code from breaking if you want to just - * write a plain PNG file. If you have long comments, I suggest writing - * them in png_write_end(), and compressing them. + * you to supply a PNG_INFO_<chunk> flag, and check info_ptr->valid before + * writing the chunk, as that will keep the code from breaking if you want + * to just write a plain PNG file. If you have long comments, I suggest + * writing them in png_write_end(), and compressing them. */ void PNGAPI png_write_info_before_PLTE(png_structrp png_ptr, png_const_inforp info_ptr) diff --git a/libs/png/pngwutil.c b/libs/png/pngwutil.c index 16345e4c0ba..01f0607c709 100644 --- a/libs/png/pngwutil.c +++ b/libs/png/pngwutil.c @@ -1,7 +1,7 @@ /* pngwutil.c - utilities to write a PNG file * - * Copyright (c) 2018 Cosmin Truta + * Copyright (c) 2018-2022 Cosmin Truta * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson * Copyright (c) 1996-1997 Andreas Dilger * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc. @@ -1747,7 +1747,7 @@ png_write_pCAL(png_structrp png_ptr, png_charp purpose, png_int_32 X0, { png_uint_32 purpose_len; size_t units_len, total_len; - png_size_tp params_len; + size_t *params_len; png_byte buf[10]; png_byte new_purpose[80]; int i; @@ -1769,7 +1769,7 @@ png_write_pCAL(png_structrp png_ptr, png_charp purpose, png_int_32 X0, png_debug1(3, "pCAL units length = %d", (int)units_len); total_len = purpose_len + units_len + 10; - params_len = (png_size_tp)png_malloc(png_ptr, + params_len = (size_t *)png_malloc(png_ptr, (png_alloc_size_t)((png_alloc_size_t)nparams * (sizeof (size_t)))); /* Find the length of each parameter, making sure we don't count the

1 0

Alexandre Julliard : opengl32: Don't free memory at process exit.
by Alexandre Julliard Dec. 6, 2022

Dec. 6, 2022

Module: wine Branch: master Commit: 80e572451e667755357095f691fdbd4c1a7db77a URL: https://gitlab.winehq.org/wine/wine/-/commit/80e572451e667755357095f691fdbd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 6 13:32:34 2022 +0100 opengl32: Don't free memory at process exit. --- dlls/opengl32/wgl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 3a1d2a81baa..f2ef3580f0f 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -1281,6 +1281,7 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) break; case DLL_PROCESS_DETACH: + if (reserved) break; UNIX_CALL( process_detach, NULL ); #ifndef _WIN64 cleanup_wow64_strings();

1 0

Alexandre Julliard : opengl32: Pass the TEB pointer in the Unix call parameters.
by Alexandre Julliard Dec. 6, 2022

Dec. 6, 2022

Module: wine Branch: master Commit: f6a0597d59772a25902685c5f95df5b56672380b URL: https://gitlab.winehq.org/wine/wine/-/commit/f6a0597d59772a25902685c5f95df5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 5 11:49:27 2022 +0100 opengl32: Pass the TEB pointer in the Unix call parameters. NtCurrentTeb() is more expensive on the Unix side. --- dlls/opengl32/make_opengl | 63 +- dlls/opengl32/thunks.c | 6038 ++-- dlls/opengl32/unix_private.h | 6 + dlls/opengl32/unix_thunks.c | 75821 +++++++++++++++++++++++++++++------------ dlls/opengl32/unix_wgl.c | 296 +- dlls/opengl32/unixlib.h | 3040 ++ dlls/opengl32/wgl.c | 24 +- 7 files changed, 60033 insertions(+), 25255 deletions(-)

1 0

Alexandre Julliard : opengl32: Fix GLdouble type alignment on the Unix side.
by Alexandre Julliard Dec. 6, 2022

Dec. 6, 2022

Module: wine Branch: master Commit: 288da7c8dbea52ed4312885f0be9ffec27e307e8 URL: https://gitlab.winehq.org/wine/wine/-/commit/288da7c8dbea52ed4312885f0be9ff… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 6 13:29:18 2022 +0100 opengl32: Fix GLdouble type alignment on the Unix side. --- dlls/glu32/project.c | 10 +++++----- dlls/opengl32/make_opengl | 1 + include/wine/wgl.h | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/glu32/project.c b/dlls/glu32/project.c index 0a71eabd98c..2533ba28f42 100644 --- a/dlls/glu32/project.c +++ b/dlls/glu32/project.c @@ -241,8 +241,8 @@ GLint WINAPI gluProject( GLdouble objx, GLdouble objy, GLdouble objz, const GLdo const GLdouble projMatrix[16], const GLint viewport[4], GLdouble *winx, GLdouble *winy, GLdouble *winz ) { - double in[4]; - double out[4]; + GLdouble in[4]; + GLdouble out[4]; in[0]=objx; in[1]=objy; @@ -276,9 +276,9 @@ GLint WINAPI gluUnProject( GLdouble winx, GLdouble winy, GLdouble winz, const GL const GLdouble projMatrix[16], const GLint viewport[4], GLdouble *objx, GLdouble *objy, GLdouble *objz ) { - double finalMatrix[16]; - double in[4]; - double out[4]; + GLdouble finalMatrix[16]; + GLdouble in[4]; + GLdouble out[4]; __gluMultMatricesd(modelMatrix, projMatrix, finalMatrix); if (!__gluInvertMatrixd(finalMatrix, finalMatrix)) return(GL_FALSE); diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index 5564b4b8526..4f93725bb29 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -133,6 +133,7 @@ my %remap_types = my %khronos_types = ( + "double" => "double DECLSPEC_ALIGN(8)", "khronos_int8_t" => "signed char", "khronos_uint8_t" => "unsigned char", "khronos_int16_t" => "short", diff --git a/include/wine/wgl.h b/include/wine/wgl.h index 51b821f5594..b3f93fab9ca 100644 --- a/include/wine/wgl.h +++ b/include/wine/wgl.h @@ -21,8 +21,8 @@ typedef int GLclampx; typedef int GLsizei; typedef float GLfloat; typedef float GLclampf; -typedef double GLdouble; -typedef double GLclampd; +typedef double DECLSPEC_ALIGN(8) GLdouble; +typedef double DECLSPEC_ALIGN(8) GLclampd; typedef void *GLeglClientBufferEXT; typedef void *GLeglImageOES; typedef char GLchar;

1 0

Ivo Ivanov : wineusb.sys: Add support for TransferBufferMDL.
by Alexandre Julliard Dec. 5, 2022

Dec. 5, 2022

Module: wine Branch: master Commit: 6b816b8969576a931af25fe5cc32326f03bb7359 URL: https://gitlab.winehq.org/wine/wine/-/commit/6b816b8969576a931af25fe5cc3232… Author: Ivo Ivanov <logos128(a)gmail.com> Date: Sat Sep 10 17:15:29 2022 +0300 wineusb.sys: Add support for TransferBufferMDL. Allow drivers such as NaturalPoint's npusbio_x64.sys to communicate with the lower level USB bus driver. Makes NaturalPoint's TrackIR5 head tracking system fully functional in Wine. --- dlls/wineusb.sys/unixlib.c | 48 +++++++++++++++++++++++++++++++--------------- dlls/wineusb.sys/unixlib.h | 1 + dlls/wineusb.sys/wineusb.c | 33 +++++++++++++++++++++++++++++++ 3 files changed, 67 insertions(+), 15 deletions(-) diff --git a/dlls/wineusb.sys/unixlib.c b/dlls/wineusb.sys/unixlib.c index 7889270c37d..f72686b5a78 100644 --- a/dlls/wineusb.sys/unixlib.c +++ b/dlls/wineusb.sys/unixlib.c @@ -305,14 +305,23 @@ static NTSTATUS usbd_status_from_libusb(enum libusb_transfer_status status) } } +struct transfer_ctx +{ + IRP *irp; + void *transfer_buffer; +}; + static void LIBUSB_CALL transfer_cb(struct libusb_transfer *transfer) { - IRP *irp = transfer->user_data; + struct transfer_ctx *transfer_ctx = transfer->user_data; + IRP *irp = transfer_ctx->irp; URB *urb = IoGetCurrentIrpStackLocation(irp)->Parameters.Others.Argument1; + unsigned char *transfer_buffer = transfer_ctx->transfer_buffer; struct usb_event event; TRACE("Completing IRP %p, status %#x.\n", irp, transfer->status); + free(transfer_ctx); urb->UrbHeader.Status = usbd_status_from_libusb(transfer->status); if (transfer->status == LIBUSB_TRANSFER_COMPLETED) @@ -327,7 +336,7 @@ static void LIBUSB_CALL transfer_cb(struct libusb_transfer *transfer) { struct _URB_CONTROL_DESCRIPTOR_REQUEST *req = &urb->UrbControlDescriptorRequest; req->TransferBufferLength = transfer->actual_length; - memcpy(req->TransferBuffer, libusb_control_transfer_get_data(transfer), transfer->actual_length); + memcpy(transfer_buffer, libusb_control_transfer_get_data(transfer), transfer->actual_length); break; } @@ -336,7 +345,7 @@ static void LIBUSB_CALL transfer_cb(struct libusb_transfer *transfer) struct _URB_CONTROL_VENDOR_OR_CLASS_REQUEST *req = &urb->UrbControlVendorClassRequest; req->TransferBufferLength = transfer->actual_length; if (req->TransferFlags & USBD_TRANSFER_DIRECTION_IN) - memcpy(req->TransferBuffer, libusb_control_transfer_get_data(transfer), transfer->actual_length); + memcpy(transfer_buffer, libusb_control_transfer_get_data(transfer), transfer->actual_length); break; } @@ -410,9 +419,12 @@ static NTSTATUS usb_submit_urb(void *args) { struct _URB_BULK_OR_INTERRUPT_TRANSFER *req = &urb->UrbBulkOrInterruptTransfer; struct pipe pipe = get_pipe(req->PipeHandle); + struct transfer_ctx *transfer_ctx; - if (req->TransferBufferMDL) - FIXME("Unhandled MDL output buffer.\n"); + if (!(transfer_ctx = calloc(1, sizeof(*transfer_ctx)))) + return STATUS_NO_MEMORY; + transfer_ctx->irp = irp; + transfer_ctx->transfer_buffer = params->transfer_buffer; if (!(transfer = libusb_alloc_transfer(0))) return STATUS_NO_MEMORY; @@ -421,12 +433,12 @@ static NTSTATUS usb_submit_urb(void *args) if (pipe.type == UsbdPipeTypeBulk) { libusb_fill_bulk_transfer(transfer, handle, pipe.endpoint, - req->TransferBuffer, req->TransferBufferLength, transfer_cb, irp, 0); + params->transfer_buffer, req->TransferBufferLength, transfer_cb, transfer_ctx, 0); } else if (pipe.type == UsbdPipeTypeInterrupt) { libusb_fill_interrupt_transfer(transfer, handle, pipe.endpoint, - req->TransferBuffer, req->TransferBufferLength, transfer_cb, irp, 0); + params->transfer_buffer, req->TransferBufferLength, transfer_cb, transfer_ctx, 0); } else { @@ -446,10 +458,13 @@ static NTSTATUS usb_submit_urb(void *args) case URB_FUNCTION_GET_DESCRIPTOR_FROM_DEVICE: { struct _URB_CONTROL_DESCRIPTOR_REQUEST *req = &urb->UrbControlDescriptorRequest; + struct transfer_ctx *transfer_ctx; unsigned char *buffer; - if (req->TransferBufferMDL) - FIXME("Unhandled MDL output buffer.\n"); + if (!(transfer_ctx = calloc(1, sizeof(*transfer_ctx)))) + return STATUS_NO_MEMORY; + transfer_ctx->irp = irp; + transfer_ctx->transfer_buffer = params->transfer_buffer; if (!(transfer = libusb_alloc_transfer(0))) return STATUS_NO_MEMORY; @@ -465,7 +480,7 @@ static NTSTATUS usb_submit_urb(void *args) LIBUSB_ENDPOINT_IN | LIBUSB_REQUEST_TYPE_STANDARD | LIBUSB_RECIPIENT_DEVICE, LIBUSB_REQUEST_GET_DESCRIPTOR, (req->DescriptorType << 8) | req->Index, req->LanguageId, req->TransferBufferLength); - libusb_fill_control_transfer(transfer, handle, buffer, transfer_cb, irp, 0); + libusb_fill_control_transfer(transfer, handle, buffer, transfer_cb, transfer_ctx, 0); transfer->flags = LIBUSB_TRANSFER_FREE_BUFFER | LIBUSB_TRANSFER_FREE_TRANSFER; ret = libusb_submit_transfer(transfer); if (ret < 0) @@ -498,16 +513,19 @@ static NTSTATUS usb_submit_urb(void *args) { struct _URB_CONTROL_VENDOR_OR_CLASS_REQUEST *req = &urb->UrbControlVendorClassRequest; uint8_t req_type = LIBUSB_REQUEST_TYPE_VENDOR | LIBUSB_RECIPIENT_INTERFACE; + struct transfer_ctx *transfer_ctx; unsigned char *buffer; + if (!(transfer_ctx = calloc(1, sizeof(*transfer_ctx)))) + return STATUS_NO_MEMORY; + transfer_ctx->irp = irp; + transfer_ctx->transfer_buffer = params->transfer_buffer; + if (req->TransferFlags & USBD_TRANSFER_DIRECTION_IN) req_type |= LIBUSB_ENDPOINT_IN; if (req->TransferFlags & ~USBD_TRANSFER_DIRECTION_IN) FIXME("Unhandled flags %#x.\n", (int)req->TransferFlags); - if (req->TransferBufferMDL) - FIXME("Unhandled MDL output buffer.\n"); - if (!(transfer = libusb_alloc_transfer(0))) return STATUS_NO_MEMORY; irp->Tail.Overlay.DriverContext[0] = transfer; @@ -521,8 +539,8 @@ static NTSTATUS usb_submit_urb(void *args) libusb_fill_control_setup(buffer, req_type, req->Request, req->Value, req->Index, req->TransferBufferLength); if (!(req->TransferFlags & USBD_TRANSFER_DIRECTION_IN)) - memcpy(buffer + LIBUSB_CONTROL_SETUP_SIZE, req->TransferBuffer, req->TransferBufferLength); - libusb_fill_control_transfer(transfer, handle, buffer, transfer_cb, irp, 0); + memcpy(buffer + LIBUSB_CONTROL_SETUP_SIZE, params->transfer_buffer, req->TransferBufferLength); + libusb_fill_control_transfer(transfer, handle, buffer, transfer_cb, transfer_ctx, 0); transfer->flags = LIBUSB_TRANSFER_FREE_BUFFER | LIBUSB_TRANSFER_FREE_TRANSFER; ret = libusb_submit_transfer(transfer); if (ret < 0) diff --git a/dlls/wineusb.sys/unixlib.h b/dlls/wineusb.sys/unixlib.h index eee16c8fc2b..3d27d3715c3 100644 --- a/dlls/wineusb.sys/unixlib.h +++ b/dlls/wineusb.sys/unixlib.h @@ -61,6 +61,7 @@ struct usb_submit_urb_params { struct unix_device *device; IRP *irp; + void *transfer_buffer; }; struct usb_cancel_transfer_params diff --git a/dlls/wineusb.sys/wineusb.c b/dlls/wineusb.sys/wineusb.c index 7848b31105e..9512ecc8d12 100644 --- a/dlls/wineusb.sys/wineusb.c +++ b/dlls/wineusb.sys/wineusb.c @@ -542,6 +542,39 @@ static NTSTATUS usb_submit_urb(struct usb_device *device, IRP *irp) .irp = irp, }; + switch (urb->UrbHeader.Function) + { + case URB_FUNCTION_BULK_OR_INTERRUPT_TRANSFER: + { + struct _URB_BULK_OR_INTERRUPT_TRANSFER *req = &urb->UrbBulkOrInterruptTransfer; + if (req->TransferBufferMDL) + params.transfer_buffer = MmGetSystemAddressForMdlSafe(req->TransferBufferMDL, NormalPagePriority); + else + params.transfer_buffer = req->TransferBuffer; + break; + } + + case URB_FUNCTION_GET_DESCRIPTOR_FROM_DEVICE: + { + struct _URB_CONTROL_DESCRIPTOR_REQUEST *req = &urb->UrbControlDescriptorRequest; + if (req->TransferBufferMDL) + params.transfer_buffer = MmGetSystemAddressForMdlSafe(req->TransferBufferMDL, NormalPagePriority); + else + params.transfer_buffer = req->TransferBuffer; + break; + } + + case URB_FUNCTION_VENDOR_INTERFACE: + { + struct _URB_CONTROL_VENDOR_OR_CLASS_REQUEST *req = &urb->UrbControlVendorClassRequest; + if (req->TransferBufferMDL) + params.transfer_buffer = MmGetSystemAddressForMdlSafe(req->TransferBufferMDL, NormalPagePriority); + else + params.transfer_buffer = req->TransferBuffer; + break; + } + } + /* Hold the wineusb lock while submitting and queuing, and * similarly hold it in complete_irp(). That way, if libusb reports * completion between submitting and queuing, we won't try to

1 0

Eric Pouech : wined3d: Enable long types in wined3d_main.c.
by Alexandre Julliard Dec. 5, 2022

Dec. 5, 2022

Module: wine Branch: master Commit: 47f280cae6f911411c448419bf57866e846e5c9b URL: https://gitlab.winehq.org/wine/wine/-/commit/47f280cae6f911411c448419bf5786… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Dec 3 09:59:18 2022 +0100 wined3d: Enable long types in wined3d_main.c. --- dlls/wined3d/wined3d_main.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 68114256cf1..bcaf1651db8 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -21,7 +21,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WINE_NO_LONG_TYPES /* temporary */ #define VKD3D_NO_VULKAN_H #define VKD3D_NO_WIN32_TYPES @@ -146,7 +145,7 @@ struct wined3d * CDECL wined3d_create(uint32_t flags) if (FAILED(hr = wined3d_init(object, flags))) { - WARN("Failed to initialize wined3d object, hr %#x.\n", hr); + WARN("Failed to initialize wined3d object, hr %#lx.\n", hr); heap_free(object); return NULL; } @@ -570,7 +569,7 @@ static struct wined3d_output * wined3d_get_output_from_window(const struct wined monitor_info.cbSize = sizeof(monitor_info); if (!GetMonitorInfoW(monitor, (MONITORINFO *)&monitor_info)) { - ERR("GetMonitorInfoW failed, error %#x.\n", GetLastError()); + ERR("GetMonitorInfoW failed, error %#lx.\n", GetLastError()); return NULL; }

1 0

Eric Pouech : wined3d: Reduce long integral type usage in wined3d_main.c.
by Alexandre Julliard Dec. 5, 2022

Dec. 5, 2022

Module: wine Branch: master Commit: 6e33aa220029a69d771acd6e6e2b05f092bc2f68 URL: https://gitlab.winehq.org/wine/wine/-/commit/6e33aa220029a69d771acd6e6e2b05… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Dec 3 09:59:17 2022 +0100 wined3d: Reduce long integral type usage in wined3d_main.c. --- dlls/wined3d/wined3d_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 2837503f574..68114256cf1 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -204,7 +204,7 @@ static DWORD get_config_key(HKEY defkey, HKEY appkey, const char *env, const cha return ERROR_FILE_NOT_FOUND; } -static DWORD get_config_key_dword(HKEY defkey, HKEY appkey, const char *env, const char *name, DWORD *value) +static DWORD get_config_key_dword(HKEY defkey, HKEY appkey, const char *env, const char *name, unsigned int *value) { DWORD type, data, size; const char *env_value; @@ -269,7 +269,7 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) const char *env; HKEY hkey = 0; HKEY appkey = 0; - DWORD tmpvalue; + unsigned int tmpvalue; WNDCLASSA wc; wined3d_context_tls_idx = TlsAlloc();

1 0

Eric Pouech : wined3d: Enable long types in ati_fragment_shader.c.
by Alexandre Julliard Dec. 5, 2022

Dec. 5, 2022

Module: wine Branch: master Commit: 9c06b575ba688a0f759eeafcaaeeb911d8191257 URL: https://gitlab.winehq.org/wine/wine/-/commit/9c06b575ba688a0f759eeafcaaeeb9… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Dec 3 09:59:15 2022 +0100 wined3d: Enable long types in ati_fragment_shader.c. --- dlls/wined3d/ati_fragment_shader.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index 2ef05c3c0f6..46fa5d4d64f 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -17,7 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WINE_NO_LONG_TYPES /* temporary */ #include <stdio.h> @@ -258,7 +257,7 @@ static void wrap_op3(const struct wined3d_gl_info *gl_info, GLuint op, GLuint ds } } -static GLuint register_for_arg(DWORD arg, const struct wined3d_gl_info *gl_info, +static GLuint register_for_arg(unsigned int arg, const struct wined3d_gl_info *gl_info, unsigned int stage, GLuint *mod, GLuint *rep, GLuint tmparg) { GLenum ret;

1 0

Eric Pouech : wined3d: Store GetLastError() into an unsigned int.
by Alexandre Julliard Dec. 5, 2022

Dec. 5, 2022

Module: wine Branch: master Commit: 13848df407825b49add53ee696a3387bffcb3800 URL: https://gitlab.winehq.org/wine/wine/-/commit/13848df407825b49add53ee696a338… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Dec 3 09:59:12 2022 +0100 wined3d: Store GetLastError() into an unsigned int. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/wined3d/adapter_gl.c | 2 +- dlls/wined3d/context_gl.c | 4 ++-- dlls/wined3d/wined3d_main.c | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 2d2867b638e..8353a10a87a 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -264,7 +264,7 @@ static void wined3d_caps_gl_ctx_destroy(const struct wined3d_caps_gl_ctx *ctx) if (!wglDeleteContext(ctx->gl_ctx)) { - DWORD err = GetLastError(); + unsigned int err = GetLastError(); ERR("wglDeleteContext(%p) failed, last error %#x.\n", ctx->gl_ctx, err); } diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 9ddcc9a40d2..689b76fe64e 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -1543,7 +1543,7 @@ static void wined3d_context_gl_cleanup(struct wined3d_context_gl *context_gl) if (!wglDeleteContext(context_gl->gl_ctx)) { - DWORD err = GetLastError(); + unsigned int err = GetLastError(); ERR("Failed to delete GL context %p, last error %#x.\n", context_gl->gl_ctx, err); } @@ -1615,7 +1615,7 @@ BOOL wined3d_context_gl_set_current(struct wined3d_context_gl *context_gl) TRACE("Clearing current D3D context.\n"); if (!wglMakeCurrent(NULL, NULL)) { - DWORD err = GetLastError(); + unsigned int err = GetLastError(); ERR("Failed to clear current GL context, last error %#x.\n", err); TlsSetValue(wined3d_context_tls_idx, NULL); return FALSE; diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index b52891c631e..2837503f574 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -275,7 +275,7 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) wined3d_context_tls_idx = TlsAlloc(); if (wined3d_context_tls_idx == TLS_OUT_OF_INDEXES) { - DWORD err = GetLastError(); + unsigned int err = GetLastError(); ERR("Failed to allocate context TLS index, err %#x.\n", err); return FALSE; } @@ -300,7 +300,7 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) ERR("Failed to register window class 'WineD3D_OpenGL'!\n"); if (!TlsFree(wined3d_context_tls_idx)) { - DWORD err = GetLastError(); + unsigned int err = GetLastError(); ERR("Failed to free context TLS index, err %#x.\n", err); } return FALSE; @@ -502,7 +502,7 @@ static BOOL wined3d_dll_destroy(HINSTANCE hInstDLL) if (!TlsFree(wined3d_context_tls_idx)) { - DWORD err = GetLastError(); + unsigned int err = GetLastError(); ERR("Failed to free context TLS index, err %#x.\n", err); }

1 0

Eric Pouech : wined3d: Transfer long types' enabling at file level.
by Alexandre Julliard Dec. 5, 2022

Dec. 5, 2022

Module: wine Branch: master Commit: a942b560525cc47275f34f32c80e147c10a5c8ab URL: https://gitlab.winehq.org/wine/wine/-/commit/a942b560525cc47275f34f32c80e14… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Dec 3 09:59:11 2022 +0100 wined3d: Transfer long types' enabling at file level. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/wined3d/Makefile.in | 1 - dlls/wined3d/adapter_gl.c | 1 + dlls/wined3d/adapter_vk.c | 1 + dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/ati_fragment_shader.c | 1 + dlls/wined3d/buffer.c | 1 + dlls/wined3d/context_gl.c | 1 + dlls/wined3d/cs.c | 1 + dlls/wined3d/device.c | 1 + dlls/wined3d/directx.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/nvidia_texture_shader.c | 1 + dlls/wined3d/palette.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm1.c | 1 + dlls/wined3d/shader_sm4.c | 1 + dlls/wined3d/state.c | 1 + dlls/wined3d/stateblock.c | 1 + dlls/wined3d/surface.c | 1 + dlls/wined3d/swapchain.c | 1 + dlls/wined3d/texture.c | 1 + dlls/wined3d/utils.c | 1 + dlls/wined3d/vertexdeclaration.c | 1 + dlls/wined3d/view.c | 1 + dlls/wined3d/wined3d_main.c | 1 + 25 files changed, 24 insertions(+), 1 deletion(-)

1 0