wine-devel October 2021

wine-devel@winehq.org

81 participants
772 discussions

[PATCH 1/2] ws2_32: Validate pointers in select().
by Torge Matthies 17 Oct '21

17 Oct '21

The documentation says that SOCKET_ERROR is returned and the error is set to WSAEFAULT if any of the input pointers point to unmapped memory. Signed-off-by: Torge Matthies <openglfreak(a)googlemail.com> --- dlls/ws2_32/socket.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index b3dab22ae6e..1238f34aa1c 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2384,6 +2384,15 @@ int WINAPI select( int count, fd_set *read_ptr, fd_set *write_ptr, TRACE( "read %p, write %p, except %p, timeout %p\n", read_ptr, write_ptr, except_ptr, timeout ); + if ((read_ptr && IsBadWritePtr(read_ptr, sizeof(*read_ptr))) + || (write_ptr && IsBadWritePtr(write_ptr, sizeof(*write_ptr))) + || (except_ptr && IsBadWritePtr(except_ptr, sizeof(*except_ptr))) + || (timeout && IsBadReadPtr(timeout, sizeof(*timeout)))) + { + SetLastError( WSAEFAULT ); + return -1; + } + FD_ZERO( &read ); FD_ZERO( &write ); FD_ZERO( &except ); -- 2.33.1

2 3

[PATCH] winedbg: use heap allocation for module filenames in handle_debug_event.
by Jinoh Kang 17 Oct '21

17 Oct '21

Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- programs/winedbg/gdbproxy.c | 41 ++++++++++++++++++++++--------------- 1 file changed, 25 insertions(+), 16 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 522e4fdb506..ae1bfac8826 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -396,10 +396,8 @@ static BOOL handle_debug_event(struct gdb_context* gdbctx, BOOL stop_on_dll_load DEBUG_EVENT *de = &gdbctx->de; struct dbg_thread *thread; - union { - char bufferA[256]; - WCHAR buffer[256]; - } u; + char bufferA[512]; + LPWSTR name; DWORD size; gdbctx->exec_tid = de->dwThreadId; @@ -414,44 +412,55 @@ static BOOL handle_debug_event(struct gdb_context* gdbctx, BOOL stop_on_dll_load if (!gdbctx->process) return TRUE; - size = ARRAY_SIZE(u.buffer); - QueryFullProcessImageNameW( gdbctx->process->handle, 0, u.buffer, &size ); - dbg_set_process_name(gdbctx->process, u.buffer); + size = UNICODE_STRING_MAX_CHARS + 1UL; + name = HeapAlloc(GetProcessHeap(), HEAP_GENERATE_EXCEPTIONS, sizeof(WCHAR) * size); + if (!QueryFullProcessImageNameW( gdbctx->process->handle, 0, name, &size )) + { + size = 0; + name[size] = L'\0'; + } + + dbg_set_process_name(gdbctx->process, name); fprintf(stderr, "%04x:%04x: create process '%s'/%p @%p (%u<%u>)\n", de->dwProcessId, de->dwThreadId, - dbg_W2A(u.buffer, -1), + dbg_W2A(name, -1), de->u.CreateProcessInfo.lpImageName, de->u.CreateProcessInfo.lpStartAddress, de->u.CreateProcessInfo.dwDebugInfoFileOffset, de->u.CreateProcessInfo.nDebugInfoSize); /* de->u.CreateProcessInfo.lpStartAddress; */ - if (!dbg_init(gdbctx->process->handle, u.buffer, TRUE)) + if (!dbg_init(gdbctx->process->handle, name, TRUE)) ERR("Couldn't initiate DbgHelp\n"); fprintf(stderr, "%04x:%04x: create thread I @%p\n", de->dwProcessId, de->dwThreadId, de->u.CreateProcessInfo.lpStartAddress); - dbg_load_module(gdbctx->process->handle, de->u.CreateProcessInfo.hFile, u.buffer, + dbg_load_module(gdbctx->process->handle, de->u.CreateProcessInfo.hFile, name, (DWORD_PTR)de->u.CreateProcessInfo.lpBaseOfImage, 0); dbg_add_thread(gdbctx->process, de->dwThreadId, de->u.CreateProcessInfo.hThread, de->u.CreateProcessInfo.lpThreadLocalBase); + + HeapFree(GetProcessHeap(), 0, name); + return TRUE; case LOAD_DLL_DEBUG_EVENT: - fetch_module_name( de->u.LoadDll.lpImageName, de->u.LoadDll.lpBaseOfDll, - u.buffer, ARRAY_SIZE(u.buffer) ); + size = UNICODE_STRING_MAX_CHARS + 1UL; + name = HeapAlloc(GetProcessHeap(), HEAP_GENERATE_EXCEPTIONS, sizeof(WCHAR) * size); + fetch_module_name( de->u.LoadDll.lpImageName, de->u.LoadDll.lpBaseOfDll, name, size ); fprintf(stderr, "%04x:%04x: loads DLL %s @%p (%u<%u>)\n", de->dwProcessId, de->dwThreadId, - dbg_W2A(u.buffer, -1), + dbg_W2A(name, size), de->u.LoadDll.lpBaseOfDll, de->u.LoadDll.dwDebugInfoFileOffset, de->u.LoadDll.nDebugInfoSize); - dbg_load_module(gdbctx->process->handle, de->u.LoadDll.hFile, u.buffer, + dbg_load_module(gdbctx->process->handle, de->u.LoadDll.hFile, name, (DWORD_PTR)de->u.LoadDll.lpBaseOfDll, 0); + HeapFree(GetProcessHeap(), 0, name); if (stop_on_dll_load_unload) break; return TRUE; @@ -501,9 +510,9 @@ static BOOL handle_debug_event(struct gdb_context* gdbctx, BOOL stop_on_dll_load case OUTPUT_DEBUG_STRING_EVENT: memory_get_string(gdbctx->process, de->u.DebugString.lpDebugStringData, TRUE, - de->u.DebugString.fUnicode, u.bufferA, sizeof(u.bufferA)); + de->u.DebugString.fUnicode, bufferA, sizeof(bufferA)); fprintf(stderr, "%08x:%08x: output debug string (%s)\n", - de->dwProcessId, de->dwThreadId, debugstr_a(u.bufferA)); + de->dwProcessId, de->dwThreadId, debugstr_a(bufferA)); return TRUE; case RIP_EVENT: -- 2.31.1

1 0

[PATCH] winedbg: set reuseaddr flag for gdb remote socket.
by Jinoh Kang 17 Oct '21

17 Oct '21

Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- programs/winedbg/gdbproxy.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 522e4fdb506..71076204de3 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -2146,6 +2146,7 @@ static BOOL gdb_exec(unsigned port, unsigned flags) static BOOL gdb_startup(struct gdb_context* gdbctx, unsigned flags, unsigned port) { SOCKET sock; + int reuseaddr = 1; struct sockaddr_in s_addrs = {0}; int s_len = sizeof(s_addrs); fd_set read_fds; @@ -2161,6 +2162,8 @@ static BOOL gdb_startup(struct gdb_context* gdbctx, unsigned flags, unsigned por return FALSE; } + setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (char*)&reuseaddr, sizeof(reuseaddr)); + s_addrs.sin_family = AF_INET; s_addrs.sin_addr.S_un.S_addr = INADDR_ANY; s_addrs.sin_port = htons(port); -- 2.31.1

1 0

[PATCH] winedbg: report current thread ID to GDB for all stop replies.
by Jinoh Kang 17 Oct '21

17 Oct '21

Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- programs/winedbg/gdbproxy.c | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 522e4fdb506..a4f5bd1387e 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -867,6 +867,22 @@ static void packet_reply_status_xpoints(struct gdb_context* gdbctx, struct dbg_t } } +static void packet_reply_begin_stop_reply(struct gdb_context* gdbctx, unsigned char signal) +{ + packet_reply_add(gdbctx, "T"); + packet_reply_val(gdbctx, signal, 1); + + /* We should always report the current thread ID for all stop replies. + * Otherwise, GDB complains with the following message: + * + * Warning: multi-threaded target stopped without sending a thread-id, + * using first non-exited thread + */ + packet_reply_add(gdbctx, "thread:"); + packet_reply_val(gdbctx, gdbctx->de.dwThreadId, 4); + packet_reply_add(gdbctx, ";"); +} + static enum packet_return packet_reply_status(struct gdb_context* gdbctx) { struct dbg_process *process = gdbctx->process; @@ -885,11 +901,7 @@ static enum packet_return packet_reply_status(struct gdb_context* gdbctx) return packet_error; packet_reply_open(gdbctx); - packet_reply_add(gdbctx, "T"); - packet_reply_val(gdbctx, signal_from_debug_event(&gdbctx->de), 1); - packet_reply_add(gdbctx, "thread:"); - packet_reply_val(gdbctx, gdbctx->de.dwThreadId, 4); - packet_reply_add(gdbctx, ";"); + packet_reply_begin_stop_reply(gdbctx, signal_from_debug_event(&gdbctx->de)); packet_reply_status_xpoints(gdbctx, thread, &ctx); for (i = 0; i < backend->gdb_num_regs; i++) @@ -913,8 +925,7 @@ static enum packet_return packet_reply_status(struct gdb_context* gdbctx) case LOAD_DLL_DEBUG_EVENT: case UNLOAD_DLL_DEBUG_EVENT: packet_reply_open(gdbctx); - packet_reply_add(gdbctx, "T"); - packet_reply_val(gdbctx, HOST_SIGTRAP, 1); + packet_reply_begin_stop_reply(gdbctx, HOST_SIGTRAP); packet_reply_add(gdbctx, "library:;"); packet_reply_close(gdbctx); return packet_done; -- 2.31.1

1 0

[RFC PATCH v3 0/7] gdi32/win32u: Enhanced Metafile generation enhancements
by Jinoh Kang 17 Oct '21

17 Oct '21

The following commits modify the behaviours of the following GDI functions: - StretchDIBits - SetDIBitsToDevice To match more closely to that of Windows 10, build 2108, subject to the following constraints: - The source image is not a JPEG (BI_JPEG) or a PNG (BI_PNG) image. - The source image is a *bottom-up* device-independent bitmap. Changelog: - v1 -> v2: add more tests, do extra work so that EMF outputs match - v2 -> v3: emf_parse_user_bitmapinfo: zero out *dst (BITMAPINFOHEADER) (gdi32: allow passing BITMAPINFO with bmiHeader.biSizeImage == 0 for EMF DC.) Jinoh Kang (7): gdi32/tests: Add tests for recording StretchDIBits in EMFs. gdi32/tests: Add tests for recording SetDIBitsToDevice in EMFs. win32u: fix return value of StretchDIBits for EMF DC. win32u: fix return value of SetDIBitsToDevice for EMF DC. gdi32: fix bounding box calculation for EMR_STRETCHDIBITS. gdi32: allow passing BITMAPINFO with bmiHeader.biSizeImage == 0 for EMF DC. gdi32: calculate effective number of scan lines and truncate bitmap bits for EMR_SETDIBITSTODEVICE. dlls/gdi32/emfdc.c | 224 ++- dlls/gdi32/tests/metafile.c | 2803 +++++++++++++++++++++++++++++++++++ dlls/win32u/emfdrv.c | 11 +- 3 files changed, 3019 insertions(+), 19 deletions(-) -- 2.31.1

1 3

[RFC PATCH] gdi32: allow passing BITMAPINFO with bmiHeader.biSizeImage == 0 for EMF DC.
by Jinoh Kang 16 Oct '21

16 Oct '21

User-facing APIs should accept biSizeImage == 0, and fix it up accordingly. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51834 Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- Some more testing is needed, particularly for when biSizeImage is set to a non-zero _but_ invalid value. dlls/gdi32/emfdc.c | 44 +++++++++++++++++++++++++++++++++------- dlls/gdi32/gdi_private.h | 7 +++++++ 2 files changed, 44 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/emfdc.c b/dlls/gdi32/emfdc.c index a1c7eb74fd5..0422d6ac9f5 100644 --- a/dlls/gdi32/emfdc.c +++ b/dlls/gdi32/emfdc.c @@ -185,6 +185,32 @@ err: return 0; } +static UINT get_user_dib_image_size( const BITMAPINFO *info ) +{ + UINT size; + + if (info->bmiHeader.biCompression != BI_RGB) + { + /* compressed image -- always trust biSizeImage */ + return info->bmiHeader.biSizeImage; + } + + size = get_dib_image_size( info ); + + /* biSizeImage can be zero if biCompression == BI_RGB */ + if (info->bmiHeader.biSizeImage) + { + if (info->bmiHeader.biSizeImage < size) + TRACE( "biSizeImage (%u) smaller than calculated size (%u)", + info->bmiHeader.biSizeImage, + size ); + else + size = info->bmiHeader.biSizeImage; /* FIXME */ + } + + return size; +} + static UINT emfdc_add_handle( struct emf *emf, HGDIOBJ obj ) { UINT index; @@ -1602,19 +1628,22 @@ BOOL EMFDC_StretchDIBits( DC_ATTR *dc_attr, INT x_dst, INT y_dst, INT width_dst, { EMRSTRETCHDIBITS *emr; BOOL ret; - UINT bmi_size, emr_size; + UINT bmi_size, emr_size, img_size; /* calculate the size of the colour table */ bmi_size = get_dib_info_size( info, usage ); - emr_size = sizeof (EMRSTRETCHDIBITS) + bmi_size + info->bmiHeader.biSizeImage; + /* obtain the size of the image */ + img_size = get_user_dib_image_size( info ); + + emr_size = sizeof (EMRSTRETCHDIBITS) + bmi_size + img_size; if (!(emr = HeapAlloc(GetProcessHeap(), 0, emr_size ))) return 0; /* write a bitmap info header (with colours) to the record */ memcpy( &emr[1], info, bmi_size); /* write bitmap bits to the record */ - memcpy ( (BYTE *)&emr[1] + bmi_size, bits, info->bmiHeader.biSizeImage ); + memcpy ( (BYTE *)&emr[1] + bmi_size, bits, img_size ); /* fill in the EMR header at the front of our piece of memory */ emr->emr.iType = EMR_STRETCHDIBITS; @@ -1632,7 +1661,7 @@ BOOL EMFDC_StretchDIBits( DC_ATTR *dc_attr, INT x_dst, INT y_dst, INT width_dst, emr->offBmiSrc = sizeof (EMRSTRETCHDIBITS); emr->cbBmiSrc = bmi_size; emr->offBitsSrc = emr->offBmiSrc + bmi_size; - emr->cbBitsSrc = info->bmiHeader.biSizeImage; + emr->cbBitsSrc = img_size; emr->cxSrc = width_src; emr->cySrc = height_src; @@ -1655,7 +1684,8 @@ BOOL EMFDC_SetDIBitsToDevice( DC_ATTR *dc_attr, INT x_dst, INT y_dst, DWORD widt { EMRSETDIBITSTODEVICE *emr; DWORD bmiSize = get_dib_info_size( info, usage ); - DWORD size = sizeof(EMRSETDIBITSTODEVICE) + bmiSize + info->bmiHeader.biSizeImage; + DWORD imgSize = get_user_dib_image_size( info ); + DWORD size = sizeof(EMRSETDIBITSTODEVICE) + bmiSize + imgSize; BOOL ret; if (!(emr = HeapAlloc( GetProcessHeap(), 0, size ))) return FALSE; @@ -1675,12 +1705,12 @@ BOOL EMFDC_SetDIBitsToDevice( DC_ATTR *dc_attr, INT x_dst, INT y_dst, DWORD widt emr->offBmiSrc = sizeof(EMRSETDIBITSTODEVICE); emr->cbBmiSrc = bmiSize; emr->offBitsSrc = sizeof(EMRSETDIBITSTODEVICE) + bmiSize; - emr->cbBitsSrc = info->bmiHeader.biSizeImage; + emr->cbBitsSrc = imgSize; emr->iUsageSrc = usage; emr->iStartScan = startscan; emr->cScans = lines; memcpy( (BYTE*)emr + emr->offBmiSrc, info, bmiSize ); - memcpy( (BYTE*)emr + emr->offBitsSrc, bits, info->bmiHeader.biSizeImage ); + memcpy( (BYTE*)emr + emr->offBitsSrc, bits, imgSize ); if ((ret = emfdc_record( dc_attr->emf, (EMR*)emr ))) emfdc_update_bounds( dc_attr->emf, &emr->rclBounds ); diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 45bd5431a23..72e9ca165b5 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -24,6 +24,7 @@ #include <stdarg.h> #include <limits.h> +#include <stdlib.h> #include "windef.h" #include "winbase.h" @@ -291,6 +292,12 @@ static inline int get_dib_stride( int width, int bpp ) return ((width * bpp + 31) >> 3) & ~3; } +static inline int get_dib_image_size( const BITMAPINFO *info ) +{ + return get_dib_stride( info->bmiHeader.biWidth, info->bmiHeader.biBitCount ) + * abs( info->bmiHeader.biHeight ); +} + /* only for use on sanitized BITMAPINFO structures */ static inline int get_dib_info_size( const BITMAPINFO *info, UINT coloruse ) { -- 2.31.1

3 17

[PATCH 2/2] imm32: Only call ImmSetActiveContext for focused window in ImmAssociateContext.
by Piotr Caban 16 Oct '21

16 Oct '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/imm32/imm.c | 2 +- dlls/imm32/tests/imm32.c | 18 +++++++++++++++++- 2 files changed, 18 insertions(+), 2 deletions(-)

1 0

[PATCH 1/2] user32: Set IMM active context on focus change.
by Piotr Caban 16 Oct '21

16 Oct '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/imm32/tests/imm32.c | 11 +++++++++-- dlls/user32/focus.c | 13 ++++++++++++- dlls/user32/misc.c | 30 ++++++++++++++++++++++++++++++ dlls/user32/user_private.h | 3 +++ 4 files changed, 54 insertions(+), 3 deletions(-)

1 0

Can I install Vegas Movie Studio 18 Platinum using WINE and edit and render 8K Ultra HD videos on Linux desktops?
by Turritopsis Dohrnii Teo En Ming 16 Oct '21

16 Oct '21

Subject: Can I install Vegas Movie Studio 18 Platinum using WINE and edit and render 8K Ultra HD videos on Linux desktops? Good day from Singapore, Can I install Vegas Movie Studio 18 Platinum using WINE and edit and render 8K Ultra HD videos on Linux desktops? I am interested in Vegas Movie Studio 18 Platinum because it has 8K support. The official website says: "In Movie Studio (Platinum & Suite) you can edit and preview 8K videos smoothly.". What is keeping me from fully migrating over to Linux desktops is that non-linear video editing software only run on Windows desktops. Even if I can install Vegas Movie Studio 18 Platinum using WINE, does it support GPU acceleration? GPU acceleration is extremely important if you want to edit and render 8K videos. You would also need a very high-end PCI Express x16 GPU graphics card to edit and render 8K videos. I am looking forward to your reply. Thank you very much. Mr. Turritopsis Dohrnii Teo En Ming, 43 years old as of 16 Oct 2021, is a TARGETED INDIVIDUAL living in Singapore. He is an IT Consultant with a Systems Integrator (SI)/computer firm in Singapore. He is an IT enthusiast. -----BEGIN EMAIL SIGNATURE----- The Gospel for all Targeted Individuals (TIs): [The New York Times] Microwave Weapons Are Prime Suspect in Ills of U.S. Embassy Workers Link: https://www.nytimes.com/2018/09/01/science/sonic-attack-cuba-microwave.html ******************************************************************************************** Singaporean Targeted Individual Mr. Turritopsis Dohrnii Teo En Ming's Academic Qualifications as at 14 Feb 2019 and refugee seeking attempts at the United Nations Refugee Agency Bangkok (21 Mar 2017), in Taiwan (5 Aug 2019) and Australia (25 Dec 2019 to 9 Jan 2020): [1] https://tdtemcerts.wordpress.com/ [2] https://tdtemcerts.blogspot.sg/ [3] https://www.scribd.com/user/270125049/Teo-En-Ming -----END EMAIL SIGNATURE-----

1 0

[PATCH 01/10] d3d10/effect: Do not use internal value types.
by Nikolay Sivov 16 Oct '21

16 Oct '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10/d3d10_private.h | 13 ------------ dlls/d3d10/effect.c | 42 ++++++++++++++++++-------------------- 2 files changed, 20 insertions(+), 35 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index e5659507eeb..11b3b4e9482 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -40,19 +40,6 @@ */ #define D3DERR_INVALIDCALL 0x8876086c -enum d3d10_effect_object_type -{ - D3D10_EOT_RASTERIZER_STATE = 0x0, - D3D10_EOT_DEPTH_STENCIL_STATE = 0x1, - D3D10_EOT_BLEND_STATE = 0x2, - D3D10_EOT_VERTEXSHADER = 0x6, - D3D10_EOT_PIXELSHADER = 0x7, - D3D10_EOT_GEOMETRYSHADER = 0x8, - D3D10_EOT_STENCIL_REF = 0x9, - D3D10_EOT_BLEND_FACTOR = 0xa, - D3D10_EOT_SAMPLE_MASK = 0xb, -}; - enum d3d10_effect_object_type_flags { D3D10_EOT_FLAG_GS_SO = 0x1, diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 71ad3f64a05..bd104465222 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1485,36 +1485,34 @@ static HRESULT parse_fx10_annotations(const char *data, size_t data_size, const return hr; } -static HRESULT parse_fx10_anonymous_shader(struct d3d10_effect *e, struct d3d10_effect_anonymous_shader *s, - enum d3d10_effect_object_type otype) +static HRESULT parse_fx10_anonymous_shader(struct d3d10_effect *e, D3D_SHADER_VARIABLE_TYPE basetype, + struct d3d10_effect_anonymous_shader *s) { struct d3d10_effect_variable *v = &s->shader; struct d3d10_effect_type *t = &s->type; - const char *shader = NULL; + const char *name = NULL; - switch (otype) + switch (basetype) { - case D3D10_EOT_VERTEXSHADER: - shader = "vertexshader"; - t->basetype = D3D10_SVT_VERTEXSHADER; + case D3D10_SVT_VERTEXSHADER: + name = "vertexshader"; break; - case D3D10_EOT_PIXELSHADER: - shader = "pixelshader"; - t->basetype = D3D10_SVT_PIXELSHADER; + case D3D10_SVT_PIXELSHADER: + name = "pixelshader"; break; - case D3D10_EOT_GEOMETRYSHADER: - shader = "geometryshader"; - t->basetype = D3D10_SVT_GEOMETRYSHADER; + case D3D10_SVT_GEOMETRYSHADER: + name = "geometryshader"; break; default: - FIXME("Unhandled object type %#x.\n", otype); + WARN("Unhandled shader type %#x.\n", basetype); return E_FAIL; } + t->basetype = basetype; - if (!copy_name(shader, &t->name)) + if (!copy_name(name, &t->name)) { ERR("Failed to copy name.\n"); return E_OUTOFMEMORY; @@ -1918,8 +1916,8 @@ static HRESULT parse_fx10_property_assignment(const char *data, size_t data_size TRACE("Effect object starts at offset %#x.\n", value_offset); - if (FAILED(hr = parse_fx10_anonymous_shader(effect, - &effect->anonymous_shaders[effect->anonymous_shader_current], property_info->id))) + if (FAILED(hr = parse_fx10_anonymous_shader(effect, property_info->type, + &effect->anonymous_shaders[effect->anonymous_shader_current]))) return hr; variable = &effect->anonymous_shaders[effect->anonymous_shader_current].shader; @@ -1938,17 +1936,17 @@ static HRESULT parse_fx10_property_assignment(const char *data, size_t data_size TRACE("Stream output declaration: %s.\n", debugstr_a(variable->u.shader.stream_output_declaration)); } - switch (property_info->id) + switch (property_info->type) { - case D3D10_EOT_VERTEXSHADER: - case D3D10_EOT_PIXELSHADER: - case D3D10_EOT_GEOMETRYSHADER: + case D3D10_SVT_VERTEXSHADER: + case D3D10_SVT_PIXELSHADER: + case D3D10_SVT_GEOMETRYSHADER: if (FAILED(hr = parse_fx10_shader(data, data_size, value_offset, variable))) return hr; break; default: - FIXME("Unhandled object type %#x\n", property_info->id); + WARN("Unexpected shader type %#x.\n", property_info->type); return E_FAIL; } -- 2.33.0

3 23

← Newer
1
...
31
32
33
34
35
36
37
...
78
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-devel October 2021