wine-commits October 2006

wine-commits@winehq.org

3 participants
1032 discussions

Ivan Gyurdiev : wined3d: D3DTRANSFORMSTATETYPE: Consistently use in the WINED3D namespace.
by Alexandre Julliard 12 Oct '06

12 Oct '06

Module: wine Branch: master Commit: ec782c2b9763db0b4fdf0ed910e3485df14ac8ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec782c2b9763db0b4fdf0ed91… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Thu Oct 12 02:21:00 2006 -0400 wined3d: D3DTRANSFORMSTATETYPE: Consistently use in the WINED3D namespace. --- dlls/ddraw/device.c | 18 ++++++++++++++++++ dlls/wined3d/device.c | 6 +++--- dlls/wined3d/wined3d_private.h | 2 +- include/wine/wined3d_interface.h | 6 +++--- 4 files changed, 25 insertions(+), 7 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index beded32..c276a2e 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -2583,6 +2583,12 @@ IDirect3DDeviceImpl_7_SetTransform(IDire if(TransformStateType == D3DTRANSFORMSTATE_WORLD) type = (D3DTRANSFORMSTATETYPE)(0 + 256); + /* FIXME: + Unhandled: D3DTRANSFORMSTATE_WORLD1 + Unhandled: D3DTRANSFORMSTATE_WORLD2 + Unhandled: D3DTRANSFORMSTATE_WORLD3 + */ + return IWineD3DDevice_SetTransform(This->wineD3DDevice, type, Matrix); @@ -2648,6 +2654,12 @@ IDirect3DDeviceImpl_7_GetTransform(IDire if(TransformStateType == D3DTRANSFORMSTATE_WORLD) type = (D3DTRANSFORMSTATETYPE)(0 + 256); + /* FIXME: + Unhandled: D3DTRANSFORMSTATE_WORLD1 + Unhandled: D3DTRANSFORMSTATE_WORLD2 + Unhandled: D3DTRANSFORMSTATE_WORLD3 + */ + return IWineD3DDevice_GetTransform(This->wineD3DDevice, type, Matrix); } @@ -2708,6 +2720,12 @@ IDirect3DDeviceImpl_7_MultiplyTransform( if(TransformStateType == D3DTRANSFORMSTATE_WORLD) TransformStateType = (D3DTRANSFORMSTATETYPE)(0 + 256); + /* FIXME: + Unhandled: D3DTRANSFORMSTATE_WORLD1 + Unhandled: D3DTRANSFORMSTATE_WORLD2 + Unhandled: D3DTRANSFORMSTATE_WORLD3 + */ + return IWineD3DDevice_MultiplyTransform(This->wineD3DDevice, TransformStateType, D3DMatrix); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4640f7d..288e7a3 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2506,7 +2506,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl /***** * Get / Set & Multiply Transform *****/ -static HRESULT WINAPI IWineD3DDeviceImpl_SetTransform(IWineD3DDevice *iface, D3DTRANSFORMSTATETYPE d3dts, CONST D3DMATRIX* lpmatrix) { +static HRESULT WINAPI IWineD3DDeviceImpl_SetTransform(IWineD3DDevice *iface, WINED3DTRANSFORMSTATETYPE d3dts, CONST D3DMATRIX* lpmatrix) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; /* Most of this routine, comments included copied from ddraw tree initially: */ @@ -2610,14 +2610,14 @@ static HRESULT WINAPI IWineD3DDeviceIm return WINED3D_OK; } -static HRESULT WINAPI IWineD3DDeviceImpl_GetTransform(IWineD3DDevice *iface, D3DTRANSFORMSTATETYPE State, D3DMATRIX* pMatrix) { +static HRESULT WINAPI IWineD3DDeviceImpl_GetTransform(IWineD3DDevice *iface, WINED3DTRANSFORMSTATETYPE State, D3DMATRIX* pMatrix) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; TRACE("(%p) : for Transform State %s\n", This, debug_d3dtstype(State)); memcpy(pMatrix, &This->stateBlock->transforms[State], sizeof(D3DMATRIX)); return WINED3D_OK; } -static HRESULT WINAPI IWineD3DDeviceImpl_MultiplyTransform(IWineD3DDevice *iface, D3DTRANSFORMSTATETYPE State, CONST D3DMATRIX* pMatrix) { +static HRESULT WINAPI IWineD3DDeviceImpl_MultiplyTransform(IWineD3DDevice *iface, WINED3DTRANSFORMSTATETYPE State, CONST D3DMATRIX* pMatrix) { D3DMATRIX *mat = NULL; D3DMATRIX temp; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0ef6ad9..4bc8863 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -220,7 +220,7 @@ #define MAX_STREAMS 16 /* Maximum poss See MaxStreams in MSDN under GetDeviceCaps */ /* Maximum number of constants provided to the shaders */ #define HIGHEST_TRANSFORMSTATE 512 - /* Highest value in D3DTRANSFORMSTATETYPE */ + /* Highest value in WINED3DTRANSFORMSTATETYPE */ #define MAX_CLIPPLANES D3DMAXUSERCLIPPLANES #define MAX_PALETTES 256 diff --git a/include/wine/wined3d_interface.h b/include/wine/wined3d_interface.h index 86f5dec..8f6a3fd 100644 --- a/include/wine/wined3d_interface.h +++ b/include/wine/wined3d_interface.h @@ -425,8 +425,8 @@ DECLARE_INTERFACE_(IWineD3DDevice,IWineD STDMETHOD(GetTexture)(THIS_ DWORD Stage, struct IWineD3DBaseTexture** ppTexture) PURE; STDMETHOD(SetTextureStageState)(THIS_ DWORD Stage, WINED3DTEXTURESTAGESTATETYPE Type,DWORD Value) PURE; STDMETHOD(GetTextureStageState)(THIS_ DWORD Stage, WINED3DTEXTURESTAGESTATETYPE Type,DWORD *pValue) PURE; - STDMETHOD(SetTransform)(THIS_ D3DTRANSFORMSTATETYPE State,CONST D3DMATRIX * pMatrix) PURE; - STDMETHOD(GetTransform)(THIS_ D3DTRANSFORMSTATETYPE State,D3DMATRIX * pMatrix) PURE; + STDMETHOD(SetTransform)(THIS_ WINED3DTRANSFORMSTATETYPE State, CONST D3DMATRIX * pMatrix) PURE; + STDMETHOD(GetTransform)(THIS_ WINED3DTRANSFORMSTATETYPE State, D3DMATRIX * pMatrix) PURE; STDMETHOD(SetVertexDeclaration)(THIS_ struct IWineD3DVertexDeclaration* pDecl) PURE; STDMETHOD(GetVertexDeclaration)(THIS_ struct IWineD3DVertexDeclaration** ppDecl) PURE; STDMETHOD(SetVertexShader)(THIS_ struct IWineD3DVertexShader* pShader) PURE; @@ -439,7 +439,7 @@ DECLARE_INTERFACE_(IWineD3DDevice,IWineD STDMETHOD(GetVertexShaderConstantF)(THIS_ UINT StartRegister, float* pConstantData, UINT Vector4fCount) PURE; STDMETHOD(SetViewport)(THIS_ CONST WINED3DVIEWPORT * pViewport) PURE; STDMETHOD(GetViewport)(THIS_ WINED3DVIEWPORT * pViewport) PURE; - STDMETHOD(MultiplyTransform)(THIS_ D3DTRANSFORMSTATETYPE State, CONST D3DMATRIX * pMatrix) PURE; + STDMETHOD(MultiplyTransform)(THIS_ WINED3DTRANSFORMSTATETYPE State, CONST D3DMATRIX * pMatrix) PURE; STDMETHOD(ValidateDevice)(THIS_ DWORD* pNumPasses) PURE; STDMETHOD(ProcessVertices)(THIS_ UINT SrcStartIndex, UINT DestIndex, UINT VertexCount, struct IWineD3DVertexBuffer* pDestBuffer, struct IWineD3DVertexBuffer* pVertexDecl, DWORD Flags) PURE; STDMETHOD(BeginStateBlock)(THIS) PURE;

1 0

Ivan Gyurdiev : wined3d: D3DRENDERSTATETYPE: Consistently use in the WINED3D namespace.
by Alexandre Julliard 12 Oct '06

12 Oct '06

Module: wine Branch: master Commit: b1a4bd87a9da1293e58f179b3528fd24dc80b3ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1a4bd87a9da1293e58f179b3… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Thu Oct 12 02:19:57 2006 -0400 wined3d: D3DRENDERSTATETYPE: Consistently use in the WINED3D namespace. --- dlls/ddraw/device.c | 5 +++ dlls/wined3d/device.c | 12 +++---- dlls/wined3d/surface.c | 8 ++--- include/wine/wined3d_interface.h | 4 +- include/wine/wined3d_types.h | 66 +++++++++++++++++++------------------- 5 files changed, 50 insertions(+), 45 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b1a4bd87a9da1293e58f1…

1 0

Nickolay V. Shmyrev : winex11.drv: Always set window type.
by Alexandre Julliard 12 Oct '06

12 Oct '06

Module: wine Branch: master Commit: 1a1b902e7fe8dd538e40b8532a14c1d22bfcd7af URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a1b902e7fe8dd538e40b8532… Author: Nickolay V. Shmyrev <nshmyrev(a)yandex.ru> Date: Wed Oct 11 19:32:22 2006 +0400 winex11.drv: Always set window type. --- dlls/winex11.drv/window.c | 17 ++++++++++------- dlls/winex11.drv/x11drv.h | 2 ++ dlls/winex11.drv/x11drv_main.c | 2 ++ 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 04294cf..3992ffb 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -465,6 +465,7 @@ void X11DRV_set_wm_hints( Display *displ XClassHint *class_hints; XWMHints* wm_hints; Atom protocols[3]; + Atom window_type; MwmHints mwm_hints; Atom dndVersion = 4; int i; @@ -523,13 +524,15 @@ void X11DRV_set_wm_hints( Display *displ XChangeProperty(display, data->whole_window, x11drv_atom(_NET_WM_PID), XA_CARDINAL, 32, PropModeReplace, (unsigned char *)&i, 1); - /* map WS_EX_TOOLWINDOW to _NET_WM_WINDOW_TYPE_UTILITY */ - if (ex_style & WS_EX_TOOLWINDOW) - { - Atom a = x11drv_atom(_NET_WM_WINDOW_TYPE_UTILITY); - XChangeProperty(display, data->whole_window, x11drv_atom(_NET_WM_WINDOW_TYPE), - XA_ATOM, 32, PropModeReplace, (unsigned char*)&a, 1); - } + /* set the WM_WINDOW_TYPE */ + window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_NORMAL); + if (ex_style & WS_EX_TOOLWINDOW) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_UTILITY); + else if (style & WS_THICKFRAME) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_NORMAL); + else if (style & WS_DLGFRAME) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_DIALOG); + else if (ex_style & WS_EX_DLGMODALFRAME) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_DIALOG); + + XChangeProperty(display, data->whole_window, x11drv_atom(_NET_WM_WINDOW_TYPE), + XA_ATOM, 32, PropModeReplace, (unsigned char*)&window_type, 1); mwm_hints.flags = MWM_HINTS_FUNCTIONS | MWM_HINTS_DECORATIONS; mwm_hints.functions = MWM_FUNC_MOVE; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index a4eb516..10de07c 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -571,6 +571,8 @@ enum x11drv_atoms XATOM__NET_WM_STATE, XATOM__NET_WM_STATE_FULLSCREEN, XATOM__NET_WM_WINDOW_TYPE, + XATOM__NET_WM_WINDOW_TYPE_DIALOG, + XATOM__NET_WM_WINDOW_TYPE_NORMAL, XATOM__NET_WM_WINDOW_TYPE_UTILITY, XATOM__XEMBED_INFO, XATOM_XdndAware, diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 95f9d10..ea50cfb 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -134,6 +134,8 @@ static const char * const atom_names[NB_ "_NET_WM_STATE", "_NET_WM_STATE_FULLSCREEN", "_NET_WM_WINDOW_TYPE", + "_NET_WM_WINDOW_TYPE_DIALOG", + "_NET_WM_WINDOW_TYPE_NORMAL", "_NET_WM_WINDOW_TYPE_UTILITY", "_XEMBED_INFO", "XdndAware",

1 0

Michael Ploujnikov : lz32/tests: Win64 printf format warning fixes.
by Alexandre Julliard 12 Oct '06

12 Oct '06

Module: wine Branch: master Commit: 7e9e599d1e48966bce1c19c820e2089607a56aa3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e9e599d1e48966bce1c19c82… Author: Michael Ploujnikov <ploujj(a)gmail.com> Date: Wed Oct 11 20:28:37 2006 -0400 lz32/tests: Win64 printf format warning fixes. --- dlls/lz32/tests/Makefile.in | 1 - dlls/lz32/tests/lzexpand_main.c | 54 ++++++++++++++++++++------------------- 2 files changed, 27 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7e9e599d1e48966bce1c1…

1 0

Michael Ploujnikov : dinput/tests: Win64 printf format warning fixes.
by Alexandre Julliard 12 Oct '06

12 Oct '06

Module: wine Branch: master Commit: 3438512f53c4ac663ad63f70fecdf2c3b15f70ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=3438512f53c4ac663ad63f70f… Author: Michael Ploujnikov <ploujj(a)gmail.com> Date: Wed Oct 11 20:22:27 2006 -0400 dinput/tests: Win64 printf format warning fixes. --- dlls/dinput/tests/Makefile.in | 1 - dlls/dinput/tests/joystick.c | 12 ++++++------ dlls/dinput/tests/keyboard.c | 4 ++-- dlls/dinput/tests/mouse.c | 2 +- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/dinput/tests/Makefile.in b/dlls/dinput/tests/Makefile.in index 9a8281a..ee0be90 100644 --- a/dlls/dinput/tests/Makefile.in +++ b/dlls/dinput/tests/Makefile.in @@ -5,7 +5,6 @@ VPATH = @srcdir@ TESTDLL = dinput.dll IMPORTS = dinput ole32 version user32 kernel32 EXTRALIBS = -ldxguid -luuid -ldxerr8 -EXTRADEFS = -DWINE_NO_LONG_AS_INT CTESTS = \ joystick.c \ diff --git a/dlls/dinput/tests/joystick.c b/dlls/dinput/tests/joystick.c index c186d0f..a465809 100644 --- a/dlls/dinput/tests/joystick.c +++ b/dlls/dinput/tests/joystick.c @@ -141,7 +141,7 @@ static BOOL CALLBACK EnumJoysticks( HWND hWnd = get_hwnd(); char oldstate[248], curstate[248]; - ok(data->version > 0x0300, "Joysticks not supported in version 0x%04lx\n", data->version); + ok(data->version > 0x0300, "Joysticks not supported in version 0x%04x\n", data->version); hr = IDirectInput_CreateDevice(data->pDI, &lpddi->guidInstance, NULL, NULL); ok(hr==E_POINTER,"IDirectInput_CreateDevice() should have returned " @@ -270,8 +270,8 @@ static BOOL CALLBACK EnumJoysticks( DXGetErrorString8(hr)); if (hr != DI_OK) break; - sprintf(curstate, "X%5ld Y%5ld Z%5ld Rx%5ld Ry%5ld Rz%5ld " - "S0%5ld S1%5ld POV0%5ld POV1%5ld POV2%5ld POV3%5ld " + sprintf(curstate, "X%5d Y%5d Z%5d Rx%5d Ry%5d Rz%5d " + "S0%5d S1%5d POV0%5d POV1%5d POV2%5d POV3%5d " "B %d %d %d %d %d %d %d %d %d %d %d %d\n", js.lX, js.lY, js.lZ, js.lRx, js.lRy, js.lRz, js.rglSlider[0], js.rglSlider[1], @@ -295,7 +295,7 @@ static BOOL CALLBACK EnumJoysticks( RELEASE: ref = IDirectInputDevice_Release(pJoystick); - ok(ref==0,"IDirectInputDevice_Release() reference count = %ld\n", ref); + ok(ref==0,"IDirectInputDevice_Release() reference count = %d\n", ref); DONE: return DIENUM_CONTINUE; @@ -308,7 +308,7 @@ static void joystick_tests(DWORD version ULONG ref; HINSTANCE hInstance = GetModuleHandle(NULL); - trace("-- Testing Direct Input Version 0x%04lx --\n", version); + trace("-- Testing Direct Input Version 0x%04x --\n", version); hr = DirectInputCreate(hInstance, version, &pDI, NULL); ok(hr==DI_OK||hr==DIERR_OLDDIRECTINPUTVERSION, "DirectInputCreate() failed: %s\n", DXGetErrorString8(hr)); @@ -321,7 +321,7 @@ static void joystick_tests(DWORD version ok(hr==DI_OK,"IDirectInput_EnumDevices() failed: %s\n", DXGetErrorString8(hr)); ref = IDirectInput_Release(pDI); - ok(ref==0,"IDirectInput_Release() reference count = %ld\n", ref); + ok(ref==0,"IDirectInput_Release() reference count = %d\n", ref); } else if (hr==DIERR_OLDDIRECTINPUTVERSION) trace(" Version Not Supported\n"); } diff --git a/dlls/dinput/tests/keyboard.c b/dlls/dinput/tests/keyboard.c index 302e178..6b4a2fa 100644 --- a/dlls/dinput/tests/keyboard.c +++ b/dlls/dinput/tests/keyboard.c @@ -48,7 +48,7 @@ const char * get_file_version(const char VS_FIXEDFILEINFO *pFixedVersionInfo; UINT len; if (VerQueryValueA(data, backslash, (LPVOID *)&pFixedVersionInfo, &len)) { - sprintf(version, "%ld.%ld.%ld.%ld", + sprintf(version, "%d.%d.%d.%d", pFixedVersionInfo->dwFileVersionMS >> 16, pFixedVersionInfo->dwFileVersionMS & 0xffff, pFixedVersionInfo->dwFileVersionLS >> 16, @@ -105,7 +105,7 @@ static void keyboard_tests(DWORD version ok(SUCCEEDED(hr), "IDirectInputDevice_GetDeviceState() failed: %s\n", DXGetErrorString8(hr)); ref = IDirectInput_Release(pDI); - ok(!ref, "IDirectInput_Release() reference count = %ld\n", ref); + ok(!ref, "IDirectInput_Release() reference count = %d\n", ref); } START_TEST(keyboard) diff --git a/dlls/dinput/tests/mouse.c b/dlls/dinput/tests/mouse.c index fa542b1..9da44a7 100644 --- a/dlls/dinput/tests/mouse.c +++ b/dlls/dinput/tests/mouse.c @@ -83,7 +83,7 @@ static void mouse_tests(void) hwnd = CreateWindow("static", "Title", WS_OVERLAPPEDWINDOW, 10, 10, 200, 200, NULL, NULL, NULL, NULL); - ok(hwnd != NULL, "err: %ld\n", GetLastError()); + ok(hwnd != NULL, "err: %d\n", GetLastError()); if (!hwnd) return; ShowWindow(hwnd, SW_SHOW);

1 0

Michael Ploujnikov : advpack/tests: Win64 printf format warning fixes.
by Alexandre Julliard 12 Oct '06

12 Oct '06

Module: wine Branch: master Commit: d7c0a0e38c28a44aa46dcb6de72b3ad9979f68c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7c0a0e38c28a44aa46dcb6de… Author: Michael Ploujnikov <ploujj(a)gmail.com> Date: Wed Oct 11 20:12:46 2006 -0400 advpack/tests: Win64 printf format warning fixes. --- dlls/advpack/tests/Makefile.in | 1 - dlls/advpack/tests/advpack.c | 66 ++++++++++++++++++++-------------------- dlls/advpack/tests/files.c | 46 ++++++++++++++-------------- dlls/advpack/tests/install.c | 42 +++++++++++++------------ 4 files changed, 77 insertions(+), 78 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d7c0a0e38c28a44aa46dc…

1 0

José Manuel Ferrer Ortiz : msi: Updated Spanish translation.
by Alexandre Julliard 12 Oct '06

12 Oct '06

Module: wine Branch: master Commit: 30f30e5e46536276471633dd3b90815999e02862 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30f30e5e46536276471633dd3… Author: José Manuel Ferrer Ortiz <jmfo1982(a)yahoo.es> Date: Thu Oct 12 02:12:18 2006 +0200 msi: Updated Spanish translation. --- dlls/msi/msi_Es.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/msi_Es.rc b/dlls/msi/msi_Es.rc index 3f33ea3..94bfaf5 100644 --- a/dlls/msi/msi_Es.rc +++ b/dlls/msi/msi_Es.rc @@ -1,7 +1,7 @@ /* * Spanish resources for MSI * - * Copyright 2005 Jos� Manuel Ferrer Ortiz + * Copyright 2005, 2006 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 @@ -22,7 +22,7 @@ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE { - 4 "The specified installation package could not be opened. Please check the file path and try again." + 4 "No se ha podido abrir el paquete de instalaci�n especificado. Por favor, compruebe la ruta del archivo y vuelva a intentarlo." 5 "ruta %s no encontrada" 9 "inserte el disco %s" 10 "par�metros incorrectos"

1 0

José Manuel Ferrer Ortiz : wldap32: Added Spanish translation.
by Alexandre Julliard 12 Oct '06

12 Oct '06

Module: wine Branch: master Commit: 9aa317dd8415414963bf19d756faf79505c02e6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9aa317dd8415414963bf19d75… Author: José Manuel Ferrer Ortiz <jmfo1982(a)yahoo.es> Date: Thu Oct 12 02:12:18 2006 +0200 wldap32: Added Spanish translation. --- dlls/wldap32/wldap32.rc | 1 dlls/wldap32/wldap32_Es.rc | 123 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 124 insertions(+), 0 deletions(-) diff --git a/dlls/wldap32/wldap32.rc b/dlls/wldap32/wldap32.rc index e47c272..65e0b64 100644 --- a/dlls/wldap32/wldap32.rc +++ b/dlls/wldap32/wldap32.rc @@ -24,6 +24,7 @@ #include "winuser.h" #include "wldap32_De.rc" #include "wldap32_En.rc" +#include "wldap32_Es.rc" #include "wldap32_Fr.rc" #include "wldap32_Ko.rc" #include "wldap32_Nl.rc" diff --git a/dlls/wldap32/wldap32_Es.rc b/dlls/wldap32/wldap32_Es.rc new file mode 100644 index 0000000..d0935b1 --- /dev/null +++ b/dlls/wldap32/wldap32_Es.rc @@ -0,0 +1,123 @@ +/* + * Spanish resources for WLDAP32 + * + * Copyright 2006 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 + */ + +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +{ + 0 "�xito" + 1 "Error en operacioens" + 2 "Error de protocolo" + 3 "L�mite de tiempo excedido" + 4 "L�mite de tama�o excedido" + 5 "Comparaci�n falsa" + 6 "Comparaci�n verdadera" + 7 "M�todo de autentificaci�n no soportado" + 8 "Autentificaci�n fuerte requerida" + 9 "Remisi�n (v2)" + 10 "Remisi�n" + 11 "L�mite de administraci�n excedido" + 12 "Extensi�n cr�tica no disponible" + 13 "Confidencialidad requerida" + 14 "" + 15 "" + 16 "No existe dicho atributo" + 17 "Tipo no definido" + 18 "Emparejamiento inapropiado" + 19 "Violaci�n de restricci�n" + 20 "El valor o atributo ya existe" + 21 "Sintaxis inv�lida" + 22 "" + 23 "" + 24 "" + 25 "" + 26 "" + 27 "" + 28 "" + 29 "" + 30 "" + 31 "" + 32 "No existe dicho objeto" + 33 "Problema de alias" + 34 "Sintaxis inv�lida de DN" + 35 "Es una hoja" + 36 "Problema de dereferencia de alias" + 37 "" + 38 "" + 39 "" + 40 "" + 41 "" + 42 "" + 43 "" + 44 "" + 45 "" + 46 "" + 47 "" + 48 "Autentificaci�n inapropriada" + 49 "Credenciales inv�lidos" + 50 "Insuficientes permisos" + 51 "Ocupado" + 52 "No disponible" + 53 "Reacio a actuar" + 54 "Bucle detectado" + 55 "" + 56 "" + 57 "" + 58 "" + 59 "" + 60 "Falta control de orden" + 61 "Error de rango de �ndice" + 62 "" + 63 "" + 64 "Violaci�n de nomenclatura" + 65 "Violaci�n de clase de objeto" + 66 "No permitido en una no-hoja" + 67 "No permitido en RDN" + 68 "Ya existe" + 69 "No Mods de clase de objeto" + 70 "Resultados demasiado largos" + 71 "Afecta a m�ltiples DSAs" + 72 "" + 73 "" + 74 "" + 75 "" + 76 "" + 77 "" + 78 "" + 79 "" + 80 "Otro" + 81 "Servidor ca�do" + 82 "Error local" + 83 "Error de codificaci�n" + 84 "Error de decodificaci�n" + 85 "Tiempo de espera superado" + 86 "Autentificaci�n desconocida" + 87 "Error de filtro" + 88 "Cancelado por el usuario" + 89 "Error de par�metro" + 90 "Sin memoria" + 91 "No se ha podido conectar al servidor LDAP" + 92 "Operaci�n no soportada por esta versi�n del protocolo LDAP" + 93 "Control especificado no se ha encontrado en el mensaje" + 94 "Ning�n resultado presente en el mensaje" + 95 "M�s resultados devueltos" + 96 "Bucle al manejar remisiones" + 97 "L�mite de saltos de remisiones excedido" +}

1 0

José Manuel Ferrer Ortiz : mshtml: Added Spanish translation.
by Alexandre Julliard 12 Oct '06

12 Oct '06

Module: wine Branch: master Commit: e0b399f75b261b9fe6fff6a34f0acad1a14f7259 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0b399f75b261b9fe6fff6a34… Author: José Manuel Ferrer Ortiz <jmfo1982(a)yahoo.es> Date: Thu Oct 12 02:12:18 2006 +0200 mshtml: Added Spanish translation. --- dlls/mshtml/Es.rc | 261 +++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/rsrc.rc | 1 2 files changed, 262 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e0b399f75b261b9fe6fff…

1 0

Christian Gmeiner : user32: SPI_GETFONTSMOOTHINGORIENTATION and SPI_SETFONTSMOOTHINGORIENTATION are kown actions .
by Alexandre Julliard 12 Oct '06

12 Oct '06

Module: wine Branch: master Commit: cdada31c00aa209e115db55a550a2846dfa81444 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdada31c00aa209e115db55a5… Author: Christian Gmeiner <christian.gmeiner(a)students.fhv.at> Date: Wed Oct 11 23:51:44 2006 +0200 user32: SPI_GETFONTSMOOTHINGORIENTATION and SPI_SETFONTSMOOTHINGORIENTATION are kown actions. --- dlls/user/sysparams.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/user/sysparams.c b/dlls/user/sysparams.c index 35be4fa..906eea1 100644 --- a/dlls/user/sysparams.c +++ b/dlls/user/sysparams.c @@ -2249,6 +2249,8 @@ #define WINE_SPI_WARN(x) \ WINE_SPI_FIXME(SPI_SETFOCUSBORDERWIDTH); /* 0x200F _WIN32_WINNT >= 0x510 */ WINE_SPI_FIXME(SPI_GETFOCUSBORDERHEIGHT); /* 0x2010 _WIN32_WINNT >= 0x510 */ WINE_SPI_FIXME(SPI_SETFOCUSBORDERHEIGHT); /* 0x2011 _WIN32_WINNT >= 0x510 */ + WINE_SPI_FIXME(SPI_GETFONTSMOOTHINGORIENTATION); /* 0x2012 */ + WINE_SPI_FIXME(SPI_SETFONTSMOOTHINGORIENTATION); /* 0x2013 */ default: FIXME( "Unknown action: %u\n", uiAction );

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2006