January 2022 - Wine-commits

Zebediah Figura : winhttp: Remove unused ole32 import.
by Alexandre Julliard 19 Jan '22

19 Jan '22

Module: wine Branch: master Commit: f400f25c2516654f85e0246a4815a2bf62a73cfd URL: https://source.winehq.org/git/wine.git/?a=commit;h=f400f25c2516654f85e0246a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jan 18 17:13:50 2022 -0600 winhttp: Remove unused ole32 import. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winhttp/Makefile.in b/dlls/winhttp/Makefile.in index f4fc317c5f1..97266fbc92a 100644 --- a/dlls/winhttp/Makefile.in +++ b/dlls/winhttp/Makefile.in @@ -1,7 +1,7 @@ MODULE = winhttp.dll IMPORTLIB = winhttp IMPORTS = uuid jsproxy user32 advapi32 ws2_32 -DELAYIMPORTS = oleaut32 ole32 crypt32 secur32 iphlpapi dhcpcsvc +DELAYIMPORTS = oleaut32 crypt32 secur32 iphlpapi dhcpcsvc C_SRCS = \ cookie.c \

1 0

Eric Pouech : dwrite: Adjust implementation to match prototype.
by Alexandre Julliard 19 Jan '22

19 Jan '22

Module: wine Branch: master Commit: de603a0d13ea86820839efd882250e286b99aff6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=de603a0d13ea86820839efd8… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sun Jan 16 11:16:44 2022 +0100 dwrite: Adjust implementation to match prototype. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 024741388cf..141b57fbaee 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -687,10 +687,10 @@ extern void release_scriptshaping_cache(struct scriptshaping_cache*) DECLSPEC_HI extern struct scriptshaping_cache *fontface_get_shaping_cache(struct dwrite_fontface *fontface) DECLSPEC_HIDDEN; extern void opentype_layout_scriptshaping_cache_init(struct scriptshaping_cache *cache) DECLSPEC_HIDDEN; -extern DWORD opentype_layout_find_script(const struct scriptshaping_cache *cache, DWORD kind, DWORD tag, - unsigned int *script_index) DECLSPEC_HIDDEN; -extern DWORD opentype_layout_find_language(const struct scriptshaping_cache *cache, DWORD kind, DWORD tag, - unsigned int script_index, unsigned int *language_index) DECLSPEC_HIDDEN; +extern unsigned int opentype_layout_find_script(const struct scriptshaping_cache *cache, unsigned int kind, + DWORD tag, unsigned int *script_index) DECLSPEC_HIDDEN; +extern unsigned int opentype_layout_find_language(const struct scriptshaping_cache *cache, unsigned int kind, + DWORD tag, unsigned int script_index, unsigned int *language_index) DECLSPEC_HIDDEN; extern void opentype_layout_apply_gsub_features(struct scriptshaping_context *context, unsigned int script_index, unsigned int language_index, struct shaping_features *features) DECLSPEC_HIDDEN; extern void opentype_layout_apply_gpos_features(struct scriptshaping_context *context, unsigned int script_index,

1 0

Eric Pouech : include/winternl.h: Fix prototype definition.
by Alexandre Julliard 19 Jan '22

19 Jan '22

Module: wine Branch: master Commit: 2b59f0bbc729484e0e7a9c35f89abbb5334df72d URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b59f0bbc729484e0e7a9c35… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sun Jan 16 11:16:38 2022 +0100 include/winternl.h: Fix prototype definition. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winternl.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/winternl.h b/include/winternl.h index 0e23fdd97bf..5be28856920 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -4374,7 +4374,7 @@ NTSYSAPI NTSTATUS WINAPI RtlLookupAtomInAtomTable(RTL_ATOM_TABLE,const WCHAR*,R NTSYSAPI NTSTATUS WINAPI RtlMakeSelfRelativeSD(PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR,LPDWORD); NTSYSAPI void WINAPI RtlMapGenericMask(PACCESS_MASK,const GENERIC_MAPPING*); NTSYSAPI NTSTATUS WINAPI RtlMultiByteToUnicodeN(LPWSTR,DWORD,LPDWORD,LPCSTR,DWORD); -NTSYSAPI NTSTATUS WINAPI RtlMultiByteToUnicodeSize(DWORD*,LPCSTR,UINT); +NTSYSAPI NTSTATUS WINAPI RtlMultiByteToUnicodeSize(DWORD*,LPCSTR,ULONG); NTSYSAPI NTSTATUS WINAPI RtlNewSecurityObject(PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR*,BOOLEAN,HANDLE,PGENERIC_MAPPING); NTSYSAPI PRTL_USER_PROCESS_PARAMETERS WINAPI RtlNormalizeProcessParams(RTL_USER_PROCESS_PARAMETERS*); NTSYSAPI NTSTATUS WINAPI RtlNormalizeString(ULONG,const WCHAR*,INT,WCHAR*,INT*); @@ -4382,7 +4382,7 @@ NTSYSAPI ULONG WINAPI RtlNtStatusToDosError(NTSTATUS); NTSYSAPI ULONG WINAPI RtlNtStatusToDosErrorNoTeb(NTSTATUS); NTSYSAPI ULONG WINAPI RtlNumberOfSetBits(PCRTL_BITMAP); NTSYSAPI ULONG WINAPI RtlNumberOfClearBits(PCRTL_BITMAP); -NTSYSAPI UINT WINAPI RtlOemStringToUnicodeSize(const STRING*); +NTSYSAPI ULONG WINAPI RtlOemStringToUnicodeSize(const STRING*); NTSYSAPI NTSTATUS WINAPI RtlOemStringToUnicodeString(UNICODE_STRING*,const STRING*,BOOLEAN); NTSYSAPI NTSTATUS WINAPI RtlOemToUnicodeN(LPWSTR,DWORD,LPDWORD,LPCSTR,DWORD); NTSYSAPI NTSTATUS WINAPI RtlOpenCurrentUser(ACCESS_MASK,PHANDLE);

1 0

Eric Pouech : rpcss: Fix implementation declaration to match prototype.
by Alexandre Julliard 19 Jan '22

19 Jan '22

Module: wine Branch: master Commit: ecd84626cbe4d1b17b574fe1796553102d921d54 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ecd84626cbe4d1b17b574fe1… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sun Jan 16 11:16:50 2022 +0100 rpcss: Fix implementation declaration to match prototype. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/rpcss/rpcss_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/rpcss/rpcss_main.c b/programs/rpcss/rpcss_main.c index 7df859155e2..af055e6000a 100644 --- a/programs/rpcss/rpcss_main.c +++ b/programs/rpcss/rpcss_main.c @@ -52,7 +52,7 @@ struct registered_class static CRITICAL_SECTION registered_classes_cs = { NULL, -1, 0, 0, 0, 0 }; static struct list registered_classes = LIST_INIT(registered_classes); -HRESULT __cdecl irpcss_server_register(handle_t h, const GUID *clsid, DWORD flags, +HRESULT __cdecl irpcss_server_register(handle_t h, const GUID *clsid, unsigned int flags, PMInterfacePointer object, unsigned int *cookie) { struct registered_class *entry;

1 0

Alexandre Julliard : configure: No longer disable mountmgr.sys in a Windows build.
by Alexandre Julliard 19 Jan '22

19 Jan '22

Module: wine Branch: master Commit: 318822d2589f492654de0ed56a116bf5ae5a578c URL: https://source.winehq.org/git/wine.git/?a=commit;h=318822d2589f492654de0ed5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 19 10:53:29 2022 +0100 configure: No longer disable mountmgr.sys in a Windows build. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 3 +-- configure.ac | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/configure b/configure index dcce2e8644e..a37c450f06c 100755 --- a/configure +++ b/configure @@ -9828,8 +9828,7 @@ then : LDDLLFLAGS="-Wl,--disable-stdcall-fixup" fi ;; esac - enable_mountmgr_sys=${enable_mountmgr_sys:-no} - enable_loader=${enable_loader:-no} + enable_loader=${enable_loader:-no} enable_server=${enable_server:-no} with_x=${with_x:-no} with_pthread=${with_pthread:-no} diff --git a/configure.ac b/configure.ac index b42cb8a5346..b4417957c9e 100644 --- a/configure.ac +++ b/configure.ac @@ -673,7 +673,6 @@ case $host_os in [LDDLLFLAGS="-Wl,--disable-stdcall-fixup"]) ;; esac dnl Disable modules that can't be used on Windows - enable_mountmgr_sys=${enable_mountmgr_sys:-no} enable_loader=${enable_loader:-no} enable_server=${enable_server:-no} dnl Disable dependencies that are not useful on Windows

1 0

Alexandre Julliard : tools: Use flush_output_buffer() in a few more places.
by Alexandre Julliard 19 Jan '22

19 Jan '22

Module: wine Branch: master Commit: 49326cb258c76ee470df697d7626f447fa9bebfc URL: https://source.winehq.org/git/wine.git/?a=commit;h=49326cb258c76ee470df697d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 19 10:55:08 2022 +0100 tools: Use flush_output_buffer() in a few more places. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/utils.c | 11 ++--------- tools/winebuild/res32.c | 8 +------- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/tools/widl/utils.c b/tools/widl/utils.c index feb590057f5..aad40f6b087 100644 --- a/tools/widl/utils.c +++ b/tools/widl/utils.c @@ -276,7 +276,6 @@ void add_output_to_resources( const char *type, const char *name ) void flush_output_resources( const char *name ) { - int fd; unsigned int i; /* all output must have been saved with add_output_to_resources() first */ @@ -294,19 +293,13 @@ void flush_output_resources( const char *name ) put_dword( 0 ); /* Version */ put_dword( 0 ); /* Characteristics */ - fd = open( name, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, 0666 ); - if (fd == -1) error( "Error creating %s\n", name ); - if (write( fd, output_buffer, output_buffer_pos ) != output_buffer_pos) - error( "Error writing to %s\n", name ); for (i = 0; i < nb_resources; i++) { - if (write( fd, resources[i].data, resources[i].size ) != resources[i].size) - error( "Error writing to %s\n", name ); + put_data( resources[i].data, resources[i].size ); free( resources[i].data ); } - close( fd ); + flush_output_buffer( name ); nb_resources = 0; - free( output_buffer ); } /* pointer-sized word */ diff --git a/tools/winebuild/res32.c b/tools/winebuild/res32.c index 85c49d0019a..a0209ad6f2a 100644 --- a/tools/winebuild/res32.c +++ b/tools/winebuild/res32.c @@ -623,7 +623,6 @@ void output_res_o_file( DLLSPEC *spec ) { unsigned int i; char *res_file = NULL; - int fd; struct strarray args; if (!spec->nb_resources) fatal_error( "--resources mode needs at least one resource file as input\n" ); @@ -673,12 +672,7 @@ void output_res_o_file( DLLSPEC *spec ) } res_file = get_temp_file_name( output_file_name, ".res" ); - if ((fd = open( res_file, O_WRONLY|O_CREAT|O_TRUNC|O_BINARY, 0600 )) == -1) - fatal_error( "Cannot create %s\n", res_file ); - if (write( fd, output_buffer, output_buffer_pos ) != output_buffer_pos) - fatal_error( "Error writing to %s\n", res_file ); - close( fd ); - free( output_buffer ); + flush_output_buffer( res_file ); args = find_tool( "windres", NULL ); strarray_add( &args, "-i" );

1 0

Alexandre Julliard : tools: Add a helper function to read the contents of a file.
by Alexandre Julliard 19 Jan '22

19 Jan '22

Module: wine Branch: master Commit: c562952f924fd1debc75e860ad45e65f66556552 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c562952f924fd1debc75e860… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 19 10:57:30 2022 +0100 tools: Add a helper function to read the contents of a file. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/tools.h | 22 ++++++++++++++++++++++ tools/winebuild/utils.c | 13 ++----------- tools/winedump/dump.c | 16 +++------------- tools/winedump/winedump.h | 2 +- tools/wmc/po.c | 22 +++++++--------------- tools/wmc/utils.c | 20 ++++++++------------ tools/wrc/po.c | 22 +++++++--------------- tools/wrc/utils.c | 20 ++++++++------------ 8 files changed, 58 insertions(+), 79 deletions(-) diff --git a/tools/tools.h b/tools/tools.h index 1065d25c6d6..1e86e38356d 100644 --- a/tools/tools.h +++ b/tools/tools.h @@ -350,6 +350,28 @@ static inline int make_temp_file( const char *prefix, const char *suffix, char * } +static inline void *read_file( const char *name, size_t *size ) +{ + struct stat st; + int res, fd; + void *data; + + if ((fd = open( name, O_RDONLY | O_BINARY )) == -1) return NULL; + fstat( fd, &st ); + data = xmalloc( st.st_size ); + res = read( fd, data, st.st_size ); + if (res == -1) + { + free( data ); + data = NULL; + *size = 0; + } + else *size = res; + close( fd ); + return data; +} + + static inline struct target get_default_target(void) { struct target target; diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 42c5dca8516..5549691ef10 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -434,18 +434,9 @@ size_t output_buffer_size; void init_input_buffer( const char *file ) { - int fd; - struct stat st; - unsigned char *buffer; - - if ((fd = open( file, O_RDONLY | O_BINARY )) == -1) fatal_perror( "Cannot open %s", file ); - if ((fstat( fd, &st ) == -1)) fatal_perror( "Cannot stat %s", file ); - if (!st.st_size) fatal_error( "%s is an empty file\n", file ); - input_buffer = buffer = xmalloc( st.st_size ); - if (read( fd, buffer, st.st_size ) != st.st_size) fatal_error( "Cannot read %s\n", file ); - close( fd ); + if (!(input_buffer = read_file( file, &input_buffer_size ))) fatal_perror( "Cannot read %s", file ); + if (!input_buffer_size) fatal_error( "%s is an empty file\n", file ); input_buffer_filename = xstrdup( file ); - input_buffer_size = st.st_size; input_buffer_pos = 0; byte_swapped = 0; } diff --git a/tools/winedump/dump.c b/tools/winedump/dump.c index 33c98648d8c..512525fda7f 100644 --- a/tools/winedump/dump.c +++ b/tools/winedump/dump.c @@ -31,7 +31,7 @@ #include "winedump.h" void *dump_base = NULL; -unsigned long dump_total_len = 0; +size_t dump_total_len = 0; void dump_data( const unsigned char *ptr, unsigned int size, const char *prefix ) { @@ -264,23 +264,14 @@ dumpers[] = BOOL dump_analysis(const char *name, file_dumper fn, enum FileSig wanted_sig) { - int fd; BOOL ret = TRUE; - struct stat s; const struct dumper *dpr; setbuf(stdout, NULL); - fd = open(name, O_RDONLY | O_BINARY); - if (fd == -1) fatal("Can't open file"); + if (!(dump_base = read_file( name, &dump_total_len ))) fatal( "Cannot read file" ); - if (fstat(fd, &s) < 0) fatal("Can't get size"); - dump_total_len = s.st_size; - - dump_base = xmalloc( dump_total_len ); - if ((unsigned long)read( fd, dump_base, dump_total_len ) != dump_total_len) fatal( "Cannot read file" ); - - printf("Contents of %s: %ld bytes\n\n", name, dump_total_len); + printf("Contents of %s: %zu bytes\n\n", name, dump_total_len); for (dpr = dumpers; dpr->kind != SIG_UNKNOWN; dpr++) { @@ -299,7 +290,6 @@ BOOL dump_analysis(const char *name, file_dumper fn, enum FileSig wanted_sig) if (ret) printf("Done dumping %s\n", name); free( dump_base ); - close(fd); return ret; } diff --git a/tools/winedump/winedump.h b/tools/winedump/winedump.h index 6013d3caae6..c84a98946b3 100644 --- a/tools/winedump/winedump.h +++ b/tools/winedump/winedump.h @@ -139,7 +139,7 @@ typedef struct __globals extern _globals globals; extern void *dump_base; -extern unsigned long dump_total_len; +extern size_t dump_total_len; /* Names to use for output DLL */ #define OUTPUT_DLL_NAME \ diff --git a/tools/wmc/po.c b/tools/wmc/po.c index ae4df7ad733..174da69759e 100644 --- a/tools/wmc/po.c +++ b/tools/wmc/po.c @@ -542,21 +542,13 @@ static void byteswap( unsigned int *data, unsigned int count ) static void load_mo_file( const char *name ) { - struct stat st; - int res, fd; - - fd = open( name, O_RDONLY | O_BINARY ); - if (fd == -1) fatal_perror( "Failed to open %s", name ); - fstat( fd, &st ); - mo_file = xmalloc( st.st_size ); - res = read( fd, mo_file, st.st_size ); - if (res == -1) fatal_perror( "Failed to read %s", name ); - else if (res != st.st_size) error( "Failed to read %s\n", name ); - close( fd ); + size_t size; + + if (!(mo_file = read_file( name, &size ))) fatal_perror( "Failed to read %s", name ); /* sanity checks */ - if (st.st_size < sizeof(*mo_file)) + if (size < sizeof(*mo_file)) error( "%s is not a valid .mo file\n", name ); if (mo_file->magic == 0xde120495) byteswap( &mo_file->revision, 4 ); @@ -564,9 +556,9 @@ static void load_mo_file( const char *name ) error( "%s is not a valid .mo file\n", name ); if ((mo_file->revision >> 16) > 1) error( "%s: unsupported file version %x\n", name, mo_file->revision ); - if (mo_file->msgid_off >= st.st_size || - mo_file->msgstr_off >= st.st_size || - st.st_size < sizeof(*mo_file) + 2 * 8 * mo_file->count) + if (mo_file->msgid_off >= size || + mo_file->msgstr_off >= size || + size < sizeof(*mo_file) + 2 * 8 * mo_file->count) error( "%s: corrupted file\n", name ); if (mo_file->magic == 0xde120495) diff --git a/tools/wmc/utils.c b/tools/wmc/utils.c index 26becacfe87..4454add2f7d 100644 --- a/tools/wmc/utils.c +++ b/tools/wmc/utils.c @@ -356,11 +356,10 @@ static void init_nls_info( struct nls_info *info, unsigned short *ptr ) static const struct nls_info *get_nls_info( unsigned int codepage ) { - struct stat st; unsigned short *data; char *path; unsigned int i; - int fd; + size_t size; for (i = 0; i < ARRAY_SIZE(nlsinfo) && nlsinfo[i].codepage; i++) if (nlsinfo[i].codepage == codepage) return &nlsinfo[i]; @@ -370,18 +369,15 @@ static const struct nls_info *get_nls_info( unsigned int codepage ) for (i = 0; nlsdirs[i]; i++) { path = strmake( "%s/c_%03u.nls", nlsdirs[i], codepage ); - if ((fd = open( path, O_RDONLY )) != -1) break; + if ((data = read_file( path, &size ))) + { + free( path ); + init_nls_info( &nlsinfo[i], data ); + return &nlsinfo[i]; + } free( path ); } - if (!nlsdirs[i]) return NULL; - - fstat( fd, &st ); - data = xmalloc( st.st_size ); - if (read( fd, data, st.st_size ) != st.st_size) error( "failed to load %s\n", path ); - close( fd ); - free( path ); - init_nls_info( &nlsinfo[i], data ); - return &nlsinfo[i]; + return NULL; } int is_valid_codepage(int cp) diff --git a/tools/wrc/po.c b/tools/wrc/po.c index 42e06f93c10..b2e52c38c22 100644 --- a/tools/wrc/po.c +++ b/tools/wrc/po.c @@ -1102,21 +1102,13 @@ static void byteswap( unsigned int *data, unsigned int count ) static void load_mo_file( const char *name ) { - struct stat st; - int res, fd; - - fd = open( name, O_RDONLY | O_BINARY ); - if (fd == -1) fatal_perror( "Failed to open %s", name ); - fstat( fd, &st ); - mo_file = xmalloc( st.st_size ); - res = read( fd, mo_file, st.st_size ); - if (res == -1) fatal_perror( "Failed to read %s", name ); - else if (res != st.st_size) error( "Failed to read %s\n", name ); - close( fd ); + size_t size; + + if (!(mo_file = read_file( name, &size ))) fatal_perror( "Failed to read %s", name ); /* sanity checks */ - if (st.st_size < sizeof(*mo_file)) + if (size < sizeof(*mo_file)) error( "%s is not a valid .mo file\n", name ); if (mo_file->magic == 0xde120495) byteswap( &mo_file->revision, 4 ); @@ -1124,9 +1116,9 @@ static void load_mo_file( const char *name ) error( "%s is not a valid .mo file\n", name ); if ((mo_file->revision >> 16) > 1) error( "%s: unsupported file version %x\n", name, mo_file->revision ); - if (mo_file->msgid_off >= st.st_size || - mo_file->msgstr_off >= st.st_size || - st.st_size < sizeof(*mo_file) + 2 * 8 * mo_file->count) + if (mo_file->msgid_off >= size || + mo_file->msgstr_off >= size || + size < sizeof(*mo_file) + 2 * 8 * mo_file->count) error( "%s: corrupted file\n", name ); if (mo_file->magic == 0xde120495) diff --git a/tools/wrc/utils.c b/tools/wrc/utils.c index f6f36260617..b37bb226319 100644 --- a/tools/wrc/utils.c +++ b/tools/wrc/utils.c @@ -237,11 +237,10 @@ static void init_nls_info( struct nls_info *info, unsigned short *ptr ) static const struct nls_info *get_nls_info( unsigned int codepage ) { - struct stat st; unsigned short *data; char *path; unsigned int i; - int fd; + size_t size; for (i = 0; i < ARRAY_SIZE(nlsinfo) && nlsinfo[i].codepage; i++) if (nlsinfo[i].codepage == codepage) return &nlsinfo[i]; @@ -251,18 +250,15 @@ static const struct nls_info *get_nls_info( unsigned int codepage ) for (i = 0; nlsdirs[i]; i++) { path = strmake( "%s/c_%03u.nls", nlsdirs[i], codepage ); - if ((fd = open( path, O_RDONLY )) != -1) break; + if ((data = read_file( path, &size ))) + { + free( path ); + init_nls_info( &nlsinfo[i], data ); + return &nlsinfo[i]; + } free( path ); } - if (!nlsdirs[i]) return NULL; - - fstat( fd, &st ); - data = xmalloc( st.st_size ); - if (read( fd, data, st.st_size ) != st.st_size) error( "failed to load %s\n", path ); - close( fd ); - free( path ); - init_nls_info( &nlsinfo[i], data ); - return &nlsinfo[i]; + return NULL; } int is_valid_codepage(int cp)

1 0

Alexandre Julliard : makefiles: Get rid of the documentation rules.
by Alexandre Julliard 19 Jan '22

19 Jan '22

Module: wine Branch: master Commit: 9d494730fe9b8b79e01bba10116de2dddb8ad36f URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d494730fe9b8b79e01bba10… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 19 16:18:33 2022 +0100 makefiles: Get rid of the documentation rules. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 14 +- configure.ac | 13 +- tools/c2man.pl | 2380 ------------------------------------------------------- tools/makedep.c | 78 +- 4 files changed, 14 insertions(+), 2471 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9d494730fe9b8b79e01b…

1 0

Zebediah Figura : d3d11: Implement ID3D11RasterizerState1.
by Alexandre Julliard 19 Jan '22

19 Jan '22

Module: wine Branch: master Commit: 7bf9e8382f92394b8b4b2b8da618a6730975f561 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7bf9e8382f92394b8b4b2b8d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jan 18 15:25:55 2022 -0600 d3d11: Implement ID3D11RasterizerState1. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/d3d11_private.h | 2 +- dlls/d3d11/device.c | 7 +++-- dlls/d3d11/state.c | 68 ++++++++++++++++++++++++++++------------------ dlls/d3d11/tests/d3d11.c | 19 +++++++++++++ 4 files changed, 65 insertions(+), 31 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7bf9e8382f92394b8b4b…

1 0

Zebediah Figura : d3d11: Implement ID3D11Device1::CreateRasterizerState1().
by Alexandre Julliard 19 Jan '22

19 Jan '22

Module: wine Branch: master Commit: 0d901c1cf17eec7e74347707e7c46a5e76a8383f URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d901c1cf17eec7e74347707… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jan 18 15:25:56 2022 -0600 d3d11: Implement ID3D11Device1::CreateRasterizerState1(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52294 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/d3d11_private.h | 4 ++-- dlls/d3d11/device.c | 38 ++++++++++++++++++++++++++++++++------ dlls/d3d11/state.c | 19 +++++++++++-------- dlls/d3d11/tests/d3d11.c | 7 +++++++ 4 files changed, 52 insertions(+), 16 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index b45ef8431bf..41272d08da8 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -467,12 +467,12 @@ struct d3d_rasterizer_state struct wined3d_private_store private_store; struct wined3d_rasterizer_state *wined3d_state; - D3D11_RASTERIZER_DESC desc; + D3D11_RASTERIZER_DESC1 desc; struct wine_rb_entry entry; ID3D11Device2 *device; }; -HRESULT d3d_rasterizer_state_create(struct d3d_device *device, const D3D11_RASTERIZER_DESC *desc, +HRESULT d3d_rasterizer_state_create(struct d3d_device *device, const D3D11_RASTERIZER_DESC1 *desc, struct d3d_rasterizer_state **state) DECLSPEC_HIDDEN; struct d3d_rasterizer_state *unsafe_impl_from_ID3D11RasterizerState(ID3D11RasterizerState *iface) DECLSPEC_HIDDEN; struct d3d_rasterizer_state *unsafe_impl_from_ID3D10RasterizerState(ID3D10RasterizerState *iface) DECLSPEC_HIDDEN; diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index c0191677e77..eb8a7e65ccd 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3598,11 +3598,18 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateRasterizerState(ID3D11Device { struct d3d_device *device = impl_from_ID3D11Device2(iface); struct d3d_rasterizer_state *object; + D3D11_RASTERIZER_DESC1 desc1; HRESULT hr; TRACE("iface %p, desc %p, rasterizer_state %p.\n", iface, desc, rasterizer_state); - if (FAILED(hr = d3d_rasterizer_state_create(device, desc, &object))) + if (!desc) + return E_INVALIDARG; + + memcpy(&desc1, desc, sizeof(*desc)); + desc1.ForcedSampleCount = 0; + + if (FAILED(hr = d3d_rasterizer_state_create(device, &desc1, &object))) return hr; *rasterizer_state = (ID3D11RasterizerState *)&object->ID3D11RasterizerState1_iface; @@ -4210,9 +4217,21 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateBlendState1(ID3D11Device2 *i static HRESULT STDMETHODCALLTYPE d3d11_device_CreateRasterizerState1(ID3D11Device2 *iface, const D3D11_RASTERIZER_DESC1 *desc, ID3D11RasterizerState1 **state) { - FIXME("iface %p, desc %p, state %p stub!\n", iface, desc, state); + struct d3d_device *device = impl_from_ID3D11Device2(iface); + struct d3d_rasterizer_state *object; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, desc %p, state %p.\n", iface, desc, state); + + if (!desc) + return E_INVALIDARG; + + if (FAILED(hr = d3d_rasterizer_state_create(device, desc, &object))) + return hr; + + *state = &object->ID3D11RasterizerState1_iface; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDeviceContextState(ID3D11Device2 *iface, UINT flags, @@ -6239,11 +6258,18 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateRasterizerState(ID3D10Device { struct d3d_device *device = impl_from_ID3D10Device(iface); struct d3d_rasterizer_state *object; + D3D11_RASTERIZER_DESC1 desc1; HRESULT hr; TRACE("iface %p, desc %p, rasterizer_state %p.\n", iface, desc, rasterizer_state); - if (FAILED(hr = d3d_rasterizer_state_create(device, (const D3D11_RASTERIZER_DESC *)desc, &object))) + if (!desc) + return E_INVALIDARG; + + memcpy(&desc1, desc, sizeof(*desc)); + desc1.ForcedSampleCount = 0; + + if (FAILED(hr = d3d_rasterizer_state_create(device, &desc1, &object))) return hr; *rasterizer_state = &object->ID3D10RasterizerState_iface; @@ -6779,8 +6805,8 @@ static int d3d_depthstencil_state_compare(const void *key, const struct wine_rb_ static int d3d_rasterizer_state_compare(const void *key, const struct wine_rb_entry *entry) { - const D3D11_RASTERIZER_DESC *ka = key; - const D3D11_RASTERIZER_DESC *kb = &WINE_RB_ENTRY_VALUE(entry, const struct d3d_rasterizer_state, entry)->desc; + const D3D11_RASTERIZER_DESC1 *ka = key; + const D3D11_RASTERIZER_DESC1 *kb = &WINE_RB_ENTRY_VALUE(entry, const struct d3d_rasterizer_state, entry)->desc; return memcmp(ka, kb, sizeof(*ka)); } diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index 9aa841f0805..bb12a93dec5 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -958,7 +958,7 @@ static void STDMETHODCALLTYPE d3d11_rasterizer_state_GetDesc(ID3D11RasterizerSta TRACE("iface %p, desc %p.\n", iface, desc); - *desc = state->desc; + memcpy(desc, &state->desc, sizeof(*desc)); } static void STDMETHODCALLTYPE d3d11_rasterizer_state_GetDesc1(ID3D11RasterizerState1 *iface, @@ -968,8 +968,7 @@ static void STDMETHODCALLTYPE d3d11_rasterizer_state_GetDesc1(ID3D11RasterizerSt TRACE("iface %p, desc %p.\n", iface, desc); - memcpy(desc, &state->desc, sizeof(state->desc)); - desc->ForcedSampleCount = 0; + *desc = state->desc; } static const struct ID3D11RasterizerState1Vtbl d3d11_rasterizer_state_vtbl = @@ -1122,7 +1121,7 @@ static enum wined3d_cull wined3d_cull_from_d3d11(D3D11_CULL_MODE mode) } static HRESULT d3d_rasterizer_state_init(struct d3d_rasterizer_state *state, struct d3d_device *device, - const D3D11_RASTERIZER_DESC *desc) + const D3D11_RASTERIZER_DESC1 *desc) { struct wined3d_rasterizer_state_desc wined3d_desc; HRESULT hr; @@ -1157,6 +1156,13 @@ static HRESULT d3d_rasterizer_state_init(struct d3d_rasterizer_state *state, str FIXME("Ignoring MultisampleEnable %#x.\n", desc->MultisampleEnable); } + if (desc->ForcedSampleCount) + { + static unsigned int once; + if (!once++) + FIXME("Ignoring ForcedSampleCount %#x.\n", desc->ForcedSampleCount); + } + /* We cannot fail after creating a wined3d_rasterizer_state object. It * would lead to double free. */ if (FAILED(hr = wined3d_rasterizer_state_create(device->wined3d_device, &wined3d_desc, @@ -1173,16 +1179,13 @@ static HRESULT d3d_rasterizer_state_init(struct d3d_rasterizer_state *state, str return S_OK; } -HRESULT d3d_rasterizer_state_create(struct d3d_device *device, const D3D11_RASTERIZER_DESC *desc, +HRESULT d3d_rasterizer_state_create(struct d3d_device *device, const D3D11_RASTERIZER_DESC1 *desc, struct d3d_rasterizer_state **state) { struct d3d_rasterizer_state *object; struct wine_rb_entry *entry; HRESULT hr; - if (!desc) - return E_INVALIDARG; - wined3d_mutex_lock(); if ((entry = wine_rb_get(&device->rasterizer_states, desc))) { diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index cd4905e2a82..298a2389555 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -5586,6 +5586,13 @@ static void test_create_rasterizer_state(void) ID3D11RasterizerState1_Release(state_ex1); + memcpy(&desc1, &desc, sizeof(desc)); + desc1.ForcedSampleCount = 0; + hr = ID3D11Device1_CreateRasterizerState1(device1, &desc1, &state_ex1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ID3D11RasterizerState1_Release(state_ex1); + ID3D11Device1_Release(device1); }

1 0