July 2019 - Wine-commits - list.winehq.org

Alexandre Julliard : kernel32: Move activation context functions to kernelbase.
by Alexandre Julliard 02 Jul '19

02 Jul '19

Module: wine Branch: master Commit: 5b5c5df676f53e7afadb364e3e772aa1d295478b URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b5c5df676f53e7afadb364e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 2 16:07:20 2019 +0200 kernel32: Move activation context functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/actctx.c | 186 ---------------------------------------- dlls/kernel32/kernel32.spec | 22 ++--- dlls/kernelbase/kernelbase.spec | 22 ++--- dlls/kernelbase/loader.c | 130 ++++++++++++++++++++++++++++ 4 files changed, 152 insertions(+), 208 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5b5c5df676f53e7afadb…

1 0

Hans Leidekker : ntdll: Fix sysfs path for the product name.
by Alexandre Julliard 02 Jul '19

02 Jul '19

Module: wine Branch: master Commit: bd8ce4c1b198697553b570777be7268ee3c2947f URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd8ce4c1b198697553b57077… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jul 2 15:28:33 2019 +0200 ntdll: Fix sysfs path for the product name. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/nt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 0dc06f9..2a2bd4f 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -2093,7 +2093,7 @@ static NTSTATUS get_firmware_info(SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULONG bios_version_len = get_smbios_string("/sys/class/dmi/id/bios_version", S(bios_version)); bios_date_len = get_smbios_string("/sys/class/dmi/id/bios_date", S(bios_date)); system_vendor_len = get_smbios_string("/sys/class/dmi/id/sys_vendor", S(system_vendor)); - system_product_len = get_smbios_string("/sys/class/dmi/id/product", S(system_product)); + system_product_len = get_smbios_string("/sys/class/dmi/id/product_name", S(system_product)); system_version_len = get_smbios_string("/sys/class/dmi/id/product_version", S(system_version)); system_serial_len = get_smbios_string("/sys/class/dmi/id/product_serial", S(system_serial)); board_vendor_len = get_smbios_string("/sys/class/dmi/id/board_vendor", S(board_vendor));

1 0

Hans Leidekker : ntdll: Use a common structure for the SMBIOS table entry header.
by Alexandre Julliard 02 Jul '19

02 Jul '19

Module: wine Branch: master Commit: 16e5c78bfe8d261be895a7806d2305b38d2ebc0f URL: https://source.winehq.org/git/wine.git/?a=commit;h=16e5c78bfe8d261be895a780… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jul 2 15:28:34 2019 +0200 ntdll: Use a common structure for the SMBIOS table entry header. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/nt.c | 42 ++++++++++++++++++++---------------------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 2a2bd4f..7cfe57c 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -79,10 +79,14 @@ struct smbios_prologue { DWORD length; }; -struct smbios_bios { +struct smbios_header { BYTE type; BYTE length; WORD handle; +}; + +struct smbios_bios { + struct smbios_header hdr; BYTE vendor; BYTE version; WORD start; @@ -92,9 +96,7 @@ struct smbios_bios { }; struct smbios_system { - BYTE type; - BYTE length; - WORD handle; + struct smbios_header hdr; BYTE vendor; BYTE product; BYTE version; @@ -102,9 +104,7 @@ struct smbios_system { }; struct smbios_board { - BYTE type; - BYTE length; - WORD handle; + struct smbios_header hdr; BYTE vendor; BYTE product; BYTE version; @@ -112,9 +112,7 @@ struct smbios_board { }; struct smbios_chassis { - BYTE type; - BYTE length; - WORD handle; + struct smbios_header hdr; BYTE vendor; BYTE shape; BYTE version; @@ -2139,9 +2137,9 @@ static NTSTATUS get_firmware_info(SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULONG string_count = 0; bios = (struct smbios_bios*)buffer; - bios->type = 0; - bios->length = sizeof(struct smbios_bios); - bios->handle = 0; + bios->hdr.type = 0; + bios->hdr.length = sizeof(struct smbios_bios); + bios->hdr.handle = 0; bios->vendor = bios_vendor_len ? ++string_count : 0; bios->version = bios_version_len ? ++string_count : 0; bios->start = 0; @@ -2158,9 +2156,9 @@ static NTSTATUS get_firmware_info(SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULONG string_count = 0; system = (struct smbios_system*)buffer; - system->type = 1; - system->length = sizeof(struct smbios_system); - system->handle = 0; + system->hdr.type = 1; + system->hdr.length = sizeof(struct smbios_system); + system->hdr.handle = 0; system->vendor = system_vendor_len ? ++string_count : 0; system->product = system_product_len ? ++string_count : 0; system->version = system_version_len ? ++string_count : 0; @@ -2176,9 +2174,9 @@ static NTSTATUS get_firmware_info(SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULONG string_count = 0; board = (struct smbios_board*)buffer; - board->type = 2; - board->length = sizeof(struct smbios_board); - board->handle = 0; + board->hdr.type = 2; + board->hdr.length = sizeof(struct smbios_board); + board->hdr.handle = 0; board->vendor = board_vendor_len ? ++string_count : 0; board->product = board_product_len ? ++string_count : 0; board->version = board_version_len ? ++string_count : 0; @@ -2194,9 +2192,9 @@ static NTSTATUS get_firmware_info(SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULONG string_count = 0; chassis = (struct smbios_chassis*)buffer; - chassis->type = 3; - chassis->length = sizeof(struct smbios_chassis); - chassis->handle = 0; + chassis->hdr.type = 3; + chassis->hdr.length = sizeof(struct smbios_chassis); + chassis->hdr.handle = 0; chassis->vendor = chassis_vendor_len ? ++string_count : 0; chassis->shape = 0x2; /* unknown */ chassis->version = chassis_version_len ? ++string_count : 0;

1 0

Hans Leidekker : ntdll: Use the machine ID for the system UUID on Linux.
by Alexandre Julliard 02 Jul '19

02 Jul '19

Module: wine Branch: master Commit: 5252d760035578226cf5239c03114493951eb31d URL: https://source.winehq.org/git/wine.git/?a=commit;h=5252d760035578226cf5239c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jul 2 15:28:35 2019 +0200 ntdll: Use the machine ID for the system UUID on Linux. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/nt.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 7cfe57c..b58c2d6 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -101,6 +101,7 @@ struct smbios_system { BYTE product; BYTE version; BYTE serial; + BYTE uuid[16]; }; struct smbios_board { @@ -2064,6 +2065,45 @@ static size_t get_smbios_string(const char *path, char *str, size_t size) return len; } +static void get_system_uuid( GUID *uuid ) +{ + static const unsigned char hex[] = + { + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x00 */ + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x10 */ + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x20 */ + 0,1,2,3,4,5,6,7,8,9,0,0,0,0,0,0, /* 0x30 */ + 0,10,11,12,13,14,15,0,0,0,0,0,0,0,0,0, /* 0x40 */ + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x50 */ + 0,10,11,12,13,14,15 /* 0x60 */ + }; + int fd; + + memset( uuid, 0xff, sizeof(*uuid) ); + if ((fd = open( "/var/lib/dbus/machine-id", O_RDONLY )) != -1) + { + unsigned char buf[32], *p = buf; + if (read( fd, buf, sizeof(buf) ) == sizeof(buf)) + { + uuid->Data1 = hex[p[6]] << 28 | hex[p[7]] << 24 | hex[p[4]] << 20 | hex[p[5]] << 16 | + hex[p[2]] << 12 | hex[p[3]] << 8 | hex[p[0]] << 4 | hex[p[1]]; + + uuid->Data2 = hex[p[10]] << 12 | hex[p[11]] << 8 | hex[p[8]] << 4 | hex[p[9]]; + uuid->Data3 = hex[p[14]] << 12 | hex[p[15]] << 8 | hex[p[12]] << 4 | hex[p[13]]; + + uuid->Data4[0] = hex[p[16]] << 4 | hex[p[17]]; + uuid->Data4[1] = hex[p[18]] << 4 | hex[p[19]]; + uuid->Data4[2] = hex[p[20]] << 4 | hex[p[21]]; + uuid->Data4[3] = hex[p[22]] << 4 | hex[p[23]]; + uuid->Data4[4] = hex[p[24]] << 4 | hex[p[25]]; + uuid->Data4[5] = hex[p[26]] << 4 | hex[p[27]]; + uuid->Data4[6] = hex[p[28]] << 4 | hex[p[29]]; + uuid->Data4[7] = hex[p[30]] << 4 | hex[p[31]]; + } + close( fd ); + } +} + static NTSTATUS get_firmware_info(SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULONG available_len, ULONG *required_len) { switch (sfti->ProviderSignature) @@ -2163,6 +2203,7 @@ static NTSTATUS get_firmware_info(SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULONG system->product = system_product_len ? ++string_count : 0; system->version = system_version_len ? ++string_count : 0; system->serial = system_serial_len ? ++string_count : 0; + get_system_uuid( (GUID *)system->uuid ); buffer += sizeof(struct smbios_system); copy_smbios_string(&buffer, system_vendor, system_vendor_len);

1 0

Jacek Caban : winedbg: Move continue_on_first_exception handling out of dbg_attach_debuggee.
by Alexandre Julliard 02 Jul '19

02 Jul '19

Module: wine Branch: master Commit: 136a0ac49b419af5510ec5c55d3a65e2cbe79d6a URL: https://source.winehq.org/git/wine.git/?a=commit;h=136a0ac49b419af5510ec5c5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 2 18:01:13 2019 +0200 winedbg: Move continue_on_first_exception handling out of dbg_attach_debuggee. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/dbg.y | 2 +- programs/winedbg/debugger.h | 2 +- programs/winedbg/stack.c | 2 +- programs/winedbg/tgt_active.c | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/programs/winedbg/dbg.y b/programs/winedbg/dbg.y index 6b080a5..126eef2 100644 --- a/programs/winedbg/dbg.y +++ b/programs/winedbg/dbg.y @@ -137,7 +137,7 @@ command: | tSYMBOLFILE pathname { symbol_read_symtable($2, 0); } | tSYMBOLFILE pathname expr_rvalue { symbol_read_symtable($2, $3); } | tWHATIS expr_lvalue { dbg_printf("type = "); types_print_type(&$2.type, FALSE); dbg_printf("\n"); } - | tATTACH tNUM { dbg_attach_debuggee($2, FALSE); dbg_active_wait_for_first_exception(); } + | tATTACH tNUM { dbg_attach_debuggee($2); dbg_active_wait_for_first_exception(); } | tDETACH { dbg_curr_process->process_io->close_process(dbg_curr_process, FALSE); } | tKILL { dbg_curr_process->process_io->close_process(dbg_curr_process, TRUE); } | tMINIDUMP pathname { minidump_write($2, (dbg_curr_thread && dbg_curr_thread->in_exception) ? &dbg_curr_thread->excpt_record : NULL);} diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index 490bd06..ee33ca0 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -431,7 +431,7 @@ extern enum dbg_start dbg_active_launch(int argc, char* argv[]); extern enum dbg_start dbg_active_auto(int argc, char* argv[]); extern enum dbg_start dbg_active_minidump(int argc, char* argv[]); extern void dbg_active_wait_for_first_exception(void); -extern BOOL dbg_attach_debuggee(DWORD pid, BOOL cofe); +extern BOOL dbg_attach_debuggee(DWORD pid); /* tgt_minidump.c */ extern void minidump_write(const char*, const EXCEPTION_RECORD*); diff --git a/programs/winedbg/stack.c b/programs/winedbg/stack.c index ed02c33..f76996d 100644 --- a/programs/winedbg/stack.c +++ b/programs/winedbg/stack.c @@ -412,7 +412,7 @@ static void backtrace_all(void) } else if (entry.th32OwnerProcessID != dbg_curr_pid) { - if (!dbg_attach_debuggee(entry.th32OwnerProcessID, FALSE)) + if (!dbg_attach_debuggee(entry.th32OwnerProcessID)) { dbg_printf("\nwarning: could not attach to %04x\n", entry.th32OwnerProcessID); diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index 5385d0e..f2ea753 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -71,7 +71,7 @@ static unsigned dbg_handle_debug_event(DEBUG_EVENT* de); * wfe is set to TRUE if dbg_attach_debuggee should also proceed with all debug events * until the first exception is received (aka: attach to an already running process) */ -BOOL dbg_attach_debuggee(DWORD pid, BOOL cofe) +BOOL dbg_attach_debuggee(DWORD pid) { if (!(dbg_curr_process = dbg_add_process(&be_process_active_io, pid, 0))) return FALSE; @@ -81,7 +81,6 @@ BOOL dbg_attach_debuggee(DWORD pid, BOOL cofe) dbg_del_process(dbg_curr_process); return FALSE; } - dbg_curr_process->continue_on_first_exception = cofe; SetEnvironmentVariableA("DBGHELP_NOLIVE", NULL); @@ -776,19 +775,20 @@ enum dbg_start dbg_active_attach(int argc, char* argv[]) /* try the form <myself> pid */ if (argc == 1 && str2int(argv[0], &pid) && pid != 0) { - if (!dbg_attach_debuggee(pid, FALSE)) + if (!dbg_attach_debuggee(pid)) return start_error_init; } /* try the form <myself> pid evt (Win32 JIT debugger) */ else if (argc == 2 && str2int(argv[0], &pid) && pid != 0 && str2int(argv[1], &evt) && evt != 0) { - if (!dbg_attach_debuggee(pid, TRUE)) + if (!dbg_attach_debuggee(pid)) { /* don't care about result */ SetEvent((HANDLE)evt); return start_error_init; } + dbg_curr_process->continue_on_first_exception = TRUE; if (!SetEvent((HANDLE)evt)) { WINE_ERR("Invalid event handle: %lx\n", evt);

1 0

Jacek Caban : winedbg: Set auto attach event after processing the first exception.
by Alexandre Julliard 02 Jul '19

02 Jul '19

Module: wine Branch: master Commit: 1bb98982d682a85b82e1496a2321daa043d8a6c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1bb98982d682a85b82e1496a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 2 18:02:30 2019 +0200 winedbg: Set auto attach event after processing the first exception. On Windows, the process is broken into by ordering an actual debug break execution in a new thread. We need to process this event before continuing exception handling in debuggee to avoid race. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/debugger.h | 4 ++-- programs/winedbg/tgt_active.c | 14 +++++--------- programs/winedbg/winedbg.c | 10 ++++++++-- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index ee33ca0..d8d7a69 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -235,8 +235,8 @@ struct dbg_process const WCHAR* imageName; struct list threads; struct backend_cpu* be_cpu; - BOOL continue_on_first_exception : 1, - active_debuggee : 1; + HANDLE event_on_first_exception; + BOOL active_debuggee; struct dbg_breakpoint bp[MAX_BREAKPOINTS]; unsigned next_bp; struct dbg_delayed_bp* delayed_bp; diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index f2ea753..71e0bc1 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -334,9 +334,11 @@ static unsigned dbg_handle_debug_event(DEBUG_EVENT* de) de->dwProcessId, de->dwThreadId, de->u.Exception.ExceptionRecord.ExceptionCode); - if (dbg_curr_process->continue_on_first_exception) + if (dbg_curr_process->event_on_first_exception) { - dbg_curr_process->continue_on_first_exception = FALSE; + SetEvent(dbg_curr_process->event_on_first_exception); + CloseHandle(dbg_curr_process->event_on_first_exception); + dbg_curr_process->event_on_first_exception = NULL; if (!DBG_IVAR(BreakOnAttach)) break; } if (dbg_fetch_context()) @@ -788,13 +790,7 @@ enum dbg_start dbg_active_attach(int argc, char* argv[]) SetEvent((HANDLE)evt); return start_error_init; } - dbg_curr_process->continue_on_first_exception = TRUE; - if (!SetEvent((HANDLE)evt)) - { - WINE_ERR("Invalid event handle: %lx\n", evt); - return start_error_init; - } - CloseHandle((HANDLE)evt); + dbg_curr_process->event_on_first_exception = (HANDLE)evt; } else return start_error_parse; diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index 92d248c..5dee3b7 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -312,7 +312,7 @@ struct dbg_process* dbg_add_process(const struct be_process_io* pio, DWORD pid, p->pio_data = NULL; p->imageName = NULL; list_init(&p->threads); - p->continue_on_first_exception = FALSE; + p->event_on_first_exception = NULL; p->active_debuggee = FALSE; p->next_bp = 1; /* breakpoint 0 is reserved for step-over */ memset(p->bp, 0, sizeof(p->bp)); @@ -372,6 +372,7 @@ void dbg_del_process(struct dbg_process* p) source_free_files(p); list_remove(&p->entry); if (p == dbg_curr_process) dbg_curr_process = NULL; + if (p->event_on_first_exception) CloseHandle(p->event_on_first_exception); HeapFree(GetProcessHeap(), 0, (char*)p->imageName); HeapFree(GetProcessHeap(), 0, p); } @@ -559,7 +560,12 @@ BOOL dbg_interrupt_debuggee(void) p = LIST_ENTRY(list_head(&dbg_process_list), struct dbg_process, entry); if (list_next(&dbg_process_list, &p->entry)) dbg_printf("Ctrl-C: only stopping the first process\n"); else dbg_printf("Ctrl-C: stopping debuggee\n"); - p->continue_on_first_exception = FALSE; + if (p->event_on_first_exception) + { + SetEvent(p->event_on_first_exception); + CloseHandle(p->event_on_first_exception); + p->event_on_first_exception = NULL; + } return DebugBreakProcess(p->handle); }

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to find_glsl_hull_shader().
by Alexandre Julliard 02 Jul '19

02 Jul '19

Module: wine Branch: master Commit: 62d6520fa678417aaaf282d61f60790583dfb4b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=62d6520fa678417aaaf282d6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 2 02:28:31 2019 +0430 wined3d: Pass a wined3d_context_gl structure to find_glsl_hull_shader(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 8023f7b..92a9586 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8533,10 +8533,9 @@ static GLuint find_glsl_vertex_shader(const struct wined3d_context_gl *context_g return ret; } -static GLuint find_glsl_hull_shader(const struct wined3d_context *context, +static GLuint find_glsl_hull_shader(const struct wined3d_context_gl *context_gl, struct shader_glsl_priv *priv, struct wined3d_shader *shader) { - const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); struct glsl_hs_compiled_shader *gl_shaders, *new_array; struct glsl_shader_private *shader_data; unsigned int new_size; @@ -10151,7 +10150,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const if (!(context->shader_update_mask & (1u << WINED3D_SHADER_TYPE_HULL)) && ctx_data->glsl_program) hs_id = ctx_data->glsl_program->hs.id; else if (hshader) - hs_id = find_glsl_hull_shader(context, priv, hshader); + hs_id = find_glsl_hull_shader(context_gl, priv, hshader); dshader = state->shader[WINED3D_SHADER_TYPE_DOMAIN]; if (!(context->shader_update_mask & (1u << WINED3D_SHADER_TYPE_DOMAIN)) && ctx_data->glsl_program)

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to find_glsl_domain_shader().
by Alexandre Julliard 02 Jul '19

02 Jul '19

Module: wine Branch: master Commit: 32dbfda4d5b1b67b10d144c80d8df5977464977a URL: https://source.winehq.org/git/wine.git/?a=commit;h=32dbfda4d5b1b67b10d144c8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 2 02:28:32 2019 +0430 wined3d: Pass a wined3d_context_gl structure to find_glsl_domain_shader(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 92a9586..a34de17 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8578,10 +8578,9 @@ static GLuint find_glsl_hull_shader(const struct wined3d_context_gl *context_gl, return ret; } -static GLuint find_glsl_domain_shader(const struct wined3d_context *context, +static GLuint find_glsl_domain_shader(const struct wined3d_context_gl *context_gl, struct shader_glsl_priv *priv, struct wined3d_shader *shader, const struct ds_compile_args *args) { - const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); struct glsl_ds_compiled_shader *gl_shaders, *new_array; struct glsl_shader_private *shader_data; unsigned int i, new_size; @@ -10162,7 +10161,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const struct ds_compile_args args; find_ds_compile_args(state, dshader, &args, context); - ds_id = find_glsl_domain_shader(context, priv, dshader, &args); + ds_id = find_glsl_domain_shader(context_gl, priv, dshader, &args); } gshader = state->shader[WINED3D_SHADER_TYPE_GEOMETRY];

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to find_glsl_geometry_shader().
by Alexandre Julliard 02 Jul '19

02 Jul '19

Module: wine Branch: master Commit: 9d7ca718e083894899fb1b48beec0ebb2407ddab URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d7ca718e083894899fb1b48… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 2 02:28:33 2019 +0430 wined3d: Pass a wined3d_context_gl structure to find_glsl_geometry_shader(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index a34de17..e6fe783 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8633,10 +8633,9 @@ static GLuint find_glsl_domain_shader(const struct wined3d_context_gl *context_g return ret; } -static GLuint find_glsl_geometry_shader(const struct wined3d_context *context, +static GLuint find_glsl_geometry_shader(const struct wined3d_context_gl *context_gl, struct shader_glsl_priv *priv, struct wined3d_shader *shader, const struct gs_compile_args *args) { - const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); struct glsl_gs_compiled_shader *gl_shaders, *new_array; struct glsl_shader_private *shader_data; unsigned int i, new_size; @@ -10174,7 +10173,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const struct gs_compile_args args; find_gs_compile_args(state, gshader, &args, context); - gs_id = find_glsl_geometry_shader(context, priv, gshader, &args); + gs_id = find_glsl_geometry_shader(context_gl, priv, gshader, &args); } /* A pixel shader is not used when rasterization is disabled. */

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to shader_glsl_generate_ffp_fragment_shader ().
by Alexandre Julliard 02 Jul '19

02 Jul '19

Module: wine Branch: master Commit: 3a2a176a7b03d345a531c55b53deb115d64869b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a2a176a7b03d345a531c55b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 2 02:28:34 2019 +0430 wined3d: Pass a wined3d_context_gl structure to shader_glsl_generate_ffp_fragment_shader(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e6fe783..ed3ff54 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -9362,13 +9362,13 @@ static void shader_glsl_ffp_fragment_op(struct wined3d_string_buffer *buffer, un /* Context activation is done by the caller. */ static GLuint shader_glsl_generate_ffp_fragment_shader(struct shader_glsl_priv *priv, - const struct ffp_frag_settings *settings, const struct wined3d_context *context) + const struct ffp_frag_settings *settings, const struct wined3d_context_gl *context_gl) { struct wined3d_string_buffer *tex_reg_name = string_buffer_get(&priv->string_buffers); enum wined3d_cmp_func alpha_test_func = settings->alpha_test_func + 1; struct wined3d_string_buffer *buffer = &priv->shader_buffer; BYTE lum_map = 0, bump_map = 0, tex_map = 0, tss_const_map = 0; - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; const BOOL legacy_syntax = needs_legacy_glsl_syntax(gl_info); BOOL tempreg_used = FALSE, tfactor_used = FALSE; UINT lowest_disabled_stage; @@ -9497,7 +9497,7 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct shader_glsl_priv * if (sampler_type) { if (shader_glsl_use_layout_binding_qualifier(gl_info)) - shader_glsl_append_sampler_binding_qualifier(buffer, context, NULL, stage); + shader_glsl_append_sampler_binding_qualifier(buffer, &context_gl->c, NULL, stage); shader_addline(buffer, "uniform sampler%s ps_sampler%u;\n", sampler_type, stage); } @@ -9795,6 +9795,7 @@ static struct glsl_ffp_vertex_shader *shader_glsl_find_ffp_vertex_shader(struct static struct glsl_ffp_fragment_shader *shader_glsl_find_ffp_fragment_shader(struct shader_glsl_priv *priv, const struct ffp_frag_settings *args, const struct wined3d_context *context) { + const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); struct glsl_ffp_fragment_shader *glsl_desc; const struct ffp_frag_desc *desc; @@ -9805,7 +9806,7 @@ static struct glsl_ffp_fragment_shader *shader_glsl_find_ffp_fragment_shader(str return NULL; glsl_desc->entry.settings = *args; - glsl_desc->id = shader_glsl_generate_ffp_fragment_shader(priv, args, context); + glsl_desc->id = shader_glsl_generate_ffp_fragment_shader(priv, args, context_gl); list_init(&glsl_desc->linked_programs); add_ffp_frag_shader(&priv->ffp_fragment_shaders, &glsl_desc->entry);

1 0