Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 61200: [PSDK] * Define MAKEINTRESOURCE correctly for Wine sources. CORE-7669 #resolve #comment Fixed in r61200.
by akhaldi＠svn.reactos.org 02 Dec '13

02 Dec '13

Author: akhaldi Date: Mon Dec 2 22:41:02 2013 New Revision: 61200 URL: http://svn.reactos.org/svn/reactos?rev=61200&view=rev Log: [PSDK] * Define MAKEINTRESOURCE correctly for Wine sources. CORE-7669 #resolve #comment Fixed in r61200. Modified: trunk/reactos/include/psdk/winuser.h Modified: trunk/reactos/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winuser.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winuser.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winuser.h [iso-8859-1] Mon Dec 2 22:41:02 2013 @@ -576,9 +576,23 @@ #define SB_RIGHT 7 #define SB_BOTTOM 7 #define SB_TOP 6 + #define IS_INTRESOURCE(i) (((ULONG_PTR)(i) >> 16) == 0) #define MAKEINTRESOURCEA(i) ((LPSTR)(ULONG_PTR)LOWORD(i)) #define MAKEINTRESOURCEW(i) ((LPWSTR)(ULONG_PTR)LOWORD(i)) + +#ifndef RC_INVOKED +#ifdef WINE_NO_UNICODE_MACROS /* force using a cast */ +#define MAKEINTRESOURCE(i) ((ULONG_PTR)((WORD)(i))) +#else +#ifdef UNICODE +#define MAKEINTRESOURCE MAKEINTRESOURCEW +#else +#define MAKEINTRESOURCE MAKEINTRESOURCEA +#endif /* UNICODE */ +#endif /* WINE_NO_UNICODE_MACROS */ +#endif /* !RC_INVOKED */ + #ifndef XFree86Server # define RT_CURSOR MAKEINTRESOURCE(1) # define RT_FONT MAKEINTRESOURCE(8) @@ -5368,7 +5382,6 @@ #define WINSTAENUMPROC WINSTAENUMPROCW #define PROPENUMPROC PROPENUMPROCW #define PROPENUMPROCEX PROPENUMPROCEXW -#define MAKEINTRESOURCE MAKEINTRESOURCEW typedef WNDCLASSW WNDCLASS,*LPWNDCLASS,*PWNDCLASS; typedef WNDCLASSEXW WNDCLASSEX,*LPWNDCLASSEX,*PWNDCLASSEX; typedef MENUITEMINFOW MENUITEMINFO,*LPMENUITEMINFO; @@ -5536,7 +5549,6 @@ #define WINSTAENUMPROC WINSTAENUMPROCA #define PROPENUMPROC PROPENUMPROCA #define PROPENUMPROCEX PROPENUMPROCEXA -#define MAKEINTRESOURCE MAKEINTRESOURCEA typedef WNDCLASSA WNDCLASS,*LPWNDCLASS,*PWNDCLASS; typedef WNDCLASSEXA WNDCLASSEX,*LPWNDCLASSEX,*PWNDCLASSEX; typedef MENUITEMINFOA MENUITEMINFO,*LPMENUITEMINFO;

1 0

[akhaldi] 61199: [APPWIZ][COMCTL32][UXTHEME] * Use explicit casts to pass __WINESRC__ strictness. CORE-7669
by akhaldi＠svn.reactos.org 02 Dec '13

02 Dec '13

Author: akhaldi Date: Mon Dec 2 22:40:06 2013 New Revision: 61199 URL: http://svn.reactos.org/svn/reactos?rev=61199&view=rev Log: [APPWIZ][COMCTL32][UXTHEME] * Use explicit casts to pass __WINESRC__ strictness. CORE-7669 Modified: trunk/reactos/dll/cpl/appwiz/createlink.c trunk/reactos/dll/win32/comctl32/commctrl.c trunk/reactos/dll/win32/uxtheme/nonclient.c Modified: trunk/reactos/dll/cpl/appwiz/createlink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/createlink.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/createlink.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/createlink.c [iso-8859-1] Mon Dec 2 22:40:06 2013 @@ -362,14 +362,14 @@ psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER; psp.hInstance = hApplet; psp.pfnDlgProc = WelcomeDlgProc; - psp.pszTemplate = MAKEINTRESOURCE(IDD_SHORTCUT_LOCATION); + psp.pszTemplate = MAKEINTRESOURCEW(IDD_SHORTCUT_LOCATION); psp.lParam = (LPARAM)pContext; ahpsp[nPages++] = CreatePropertySheetPage(&psp); /* Create the Finish page */ psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER; psp.pfnDlgProc = FinishDlgProc; - psp.pszTemplate = MAKEINTRESOURCE(IDD_SHORTCUT_FINISH); + psp.pszTemplate = MAKEINTRESOURCEW(IDD_SHORTCUT_FINISH); ahpsp[nPages++] = CreatePropertySheetPage(&psp); @@ -381,7 +381,7 @@ psh.nPages = nPages; psh.nStartPage = 0; psh.phpage = ahpsp; - psh.pszbmWatermark = MAKEINTRESOURCE(IDB_WATERMARK); + psh.pszbmWatermark = MAKEINTRESOURCEW(IDB_WATERMARK); /* Display the wizard */ PropertySheet(&psh); Modified: trunk/reactos/dll/win32/comctl32/commctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/commctr… ============================================================================== --- trunk/reactos/dll/win32/comctl32/commctrl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/commctrl.c [iso-8859-1] Mon Dec 2 22:40:06 2013 @@ -119,7 +119,7 @@ HANDLE hFile; BOOL bRet = FALSE; - hResInfo = FindResourceW(COMCTL32_hModule, L"WINE_MANIFEST", RT_MANIFEST); + hResInfo = FindResourceW(COMCTL32_hModule, L"WINE_MANIFEST", (LPWSTR)RT_MANIFEST); if (!hResInfo) return FALSE; Modified: trunk/reactos/dll/win32/uxtheme/nonclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/nonclien… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/nonclient.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/nonclient.c [iso-8859-1] Mon Dec 2 22:40:06 2013 @@ -87,7 +87,7 @@ hIcon = (HICON)GetClassLong(hwnd, GCL_HICON); if(!hIcon) - hIcon = LoadIcon(NULL, IDI_WINLOGO); + hIcon = LoadIconW(NULL, (LPCWSTR)IDI_WINLOGO); return hIcon; }

1 0

[akhaldi] 61198: [GDI32_WINETEST] * Don't define __WINESRC__ (just yet). * Don't define __ROS_LONG64__ twice.
by akhaldi＠svn.reactos.org 02 Dec '13

02 Dec '13

Author: akhaldi Date: Mon Dec 2 22:36:55 2013 New Revision: 61198 URL: http://svn.reactos.org/svn/reactos?rev=61198&view=rev Log: [GDI32_WINETEST] * Don't define __WINESRC__ (just yet). * Don't define __ROS_LONG64__ twice. Modified: trunk/rostests/winetests/gdi32/CMakeLists.txt Modified: trunk/rostests/winetests/gdi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/CMakeList… ============================================================================== --- trunk/rostests/winetests/gdi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/gdi32/CMakeLists.txt [iso-8859-1] Mon Dec 2 22:36:55 2013 @@ -1,7 +1,3 @@ - -add_definitions( - -D__ROS_LONG64__ - -D__WINESRC__) remove_definitions(-DWINVER=0x502 -D_WIN32_IE=0x600 -D_WIN32_WINNT=0x502)

1 0

[akhaldi] 61197: [PSDK] * Remove the no longer needed, __WINESRC__ based differentiation within DEVMODE.
by akhaldi＠svn.reactos.org 02 Dec '13

02 Dec '13

Author: akhaldi Date: Mon Dec 2 22:22:55 2013 New Revision: 61197 URL: http://svn.reactos.org/svn/reactos?rev=61197&view=rev Log: [PSDK] * Remove the no longer needed, __WINESRC__ based differentiation within DEVMODE. Modified: trunk/reactos/include/psdk/wingdi.h Modified: trunk/reactos/include/psdk/wingdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wingdi.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/wingdi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wingdi.h [iso-8859-1] Mon Dec 2 22:22:55 2013 @@ -1547,22 +1547,13 @@ short dmCopies; short dmDefaultSource; short dmPrintQuality; -#ifdef __WINESRC__ } DUMMYSTRUCTNAME1; -#else - } DUMMYSTRUCTNAME; -#endif struct { POINTL dmPosition; DWORD dmDisplayOrientation; DWORD dmDisplayFixedOutput; } DUMMYSTRUCTNAME2; -#ifdef __WINESRC__ } DUMMYUNIONNAME1; -#else - } DUMMYUNIONNAME; -#endif - short dmColor; short dmDuplex; short dmYResolution; @@ -1608,22 +1599,13 @@ short dmCopies; short dmDefaultSource; short dmPrintQuality; -#ifdef __WINESRC__ } DUMMYSTRUCTNAME1; -#else - } DUMMYSTRUCTNAME; -#endif struct { POINTL dmPosition; DWORD dmDisplayOrientation; DWORD dmDisplayFixedOutput; } DUMMYSTRUCTNAME2; -#ifdef __WINESRC__ } DUMMYUNIONNAME1; -#else - } DUMMYUNIONNAME; -#endif - short dmColor; short dmDuplex; short dmYResolution;

1 0

[akhaldi] 61196: [PSDK] * Add DUMMYUNIONNAME1 and DUMMYSTRUCTNAME1 to ntdef.h (winnt.h already has them).
by akhaldi＠svn.reactos.org 02 Dec '13

02 Dec '13

Author: akhaldi Date: Mon Dec 2 22:19:15 2013 New Revision: 61196 URL: http://svn.reactos.org/svn/reactos?rev=61196&view=rev Log: [PSDK] * Add DUMMYUNIONNAME1 and DUMMYSTRUCTNAME1 to ntdef.h (winnt.h already has them). Modified: trunk/reactos/include/psdk/ntdef.h Modified: trunk/reactos/include/psdk/ntdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntdef.h?rev=6… ============================================================================== --- trunk/reactos/include/psdk/ntdef.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntdef.h [iso-8859-1] Mon Dec 2 22:19:15 2013 @@ -116,6 +116,7 @@ #define _ANONYMOUS_UNION #define _UNION_NAME(x) x #define DUMMYUNIONNAME u +#define DUMMYUNIONNAME1 u1 #define DUMMYUNIONNAME2 u2 #define DUMMYUNIONNAME3 u3 #define DUMMYUNIONNAME4 u4 @@ -126,6 +127,7 @@ #else #define _UNION_NAME(x) #define DUMMYUNIONNAME +#define DUMMYUNIONNAME1 #define DUMMYUNIONNAME2 #define DUMMYUNIONNAME3 #define DUMMYUNIONNAME4 @@ -139,6 +141,7 @@ #define _ANONYMOUS_STRUCT #define _STRUCT_NAME(x) x #define DUMMYSTRUCTNAME s +#define DUMMYSTRUCTNAME1 s1 #define DUMMYSTRUCTNAME2 s2 #define DUMMYSTRUCTNAME3 s3 #define DUMMYSTRUCTNAME4 s4 @@ -146,6 +149,7 @@ #else #define _STRUCT_NAME(x) #define DUMMYSTRUCTNAME +#define DUMMYSTRUCTNAME1 #define DUMMYSTRUCTNAME2 #define DUMMYSTRUCTNAME3 #define DUMMYSTRUCTNAME4

1 0

[akhaldi] 61195: [PSDK] * Fix IMAGE_RESOURCE_DIRECTORY_ENTRY structure. [KERNEL32][VERSION] * Correct the use of IMAGE_RESOURCE_DIRECTORY_ENTRY. CORE-7667 #resolve
by akhaldi＠svn.reactos.org 02 Dec '13

02 Dec '13

Author: akhaldi Date: Mon Dec 2 10:56:38 2013 New Revision: 61195 URL: http://svn.reactos.org/svn/reactos?rev=61195&view=rev Log: [PSDK] * Fix IMAGE_RESOURCE_DIRECTORY_ENTRY structure. [KERNEL32][VERSION] * Correct the use of IMAGE_RESOURCE_DIRECTORY_ENTRY. CORE-7667 #resolve Modified: trunk/reactos/dll/win32/kernel32/wine/res.c trunk/reactos/dll/win32/version/resource.c trunk/reactos/include/psdk/winnt.h Modified: trunk/reactos/dll/win32/kernel32/wine/res.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/wine/re… ============================================================================== --- trunk/reactos/dll/win32/kernel32/wine/res.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/wine/res.c [iso-8859-1] Mon Dec 2 10:56:38 2013 @@ -983,7 +983,7 @@ Type = resource_dup_string( root, e1 ); - namedir = (const IMAGE_RESOURCE_DIRECTORY *)((const char *)root + e1->u2.s3.OffsetToDirectory); + namedir = (const IMAGE_RESOURCE_DIRECTORY *)((const char *)root + e1->u2.s2.OffsetToDirectory); for (j = 0; j < namedir->NumberOfNamedEntries + namedir->NumberOfIdEntries; j++) { LPWSTR Name; @@ -992,7 +992,7 @@ Name = resource_dup_string( root, e2 ); - langdir = (const IMAGE_RESOURCE_DIRECTORY *)((const char *)root + e2->u2.s3.OffsetToDirectory); + langdir = (const IMAGE_RESOURCE_DIRECTORY *)((const char *)root + e2->u2.s2.OffsetToDirectory); for (k = 0; k < langdir->NumberOfNamedEntries + langdir->NumberOfIdEntries; k++) { LANGID Lang; @@ -1252,8 +1252,8 @@ root->NumberOfIdEntries++; e1->u1.Id = LOWORD( types->id ); } - e1->u2.s3.OffsetToDirectory = si->names_ofs; - e1->u2.s3.DataIsDirectory = TRUE; + e1->u2.s2.OffsetToDirectory = si->names_ofs; + e1->u2.s2.DataIsDirectory = TRUE; si->types_ofs += sizeof (IMAGE_RESOURCE_DIRECTORY_ENTRY); namedir = (IMAGE_RESOURCE_DIRECTORY*) &base[si->names_ofs]; @@ -1288,8 +1288,8 @@ namedir->NumberOfIdEntries++; e2->u1.Id = LOWORD( names->id ); } - e2->u2.s3.OffsetToDirectory = si->langs_ofs; - e2->u2.s3.DataIsDirectory = TRUE; + e2->u2.s2.OffsetToDirectory = si->langs_ofs; + e2->u2.s2.DataIsDirectory = TRUE; si->names_ofs += sizeof (IMAGE_RESOURCE_DIRECTORY_ENTRY); langdir = (IMAGE_RESOURCE_DIRECTORY*) &base[si->langs_ofs]; Modified: trunk/reactos/dll/win32/version/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/version/resource… ============================================================================== --- trunk/reactos/dll/win32/version/resource.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/version/resource.c [iso-8859-1] Mon Dec 2 10:56:38 2013 @@ -84,7 +84,7 @@ { pos = (min + max) / 2; if (entry[pos].u1.Id == id) - return (const IMAGE_RESOURCE_DIRECTORY *)((const char *)root + entry[pos].u2.s3.OffsetToDirectory); + return (const IMAGE_RESOURCE_DIRECTORY *)((const char *)root + entry[pos].u2.s2.OffsetToDirectory); if (entry[pos].u1.Id > id) max = pos - 1; else min = pos + 1; } @@ -104,7 +104,7 @@ const IMAGE_RESOURCE_DIRECTORY_ENTRY *entry; entry = (const IMAGE_RESOURCE_DIRECTORY_ENTRY *)(dir + 1); - return (const IMAGE_RESOURCE_DIRECTORY *)((const char *)root + entry->u2.s3.OffsetToDirectory); + return (const IMAGE_RESOURCE_DIRECTORY *)((const char *)root + entry->u2.s2.OffsetToDirectory); } Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=6… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Mon Dec 2 10:56:38 2013 @@ -4661,7 +4661,7 @@ _ANONYMOUS_STRUCT struct { DWORD OffsetToDirectory:31; DWORD DataIsDirectory:1; - } DUMMYSTRUCTNAME3; + } DUMMYSTRUCTNAME2; } DUMMYUNIONNAME2; } IMAGE_RESOURCE_DIRECTORY_ENTRY, *PIMAGE_RESOURCE_DIRECTORY_ENTRY;

1 0

[aandrejevic] 61194: [NTVDM] Compile NTVDM even on non-i386 architectures.
by aandrejevic＠svn.reactos.org 02 Dec '13

02 Dec '13

Author: aandrejevic Date: Mon Dec 2 01:02:17 2013 New Revision: 61194 URL: http://svn.reactos.org/svn/reactos?rev=61194&view=rev Log: [NTVDM] Compile NTVDM even on non-i386 architectures. Modified: branches/ntvdm/subsystems/CMakeLists.txt Modified: branches/ntvdm/subsystems/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/CMakeLists.txt… ============================================================================== --- branches/ntvdm/subsystems/CMakeLists.txt [iso-8859-1] (original) +++ branches/ntvdm/subsystems/CMakeLists.txt [iso-8859-1] Mon Dec 2 01:02:17 2013 @@ -1,6 +1,4 @@ -if(ARCH STREQUAL "i386") - add_subdirectory(ntvdm) -endif() +add_subdirectory(ntvdm) add_subdirectory(win) add_subdirectory(win32)

1 0

[dreimer] 61193: [SHELLEXT] Fix/Update german RC files.
by dreimer＠svn.reactos.org 01 Dec '13

01 Dec '13

Author: dreimer Date: Sun Dec 1 22:54:08 2013 New Revision: 61193 URL: http://svn.reactos.org/svn/reactos?rev=61193&view=rev Log: [SHELLEXT] Fix/Update german RC files. Modified: trunk/reactos/dll/shellext/deskadp/lang/de-DE.rc trunk/reactos/dll/shellext/deskmon/lang/de-DE.rc trunk/reactos/dll/shellext/slayer/lang/de-DE.rc Modified: trunk/reactos/dll/shellext/deskadp/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskadp/lang/… ============================================================================== --- trunk/reactos/dll/shellext/deskadp/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/deskadp/lang/de-DE.rc [iso-8859-1] Sun Dec 1 22:54:08 2013 @@ -10,15 +10,15 @@ PUSHBUTTON "&Einstellungen", IDC_ADAPTERPROPERTIES, 177, 33, 59, 14 GROUPBOX "Adapter-Informationen", -1, 7, 56, 237, 75 LTEXT "Chiptyp:", -1, 13, 68, 58, 8 - LTEXT "", IDC_CHIPTYPE, 71, 68, 160, 8, SS_NOPREFIX + LTEXT "", IDC_CHIPTYPE, 81, 68, 160, 8, SS_NOPREFIX LTEXT "DAC Typ:", -1, 13, 80, 58, 8 - LTEXT "", IDC_DACTYPE, 71, 80, 160, 8, SS_NOPREFIX + LTEXT "", IDC_DACTYPE, 81, 80, 160, 8, SS_NOPREFIX LTEXT "Speichergröße:", -1, 13, 92, 58, 8 - LTEXT "", IDC_MEMORYSIZE, 71, 92, 160, 8, SS_NOPREFIX + LTEXT "", IDC_MEMORYSIZE, 81, 92, 160, 8, SS_NOPREFIX LTEXT "Zeichenfolge:", -1, 13, 104, 58, 8 - LTEXT "", IDC_ADAPTERSTRING, 71, 104, 160, 8, SS_NOPREFIX - LTEXT "BIOS-Informationen:", -1, 13, 116, 58, 8 - LTEXT "", IDC_BIOSINFORMATION, 71, 116, 160, 8, SS_NOPREFIX + LTEXT "", IDC_ADAPTERSTRING, 81, 104, 160, 8, SS_NOPREFIX + LTEXT "BIOS-Informationen:", -1, 13, 116, 65, 8 + LTEXT "", IDC_BIOSINFORMATION, 81, 116, 160, 8, SS_NOPREFIX PUSHBUTTON "Alle Modi auf&listen...", IDC_LISTALLMODES, 7, 139, 75, 14 END Modified: trunk/reactos/dll/shellext/deskmon/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskmon/lang/… ============================================================================== --- trunk/reactos/dll/shellext/deskmon/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/deskmon/lang/de-DE.rc [iso-8859-1] Sun Dec 1 22:54:08 2013 @@ -12,7 +12,7 @@ GROUPBOX "Monitoreinstellungen", IDS_MONITORSETTINGSGROUP, 7, 58, 237, 63 LTEXT "Bild&schirmwiederholrate:", IDS_REFRESHRATELABEL, 13, 73, 225, 8 COMBOBOX IDC_REFRESHRATE, 13, 85, 225, 200, WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT - AUTOCHECKBOX "&Versteckt Modi, die der Monitor nicht anzeigen kann.", IDC_PRUNINGCHECK, 13, 106, 225, 10 + AUTOCHECKBOX "Modi &verstecken, die der Monitor nicht anzeigen kann", IDC_PRUNINGCHECK, 13, 106, 225, 10 END STRINGTABLE Modified: trunk/reactos/dll/shellext/slayer/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/slayer/lang/d… ============================================================================== --- trunk/reactos/dll/shellext/slayer/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/slayer/lang/de-DE.rc [iso-8859-1] Sun Dec 1 22:54:08 2013 @@ -33,5 +33,5 @@ STRINGTABLE BEGIN IDS_SLAYER "Slayer" - IDS_DESCRIPTION "Application Compatibility Layer Shell Extension" + IDS_DESCRIPTION "Anwendungs-Kompatibilitätsschicht Shell Erweiterung" END

1 0

[dreimer] 61192: [CPL] Translate wined3dcfg.rc Update german translations of hdwwiz, inetcpl, input, joy, sysdm and timedate
by dreimer＠svn.reactos.org 01 Dec '13

01 Dec '13

Author: dreimer Date: Sun Dec 1 22:41:46 2013 New Revision: 61192 URL: http://svn.reactos.org/svn/reactos?rev=61192&view=rev Log: [CPL] Translate wined3dcfg.rc Update german translations of hdwwiz, inetcpl, input, joy, sysdm and timedate Added: trunk/reactos/dll/cpl/wined3dcfg/lang/de-DE.rc (with props) Modified: trunk/reactos/dll/cpl/hdwwiz/lang/de-DE.rc trunk/reactos/dll/cpl/inetcpl/lang/de-DE.rc trunk/reactos/dll/cpl/input/lang/de-DE.rc trunk/reactos/dll/cpl/joy/lang/de-DE.rc trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc trunk/reactos/dll/cpl/timedate/lang/de-DE.rc trunk/reactos/dll/cpl/wined3dcfg/wined3dcfg.rc Modified: trunk/reactos/dll/cpl/hdwwiz/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/de-DE.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/de-DE.rc [iso-8859-1] Sun Dec 1 22:41:46 2013 @@ -105,7 +105,7 @@ BEGIN LTEXT "Hardwareassistent wird vervollständigt", IDC_FINISHTITLE, 114, 8, 203, 24 LTEXT "Der Assistent fand folgende Hardware an ihrem Computer:", -1, 114, 32, 193, 19 - LTEXT "Klicken Sie ""Beenden"", um den Assistenten zu schließen.", -1, 114, 166, 132, 8 + LTEXT "Klicken Sie ""Beenden"", um den Assistenten zu schließen.", -1, 114, 166, 192, 8 CONTROL "", IDC_FOUNDHARDWARELIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS, 114, 56, 193, 78 END Modified: trunk/reactos/dll/cpl/inetcpl/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/lang/de-DE… ============================================================================== --- trunk/reactos/dll/cpl/inetcpl/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/inetcpl/lang/de-DE.rc [iso-8859-1] Sun Dec 1 22:41:46 2013 @@ -104,13 +104,13 @@ STRINGTABLE BEGIN - IDS_CPL_NAME "Internet Settings" - IDS_CPL_INFO "Configure Wine Internet Browser and related settings" - IDS_SEC_SETTINGS "Security settings for zone: " - IDS_SEC_LEVEL0 "Custom" - IDS_SEC_LEVEL1 "Very Low" - IDS_SEC_LEVEL2 "Low" - IDS_SEC_LEVEL3 "Medium" - IDS_SEC_LEVEL4 "Increased" - IDS_SEC_LEVEL5 "High" + IDS_CPL_NAME "Internetoptionen" + IDS_CPL_INFO "Konfiguration des Wine Internet Browsers und dessen Einstellungen" + IDS_SEC_SETTINGS "Sicherheitseinstellungen fÃ¼r Zone: " + IDS_SEC_LEVEL0 "Benutzerdefiniert" + IDS_SEC_LEVEL1 "Sehr niedrig" + IDS_SEC_LEVEL2 "Niedrig" + IDS_SEC_LEVEL3 "Mittel" + IDS_SEC_LEVEL4 "Mittel bis hoch" + IDS_SEC_LEVEL5 "Hoch" END Modified: trunk/reactos/dll/cpl/input/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/de-DE.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/de-DE.rc [iso-8859-1] Sun Dec 1 22:41:46 2013 @@ -20,7 +20,7 @@ CAPTION "Erweiterte Einstellungen" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "System Configuration", -1, 7, 7, 240, 70 + GROUPBOX "System Konfiguration", -1, 7, 7, 240, 70 AUTOCHECKBOX "&Erweiterte &Textdienste deaktivieren", IDC_TURNOFFTEXTSVCS_CB, 14, 20, 130, 12 LTEXT "AuswÃ¤hlen, um die erweiterte SprachunterstÃ¼tzung in allen Programmen zu deaktivieren.\nNicht empfohlen fÃ¼r ostasiatische Benutzer, da die Sprachleiste hierdurch geschlossen wird.", -1, 14, 40, 230, 35 END Modified: trunk/reactos/dll/cpl/joy/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/joy/lang/de-DE.rc?… ============================================================================== --- trunk/reactos/dll/cpl/joy/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/joy/lang/de-DE.rc [iso-8859-1] Sun Dec 1 22:41:46 2013 @@ -31,7 +31,7 @@ AUTOCHECKBOX "&Ruder und Pedale aktivieren", IDC_ENABLE_RUDDERS_CHECKBOX, 7, 114, 105, 10, WS_GROUP LTEXT "&Gameport:", -1, 7, 134, 38, 8, NOT WS_VISIBLE COMBOBOX IDC_GAME_PORT_COMBO, 7, 147, 140, 50, CBS_DROPDOWNLIST | CBS_SORT | NOT WS_VISIBLE | WS_VSCROLL - PUSHBUTTON "&Benutzerdefiniert...", IDC_CUSTOM_BUTTON, 195, 147, 63, 14 + PUSHBUTTON "&Benutzerdefiniert...", IDC_CUSTOM_BUTTON, 188, 147, 70, 14 CONTROL "", -25525, "STATIC", SS_ETCHEDHORZ, 7, 170, 251, 1 DEFPUSHBUTTON "OK", IDOK, 155, 179, 50, 14 PUSHBUTTON "Abbrechen", IDCANCEL, 208, 179, 50, 14 Modified: trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/de-DE.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc [iso-8859-1] Sun Dec 1 22:41:46 2013 @@ -98,8 +98,8 @@ GROUPBOX "Hardwareprofil-Auswahl", IDC_STATIC, 7, 130, 240, 75 LTEXT "Wenn ReactOS startet:", IDC_STATIC, 14, 142, 210, 8 AUTORADIOBUTTON "&Warten, bis ein Hardwareprofil gewÃ¤hlt wird", IDC_HRDPROFWAIT, 14, 158, 170, 8, WS_GROUP - AUTORADIOBUTTON "&Das erste Profil aus der Liste auswÃ¤hlen, wenn ich kein Profil innerhalb von", IDC_HRDPROFSELECT, 14, 173, 200, 8 - LTEXT "Sekunden gewÃ¤hlt habe", IDC_STATIC, 65, 187, 80, 8 + AUTORADIOBUTTON "&Erstes Profil aus der Liste auswÃ¤hlen, wenn kein Profil innerhalb von", IDC_HRDPROFSELECT, 14, 173, 230, 8 + LTEXT "Sekunden gewÃ¤hlt wurde", IDC_STATIC, 65, 187, 90, 8 EDITTEXT IDC_HRDPROFEDIT, 25, 185, 35, 12 CONTROL "", IDC_HRDPROFUPDWN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 25, 185, 7, 10 @@ -117,7 +117,7 @@ LTEXT "Nach:", IDC_STATIC, 5, 30, 20, 8 EDITTEXT IDC_COPYPROFILETO, 30, 30, 160, 12 DEFPUSHBUTTON "OK", IDOK, 199, 9, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, 199, 30, 50, 14 + PUSHBUTTON "Abbrechen", IDCANCEL, 199, 30, 50, 14 END IDD_RENAMEPROFILE DIALOGEX 12, 26, 256, 52 Modified: trunk/reactos/dll/cpl/timedate/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/lang/de-D… ============================================================================== --- trunk/reactos/dll/cpl/timedate/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/timedate/lang/de-DE.rc [iso-8859-1] Sun Dec 1 22:41:46 2013 @@ -2,7 +2,7 @@ IDD_DATETIMEPAGE DIALOGEX 0, 0, 252, 146 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Datum && Uhrzeit" +CAPTION "Datum & Uhrzeit" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "&Datum", -1, 4, 2, 122, 125 Added: trunk/reactos/dll/cpl/wined3dcfg/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/wined3dcfg/lang/de… ============================================================================== --- trunk/reactos/dll/cpl/wined3dcfg/lang/de-DE.rc (added) +++ trunk/reactos/dll/cpl/wined3dcfg/lang/de-DE.rc [iso-8859-1] Sun Dec 1 22:41:46 2013 @@ -0,0 +1,26 @@ +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +IDD_PROPPAGEGENERAL DIALOGEX 0, 0, 246, 228 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Allgemein" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_CPLICON, IDI_CPLICON, 8, 5, 21, 20 + GROUPBOX "Shader", -1, 5, 35, 230, 65 + AUTOCHECKBOX "&GLSL aktivieren", IDC_GLSL, 15, 50, 150, 10 + AUTOCHECKBOX "&Pixel Shader aktivieren", IDC_PIXELSHADERS, 15, 65, 150, 10 + AUTOCHECKBOX "&Vertex Shader aktivieren", IDC_VERTEXSHADERS, 15, 80, 150, 10 + GROUPBOX "Rendering", -1, 5, 110, 230, 85 + AUTOCHECKBOX "&Multisampling erzwingen", IDC_MULTISAMPLING, 15, 125, 150, 10 + AUTOCHECKBOX "&Strikte Zeichenreihenfolge erzwingen", IDC_STRICTDRAWORDERING, 15, 140, 150, 10 + LTEXT "Offscreen Rendering:", -1, 15, 157, 80, 10 + COMBOBOX IDC_OFFSCREEN, 95, 155, 90, 50, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "Render Ziel festlegen:", -1, 15, 175, 72, 10, SS_LEFT + COMBOBOX IDC_LOCKING, 95, 173, 90, 50, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST +END + +STRINGTABLE +BEGIN + IDS_CPLNAME "WineD3D" + IDS_CPLDESCRIPTION "Konfiguriert WineD3D Runtime Einstellungen." +END Propchange: trunk/reactos/dll/cpl/wined3dcfg/lang/de-DE.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/cpl/wined3dcfg/wined3dcfg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/wined3dcfg/wined3d… ============================================================================== --- trunk/reactos/dll/cpl/wined3dcfg/wined3dcfg.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/wined3dcfg/wined3dcfg.rc [iso-8859-1] Sun Dec 1 22:41:46 2013 @@ -21,6 +21,9 @@ #ifdef LANGUAGE_CS_CZ #include "lang/cs-CZ.rc" #endif +#ifdef LANGUAGE_DE_DE + #include "lang/de-DE.rc" +#endif #ifdef LANGUAGE_EN_US #include "lang/en-US.rc" #endif

1 0

[tfaber] 61191: [DEVMGR] - Correctly display memory ranges CORE-7666 #resolve
by tfaber＠svn.reactos.org 01 Dec '13

01 Dec '13

Author: tfaber Date: Sun Dec 1 20:13:46 2013 New Revision: 61191 URL: http://svn.reactos.org/svn/reactos?rev=61191&view=rev Log: [DEVMGR] - Correctly display memory ranges CORE-7666 #resolve Modified: trunk/reactos/dll/win32/devmgr/hwresource.c Modified: trunk/reactos/dll/win32/devmgr/hwresource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/hwresourc… ============================================================================== --- trunk/reactos/dll/win32/devmgr/hwresource.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/hwresource.c [iso-8859-1] Sun Dec 1 20:13:46 2013 @@ -298,7 +298,7 @@ { if (LoadString(hDllInstance, IDS_RESOURCE_MEMORY_RANGE, szBuffer, sizeof(szBuffer) / sizeof(szBuffer[0]))) { - wsprintf(szDetail, L"%08lx - %08lx", Descriptor->u.Memory.Start, Descriptor->u.Memory.Start.LowPart + Descriptor->u.Memory.Length - 1); + wsprintf(szDetail, L"%08I64x - %08I64x", Descriptor->u.Memory.Start.QuadPart, Descriptor->u.Memory.Start.QuadPart + Descriptor->u.Memory.Length - 1); InsertListItem(hWndDevList, ItemCount, szBuffer, szDetail); ItemCount++; }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs