March 2016 - Wine-Commits - list.winehq.org

Henri Verbeet : d3d8: Use wined3d_texture_get_sub_resource_desc() in d3d8_texture_3d_GetLevelDesc().
by Alexandre Julliard March 1, 2016

March 1, 2016

Module: wine Branch: master Commit: cd25ecffa7b7f5a8e5e65d5433b14d3876e5bba2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd25ecffa7b7f5a8e5e65d543… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 29 18:19:28 2016 +0100 d3d8: Use wined3d_texture_get_sub_resource_desc() in d3d8_texture_3d_GetLevelDesc(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/texture.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index 78f40c7..7ed79a5 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -945,21 +945,16 @@ static DWORD WINAPI d3d8_texture_3d_GetLevelCount(IDirect3DVolumeTexture8 *iface static HRESULT WINAPI d3d8_texture_3d_GetLevelDesc(IDirect3DVolumeTexture8 *iface, UINT level, D3DVOLUME_DESC *desc) { struct d3d8_texture *texture = impl_from_IDirect3DVolumeTexture8(iface); - struct wined3d_resource *sub_resource; - HRESULT hr = D3D_OK; + struct wined3d_sub_resource_desc wined3d_desc; + HRESULT hr; TRACE("iface %p, level %u, desc %p.\n", iface, level, desc); wined3d_mutex_lock(); - if (!(sub_resource = wined3d_texture_get_sub_resource(texture->wined3d_texture, level))) - hr = D3DERR_INVALIDCALL; - else + if (SUCCEEDED(hr = wined3d_texture_get_sub_resource_desc(texture->wined3d_texture, level, &wined3d_desc))) { - struct wined3d_resource_desc wined3d_desc; - - wined3d_resource_get_desc(sub_resource, &wined3d_desc); desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format); - desc->Type = wined3d_desc.resource_type; + desc->Type = D3DRTYPE_VOLUME; desc->Usage = wined3d_desc.usage & WINED3DUSAGE_MASK; desc->Pool = wined3d_desc.pool; desc->Size = wined3d_desc.size;

1 0

Juan Jose Gonzalez : include: Add HidD_GetSerialNumberString to ddk/ hidsdi.h.
by Alexandre Julliard March 1, 2016

March 1, 2016

Module: wine Branch: master Commit: 4eddd5dba343d541fa79564ffbc7ad6d5cbe8e76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4eddd5dba343d541fa79564ff… Author: Juan Jose Gonzalez <juanj.gh(a)gmail.com> Date: Mon Feb 29 20:22:09 2016 +0100 include: Add HidD_GetSerialNumberString to ddk/hidsdi.h. Signed-off-by: Juan Jose Gonzalez <juanj.gh(a)gmail.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ddk/hidsdi.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/ddk/hidsdi.h b/include/ddk/hidsdi.h index 566d030..c8a0d73 100644 --- a/include/ddk/hidsdi.h +++ b/include/ddk/hidsdi.h @@ -39,6 +39,7 @@ void WINAPI HidD_GetHidGuid(LPGUID guid); BOOLEAN WINAPI HidD_GetInputReport(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength); BOOLEAN WINAPI HidD_GetManufacturerString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength); BOOLEAN WINAPI HidD_GetProductString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength); +BOOLEAN WINAPI HidD_GetSerialNumberString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength); BOOLEAN WINAPI HidD_SetFeature(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength); BOOLEAN WINAPI HidD_GetPreparsedData( HANDLE HidDeviceObject, PHIDP_PREPARSED_DATA *PreparsedData); BOOLEAN WINAPI HidD_FreePreparsedData(PHIDP_PREPARSED_DATA PreparsedData);

1 0

Alexandre Julliard : makefiles: Generate the LINGUAS file.
by Alexandre Julliard March 1, 2016

March 1, 2016

Module: wine Branch: master Commit: f7a239a504dcd877264796b133d62c0444c3da86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7a239a504dcd877264796b13… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 1 14:30:24 2016 +0900 makefiles: Generate the LINGUAS file. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 3 --- configure.ac | 1 - po/LINGUAS | 45 --------------------------------------------- tools/make_makefiles | 13 +------------ tools/makedep.c | 30 ++++++++++++++++++++++++++++++ 5 files changed, 31 insertions(+), 61 deletions(-) diff --git a/configure b/configure index 2f40d7e..31573d0 100755 --- a/configure +++ b/configure @@ -17246,8 +17246,6 @@ test "$srcdir" = "." || wine_fn_config_symlink fonts/marlett.ttf fonts/symbol.tt fi ac_config_links="$ac_config_links loader/l_intl.nls:loader/l_intl.nls" test "$srcdir" = "." || wine_fn_config_symlink loader/l_intl.nls -ac_config_links="$ac_config_links po/LINGUAS:po/LINGUAS" -test "$srcdir" = "." || wine_fn_config_symlink po/LINGUAS ac_config_links="$ac_config_links wine:tools/winewrapper" wine_fn_config_symlink wine if test "x$enable_win64" != xno; then @@ -18970,7 +18968,6 @@ do "fonts/tahomabd.ttf") CONFIG_LINKS="$CONFIG_LINKS fonts/tahomabd.ttf:fonts/tahomabd.ttf" ;; "fonts/wingding.ttf") CONFIG_LINKS="$CONFIG_LINKS fonts/wingding.ttf:fonts/wingding.ttf" ;; "loader/l_intl.nls") CONFIG_LINKS="$CONFIG_LINKS loader/l_intl.nls:loader/l_intl.nls" ;; - "po/LINGUAS") CONFIG_LINKS="$CONFIG_LINKS po/LINGUAS:po/LINGUAS" ;; "wine") CONFIG_LINKS="$CONFIG_LINKS wine:tools/winewrapper" ;; "wine64") CONFIG_LINKS="$CONFIG_LINKS wine64:tools/winewrapper" ;; "tools/makedep") CONFIG_COMMANDS="$CONFIG_COMMANDS tools/makedep" ;; diff --git a/configure.ac b/configure.ac index 54b16f6..82a8d0f 100644 --- a/configure.ac +++ b/configure.ac @@ -2611,7 +2611,6 @@ test -n "$CROSSTARGET" || WINE_APPEND_RULE( WINE_CONFIG_SYMLINK(fonts,fonts,[marlett.ttf,symbol.ttf,tahoma.ttf,tahomabd.ttf,wingding.ttf],enable_fonts) WINE_CONFIG_SYMLINK(loader,loader,[l_intl.nls]) -WINE_CONFIG_SYMLINK(po,po,[LINGUAS]) WINE_CONFIG_SYMLINK(,tools,[wine],,winewrapper) WINE_CONFIG_SYMLINK(,tools,[wine64],enable_win64,winewrapper) diff --git a/po/LINGUAS b/po/LINGUAS deleted file mode 100644 index 091a734..0000000 --- a/po/LINGUAS +++ /dev/null @@ -1,45 +0,0 @@ -ar -bg -ca -cs -da -de -el -en -en_US -eo -es -fa -fi -fr -he -hi -hr -hu -it -ja -ko -lt -ml -nb_NO -nl -or -pa -pl -pt_BR -pt_PT -rm -ro -ru -sk -sl -sr_RS(a)cyrillic -sr_RS(a)latin -sv -te -th -tr -uk -wa -zh_CN -zh_TW diff --git a/tools/make_makefiles b/tools/make_makefiles index 98f65d3..a5e8a05 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -55,7 +55,7 @@ my %ignored_source_files = ( "tools/makedep.c" => 1, ); -my (@linguas, @makefiles, %makefiles); +my (@makefiles, %makefiles); sub dirname($) { @@ -532,20 +532,10 @@ sub update_makefiles(@) } -################################################################ -# update the LINGUAS file - -sub update_linguas(@) -{ - replace_in_file( "po/LINGUAS", undef, undef, join("\n", sort @_), "\n" ); -} - - my $git_dir = $ENV{GIT_DIR} || ".git"; die "needs to be run from a git checkout" unless -d $git_dir; my @all_files = split /\0/, `git ls-files -c -z`; -(a)linguas = map { (my $ret = $_) =~ s/^po\/(.*)\.po/$1/; $ret; } grep /^po\/.*\.po$/, @all_files; @makefiles = map { (my $ret = $_) =~ s/\.in$//; $ret; } grep /Makefile.in$/, @all_files; foreach my $file (sort @makefiles) @@ -555,5 +545,4 @@ foreach my $file (sort @makefiles) } assign_sources_to_makefiles( @all_files ); -update_linguas( @linguas ); update_makefiles( @makefiles ); diff --git a/tools/makedep.c b/tools/makedep.c index 687bf3f..adb8a40 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2251,6 +2251,10 @@ static void output_po_files( const struct makefile *make ) output( ": %s/wine.pot\n", po_dir ); output( "\tmsgmerge --previous -q $@ %s/wine.pot | msgattrib --no-obsolete -o $@.new && mv $@.new $@\n", po_dir ); + output( "po:" ); + for (i = 0; i < linguas.count; i++) + output_filename( strmake( "%s/%s.po", po_dir, linguas.str[i] )); + output( "\n" ); } output( "%s/wine.pot:", po_dir ); output_filenames( pot_files ); @@ -3212,6 +3216,27 @@ static void rename_temp_file_if_changed( const char *dest ) /******************************************************************* + * output_linguas + */ +static void output_linguas( const struct makefile *make ) +{ + const char *dest = base_dir_path( make, "LINGUAS" ); + struct incl_file *source; + + output_file = create_temp_file( dest ); + + output( "# Automatically generated by make depend; DO NOT EDIT!!\n" ); + LIST_FOR_EACH_ENTRY( source, &make->sources, struct incl_file, entry ) + if (strendswith( source->name, ".po" )) + output( "%s\n", replace_extension( source->name, ".po", "" )); + + if (fclose( output_file )) fatal_perror( "write" ); + output_file = NULL; + rename_temp_file_if_changed( dest ); +} + + +/******************************************************************* * output_testlist */ static void output_testlist( const struct makefile *make ) @@ -3333,6 +3358,11 @@ static void output_dependencies( const struct makefile *make ) output_testlist( make ); strarray_add( &ignore_files, "testlist.c" ); } + if (make->base_dir && !strcmp( make->base_dir, "po" )) + { + output_linguas( make ); + strarray_add( &ignore_files, "LINGUAS" ); + } strarray_addall( &ignore_files, targets ); if (!make->src_dir) output_gitignore( base_dir_path( make, ".gitignore" ), ignore_files );

1 0

Henri Verbeet : d3d9: Use wined3d_texture_get_sub_resource_desc() in d3d9_device_GetRenderTargetData().
by Alexandre Julliard March 1, 2016

March 1, 2016

Module: wine Branch: master Commit: f4c8d81489a4904ba1b0577da5ab73a9b8e8fc08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4c8d81489a4904ba1b0577da… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 29 18:19:29 2016 +0100 d3d9: Use wined3d_texture_get_sub_resource_desc() in d3d9_device_GetRenderTargetData(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index bac44b6..bd94712 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1281,23 +1281,20 @@ static HRESULT WINAPI d3d9_device_GetRenderTargetData(IDirect3DDevice9Ex *iface, { struct d3d9_surface *rt_impl = unsafe_impl_from_IDirect3DSurface9(render_target); struct d3d9_surface *dst_impl = unsafe_impl_from_IDirect3DSurface9(dst_surface); - struct wined3d_resource_desc wined3d_desc; - struct wined3d_resource *sub_resource; + struct wined3d_sub_resource_desc wined3d_desc; RECT dst_rect, src_rect; HRESULT hr; TRACE("iface %p, render_target %p, dst_surface %p.\n", iface, render_target, dst_surface); wined3d_mutex_lock(); - sub_resource = wined3d_texture_get_sub_resource(dst_impl->wined3d_texture, dst_impl->sub_resource_idx); - wined3d_resource_get_desc(sub_resource, &wined3d_desc); + wined3d_texture_get_sub_resource_desc(dst_impl->wined3d_texture, dst_impl->sub_resource_idx, &wined3d_desc); dst_rect.left = 0; dst_rect.top = 0; dst_rect.right = wined3d_desc.width; dst_rect.bottom = wined3d_desc.height; - sub_resource = wined3d_texture_get_sub_resource(rt_impl->wined3d_texture, rt_impl->sub_resource_idx); - wined3d_resource_get_desc(sub_resource, &wined3d_desc); + wined3d_texture_get_sub_resource_desc(rt_impl->wined3d_texture, rt_impl->sub_resource_idx, &wined3d_desc); src_rect.left = 0; src_rect.top = 0; src_rect.right = wined3d_desc.width;

1 0

Henri Verbeet : d3d8: Use wined3d_texture_get_sub_resource_desc() in d3d8_device_SetRenderTarget().
by Alexandre Julliard March 1, 2016

March 1, 2016

Module: wine Branch: master Commit: 5c27fef77a7dd9fa847a23c945700d3204b7bde4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c27fef77a7dd9fa847a23c94… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 29 18:19:23 2016 +0100 d3d8: Use wined3d_texture_get_sub_resource_desc() in d3d8_device_SetRenderTarget(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 0c19b3f..c1875bc 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1173,9 +1173,8 @@ static HRESULT WINAPI d3d8_device_SetRenderTarget(IDirect3DDevice8 *iface, if (ds_impl) { + struct wined3d_sub_resource_desc ds_desc, rt_desc; struct wined3d_rendertarget_view *original_rtv; - struct wined3d_resource_desc ds_desc, rt_desc; - struct wined3d_resource *wined3d_resource; struct d3d8_surface *original_surface; /* If no render target is passed in check the size against the current RT */ @@ -1188,14 +1187,14 @@ static HRESULT WINAPI d3d8_device_SetRenderTarget(IDirect3DDevice8 *iface, return D3DERR_NOTFOUND; } original_surface = wined3d_rendertarget_view_get_sub_resource_parent(original_rtv); - wined3d_resource = wined3d_texture_get_sub_resource(original_surface->wined3d_texture, original_surface->sub_resource_idx); + wined3d_texture_get_sub_resource_desc(original_surface->wined3d_texture, + original_surface->sub_resource_idx, &rt_desc); } else - wined3d_resource = wined3d_texture_get_sub_resource(rt_impl->wined3d_texture, rt_impl->sub_resource_idx); - wined3d_resource_get_desc(wined3d_resource, &rt_desc); + wined3d_texture_get_sub_resource_desc(rt_impl->wined3d_texture, + rt_impl->sub_resource_idx, &rt_desc); - wined3d_resource = wined3d_texture_get_sub_resource(ds_impl->wined3d_texture, ds_impl->sub_resource_idx); - wined3d_resource_get_desc(wined3d_resource, &ds_desc); + wined3d_texture_get_sub_resource_desc(ds_impl->wined3d_texture, ds_impl->sub_resource_idx, &ds_desc); if (ds_desc.width < rt_desc.width || ds_desc.height < rt_desc.height) {

1 0

Frédéric Delanoy : ieframe/tests: Use todo_wine_if() in tests.
by Alexandre Julliard March 1, 2016

March 1, 2016

Module: wine Branch: master Commit: 014e06b9c5176f0e1221a76e7f73ff9c59963de2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=014e06b9c5176f0e1221a76e7… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Feb 27 15:27:32 2016 +0100 ieframe/tests: Use todo_wine_if() in tests. Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/tests/webbrowser.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 032faef..b2bbebd 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -1654,9 +1654,7 @@ static HRESULT WINAPI DocHostUIHandler_GetExternal(IDocHostUIHandler2 *iface, ID static HRESULT WINAPI DocHostUIHandler_TranslateUrl(IDocHostUIHandler2 *iface, DWORD dwTranslate, OLECHAR *pchURLIn, OLECHAR **ppchURLOut) { - if(is_downloading && !(dwl_flags & DWL_EXPECT_BEFORE_NAVIGATE)) - todo_wine CHECK_EXPECT(TranslateUrl); - else + todo_wine_if(is_downloading && !(dwl_flags & DWL_EXPECT_BEFORE_NAVIGATE)) CHECK_EXPECT(TranslateUrl); return E_NOTIMPL; }

1 0

Alexandre Julliard : makefiles: Add a makefile for the po directory.
by Alexandre Julliard March 1, 2016

March 1, 2016

Module: wine Branch: master Commit: 0bb029f92912d3a69967316cccb084e05f3eb9b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bb029f92912d3a69967316cc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 1 14:21:01 2016 +0900 makefiles: Add a makefile for the po directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.in | 3 +-- configure | 55 +++------------------------------------------------- configure.ac | 52 ++----------------------------------------------- po/Makefile.in | 46 +++++++++++++++++++++++++++++++++++++++++++ tools/make_makefiles | 10 +++++++--- tools/makedep.c | 23 +++++++++++----------- 6 files changed, 71 insertions(+), 118 deletions(-) diff --git a/Makefile.in b/Makefile.in index b9b58cd..5b658a2 100644 --- a/Makefile.in +++ b/Makefile.in @@ -70,7 +70,6 @@ CONVERT = @CONVERT@ ICOTOOL = @ICOTOOL@ MSGFMT = @MSGFMT@ CROSSTARGET = @CROSSTARGET@ -LINGUAS = @LINGUAS@ SUBDIRS = @SUBDIRS@ RUNTESTFLAGS = -q -P wine MAKEDEP = $(TOOLSDIR)/tools/makedep$(TOOLSEXT) @@ -139,7 +138,7 @@ install-manpages:: manpages # dependencies needed to build any dll or program __tooldeps__: libs/port libs/wpp -__builddeps__: __tooldeps__ libs/wine include +__builddeps__: __tooldeps__ libs/wine include po .PHONY: depend dummy check test testclean crosstest __tooldeps__ __builddeps__ dummy: diff --git a/configure b/configure index 7bf9178..2f40d7e 100755 --- a/configure +++ b/configure @@ -625,7 +625,6 @@ ac_includes_default="\ ac_subst_vars='LTLIBOBJS LIBOBJS WINELOADER_INSTALL -LINGUAS ALL_VARS_RULES LDAP_LIBS RT_LIBS @@ -1439,6 +1438,7 @@ enable_libs_port enable_libs_wine enable_libs_wpp enable_loader +enable_po enable_arp enable_aspnet_regiis enable_attrib @@ -6116,6 +6116,7 @@ if test "$MSGFMT" = false; then : This is an error since --with-gettext was requested." "$LINENO" 5 ;; esac fi +test "$MSGFMT" = false && enable_po=${enable_po:-no} { $as_echo "$as_me:${as_lineno-$LINENO}: checking for i386_set_ldt in -li386" >&5 @@ -18070,6 +18071,7 @@ wine_fn_config_makefile libs/port enable_libs_port wine_fn_config_makefile libs/wine enable_libs_wine clean,implib,install-dev,install-lib wine_fn_config_makefile libs/wpp enable_libs_wpp wine_fn_config_makefile loader enable_loader clean,install-lib +wine_fn_config_makefile po enable_po clean wine_fn_config_program arp enable_arp install wine_fn_config_program aspnet_regiis enable_aspnet_regiis install wine_fn_config_program attrib enable_attrib clean,install @@ -18174,55 +18176,6 @@ wine_fn_config_tool tools/winemaker clean,install-dev wine_fn_config_tool tools/wmc clean,install-dev wine_fn_config_tool tools/wrc clean,install-dev -LINGUAS="\ -ar \ -bg \ -ca \ -cs \ -da \ -de \ -el \ -en \ -en_US \ -eo \ -es \ -fa \ -fi \ -fr \ -he \ -hi \ -hr \ -hu \ -it \ -ja \ -ko \ -lt \ -ml \ -nb_NO \ -nl \ -or \ -pa \ -pl \ -pt_BR \ -pt_PT \ -rm \ -ro \ -ru \ -sk \ -sl \ -sr_RS(a)cyrillic \ -sr_RS(a)latin \ -sv \ -te \ -th \ -tr \ -uk \ -wa \ -zh_CN \ -zh_TW" - - - wine_fn_append_file CONFIGURE_TARGETS "TAGS" wine_fn_append_file CONFIGURE_TARGETS "tags" @@ -18257,8 +18210,6 @@ include/stamp-h.in: configure.ac aclocal.m4 @echo timestamp > \$@" fi -test "$MSGFMT" != false || LINGUAS= - if test "x$enable_tools" != xno then wine_fn_append_rule "tools/makedep$ac_exeext: $srcdir/tools/makedep.c include/config.h config.status diff --git a/configure.ac b/configure.ac index 19abd08..54b16f6 100644 --- a/configure.ac +++ b/configure.ac @@ -362,6 +362,7 @@ EOF fi WINE_WARNING_WITH(gettext,[test "$MSGFMT" = false], [gettext tools not found (or too old), translations won't be built.]) +test "$MSGFMT" = false && enable_po=${enable_po:-no} dnl **** Check for some libraries **** @@ -3430,6 +3431,7 @@ WINE_CONFIG_MAKEFILE([libs/port]) WINE_CONFIG_MAKEFILE([libs/wine],,[clean,implib,install-dev,install-lib]) WINE_CONFIG_MAKEFILE([libs/wpp]) WINE_CONFIG_MAKEFILE([loader],,[clean,install-lib]) +WINE_CONFIG_MAKEFILE([po],,[clean]) WINE_CONFIG_PROGRAM(arp,,[install]) WINE_CONFIG_PROGRAM(aspnet_regiis,,[install]) WINE_CONFIG_PROGRAM(attrib,,[clean,install]) @@ -3533,54 +3535,6 @@ WINE_CONFIG_TOOL(tools/winegcc,[clean,install-dev]) WINE_CONFIG_TOOL(tools/winemaker,[clean,install-dev]) WINE_CONFIG_TOOL(tools/wmc,[clean,install-dev]) WINE_CONFIG_TOOL(tools/wrc,[clean,install-dev]) - -AC_SUBST([LINGUAS],["\ -ar \ -bg \ -ca \ -cs \ -da \ -de \ -el \ -en \ -en_US \ -eo \ -es \ -fa \ -fi \ -fr \ -he \ -hi \ -hr \ -hu \ -it \ -ja \ -ko \ -lt \ -ml \ -nb_NO \ -nl \ -or \ -pa \ -pl \ -pt_BR \ -pt_PT \ -rm \ -ro \ -ru \ -sk \ -sl \ -sr_RS(a)cyrillic \ -sr_RS(a)latin \ -sv \ -te \ -th \ -tr \ -uk \ -wa \ -zh_CN \ -zh_TW"]) - dnl End of auto-generated output commands dnl Main ignore file @@ -3629,8 +3583,6 @@ include/stamp-h.in: configure.ac aclocal.m4 @echo timestamp > \$[@]]) fi -test "$MSGFMT" != false || LINGUAS= - if test "x$enable_tools" != xno then WINE_APPEND_RULE( diff --git a/po/Makefile.in b/po/Makefile.in new file mode 100644 index 0000000..430a9a8 --- /dev/null +++ b/po/Makefile.in @@ -0,0 +1,46 @@ +PO_SRCS = \ + ar.po \ + bg.po \ + ca.po \ + cs.po \ + da.po \ + de.po \ + el.po \ + en.po \ + en_US.po \ + eo.po \ + es.po \ + fa.po \ + fi.po \ + fr.po \ + he.po \ + hi.po \ + hr.po \ + hu.po \ + it.po \ + ja.po \ + ko.po \ + lt.po \ + ml.po \ + nb_NO.po \ + nl.po \ + or.po \ + pa.po \ + pl.po \ + pt_BR.po \ + pt_PT.po \ + rm.po \ + ro.po \ + ru.po \ + sk.po \ + sl.po \ + sr_RS(a)cyrillic.po \ + sr_RS(a)latin.po \ + sv.po \ + te.po \ + th.po \ + tr.po \ + uk.po \ + wa.po \ + zh_CN.po \ + zh_TW.po diff --git a/tools/make_makefiles b/tools/make_makefiles index ce38c53..98f65d3 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -211,7 +211,7 @@ sub parse_makefile($) ${$make{"=flags"}}{"implib"} = 1 if $var eq "IMPORTLIB"; next; } - if (/^\s*(BISON_SRCS|LEX_SRCS|IDL_SRCS|C_SRCS|OBJC_SRCS|MC_SRCS|RC_SRCS|SVG_SRCS|FONT_SRCS|IN_SRCS|PROGRAMS|EXTRA_TARGETS|MANPAGES|EXTRA_OBJS|INSTALL_LIB|INSTALL_DEV)\s*=\s*(.*)/) + if (/^\s*(BISON_SRCS|LEX_SRCS|IDL_SRCS|C_SRCS|OBJC_SRCS|MC_SRCS|RC_SRCS|SVG_SRCS|FONT_SRCS|IN_SRCS|PO_SRCS|PROGRAMS|EXTRA_TARGETS|MANPAGES|EXTRA_OBJS|INSTALL_LIB|INSTALL_DEV)\s*=\s*(.*)/) { my $var = $1; my @list = split(/\s+/, $2); @@ -388,6 +388,11 @@ sub assign_sources_to_makefiles(@) push @{${$make}{"=MC_SRCS"}}, $name; ${${$make}{"=flags"}}{"clean"} = 1; } + elsif ($name =~ /\.po$/) + { + push @{${$make}{"=PO_SRCS"}}, $name; + ${${$make}{"=flags"}}{"clean"} = 1; + } elsif ($name =~ /\.idl$/) { die "no makedep flags specified in $file" unless %flags || $dir eq "include"; @@ -502,8 +507,6 @@ sub update_makefiles(@) } } - push @lines, "\nAC_SUBST([LINGUAS],[\"\\\n", join( " \\\n", sort @linguas ), "\"])\n\n"; - # update the source variables in all the makefiles foreach my $file (sort @_) @@ -519,6 +522,7 @@ sub update_makefiles(@) replace_makefile_variable( $file, "IDL_SRCS" ); replace_makefile_variable( $file, "HEADER_SRCS" ); replace_makefile_variable( $file, "XTEMPLATE_SRCS" ); + replace_makefile_variable( $file, "PO_SRCS" ); replace_makefile_variable( $file, "IN_SRCS" ); replace_makefile_variable( $file, "MANPAGES" ); } diff --git a/tools/makedep.c b/tools/makedep.c index 12f5395..687bf3f 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1811,6 +1811,11 @@ static void add_generated_sources( struct makefile *make ) if (!make->staticimplib && make->importlib && *dll_ext) make->staticimplib = strmake( "lib%s.def.a", make->importlib ); } + if (strendswith( source->name, ".po" )) + { + if (!make->disabled) + strarray_add_uniq( &linguas, replace_extension( source->name, ".po", "" )); + } } if (make->testdll) { @@ -2536,6 +2541,12 @@ static struct strarray output_sources( const struct makefile *make ) top_dir_path( make, "tools/buildimage" ), source->filename ); } } + else if (!strcmp( ext, "po" )) /* po file */ + { + output( "%s.mo: %s\n", obj_dir_path( make, obj ), source->filename ); + output( "\t%s -o $@ %s\n", msgfmt, source->filename ); + strarray_add( &all_targets, strmake( "%s.mo", obj )); + } else if (!strcmp( ext, "res" )) { strarray_add( &res_files, source->name ); @@ -3080,16 +3091,6 @@ static struct strarray output_sources( const struct makefile *make ) output( "\n" ); strarray_add( &phony_targets, "distclean" ); - if (msgfmt && strcmp( msgfmt, "false" )) - { - strarray_addall( &build_deps, mo_files ); - for (i = 0; i < linguas.count; i++) - { - output( "%s/%s.mo:", obj_dir_path( make, "po" ), linguas.str[i] ); - output( " %s/%s.po\n", src_dir_path( make, "po" ), linguas.str[i] ); - output( "\t%s -o $@ %s/%s.po\n", msgfmt, src_dir_path( make, "po" ), linguas.str[i] ); - } - } if (build_deps.count) { output( "__builddeps__:" ); @@ -3360,6 +3361,7 @@ static void load_sources( struct makefile *make ) "SVG_SRCS", "FONT_SRCS", "IN_SRCS", + "PO_SRCS", "MANPAGES", NULL }; @@ -3537,7 +3539,6 @@ int main( int argc, char *argv[] ) top_makefile = parse_makefile( NULL ); - linguas = get_expanded_make_var_array( top_makefile, "LINGUAS" ); target_flags = get_expanded_make_var_array( top_makefile, "TARGETFLAGS" ); msvcrt_flags = get_expanded_make_var_array( top_makefile, "MSVCRTFLAGS" ); dll_flags = get_expanded_make_var_array( top_makefile, "DLLFLAGS" );

1 0

Henri Verbeet : d3d8: Use wined3d_texture_get_sub_resource_desc() in d3d8_texture_2d_GetLevelDesc().
by Alexandre Julliard March 1, 2016

March 1, 2016

Module: wine Branch: master Commit: 704a11e6d69cce67ce855ef2a8fa66725826eaf8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=704a11e6d69cce67ce855ef2a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 29 18:19:26 2016 +0100 d3d8: Use wined3d_texture_get_sub_resource_desc() in d3d8_texture_2d_GetLevelDesc(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/texture.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index bef099a..a1bf0ab 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -243,21 +243,16 @@ static DWORD WINAPI d3d8_texture_2d_GetLevelCount(IDirect3DTexture8 *iface) static HRESULT WINAPI d3d8_texture_2d_GetLevelDesc(IDirect3DTexture8 *iface, UINT level, D3DSURFACE_DESC *desc) { struct d3d8_texture *texture = impl_from_IDirect3DTexture8(iface); - struct wined3d_resource *sub_resource; - HRESULT hr = D3D_OK; + struct wined3d_sub_resource_desc wined3d_desc; + HRESULT hr; TRACE("iface %p, level %u, desc %p.\n", iface, level, desc); wined3d_mutex_lock(); - if (!(sub_resource = wined3d_texture_get_sub_resource(texture->wined3d_texture, level))) - hr = D3DERR_INVALIDCALL; - else + if (SUCCEEDED(hr = wined3d_texture_get_sub_resource_desc(texture->wined3d_texture, level, &wined3d_desc))) { - struct wined3d_resource_desc wined3d_desc; - - wined3d_resource_get_desc(sub_resource, &wined3d_desc); desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format); - desc->Type = wined3d_desc.resource_type; + desc->Type = D3DRTYPE_SURFACE; desc->Usage = wined3d_desc.usage & WINED3DUSAGE_MASK; desc->Pool = wined3d_desc.pool; desc->Size = wined3d_desc.size;

1 0

Henri Verbeet : d3d8: Use wined3d_texture_get_sub_resource_desc() in d3d8_volume_GetDesc().
by Alexandre Julliard March 1, 2016

March 1, 2016

Module: wine Branch: master Commit: f2fdb1685665c20f98f18428c3bc3096ad4126c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2fdb1685665c20f98f18428c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 29 18:19:25 2016 +0100 d3d8: Use wined3d_texture_get_sub_resource_desc() in d3d8_volume_GetDesc(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/volume.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/d3d8/volume.c b/dlls/d3d8/volume.c index f26e424..f3a30a8 100644 --- a/dlls/d3d8/volume.c +++ b/dlls/d3d8/volume.c @@ -115,18 +115,16 @@ static HRESULT WINAPI d3d8_volume_GetContainer(IDirect3DVolume8 *iface, REFIID r static HRESULT WINAPI d3d8_volume_GetDesc(IDirect3DVolume8 *iface, D3DVOLUME_DESC *desc) { struct d3d8_volume *volume = impl_from_IDirect3DVolume8(iface); - struct wined3d_resource_desc wined3d_desc; - struct wined3d_resource *sub_resource; + struct wined3d_sub_resource_desc wined3d_desc; TRACE("iface %p, desc %p.\n", iface, desc); wined3d_mutex_lock(); - sub_resource = wined3d_texture_get_sub_resource(volume->wined3d_texture, volume->sub_resource_idx); - wined3d_resource_get_desc(sub_resource, &wined3d_desc); + wined3d_texture_get_sub_resource_desc(volume->wined3d_texture, volume->sub_resource_idx, &wined3d_desc); wined3d_mutex_unlock(); desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format); - desc->Type = wined3d_desc.resource_type; + desc->Type = D3DRTYPE_VOLUME; desc->Usage = wined3d_desc.usage & WINED3DUSAGE_MASK; desc->Pool = wined3d_desc.pool; desc->Size = wined3d_desc.size;

1 0

Henri Verbeet : d3d8: Use wined3d_texture_get_sub_resource_desc() in d3d8_surface_GetDesc().
by Alexandre Julliard March 1, 2016

March 1, 2016

Module: wine Branch: master Commit: 9a6ee515ed263cf6f14cb12b33cc3e3f71d46963 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a6ee515ed263cf6f14cb12b3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 29 18:19:24 2016 +0100 d3d8: Use wined3d_texture_get_sub_resource_desc() in d3d8_surface_GetDesc(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/surface.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/d3d8/surface.c b/dlls/d3d8/surface.c index ec263b1..565f642 100644 --- a/dlls/d3d8/surface.c +++ b/dlls/d3d8/surface.c @@ -175,18 +175,16 @@ static HRESULT WINAPI d3d8_surface_GetContainer(IDirect3DSurface8 *iface, REFIID static HRESULT WINAPI d3d8_surface_GetDesc(IDirect3DSurface8 *iface, D3DSURFACE_DESC *desc) { struct d3d8_surface *surface = impl_from_IDirect3DSurface8(iface); - struct wined3d_resource_desc wined3d_desc; - struct wined3d_resource *sub_resource; + struct wined3d_sub_resource_desc wined3d_desc; TRACE("iface %p, desc %p.\n", iface, desc); wined3d_mutex_lock(); - sub_resource = wined3d_texture_get_sub_resource(surface->wined3d_texture, surface->sub_resource_idx); - wined3d_resource_get_desc(sub_resource, &wined3d_desc); + wined3d_texture_get_sub_resource_desc(surface->wined3d_texture, surface->sub_resource_idx, &wined3d_desc); wined3d_mutex_unlock(); desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format); - desc->Type = wined3d_desc.resource_type; + desc->Type = D3DRTYPE_SURFACE; desc->Usage = wined3d_desc.usage & WINED3DUSAGE_MASK; desc->Pool = wined3d_desc.pool; desc->Size = wined3d_desc.size;

1 0