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

Alexandre Julliard : kernelbase: Forward functions directly to ntdll where possible.
by Alexandre Julliard July 2, 2019

July 2, 2019

Module: wine Branch: master Commit: 1f6808f49451cd985c43ec18dc04c1101a9441bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f6808f49451cd985c43ec18… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 2 15:16:02 2019 +0200 kernelbase: Forward functions directly to ntdll where possible. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/kernelbase.spec | 130 ++++++++++++++++++++-------------------- tools/make_specfiles | 2 +- 2 files changed, 66 insertions(+), 66 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1f6808f49451cd985c43…

1 0

Alexandre Julliard : wpp: Get rid of the no longer needed callbacks.
by Alexandre Julliard July 2, 2019

July 2, 2019

Module: wine Branch: master Commit: 918723186b2f55d6fd5778caa88054e7e17ab504 URL: https://source.winehq.org/git/wine.git/?a=commit;h=918723186b2f55d6fd5778ca… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 2 13:49:37 2019 +0200 wpp: Get rid of the no longer needed callbacks. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/wpp.h | 25 ---------------------- libs/wpp/ppl.l | 8 +++---- libs/wpp/preproc.c | 58 +++++++------------------------------------------- libs/wpp/wpp.c | 10 ++------- libs/wpp/wpp_private.h | 2 ++ 5 files changed, 16 insertions(+), 87 deletions(-) diff --git a/include/wine/wpp.h b/include/wine/wpp.h index ac180be..0343099 100644 --- a/include/wine/wpp.h +++ b/include/wine/wpp.h @@ -24,30 +24,6 @@ #include <stdio.h> #include <stdarg.h> -struct wpp_callbacks -{ - /* I/O callbacks */ - - /* Looks for a file to include, returning the path where it is found */ - /* The type param is true for local (#include "filename.h") includes */ - /* parent_name is the directory of the parent source file, includepath - * is an array of additional include paths */ - char *(*lookup)( const char *filename, int type, const char *parent_name, - char **include_path, int include_path_count ); - /* Opens an include file */ - void *(*open)( const char *filename, int type ); - /* Closes a previously opened file */ - void (*close)( void *file ); - /* Reads buffer from the input */ - int (*read)( void *file, char *buffer, unsigned int len ); - /* Writes buffer to the output */ - void (*write)( const char *buffer, unsigned int len ); - - /* Error callbacks */ - void (*error)( const char *file, int line, int col, const char *near, const char *msg, va_list ap ); - void (*warning)( const char *file, int line, int col, const char *near, const char *msg, va_list ap ); -}; - /* Return value == 0 means successful execution */ extern int wpp_add_define( const char *name, const char *value ); extern void wpp_del_define( const char *name ); @@ -57,6 +33,5 @@ extern void wpp_set_pedantic( int on ); extern int wpp_add_include_path( const char *path ); extern char *wpp_find_include( const char *name, const char *parent_name ); extern int wpp_parse( const char *input, FILE *output ); -extern void wpp_set_callbacks( const struct wpp_callbacks *callbacks ); #endif /* __WINE_WPP_H */ diff --git a/libs/wpp/ppl.l b/libs/wpp/ppl.l index 0a3768b..4fd12c6 100644 --- a/libs/wpp/ppl.l +++ b/libs/wpp/ppl.l @@ -306,7 +306,7 @@ includelogicentry_t *pp_includelogiclist = NULL; #define YY_INPUT(buf,result,max_size) \ { \ - result = wpp_callbacks->read(pp_status.file, buf, max_size); \ + result = fread(buf, 1, max_size, pp_status.file); \ } #define BUFFERINITIALCAPACITY 256 @@ -353,7 +353,7 @@ void pp_writestring(const char *format, ...) va_end(valist); } - wpp_callbacks->write(buffer, len); + fwrite(buffer, 1, len, ppy_out); } %} @@ -1340,7 +1340,7 @@ static bufferstackentry_t *pop_buffer(void) if(!bufferstack[bufferstackidx].should_pop) { - wpp_callbacks->close(pp_status.file); + fclose(pp_status.file); pp_writestring("# %d \"%s\" 2\n", bufferstack[bufferstackidx].line_number, bufferstack[bufferstackidx].filename); /* We have EOF, check the include logic */ @@ -1561,7 +1561,7 @@ static void put_buffer(const char *s, int len) if(top_macro()) add_text_to_macro(s, len); else - wpp_callbacks->write(s, len); + fwrite(s, 1, len, ppy_out); } diff --git a/libs/wpp/preproc.c b/libs/wpp/preproc.c index 1bd10cd..df5adf0 100644 --- a/libs/wpp/preproc.c +++ b/libs/wpp/preproc.c @@ -112,8 +112,8 @@ char *pp_xstrdup(const char *str) return memcpy(s, str, len); } -static char *wpp_default_lookup(const char *name, int type, const char *parent_name, - char **include_path, int include_path_count) +char *wpp_lookup(const char *name, int type, const char *parent_name, + char **include_path, int include_path_count) { char *cpy; char *cptr; @@ -190,22 +190,6 @@ static char *wpp_default_lookup(const char *name, int type, const char *parent_n return NULL; } -static void *wpp_default_open(const char *filename, int type) { - return fopen(filename,"rt"); -} - -static void wpp_default_close(void *file) { - fclose(file); -} - -static int wpp_default_read(void *file, char *buffer, unsigned int len){ - return fread(buffer, 1, len, file); -} - -static void wpp_default_write( const char *buffer, unsigned int len ) { - fwrite(buffer, 1, len, ppy_out); -} - /* Don't comment on the hash, it's primitive but functional... */ static int pphash(const char *str) { @@ -505,7 +489,7 @@ int wpp_add_include_path(const char *path) char *wpp_find_include(const char *name, const char *parent_name) { - return wpp_default_lookup(name, !!parent_name, parent_name, includepath, nincludepath); + return wpp_lookup(name, !!parent_name, parent_name, includepath, nincludepath); } void *pp_open_include(const char *name, int type, const char *parent_name, char **newpath) @@ -513,9 +497,8 @@ void *pp_open_include(const char *name, int type, const char *parent_name, char char *path; void *fp; - if (!(path = wpp_callbacks->lookup(name, type, parent_name, includepath, - nincludepath))) return NULL; - fp = wpp_callbacks->open(path, type); + if (!(path = wpp_lookup(name, type, parent_name, includepath, nincludepath))) return NULL; + fp = fopen(path, "rt"); if (fp) { @@ -705,45 +688,20 @@ end: fprintf(stderr, "\n"); } -static void wpp_default_error(const char *file, int line, int col, const char *near, const char *msg, va_list ap) -{ - generic_msg(msg, "Error", near, ap); - exit(1); -} - -static void wpp_default_warning(const char *file, int line, int col, const char *near, const char *msg, va_list ap) -{ - generic_msg(msg, "Warning", near, ap); -} - -static const struct wpp_callbacks default_callbacks = -{ - wpp_default_lookup, - wpp_default_open, - wpp_default_close, - wpp_default_read, - wpp_default_write, - wpp_default_error, - wpp_default_warning, -}; - -const struct wpp_callbacks *wpp_callbacks = &default_callbacks; - int ppy_error(const char *s, ...) { va_list ap; va_start(ap, s); - wpp_callbacks->error(pp_status.input, pp_status.line_number, pp_status.char_number, ppy_text, s, ap); + generic_msg(s, "Error", ppy_text, ap); va_end(ap); - pp_status.state = 1; - return 1; + exit(1); } int ppy_warning(const char *s, ...) { va_list ap; va_start(ap, s); - wpp_callbacks->warning(pp_status.input, pp_status.line_number, pp_status.char_number, ppy_text, s, ap); + generic_msg(s, "Warning", ppy_text, ap); va_end(ap); return 0; } diff --git a/libs/wpp/wpp.c b/libs/wpp/wpp.c index 60b2d38..60d6681 100644 --- a/libs/wpp/wpp.c +++ b/libs/wpp/wpp.c @@ -197,7 +197,7 @@ int wpp_parse( const char *input, FILE *output ) add_special_defines(); if (!input) pp_status.file = stdin; - else if (!(pp_status.file = wpp_callbacks->open(input, 1))) + else if (!(pp_status.file = fopen(input, "rt"))) { ppy_error("Could not open %s\n", input); del_special_defines(); @@ -217,7 +217,7 @@ int wpp_parse( const char *input, FILE *output ) if (input) { - wpp_callbacks->close(pp_status.file); + fclose(pp_status.file); free(pp_status.input); } /* Clean if_stack, it could remain dirty on errors */ @@ -227,9 +227,3 @@ int wpp_parse( const char *input, FILE *output ) pp_pop_define_state(); return ret; } - - -void wpp_set_callbacks( const struct wpp_callbacks *callbacks ) -{ - wpp_callbacks = callbacks; -} diff --git a/libs/wpp/wpp_private.h b/libs/wpp/wpp_private.h index 093f221..ab4296b 100644 --- a/libs/wpp/wpp_private.h +++ b/libs/wpp/wpp_private.h @@ -190,6 +190,8 @@ void pp_next_if_state(int); pp_if_state_t pp_pop_if(void); pp_if_state_t pp_if_state(void); int pp_get_if_depth(void); +char *wpp_lookup(const char *name, int type, const char *parent_name, + char **include_path, int include_path_count); #ifndef __GNUC__ #define __attribute__(x) /*nothing*/

1 0

Alexandre Julliard : d3dcompiler: Build with msvcrt.
by Alexandre Julliard July 2, 2019

July 2, 2019

Module: wine Branch: master Commit: c8d34ef08886076e675293300e2a86a0bae61f71 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c8d34ef08886076e67529330… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 2 13:37:18 2019 +0200 d3dcompiler: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_33/Makefile.in | 2 ++ dlls/d3dcompiler_34/Makefile.in | 2 ++ dlls/d3dcompiler_35/Makefile.in | 2 ++ dlls/d3dcompiler_36/Makefile.in | 2 ++ dlls/d3dcompiler_37/Makefile.in | 2 ++ dlls/d3dcompiler_38/Makefile.in | 2 ++ dlls/d3dcompiler_39/Makefile.in | 2 ++ dlls/d3dcompiler_40/Makefile.in | 2 ++ dlls/d3dcompiler_41/Makefile.in | 2 ++ dlls/d3dcompiler_42/Makefile.in | 2 ++ dlls/d3dcompiler_43/Makefile.in | 2 ++ dlls/d3dcompiler_43/asmparser.c | 2 -- dlls/d3dcompiler_43/asmshader.l | 2 -- dlls/d3dcompiler_43/asmshader.y | 10 ++++------ dlls/d3dcompiler_43/blob.c | 3 --- dlls/d3dcompiler_43/bytecodewriter.c | 2 -- dlls/d3dcompiler_43/compiler.c | 29 +++++++++++++---------------- dlls/d3dcompiler_43/d3dcompiler_private.h | 8 ++++---- dlls/d3dcompiler_43/hlsl.l | 2 -- dlls/d3dcompiler_43/hlsl.y | 17 ++++++++--------- dlls/d3dcompiler_43/main.c | 2 -- dlls/d3dcompiler_43/ppl.l | 25 ++++++------------------- dlls/d3dcompiler_43/ppy.y | 3 --- dlls/d3dcompiler_43/preproc.c | 14 ++++---------- dlls/d3dcompiler_43/reflection.c | 3 --- dlls/d3dcompiler_43/utils.c | 5 +---- dlls/d3dcompiler_43/wpp_private.h | 8 ++++---- dlls/d3dcompiler_46/Makefile.in | 2 ++ dlls/d3dcompiler_47/Makefile.in | 2 ++ 29 files changed, 70 insertions(+), 91 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c8d34ef08886076e6752…

1 0

Alexandre Julliard : ntdll: Initialize filesystem redirects before kernel32 is loaded.
by Alexandre Julliard July 2, 2019

July 2, 2019

Module: wine Branch: master Commit: 21d91ef04b0f5723646b316dbb5c4ec74e9daa81 URL: https://source.winehq.org/git/wine.git/?a=commit;h=21d91ef04b0f5723646b316d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 2 12:36:05 2019 +0200 ntdll: Initialize filesystem redirects before kernel32 is loaded. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/directory.c | 78 ++++++-------------------------------------------- dlls/ntdll/rtlstr.c | 1 - dlls/ntdll/thread.c | 1 + 3 files changed, 10 insertions(+), 70 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index dd0062d..b50d41b 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -2191,83 +2191,30 @@ static const WCHAR driversetcW[] = {'s','y','s','t','e','m','3','2','\\','d','r' static const WCHAR logfilesW[] = {'s','y','s','t','e','m','3','2','\\','l','o','g','f','i','l','e','s',0}; static const WCHAR spoolW[] = {'s','y','s','t','e','m','3','2','\\','s','p','o','o','l',0}; static const WCHAR system32W[] = {'s','y','s','t','e','m','3','2',0}; -static const WCHAR syswow64W[] = {'s','y','s','w','o','w','6','4',0}; static const WCHAR sysnativeW[] = {'s','y','s','n','a','t','i','v','e',0}; static const WCHAR regeditW[] = {'r','e','g','e','d','i','t','.','e','x','e',0}; -static const WCHAR wow_regeditW[] = {'s','y','s','w','o','w','6','4','\\','r','e','g','e','d','i','t','.','e','x','e',0}; static struct { const WCHAR *source; - const WCHAR *dos_target; const char *unix_target; } redirects[] = { - { catrootW, NULL, NULL }, - { catroot2W, NULL, NULL }, - { driversstoreW, NULL, NULL }, - { driversetcW, NULL, NULL }, - { logfilesW, NULL, NULL }, - { spoolW, NULL, NULL }, - { system32W, syswow64W, NULL }, - { sysnativeW, system32W, NULL }, - { regeditW, wow_regeditW, NULL } + { catrootW, NULL }, + { catroot2W, NULL }, + { driversstoreW, NULL }, + { driversetcW, NULL }, + { logfilesW, NULL }, + { spoolW, NULL }, + { system32W, "syswow64" }, + { sysnativeW, "system32" }, + { regeditW, "syswow64/regedit.exe" } }; static unsigned int nb_redirects; /*********************************************************************** - * get_redirect_target - * - * Find the target unix name for a redirected dir. - */ -static const char *get_redirect_target( const char *windows_dir, const WCHAR *name ) -{ - int used_default, len, pos, win_len = strlen( windows_dir ); - char *unix_name, *unix_target = NULL; - NTSTATUS status; - - if (!(unix_name = RtlAllocateHeap( GetProcessHeap(), 0, win_len + MAX_DIR_ENTRY_LEN + 2 ))) - return NULL; - memcpy( unix_name, windows_dir, win_len ); - pos = win_len; - - while (*name) - { - const WCHAR *end, *next; - - for (end = name; *end; end++) if (IS_SEPARATOR(*end)) break; - for (next = end; *next; next++) if (!IS_SEPARATOR(*next)) break; - - status = find_file_in_dir( unix_name, pos, name, end - name, FALSE, NULL ); - if (status == STATUS_OBJECT_PATH_NOT_FOUND && !*next) /* not finding last element is ok */ - { - len = ntdll_wcstoumbs( 0, name, end - name, unix_name + pos + 1, - MAX_DIR_ENTRY_LEN - (pos - win_len), NULL, &used_default ); - if (len > 0 && !used_default) - { - unix_name[pos] = '/'; - pos += len + 1; - unix_name[pos] = 0; - break; - } - } - if (status) goto done; - pos += strlen( unix_name + pos ); - name = next; - } - - if ((unix_target = RtlAllocateHeap( GetProcessHeap(), 0, pos - win_len ))) - memcpy( unix_target, unix_name + win_len + 1, pos - win_len ); - -done: - RtlFreeHeap( GetProcessHeap(), 0, unix_name ); - return unix_target; -} - - -/*********************************************************************** * init_redirects */ static void init_redirects(void) @@ -2276,7 +2223,6 @@ static void init_redirects(void) const char *config_dir = wine_get_config_dir(); char *dir; struct stat st; - unsigned int i; if (!(dir = RtlAllocateHeap( GetProcessHeap(), 0, strlen(config_dir) + sizeof(windows_dir) ))) return; strcpy( dir, config_dir ); @@ -2286,12 +2232,6 @@ static void init_redirects(void) windir.dev = st.st_dev; windir.ino = st.st_ino; nb_redirects = ARRAY_SIZE( redirects ); - for (i = 0; i < nb_redirects; i++) - { - if (!redirects[i].dos_target) continue; - redirects[i].unix_target = get_redirect_target( dir, redirects[i].dos_target ); - TRACE( "%s -> %s\n", debugstr_w(redirects[i].source), redirects[i].unix_target ); - } } else ERR( "%s: %s\n", dir, strerror(errno) ); RtlFreeHeap( GetProcessHeap(), 0, dir ); diff --git a/dlls/ntdll/rtlstr.c b/dlls/ntdll/rtlstr.c index e834ad2..6b60d36 100644 --- a/dlls/ntdll/rtlstr.c +++ b/dlls/ntdll/rtlstr.c @@ -63,7 +63,6 @@ void CDECL __wine_init_codepages( const union cptable *ansi, const union cptable oem_table = oem; unix_table = ucp; NlsAnsiCodePage = ansi->info.codepage; - init_directories(); } int ntdll_umbstowcs(DWORD flags, const char* src, int srclen, WCHAR* dst, int dstlen) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index f837062..126bf76 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -245,6 +245,7 @@ void thread_init(void) exit(1); } + init_directories(); init_user_process_params( info_size ); /* initialize time values in user_shared_data */

1 0

Alexandre Julliard : d3d9: Build with msvcrt.
by Alexandre Julliard July 2, 2019

July 2, 2019

Module: wine Branch: master Commit: 19f177360e90a51c9f3331e778a65e8b1f5a4f38 URL: https://source.winehq.org/git/wine.git/?a=commit;h=19f177360e90a51c9f3331e7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 2 09:55:58 2019 +0200 d3d9: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/Makefile.in | 2 ++ dlls/d3d9/buffer.c | 2 -- dlls/d3d9/d3d9_main.c | 2 -- dlls/d3d9/d3d9_private.h | 1 - dlls/d3d9/device.c | 2 -- dlls/d3d9/directx.c | 2 -- dlls/d3d9/query.c | 2 -- dlls/d3d9/shader.c | 2 -- dlls/d3d9/stateblock.c | 2 -- dlls/d3d9/surface.c | 2 -- dlls/d3d9/swapchain.c | 2 -- dlls/d3d9/texture.c | 2 -- dlls/d3d9/vertexdeclaration.c | 2 -- dlls/d3d9/volume.c | 2 -- 14 files changed, 2 insertions(+), 25 deletions(-) diff --git a/dlls/d3d9/Makefile.in b/dlls/d3d9/Makefile.in index 1c05f5a..84ec0b5 100644 --- a/dlls/d3d9/Makefile.in +++ b/dlls/d3d9/Makefile.in @@ -2,6 +2,8 @@ MODULE = d3d9.dll IMPORTLIB = d3d9 IMPORTS = dxguid uuid wined3d +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ buffer.c \ d3d9_main.c \ diff --git a/dlls/d3d9/buffer.c b/dlls/d3d9/buffer.c index 46d11e7..7af652e 100644 --- a/dlls/d3d9/buffer.c +++ b/dlls/d3d9/buffer.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" #include "d3d9_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d9); diff --git a/dlls/d3d9/d3d9_main.c b/dlls/d3d9/d3d9_main.c index bd0524b..21df2a3 100644 --- a/dlls/d3d9/d3d9_main.c +++ b/dlls/d3d9/d3d9_main.c @@ -21,8 +21,6 @@ * */ -#include "config.h" -#include "wine/port.h" #include "initguid.h" #include "d3d9_private.h" diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 8ee521b..a56bdb2 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -35,7 +35,6 @@ #include "winuser.h" #include "wine/debug.h" #include "wine/heap.h" -#include "wine/unicode.h" #include "d3d9.h" #include "wine/wined3d.h" diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index e2da02b..8f94eb0 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -20,8 +20,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" #include "d3d9_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d9); diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index c507991..1d3754a 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" #include "d3d9_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d9); diff --git a/dlls/d3d9/query.c b/dlls/d3d9/query.c index 49a8a12..e9180fb 100644 --- a/dlls/d3d9/query.c +++ b/dlls/d3d9/query.c @@ -20,8 +20,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" #include "d3d9_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d9); diff --git a/dlls/d3d9/shader.c b/dlls/d3d9/shader.c index 5493508..838c7de 100644 --- a/dlls/d3d9/shader.c +++ b/dlls/d3d9/shader.c @@ -17,8 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" #include "d3d9_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d9); diff --git a/dlls/d3d9/stateblock.c b/dlls/d3d9/stateblock.c index 75f9748..0221328 100644 --- a/dlls/d3d9/stateblock.c +++ b/dlls/d3d9/stateblock.c @@ -20,8 +20,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" #include "d3d9_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d9); diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c index 9aa2154..b74f6ca 100644 --- a/dlls/d3d9/surface.c +++ b/dlls/d3d9/surface.c @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" #include "d3d9_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d9); diff --git a/dlls/d3d9/swapchain.c b/dlls/d3d9/swapchain.c index 46da32e..be9c55a 100644 --- a/dlls/d3d9/swapchain.c +++ b/dlls/d3d9/swapchain.c @@ -20,8 +20,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" #include "d3d9_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d9); diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index 9f36709..ae754b5 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" #include "d3d9_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d9); diff --git a/dlls/d3d9/vertexdeclaration.c b/dlls/d3d9/vertexdeclaration.c index 130383e..c30a843 100644 --- a/dlls/d3d9/vertexdeclaration.c +++ b/dlls/d3d9/vertexdeclaration.c @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" #include "d3d9_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d9); diff --git a/dlls/d3d9/volume.c b/dlls/d3d9/volume.c index cdc4761..39caa8f 100644 --- a/dlls/d3d9/volume.c +++ b/dlls/d3d9/volume.c @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" #include "d3d9_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d9);

1 0

Jacek Caban : winedbg: Set auto attach event after processing the first exception.
by Alexandre Julliard July 2, 2019

July 2, 2019

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

Hans Leidekker : ntdll: Use the machine ID for the system UUID on Linux.
by Alexandre Julliard July 2, 2019

July 2, 2019

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

Alexandre Julliard : d3d11: Build with msvcrt.
by Alexandre Julliard July 2, 2019

July 2, 2019

Module: wine Branch: master Commit: d216374962b199cf028d07194fd3b1ebfb6d4a35 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d216374962b199cf028d0719… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 2 09:56:08 2019 +0200 d3d11: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/Makefile.in | 2 ++ dlls/d3d11/async.c | 3 --- dlls/d3d11/buffer.c | 3 --- dlls/d3d11/d3d11_main.c | 3 --- dlls/d3d11/device.c | 3 --- dlls/d3d11/inputlayout.c | 3 --- dlls/d3d11/shader.c | 3 --- dlls/d3d11/state.c | 3 --- dlls/d3d11/texture.c | 3 --- dlls/d3d11/utils.c | 3 --- dlls/d3d11/view.c | 3 --- 11 files changed, 2 insertions(+), 30 deletions(-) diff --git a/dlls/d3d11/Makefile.in b/dlls/d3d11/Makefile.in index 5a56fae..db9e40d 100644 --- a/dlls/d3d11/Makefile.in +++ b/dlls/d3d11/Makefile.in @@ -2,6 +2,8 @@ MODULE = d3d11.dll IMPORTLIB = d3d11 IMPORTS = dxguid uuid dxgi wined3d +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ async.c \ buffer.c \ diff --git a/dlls/d3d11/async.c b/dlls/d3d11/async.c index 1a56df9..fd83871 100644 --- a/dlls/d3d11/async.c +++ b/dlls/d3d11/async.c @@ -18,9 +18,6 @@ * */ -#include "config.h" -#include "wine/port.h" - #include "d3d11_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d11); diff --git a/dlls/d3d11/buffer.c b/dlls/d3d11/buffer.c index f2d32ed..ed9ee13 100644 --- a/dlls/d3d11/buffer.c +++ b/dlls/d3d11/buffer.c @@ -17,9 +17,6 @@ * */ -#include "config.h" -#include "wine/port.h" - #include "d3d11_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d11); diff --git a/dlls/d3d11/d3d11_main.c b/dlls/d3d11/d3d11_main.c index b0a32ac..a5854a9 100644 --- a/dlls/d3d11/d3d11_main.c +++ b/dlls/d3d11/d3d11_main.c @@ -20,9 +20,6 @@ * */ -#include "config.h" -#include "wine/port.h" - #define D3D11_INIT_GUID #include "d3d11_private.h" diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 31292e9..5fac117 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -17,9 +17,6 @@ * */ -#include "config.h" -#include "wine/port.h" - #define NONAMELESSUNION #include "d3d11_private.h" diff --git a/dlls/d3d11/inputlayout.c b/dlls/d3d11/inputlayout.c index de40eda..9bee927 100644 --- a/dlls/d3d11/inputlayout.c +++ b/dlls/d3d11/inputlayout.c @@ -17,9 +17,6 @@ * */ -#include "config.h" -#include "wine/port.h" - #include "d3d11_private.h" #include "winternl.h" diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c index a506aac..6bec797 100644 --- a/dlls/d3d11/shader.c +++ b/dlls/d3d11/shader.c @@ -17,9 +17,6 @@ * */ -#include "config.h" -#include "wine/port.h" - #include "d3d11_private.h" #include "winternl.h" diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index 6de3502..92b75f8 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -17,9 +17,6 @@ * */ -#include "config.h" -#include "wine/port.h" - #include "d3d11_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d11); diff --git a/dlls/d3d11/texture.c b/dlls/d3d11/texture.c index 7882195..d54f22f 100644 --- a/dlls/d3d11/texture.c +++ b/dlls/d3d11/texture.c @@ -18,9 +18,6 @@ * */ -#include "config.h" -#include "wine/port.h" - #include "d3d11_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d11); diff --git a/dlls/d3d11/utils.c b/dlls/d3d11/utils.c index 0555603..065436c 100644 --- a/dlls/d3d11/utils.c +++ b/dlls/d3d11/utils.c @@ -17,9 +17,6 @@ * */ -#include "config.h" -#include "wine/port.h" - #include "d3d11_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d11); diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c index 93d0b78..a6eddf5 100644 --- a/dlls/d3d11/view.c +++ b/dlls/d3d11/view.c @@ -17,9 +17,6 @@ * */ -#include "config.h" -#include "wine/port.h" - #define NONAMELESSUNION #include "d3d11_private.h"

1 0

Alexandre Julliard : kernel32: Move resource functions to kernelbase.
by Alexandre Julliard July 2, 2019

July 2, 2019

Module: wine Branch: master Commit: 5129c4598227f2d9e24abc8565d24d7874cfb27f URL: https://source.winehq.org/git/wine.git/?a=commit;h=5129c4598227f2d9e24abc85… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 2 15:16:42 2019 +0200 kernel32: Move resource functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-libraryloader-l1-1-0.spec | 8 +- .../api-ms-win-core-libraryloader-l1-1-1.spec | 8 +- .../api-ms-win-core-libraryloader-l1-2-0.spec | 8 +- .../api-ms-win-core-libraryloader-l1-2-1.spec | 8 +- dlls/kernel32/kernel32.spec | 26 +- dlls/kernel32/resource.c | 502 +----------------- dlls/kernelbase/Makefile.in | 1 + dlls/kernelbase/kernelbase.spec | 26 +- dlls/kernelbase/loader.c | 579 +++++++++++++++++++++ include/winbase.h | 6 + 10 files changed, 644 insertions(+), 528 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5129c4598227f2d9e24a…

1 0

Hans Leidekker : ntdll: Fix sysfs path for the product name.
by Alexandre Julliard July 2, 2019

July 2, 2019

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