August 2010 - Wine-Commits - list.winehq.org

Alexandre Julliard : d3dx10: Fix typo in a forward name.
by Alexandre Julliard Aug. 30, 2010

Aug. 30, 2010

Module: wine Branch: master Commit: 3f4573cc725a4f2b1f3af488f214d9e0b4564d8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f4573cc725a4f2b1f3af488f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Aug 29 12:02:02 2010 +0200 d3dx10: Fix typo in a forward name. --- dlls/d3dx10_33/d3dx10_33.spec | 2 +- dlls/d3dx10_34/d3dx10_34.spec | 2 +- dlls/d3dx10_35/d3dx10_35.spec | 2 +- dlls/d3dx10_36/d3dx10_36.spec | 2 +- dlls/d3dx10_37/d3dx10_37.spec | 2 +- dlls/d3dx10_38/d3dx10_38.spec | 2 +- dlls/d3dx10_39/d3dx10_39.spec | 2 +- dlls/d3dx10_40/d3dx10_40.spec | 2 +- dlls/d3dx10_41/d3dx10_41.spec | 2 +- dlls/d3dx10_42/d3dx10_42.spec | 2 +- dlls/d3dx10_43/d3dx10_43.spec | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/d3dx10_33/d3dx10_33.spec b/dlls/d3dx10_33/d3dx10_33.spec index 33c7f88..940260f 100644 --- a/dlls/d3dx10_33/d3dx10_33.spec +++ b/dlls/d3dx10_33/d3dx10_33.spec @@ -67,7 +67,7 @@ @ stdcall D3DX10SaveTextureToMemory(ptr ptr ptr long) d3dx10_43.D3DX10SaveTextureToMemory @ stdcall D3DX10UnsetAllDeviceObjects(ptr) d3dx10_43.D3DX10UnsetAllDeviceObjects @ stdcall D3DXBoxBoundProbe(ptr ptr ptr ptr) d3dx10_43.D3DXBoxBoundProbe -@ stdcall D3DXColorAdjustContrast(ptr ptr long) d3dx10_43.3DXColorAdjustContrast +@ stdcall D3DXColorAdjustContrast(ptr ptr long) d3dx10_43.D3DXColorAdjustContrast @ stdcall D3DXColorAdjustSaturation(ptr ptr long) d3dx10_43.D3DXColorAdjustSaturation @ stdcall D3DXComputeBoundingBox(ptr long long ptr ptr) d3dx10_43.D3DXComputeBoundingBox @ stdcall D3DXComputeBoundingSphere(ptr long long ptr ptr) d3dx10_43.D3DXComputeBoundingSphere diff --git a/dlls/d3dx10_34/d3dx10_34.spec b/dlls/d3dx10_34/d3dx10_34.spec index 33c7f88..940260f 100644 --- a/dlls/d3dx10_34/d3dx10_34.spec +++ b/dlls/d3dx10_34/d3dx10_34.spec @@ -67,7 +67,7 @@ @ stdcall D3DX10SaveTextureToMemory(ptr ptr ptr long) d3dx10_43.D3DX10SaveTextureToMemory @ stdcall D3DX10UnsetAllDeviceObjects(ptr) d3dx10_43.D3DX10UnsetAllDeviceObjects @ stdcall D3DXBoxBoundProbe(ptr ptr ptr ptr) d3dx10_43.D3DXBoxBoundProbe -@ stdcall D3DXColorAdjustContrast(ptr ptr long) d3dx10_43.3DXColorAdjustContrast +@ stdcall D3DXColorAdjustContrast(ptr ptr long) d3dx10_43.D3DXColorAdjustContrast @ stdcall D3DXColorAdjustSaturation(ptr ptr long) d3dx10_43.D3DXColorAdjustSaturation @ stdcall D3DXComputeBoundingBox(ptr long long ptr ptr) d3dx10_43.D3DXComputeBoundingBox @ stdcall D3DXComputeBoundingSphere(ptr long long ptr ptr) d3dx10_43.D3DXComputeBoundingSphere diff --git a/dlls/d3dx10_35/d3dx10_35.spec b/dlls/d3dx10_35/d3dx10_35.spec index b34cd87..fa1a351 100644 --- a/dlls/d3dx10_35/d3dx10_35.spec +++ b/dlls/d3dx10_35/d3dx10_35.spec @@ -70,7 +70,7 @@ @ stdcall D3DX10SaveTextureToMemory(ptr ptr ptr long) d3dx10_43.D3DX10SaveTextureToMemory @ stdcall D3DX10UnsetAllDeviceObjects(ptr) d3dx10_43.D3DX10UnsetAllDeviceObjects @ stdcall D3DXBoxBoundProbe(ptr ptr ptr ptr) d3dx10_43.D3DXBoxBoundProbe -@ stdcall D3DXColorAdjustContrast(ptr ptr long) d3dx10_43.3DXColorAdjustContrast +@ stdcall D3DXColorAdjustContrast(ptr ptr long) d3dx10_43.D3DXColorAdjustContrast @ stdcall D3DXColorAdjustSaturation(ptr ptr long) d3dx10_43.D3DXColorAdjustSaturation @ stdcall D3DXComputeBoundingBox(ptr long long ptr ptr) d3dx10_43.D3DXComputeBoundingBox @ stdcall D3DXComputeBoundingSphere(ptr long long ptr ptr) d3dx10_43.D3DXComputeBoundingSphere diff --git a/dlls/d3dx10_36/d3dx10_36.spec b/dlls/d3dx10_36/d3dx10_36.spec index b34cd87..fa1a351 100644 --- a/dlls/d3dx10_36/d3dx10_36.spec +++ b/dlls/d3dx10_36/d3dx10_36.spec @@ -70,7 +70,7 @@ @ stdcall D3DX10SaveTextureToMemory(ptr ptr ptr long) d3dx10_43.D3DX10SaveTextureToMemory @ stdcall D3DX10UnsetAllDeviceObjects(ptr) d3dx10_43.D3DX10UnsetAllDeviceObjects @ stdcall D3DXBoxBoundProbe(ptr ptr ptr ptr) d3dx10_43.D3DXBoxBoundProbe -@ stdcall D3DXColorAdjustContrast(ptr ptr long) d3dx10_43.3DXColorAdjustContrast +@ stdcall D3DXColorAdjustContrast(ptr ptr long) d3dx10_43.D3DXColorAdjustContrast @ stdcall D3DXColorAdjustSaturation(ptr ptr long) d3dx10_43.D3DXColorAdjustSaturation @ stdcall D3DXComputeBoundingBox(ptr long long ptr ptr) d3dx10_43.D3DXComputeBoundingBox @ stdcall D3DXComputeBoundingSphere(ptr long long ptr ptr) d3dx10_43.D3DXComputeBoundingSphere diff --git a/dlls/d3dx10_37/d3dx10_37.spec b/dlls/d3dx10_37/d3dx10_37.spec index e444dfa..68adcca 100644 --- a/dlls/d3dx10_37/d3dx10_37.spec +++ b/dlls/d3dx10_37/d3dx10_37.spec @@ -71,7 +71,7 @@ @ stdcall D3DX10SaveTextureToMemory(ptr ptr ptr long) d3dx10_43.D3DX10SaveTextureToMemory @ stdcall D3DX10UnsetAllDeviceObjects(ptr) d3dx10_43.D3DX10UnsetAllDeviceObjects @ stdcall D3DXBoxBoundProbe(ptr ptr ptr ptr) d3dx10_43.D3DXBoxBoundProbe -@ stdcall D3DXColorAdjustContrast(ptr ptr long) d3dx10_43.3DXColorAdjustContrast +@ stdcall D3DXColorAdjustContrast(ptr ptr long) d3dx10_43.D3DXColorAdjustContrast @ stdcall D3DXColorAdjustSaturation(ptr ptr long) d3dx10_43.D3DXColorAdjustSaturation @ stdcall D3DXComputeBoundingBox(ptr long long ptr ptr) d3dx10_43.D3DXComputeBoundingBox @ stdcall D3DXComputeBoundingSphere(ptr long long ptr ptr) d3dx10_43.D3DXComputeBoundingSphere diff --git a/dlls/d3dx10_38/d3dx10_38.spec b/dlls/d3dx10_38/d3dx10_38.spec index 952d4ec..1c88e2e 100644 --- a/dlls/d3dx10_38/d3dx10_38.spec +++ b/dlls/d3dx10_38/d3dx10_38.spec @@ -70,7 +70,7 @@ @ stdcall D3DX10SaveTextureToMemory(ptr ptr ptr long) d3dx10_43.D3DX10SaveTextureToMemory @ stdcall D3DX10UnsetAllDeviceObjects(ptr) d3dx10_43.D3DX10UnsetAllDeviceObjects @ stdcall D3DXBoxBoundProbe(ptr ptr ptr ptr) d3dx10_43.D3DXBoxBoundProbe -@ stdcall D3DXColorAdjustContrast(ptr ptr long) d3dx10_43.3DXColorAdjustContrast +@ stdcall D3DXColorAdjustContrast(ptr ptr long) d3dx10_43.D3DXColorAdjustContrast @ stdcall D3DXColorAdjustSaturation(ptr ptr long) d3dx10_43.D3DXColorAdjustSaturation @ stdcall D3DXComputeBoundingBox(ptr long long ptr ptr) d3dx10_43.D3DXComputeBoundingBox @ stdcall D3DXComputeBoundingSphere(ptr long long ptr ptr) d3dx10_43.D3DXComputeBoundingSphere diff --git a/dlls/d3dx10_39/d3dx10_39.spec b/dlls/d3dx10_39/d3dx10_39.spec index 496441f..bb0a4c6 100644 --- a/dlls/d3dx10_39/d3dx10_39.spec +++ b/dlls/d3dx10_39/d3dx10_39.spec @@ -70,7 +70,7 @@ @ stdcall D3DX10SaveTextureToMemory(ptr ptr ptr long) d3dx10_43.D3DX10SaveTextureToMemory @ stdcall D3DX10UnsetAllDeviceObjects(ptr) d3dx10_43.D3DX10UnsetAllDeviceObjects @ stdcall D3DXBoxBoundProbe(ptr ptr ptr ptr) d3dx10_43.D3DXBoxBoundProbe -@ stdcall D3DXColorAdjustContrast(ptr ptr long) d3dx10_43.3DXColorAdjustContrast +@ stdcall D3DXColorAdjustContrast(ptr ptr long) d3dx10_43.D3DXColorAdjustContrast @ stdcall D3DXColorAdjustSaturation(ptr ptr long) d3dx10_43.D3DXColorAdjustSaturation @ stdcall D3DXComputeBoundingBox(ptr long long ptr ptr) d3dx10_43.D3DXComputeBoundingBox @ stdcall D3DXComputeBoundingSphere(ptr long long ptr ptr) d3dx10_43.D3DXComputeBoundingSphere diff --git a/dlls/d3dx10_40/d3dx10_40.spec b/dlls/d3dx10_40/d3dx10_40.spec index 51dc1cd..76c4378 100644 --- a/dlls/d3dx10_40/d3dx10_40.spec +++ b/dlls/d3dx10_40/d3dx10_40.spec @@ -66,7 +66,7 @@ @ stdcall D3DX10SaveTextureToMemory(ptr ptr ptr long) d3dx10_43.D3DX10SaveTextureToMemory @ stdcall D3DX10UnsetAllDeviceObjects(ptr) d3dx10_43.D3DX10UnsetAllDeviceObjects @ stdcall D3DXBoxBoundProbe(ptr ptr ptr ptr) d3dx10_43.D3DXBoxBoundProbe -@ stdcall D3DXColorAdjustContrast(ptr ptr long) d3dx10_43.3DXColorAdjustContrast +@ stdcall D3DXColorAdjustContrast(ptr ptr long) d3dx10_43.D3DXColorAdjustContrast @ stdcall D3DXColorAdjustSaturation(ptr ptr long) d3dx10_43.D3DXColorAdjustSaturation @ stdcall D3DXComputeBoundingBox(ptr long long ptr ptr) d3dx10_43.D3DXComputeBoundingBox @ stdcall D3DXComputeBoundingSphere(ptr long long ptr ptr) d3dx10_43.D3DXComputeBoundingSphere diff --git a/dlls/d3dx10_41/d3dx10_41.spec b/dlls/d3dx10_41/d3dx10_41.spec index 51dc1cd..76c4378 100644 --- a/dlls/d3dx10_41/d3dx10_41.spec +++ b/dlls/d3dx10_41/d3dx10_41.spec @@ -66,7 +66,7 @@ @ stdcall D3DX10SaveTextureToMemory(ptr ptr ptr long) d3dx10_43.D3DX10SaveTextureToMemory @ stdcall D3DX10UnsetAllDeviceObjects(ptr) d3dx10_43.D3DX10UnsetAllDeviceObjects @ stdcall D3DXBoxBoundProbe(ptr ptr ptr ptr) d3dx10_43.D3DXBoxBoundProbe -@ stdcall D3DXColorAdjustContrast(ptr ptr long) d3dx10_43.3DXColorAdjustContrast +@ stdcall D3DXColorAdjustContrast(ptr ptr long) d3dx10_43.D3DXColorAdjustContrast @ stdcall D3DXColorAdjustSaturation(ptr ptr long) d3dx10_43.D3DXColorAdjustSaturation @ stdcall D3DXComputeBoundingBox(ptr long long ptr ptr) d3dx10_43.D3DXComputeBoundingBox @ stdcall D3DXComputeBoundingSphere(ptr long long ptr ptr) d3dx10_43.D3DXComputeBoundingSphere diff --git a/dlls/d3dx10_42/d3dx10_42.spec b/dlls/d3dx10_42/d3dx10_42.spec index 51dc1cd..76c4378 100644 --- a/dlls/d3dx10_42/d3dx10_42.spec +++ b/dlls/d3dx10_42/d3dx10_42.spec @@ -66,7 +66,7 @@ @ stdcall D3DX10SaveTextureToMemory(ptr ptr ptr long) d3dx10_43.D3DX10SaveTextureToMemory @ stdcall D3DX10UnsetAllDeviceObjects(ptr) d3dx10_43.D3DX10UnsetAllDeviceObjects @ stdcall D3DXBoxBoundProbe(ptr ptr ptr ptr) d3dx10_43.D3DXBoxBoundProbe -@ stdcall D3DXColorAdjustContrast(ptr ptr long) d3dx10_43.3DXColorAdjustContrast +@ stdcall D3DXColorAdjustContrast(ptr ptr long) d3dx10_43.D3DXColorAdjustContrast @ stdcall D3DXColorAdjustSaturation(ptr ptr long) d3dx10_43.D3DXColorAdjustSaturation @ stdcall D3DXComputeBoundingBox(ptr long long ptr ptr) d3dx10_43.D3DXComputeBoundingBox @ stdcall D3DXComputeBoundingSphere(ptr long long ptr ptr) d3dx10_43.D3DXComputeBoundingSphere diff --git a/dlls/d3dx10_43/d3dx10_43.spec b/dlls/d3dx10_43/d3dx10_43.spec index c5068c3..1ea80a2 100644 --- a/dlls/d3dx10_43/d3dx10_43.spec +++ b/dlls/d3dx10_43/d3dx10_43.spec @@ -66,7 +66,7 @@ @ stub D3DX10SaveTextureToMemory @ stub D3DX10UnsetAllDeviceObjects @ stdcall D3DXBoxBoundProbe(ptr ptr ptr ptr) d3dx9_36.D3DXBoxBoundProbe -@ stdcall D3DXColorAdjustContrast(ptr ptr long) d3dx9_36.3DXColorAdjustContrast +@ stdcall D3DXColorAdjustContrast(ptr ptr long) d3dx9_36.D3DXColorAdjustContrast @ stdcall D3DXColorAdjustSaturation(ptr ptr long) d3dx9_36.D3DXColorAdjustSaturation @ stdcall D3DXComputeBoundingBox(ptr long long ptr ptr) d3dx9_36.D3DXComputeBoundingBox @ stdcall D3DXComputeBoundingSphere(ptr long long ptr ptr) d3dx9_36.D3DXComputeBoundingSphere

1 0

Matteo Bruni : d3dcompiler: Stub D3DCompile implementation.
by Alexandre Julliard Aug. 30, 2010

Aug. 30, 2010

Module: wine Branch: master Commit: 390b48035682db6fd6b1fe3b7432747bef52a283 URL: http://source.winehq.org/git/wine.git/?a=commit;h=390b48035682db6fd6b1fe3b7… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Sat Aug 21 03:00:47 2010 +0200 d3dcompiler: Stub D3DCompile implementation. --- dlls/d3dcompiler_43/compiler.c | 17 +++++++++++++++++ dlls/d3dcompiler_43/d3dcompiler_43.spec | 2 +- include/d3dcompiler.h | 4 ++++ 3 files changed, 22 insertions(+), 1 deletions(-) diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c index 1c5c32b..43a5a3a 100644 --- a/dlls/d3dcompiler_43/compiler.c +++ b/dlls/d3dcompiler_43/compiler.c @@ -491,3 +491,20 @@ cleanup: LeaveCriticalSection(&wpp_mutex); return hr; } + +HRESULT WINAPI D3DCompile(const void *data, SIZE_T data_size, const char *filename, + const D3D_SHADER_MACRO *defines, ID3DInclude *include, const char *entrypoint, + const char *target, UINT sflags, UINT eflags, ID3DBlob **shader, ID3DBlob **error_messages) +{ + FIXME("data %p, data_size %lu, filename %s, defines %p, include %p, entrypoint %s,\n" + "target %s, sflags %#x, eflags %#x, shader %p, error_messages %p stub!\n", + data, data_size, debugstr_a(filename), defines, include, debugstr_a(entrypoint), + debugstr_a(target), sflags, eflags, shader, error_messages); + + TRACE("Shader source:\n%s\n", debugstr_an(data, data_size)); + + if (error_messages) + D3DCreateBlob(1, error_messages); /* zero fill used as string end */ + + return D3DERR_INVALIDCALL; +} diff --git a/dlls/d3dcompiler_43/d3dcompiler_43.spec b/dlls/d3dcompiler_43/d3dcompiler_43.spec index e86acef..ef57d52 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_43.spec +++ b/dlls/d3dcompiler_43/d3dcompiler_43.spec @@ -1,6 +1,6 @@ @ stdcall D3DAssemble(ptr long str ptr ptr long ptr ptr) @ stub DebugSetMute -@ stub D3DCompile +@ stdcall D3DCompile(ptr long str ptr ptr str str long long ptr ptr) @ stub D3DCompressShaders @ stdcall D3DCreateBlob(long ptr) @ stub D3DDecompressShaders diff --git a/include/d3dcompiler.h b/include/d3dcompiler.h index 1939124..9929cba 100644 --- a/include/d3dcompiler.h +++ b/include/d3dcompiler.h @@ -41,6 +41,10 @@ #define D3DCOMPILE_OPTIMIZATION_LEVEL3 0x8000 #define D3DCOMPILE_WARNINGS_ARE_ERRORS 0x40000 +HRESULT WINAPI D3DCompile(const void *data, SIZE_T data_size, const char *filename, + const D3D_SHADER_MACRO *defines, ID3DInclude *include, const char *entrypoint, + const char *target, UINT sflags, UINT eflags, ID3DBlob **shader, ID3DBlob **error_messages); + HRESULT WINAPI D3DCreateBlob(SIZE_T data_size, ID3DBlob **blob); #endif

1 0

Vincent Povirk : windowscodecs: Implement IWICStream:: InitializeFromIStreamRegion.
by Alexandre Julliard Aug. 30, 2010

Aug. 30, 2010

Module: wine Branch: master Commit: 1ed39c29e21afac1aa34c1b3d5d0d43d195ba3f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ed39c29e21afac1aa34c1b3d… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Aug 27 18:24:29 2010 -0500 windowscodecs: Implement IWICStream::InitializeFromIStreamRegion. --- dlls/windowscodecs/stream.c | 322 ++++++++++++++++++++++++++++++++++++- dlls/windowscodecs/tests/stream.c | 2 +- 2 files changed, 321 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1ed39c29e21afac1aa34c…

1 0

Dan Kegel : kernel32: Add error text for WSAECONNREFUSED.
by Alexandre Julliard Aug. 30, 2010

Aug. 30, 2010

Module: wine Branch: master Commit: a5bdb7dbc1e06717553d50aa6d2a53eb6544180a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5bdb7dbc1e06717553d50aa6… Author: Dan Kegel <dank(a)kegel.com> Date: Fri Aug 27 15:27:32 2010 +0000 kernel32: Add error text for WSAECONNREFUSED. --- dlls/kernel32/nls/winerr_dan.mc | 5 +++++ dlls/kernel32/nls/winerr_deu.mc | 5 +++++ dlls/kernel32/nls/winerr_enu.mc | 5 +++++ dlls/kernel32/nls/winerr_fra.mc | 5 +++++ dlls/kernel32/nls/winerr_ita.mc | 5 +++++ dlls/kernel32/nls/winerr_jpn.mc | 5 +++++ dlls/kernel32/nls/winerr_kor.mc | 5 +++++ dlls/kernel32/nls/winerr_lth.mc | 5 +++++ dlls/kernel32/nls/winerr_nld.mc | 5 +++++ dlls/kernel32/nls/winerr_nor.mc | 5 +++++ dlls/kernel32/nls/winerr_plk.mc | 5 +++++ dlls/kernel32/nls/winerr_ptb.mc | 5 +++++ dlls/kernel32/nls/winerr_ptg.mc | 5 +++++ dlls/kernel32/nls/winerr_rus.mc | 5 +++++ dlls/kernel32/nls/winerr_ukr.mc | 5 +++++ 15 files changed, 75 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/nls/winerr_dan.mc b/dlls/kernel32/nls/winerr_dan.mc index b847952..c3033e3 100644 --- a/dlls/kernel32/nls/winerr_dan.mc +++ b/dlls/kernel32/nls/winerr_dan.mc @@ -3735,3 +3735,8 @@ SymbolicName=NERR_UserNotFound Language=DAN Brugernavnet blev ikke fundet . +MessageId=10061 +SymbolicName=WSAECONNREFUSED +Language=DAN +Forbindelse nægtet +. diff --git a/dlls/kernel32/nls/winerr_deu.mc b/dlls/kernel32/nls/winerr_deu.mc index 478f29b..71b2641 100644 --- a/dlls/kernel32/nls/winerr_deu.mc +++ b/dlls/kernel32/nls/winerr_deu.mc @@ -3734,3 +3734,8 @@ SymbolicName=NERR_UserNotFound Language=DEU Der Benutzername konnte nicht gefunden werden . +MessageId=10061 +SymbolicName=WSAECONNREFUSED +Language=DEU +Verbindung abgelehnt +. diff --git a/dlls/kernel32/nls/winerr_enu.mc b/dlls/kernel32/nls/winerr_enu.mc index 0c3aee4..ed36103 100644 --- a/dlls/kernel32/nls/winerr_enu.mc +++ b/dlls/kernel32/nls/winerr_enu.mc @@ -3733,3 +3733,8 @@ SymbolicName=NERR_UserNotFound Language=ENU The username could not be found . +MessageId=10061 +SymbolicName=WSAECONNREFUSED +Language=ENU +Connection refused +. diff --git a/dlls/kernel32/nls/winerr_fra.mc b/dlls/kernel32/nls/winerr_fra.mc index 7b3e6b6..7f96f34 100644 --- a/dlls/kernel32/nls/winerr_fra.mc +++ b/dlls/kernel32/nls/winerr_fra.mc @@ -3735,3 +3735,8 @@ SymbolicName=NERR_UserNotFound Language=FRA Nom d'utilisateur introuvable . +MessageId=10061 +SymbolicName=WSAECONNREFUSED +Language=FRA +Connexion refusée +. diff --git a/dlls/kernel32/nls/winerr_ita.mc b/dlls/kernel32/nls/winerr_ita.mc index 2ca8f36..0146857 100644 --- a/dlls/kernel32/nls/winerr_ita.mc +++ b/dlls/kernel32/nls/winerr_ita.mc @@ -3735,3 +3735,8 @@ SymbolicName=NERR_UserNotFound Language=ITA Impossibile trovare il nome utente . +MessageId=10061 +SymbolicName=WSAECONNREFUSED +Language=ITA +Connessione rifiutata +. diff --git a/dlls/kernel32/nls/winerr_jpn.mc b/dlls/kernel32/nls/winerr_jpn.mc index 64fa3b9..a419baa 100644 --- a/dlls/kernel32/nls/winerr_jpn.mc +++ b/dlls/kernel32/nls/winerr_jpn.mc @@ -3737,3 +3737,8 @@ SymbolicName=NERR_UserNotFound Language=JPN ユーザ名は見つけられません。 . +MessageId=10061 +SymbolicName=WSAECONNREFUSED +Language=JPN +接続は拒否されました。 +. diff --git a/dlls/kernel32/nls/winerr_kor.mc b/dlls/kernel32/nls/winerr_kor.mc index 289b17e..e7db432 100644 --- a/dlls/kernel32/nls/winerr_kor.mc +++ b/dlls/kernel32/nls/winerr_kor.mc @@ -3735,3 +3735,8 @@ SymbolicName=NERR_UserNotFound Language=KOR �� ̸�� ã�� ϴ� . +MessageId=10061 +SymbolicName=WSAECONNREFUSED +Language=KOR +Connection refused +. diff --git a/dlls/kernel32/nls/winerr_lth.mc b/dlls/kernel32/nls/winerr_lth.mc index 7278025..8f611fe 100644 --- a/dlls/kernel32/nls/winerr_lth.mc +++ b/dlls/kernel32/nls/winerr_lth.mc @@ -3734,3 +3734,8 @@ SymbolicName=NERR_UserNotFound Language=LTH Naudotojo vardas nerastas . +MessageId=10061 +SymbolicName=WSAECONNREFUSED +Language=LTH +Sujungimas nepriimtas +. diff --git a/dlls/kernel32/nls/winerr_nld.mc b/dlls/kernel32/nls/winerr_nld.mc index 6acf839..51b1401 100644 --- a/dlls/kernel32/nls/winerr_nld.mc +++ b/dlls/kernel32/nls/winerr_nld.mc @@ -3735,3 +3735,8 @@ SymbolicName=NERR_UserNotFound Language=NLD Gebruikersnaam niet gevonden . +MessageId=10061 +SymbolicName=WSAECONNREFUSED +Language=NLD +Verbinding geweigerd +. diff --git a/dlls/kernel32/nls/winerr_nor.mc b/dlls/kernel32/nls/winerr_nor.mc index d8828e1..6efdfb3 100644 --- a/dlls/kernel32/nls/winerr_nor.mc +++ b/dlls/kernel32/nls/winerr_nor.mc @@ -3735,3 +3735,8 @@ SymbolicName=NERR_UserNotFound Language=NOR Brukernavnet finnes ikke . +MessageId=10061 +SymbolicName=WSAECONNREFUSED +Language=NOR +Tilkobling nektet +. diff --git a/dlls/kernel32/nls/winerr_plk.mc b/dlls/kernel32/nls/winerr_plk.mc index 6fd397c..6395016 100644 --- a/dlls/kernel32/nls/winerr_plk.mc +++ b/dlls/kernel32/nls/winerr_plk.mc @@ -3734,3 +3734,8 @@ SymbolicName=NERR_UserNotFound Language=PLK Nie znaleziono nazwy u�ytkownika . +MessageId=10061 +SymbolicName=WSAECONNREFUSED +Language=PLK +Po��czenie odm�wi�o +. diff --git a/dlls/kernel32/nls/winerr_ptb.mc b/dlls/kernel32/nls/winerr_ptb.mc index 883655d..d3007e6 100644 --- a/dlls/kernel32/nls/winerr_ptb.mc +++ b/dlls/kernel32/nls/winerr_ptb.mc @@ -3735,3 +3735,8 @@ SymbolicName=NERR_UserNotFound Language=PTB O nome de usuário não foi encontrado . +MessageId=10061 +SymbolicName=WSAECONNREFUSED +Language=PTB +Conexão recusada +. diff --git a/dlls/kernel32/nls/winerr_ptg.mc b/dlls/kernel32/nls/winerr_ptg.mc index 26f2fc4..f593f6e 100644 --- a/dlls/kernel32/nls/winerr_ptg.mc +++ b/dlls/kernel32/nls/winerr_ptg.mc @@ -3734,3 +3734,8 @@ SymbolicName=NERR_UserNotFound Language=PTG O nome de utilizador não foi encontrado . +MessageId=10061 +SymbolicName=WSAECONNREFUSED +Language=PTG +Ligação recusada +. diff --git a/dlls/kernel32/nls/winerr_rus.mc b/dlls/kernel32/nls/winerr_rus.mc index b3142b4..07a81b0 100644 --- a/dlls/kernel32/nls/winerr_rus.mc +++ b/dlls/kernel32/nls/winerr_rus.mc @@ -3734,3 +3734,8 @@ SymbolicName=NERR_UserNotFound Language=RUS Имя пользователя не найдено . +MessageId=10061 +SymbolicName=WSAECONNREFUSED +Language=RUS +Соединение отвергнуто +. diff --git a/dlls/kernel32/nls/winerr_ukr.mc b/dlls/kernel32/nls/winerr_ukr.mc index 8a607b3..571dc17 100644 --- a/dlls/kernel32/nls/winerr_ukr.mc +++ b/dlls/kernel32/nls/winerr_ukr.mc @@ -3735,3 +3735,8 @@ SymbolicName=NERR_UserNotFound Language=UKR Ім'я користувача не знайдено . +MessageId=10061 +SymbolicName=WSAECONNREFUSED +Language=UKR +У з'єднанні відмовлено +.

1 0

Matteo Bruni : d3dx9: Forward D3DXCompileShader to d3dcompiler.
by Alexandre Julliard Aug. 30, 2010

Aug. 30, 2010

Module: wine Branch: master Commit: 3a6050b6aba351fdf0805a901417cdef892a5c23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a6050b6aba351fdf0805a901… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Wed Aug 25 18:43:42 2010 +0200 d3dx9: Forward D3DXCompileShader to d3dcompiler. --- dlls/d3dx9_36/shader.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 9c6700a..35665d6 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -25,6 +25,7 @@ #include "wingdi.h" #include "objbase.h" #include "d3dcommon.h" +#include "d3dcompiler.h" #include "d3dx9_36_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3dx); @@ -371,16 +372,15 @@ HRESULT WINAPI D3DXCompileShader(LPCSTR pSrcData, LPD3DXBUFFER* ppErrorMsgs, LPD3DXCONSTANTTABLE * ppConstantTable) { - FIXME("(%p, %d, %p, %p, %s, %s, %x, %p, %p, %p): stub\n", - pSrcData, srcDataLen, pDefines, pInclude, debugstr_a(pFunctionName), - debugstr_a(pProfile), Flags, ppShader, ppErrorMsgs, ppConstantTable); + HRESULT hr = D3DCompile(pSrcData, srcDataLen, NULL, + (D3D_SHADER_MACRO *)pDefines, (ID3DInclude *)pInclude, + pFunctionName, pProfile, Flags, 0, + (ID3DBlob **)ppShader, (ID3DBlob **)ppErrorMsgs); - TRACE("Shader source:\n"); - TRACE("%s\n", debugstr_an(pSrcData, srcDataLen)); - - if (ppErrorMsgs) - D3DXCreateBuffer(1, ppErrorMsgs); /* zero fill used as string end */ - return D3DERR_INVALIDCALL; + if(SUCCEEDED(hr) && ppConstantTable) + return D3DXGetShaderConstantTable(ID3DXBuffer_GetBufferPointer(*ppShader), + ppConstantTable); + return hr; } static const struct ID3DXConstantTableVtbl ID3DXConstantTable_Vtbl;

1 0

Matteo Bruni : include: Update some d3d10shader.h definitions.
by Alexandre Julliard Aug. 30, 2010

Aug. 30, 2010

Module: wine Branch: master Commit: e574c89f88ab8ca2f013b677c1ffb1208e5c54b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e574c89f88ab8ca2f013b677c… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Thu Aug 26 17:15:44 2010 +0200 include: Update some d3d10shader.h definitions. --- include/d3d10shader.h | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/include/d3d10shader.h b/include/d3d10shader.h index 592dd18..f06df30 100644 --- a/include/d3d10shader.h +++ b/include/d3d10shader.h @@ -127,11 +127,14 @@ typedef enum D3D10_REGISTER_COMPONENT_TYPE D3D10_REGISTER_COMPONENT_FLOAT32 = 3, } D3D10_REGISTER_COMPONENT_TYPE; -typedef struct _D3D10_SHADER_MACRO -{ - LPCSTR Name; - LPCSTR Definition; -} D3D10_SHADER_MACRO, *LPD3D10_SHADER_MACRO; +/* These are defined as version-neutral in d3dcommon.h */ +typedef D3D_SHADER_MACRO D3D10_SHADER_MACRO; +typedef D3D_SHADER_MACRO *LPD3D10_SHADER_MACRO; + +typedef D3D_INCLUDE_TYPE D3D10_INCLUDE_TYPE; +typedef ID3DInclude ID3D10Include; +typedef ID3DInclude *LPD3D10INCLUDE; +#define IID_ID3D10Include IID_ID3DInclude typedef enum D3D10_RESOURCE_RETURN_TYPE { @@ -279,6 +282,9 @@ DECLARE_INTERFACE_(ID3D10ShaderReflection, IUnknown) }; #undef INTERFACE +HRESULT WINAPI D3D10CompileShader(LPCSTR data, SIZE_T data_size, LPCSTR filename, + const D3D10_SHADER_MACRO *defines, ID3D10Include *include, LPCSTR entrypoint, + LPCSTR profile, UINT flags, ID3D10Blob **shader, ID3D10Blob **error_messages); LPCSTR WINAPI D3D10GetVertexShaderProfile(ID3D10Device *device); LPCSTR WINAPI D3D10GetGeometryShaderProfile(ID3D10Device *device); LPCSTR WINAPI D3D10GetPixelShaderProfile(ID3D10Device *device);

1 0

Eric Pouech : dbghelp: Use virtual size (not raw/file size) when getting the size of a PE section.
by Alexandre Julliard Aug. 30, 2010

Aug. 30, 2010

Module: wine Branch: master Commit: 63c7ea649427c1518d1e8b3305620dfdf1dba358 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63c7ea649427c1518d1e8b330… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Aug 28 09:09:24 2010 +0200 dbghelp: Use virtual size (not raw/file size) when getting the size of a PE section. --- dlls/dbghelp/pe_module.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c index 18cec9a..d41cdf4 100644 --- a/dlls/dbghelp/pe_module.c +++ b/dlls/dbghelp/pe_module.c @@ -79,6 +79,14 @@ const char* pe_map_section(struct image_section_map* ism) fmap->sect[ism->sidx].mapped == IMAGE_NO_MAP) { IMAGE_NT_HEADERS* nth; + + if (fmap->sect[ism->sidx].shdr.Misc.VirtualSize > fmap->sect[ism->sidx].shdr.SizeOfRawData) + { + FIXME("Section %ld: virtual (0x%x) > raw (0x%x) size - not supported\n", + ism->sidx, fmap->sect[ism->sidx].shdr.Misc.VirtualSize, + fmap->sect[ism->sidx].shdr.SizeOfRawData); + return IMAGE_NO_MAP; + } /* FIXME: that's rather drastic, but that will do for now * that's ok if the full file map exists, but we could be less agressive otherwise and * only map the relevant section @@ -162,13 +170,13 @@ DWORD_PTR pe_get_map_rva(const struct image_section_map* ism) /****************************************************************** * pe_get_map_size * - * Get the size of an PE section + * Get the size of a PE section */ unsigned pe_get_map_size(const struct image_section_map* ism) { if (ism->sidx < 0 || ism->sidx >= ism->fmap->u.pe.ntheader.FileHeader.NumberOfSections) return 0; - return ism->fmap->u.pe.sect[ism->sidx].shdr.SizeOfRawData; + return ism->fmap->u.pe.sect[ism->sidx].shdr.Misc.VirtualSize; } /******************************************************************

1 0

Sven Baars : jscript: Update the Dutch translation.
by Alexandre Julliard Aug. 30, 2010

Aug. 30, 2010

Module: wine Branch: master Commit: 32722884f30e62c11b3beab39ec68717ef9de5d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32722884f30e62c11b3beab39… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sat Aug 28 13:42:28 2010 +0200 jscript: Update the Dutch translation. --- dlls/jscript/jscript_Nl.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/jscript_Nl.rc b/dlls/jscript/jscript_Nl.rc index e140b31..0e5798b 100644 --- a/dlls/jscript/jscript_Nl.rc +++ b/dlls/jscript/jscript_Nl.rc @@ -28,6 +28,7 @@ STRINGTABLE IDS_INVALID_CALL_ARG "Ongeldige procedure-aanroep of argument" IDS_CREATE_OBJ_ERROR "Automatiseringsserver kan het object niet creëren" IDS_NO_PROPERTY "Dit object ondersteunt deze eigenschap of methode niet" + IDS_UNSUPPORTED_ACTION "Dit object ondersteunt deze actie niet" IDS_ARG_NOT_OPT "Argument is niet optioneel" IDS_SYNTAX_ERROR "Syntax fout" IDS_SEMICOLON "';' verwacht"

1 0

Vincent Povirk : windowscodecs: Add test for IWICStream:: InitializeFromIStreamRegion.
by Alexandre Julliard Aug. 30, 2010

Aug. 30, 2010

Module: wine Branch: master Commit: 0b532eb83448e959435e4ae83d6d37a79f12ac34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b532eb83448e959435e4ae83… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Aug 27 17:25:40 2010 -0500 windowscodecs: Add test for IWICStream::InitializeFromIStreamRegion. --- dlls/windowscodecs/tests/stream.c | 329 +++++++++++++++++++++++++++++++++++++ include/wincodec.idl | 1 + 2 files changed, 330 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0b532eb83448e959435e4…

1 0

André Hentschel : kernel32: Better describe an error.
by Alexandre Julliard Aug. 30, 2010

Aug. 30, 2010

Module: wine Branch: master Commit: 0029e64e4ee7af9e01cbb860fc7f31a10ce7e7c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0029e64e4ee7af9e01cbb860f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Aug 27 21:47:53 2010 +0200 kernel32: Better describe an error. --- dlls/kernel32/process.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 65dc2eb..ef65a86 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -1659,7 +1659,7 @@ static BOOL create_process( HANDLE hFile, LPCWSTR filename, LPWSTR cmd_line, LPW if (!is_win64 && !is_wow64 && (binary_info->flags & BINARY_FLAG_64BIT)) { - ERR( "starting 64-bit process %s not supported on this environment\n", debugstr_w(filename) ); + ERR( "starting 64-bit process %s not supported in 32-bit wineprefix\n", debugstr_w(filename) ); SetLastError( ERROR_BAD_EXE_FORMAT ); return FALSE; }

1 0