February 2010 - Wine-Commits

Alexandre Julliard : runtest: Fix handling of test binaries in the programs directory.
by Alexandre Julliard Feb. 15, 2010

Feb. 15, 2010

Module: wine Branch: master Commit: 96346ed62ef1d51df38f5073309172bb58c68c82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96346ed62ef1d51df38f50733… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 15 12:49:08 2010 +0100 runtest: Fix handling of test binaries in the programs directory. --- tools/runtest | 24 ++++++++++++++++-------- 1 files changed, 16 insertions(+), 8 deletions(-) diff --git a/tools/runtest b/tools/runtest index 86f8680..79bd2f7 100755 --- a/tools/runtest +++ b/tools/runtest @@ -91,14 +91,22 @@ done if [ -z "$program" ]; then # try to autodetect the test program name based on the working directory working_path=`pwd` - working_basename=`basename "$working_path"` - if [ "$working_basename" = "tests" ]; then - parent_path=`dirname "$working_path"` - parent_basename=`basename "$parent_path"` - program="${parent_basename}_test.exe.so" - elif [ -d "tests" ]; then - program="tests/${working_basename}_test.exe.so" - fi + case $working_path in + */dlls/*/tests) + parent_path=`dirname "$working_path"` + program=`basename "$parent_path"`_test.exe.so + ;; + */dlls/*) + program=tests/`basename "$working_path"`_test.exe.so + ;; + */programs/*/tests) + parent_path=`dirname "$working_path"` + program=`basename "$parent_path"`.exe_test.exe.so + ;; + */programs/*) + program=tests/`basename "$working_path"`.exe_test.exe.so + ;; + esac fi if [ ! -f "$program" ]; then echo "Can't find the test program, use the -p argument to specify one" 1>&2

1 0

José Manuel Ferrer Ortiz : localspl: New Spanish translations.
by Alexandre Julliard Feb. 15, 2010

Feb. 15, 2010

Module: wine Branch: master Commit: efa97230c13306f1e7e689915f71ba7c1375d94d URL: http://source.winehq.org/git/wine.git/?a=commit;h=efa97230c13306f1e7e689915… Author: José Manuel Ferrer Ortiz <jmfo1982(a)yahoo.es> Date: Sat Feb 13 01:13:29 2010 +0100 localspl: New Spanish translations. --- dlls/localspl/Makefile.in | 1 + dlls/localspl/spl_Es.rc | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 0 deletions(-) diff --git a/dlls/localspl/Makefile.in b/dlls/localspl/Makefile.in index 9fa087d..6409454 100644 --- a/dlls/localspl/Makefile.in +++ b/dlls/localspl/Makefile.in @@ -15,6 +15,7 @@ RC_SRCS = \ spl_Da.rc \ spl_De.rc \ spl_En.rc \ + spl_Es.rc \ spl_Fr.rc \ spl_Ko.rc \ spl_Lt.rc \ diff --git a/dlls/localspl/spl_Es.rc b/dlls/localspl/spl_Es.rc new file mode 100644 index 0000000..9b9a558 --- /dev/null +++ b/dlls/localspl/spl_Es.rc @@ -0,0 +1,32 @@ +/* + * Spanish resources for localspl + * + * Copyright 2010 José Manuel Ferrer Ortiz + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "localspl_private.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +{ + IDS_LOCALPORT "Puerto local" + IDS_LOCALMONITOR "Monitor local" +}

1 0

Alexandre Julliard : ntdll/tests: Use correct access rights in the NtOpenKey test.
by Alexandre Julliard Feb. 15, 2010

Feb. 15, 2010

Module: wine Branch: master Commit: 531daa04c2aadb7d2d655efae09c9f182bc482c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=531daa04c2aadb7d2d655efae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 15 12:20:18 2010 +0100 ntdll/tests: Use correct access rights in the NtOpenKey test. --- dlls/ntdll/tests/reg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 48de5a5..8061516 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -350,7 +350,7 @@ static void test_NtOpenKey(void) InitializeObjectAttributes(&attr, &winetestpath, 0, 0, 0); /* NULL key */ - status = pNtOpenKey(NULL, 0, &attr); + status = pNtOpenKey(NULL, am, &attr); todo_wine ok(status == STATUS_ACCESS_VIOLATION, "Expected STATUS_ACCESS_VIOLATION, got: 0x%08x\n", status);

1 0

Christian Costa : d3dx9_36: Implement D3DXCreateTexture.
by Alexandre Julliard Feb. 15, 2010

Feb. 15, 2010

Module: wine Branch: master Commit: 82d70540857d868691db0fecc65c254b0ebc58ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=82d70540857d868691db0fecc… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Mon Feb 15 09:47:50 2010 +0100 d3dx9_36: Implement D3DXCreateTexture. --- dlls/d3dx9_36/Makefile.in | 1 + dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/texture.c | 37 +++++++++++++++++++++++++++++++++++++ 3 files changed, 39 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/Makefile.in b/dlls/d3dx9_36/Makefile.in index 88ac1d7..36eca4a 100644 --- a/dlls/d3dx9_36/Makefile.in +++ b/dlls/d3dx9_36/Makefile.in @@ -15,6 +15,7 @@ C_SRCS = \ shader.c \ sprite.c \ surface.c \ + texture.c \ util.c RC_SRCS = version.rc diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index 37334e7..43551b2 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -92,7 +92,7 @@ @ stub D3DXCreateTeapot @ stub D3DXCreateTextA @ stub D3DXCreateTextW -@ stub D3DXCreateTexture +@ stdcall D3DXCreateTexture(ptr long long long long long long ptr) @ stub D3DXCreateTextureFromFileA @ stub D3DXCreateTextureFromFileExA @ stub D3DXCreateTextureFromFileExW diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c new file mode 100644 index 0000000..f47853a --- /dev/null +++ b/dlls/d3dx9_36/texture.c @@ -0,0 +1,37 @@ +/* + * Copyright 2010 Christian Costa + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/debug.h" +#include "d3dx9_36_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d3dx); + +HRESULT WINAPI D3DXCreateTexture(LPDIRECT3DDEVICE9 pDevice, + UINT width, + UINT height, + UINT miplevels, + DWORD usage, + D3DFORMAT format, + D3DPOOL pool, + LPDIRECT3DTEXTURE9 *ppTexture) +{ + FIXME("(%p, %d, %d, %d, %x, %x, %x, %p): semi-stub\n", pDevice, width, height, miplevels, usage, format, + pool, ppTexture); + + return IDirect3DDevice9_CreateTexture(pDevice, width, height, miplevels, usage, format, pool, ppTexture, NULL); +}

1 0

André Hentschel : cmd: Improve German translation.
by Alexandre Julliard Feb. 15, 2010

Feb. 15, 2010

Module: wine Branch: master Commit: d00f0316463eb53fffff2edbdc9809876dc6a4a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d00f0316463eb53fffff2edbd… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Feb 14 21:43:31 2010 +0100 cmd: Improve German translation. --- programs/cmd/De.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/cmd/De.rc b/programs/cmd/De.rc index 0e4fc44..2e83338 100644 --- a/programs/cmd/De.rc +++ b/programs/cmd/De.rc @@ -233,7 +233,7 @@ mit PUSHD gespeicherten.\n" Betriebssystem oder der Shell zurück, von der CMD gestart wurde.\n" - WCMD_ALLHELP, "CMD eingebauten Befehle sind:\n\ + WCMD_ALLHELP, "In CMD eingebaute Befehle sind:\n\ ATTRIB\t\tZeigt oder ändert die DOS Dateieigenschaften\n\ CALL\t\tRuft eine Batch-Datei innerhalb einer anderen auf\n\ CD (CHDIR)\tWechselt in ein Verzeichnis\n\

1 0

Alexander Nicolaysen Sørnes : dsound/ tests: Test querying for KsPropertySet on primary buffer.
by Alexandre Julliard Feb. 15, 2010

Feb. 15, 2010

Module: wine Branch: master Commit: 9c88bd8d245c667979fe99c5e6aa78b2cae0ae07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c88bd8d245c667979fe99c5e… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Mon Feb 15 00:59:27 2010 +0100 dsound/tests: Test querying for KsPropertySet on primary buffer. --- dlls/dsound/tests/ds3d.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/dsound/tests/ds3d.c b/dlls/dsound/tests/ds3d.c index 8ae0efa..ad380d8 100644 --- a/dlls/dsound/tests/ds3d.c +++ b/dlls/dsound/tests/ds3d.c @@ -1158,13 +1158,12 @@ static HRESULT test_primary_3d_with_listener(LPGUID lpGuid) "to create a 3D primary buffer: %08x\n",rc); if (rc==DS_OK && primary!=NULL) { LPDIRECTSOUND3DLISTENER listener=NULL; + LPDIRECTSOUNDBUFFER temp_buffer=NULL; rc=IDirectSoundBuffer_QueryInterface(primary, &IID_IDirectSound3DListener,(void **)&listener); ok(rc==DS_OK && listener!=NULL,"IDirectSoundBuffer_QueryInterface() " "failed to get a 3D listener: %08x\n",rc); if (rc==DS_OK && listener!=NULL) { - LPDIRECTSOUNDBUFFER temp_buffer=NULL; - /* Checking the COM interface */ rc=IDirectSoundBuffer_QueryInterface(primary, &IID_IDirectSoundBuffer,(LPVOID *)&temp_buffer); @@ -1213,6 +1212,16 @@ static HRESULT test_primary_3d_with_listener(LPGUID lpGuid) "references, should have 0\n",ref); } + todo_wine { + temp_buffer = NULL; + rc=IDirectSoundBuffer_QueryInterface(primary, + &IID_IKsPropertySet,(LPVOID *)&temp_buffer); + ok(rc==DS_OK && temp_buffer!=NULL, + "IDirectSoundBuffer_QueryInterface didn't handle IKsPropertySet on primary buffer: ret = %08x\n", rc); + if(temp_buffer) + IKsPropertySet_Release(temp_buffer); + } + /* Testing the reference counting */ ref=IDirectSoundBuffer_Release(primary); ok(ref==0,"IDirectSoundBuffer_Release() primary has %d references, "

1 0

Christian Costa : d3drm: Remove wrong description.
by Alexandre Julliard Feb. 15, 2010

Feb. 15, 2010

Module: wine Branch: master Commit: 739c1177d9c0b8d28b226ad09fb033c83d53bd06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=739c1177d9c0b8d28b226ad09… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Mon Feb 15 09:49:03 2010 +0100 d3drm: Remove wrong description. --- dlls/d3drm/d3drm.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 849efea..72eb864 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -3,9 +3,6 @@ * * Copyright 2010 Christian Costa * - * This file contains the (internal) driver registration functions, - * driver enumeration APIs and DirectDraw creation functions. - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either

1 0

Jörg Höhle : winex11: Initialize KeyPressEvent for XmbLookupString.
by Alexandre Julliard Feb. 15, 2010

Feb. 15, 2010

Module: wine Branch: master Commit: 7155742d70860e6e43941cff406ce3cc21147ead URL: http://source.winehq.org/git/wine.git/?a=commit;h=7155742d70860e6e43941cff4… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sat Feb 13 22:37:21 2010 +0100 winex11: Initialize KeyPressEvent for XmbLookupString. --- dlls/winex11.drv/keyboard.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 74581cb..86ac83b 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1754,6 +1754,7 @@ void X11DRV_InitKeyboard( Display *display ) e2.display = display; e2.state = 0; + e2.type = KeyPress; memset(keyc2vkey, 0, sizeof(keyc2vkey)); for (keyc = min_keycode; keyc <= max_keycode; keyc++) @@ -2268,6 +2269,7 @@ UINT CDECL X11DRV_MapVirtualKeyEx(UINT wCode, UINT wMapType, HKL hkl) e.display = display; e.state = 0; e.keycode = 0; + e.type = KeyPress; wine_tsx11_lock();

1 0

Ozkan Sezer : include: Another fix for IDirectSound3DBuffer_SetConeAngles.
by Alexandre Julliard Feb. 15, 2010

Feb. 15, 2010

Module: wine Branch: master Commit: f02fd4b5eb41937f5be6dfc95269dc833bb06037 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f02fd4b5eb41937f5be6dfc95… Author: Ozkan Sezer <sezeroz(a)gmail.com> Date: Sun Feb 14 12:07:37 2010 +0200 include: Another fix for IDirectSound3DBuffer_SetConeAngles. --- include/dsound.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/dsound.h b/include/dsound.h index 0923561..b594053 100644 --- a/include/dsound.h +++ b/include/dsound.h @@ -1098,7 +1098,7 @@ DECLARE_INTERFACE_(IDirectSound3DBuffer,IUnknown) #define IDirectSound3DBuffer_GetPosition(p,a) (p)->GetPosition(a) #define IDirectSound3DBuffer_GetVelocity(p,a) (p)->GetVelocity(a) #define IDirectSound3DBuffer_SetAllParameters(p,a,b) (p)->SetAllParameters(a,b) -#define IDirectSound3DBuffer_SetConeAngles(p,a,b) (p)->SetConeAngles(a,b) +#define IDirectSound3DBuffer_SetConeAngles(p,a,b,c) (p)->SetConeAngles(a,b,c) #define IDirectSound3DBuffer_SetConeOrientation(p,a,b,c,d) (p)->SetConeOrientation(a,b,c,d) #define IDirectSound3DBuffer_SetConeOutsideVolume(p,a,b) (p)->SetConeOutsideVolume(a,b) #define IDirectSound3DBuffer_SetMaxDistance(p,a,b) (p)->SetMaxDistance(a,b)

1 0

Jörg Höhle : winex11: Add vkey codes for functions keys upto F24.
by Alexandre Julliard Feb. 15, 2010

Feb. 15, 2010

Module: wine Branch: master Commit: da49030b39701ccb5696bd1a7e632aa4681751b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da49030b39701ccb5696bd1a7… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sun Feb 14 21:05:32 2010 +0100 winex11: Add vkey codes for functions keys upto F24. Scancodes 63..6B for F16-F24 were not added because they conflict with the 60.. reassignment heuristic in InitKeyboard. --- dlls/winex11.drv/keyboard.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 86ac83b..5284717 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1023,8 +1023,8 @@ static const WORD nonchar_key_vkey[256] = /* function keys */ VK_F1, VK_F2, VK_F3, VK_F4, VK_F5, VK_F6, VK_F7, VK_F8, VK_F9, VK_F10, /* FFC0 */ - VK_F11, VK_F12, VK_F13, VK_F14, VK_F15, VK_F16, 0, 0, /* FFC8 */ - 0, 0, 0, 0, 0, 0, 0, 0, /* FFD0 */ + VK_F11, VK_F12, VK_F13, VK_F14, VK_F15, VK_F16, VK_F17, VK_F18, /* FFC8 */ + VK_F19, VK_F20, VK_F21, VK_F22, VK_F23, VK_F24, 0, 0, /* FFD0 */ 0, 0, 0, 0, 0, 0, 0, 0, /* FFD8 */ /* modifier keys */ 0, VK_LSHIFT, VK_RSHIFT, VK_LCONTROL, /* FFE0 */ @@ -1069,7 +1069,7 @@ static const WORD nonchar_key_scan[256] = /* function keys */ 0x3B, 0x3C, 0x3D, 0x3E, 0x3F, 0x40, 0x41, 0x42, 0x43, 0x44, /* FFC0 */ - 0x57, 0x58, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* FFC8 */ + 0x57, 0x58, 0x5B, 0x5C, 0x5D, 0x00, 0x00, 0x00, /* FFC8 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* FFD0 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* FFD8 */ /* modifier keys */

1 0