January 2012 - Wine-commits

Francois Gouget : po: Fix a formatting directive in the Polish translation.
by Alexandre Julliard 23 Jan '12

23 Jan '12

Module: wine Branch: master Commit: f05afaca4d762b45cac2b47da81154d371350843 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f05afaca4d762b45cac2b47da… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jan 23 00:39:46 2012 +0100 po: Fix a formatting directive in the Polish translation. --- po/pl.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/po/pl.po b/po/pl.po index 24b992c..60a29d7 100644 --- a/po/pl.po +++ b/po/pl.po @@ -10445,7 +10445,7 @@ msgid "" msgstr "" "%1\n" "Plik ten zawiera znaki Unicode, które zostaną utracone jeżeli\n" -"zapiszesz ten plik przy użyciu kodowania %s.\n" +"zapiszesz ten plik przy użyciu kodowania %2.\n" "Aby zachować te znaki, naciśnij Anuluj, a później zaznacz\n" "jedną z opcji Unicode z rozwijalnej listy kodowań.\n" "Czy chcesz kontynuować mimo tego?"

1 0

Francois Gouget : po: Fix a formatting directive in the Danish translation.
by Alexandre Julliard 23 Jan '12

23 Jan '12

Module: wine Branch: master Commit: 0c36034f85e053733f33adbde6a0d9770386e8ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c36034f85e053733f33adbde… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jan 23 00:39:56 2012 +0100 po: Fix a formatting directive in the Danish translation. --- po/da.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/po/da.po b/po/da.po index 2540dcf..b7e351c 100644 --- a/po/da.po +++ b/po/da.po @@ -77,7 +77,7 @@ msgstr "OK" #: appwiz.rc:76 msgid "The following information can be used to get technical support for %s:" -msgstr "Følgende oplysninger kan bruges til at få teknisk support for% s:" +msgstr "Følgende oplysninger kan bruges til at få teknisk support for %s:" #: appwiz.rc:77 msgid "Publisher:"

1 0

Francois Gouget : po: Mark an incorrect No rwegian Bokmål translation as fuzzy.
by Alexandre Julliard 23 Jan '12

23 Jan '12

Module: wine Branch: master Commit: baca3472cdd654caf764d254a1864f143b76d71f URL: http://source.winehq.org/git/wine.git/?a=commit;h=baca3472cdd654caf764d254a… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jan 23 00:41:40 2012 +0100 po: Mark an incorrect Norwegian Bokmål translation as fuzzy. --- po/sv.po | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/po/sv.po b/po/sv.po index a8261b2..6eb27e2 100644 --- a/po/sv.po +++ b/po/sv.po @@ -13466,6 +13466,7 @@ msgid "Error while selecting new font." msgstr "Ett fel uppstod när ett nytt teckensnitt valdes." #: winefile.rc:99 +#, fuzzy msgid "Wine File Manager" msgstr "Winefile"

1 0

Rico Schüller : d3dx9: Introduce free_constant_table() .
by Alexandre Julliard 23 Jan '12

23 Jan '12

Module: wine Branch: master Commit: 4a6e06d7bbf3228f91f117f8d61cfa82917ffc01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a6e06d7bbf3228f91f117f8d… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Jan 22 11:28:52 2012 +0100 d3dx9: Introduce free_constant_table(). --- dlls/d3dx9_36/shader.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index fd7e6b7..9a9d77c 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -632,6 +632,12 @@ typedef struct ID3DXConstantTableImpl { ctab_constant *constants; } ID3DXConstantTableImpl; +static void free_constant_table(struct ID3DXConstantTableImpl *table) +{ + HeapFree(GetProcessHeap(), 0, table->constants); + HeapFree(GetProcessHeap(), 0, table->ctab); +} + static inline ID3DXConstantTableImpl *impl_from_ID3DXConstantTable(ID3DXConstantTable *iface) { return CONTAINING_RECORD(iface, ID3DXConstantTableImpl, ID3DXConstantTable_iface); @@ -681,7 +687,7 @@ static ULONG WINAPI ID3DXConstantTableImpl_AddRef(ID3DXConstantTable* iface) return InterlockedIncrement(&This->ref); } -static ULONG WINAPI ID3DXConstantTableImpl_Release(ID3DXConstantTable* iface) +static ULONG WINAPI ID3DXConstantTableImpl_Release(ID3DXConstantTable *iface) { ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface); ULONG ref = InterlockedDecrement(&This->ref); @@ -690,8 +696,7 @@ static ULONG WINAPI ID3DXConstantTableImpl_Release(ID3DXConstantTable* iface) if (!ref) { - HeapFree(GetProcessHeap(), 0, This->constants); - HeapFree(GetProcessHeap(), 0, This->ctab); + free_constant_table(This); HeapFree(GetProcessHeap(), 0, This); } @@ -1258,8 +1263,7 @@ HRESULT WINAPI D3DXGetShaderConstantTableEx(CONST DWORD* byte_code, error: - HeapFree(GetProcessHeap(), 0, object->constants); - HeapFree(GetProcessHeap(), 0, object->ctab); + free_constant_table(object); HeapFree(GetProcessHeap(), 0, object); return hr;

1 0

Rico Schüller : d3dx9: Get rid of ID3DXConstantTableImpl typedef.
by Alexandre Julliard 23 Jan '12

23 Jan '12

Module: wine Branch: master Commit: 59b365f9bb2dcc1b39496d6ea8368df1c91367a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59b365f9bb2dcc1b39496d6ea… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Jan 22 11:29:03 2012 +0100 d3dx9: Get rid of ID3DXConstantTableImpl typedef. --- dlls/d3dx9_36/shader.c | 114 +++++++++++++++++++++++------------------------ 1 files changed, 56 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=59b365f9bb2dcc1b39496…

1 0

Rico Schüller : d3dx9: Reorder argument check in D3DXGetShaderConstantTableEx().
by Alexandre Julliard 23 Jan '12

23 Jan '12

Module: wine Branch: master Commit: 6ad34b161f57a95d124de5a306088b337be5edc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ad34b161f57a95d124de5a30… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Jan 22 11:29:08 2012 +0100 d3dx9: Reorder argument check in D3DXGetShaderConstantTableEx(). --- dlls/d3dx9_36/shader.c | 35 +++++++++++++++++++++-------------- 1 files changed, 21 insertions(+), 14 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 775899d..eff3935 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -1175,11 +1175,30 @@ HRESULT WINAPI D3DXGetShaderConstantTableEx(CONST DWORD *byte_code, TRACE("(%p, %x, %p)\n", byte_code, flags, constant_table); if (!byte_code || !constant_table) + { + WARN("Invalid argument specified.\n"); return D3DERR_INVALIDCALL; + } hr = D3DXFindShaderComment(byte_code, MAKEFOURCC('C','T','A','B'), &data, &size); if (hr != D3D_OK) + { + WARN("CTAB not found.\n"); + return D3DXERR_INVALIDDATA; + } + + if (size < sizeof(D3DXSHADER_CONSTANTTABLE)) + { + WARN("Invalid CTAB size.\n"); + return D3DXERR_INVALIDDATA; + } + + ctab_header = (const D3DXSHADER_CONSTANTTABLE *)data; + if (ctab_header->Size != sizeof(D3DXSHADER_CONSTANTTABLE)) + { + WARN("Invalid D3DXSHADER_CONSTANTTABLE size.\n"); return D3DXERR_INVALIDDATA; + } object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) @@ -1191,28 +1210,16 @@ HRESULT WINAPI D3DXGetShaderConstantTableEx(CONST DWORD *byte_code, object->ID3DXConstantTable_iface.lpVtbl = &ID3DXConstantTable_Vtbl; object->ref = 1; - if (size < sizeof(D3DXSHADER_CONSTANTTABLE)) - { - hr = D3DXERR_INVALIDDATA; - goto error; - } - object->ctab = HeapAlloc(GetProcessHeap(), 0, size); if (!object->ctab) { ERR("Out of memory\n"); - hr = E_OUTOFMEMORY; - goto error; + HeapFree(GetProcessHeap(), 0, object); + return E_OUTOFMEMORY; } object->size = size; memcpy(object->ctab, data, object->size); - ctab_header = (const D3DXSHADER_CONSTANTTABLE*)data; - if (ctab_header->Size != sizeof(D3DXSHADER_CONSTANTTABLE)) - { - hr = D3DXERR_INVALIDDATA; - goto error; - } object->desc.Creator = ctab_header->Creator ? object->ctab + ctab_header->Creator : NULL; object->desc.Version = ctab_header->Version; object->desc.Constants = ctab_header->Constants;

1 0

Rico Schüller : d3dx9: Fix constant table trace.
by Alexandre Julliard 23 Jan '12

23 Jan '12

Module: wine Branch: master Commit: 7b3863fec0134cf85a3125c0dc965e2c404c9d39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b3863fec0134cf85a3125c0d… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Jan 22 11:29:32 2012 +0100 d3dx9: Fix constant table trace. --- dlls/d3dx9_36/shader.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index eff3935..29b4f6e 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -1223,12 +1223,9 @@ HRESULT WINAPI D3DXGetShaderConstantTableEx(CONST DWORD *byte_code, object->desc.Creator = ctab_header->Creator ? object->ctab + ctab_header->Creator : NULL; object->desc.Version = ctab_header->Version; object->desc.Constants = ctab_header->Constants; - if (object->desc.Creator) - TRACE("Creator = %s\n", object->desc.Creator); - TRACE("Version = %x\n", object->desc.Version); - TRACE("Constants = %d\n", ctab_header->Constants); - if (ctab_header->Target) - TRACE("Target = %s\n", object->ctab + ctab_header->Target); + TRACE("Creator %s, Version %x, Constants %u, Target %s\n", + debugstr_a(object->desc.Creator), object->desc.Version, object->desc.Constants, + debugstr_a(ctab_header->Target ? object->ctab + ctab_header->Target : NULL)); if (object->desc.Constants > 65535) {

1 0

André Hentschel : winelib: Update information about winemaker's Makefiles.
by Alexandre Julliard 23 Jan '12

23 Jan '12

Module: docs Branch: master Commit: 3e1c8092db42fd47af1fd882776887a8ee41a118 URL: http://source.winehq.org/git/docs.git/?a=commit;h=3e1c8092db42fd47af1fd8827… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 18 21:13:42 2012 +0100 winelib: Update information about winemaker's Makefiles. --- en/winelib-toolkit.sgml | 24 +++++++++++++----------- 1 files changed, 13 insertions(+), 11 deletions(-) diff --git a/en/winelib-toolkit.sgml b/en/winelib-toolkit.sgml index 1af66ac..2a262f2 100644 --- a/en/winelib-toolkit.sgml +++ b/en/winelib-toolkit.sgml @@ -217,13 +217,14 @@ SRCDIR = . SUBDIRS = DLLS = +LIBS = EXES = hello.exe </programlisting> <para> This is where the targets for this directory are listed. The names are pretty self-explanatory. <varname>SUBDIRS</varname> is usually only present in the top-level makefile. For libraries and - executables, specify the full name, including the '.dll' or '.exe' + executables, specify the full name, including the '.dll', '.a' or '.exe' extension. Note that these names must be in all lowercase. </para> <programlisting> @@ -232,6 +233,7 @@ EXES = hello.exe DEFINES = -DSTRICT INCLUDE_PATH = DLL_PATH = +DLL_IMPORTS = LIBRARY_PATH = LIBRARIES = </programlisting> @@ -240,23 +242,22 @@ LIBRARIES = to all the targets in this makefile. The <varname>LIBRARIES</> variable allows you to specify additional Unix libraries to link with. Note that you would normally not specify Winelib libraries - there. To link with a Winelib library, one uses the <varname>DLLS</> - variables of the Makefile. The exception is for C++ libraries where - you currently don't have a choice but to link with them in the - Unix sense. One library you are likely to find here is - <literal>mfc</> (note, the '-l' is omitted). + there. To link with a Winelib library, one uses <varname>DLL_IMPORTS</> + The exception is for C++ libraries where you currently don't have + a choice but to link with them in the Unix sense. One library you are + likely to find here is <literal>mfc</>. </para> <para> The other variable names should be self-explanatory. There are also <varname>CEXTRA</varname>, <varname>CXXEXTRA</varname> and - <varname>RCEXTRA</varname>(usually not present in the file) which + <varname>RCEXTRA</varname> which allow you to specify additional flags for, respectively, the C compiler, the C++ compiler and the resource compiler. - Finally note that all these variable contain the option's name. + Finally note that all these variables contain the option's name. </para> <para> - Then come one section per target, each describing the various + Then there is one section per target, each describing the various components that target is made of. </para> <programlisting> @@ -291,7 +292,8 @@ hello_exe_LIBRARIES = </para> <programlisting> hello_exe_OBJS = $(hello_exe_C_SRCS:.c=.o) \ - $(hello_exe_CXX_SRCS:.cpp=.o) + $(hello_exe_CXX_SRCS:.cpp=.o) \ + $(hello_exe_RC_SRCS:.rc=.res) </programlisting> <para> The above just builds a list of all the object files that @@ -311,7 +313,7 @@ RC_SRCS = $(hello_exe_RC_SRCS) <programlisting> ### Generic targets -all: $(SUBDIRS) $(DLLS:%=%.so) $(EXES:%=%.so) +all: $(SUBDIRS) $(DLLS:%=%.so) $(LIBS) $(EXES) </programlisting> <para> The above first defines the default target for this makefile. Here

1 0

André Hentschel : wineusr: Rewrite WineCfg Audio tab documentation.
by Alexandre Julliard 23 Jan '12

23 Jan '12

Module: docs Branch: master Commit: 5b3b3d20519bebf071988541dee68d6899cf8c1c URL: http://source.winehq.org/git/docs.git/?a=commit;h=5b3b3d20519bebf071988541d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jan 16 23:01:51 2012 +0100 wineusr: Rewrite WineCfg Audio tab documentation. --- en/wineusr-configuring.sgml | 21 ++++++--------------- 1 files changed, 6 insertions(+), 15 deletions(-) diff --git a/en/wineusr-configuring.sgml b/en/wineusr-configuring.sgml index 56f7923..02d30e6 100644 --- a/en/wineusr-configuring.sgml +++ b/en/wineusr-configuring.sgml @@ -334,23 +334,14 @@ <sect2> <title>Audio Settings</title> <para> - Wine can work with quite a few different audio subsystems - which you can choose under the "Audio" tab. winecfg figures out all - available drivers for you, but you can manually select which driver - will be used. Older - Linux distributions using the 2.4 kernel or earlier typically - use the "OSS" driver. Usually 2.6 kernels have switched to "ALSA". - The "aRts" driver was recently deactivated due to the general lack - of maintenance of the "aRts" subsystem. - If you're using GNOME you can probably use EsounD. The OSS and ALSA - audio drivers get the most testing, so it's recommended you stick - with them if possible. - If you need to use "Jack", "NAS" or "CoreAudio" you probably already know why. + Wine can work with quite a few different audio subsystems. + You can see the selected driver that Wine figures out for you + under the "Audio" tab. </para> <para> - DirectSound settings are primarily used by games. You can - choose what level of hardware acceleration you'd like, but - for most people "Full" is fine. + You can manually select which device will be used for + Output, Input, Voice output and Voice input. For example you can choose + the digital output of your sound device instead of the analog one. </para> </sect2> <sect2>

1 0

André Hentschel : wineusr: Rewrite WineCfg Graphics tab documentation.
by Alexandre Julliard 23 Jan '12

23 Jan '12

Module: docs Branch: master Commit: 827edebbeed6e7624afff36f235d1d8c41533e82 URL: http://source.winehq.org/git/docs.git/?a=commit;h=827edebbeed6e7624afff36f2… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jan 16 23:02:26 2012 +0100 wineusr: Rewrite WineCfg Graphics tab documentation. --- en/wineusr-configuring.sgml | 28 +++++----------------------- 1 files changed, 5 insertions(+), 23 deletions(-) diff --git a/en/wineusr-configuring.sgml b/en/wineusr-configuring.sgml index 02d30e6..2d3fc9c 100644 --- a/en/wineusr-configuring.sgml +++ b/en/wineusr-configuring.sgml @@ -244,19 +244,11 @@ can configure. For most people the defaults are fine. </para> <para> - The first few settings primarily affect games and are somewhat + The first setting primarily affect games and is somewhat self-explanatory. You can prevent the mouse from leaving the - window of a DirectX program (i.e. a game.) and the default is - to have that box checked. There's lots of - reasons you might want to do that, not the least of which - includes it's easier to play the game if the cursor is - confined to a smaller area. The other reason to turn this - option on is for more precise control of the mouse - Wine - warps the location of the mouse to mimic the way Windows - works. Similarly, "desktop double buffering" allows for - smoother updates to the screen, which games can benefit from, - and the default is to leave it turned on. The tradeoff is - increased memory use. + window of a full-screen program (i.e. a game.) and the default + is to not have that box checked. That is mostly needed when using + a virtual desktop. </para> <para> You may find it helpful to <emphasis>Emulate a virtual @@ -266,17 +258,7 @@ (possibly unsuccessfully) the screen resolution. Confining them to a window can allow for more control over them at the possible expense of decreased usability. Sizes you might want to try are - 640x480 (the default) or 800x600. - </para> - <para> - Finally, you can configure some Direct3D settings. For the - most part these settings are detected automatically, but you - can force them to behave in a specific manner. Some games - attempt to probe the underlying system to see if it supports - specific features. By turning these off Wine won't report - the ability to render games in a certain way. It may lead - to the game running faster at the expense of the quality of - the graphics or the game may not run at all. + 800x600 (the default) or 1024x768. </para> </sect2> <sect2>

1 0