March 2008 - Wine-commits - list.winehq.org

Stefan Dösinger : wined3d: Inherit from the proper state table in atifs.
by Alexandre Julliard 28 Mar '08

28 Mar '08

Module: wine Branch: master Commit: f63ce1c4891b205d70f012c618c7d10ff67d70bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=f63ce1c4891b205d70f012c61… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Mar 26 22:48:06 2008 +0100 wined3d: Inherit from the proper state table in atifs. --- dlls/wined3d/ati_fragment_shader.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index 90d33c7..d4b95db 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -727,7 +727,7 @@ struct StateEntry ATIFSStateTable[STATE_HIGHEST + 1]; static void init_state_table() { unsigned int i; const DWORD rep = STATE_TEXTURESTAGE(0, WINED3DTSS_COLOROP); - memcpy(ATIFSStateTable, FFPStateTable, sizeof(ATIFSStateTable)); + memcpy(ATIFSStateTable, arb_program_shader_backend.StateTable, sizeof(ATIFSStateTable)); for(i = 0; i < MAX_TEXTURES; i++) { ATIFSStateTable[STATE_TEXTURESTAGE(i, WINED3DTSS_COLOROP)].apply = set_tex_op_atifs; @@ -835,8 +835,8 @@ static BOOL shader_atifs_dirty_const(IWineD3DDevice *iface) { } static void shader_atifs_load_init(void) { - init_state_table(); arb_program_shader_backend.shader_dll_load_init(); + init_state_table(); } static void shader_atifs_get_caps(WINED3DDEVTYPE devtype, WineD3D_GL_Info *gl_info, struct shader_caps *caps) {

1 0

Stefan Dösinger : wined3d: Remove some debug TRACE stuff.
by Alexandre Julliard 28 Mar '08

28 Mar '08

Module: wine Branch: master Commit: 1fdc0ee811b87c557b6ee10d98de93648cb6a465 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fdc0ee811b87c557b6ee10d9… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Mar 27 21:42:45 2008 +0100 wined3d: Remove some debug TRACE stuff. --- dlls/wined3d/utils.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 4b09285..d8f0990 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3293,7 +3293,7 @@ struct ffp_desc *find_ffp_shader(struct list *shaders, struct texture_stage_op o */ LIST_FOR_EACH_ENTRY(entry, shaders, struct ffp_desc, entry) { if(memcmp(op, entry->op, sizeof(struct texture_stage_op) * MAX_TEXTURES) == 0) { - TRACE("Found shader entry %p. size %d\n", entry, sizeof(struct texture_stage_op) * MAX_TEXTURES); + TRACE("Found shader entry %p\n", entry); return entry; } }

1 0

Mikołaj Zalewski : services.exe: Load list of services from registry at startup.
by Alexandre Julliard 28 Mar '08

28 Mar '08

Module: wine Branch: master Commit: a1fbd5508f2ec4e8b10037b8c624a0bd8b8deec9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1fbd5508f2ec4e8b10037b8c… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Sat Mar 15 10:38:45 2008 +0100 services.exe: Load list of services from registry at startup. --- programs/services/Makefile.in | 4 +- programs/services/services.c | 176 +++++++++++++++++++++++++++++++++++++++++ programs/services/services.h | 48 +++++++++++ programs/services/utils.c | 147 ++++++++++++++++++++++++++++++++++ 4 files changed, 374 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a1fbd5508f2ec4e8b1003…

1 0

Stefan Dösinger : d3d8: Reject broken normal declaration types with fixed function.
by Alexandre Julliard 28 Mar '08

28 Mar '08

Module: wine Branch: master Commit: 0fa0df7843d4b11eaee9f0611944f10774d4fbca URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fa0df7843d4b11eaee9f0611… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Mar 27 20:11:36 2008 +0100 d3d8: Reject broken normal declaration types with fixed function. --- dlls/d3d8/d3d8_private.h | 1 + dlls/d3d8/device.c | 17 +++++++++++++++++ dlls/d3d8/tests/device.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/d3d8/vertexdeclaration.c | 2 +- 4 files changed, 57 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 2601b47..0da18ca 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -635,6 +635,7 @@ typedef struct IDirect3DPixelShader8Impl { */ void load_local_constants(const DWORD *d3d8_elements, IWineD3DVertexShader *wined3d_vertex_shader); UINT convert_to_wined3d_declaration(const DWORD *d3d8_elements, DWORD *d3d8_elements_size, WINED3DVERTEXELEMENT **wined3d_elements); +size_t parse_token(const DWORD* pToken); /* Callbacks */ extern HRESULT WINAPI D3D8CB_CreateSurface(IUnknown *device, IUnknown *pSuperior, UINT Width, UINT Height, diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 43e748e..a846bf6 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1522,6 +1522,23 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CreateVertexShader(LPDIRECT3DDEVICE8 HRESULT hrc = D3D_OK; IDirect3DVertexShader8Impl *object; IWineD3DVertexDeclaration *wined3d_vertex_declaration; + const DWORD *token = pDeclaration; + + /* Test if the vertex declaration is valid */ + while (D3DVSD_END() != *token) { + D3DVSD_TOKENTYPE token_type = ((*token & D3DVSD_TOKENTYPEMASK) >> D3DVSD_TOKENTYPESHIFT); + + if (token_type == D3DVSD_TOKEN_STREAMDATA && !(token_type & 0x10000000)) { + DWORD type = ((*token & D3DVSD_DATATYPEMASK) >> D3DVSD_DATATYPESHIFT); + DWORD reg = ((*token & D3DVSD_VERTEXREGMASK) >> D3DVSD_VERTEXREGSHIFT); + + if(reg == D3DVSDE_NORMAL && type != D3DVSDT_FLOAT3 && !pFunction) { + WARN("Attempt to use a non-FLOAT3 normal with the fixed function function\n"); + return D3DERR_INVALIDCALL; + } + } + token += parse_token(token); + } /* Setup a stub object for now */ object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 0dd4e92..8de4ec7 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -880,6 +880,27 @@ static void test_shader(void) D3DVSD_REG(D3DVSDE_POSITION, D3DVSDT_FLOAT3), D3DVSD_END() }; + DWORD decl_normal_float2[] = + { + D3DVSD_STREAM(0), + D3DVSD_REG(D3DVSDE_POSITION, D3DVSDT_FLOAT3), /* D3DVSDE_POSITION, Register v0 */ + D3DVSD_REG(D3DVSDE_NORMAL, D3DVSDT_FLOAT2), /* D3DVSDE_NORMAL, Register v1 */ + D3DVSD_END() + }; + DWORD decl_normal_float4[] = + { + D3DVSD_STREAM(0), + D3DVSD_REG(D3DVSDE_POSITION, D3DVSDT_FLOAT3), /* D3DVSDE_POSITION, Register v0 */ + D3DVSD_REG(D3DVSDE_NORMAL, D3DVSDT_FLOAT4), /* D3DVSDE_NORMAL, Register v1 */ + D3DVSD_END() + }; + DWORD decl_normal_d3dcolor[] = + { + D3DVSD_STREAM(0), + D3DVSD_REG(D3DVSDE_POSITION, D3DVSDT_FLOAT3), /* D3DVSDE_POSITION, Register v0 */ + D3DVSD_REG(D3DVSDE_NORMAL, D3DVSDT_D3DCOLOR),/* D3DVSDE_NORMAL, Register v1 */ + D3DVSD_END() + }; const DWORD vertex_decl_size = sizeof(dwVertexDecl); const DWORD simple_vs_size = sizeof(simple_vs); const DWORD simple_ps_size = sizeof(simple_ps); @@ -962,6 +983,23 @@ static void test_shader(void) ok(hr == D3D_OK, "IDirect3DDevice8_GetVertexShader returned %#08x\n", hr); ok(hTempHandle == 0, "Vertex Shader %d is set, expected shader %d\n", hTempHandle, 0); + /* Test a broken declaration. 3DMark2001 tries to use normals with 2 components + * First try the fixed function shader function, then a custom one + */ + hr = IDirect3DDevice8_CreateVertexShader(pDevice, decl_normal_float2, 0, &hVertexShader, 0); + ok(hr == D3DERR_INVALIDCALL, "IDirect3DDevice8_CreateVertexShader returned %#08x\n", hr); + if(SUCCEEDED(hr)) IDirect3DDevice8_DeleteVertexShader(pDevice, hVertexShader); + hr = IDirect3DDevice8_CreateVertexShader(pDevice, decl_normal_float4, 0, &hVertexShader, 0); + ok(hr == D3DERR_INVALIDCALL, "IDirect3DDevice8_CreateVertexShader returned %#08x\n", hr); + if(SUCCEEDED(hr)) IDirect3DDevice8_DeleteVertexShader(pDevice, hVertexShader); + hr = IDirect3DDevice8_CreateVertexShader(pDevice, decl_normal_d3dcolor, 0, &hVertexShader, 0); + ok(hr == D3DERR_INVALIDCALL, "IDirect3DDevice8_CreateVertexShader returned %#08x\n", hr); + if(SUCCEEDED(hr)) IDirect3DDevice8_DeleteVertexShader(pDevice, hVertexShader); + + hr = IDirect3DDevice8_CreateVertexShader(pDevice, decl_normal_float2, simple_vs, &hVertexShader, 0); + ok(hr == D3D_OK, "IDirect3DDevice8_CreateVertexShader returned %#08x\n", hr); + if(SUCCEEDED(hr)) IDirect3DDevice8_DeleteVertexShader(pDevice, hVertexShader); + if (caps.PixelShaderVersion >= D3DPS_VERSION(1, 0)) { /* The same with a pixel shader */ diff --git a/dlls/d3d8/vertexdeclaration.c b/dlls/d3d8/vertexdeclaration.c index 57d0337..debeca0 100644 --- a/dlls/d3d8/vertexdeclaration.c +++ b/dlls/d3d8/vertexdeclaration.c @@ -118,7 +118,7 @@ static const char *debug_d3dvsde_register(D3DVSDE_REGISTER d3dvsde_register) } } -static size_t parse_token(const DWORD* pToken) +size_t parse_token(const DWORD* pToken) { const DWORD token = *pToken; size_t tokenlen = 1;

1 0

Marcus Meissner : ddraw/tests: Initialize ddprimpal.
by Alexandre Julliard 28 Mar '08

28 Mar '08

Module: wine Branch: master Commit: 0ab270e41a7a3286e86d788651dc9da9505a948f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ab270e41a7a3286e86d78865… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Mar 28 09:02:41 2008 +0100 ddraw/tests: Initialize ddprimpal. --- dlls/ddraw/tests/visual.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index d8eb59a..580bf88 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -1786,7 +1786,7 @@ static void p8_primary_test() PALETTEENTRY entries[256]; RGBQUAD coltable[256]; UINT i; - IDirectDrawPalette *ddprimpal; + IDirectDrawPalette *ddprimpal = NULL; IDirectDrawSurface *offscreen = NULL; WNDCLASS wc = {0}; DDBLTFX ddbltfx;

1 0

Mikołaj Zalewski : services.exe: Add a new program.
by Alexandre Julliard 28 Mar '08

28 Mar '08

Module: wine Branch: master Commit: 7bd0efa12312f5b18a3d5a79e5520f64393ad5b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bd0efa12312f5b18a3d5a79e… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Sat Mar 15 09:49:42 2008 +0100 services.exe: Add a new program. --- .gitignore | 1 + Makefile.in | 2 ++ configure | 3 +++ configure.ac | 1 + programs/Makefile.in | 2 ++ programs/services/Makefile.in | 14 ++++++++++++++ programs/services/services.c | 28 ++++++++++++++++++++++++++++ 7 files changed, 51 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index f6088d3..4003d88 100644 --- a/.gitignore +++ b/.gitignore @@ -582,6 +582,7 @@ programs/rpcss/irot_s.c programs/rpcss/rpcss programs/rundll32/rundll32 programs/secedit/secedit +programs/services/services programs/spoolsv/spoolsv programs/start/start programs/svchost/svchost diff --git a/Makefile.in b/Makefile.in index 9364ba2..cfc8be9 100644 --- a/Makefile.in +++ b/Makefile.in @@ -539,6 +539,7 @@ ALL_MAKEFILES = \ programs/rpcss/Makefile \ programs/rundll32/Makefile \ programs/secedit/Makefile \ + programs/services/Makefile \ programs/spoolsv/Makefile \ programs/start/Makefile \ programs/svchost/Makefile \ @@ -962,6 +963,7 @@ programs/regsvr32/Makefile: programs/regsvr32/Makefile.in programs/Makeprog.rule programs/rpcss/Makefile: programs/rpcss/Makefile.in programs/Makeprog.rules programs/rundll32/Makefile: programs/rundll32/Makefile.in programs/Makeprog.rules programs/secedit/Makefile: programs/secedit/Makefile.in programs/Makeprog.rules +programs/services/Makefile: programs/services/Makefile.in programs/Makeprog.rules programs/spoolsv/Makefile: programs/spoolsv/Makefile.in programs/Makeprog.rules programs/start/Makefile: programs/start/Makefile.in programs/Makeprog.rules programs/svchost/Makefile: programs/svchost/Makefile.in programs/Makeprog.rules diff --git a/configure b/configure index 97e2a78..f752c3e 100755 --- a/configure +++ b/configure @@ -22026,6 +22026,8 @@ ac_config_files="$ac_config_files programs/rundll32/Makefile" ac_config_files="$ac_config_files programs/secedit/Makefile" +ac_config_files="$ac_config_files programs/services/Makefile" + ac_config_files="$ac_config_files programs/spoolsv/Makefile" ac_config_files="$ac_config_files programs/start/Makefile" @@ -23035,6 +23037,7 @@ do "programs/rpcss/Makefile") CONFIG_FILES="$CONFIG_FILES programs/rpcss/Makefile" ;; "programs/rundll32/Makefile") CONFIG_FILES="$CONFIG_FILES programs/rundll32/Makefile" ;; "programs/secedit/Makefile") CONFIG_FILES="$CONFIG_FILES programs/secedit/Makefile" ;; + "programs/services/Makefile") CONFIG_FILES="$CONFIG_FILES programs/services/Makefile" ;; "programs/spoolsv/Makefile") CONFIG_FILES="$CONFIG_FILES programs/spoolsv/Makefile" ;; "programs/start/Makefile") CONFIG_FILES="$CONFIG_FILES programs/start/Makefile" ;; "programs/svchost/Makefile") CONFIG_FILES="$CONFIG_FILES programs/svchost/Makefile" ;; diff --git a/configure.ac b/configure.ac index 1cfeedc..d63dcec 100644 --- a/configure.ac +++ b/configure.ac @@ -2042,6 +2042,7 @@ AC_CONFIG_FILES([programs/regsvr32/Makefile]) AC_CONFIG_FILES([programs/rpcss/Makefile]) AC_CONFIG_FILES([programs/rundll32/Makefile]) AC_CONFIG_FILES([programs/secedit/Makefile]) +AC_CONFIG_FILES([programs/services/Makefile]) AC_CONFIG_FILES([programs/spoolsv/Makefile]) AC_CONFIG_FILES([programs/start/Makefile]) AC_CONFIG_FILES([programs/svchost/Makefile]) diff --git a/programs/Makefile.in b/programs/Makefile.in index 3149c7b..26f2663 100644 --- a/programs/Makefile.in +++ b/programs/Makefile.in @@ -27,6 +27,7 @@ SUBDIRS = \ rpcss \ rundll32 \ secedit \ + services \ spoolsv \ start \ svchost \ @@ -73,6 +74,7 @@ INSTALLSUBDIRS = \ rpcss \ rundll32 \ secedit \ + services \ spoolsv \ start \ svchost \ diff --git a/programs/services/Makefile.in b/programs/services/Makefile.in new file mode 100644 index 0000000..52c69e0 --- /dev/null +++ b/programs/services/Makefile.in @@ -0,0 +1,14 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = services.exe +APPMODE = -mconsole +IMPORTS = kernel32 + +C_SRCS = \ + services.c + +(a)MAKE_PROG_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/programs/services/services.c b/programs/services/services.c new file mode 100644 index 0000000..04532d1 --- /dev/null +++ b/programs/services/services.c @@ -0,0 +1,28 @@ +/* + * Services - controls services keeps track of their state + * + * Copyright 2007 Google (Mikolaj Zalewski) + * + * 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 + */ + +#define WIN32_LEAN_AND_MEAN + +#include <stdarg.h> + +int main(int argc, char *argv[]) +{ + return 0; +}

1 0

Vitaliy Margolen : shlwapi: Add Russian translation.
by Alexandre Julliard 28 Mar '08

28 Mar '08

Module: wine Branch: master Commit: 2dddbe2f1805f1cb252f8f2bdfd94f088be4bd8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2dddbe2f1805f1cb252f8f2bd… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Thu Mar 27 21:42:32 2008 -0600 shlwapi: Add Russian translation. --- dlls/shlwapi/shlwapi.rc | 1 + dlls/shlwapi/shlwapi_Ru.rc | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 0 deletions(-) diff --git a/dlls/shlwapi/shlwapi.rc b/dlls/shlwapi/shlwapi.rc index 3018685..2609035 100644 --- a/dlls/shlwapi/shlwapi.rc +++ b/dlls/shlwapi/shlwapi.rc @@ -40,5 +40,6 @@ #include "shlwapi_Pl.rc" #include "shlwapi_Pt.rc" #include "shlwapi_Ro.rc" +#include "shlwapi_Ru.rc" #include "shlwapi_Sv.rc" #include "shlwapi_Tr.rc" diff --git a/dlls/shlwapi/shlwapi_Ru.rc b/dlls/shlwapi/shlwapi_Ru.rc new file mode 100644 index 0000000..87aee4a --- /dev/null +++ b/dlls/shlwapi/shlwapi_Ru.rc @@ -0,0 +1,43 @@ +/* + * Russian resources for shlwapi + * + * Copyright 2008 Vitaliy Margolen + * + * 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_RUSSIAN, SUBLANG_DEFAULT + +IDD_ERR_DIALOG DIALOG MOVEABLE DISCARDABLE 0, 0, 220, 60 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "��!" +FONT 8, "MS Shell Dlg" +{ + LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 + LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 + CHECKBOX "�� &�� ", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&OK" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"�&��" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&��" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&��" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP +} + +STRINGTABLE DISCARDABLE +{ + IDS_BYTES_FORMAT "%ld ��" + IDS_TIME_INTERVAL_HOURS " ��" + IDS_TIME_INTERVAL_MINUTES " ��" + IDS_TIME_INTERVAL_SECONDS " ��" +}

1 0

Vitaliy Margolen : Update Russian translations.
by Alexandre Julliard 28 Mar '08

28 Mar '08

Module: wine Branch: master Commit: 5b690b08855129b6400b046fc066aa4d1b60087a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b690b08855129b6400b046fc… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Thu Mar 27 21:42:44 2008 -0600 Update Russian translations. --- dlls/comdlg32/cdlg_Ru.rc | 8 ++ dlls/shell32/shell32_Ru.rc | 41 +++++++++- dlls/user32/resources/user32_Ru.rc | 17 +++- programs/notepad/Ru.rc | 7 +- programs/regedit/Ru.rc | 167 ++++++++++++++++++++++++++++++++++++ programs/wordpad/Ru.rc | 3 +- 6 files changed, 235 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5b690b08855129b6400b0…

1 0

Marcus Meissner : user32/tests: Mark unsigned entitities as unsigned.
by Alexandre Julliard 28 Mar '08

28 Mar '08

Module: wine Branch: master Commit: 22facc67d23041f452252c59931ae31232290a46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22facc67d23041f452252c599… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Mar 28 09:21:15 2008 +0100 user32/tests: Mark unsigned entitities as unsigned. --- dlls/user32/tests/resource.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/resource.c b/dlls/user32/tests/resource.c index 24ec995..a8b6c08 100644 --- a/dlls/user32/tests/resource.c +++ b/dlls/user32/tests/resource.c @@ -74,8 +74,8 @@ static void test_LoadStringA (void) static const char str[] = "String resource"; /* same in resource.rc */ char buf[128]; struct string_test { - int bufsiz; - int expected; + unsigned int bufsiz; + unsigned int expected; }; struct string_test tests[] = {{sizeof buf, sizeof str - 1}, {sizeof str, sizeof str - 1}, @@ -85,8 +85,8 @@ static void test_LoadStringA (void) assert (sizeof str < sizeof buf); for (i = 0; i < sizeof tests / sizeof tests[0]; i++) { - const int bufsiz = tests[i].bufsiz; - const int expected = tests[i].expected; + const unsigned int bufsiz = tests[i].bufsiz; + const unsigned int expected = tests[i].expected; const int len = LoadStringA (hInst, 0, buf, bufsiz); ok (len == expected, "bufsiz=%d: got %d, expected %d\n",

1 0

Michael Stefaniuc : winhelp: Fix and activate the Romansh translation.
by Alexandre Julliard 28 Mar '08

28 Mar '08

Module: wine Branch: master Commit: 00489f45efd0b871b71346ad021101127ccd549f URL: http://source.winehq.org/git/wine.git/?a=commit;h=00489f45efd0b871b71346ad0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 28 01:23:58 2008 +0100 winhelp: Fix and activate the Romansh translation. --- programs/winhelp/{Va.rc => Rm.rc} | 46 +++++++++++++++++------------------- programs/winhelp/rsrc.rc | 1 + 2 files changed, 23 insertions(+), 24 deletions(-) diff --git a/programs/winhelp/Va.rc b/programs/winhelp/Rm.rc similarity index 63% rename from programs/winhelp/Va.rc rename to programs/winhelp/Rm.rc index 647c9df..ebbb154 100644 --- a/programs/winhelp/Va.rc +++ b/programs/winhelp/Rm.rc @@ -20,13 +20,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +/* FIXME: This file is in the Vallader Romansh dialect and not in the + official Rumantsch Grischun. */ + /* Menu */ -/* -* language : switzerland romanch -* not supported today -*/ -MAIN_MENU MENU LANGUAGE LANG_, SUBLANG_DEFAULT +MAIN_MENU MENU LANGUAGE LANG_ROMANSH, SUBLANG_DEFAULT { POPUP "&Datoteca" { MENUITEM "&Rivir", MNID_FILE_OPEN @@ -44,33 +43,32 @@ MAIN_MENU MENU LANGUAGE LANG_, SUBLANG_DEFAULT POPUP "&Marca" { MENUITEM "&Definir...", MNID_BKMK_DEFINE } - POPUP "&Ag�d" { - MENUITEM "&Douvrar l'ag�d", MNID_HELP_HELPON - MENUITEM "Ad�na da&vant", MNID_HELP_HELPTOP + POPUP "&Ag�d" { + MENUITEM "&Douvrar l'ag�d", MNID_HELP_HELPON + MENUITEM "Ad�na da&vant", MNID_HELP_HELPTOP MENUITEM SEPARATOR MENUITEM "I&nfuormaziuns", MNID_HELP_ABOUT #ifdef WINELIB - MENUITEM "Davart &WINE", MNID_HELP_WINE + MENUITEM "Davart &Wine", MNID_HELP_WINE #endif } } /* Strings */ - -STRINGTABLE DISCARDABLE LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE LANGUAGE LANG_ROMANSH, SUBLANG_DEFAULT { -WINE_HELP, "WINE ag�d" -WHERROR, "SBAGL" -WARNING, "ATTENZIUN" -INFO, "INFUORMAZIUN" -NOT_IMPLEMENTED, "Na implementa" -HLPFILE_ERROR_s, "Sbagl cun leger la datoteca d'ag�d `%s'" -CONTENTS, "&Cuntgn�" -SEARCH, "&Tscherchar" -BACK, "&Inavo" -HISTORY, "&Fin qua" -TOPICS, "T&opics" -ALL_FILES, "Tuot las datotecas (*.*)" -HELP_FILES_HLP, "Datotecas d'ag�d (*.hlp)" +STID_WINE_HELP, "WINE ag�d" +STID_WHERROR, "SBAGL" +STID_WARNING, "ATTENZIUN" +STID_INFO, "INFUORMAZIUN" +STID_NOT_IMPLEMENTED, "Na implementa" +STID_HLPFILE_ERROR_s, "Sbagl cun leger la datoteca d'ag�d `%s'" +STID_CONTENTS, "&Cuntgn�" +STID_SEARCH, "&Tscherchar" +STID_BACK, "&Inavo" +STID_HISTORY, "&Fin qua" +STID_TOPICS, "T&opics" +STID_ALL_FILES, "Tuot las datotecas (*.*)" +STID_HELP_FILES_HLP, "Datotecas d'ag�d (*.hlp)" STID_FILE_NOT_FOUND_s "Cannot find '%s'. Do you want to find this file yourself?" } diff --git a/programs/winhelp/rsrc.rc b/programs/winhelp/rsrc.rc index 8109916..c8a6417 100644 --- a/programs/winhelp/rsrc.rc +++ b/programs/winhelp/rsrc.rc @@ -41,6 +41,7 @@ #include "No.rc" #include "Pl.rc" #include "Pt.rc" +#include "Rm.rc" #include "Ru.rc" #include "Si.rc" #include "Sk.rc"

1 0