January 2009 - Wine-commits

Alexandre Julliard : include: Fix the PROCESSENTRY32 structure on 64-bit.
by Alexandre Julliard 04 Jan '09

04 Jan '09

Module: wine Branch: master Commit: 03f9519711415d77625dfe16c0197b2a3973519d URL: http://source.winehq.org/git/wine.git/?a=commit;h=03f9519711415d77625dfe16c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jan 4 14:10:33 2009 +0100 include: Fix the PROCESSENTRY32 structure on 64-bit. --- include/tlhelp32.h | 40 ++++++++++++++++++++-------------------- 1 files changed, 20 insertions(+), 20 deletions(-) diff --git a/include/tlhelp32.h b/include/tlhelp32.h index cc5a237..4b4d224 100644 --- a/include/tlhelp32.h +++ b/include/tlhelp32.h @@ -60,30 +60,30 @@ BOOL WINAPI Thread32Next(HANDLE,LPTHREADENTRY32); typedef struct tagPROCESSENTRY32 { - DWORD dwSize; - DWORD cntUsage; - DWORD th32ProcessID; - DWORD th32DefaultHeapID; - DWORD th32ModuleID; - DWORD cntThreads; - DWORD th32ParentProcessID; - LONG pcPriClassBase; - DWORD dwFlags; - char szExeFile[MAX_PATH]; + DWORD dwSize; + DWORD cntUsage; + DWORD th32ProcessID; + ULONG_PTR th32DefaultHeapID; + DWORD th32ModuleID; + DWORD cntThreads; + DWORD th32ParentProcessID; + LONG pcPriClassBase; + DWORD dwFlags; + char szExeFile[MAX_PATH]; } PROCESSENTRY32, *PPROCESSENTRY32, *LPPROCESSENTRY32; typedef struct tagPROCESSENTRY32W { - DWORD dwSize; - DWORD cntUsage; - DWORD th32ProcessID; - DWORD th32DefaultHeapID; - DWORD th32ModuleID; - DWORD cntThreads; - DWORD th32ParentProcessID; - LONG pcPriClassBase; - DWORD dwFlags; - WCHAR szExeFile[MAX_PATH]; + DWORD dwSize; + DWORD cntUsage; + DWORD th32ProcessID; + ULONG_PTR th32DefaultHeapID; + DWORD th32ModuleID; + DWORD cntThreads; + DWORD th32ParentProcessID; + LONG pcPriClassBase; + DWORD dwFlags; + WCHAR szExeFile[MAX_PATH]; } PROCESSENTRY32W, *PPROCESSENTRY32W, *LPPROCESSENTRY32W; BOOL WINAPI Process32First(HANDLE,LPPROCESSENTRY32);

1 0

Alexandre Julliard : include: Fix the msvcrt time_t definition on 64-bit.
by Alexandre Julliard 04 Jan '09

04 Jan '09

Module: wine Branch: master Commit: fcd2ff970365ab77d5252c0b15bdccf594125252 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcd2ff970365ab77d5252c0b1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jan 4 14:10:43 2009 +0100 include: Fix the msvcrt time_t definition on 64-bit. --- include/msvcrt/crtdefs.h | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/include/msvcrt/crtdefs.h b/include/msvcrt/crtdefs.h index 7234c1d..fce448e 100644 --- a/include/msvcrt/crtdefs.h +++ b/include/msvcrt/crtdefs.h @@ -104,11 +104,6 @@ typedef unsigned int size_t; #define _SIZE_T_DEFINED #endif -#ifndef _TIME_T_DEFINED -typedef long time_t; -#define _TIME_T_DEFINED -#endif - #ifndef _TIME32_T_DEFINED typedef long __time32_t; #define _TIME32_T_DEFINED @@ -119,6 +114,15 @@ typedef __int64 __time64_t; #define _TIME64_T_DEFINED #endif +#ifndef _TIME_T_DEFINED +#ifdef _WIN64 +typedef __time64_t time_t; +#else +typedef __time32_t time_t; +#endif +#define _TIME_T_DEFINED +#endif + #ifndef _WCHAR_T_DEFINED #ifndef __cplusplus typedef unsigned short wchar_t;

1 0

Alexandre Julliard : msvcrt/tests: Fix the printf pointer formatting tests on 64-bit.
by Alexandre Julliard 04 Jan '09

04 Jan '09

Module: wine Branch: master Commit: 159dfb219c8e34f955cda5b65d69385bfbb1a86d URL: http://source.winehq.org/git/wine.git/?a=commit;h=159dfb219c8e34f955cda5b65… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jan 4 14:11:02 2009 +0100 msvcrt/tests: Fix the printf pointer formatting tests on 64-bit. --- dlls/msvcrt/tests/printf.c | 75 +++++++++++++++++++++++++++++++------------ 1 files changed, 54 insertions(+), 21 deletions(-) diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index 1603893..9d31f86 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -277,20 +277,50 @@ static void test_sprintf( void ) ok(!strcmp(buffer,"1 "),"Character zero-padded and/or not left-adjusted \"%s\"\n",buffer); ok( r==4, "return count wrong\n"); - format = "%p"; - r = sprintf(buffer,format,(void *)57); - ok(!strcmp(buffer,"00000039"),"Pointer formatted incorrectly \"%s\"\n",buffer); - ok( r==8, "return count wrong\n"); - - format = "%#012p"; - r = sprintf(buffer,format,(void *)57); - ok(!strcmp(buffer," 0X00000039"),"Pointer formatted incorrectly\n"); - ok( r==12, "return count wrong\n"); - - format = "%Fp"; - r = sprintf(buffer,format,(void *)57); - ok(!strcmp(buffer,"00000039"),"Pointer formatted incorrectly \"%s\"\n",buffer); - ok( r==8, "return count wrong\n"); + if (sizeof(void *) == 8) + { + format = "%p"; + r = sprintf(buffer,format,(void *)57); + ok(!strcmp(buffer,"0000000000000039"),"Pointer formatted incorrectly \"%s\"\n",buffer); + ok( r==16, "return count wrong\n"); + + format = "%#020p"; + r = sprintf(buffer,format,(void *)57); + ok(!strcmp(buffer," 0X0000000000000039"),"Pointer formatted incorrectly\n"); + ok( r==20, "return count wrong\n"); + + format = "%Fp"; + r = sprintf(buffer,format,(void *)57); + ok(!strcmp(buffer,"0000000000000039"),"Pointer formatted incorrectly \"%s\"\n",buffer); + ok( r==16, "return count wrong\n"); + + format = "%#-020p"; + r = sprintf(buffer,format,(void *)57); + ok(!strcmp(buffer,"0X0000000000000039 "),"Pointer formatted incorrectly\n"); + ok( r==20, "return count wrong\n"); + } + else + { + format = "%p"; + r = sprintf(buffer,format,(void *)57); + ok(!strcmp(buffer,"00000039"),"Pointer formatted incorrectly \"%s\"\n",buffer); + ok( r==8, "return count wrong\n"); + + format = "%#012p"; + r = sprintf(buffer,format,(void *)57); + ok(!strcmp(buffer," 0X00000039"),"Pointer formatted incorrectly\n"); + ok( r==12, "return count wrong\n"); + + format = "%Fp"; + r = sprintf(buffer,format,(void *)57); + ok(!strcmp(buffer,"00000039"),"Pointer formatted incorrectly \"%s\"\n",buffer); + ok( r==8, "return count wrong\n"); + + format = "%#-012p"; + r = sprintf(buffer,format,(void *)57); + ok(!strcmp(buffer,"0X00000039 "),"Pointer formatted incorrectly\n"); + ok( r==12, "return count wrong\n"); + } format = "%04s"; r = sprintf(buffer,format,"foo"); @@ -312,11 +342,6 @@ static void test_sprintf( void ) ok(!strcmp(buffer,"foo "),"Negative field width ignored \"%s\"\n",buffer); ok( r==5, "return count wrong\n"); - format = "%#-012p"; - r = sprintf(buffer,format,(void *)57); - ok(!strcmp(buffer,"0X00000039 "),"Pointer formatted incorrectly\n"); - ok( r==12, "return count wrong\n"); - format = "hello"; r = sprintf(buffer, format); ok(!strcmp(buffer,"hello"), "failed\n"); @@ -455,8 +480,16 @@ static void test_sprintf( void ) format = "%p"; r = sprintf(buffer, format,0); - ok(!strcmp(buffer,"00000000"), "failed\n"); - ok( r==8, "return count wrong\n"); + if (sizeof(void *) == 8) + { + ok(!strcmp(buffer,"0000000000000000"), "failed\n"); + ok( r==16, "return count wrong\n"); + } + else + { + ok(!strcmp(buffer,"00000000"), "failed\n"); + ok( r==8, "return count wrong\n"); + } format = "%s"; r = sprintf(buffer, format,0);

1 0

Michael Stefaniuc : include: Change unsigned long to ULONG in rpcdce. h for Win64 compatibility.
by Alexandre Julliard 04 Jan '09

04 Jan '09

Module: wine Branch: master Commit: 4c7a6694cd825367d222161aab53d1763cd0b1a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c7a6694cd825367d222161aa… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jan 4 01:49:37 2009 +0100 include: Change unsigned long to ULONG in rpcdce.h for Win64 compatibility. Also fix the compiler warnings introduced by this change. --- dlls/rpcrt4/rpc_binding.c | 14 ++++---- dlls/rpcrt4/rpc_server.c | 4 +- include/rpcdce.h | 72 ++++++++++++++++++++++---------------------- 3 files changed, 45 insertions(+), 45 deletions(-) diff --git a/dlls/rpcrt4/rpc_binding.c b/dlls/rpcrt4/rpc_binding.c index 71d3c39..e69f0f6 100644 --- a/dlls/rpcrt4/rpc_binding.c +++ b/dlls/rpcrt4/rpc_binding.c @@ -1372,7 +1372,7 @@ BOOL RpcQualityOfService_IsEqual(const RpcQualityOfService *qos1, const RpcQuali if (!qos1 || !qos2) return FALSE; - TRACE("qos1 = { %ld %ld %ld %ld }, qos2 = { %ld %ld %ld %ld }\n", + TRACE("qos1 = { %d %d %d %d }, qos2 = { %d %d %d %d }\n", qos1->qos->Capabilities, qos1->qos->IdentityTracking, qos1->qos->ImpersonationType, qos1->qos->AdditionalSecurityInfoType, qos2->qos->Capabilities, qos2->qos->IdentityTracking, @@ -1517,14 +1517,14 @@ RpcBindingSetAuthInfoExA( RPC_BINDING_HANDLE Binding, RPC_CSTR ServerPrincName, { RPC_STATUS status; - TRACE("SecurityQos { Version=%ld, Capabilties=0x%lx, IdentityTracking=%ld, ImpersonationLevel=%ld", + TRACE("SecurityQos { Version=%d, Capabilties=0x%x, IdentityTracking=%d, ImpersonationLevel=%d", SecurityQos->Version, SecurityQos->Capabilities, SecurityQos->IdentityTracking, SecurityQos->ImpersonationType); if (SecurityQos->Version >= 2) { const RPC_SECURITY_QOS_V2_A *SecurityQos2 = (const RPC_SECURITY_QOS_V2_A *)SecurityQos; - TRACE(", AdditionalSecurityInfoType=%ld", SecurityQos2->AdditionalSecurityInfoType); + TRACE(", AdditionalSecurityInfoType=%d", SecurityQos2->AdditionalSecurityInfoType); if (SecurityQos2->AdditionalSecurityInfoType == RPC_C_AUTHN_INFO_TYPE_HTTP) - TRACE(", { %p, 0x%lx, %ld, %ld, %p, %s }", + TRACE(", { %p, 0x%x, %d, %d, %p, %s }", SecurityQos2->u.HttpCredentials->TransportCredentials, SecurityQos2->u.HttpCredentials->Flags, SecurityQos2->u.HttpCredentials->AuthenticationTarget, @@ -1647,14 +1647,14 @@ RpcBindingSetAuthInfoExW( RPC_BINDING_HANDLE Binding, RPC_WSTR ServerPrincName, { RPC_STATUS status; - TRACE("SecurityQos { Version=%ld, Capabilties=0x%lx, IdentityTracking=%ld, ImpersonationLevel=%ld", + TRACE("SecurityQos { Version=%d, Capabilties=0x%x, IdentityTracking=%d, ImpersonationLevel=%d", SecurityQos->Version, SecurityQos->Capabilities, SecurityQos->IdentityTracking, SecurityQos->ImpersonationType); if (SecurityQos->Version >= 2) { const RPC_SECURITY_QOS_V2_W *SecurityQos2 = (const RPC_SECURITY_QOS_V2_W *)SecurityQos; - TRACE(", AdditionalSecurityInfoType=%ld", SecurityQos2->AdditionalSecurityInfoType); + TRACE(", AdditionalSecurityInfoType=%d", SecurityQos2->AdditionalSecurityInfoType); if (SecurityQos2->AdditionalSecurityInfoType == RPC_C_AUTHN_INFO_TYPE_HTTP) - TRACE(", { %p, 0x%lx, %ld, %ld, %p, %s }", + TRACE(", { %p, 0x%x, %d, %d, %p, %s }", SecurityQos2->u.HttpCredentials->TransportCredentials, SecurityQos2->u.HttpCredentials->Flags, SecurityQos2->u.HttpCredentials->AuthenticationTarget, diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index 60c3202..b6e058a 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -745,7 +745,7 @@ RPC_STATUS WINAPI RpcServerUseProtseqEpExA( RPC_CSTR Protseq, UINT MaxCalls, RPC RpcServerProtseq* ps; RPC_STATUS status; - TRACE("(%s,%u,%s,%p,{%u,%lu,%lu})\n", debugstr_a(szps), MaxCalls, + TRACE("(%s,%u,%s,%p,{%u,%u,%u})\n", debugstr_a(szps), MaxCalls, debugstr_a(szep), SecurityDescriptor, lpPolicy->Length, lpPolicy->EndpointFlags, lpPolicy->NICFlags ); @@ -766,7 +766,7 @@ RPC_STATUS WINAPI RpcServerUseProtseqEpExW( RPC_WSTR Protseq, UINT MaxCalls, RPC RPC_STATUS status; LPSTR EndpointA; - TRACE("(%s,%u,%s,%p,{%u,%lu,%lu})\n", debugstr_w( Protseq ), MaxCalls, + TRACE("(%s,%u,%s,%p,{%u,%u,%u})\n", debugstr_w( Protseq ), MaxCalls, debugstr_w( Endpoint ), SecurityDescriptor, lpPolicy->Length, lpPolicy->EndpointFlags, lpPolicy->NICFlags ); diff --git a/include/rpcdce.h b/include/rpcdce.h index 1fca11b..aec99a4 100644 --- a/include/rpcdce.h +++ b/include/rpcdce.h @@ -54,14 +54,14 @@ typedef RPC_BINDING_HANDLE handle_t; typedef struct _RPC_BINDING_VECTOR { - unsigned long Count; + ULONG Count; RPC_BINDING_HANDLE BindingH[1]; } RPC_BINDING_VECTOR; #define rpc_binding_vector_t RPC_BINDING_VECTOR typedef struct _UUID_VECTOR { - unsigned long Count; + ULONG Count; UUID *Uuid[1]; } UUID_VECTOR; #define uuid_vector_t UUID_VECTOR @@ -75,14 +75,14 @@ typedef struct _RPC_IF_ID typedef struct { - unsigned long Count; + ULONG Count; RPC_IF_ID *IfId[1]; } RPC_IF_ID_VECTOR; typedef struct { unsigned int Count; - unsigned long Stats[1]; + ULONG Stats[1]; } RPC_STATS_VECTOR; typedef I_RPC_HANDLE *RPC_EP_INQ_HANDLE; @@ -195,66 +195,66 @@ typedef void (__RPC_USER *RPC_AUTH_KEY_RETRIEVAL_FN)(); typedef struct _RPC_POLICY { unsigned int Length; - unsigned long EndpointFlags; - unsigned long NICFlags; + ULONG EndpointFlags; + ULONG NICFlags; } RPC_POLICY, *PRPC_POLICY; typedef struct _SEC_WINNT_AUTH_IDENTITY_W { unsigned short* User; - unsigned long UserLength; + ULONG UserLength; unsigned short* Domain; - unsigned long DomainLength; + ULONG DomainLength; unsigned short* Password; - unsigned long PasswordLength; - unsigned long Flags; + ULONG PasswordLength; + ULONG Flags; } SEC_WINNT_AUTH_IDENTITY_W, *PSEC_WINNT_AUTH_IDENTITY_W; typedef struct _SEC_WINNT_AUTH_IDENTITY_A { unsigned char* User; - unsigned long UserLength; + ULONG UserLength; unsigned char* Domain; - unsigned long DomainLength; + ULONG DomainLength; unsigned char* Password; - unsigned long PasswordLength; - unsigned long Flags; + ULONG PasswordLength; + ULONG Flags; } SEC_WINNT_AUTH_IDENTITY_A, *PSEC_WINNT_AUTH_IDENTITY_A; typedef struct _RPC_HTTP_TRANSPORT_CREDENTIALS_W { SEC_WINNT_AUTH_IDENTITY_W *TransportCredentials; - unsigned long Flags; - unsigned long AuthenticationTarget; - unsigned long NumberOfAuthnSchemes; - unsigned long *AuthnSchemes; + ULONG Flags; + ULONG AuthenticationTarget; + ULONG NumberOfAuthnSchemes; + ULONG *AuthnSchemes; unsigned short *ServerCertificateSubject; } RPC_HTTP_TRANSPORT_CREDENTIALS_W, *PRPC_HTTP_TRANSPORT_CREDENTIALS_W; typedef struct _RPC_HTTP_TRANSPORT_CREDENTIALS_A { SEC_WINNT_AUTH_IDENTITY_A *TransportCredentials; - unsigned long Flags; - unsigned long AuthenticationTarget; - unsigned long NumberOfAuthnSchemes; - unsigned long *AuthnSchemes; + ULONG Flags; + ULONG AuthenticationTarget; + ULONG NumberOfAuthnSchemes; + ULONG *AuthnSchemes; unsigned char *ServerCertificateSubject; } RPC_HTTP_TRANSPORT_CREDENTIALS_A, *PRPC_HTTP_TRANSPORT_CREDENTIALS_A; typedef struct _RPC_SECURITY_QOS { - unsigned long Version; - unsigned long Capabilities; - unsigned long IdentityTracking; - unsigned long ImpersonationType; + ULONG Version; + ULONG Capabilities; + ULONG IdentityTracking; + ULONG ImpersonationType; } RPC_SECURITY_QOS, *PRPC_SECURITY_QOS; typedef struct _RPC_SECURITY_QOS_V2_W { - unsigned long Version; - unsigned long Capabilities; - unsigned long IdentityTracking; - unsigned long ImpersonationType; - unsigned long AdditionalSecurityInfoType; + ULONG Version; + ULONG Capabilities; + ULONG IdentityTracking; + ULONG ImpersonationType; + ULONG AdditionalSecurityInfoType; union { RPC_HTTP_TRANSPORT_CREDENTIALS_W *HttpCredentials; @@ -263,11 +263,11 @@ typedef struct _RPC_SECURITY_QOS_V2_W typedef struct _RPC_SECURITY_QOS_V2_A { - unsigned long Version; - unsigned long Capabilities; - unsigned long IdentityTracking; - unsigned long ImpersonationType; - unsigned long AdditionalSecurityInfoType; + ULONG Version; + ULONG Capabilities; + ULONG IdentityTracking; + ULONG ImpersonationType; + ULONG AdditionalSecurityInfoType; union { RPC_HTTP_TRANSPORT_CREDENTIALS_A *HttpCredentials;

1 0

Michael Stefaniuc : include: Use LONG instead of long in richedit.h.
by Alexandre Julliard 04 Jan '09

04 Jan '09

Module: wine Branch: master Commit: 82d8fc3f1ef08328289fb608f540b0b1b849183f URL: http://source.winehq.org/git/wine.git/?a=commit;h=82d8fc3f1ef08328289fb608f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jan 4 11:28:42 2009 +0100 include: Use LONG instead of long in richedit.h. --- include/richedit.h | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/richedit.h b/include/richedit.h index 02ebdc2..095cc8a 100644 --- a/include/richedit.h +++ b/include/richedit.h @@ -622,7 +622,7 @@ typedef enum tagKHYPH typedef struct hyphresult { KHYPH khyph; - long ichHyph; + LONG ichHyph; WCHAR chHyph; } HYPHRESULT; @@ -630,7 +630,7 @@ typedef struct tagHyphenateInfo { SHORT cbSize; SHORT dxHyphenateZone; - void (WINAPI* pfnHyphenate)(WCHAR*, LANGID, long, HYPHRESULT*); + void (WINAPI* pfnHyphenate)(WCHAR*, LANGID, LONG, HYPHRESULT*); } HYPHENATEINFO; typedef struct _msgfilter { @@ -712,7 +712,7 @@ typedef struct _imecomptext { DWORD flags; } IMECOMPTEXT; -void WINAPI HyphenateProc(WCHAR*, LANGID, long, HYPHRESULT*); +void WINAPI HyphenateProc(WCHAR*, LANGID, LONG, HYPHRESULT*); #define SF_TEXT 0x00000001 #define SF_RTF 0x00000002

1 0

Michael Stefaniuc : include: Change long to LONG in d3dtypes. h for Win64 compatibility.
by Alexandre Julliard 04 Jan '09

04 Jan '09

Module: wine Branch: master Commit: 3d94f5efc29b43c72e9574ca6c7ee88a69e28b73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d94f5efc29b43c72e9574ca6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jan 4 11:29:02 2009 +0100 include: Change long to LONG in d3dtypes.h for Win64 compatibility. --- include/d3dtypes.h | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/d3dtypes.h b/include/d3dtypes.h index f0be963..21b9e74 100644 --- a/include/d3dtypes.h +++ b/include/d3dtypes.h @@ -55,10 +55,10 @@ typedef LONG D3DFIXED; #define RGBA_MAKE(r, g, b, a) ((D3DCOLOR) (((a) << 24) | ((r) << 16) | ((g) << 8) | (b))) #define D3DRGB(r, g, b) \ - (0xff000000L | ( ((long)((r) * 255)) << 16) | (((long)((g) * 255)) << 8) | (long)((b) * 255)) + (0xff000000 | ( ((LONG)((r) * 255)) << 16) | (((LONG)((g) * 255)) << 8) | (LONG)((b) * 255)) #define D3DRGBA(r, g, b, a) \ - ( (((long)((a) * 255)) << 24) | (((long)((r) * 255)) << 16) \ - | (((long)((g) * 255)) << 8) | (long)((b) * 255) \ + ( (((LONG)((a) * 255)) << 24) | (((LONG)((r) * 255)) << 16) \ + | (((LONG)((g) * 255)) << 8) | (LONG)((b) * 255) \ ) #define RGB_GETRED(rgb) (((rgb) >> 16) & 0xff)

1 0

Michael Stefaniuc : appwiz.cpl: Add Romanian translation.
by Alexandre Julliard 04 Jan '09

04 Jan '09

Module: wine Branch: master Commit: 969ef6d3b5ed131d5642dbf6ea368f85ae0c0986 URL: http://source.winehq.org/git/wine.git/?a=commit;h=969ef6d3b5ed131d5642dbf6e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jan 4 01:47:25 2009 +0100 appwiz.cpl: Add Romanian translation. --- dlls/appwiz.cpl/Ro.rc | 82 +++++++++++++++++++++++++++++++++++++++++++++ dlls/appwiz.cpl/appwiz.rc | 1 + 2 files changed, 83 insertions(+), 0 deletions(-) diff --git a/dlls/appwiz.cpl/Ro.rc b/dlls/appwiz.cpl/Ro.rc new file mode 100644 index 0000000..321e9dd --- /dev/null +++ b/dlls/appwiz.cpl/Ro.rc @@ -0,0 +1,82 @@ +/* +* Add/Remove Programs Romanian resources +* +* Copyright 2001-2002, 2008 Owen Rudge +* Copyright 2009 Michael Stefaniuc +* +* 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_ROMANIAN, SUBLANG_NEUTRAL + +#pragma code_page(65001) + +STRINGTABLE +{ + IDS_CPL_TITLE, "Adăugare/eliminare programe" + IDS_CPL_DESC, "Permite instalarea sau dezinstalarea de aplicații pe calculatorul d-voastră." + IDS_TAB1_TITLE, "Aplicații" + + IDS_UNINSTALL_FAILED, "Nu am putut rula dezinstalarea pentru „%s”. Vreți să înlăturați înregistrarea de dezinstalare a acestei aplicații?" + IDS_NOT_SPECIFIED, "Ne specificat" + + IDS_COLUMN_NAME, "Nume" + IDS_COLUMN_PUBLISHER, "Emitent" + IDS_COLUMN_VERSION, "Versiune" +} + +IDD_MAIN DIALOG 0, 0, 320, 220 +STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Instalare/dezinstalare" +FONT 8, "MS Shell Dlg" +{ + CONTROL "Pentru a instala un program de pe dischetă, CD-ROM sau discul fix, apăsați pe „Instalează”.", 1000, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 7, 270, 20 + CONTROL "&Instalează...", IDC_INSTALL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 246, 26, 64, 14 + CONTROL "", -1, "STATIC", SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE, 7, 46, 303, 1 + CONTROL 2, 1001, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 7, 21, 20 + CONTROL "Urmatoarele programe pot fi îndepărtate automat. Pentru a îndepărta un program sau pentru ai modifica componentele instalate, alegeți programul din listă și apăsați pe „Adaugă/&șterge”.", 1002, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 57, 270, 30 + CONTROL "", IDL_PROGRAMS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SORTASCENDING | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 90, 303, 100 + CONTROL "Adaugă/&șterge...", IDC_ADDREMOVE, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 236, 198, 74, 14 + CONTROL "Informații a&sistență...", IDC_SUPPORT_INFO, "button", BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 156, 198, 74, 14 + CONTROL 3, 1003, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 57, 21, 20 +} + +IDD_INFO DIALOG 0, 0, 256, 138 +STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Informații de asistență" +FONT 8, "MS Shell Dlg" +{ + CONTROL "OK", IDOK, "BUTTON", BS_DEFPUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 103, 116, 50, 14 + CONTROL "Următoarele informații pot fi folosite la obținerea de asistență technică pentru „%s”:", IDC_INFO_LABEL, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 12, 9, 228, 19 + CONTROL "Emitent:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 30, 60, 8 + CONTROL "Versiune:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 40, 60, 8 + CONTROL "Contact:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 50, 60, 8 + CONTROL "Informații de asistență:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 60, 84, 8 + CONTROL "Asistență prin telefon:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 70, 84, 8 + CONTROL "Readme:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 80, 60, 8 + CONTROL "Actualizări produs:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 90, 60, 8 + CONTROL "Comentarii:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 100, 60, 8 + CONTROL "", IDC_INFO_PUBLISHER, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 30, 136, 8 + CONTROL "", IDC_INFO_VERSION, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 40, 136, 8 + CONTROL "", IDC_INFO_CONTACT, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 50, 136, 8 + CONTROL "", IDC_INFO_SUPPORT, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 60, 136, 8 + CONTROL "", IDC_INFO_PHONE, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 70, 136, 8 + CONTROL "", IDC_INFO_README, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 80, 136, 8 + CONTROL "", IDC_INFO_UPDATES, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 90, 136, 8 + CONTROL "", IDC_INFO_COMMENTS, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 100, 136, 8 +} + +#pragma code_page(default) diff --git a/dlls/appwiz.cpl/appwiz.rc b/dlls/appwiz.cpl/appwiz.rc index 7c95366..843662a 100644 --- a/dlls/appwiz.cpl/appwiz.rc +++ b/dlls/appwiz.cpl/appwiz.rc @@ -32,6 +32,7 @@ #include "Nl.rc" #include "No.rc" #include "Pt.rc" +#include "Ro.rc" #include "Ru.rc" #include "Si.rc" #include "Zh.rc"

1 0

Michael Stefaniuc : include: Change RPC_STATUS from long to LONG for Win64 compatibility.
by Alexandre Julliard 04 Jan '09

04 Jan '09

Module: wine Branch: master Commit: e86eb8efa6975fac1278a4089b36fb098cb2416e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e86eb8efa6975fac1278a4089… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jan 4 01:49:14 2009 +0100 include: Change RPC_STATUS from long to LONG for Win64 compatibility. Also fix the compiler warnings introduced by this change. --- dlls/advapi32/crypt.c | 2 +- dlls/ole32/rpc.c | 16 +++--- dlls/oleaut32/tests/typelib.c | 2 +- dlls/rpcrt4/ndr_clientserver.c | 2 +- dlls/rpcrt4/rpc_assoc.c | 2 +- dlls/rpcrt4/rpc_epmap.c | 2 +- dlls/rpcrt4/rpc_message.c | 2 +- dlls/rpcrt4/rpc_server.c | 2 +- dlls/rpcrt4/rpcrt4_main.c | 2 +- dlls/rpcrt4/tests/ndr_marshall.c | 18 ++++---- dlls/rpcrt4/tests/rpc.c | 94 +++++++++++++++++++------------------- dlls/rpcrt4/tests/rpc_async.c | 12 ++-- dlls/rpcrt4/tests/server.c | 10 ++-- include/rpc.h | 2 +- programs/rpcss/epmp.c | 2 +- 15 files changed, 85 insertions(+), 85 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e86eb8efa6975fac1278a…

1 0

Michael Stefaniuc : mshtml: Fix a dialog size for the Pt and Si translations.
by Alexandre Julliard 04 Jan '09

04 Jan '09

Module: wine Branch: master Commit: e75df00707c06359629a531756a0a1964194325e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e75df00707c06359629a53175… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jan 4 01:48:31 2009 +0100 mshtml: Fix a dialog size for the Pt and Si translations. --- dlls/mshtml/Pt.rc | 10 +++++----- dlls/mshtml/Si.rc | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/Pt.rc b/dlls/mshtml/Pt.rc index fae6d18..58ca5da 100644 --- a/dlls/mshtml/Pt.rc +++ b/dlls/mshtml/Pt.rc @@ -27,17 +27,17 @@ STRINGTABLE DISCARDABLE IDS_INSTALLING "Instalando..." } -ID_DWL_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 260, 85 +ID_DWL_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 260, 95 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Instalador Wine Gecko" FONT 8, "MS Shell Dlg" { LTEXT "Esta aplica��o est� a tentar mostrar uma p�gina HTML. O Wine precisa que o Gecko " \ "(Motor HTML Mozilla) seja instalado para mostrar a p�gina. Clique em Instalar se deseja que o Wine " \ - "descarregue e instale o Gecko automaticamente.", ID_DWL_STATUS, 10, 10, 240, 30, SS_LEFT - CONTROL "Progresso", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 40, 240, 12 - DEFPUSHBUTTON "&Instalar", ID_DWL_INSTALL, 200, 60, 50, 15, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Cancelar", IDCANCEL, 140, 60, 50, 15, WS_GROUP | WS_TABSTOP + "descarregue e instale o Gecko automaticamente.", ID_DWL_STATUS, 10, 10, 240, 40, SS_LEFT + CONTROL "Progresso", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 50, 240, 12 + DEFPUSHBUTTON "&Instalar", ID_DWL_INSTALL, 200, 70, 50, 15, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Cancelar", IDCANCEL, 140, 70, 50, 15, WS_GROUP | WS_TABSTOP } IDD_HYPERLINK DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 250, 65 diff --git a/dlls/mshtml/Si.rc b/dlls/mshtml/Si.rc index 2ec1c5c..be4a1b6 100644 --- a/dlls/mshtml/Si.rc +++ b/dlls/mshtml/Si.rc @@ -28,7 +28,7 @@ STRINGTABLE DISCARDABLE IDS_INSTALLING "Nameščam ..." } -ID_DWL_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 260, 85 +ID_DWL_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 260, 95 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Namestitev Wine Gecko" FONT 8, "MS Shell Dlg" @@ -36,10 +36,10 @@ FONT 8, "MS Shell Dlg" LTEXT "Ta program poskuša prikazati HTML stran. Wine za prikaz spletnih strani " \ "potrebuje Gecko (Mozillin HTML prikazovalnik). Kliknite Namesti, če " \ "želite, da Wine samodejno naloži in namesti Gecko (potrebna je povezava " \ - "z internetom).", ID_DWL_STATUS, 10, 10, 240, 30, SS_LEFT - CONTROL "Napredek", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 40, 240, 12 - DEFPUSHBUTTON "&Namesti", ID_DWL_INSTALL, 200, 60, 50, 15, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Prekliči", IDCANCEL, 140, 60, 50, 15, WS_GROUP | WS_TABSTOP + "z internetom).", ID_DWL_STATUS, 10, 10, 240, 40, SS_LEFT + CONTROL "Napredek", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 50, 240, 12 + DEFPUSHBUTTON "&Namesti", ID_DWL_INSTALL, 200, 70, 50, 15, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Prekliči", IDCANCEL, 140, 70, 50, 15, WS_GROUP | WS_TABSTOP } IDD_HYPERLINK DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 250, 65

1 0

Michael Stefaniuc : mshtml: Add the Romanian translation.
by Alexandre Julliard 04 Jan '09

04 Jan '09

Module: wine Branch: master Commit: 8757515dd99aad44e2bbe3d49441ebbd2dd9b039 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8757515dd99aad44e2bbe3d49… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jan 4 01:47:46 2009 +0100 mshtml: Add the Romanian translation. --- dlls/mshtml/Ro.rc | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/rsrc.rc | 1 + 2 files changed, 59 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/Ro.rc b/dlls/mshtml/Ro.rc new file mode 100644 index 0000000..fe6d221 --- /dev/null +++ b/dlls/mshtml/Ro.rc @@ -0,0 +1,58 @@ +/* + * Copyright 2005-2006 Jacek Caban + * Copyright 2009 Michael Stefaniuc + * + * 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_ROMANIAN, SUBLANG_NEUTRAL + +#pragma code_page(65001) + +STRINGTABLE DISCARDABLE +{ + IDS_HTMLDISABLED "Afișarea de pagini HTML este în prezent dezactivată." + IDS_HTMLDOCUMENT "Document HTML" + IDS_DOWNLOADING "Descarc..." + IDS_INSTALLING "Instalez..." +} + +ID_DWL_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 260, 95 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Instalator Wine Gecko" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Această aplicație încearcă să afișeze o pagină HTML. Wine are nevoie de Gecko (motorul de HTML Mozilla) pentru a afișa această pagină. Apăsați „Instalează” dacă doriți ca Wine să descarce și să instaleze Gecko în mod automat.", ID_DWL_STATUS, 10, 10, 240, 40, SS_LEFT + CONTROL "Progres", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 50, 240, 12 + DEFPUSHBUTTON "&Instalează", ID_DWL_INSTALL, 200, 70, 50, 15, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Renunță", IDCANCEL, 140, 70, 50, 15, WS_GROUP | WS_TABSTOP +} + +IDD_HYPERLINK DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 250, 65 +STYLE DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Hiperlegătură" +FONT 8, "MS Shell Dlg" +{ + GROUPBOX "Informații de hiperlegătură", IDC_STATIC, 5, 5, 190, 55 + LTEXT "&Tip:", IDC_STATIC, 10, 22, 20, 10 + COMBOBOX IDC_TYPE, 35, 20, 45, 100, WS_TABSTOP | WS_GROUP | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_HASSTRINGS + LTEXT "&URL:", IDC_STATIC, 10, 42, 20, 10 + EDITTEXT IDC_URL, 35, 40, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 200, 10, 45, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Renunță", IDCANCEL, 200, 28, 45, 14, WS_GROUP | WS_TABSTOP +} + +#pragma code_page(default) diff --git a/dlls/mshtml/rsrc.rc b/dlls/mshtml/rsrc.rc index 17c0233..83e9d69 100644 --- a/dlls/mshtml/rsrc.rc +++ b/dlls/mshtml/rsrc.rc @@ -47,6 +47,7 @@ #include "No.rc" #include "Pl.rc" #include "Pt.rc" +#include "Ro.rc" #include "Ru.rc" #include "Si.rc" #include "Sv.rc"

1 0