April 2020 - Wine-Commits - list.winehq.org

Alexandre Julliard : libwine: Remove __wine_main_arg* from the public header.
by Alexandre Julliard April 9, 2020

April 9, 2020

Module: wine Branch: master Commit: de47a5969be3d78d2043abb75b7659241b8e434a URL: https://source.winehq.org/git/wine.git/?a=commit;h=de47a5969be3d78d2043abb7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 9 11:48:43 2020 +0200 libwine: Remove __wine_main_arg* from the public header. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll_misc.h | 4 ++++ include/wine/library.h | 5 ----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index a5fe98c8d8..b62239de5b 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -92,6 +92,10 @@ extern void init_user_process_params( SIZE_T data_size ) DECLSPEC_HIDDEN; extern char **build_envp( const WCHAR *envW ) DECLSPEC_HIDDEN; extern NTSTATUS restart_process( RTL_USER_PROCESS_PARAMETERS *params, NTSTATUS status ) DECLSPEC_HIDDEN; +extern int __wine_main_argc; +extern char **__wine_main_argv; +extern WCHAR **__wine_main_wargv; + /* server support */ extern timeout_t server_start_time DECLSPEC_HIDDEN; extern unsigned int server_cpus DECLSPEC_HIDDEN; diff --git a/include/wine/library.h b/include/wine/library.h index 060a186105..4c4b448f10 100644 --- a/include/wine/library.h +++ b/include/wine/library.h @@ -54,13 +54,8 @@ extern void wine_exec_wine_binary( const char *name, char **argv, const char *en /* dll loading */ typedef void (*load_dll_callback_t)( void *, const char * ); - extern void wine_dll_set_callback( load_dll_callback_t load ); extern const char *wine_dll_enum_load_path( unsigned int index ); - -extern int __wine_main_argc; -extern char **__wine_main_argv; -extern WCHAR **__wine_main_wargv; extern void __wine_dll_register( const IMAGE_NT_HEADERS *header, const char *filename ); extern void wine_init( int argc, char *argv[], char *error, int error_size );

1 0

Piotr Caban : server: Initialize current_time before it's used in init_registry.
by Alexandre Julliard April 9, 2020

April 9, 2020

Module: wine Branch: master Commit: 9bfbb4866231f9c2e6e22e23037c54c5702dd634 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9bfbb4866231f9c2e6e22e23… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 6 17:20:58 2020 +0200 server: Initialize current_time before it's used in init_registry. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/fd.c | 2 +- server/file.h | 1 + server/main.c | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/server/fd.c b/server/fd.c index d4584f7326..c9ef8fde6d 100644 --- a/server/fd.c +++ b/server/fd.c @@ -372,7 +372,7 @@ struct timeout_user static struct list timeout_list = LIST_INIT(timeout_list); /* sorted timeouts list */ timeout_t current_time; -static inline void set_current_time(void) +void set_current_time(void) { static const timeout_t ticks_1601_to_1970 = (timeout_t)86400 * (369 * 365 + 89) * TICKS_PER_SEC; struct timeval now; diff --git a/server/file.h b/server/file.h index 0df4c17716..ea36cdb07d 100644 --- a/server/file.h +++ b/server/file.h @@ -134,6 +134,7 @@ extern timeout_t current_time; typedef void (*timeout_callback)( void *private ); +extern void set_current_time( void ); extern struct timeout_user *add_timeout_user( timeout_t when, timeout_callback func, void *private ); extern void remove_timeout_user( struct timeout_user *user ); extern const char *get_timeout_str( timeout_t timeout ); diff --git a/server/main.c b/server/main.c index 26986d34b3..efb205f529 100644 --- a/server/main.c +++ b/server/main.c @@ -141,6 +141,7 @@ int main( int argc, char *argv[] ) open_master_socket(); if (debug_level) fprintf( stderr, "wineserver: starting (pid=%ld)\n", (long) getpid() ); + set_current_time(); init_signals(); init_directories(); init_registry();

1 0

Alexandre Julliard : winver: Build with msvcrt.
by Alexandre Julliard April 9, 2020

April 9, 2020

Module: wine Branch: master Commit: cb594c1c2e48ba2eec2c4ce4195909918ae6187e URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb594c1c2e48ba2eec2c4ce4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 9 09:44:59 2020 +0200 winver: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winver/Makefile.in | 3 ++- programs/winver/winver.c | 8 ++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/programs/winver/Makefile.in b/programs/winver/Makefile.in index 425f9c5dda..0caef71386 100644 --- a/programs/winver/Makefile.in +++ b/programs/winver/Makefile.in @@ -1,7 +1,8 @@ MODULE = winver.exe -APPMODE = -mwindows IMPORTS = shell32 +EXTRADLLFLAGS = -mwindows -mno-cygwin + C_SRCS = winver.c RC_SRCS = version.rc diff --git a/programs/winver/winver.c b/programs/winver/winver.c index 96ee25748a..019eb5248b 100644 --- a/programs/winver/winver.c +++ b/programs/winver/winver.c @@ -18,11 +18,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include "windows.h" #include "shellapi.h" int PASCAL WinMain (HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show) { - return !ShellAboutA(NULL, PACKAGE_NAME, PACKAGE_STRING, 0); + char name[128] = "Wine "; + const char * (CDECL *wine_get_version)(void); + + wine_get_version = (void *)GetProcAddress( GetModuleHandleA("ntdll.dll"), "wine_get_version" ); + if (wine_get_version) strcat( name, wine_get_version() ); + return !ShellAboutA( NULL, name, NULL, 0 ); }

1 0

Alexandre Julliard : winepath: Build with msvcrt.
by Alexandre Julliard April 9, 2020

April 9, 2020

Module: wine Branch: master Commit: e22bcac706be3afac67f4faac3aca79fd67c3d6f URL: https://source.winehq.org/git/wine.git/?a=commit;h=e22bcac706be3afac67f4faa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 9 09:43:30 2020 +0200 winepath: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winepath/Makefile.in | 3 ++- programs/winepath/winepath.c | 15 +++------------ 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/programs/winepath/Makefile.in b/programs/winepath/Makefile.in index 16b5627aa5..58a9acdc9e 100644 --- a/programs/winepath/Makefile.in +++ b/programs/winepath/Makefile.in @@ -1,5 +1,6 @@ MODULE = winepath.exe -APPMODE = -mconsole -municode + +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin C_SRCS = winepath.c diff --git a/programs/winepath/winepath.c b/programs/winepath/winepath.c index 7f4cd978d5..81944829dd 100644 --- a/programs/winepath/winepath.c +++ b/programs/winepath/winepath.c @@ -21,9 +21,6 @@ */ #define WIN32_LEAN_AND_MEAN - -#include "config.h" - #include <windows.h> #include <stdio.h> #include <stdlib.h> @@ -92,13 +89,7 @@ static int option(int shortopt, const WCHAR *longopt) */ static int parse_options(WCHAR *argv[]) { - static const WCHAR longW[] = { 'l','o','n','g',0 }; - static const WCHAR shortW[] = { 's','h','o','r','t',0 }; - static const WCHAR unixW[] = { 'u','n','i','x',0 }; - static const WCHAR windowsW[] = { 'w','i','n','d','o','w','s',0 }; - static const WCHAR helpW[] = { 'h','e','l','p',0 }; - static const WCHAR nullW[] = { 0 }; - static const WCHAR *longopts[] = { longW, shortW, unixW, windowsW, helpW, nullW }; + static const WCHAR *longopts[] = { L"long", L"short", L"unix", L"windows", L"help", NULL }; int outputformats = 0; BOOL done = FALSE; int i, j; @@ -117,10 +108,10 @@ static int parse_options(WCHAR *argv[]) done = TRUE; } else { /* long option */ - for (j = 0; longopts[j][0]; j++) + for (j = 0; longopts[j]; j++) if (!lstrcmpiW(argv[i]+2, longopts[j])) break; - outputformats |= option(longopts[j][0], argv[i]); + if (longopts[j]) outputformats |= option(longopts[j][0], argv[i]); } } else { /* short options */

1 0

Alexandre Julliard : winepath: Remove the --version option.
by Alexandre Julliard April 9, 2020

April 9, 2020

Module: wine Branch: master Commit: 2bfba562f9091a870a3a9e4aefac90a0d8f7f68e URL: https://source.winehq.org/git/wine.git/?a=commit;h=2bfba562f9091a870a3a9e4a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 9 09:34:27 2020 +0200 winepath: Remove the --version option. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winepath/winepath.c | 7 +------ programs/winepath/winepath.man.in | 2 -- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/programs/winepath/winepath.c b/programs/winepath/winepath.c index 36881d3f26..7f4cd978d5 100644 --- a/programs/winepath/winepath.c +++ b/programs/winepath/winepath.c @@ -56,7 +56,6 @@ static int option(int shortopt, const WCHAR *longopt) " directory to the short format\n" " -0 separate output with \\0 character, instead of a newline\n" " -h, --help output this help message and exit\n" - " -v, --version output version information and exit\n" "\n" "If more than one option is given then the input paths are output in\n" "all formats specified, in the order long, short, Unix, Windows.\n" @@ -67,9 +66,6 @@ static int option(int shortopt, const WCHAR *longopt) printf("Usage: %s [OPTION] [PATH]...\n", progname); printf(helpmsg); exit(0); - case 'v': - printf("%s version " PACKAGE_VERSION "\n", progname); - exit(0); case 'l': return LONGFORMAT; case 's': @@ -101,9 +97,8 @@ static int parse_options(WCHAR *argv[]) static const WCHAR unixW[] = { 'u','n','i','x',0 }; static const WCHAR windowsW[] = { 'w','i','n','d','o','w','s',0 }; static const WCHAR helpW[] = { 'h','e','l','p',0 }; - static const WCHAR versionW[] = { 'v','e','r','s','i','o','n',0 }; static const WCHAR nullW[] = { 0 }; - static const WCHAR *longopts[] = { longW, shortW, unixW, windowsW, helpW, versionW, nullW }; + static const WCHAR *longopts[] = { longW, shortW, unixW, windowsW, helpW, nullW }; int outputformats = 0; BOOL done = FALSE; int i, j; diff --git a/programs/winepath/winepath.man.in b/programs/winepath/winepath.man.in index 5548e40044..280ed14e59 100644 --- a/programs/winepath/winepath.man.in +++ b/programs/winepath/winepath.man.in @@ -27,8 +27,6 @@ format. separate output with \\0 character, instead of a newline. .IP \fB\-h\fR,\fB\ \-\-help shows winepath help message and exit. -.IP \fB\-v\fR,\fB\ \-\-version -shows version information and exit. .SH BUGS Bugs can be reported on the .UR https://bugs.winehq.org

1 0

Alexandre Julliard : winecfg: Avoid depending on the PACKAGE_* macros.
by Alexandre Julliard April 9, 2020

April 9, 2020

Module: wine Branch: master Commit: 3073a17202b0c9687d6302ffbfb10c2363169448 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3073a17202b0c9687d6302ff… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 9 09:31:02 2020 +0200 winecfg: Avoid depending on the PACKAGE_* macros. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ar.po | 307 ++++++++++++++++++++++---------------------- po/ast.po | 307 ++++++++++++++++++++++---------------------- po/bg.po | 307 ++++++++++++++++++++++---------------------- po/ca.po | 307 ++++++++++++++++++++++---------------------- po/cs.po | 307 ++++++++++++++++++++++---------------------- po/da.po | 307 ++++++++++++++++++++++---------------------- po/de.po | 307 ++++++++++++++++++++++---------------------- po/el.po | 307 ++++++++++++++++++++++---------------------- po/en.po | 307 ++++++++++++++++++++++---------------------- po/en_US.po | 307 ++++++++++++++++++++++---------------------- po/eo.po | 307 ++++++++++++++++++++++---------------------- po/es.po | 307 ++++++++++++++++++++++---------------------- po/fa.po | 307 ++++++++++++++++++++++---------------------- po/fi.po | 307 ++++++++++++++++++++++---------------------- po/fr.po | 307 ++++++++++++++++++++++---------------------- po/he.po | 307 ++++++++++++++++++++++---------------------- po/hi.po | 307 ++++++++++++++++++++++---------------------- po/hr.po | 307 ++++++++++++++++++++++---------------------- po/hu.po | 307 ++++++++++++++++++++++---------------------- po/it.po | 307 ++++++++++++++++++++++---------------------- po/ja.po | 307 ++++++++++++++++++++++---------------------- po/ko.po | 307 ++++++++++++++++++++++---------------------- po/lt.po | 307 ++++++++++++++++++++++---------------------- po/ml.po | 307 ++++++++++++++++++++++---------------------- po/nb_NO.po | 307 ++++++++++++++++++++++---------------------- po/nl.po | 307 ++++++++++++++++++++++---------------------- po/or.po | 307 ++++++++++++++++++++++---------------------- po/pa.po | 307 ++++++++++++++++++++++---------------------- po/pl.po | 307 ++++++++++++++++++++++---------------------- po/pt_BR.po | 307 ++++++++++++++++++++++---------------------- po/pt_PT.po | 307 ++++++++++++++++++++++---------------------- po/rm.po | 307 ++++++++++++++++++++++---------------------- po/ro.po | 307 ++++++++++++++++++++++---------------------- po/ru.po | 307 ++++++++++++++++++++++---------------------- po/si.po | 307 ++++++++++++++++++++++---------------------- po/sk.po | 307 ++++++++++++++++++++++---------------------- po/sl.po | 307 ++++++++++++++++++++++---------------------- po/sr_RS(a)cyrillic.po | 307 ++++++++++++++++++++++---------------------- po/sr_RS(a)latin.po | 307 ++++++++++++++++++++++---------------------- po/sv.po | 307 ++++++++++++++++++++++---------------------- po/ta.po | 307 ++++++++++++++++++++++---------------------- po/te.po | 307 ++++++++++++++++++++++---------------------- po/th.po | 307 ++++++++++++++++++++++---------------------- po/tr.po | 307 ++++++++++++++++++++++---------------------- po/uk.po | 307 ++++++++++++++++++++++---------------------- po/wa.po | 307 ++++++++++++++++++++++---------------------- po/wine.pot | 307 ++++++++++++++++++++++---------------------- po/zh_CN.po | 307 ++++++++++++++++++++++---------------------- po/zh_TW.po | 307 ++++++++++++++++++++++---------------------- programs/winecfg/about.c | 26 ++-- programs/winecfg/winecfg.rc | 5 +- 51 files changed, 7557 insertions(+), 7517 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3073a17202b0c9687d63…

1 0

Dmitry Timoshkov : adsldp: Fix typos in ADSTYPE_BOOLEAN handling.
by Alexandre Julliard April 9, 2020

April 9, 2020

Module: wine Branch: master Commit: fc1cc8ef78af30e3243043bc370bf29e435161ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc1cc8ef78af30e3243043bc… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Apr 9 16:01:32 2020 +0800 adsldp: Fix typos in ADSTYPE_BOOLEAN handling. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/adsldp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index 6d411430a0..de88ee994c 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -1488,16 +1488,16 @@ static HRESULT add_column_values(LDAP_namespace *ldap, struct ldap_search_contex { col->pADsValues[i].dwType = type; - if (wcsicmp(values[i], L"TRUE")) + if (!wcsicmp(values[i], L"TRUE")) col->pADsValues[i].u.Boolean = 1; - else if (wcsicmp(values[i], L"FALSE")) + else if (!wcsicmp(values[i], L"FALSE")) col->pADsValues[i].u.Boolean = 0; else { FIXME("not recognized boolean value %s\n", debugstr_w(values[i])); col->pADsValues[i].u.Boolean = 0; } - TRACE("=> %d\n", col->pADsValues[i].u.Boolean); + TRACE("%s => %d\n", debugstr_w(values[i]), col->pADsValues[i].u.Boolean); } ldap_value_freeW(values);

1 0

Chip Davis : widl: Cast server functions to void *.
by Alexandre Julliard April 9, 2020

April 9, 2020

Module: wine Branch: master Commit: 1387075b80c5ba76fc86c05a6b47a9f6bc6674e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1387075b80c5ba76fc86c05a… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Wed Apr 8 23:04:04 2020 -0500 widl: Cast server functions to void *. This avoids a warning casting between calling conventions with Clang. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/server.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/widl/server.c b/tools/widl/server.c index 79dc079fd2..cce880bbf6 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -307,7 +307,7 @@ static void write_routinetable(type_t *iface) { var_t *func = stmt->u.var; if (is_local( func->attrs )) continue; - print_server( "(SERVER_ROUTINE)%s%s,\n", prefix_server, get_name(func)); + print_server( "(void *)%s%s,\n", prefix_server, get_name(func)); } indent--; print_server( "};\n\n" );

1 0

Alexandre Julliard : libwine: Remove some no longer needed helper functions.
by Alexandre Julliard April 9, 2020

April 9, 2020

Module: wine Branch: master Commit: 18273d5e71e25575bdbdba1d252df72be3373f6d URL: https://source.winehq.org/git/wine.git/?a=commit;h=18273d5e71e25575bdbdba1d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 9 11:48:23 2020 +0200 libwine: Remove some no longer needed helper functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/wine/ldt.c | 55 +++++++++++++++---------------------------------------- 1 file changed, 15 insertions(+), 40 deletions(-) diff --git a/libs/wine/ldt.c b/libs/wine/ldt.c index a8f4925019..18b0b9be9b 100644 --- a/libs/wine/ldt.c +++ b/libs/wine/ldt.c @@ -45,26 +45,9 @@ struct __wine_ldt_copy unsigned char flags[8192]; /* flags (defined below) */ } wine_ldt_copy_obsolete = { { 0, 0, 0 } }; -#define WINE_LDT_FLAGS_DATA 0x13 /* Data segment */ -#define WINE_LDT_FLAGS_STACK 0x17 /* Stack segment */ -#define WINE_LDT_FLAGS_CODE 0x1b /* Code segment */ -#define WINE_LDT_FLAGS_TYPE_MASK 0x1f /* Mask for segment type */ #define WINE_LDT_FLAGS_32BIT 0x40 /* Segment is 32-bit (code or stack) */ #define WINE_LDT_FLAGS_ALLOCATED 0x80 /* Segment is allocated (no longer free) */ -/* helper functions to manipulate the LDT_ENTRY structure */ -static inline void wine_ldt_set_base( LDT_ENTRY *ent, const void *base ) -{ - ent->BaseLow = (WORD)(ULONG_PTR)base; - ent->HighWord.Bits.BaseMid = (BYTE)((ULONG_PTR)base >> 16); - ent->HighWord.Bits.BaseHi = (BYTE)((ULONG_PTR)base >> 24); -} -static inline void wine_ldt_set_limit( LDT_ENTRY *ent, unsigned int limit ) -{ - if ((ent->HighWord.Bits.Granularity = (limit >= 0x100000))) limit >>= 12; - ent->LimitLow = (WORD)limit; - ent->HighWord.Bits.LimitHi = (limit >> 16); -} static inline void *wine_ldt_get_base( const LDT_ENTRY *ent ) { return (void *)(ent->BaseLow | @@ -77,26 +60,6 @@ static inline unsigned int wine_ldt_get_limit( const LDT_ENTRY *ent ) if (ent->HighWord.Bits.Granularity) limit = (limit << 12) | 0xfff; return limit; } -static inline void wine_ldt_set_flags( LDT_ENTRY *ent, unsigned char flags ) -{ - ent->HighWord.Bits.Dpl = 3; - ent->HighWord.Bits.Pres = 1; - ent->HighWord.Bits.Type = flags; - ent->HighWord.Bits.Sys = 0; - ent->HighWord.Bits.Reserved_0 = 0; - ent->HighWord.Bits.Default_Big = (flags & WINE_LDT_FLAGS_32BIT) != 0; -} -static inline unsigned char wine_ldt_get_flags( const LDT_ENTRY *ent ) -{ - unsigned char ret = ent->HighWord.Bits.Type; - if (ent->HighWord.Bits.Default_Big) ret |= WINE_LDT_FLAGS_32BIT; - return ret; -} -static inline int wine_ldt_is_empty( const LDT_ENTRY *ent ) -{ - const DWORD *dw = (const DWORD *)ent; - return (dw[0] | dw[1]) == 0; -} #ifdef __linux__ @@ -207,9 +170,21 @@ void wine_ldt_get_entry_obsolete( unsigned short sel, LDT_ENTRY *entry ) lock_ldt(); if (wine_ldt_copy_obsolete.flags[index] & WINE_LDT_FLAGS_ALLOCATED) { - wine_ldt_set_base( entry, wine_ldt_copy_obsolete.base[index] ); - wine_ldt_set_limit( entry, wine_ldt_copy_obsolete.limit[index] ); - wine_ldt_set_flags( entry, wine_ldt_copy_obsolete.flags[index] ); + ULONG_PTR base = (ULONG_PTR)wine_ldt_copy_obsolete.base[index]; + ULONG limit = wine_ldt_copy_obsolete.limit[index]; + + entry->BaseLow = (WORD)base; + entry->HighWord.Bits.BaseMid = (BYTE)(base >> 16); + entry->HighWord.Bits.BaseHi = (BYTE)(base >> 24); + if ((entry->HighWord.Bits.Granularity = (limit >= 0x100000))) limit >>= 12; + entry->LimitLow = (WORD)limit; + entry->HighWord.Bits.LimitHi = (limit >> 16); + entry->HighWord.Bits.Dpl = 3; + entry->HighWord.Bits.Pres = 1; + entry->HighWord.Bits.Type = wine_ldt_copy_obsolete.flags[index]; + entry->HighWord.Bits.Sys = 0; + entry->HighWord.Bits.Reserved_0 = 0; + entry->HighWord.Bits.Default_Big = !!(wine_ldt_copy_obsolete.flags[index] & WINE_LDT_FLAGS_32BIT); } else *entry = null_entry; unlock_ldt();

1 0

Zebediah Figura : kernel32: Implement GetVolumeInformationByHandleW().
by Alexandre Julliard April 9, 2020

April 9, 2020

Module: wine Branch: master Commit: 928d1e64475f8936967943675754a0cacda48b3a URL: https://source.winehq.org/git/wine.git/?a=commit;h=928d1e64475f893696794367… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 8 16:06:07 2020 -0500 kernel32: Implement GetVolumeInformationByHandleW(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/volume.c | 68 ++++++++++++++++++++++++++++++++++++++++++++ dlls/kernel32/volume.c | 67 +++++++++++++++++++++++++++++++++---------- 2 files changed, 120 insertions(+), 15 deletions(-) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index 37d15fd3f8..126df5b8a0 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -60,6 +60,7 @@ static BOOL (WINAPI *pGetVolumePathNameA)(LPCSTR, LPSTR, DWORD); static BOOL (WINAPI *pGetVolumePathNamesForVolumeNameA)(LPCSTR, LPSTR, DWORD, LPDWORD); static BOOL (WINAPI *pGetVolumePathNamesForVolumeNameW)(LPCWSTR, LPWSTR, DWORD, LPDWORD); static BOOL (WINAPI *pCreateSymbolicLinkA)(const char *, const char *, DWORD); +static BOOL (WINAPI *pGetVolumeInformationByHandleW)(HANDLE, WCHAR *, DWORD, DWORD *, DWORD *, DWORD *, WCHAR *, DWORD); /* ############################### */ @@ -1520,6 +1521,71 @@ static void test_mounted_folder(void) ok(ret, "got error %u\n", GetLastError()); } +static void test_GetVolumeInformationByHandle(void) +{ + char buffer[50] DECLSPEC_ALIGN(8); + FILE_FS_ATTRIBUTE_INFORMATION *attr_info = (void *)buffer; + FILE_FS_VOLUME_INFORMATION *volume_info = (void *)buffer; + DWORD serial, filename_len, flags; + WCHAR label[20], fsname[20]; + IO_STATUS_BLOCK io; + HANDLE file; + NTSTATUS status; + BOOL ret; + + if (!pGetVolumeInformationByHandleW) + { + win_skip("GetVolumeInformationByHandleW is not present.\n"); + return; + } + + file = CreateFileA( "C:/windows", 0, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, + OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL ); + ok(file != INVALID_HANDLE_VALUE, "failed to open file, error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pGetVolumeInformationByHandleW( INVALID_HANDLE_VALUE, label, ARRAY_SIZE(label), &serial, + &filename_len, &flags, fsname, ARRAY_SIZE(fsname) ); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE, "got error %u\n", GetLastError()); + + ret = pGetVolumeInformationByHandleW( file, NULL, 0, NULL, NULL, NULL, NULL, 0 ); + ok(ret, "got error %u\n", GetLastError()); + + ret = pGetVolumeInformationByHandleW( file, label, ARRAY_SIZE(label), &serial, + &filename_len, &flags, fsname, ARRAY_SIZE(fsname) ); + ok(ret, "got error %u\n", GetLastError()); + + memset(buffer, 0, sizeof(buffer)); + status = NtQueryVolumeInformationFile( file, &io, buffer, sizeof(buffer), FileFsAttributeInformation ); + ok(!status, "got status %#x\n", status); + ok(flags == attr_info->FileSystemAttributes, "expected flags %#x, got %#x\n", + attr_info->FileSystemAttributes, flags); + ok(filename_len == attr_info->MaximumComponentNameLength, "expected filename_len %u, got %u\n", + attr_info->MaximumComponentNameLength, filename_len); + ok(!wcscmp( fsname, attr_info->FileSystemName ), "expected fsname %s, got %s\n", + debugstr_w( attr_info->FileSystemName ), debugstr_w( fsname )); + ok(wcslen( fsname ) == attr_info->FileSystemNameLength / sizeof(WCHAR), + "expected fsname length %u, got %u\n", attr_info->FileSystemNameLength / sizeof(WCHAR), wcslen( fsname )); + + SetLastError(0xdeadbeef); + ret = pGetVolumeInformationByHandleW( file, NULL, 0, NULL, &filename_len, &flags, fsname, 2 ); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_BAD_LENGTH, "got error %u\n", GetLastError()); + + memset(buffer, 0, sizeof(buffer)); + status = NtQueryVolumeInformationFile( file, &io, buffer, sizeof(buffer), FileFsVolumeInformation ); + ok(!status, "got status %#x\n", status); + ok(serial == volume_info->VolumeSerialNumber, "expected serial %08x, got %08x\n", + volume_info->VolumeSerialNumber, serial); + ok(!wcscmp( label, volume_info->VolumeLabel ), "expected label %s, got %s\n", + debugstr_w( volume_info->VolumeLabel ), debugstr_w( label )); + ok(wcslen( label ) == volume_info->VolumeLabelLength / sizeof(WCHAR), + "expected label length %u, got %u\n", volume_info->VolumeLabelLength / sizeof(WCHAR), wcslen( label )); + + CloseHandle( file ); +} + START_TEST(volume) { hdll = GetModuleHandleA("kernel32.dll"); @@ -1535,6 +1601,7 @@ START_TEST(volume) pGetVolumePathNamesForVolumeNameA = (void *) GetProcAddress(hdll, "GetVolumePathNamesForVolumeNameA"); pGetVolumePathNamesForVolumeNameW = (void *) GetProcAddress(hdll, "GetVolumePathNamesForVolumeNameW"); pCreateSymbolicLinkA = (void *) GetProcAddress(hdll, "CreateSymbolicLinkA"); + pGetVolumeInformationByHandleW = (void *) GetProcAddress(hdll, "GetVolumeInformationByHandleW"); test_query_dos_deviceA(); test_dos_devices(); @@ -1553,4 +1620,5 @@ START_TEST(volume) test_GetVolumePathNamesForVolumeNameW(); test_cdrom_ioctl(); test_mounted_folder(); + test_GetVolumeInformationByHandle(); } diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index 4f0f4a0a0f..7555dd9e95 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -2117,21 +2117,58 @@ BOOL WINAPI SetVolumeMountPointW(LPCWSTR path, LPCWSTR volume) /*********************************************************************** * GetVolumeInformationByHandleW (KERNEL32.@) */ -BOOL WINAPI GetVolumeInformationByHandleW(HANDLE handle, WCHAR *volnamebuf, DWORD volnamesize, DWORD *volserial, DWORD *maxlength, DWORD *flags, WCHAR *fsnamebuf, DWORD fsnamesize) +BOOL WINAPI GetVolumeInformationByHandleW( HANDLE handle, WCHAR *label, DWORD label_len, + DWORD *serial, DWORD *filename_len, DWORD *flags, + WCHAR *fsname, DWORD fsname_len ) { - FIXME("%p %p %d %p %p %p %p %d\n", handle, volnamebuf, volnamesize, volserial, maxlength, flags, fsnamebuf, fsnamesize); - - if(volnamebuf && volnamesize) - *volnamebuf = 0; - if(volserial) - *volserial = 0; - if(maxlength) - *maxlength = 0; - if(flags) - *flags = 0; - if(fsnamebuf && fsnamesize) - *fsnamebuf = 0; + IO_STATUS_BLOCK io; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + TRACE( "%p\n", handle ); + + if (label || serial) + { + char buffer[sizeof(FILE_FS_VOLUME_INFORMATION) + MAX_PATH * sizeof(WCHAR)]; + FILE_FS_VOLUME_INFORMATION *info = (FILE_FS_VOLUME_INFORMATION *)buffer; + + if (!set_ntstatus( NtQueryVolumeInformationFile( handle, &io, info, sizeof(buffer), + FileFsVolumeInformation ) )) + return FALSE; + + if (label) + { + if (label_len < info->VolumeLabelLength / sizeof(WCHAR) + 1) + { + SetLastError( ERROR_BAD_LENGTH ); + return FALSE; + } + memcpy( label, info->VolumeLabel, info->VolumeLabelLength ); + label[info->VolumeLabelLength / sizeof(WCHAR)] = 0; + } + if (serial) *serial = info->VolumeSerialNumber; + } + + if (filename_len || flags || fsname) + { + char buffer[sizeof(FILE_FS_ATTRIBUTE_INFORMATION) + MAX_PATH * sizeof(WCHAR)]; + FILE_FS_ATTRIBUTE_INFORMATION *info = (FILE_FS_ATTRIBUTE_INFORMATION *)buffer; + + if (!set_ntstatus( NtQueryVolumeInformationFile( handle, &io, info, sizeof(buffer), + FileFsAttributeInformation ) )) + return FALSE; + + if (fsname) + { + if (fsname_len < info->FileSystemNameLength / sizeof(WCHAR) + 1) + { + SetLastError( ERROR_BAD_LENGTH ); + return FALSE; + } + memcpy( fsname, info->FileSystemName, info->FileSystemNameLength ); + fsname[info->FileSystemNameLength / sizeof(WCHAR)] = 0; + } + if (filename_len) *filename_len = info->MaximumComponentNameLength; + if (flags) *flags = info->FileSystemAttributes; + } + + return TRUE; }

1 0