Ros-diffs January 2014

ros-diffs@reactos.org

14 participants
426 discussions

[tfaber] 61645: [CMLIB] - Fix implicit function declaration

by tfaber＠svn.reactos.org

Author: tfaber Date: Thu Jan 16 11:00:29 2014 New Revision: 61645 URL: http://svn.reactos.org/svn/reactos?rev=61645&view=rev Log: [CMLIB] - Fix implicit function declaration Modified: trunk/reactos/lib/cmlib/cmlib.h Modified: trunk/reactos/lib/cmlib/cmlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmlib.h?rev=6164… ============================================================================== --- trunk/reactos/lib/cmlib/cmlib.h [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/cmlib.h [iso-8859-1] Thu Jan 16 11:00:29 2014 @@ -47,6 +47,10 @@ VOID NTAPI KeQuerySystemTime( OUT PLARGE_INTEGER CurrentTime); + + WCHAR NTAPI + RtlUpcaseUnicodeChar( + IN WCHAR Source); VOID NTAPI RtlInitializeBitMap(

10 years, 8 months

[tfaber] 61644: [SNDREC32:FORMATTING] - Fix spacing

by tfaber＠svn.reactos.org

Author: tfaber Date: Thu Jan 16 10:47:14 2014 New Revision: 61644 URL: http://svn.reactos.org/svn/reactos?rev=61644&view=rev Log: [SNDREC32:FORMATTING] - Fix spacing Modified: trunk/reactos/base/applications/sndrec32/sndrec32.cpp Modified: trunk/reactos/base/applications/sndrec32/sndrec32.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/sndrec32.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/sndrec32.cpp [iso-8859-1] Thu Jan 16 10:47:14 2014 @@ -113,7 +113,7 @@ MSG msg; HACCEL hAccelTable; - + s_info.cbSize = sizeof( NONCLIENTMETRICS ); InitCommonControls(); @@ -233,7 +233,7 @@ return (int)msg.wParam; } -ATOM +ATOM MyRegisterClass(HINSTANCE hInstance) { WNDCLASSEX wcex; @@ -255,7 +255,7 @@ return RegisterClassEx(&wcex); } -BOOL +BOOL InitInstance(HINSTANCE hInstance, int nCmdShow) { HWND hWnd; @@ -286,7 +286,7 @@ return TRUE; } -ATOM +ATOM MyRegisterClass_wave(HINSTANCE hInstance) { WNDCLASSEX wcex; @@ -308,7 +308,7 @@ return RegisterClassEx(&wcex); } -BOOL +BOOL InitInstance_wave(HWND f, HINSTANCE hInstance, int nCmdShow) @@ -343,7 +343,7 @@ } LRESULT -CALLBACK +CALLBACK WndProc_wave(HWND hWnd, UINT message, WPARAM wParam, @@ -426,7 +426,7 @@ } LRESULT -CALLBACK +CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, @@ -615,24 +615,24 @@ ofn.lpstrFilter = TEXT("Audio Files (*.wav)\0*.wav\0All Files (*.*)\0*.*\0"); ofn.lpstrFile = file_path; ofn.nMaxFile = MAX_PATH; - + ofn.lpstrDefExt = TEXT("wav"); - - if (GetSaveFileName (&ofn)) + + if (GetSaveFileName (&ofn)) { write_wav(file_path); EnableMenuItem(GetMenu(hWnd), ID_FILE_SAVE, MF_ENABLED); } - break; - - - case ID_EDIT_AUDIOPROPS: - ShellExecute( NULL, NULL, _T("rundll32.exe"), _T("shell32.dll,Control_RunDLL mmsys.cpl,ShowAudioPropertySheet"), NULL, SW_SHOWNORMAL ); - break; - - case ID_FILE_EXIT: - DestroyWindow( hWnd ); - break; + break; + + + case ID_EDIT_AUDIOPROPS: + ShellExecute(NULL, NULL, _T("rundll32.exe"), _T("shell32.dll,Control_RunDLL mmsys.cpl,ShowAudioPropertySheet"), NULL, SW_SHOWNORMAL); + break; + + case ID_FILE_EXIT: + DestroyWindow(hWnd); + break; /* Sndrec32 buttons routines */ case BUTSTART_ID: @@ -750,7 +750,7 @@ case WM_TIMER: switch (wParam) { - case 1: + case 1: if (stopped_flag) { KillTimer(hWnd, 1); @@ -841,7 +841,7 @@ ExtTextOut(hdc, STRBUF_X, STRBUF_Y, - ETO_OPAQUE, + ETO_OPAQUE, 0, str_tmp, _tcslen(str_tmp), @@ -1115,7 +1115,7 @@ TEXT("File Error, WriteFile() failed."), TEXT("ERROR"), MB_OK | MB_ICONERROR); - + CloseHandle(file); return FALSE; } @@ -1127,7 +1127,7 @@ TEXT("File Error, WriteFile() failed."), TEXT("ERROR"), MB_OK | MB_ICONERROR); - + CloseHandle(file); return FALSE; }

10 years, 8 months

[tfaber] 61643: [CDMAKE] - When deleting a directory entry, also remove it from the hash table. This prevents use after free in the case of a hash collision CORE-7774 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Thu Jan 16 10:29:51 2014 New Revision: 61643 URL: http://svn.reactos.org/svn/reactos?rev=61643&view=rev Log: [CDMAKE] - When deleting a directory entry, also remove it from the hash table. This prevents use after free in the case of a hash collision CORE-7774 #resolve Modified: trunk/reactos/tools/cdmake/dirhash.c Modified: trunk/reactos/tools/cdmake/dirhash.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cdmake/dirhash.c?rev… ============================================================================== --- trunk/reactos/tools/cdmake/dirhash.c [iso-8859-1] (original) +++ trunk/reactos/tools/cdmake/dirhash.c [iso-8859-1] Thu Jan 16 10:29:51 2014 @@ -10,7 +10,7 @@ { unsigned int val = 5381; int i = 0; - + for (i = 0; name[i]; i++) { val = (33 * val) + name[i]; @@ -63,6 +63,19 @@ while (de && strcmp(de->normalized_name, norm)) de = de->next; return de; +} + +static void +delete_entry_by_normname(struct target_dir_hash *dh, const char *norm) +{ + unsigned int hashcode; + struct target_dir_entry **ent; + hashcode = djb_hash(norm); + ent = &dh->buckets[hashcode % NUM_DIR_HASH_BUCKETS]; + while (*ent && strcmp((*ent)->normalized_name, norm)) + ent = &(*ent)->next; + if (*ent) + *ent = (*ent)->next; } void normalize_dirname(char *filename) @@ -147,9 +160,9 @@ } struct target_dir_entry * -dir_hash_next_dir(struct target_dir_hash *dh, struct target_dir_traversal *t) -{ - if (t->i == -1) +dir_hash_next_dir(struct target_dir_hash *dh, struct target_dir_traversal *t) +{ + if (t->i == -1) return NULL; if (!t->it) { @@ -177,14 +190,16 @@ } } -void dir_hash_destroy_dir(struct target_dir_entry *de) +static void +dir_hash_destroy_dir(struct target_dir_hash *dh, struct target_dir_entry *de) { struct target_file *tf; struct target_dir_entry *te; + unsigned int hashcode; while ((te = de->child)) { de->child = te->next; - dir_hash_destroy_dir(te); + dir_hash_destroy_dir(dh, te); free(te); } while ((tf = de->head)) @@ -194,11 +209,12 @@ free(tf->target_name); free(tf); } + delete_entry_by_normname(dh, de->normalized_name); free(de->normalized_name); free(de->case_name); } void dir_hash_destroy(struct target_dir_hash *dh) { - dir_hash_destroy_dir(&dh->root); -} + dir_hash_destroy_dir(dh, &dh->root); +}

10 years, 8 months

[dreimer] 61642: [SNDREC32] add missing menus and implement Edit->Audio Properties by Robert Naumann CORE-7442 #resolve

by dreimer＠svn.reactos.org

Author: dreimer Date: Thu Jan 16 00:56:59 2014 New Revision: 61642 URL: http://svn.reactos.org/svn/reactos?rev=61642&view=rev Log: [SNDREC32] add missing menus and implement Edit->Audio Properties by Robert Naumann CORE-7442 #resolve Modified: trunk/reactos/base/applications/sndrec32/CMakeLists.txt trunk/reactos/base/applications/sndrec32/lang/cs-CZ.rc trunk/reactos/base/applications/sndrec32/lang/de-DE.rc trunk/reactos/base/applications/sndrec32/lang/en-US.rc trunk/reactos/base/applications/sndrec32/lang/es-ES.rc trunk/reactos/base/applications/sndrec32/lang/fr-FR.rc trunk/reactos/base/applications/sndrec32/lang/he-IL.rc trunk/reactos/base/applications/sndrec32/lang/it-IT.rc trunk/reactos/base/applications/sndrec32/lang/ja-JP.rc trunk/reactos/base/applications/sndrec32/lang/pl-PL.rc trunk/reactos/base/applications/sndrec32/lang/ro-RO.rc trunk/reactos/base/applications/sndrec32/lang/sk-SK.rc trunk/reactos/base/applications/sndrec32/lang/sq-AL.rc trunk/reactos/base/applications/sndrec32/lang/sv-SE.rc trunk/reactos/base/applications/sndrec32/lang/tr-TR.rc trunk/reactos/base/applications/sndrec32/lang/uk-UA.rc trunk/reactos/base/applications/sndrec32/lang/zh-CN.rc trunk/reactos/base/applications/sndrec32/lang/zh-TW.rc trunk/reactos/base/applications/sndrec32/resource.h trunk/reactos/base/applications/sndrec32/sndrec32.cpp Modified: trunk/reactos/base/applications/sndrec32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/CMakeLists.txt [iso-8859-1] Thu Jan 16 00:56:59 2014 @@ -13,5 +13,5 @@ rsrc.rc) set_module_type(sndrec32 win32gui UNICODE) -add_importlibs(sndrec32 winmm user32 msacm32 comctl32 comdlg32 gdi32 msvcrt kernel32) +add_importlibs(sndrec32 winmm user32 msacm32 comctl32 comdlg32 gdi32 msvcrt kernel32 shell32) add_cd_file(TARGET sndrec32 DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/sndrec32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/lang/cs-CZ.rc [iso-8859-1] Thu Jan 16 00:56:59 2014 @@ -18,7 +18,7 @@ BEGIN ICON IDI_SNDREC32, -1, 19, 14, 21, 20 LTEXT "ReactOS ZÃ¡znam zvuku, verze 1.0", IDC_STATIC, 56, 16, 114, 8, SS_NOPREFIX - LTEXT "Copyright (C) 2009", IDC_STATIC, 55, 25, 114, 8 + LTEXT "Copyright (C) 2009", IDC_STATIC, 56, 25, 114, 8 DEFPUSHBUTTON "OK", IDOK, 139, 54, 50, 14, WS_GROUP END @@ -26,18 +26,43 @@ BEGIN POPUP "Soubor" BEGIN - MENUITEM "NovÃ½", ID_NEW + MENUITEM "NovÃ½", ID_FILE_NEW MENUITEM "OtevÅÃt...", ID_FILE_OPEN MENUITEM "UloÅ¾it", ID_FILE_SAVE, GRAYED MENUITEM "UloÅ¾it jako...", ID_FILE_SAVEAS, GRAYED + MENUITEM "Restore...", ID_FILE_RESTORE, GRAYED + MENUITEM "Properties", ID_FILE_PROPERTIES MENUITEM SEPARATOR - MENUITEM "Konec", ID_EXIT + MENUITEM "Konec", ID_FILE_EXIT END - MENUITEM "todo1", 0 - MENUITEM "todo2", 0 - POPUP "?" + POPUP "&Edit" BEGIN - MENUITEM "O programu...", ID__ABOUT + MENUITEM "&Copy", ID_EDIT_COPY + MENUITEM "&Paste Insert", ID_EDIT_PASTE, GRAYED + MENUITEM "Paste Mi&x", ID_EDIT_PASTEMIX, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Insert File...", ID_EDIT_INSERTFILE + MENUITEM "&Mix with File...", ID_EDIT_MIXFILE + MENUITEM SEPARATOR + MENUITEM "Delete &Before Current Position",ID_EDIT_DELETEBEFORE, GRAYED + MENUITEM "Delete &After Current Position",ID_EDIT_DELETEAFTER, GRAYED + MENUITEM SEPARATOR + MENUITEM "A&udio Properties", ID_EDIT_AUDIOPROPS + END + POPUP "Effect&s" + BEGIN + MENUITEM "&Increase Volume (by 25%)", ID_EFFECTS_INCVOL + MENUITEM "&Decrease Volume", ID_EFFECTS_DECVOL + MENUITEM SEPARATOR + MENUITEM "&Increase Speed (by 100%)", ID_EFFECTS_INCSPD + MENUITEM "&Decrease Speed", ID_EFFECTS_DECSPD + MENUITEM SEPARATOR + MENUITEM "&Add Echo", ID_EFFECTS_ECHO + MENUITEM "&Reverse", ID_EFFECTS_REVERSE + END + POPUP "&?" + BEGIN + MENUITEM "O programu...", ID_ABOUT END END Modified: trunk/reactos/base/applications/sndrec32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/lang/de-DE.rc [iso-8859-1] Thu Jan 16 00:56:59 2014 @@ -12,27 +12,52 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN ICON IDI_SNDREC32, -1, 19, 14, 21, 20 - LTEXT "ReactOS Audiorecorder, Version 1.0", IDC_STATIC, 16, 16, 134, 8, SS_NOPREFIX - LTEXT "Copyright (C) 2009", IDC_STATIC, 16, 25, 134, 8 + LTEXT "ReactOS Audiorecorder, Version 1.0", IDC_STATIC, 56, 16, 134, 8, SS_NOPREFIX + LTEXT "Copyright (C) 2009", IDC_STATIC, 56, 25, 134, 8 DEFPUSHBUTTON "OK", IDOK, 139, 54, 50, 14, WS_GROUP END IDR_MENU1 MENU BEGIN - POPUP "Datei" + POPUP "&Datei" BEGIN - MENUITEM "Neu", ID_NEW - MENUITEM "Ãffnen...", ID_FILE_OPEN - MENUITEM "Speichern", ID_FILE_SAVE, GRAYED - MENUITEM "Speichern unter...", ID_FILE_SAVEAS, GRAYED + MENUITEM "Neu", ID_FILE_NEW + MENUITEM "Ã&ffnen...", ID_FILE_OPEN + MENUITEM "&Speichern", ID_FILE_SAVE, GRAYED + MENUITEM "Speichern &unter...", ID_FILE_SAVEAS, GRAYED + MENUITEM "&Wiederherstellen...", ID_FILE_RESTORE, GRAYED + MENUITEM "&Eigenschaften", ID_FILE_PROPERTIES MENUITEM SEPARATOR - MENUITEM "Beenden", ID_EXIT + MENUITEM "&Beenden", ID_FILE_EXIT END - MENUITEM "todo1", 0 - MENUITEM "todo2", 0 - POPUP "?" + POPUP "&Bearbeiten" BEGIN - MENUITEM "Ãber...", ID__ABOUT + MENUITEM "&Kopieren", ID_EDIT_COPY + MENUITEM "&EinfÃ¼gen", ID_EDIT_PASTE, GRAYED + MENUITEM "&Mix EinfÃ¼gen", ID_EDIT_PASTEMIX, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Datei einfÃ¼gen...", ID_EDIT_INSERTFILE + MENUITEM "D&atei einmischen...", ID_EDIT_MIXFILE + MENUITEM SEPARATOR + MENUITEM "Vor aktueller Position &lÃ¶schen",ID_EDIT_DELETEBEFORE, GRAYED + MENUITEM "Nach aktueller Position lÃ¶&schen",ID_EDIT_DELETEAFTER, GRAYED + MENUITEM SEPARATOR + MENUITEM "A&udioeigenschaften", ID_EDIT_AUDIOPROPS + END + POPUP "&Effekte" + BEGIN + MENUITEM "LautstÃ¤rke &erhÃ¶hen (um 25%)",ID_EFFECTS_INCVOL + MENUITEM "LautstÃ¤rke &verringern", ID_EFFECTS_DECVOL + MENUITEM SEPARATOR + MENUITEM "Geschwindigkeit er&hÃ¶hen (um 100%)",ID_EFFECTS_INCSPD + MENUITEM "Geschwindigkeit ver&ringern", ID_EFFECTS_DECSPD + MENUITEM SEPARATOR + MENUITEM "E&cho hinzufÃ¼gen", ID_EFFECTS_ECHO + MENUITEM "&Umkehren", ID_EFFECTS_REVERSE + END + POPUP "&?" + BEGIN + MENUITEM "Inf&o...", ID_ABOUT END END Modified: trunk/reactos/base/applications/sndrec32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/lang/en-US.rc [iso-8859-1] Thu Jan 16 00:56:59 2014 @@ -13,7 +13,7 @@ BEGIN ICON IDI_SNDREC32, -1, 19, 14, 21, 20 LTEXT "ReactOS Sound Recorder, version 1.0", IDC_STATIC, 56, 16, 114, 8, SS_NOPREFIX - LTEXT "Copyright (C) 2009", IDC_STATIC, 55, 25, 114, 8 + LTEXT "Copyright (C) 2009", IDC_STATIC, 56, 25, 114, 8 DEFPUSHBUTTON "OK", IDOK, 139, 54, 50, 14, WS_GROUP END @@ -21,18 +21,43 @@ BEGIN POPUP "File" BEGIN - MENUITEM "New", ID_NEW + MENUITEM "New", ID_FILE_NEW MENUITEM "Open...", ID_FILE_OPEN MENUITEM "Save", ID_FILE_SAVE, GRAYED MENUITEM "Save As...", ID_FILE_SAVEAS, GRAYED + MENUITEM "Restore...", ID_FILE_RESTORE, GRAYED + MENUITEM "Properties", ID_FILE_PROPERTIES MENUITEM SEPARATOR - MENUITEM "Exit", ID_EXIT + MENUITEM "Exit", ID_FILE_EXIT END - MENUITEM "todo1", 0 - MENUITEM "todo2", 0 - POPUP "?" + POPUP "&Edit" BEGIN - MENUITEM "About...", ID__ABOUT + MENUITEM "&Copy", ID_EDIT_COPY + MENUITEM "&Paste Insert", ID_EDIT_PASTE, GRAYED + MENUITEM "Paste Mi&x", ID_EDIT_PASTEMIX, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Insert File...", ID_EDIT_INSERTFILE + MENUITEM "&Mix with File...", ID_EDIT_MIXFILE + MENUITEM SEPARATOR + MENUITEM "Delete &Before Current Position", ID_EDIT_DELETEBEFORE, GRAYED + MENUITEM "Delete &After Current Position", ID_EDIT_DELETEAFTER, GRAYED + MENUITEM SEPARATOR + MENUITEM "A&udio Properties", ID_EDIT_AUDIOPROPS + END + POPUP "Effect&s" + BEGIN + MENUITEM "&Increase Volume (by 25%)", ID_EFFECTS_INCVOL + MENUITEM "&Decrease Volume", ID_EFFECTS_DECVOL + MENUITEM SEPARATOR + MENUITEM "&Increase Speed (by 100%)", ID_EFFECTS_INCSPD + MENUITEM "&Decrease Speed", ID_EFFECTS_DECSPD + MENUITEM SEPARATOR + MENUITEM "&Add Echo", ID_EFFECTS_ECHO + MENUITEM "&Reverse", ID_EFFECTS_REVERSE + END + POPUP "&?" + BEGIN + MENUITEM "About...", ID_ABOUT END END Modified: trunk/reactos/base/applications/sndrec32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/lang/es-ES.rc [iso-8859-1] Thu Jan 16 00:56:59 2014 @@ -13,7 +13,7 @@ BEGIN ICON IDI_SNDREC32, -1, 19, 14, 21, 20 LTEXT "Grabadora de sonidos ReactOS, version 1.0", IDC_STATIC, 56, 16, 114, 8, SS_NOPREFIX - LTEXT "Copyright (C) 2009", IDC_STATIC, 55, 25, 114, 8 + LTEXT "Copyright (C) 2009", IDC_STATIC, 56, 25, 114, 8 DEFPUSHBUTTON "Aceptar", IDOK, 139, 54, 50, 14, WS_GROUP END @@ -21,18 +21,43 @@ BEGIN POPUP "Archivo" BEGIN - MENUITEM "Nuevo", ID_NEW + MENUITEM "Nuevo", ID_FILE_NEW MENUITEM "Abrir...", ID_FILE_OPEN MENUITEM "Guardar", ID_FILE_SAVE, GRAYED MENUITEM "Guardar como...", ID_FILE_SAVEAS, GRAYED + MENUITEM "Restore...", ID_FILE_RESTORE, GRAYED + MENUITEM "Properties", ID_FILE_PROPERTIES MENUITEM SEPARATOR - MENUITEM "Salir", ID_EXIT + MENUITEM "Salir", ID_FILE_EXIT END - MENUITEM "todo1", 0 - MENUITEM "todo2", 0 + POPUP "&Edit" + BEGIN + MENUITEM "&Copy", ID_EDIT_COPY + MENUITEM "&Paste Insert", ID_EDIT_PASTE, GRAYED + MENUITEM "Paste Mi&x", ID_EDIT_PASTEMIX, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Insert File...", ID_EDIT_INSERTFILE + MENUITEM "&Mix with File...", ID_EDIT_MIXFILE + MENUITEM SEPARATOR + MENUITEM "Delete &Before Current Position",ID_EDIT_DELETEBEFORE, GRAYED + MENUITEM "Delete &After Current Position",ID_EDIT_DELETEAFTER, GRAYED + MENUITEM SEPARATOR + MENUITEM "A&udio Properties", ID_EDIT_AUDIOPROPS + END + POPUP "Effect&s" + BEGIN + MENUITEM "&Increase Volume (by 25%)", ID_EFFECTS_INCVOL + MENUITEM "&Decrease Volume", ID_EFFECTS_DECVOL + MENUITEM SEPARATOR + MENUITEM "&Increase Speed (by 100%)", ID_EFFECTS_INCSPD + MENUITEM "&Decrease Speed", ID_EFFECTS_DECSPD + MENUITEM SEPARATOR + MENUITEM "&Add Echo", ID_EFFECTS_ECHO + MENUITEM "&Reverse", ID_EFFECTS_REVERSE + END POPUP "?" BEGIN - MENUITEM "Acerca de...", ID__ABOUT + MENUITEM "Acerca de...", ID_ABOUT END END Modified: trunk/reactos/base/applications/sndrec32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/lang/fr-FR.rc [iso-8859-1] Thu Jan 16 00:56:59 2014 @@ -13,7 +13,7 @@ BEGIN ICON IDI_SNDREC32, -1, 19, 14, 21, 20 LTEXT "Enregistreur de Son ReactOS, version 1.0", IDC_STATIC, 56, 16, 114, 8, SS_NOPREFIX - LTEXT "Copyright (C) 2009", IDC_STATIC, 55, 25, 114, 8 + LTEXT "Copyright (C) 2009", IDC_STATIC, 56, 25, 114, 8 DEFPUSHBUTTON "Accepter", IDOK, 139, 54, 50, 14, WS_GROUP END @@ -21,18 +21,43 @@ BEGIN POPUP "Fichier" BEGIN - MENUITEM "Nouveau", ID_NEW + MENUITEM "Nouveau", ID_FILE_NEW MENUITEM "Ouvrir...", ID_FILE_OPEN MENUITEM "Enregistrer", ID_FILE_SAVE, GRAYED MENUITEM "Enregistrer sous...", ID_FILE_SAVEAS, GRAYED + MENUITEM "Restore...", ID_FILE_RESTORE, GRAYED + MENUITEM "Properties", ID_FILE_PROPERTIES MENUITEM SEPARATOR - MENUITEM "Sortir", ID_EXIT + MENUITEM "Sortir", ID_FILE_EXIT END - MENUITEM "todo1", 0 - MENUITEM "todo2", 0 + POPUP "&Edit" + BEGIN + MENUITEM "&Copy", ID_EDIT_COPY + MENUITEM "&Paste Insert", ID_EDIT_PASTE, GRAYED + MENUITEM "Paste Mi&x", ID_EDIT_PASTEMIX, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Insert File...", ID_EDIT_INSERTFILE + MENUITEM "&Mix with File...", ID_EDIT_MIXFILE + MENUITEM SEPARATOR + MENUITEM "Delete &Before Current Position",ID_EDIT_DELETEBEFORE, GRAYED + MENUITEM "Delete &After Current Position",ID_EDIT_DELETEAFTER, GRAYED + MENUITEM SEPARATOR + MENUITEM "A&udio Properties", ID_EDIT_AUDIOPROPS + END + POPUP "Effect&s" + BEGIN + MENUITEM "&Increase Volume (by 25%)", ID_EFFECTS_INCVOL + MENUITEM "&Decrease Volume", ID_EFFECTS_DECVOL + MENUITEM SEPARATOR + MENUITEM "&Increase Speed (by 100%)", ID_EFFECTS_INCSPD + MENUITEM "&Decrease Speed", ID_EFFECTS_DECSPD + MENUITEM SEPARATOR + MENUITEM "&Add Echo", ID_EFFECTS_ECHO + MENUITEM "&Reverse", ID_EFFECTS_REVERSE + END POPUP "?" BEGIN - MENUITEM "Ã propos...", ID__ABOUT + MENUITEM "Ã propos...", ID_ABOUT END END Modified: trunk/reactos/base/applications/sndrec32/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/lang/he-IL.rc [iso-8859-1] Thu Jan 16 00:56:59 2014 @@ -13,7 +13,7 @@ BEGIN ICON IDI_SNDREC32, -1, 19, 14, 21, 20 LTEXT "×¨×©××§×× ×©× ReactOS ××¨×¡× 1.0", IDC_STATIC, 56, 16, 114, 8, SS_NOPREFIX - LTEXT "××××××ª ×××¦×¨×× (C) 2009", IDC_STATIC, 55, 25, 114, 8 + LTEXT "××××××ª ×××¦×¨×× (C) 2009", IDC_STATIC, 56, 25, 114, 8 DEFPUSHBUTTON "×××©××¨", IDOK, 139, 54, 50, 14, WS_GROUP END @@ -21,18 +21,43 @@ BEGIN POPUP "×§×××¥" BEGIN - MENUITEM "×××©", ID_NEW + MENUITEM "×××©", ID_FILE_NEW MENUITEM "×¤×ª×...", ID_FILE_OPEN MENUITEM "×©×××¨", ID_FILE_SAVE, GRAYED MENUITEM "×©×××¨ ××©×...", ID_FILE_SAVEAS, GRAYED + MENUITEM "Restore...", ID_FILE_RESTORE, GRAYED + MENUITEM "Properties", ID_FILE_PROPERTIES MENUITEM SEPARATOR - MENUITEM "××¦×××", ID_EXIT + MENUITEM "××¦×××", ID_FILE_EXIT END - MENUITEM "todo1", 0 - MENUITEM "todo2", 0 + POPUP "&Edit" + BEGIN + MENUITEM "&Copy", ID_EDIT_COPY + MENUITEM "&Paste Insert", ID_EDIT_PASTE, GRAYED + MENUITEM "Paste Mi&x", ID_EDIT_PASTEMIX, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Insert File...", ID_EDIT_INSERTFILE + MENUITEM "&Mix with File...", ID_EDIT_MIXFILE + MENUITEM SEPARATOR + MENUITEM "Delete &Before Current Position",ID_EDIT_DELETEBEFORE, GRAYED + MENUITEM "Delete &After Current Position",ID_EDIT_DELETEAFTER, GRAYED + MENUITEM SEPARATOR + MENUITEM "A&udio Properties", ID_EDIT_AUDIOPROPS + END + POPUP "Effect&s" + BEGIN + MENUITEM "&Increase Volume (by 25%)", ID_EFFECTS_INCVOL + MENUITEM "&Decrease Volume", ID_EFFECTS_DECVOL + MENUITEM SEPARATOR + MENUITEM "&Increase Speed (by 100%)", ID_EFFECTS_INCSPD + MENUITEM "&Decrease Speed", ID_EFFECTS_DECSPD + MENUITEM SEPARATOR + MENUITEM "&Add Echo", ID_EFFECTS_ECHO + MENUITEM "&Reverse", ID_EFFECTS_REVERSE + END POPUP "?" BEGIN - MENUITEM "×××××ª...", ID__ABOUT + MENUITEM "×××××ª...", ID_ABOUT END END Modified: trunk/reactos/base/applications/sndrec32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/lang/it-IT.rc [iso-8859-1] Thu Jan 16 00:56:59 2014 @@ -13,7 +13,7 @@ BEGIN ICON IDI_SNDREC32, -1, 19, 14, 21, 20 LTEXT "ReactOS registratore audio, versione 1.0", IDC_STATIC, 56, 16, 114, 8, SS_NOPREFIX - LTEXT "Copyright (C) 2009", IDC_STATIC, 55, 25, 114, 8 + LTEXT "Copyright (C) 2009", IDC_STATIC, 56, 25, 114, 8 DEFPUSHBUTTON "OK", IDOK, 139, 54, 50, 14, WS_GROUP END @@ -21,18 +21,43 @@ BEGIN POPUP "File" BEGIN - MENUITEM "Nuovo", ID_NEW + MENUITEM "Nuovo", ID_FILE_NEW MENUITEM "Apri...", ID_FILE_OPEN MENUITEM "Salva", ID_FILE_SAVE, GRAYED MENUITEM "Salva con nome...", ID_FILE_SAVEAS, GRAYED + MENUITEM "Restore...", ID_FILE_RESTORE, GRAYED + MENUITEM "Properties", ID_FILE_PROPERTIES MENUITEM SEPARATOR - MENUITEM "Esci", ID_EXIT + MENUITEM "Esci", ID_FILE_EXIT END - MENUITEM "todo1", 0 - MENUITEM "todo2", 0 + POPUP "&Edit" + BEGIN + MENUITEM "&Copy", ID_EDIT_COPY + MENUITEM "&Paste Insert", ID_EDIT_PASTE, GRAYED + MENUITEM "Paste Mi&x", ID_EDIT_PASTEMIX, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Insert File...", ID_EDIT_INSERTFILE + MENUITEM "&Mix with File...", ID_EDIT_MIXFILE + MENUITEM SEPARATOR + MENUITEM "Delete &Before Current Position",ID_EDIT_DELETEBEFORE, GRAYED + MENUITEM "Delete &After Current Position",ID_EDIT_DELETEAFTER, GRAYED + MENUITEM SEPARATOR + MENUITEM "A&udio Properties", ID_EDIT_AUDIOPROPS + END + POPUP "Effect&s" + BEGIN + MENUITEM "&Increase Volume (by 25%)", ID_EFFECTS_INCVOL + MENUITEM "&Decrease Volume", ID_EFFECTS_DECVOL + MENUITEM SEPARATOR + MENUITEM "&Increase Speed (by 100%)", ID_EFFECTS_INCSPD + MENUITEM "&Decrease Speed", ID_EFFECTS_DECSPD + MENUITEM SEPARATOR + MENUITEM "&Add Echo", ID_EFFECTS_ECHO + MENUITEM "&Reverse", ID_EFFECTS_REVERSE + END POPUP "?" BEGIN - MENUITEM "Informazioni...", ID__ABOUT + MENUITEM "Informazioni...", ID_ABOUT END END Modified: trunk/reactos/base/applications/sndrec32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/lang/ja-JP.rc [iso-8859-1] Thu Jan 16 00:56:59 2014 @@ -13,7 +13,7 @@ BEGIN ICON IDI_SNDREC32, -1, 19, 14, 21, 20 LTEXT "reactOS_sndrec32, ãã¼ã¸ã§ã³ 1.0", IDC_STATIC, 56, 16, 114, 8, SS_NOPREFIX - LTEXT "Copyright (C) 2009", IDC_STATIC, 55, 25, 114, 8 + LTEXT "Copyright (C) 2009", IDC_STATIC, 56, 25, 114, 8 DEFPUSHBUTTON "OK", IDOK, 139, 54, 50, 14, WS_GROUP END @@ -21,18 +21,43 @@ BEGIN POPUP "ãã¡ã¤ã«" BEGIN - MENUITEM "æ°è¦ä½æ", ID_NEW + MENUITEM "æ°è¦ä½æ", ID_FILE_NEW MENUITEM "éã...", ID_FILE_OPEN MENUITEM "ä¸æ¸ãä¿å", ID_FILE_SAVE, GRAYED MENUITEM "ååãã¤ãã¦ä¿å...", ID_FILE_SAVEAS, GRAYED + MENUITEM "Restore...", ID_FILE_RESTORE, GRAYED + MENUITEM "Properties", ID_FILE_PROPERTIES MENUITEM SEPARATOR - MENUITEM "çµäº", ID_EXIT + MENUITEM "çµäº", ID_FILE_EXIT END - MENUITEM "todo1", 0 - MENUITEM "todo2", 0 + POPUP "&Edit" + BEGIN + MENUITEM "&Copy", ID_EDIT_COPY + MENUITEM "&Paste Insert", ID_EDIT_PASTE, GRAYED + MENUITEM "Paste Mi&x", ID_EDIT_PASTEMIX, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Insert File...", ID_EDIT_INSERTFILE + MENUITEM "&Mix with File...", ID_EDIT_MIXFILE + MENUITEM SEPARATOR + MENUITEM "Delete &Before Current Position",ID_EDIT_DELETEBEFORE, GRAYED + MENUITEM "Delete &After Current Position",ID_EDIT_DELETEAFTER, GRAYED + MENUITEM SEPARATOR + MENUITEM "A&udio Properties", ID_EDIT_AUDIOPROPS + END + POPUP "Effect&s" + BEGIN + MENUITEM "&Increase Volume (by 25%)", ID_EFFECTS_INCVOL + MENUITEM "&Decrease Volume", ID_EFFECTS_DECVOL + MENUITEM SEPARATOR + MENUITEM "&Increase Speed (by 100%)", ID_EFFECTS_INCSPD + MENUITEM "&Decrease Speed", ID_EFFECTS_DECSPD + MENUITEM SEPARATOR + MENUITEM "&Add Echo", ID_EFFECTS_ECHO + MENUITEM "&Reverse", ID_EFFECTS_REVERSE + END POPUP "?" BEGIN - MENUITEM "ãã¼ã¸ã§ã³æå ±...", ID__ABOUT + MENUITEM "ãã¼ã¸ã§ã³æå ±...", ID_ABOUT END END Modified: trunk/reactos/base/applications/sndrec32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/lang/pl-PL.rc [iso-8859-1] Thu Jan 16 00:56:59 2014 @@ -21,7 +21,7 @@ BEGIN ICON IDI_SNDREC32, -1, 19, 14, 21, 20 LTEXT "Rejestrator dÅºwiÄku ReactOS, wersja 1.0", IDC_STATIC, 56, 16, 114, 8, SS_NOPREFIX - LTEXT "Copyright (C) 2009", IDC_STATIC, 55, 25, 114, 8 + LTEXT "Copyright (C) 2009", IDC_STATIC, 56, 25, 114, 8 DEFPUSHBUTTON "OK", IDOK, 139, 54, 50, 14, WS_GROUP END @@ -29,18 +29,43 @@ BEGIN POPUP "Plik" BEGIN - MENUITEM "Nowy", ID_NEW + MENUITEM "Nowy", ID_FILE_NEW MENUITEM "OtwÃ³rz...", ID_FILE_OPEN MENUITEM "Zapisz", ID_FILE_SAVE, GRAYED MENUITEM "Zapisz jako...", ID_FILE_SAVEAS, GRAYED + MENUITEM "Restore...", ID_FILE_RESTORE, GRAYED + MENUITEM "Properties", ID_FILE_PROPERTIES MENUITEM SEPARATOR - MENUITEM "WyjÅcie", ID_EXIT + MENUITEM "WyjÅcie", ID_FILE_EXIT END - MENUITEM "todo1", 0 - MENUITEM "todo2", 0 + POPUP "&Edit" + BEGIN + MENUITEM "&Copy", ID_EDIT_COPY + MENUITEM "&Paste Insert", ID_EDIT_PASTE, GRAYED + MENUITEM "Paste Mi&x", ID_EDIT_PASTEMIX, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Insert File...", ID_EDIT_INSERTFILE + MENUITEM "&Mix with File...", ID_EDIT_MIXFILE + MENUITEM SEPARATOR + MENUITEM "Delete &Before Current Position",ID_EDIT_DELETEBEFORE, GRAYED + MENUITEM "Delete &After Current Position",ID_EDIT_DELETEAFTER, GRAYED + MENUITEM SEPARATOR + MENUITEM "A&udio Properties", ID_EDIT_AUDIOPROPS + END + POPUP "Effect&s" + BEGIN + MENUITEM "&Increase Volume (by 25%)", ID_EFFECTS_INCVOL + MENUITEM "&Decrease Volume", ID_EFFECTS_DECVOL + MENUITEM SEPARATOR + MENUITEM "&Increase Speed (by 100%)", ID_EFFECTS_INCSPD + MENUITEM "&Decrease Speed", ID_EFFECTS_DECSPD + MENUITEM SEPARATOR + MENUITEM "&Add Echo", ID_EFFECTS_ECHO + MENUITEM "&Reverse", ID_EFFECTS_REVERSE + END POPUP "?" BEGIN - MENUITEM "O programie...", ID__ABOUT + MENUITEM "O programie...", ID_ABOUT END END Modified: trunk/reactos/base/applications/sndrec32/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/lang/ro-RO.rc [iso-8859-1] Thu Jan 16 00:56:59 2014 @@ -22,7 +22,7 @@ BEGIN ICON IDI_SNDREC32, -1, 19, 14, 21, 20 LTEXT "Ãnregistrator audio, versiunea 1.0", IDC_STATIC, 56, 16, 114, 8, SS_NOPREFIX - LTEXT "Drept de autor (C) 2009", IDC_STATIC, 55, 25, 114, 8 + LTEXT "Drept de autor (C) 2009", IDC_STATIC, 56, 25, 114, 8 DEFPUSHBUTTON "Ã&nchide", IDOK, 139, 54, 50, 14, WS_GROUP END @@ -30,18 +30,43 @@ BEGIN POPUP "&FiÈier" BEGIN - MENUITEM "&Nou", ID_NEW + MENUITEM "&Nou", ID_FILE_NEW MENUITEM "&Deschidereâ¦", ID_FILE_OPEN MENUITEM "PÄ&streazÄ", ID_FILE_SAVE, GRAYED MENUITEM "&PÄstrare Ã®nâ¦", ID_FILE_SAVEAS, GRAYED + MENUITEM "Restore...", ID_FILE_RESTORE, GRAYED + MENUITEM "Properties", ID_FILE_PROPERTIES MENUITEM SEPARATOR - MENUITEM "I&eÈire", ID_EXIT + MENUITEM "I&eÈire", ID_FILE_EXIT END - MENUITEM "todo1", 0 - MENUITEM "todo2", 0 + POPUP "&Edit" + BEGIN + MENUITEM "&Copy", ID_EDIT_COPY + MENUITEM "&Paste Insert", ID_EDIT_PASTE, GRAYED + MENUITEM "Paste Mi&x", ID_EDIT_PASTEMIX, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Insert File...", ID_EDIT_INSERTFILE + MENUITEM "&Mix with File...", ID_EDIT_MIXFILE + MENUITEM SEPARATOR + MENUITEM "Delete &Before Current Position",ID_EDIT_DELETEBEFORE, GRAYED + MENUITEM "Delete &After Current Position",ID_EDIT_DELETEAFTER, GRAYED + MENUITEM SEPARATOR + MENUITEM "A&udio Properties", ID_EDIT_AUDIOPROPS + END + POPUP "Effect&s" + BEGIN + MENUITEM "&Increase Volume (by 25%)", ID_EFFECTS_INCVOL + MENUITEM "&Decrease Volume", ID_EFFECTS_DECVOL + MENUITEM SEPARATOR + MENUITEM "&Increase Speed (by 100%)", ID_EFFECTS_INCSPD + MENUITEM "&Decrease Speed", ID_EFFECTS_DECSPD + MENUITEM SEPARATOR + MENUITEM "&Add Echo", ID_EFFECTS_ECHO + MENUITEM "&Reverse", ID_EFFECTS_REVERSE + END POPUP "&?" BEGIN - MENUITEM "&Despreâ¦", ID__ABOUT + MENUITEM "&Despreâ¦", ID_ABOUT END END Modified: trunk/reactos/base/applications/sndrec32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/lang/sk-SK.rc [iso-8859-1] Thu Jan 16 00:56:59 2014 @@ -18,7 +18,7 @@ BEGIN ICON IDI_SNDREC32, -1, 19, 14, 21, 20 LTEXT "reactOS_sndrec32, verzia 1.0", IDC_STATIC, 56, 16, 114, 8, SS_NOPREFIX - LTEXT "AutorskÃ© prÃ¡va (C) 2009", IDC_STATIC, 55, 25, 114, 8 + LTEXT "AutorskÃ© prÃ¡va (C) 2009", IDC_STATIC, 56, 25, 114, 8 DEFPUSHBUTTON "OK", IDOK, 139, 54, 50, 14, WS_GROUP END @@ -26,18 +26,43 @@ BEGIN POPUP "&SÃºbor" BEGIN - MENUITEM "NovÃ½", ID_NEW + MENUITEM "NovÃ½", ID_FILE_NEW MENUITEM "OtvoriÅ¥...", ID_FILE_OPEN MENUITEM "UloÅ¾iÅ¥", ID_FILE_SAVE, GRAYED MENUITEM "UloÅ¾iÅ¥ ako...", ID_FILE_SAVEAS, GRAYED + MENUITEM "Restore...", ID_FILE_RESTORE, GRAYED + MENUITEM "Properties", ID_FILE_PROPERTIES MENUITEM SEPARATOR - MENUITEM "SkonÄiÅ¥", ID_EXIT + MENUITEM "SkonÄiÅ¥", ID_FILE_EXIT END - MENUITEM "todo1", 0 - MENUITEM "todo2", 0 + POPUP "&Edit" + BEGIN + MENUITEM "&Copy", ID_EDIT_COPY + MENUITEM "&Paste Insert", ID_EDIT_PASTE, GRAYED + MENUITEM "Paste Mi&x", ID_EDIT_PASTEMIX, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Insert File...", ID_EDIT_INSERTFILE + MENUITEM "&Mix with File...", ID_EDIT_MIXFILE + MENUITEM SEPARATOR + MENUITEM "Delete &Before Current Position",ID_EDIT_DELETEBEFORE, GRAYED + MENUITEM "Delete &After Current Position",ID_EDIT_DELETEAFTER, GRAYED + MENUITEM SEPARATOR + MENUITEM "A&udio Properties", ID_EDIT_AUDIOPROPS + END + POPUP "Effect&s" + BEGIN + MENUITEM "&Increase Volume (by 25%)", ID_EFFECTS_INCVOL + MENUITEM "&Decrease Volume", ID_EFFECTS_DECVOL + MENUITEM SEPARATOR + MENUITEM "&Increase Speed (by 100%)", ID_EFFECTS_INCSPD + MENUITEM "&Decrease Speed", ID_EFFECTS_DECSPD + MENUITEM SEPARATOR + MENUITEM "&Add Echo", ID_EFFECTS_ECHO + MENUITEM "&Reverse", ID_EFFECTS_REVERSE + END POPUP "?" BEGIN - MENUITEM "Ä&o je...", ID__ABOUT + MENUITEM "Ä&o je...", ID_ABOUT END END Modified: trunk/reactos/base/applications/sndrec32/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/lang/sq-AL.rc [iso-8859-1] Thu Jan 16 00:56:59 2014 @@ -17,7 +17,7 @@ BEGIN ICON IDI_SNDREC32, -1, 19, 14, 21, 20 LTEXT "ReactOS Rregjistruesi i Zerit, versioni 1.0", IDC_STATIC, 56, 16, 114, 8, SS_NOPREFIX - LTEXT "T'drejtat (C) 2009", IDC_STATIC, 55, 25, 114, 8 + LTEXT "T'drejtat (C) 2009", IDC_STATIC, 56, 25, 114, 8 DEFPUSHBUTTON "OK", IDOK, 139, 54, 50, 14, WS_GROUP END @@ -25,18 +25,43 @@ BEGIN POPUP "File" BEGIN - MENUITEM "E Re ", ID_NEW + MENUITEM "E Re ", ID_FILE_NEW MENUITEM "Hap...", ID_FILE_OPEN MENUITEM "Ruaj", ID_FILE_SAVE, GRAYED MENUITEM "Ruaj si...", ID_FILE_SAVEAS, GRAYED + MENUITEM "Restore...", ID_FILE_RESTORE, GRAYED + MENUITEM "Properties", ID_FILE_PROPERTIES MENUITEM SEPARATOR - MENUITEM "Dil", ID_EXIT + MENUITEM "Dil", ID_FILE_EXIT END - MENUITEM "todo1", 0 - MENUITEM "todo2", 0 + POPUP "&Edit" + BEGIN + MENUITEM "&Copy", ID_EDIT_COPY + MENUITEM "&Paste Insert", ID_EDIT_PASTE, GRAYED + MENUITEM "Paste Mi&x", ID_EDIT_PASTEMIX, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Insert File...", ID_EDIT_INSERTFILE + MENUITEM "&Mix with File...", ID_EDIT_MIXFILE + MENUITEM SEPARATOR + MENUITEM "Delete &Before Current Position", ID_EDIT_DELETEBEFORE, GRAYED + MENUITEM "Delete &After Current Position", ID_EDIT_DELETEAFTER, GRAYED + MENUITEM SEPARATOR + MENUITEM "A&udio Properties", ID_EDIT_AUDIOPROPS + END + POPUP "Effect&s" + BEGIN + MENUITEM "&Increase Volume (by 25%)", ID_EFFECTS_INCVOL + MENUITEM "&Decrease Volume", ID_EFFECTS_DECVOL + MENUITEM SEPARATOR + MENUITEM "&Increase Speed (by 100%)", ID_EFFECTS_INCSPD + MENUITEM "&Decrease Speed", ID_EFFECTS_DECSPD + MENUITEM SEPARATOR + MENUITEM "&Add Echo", ID_EFFECTS_ECHO + MENUITEM "&Reverse", ID_EFFECTS_REVERSE + END POPUP "?" BEGIN - MENUITEM "Rreth...", ID__ABOUT + MENUITEM "Rreth...", ID_ABOUT END END Modified: trunk/reactos/base/applications/sndrec32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/lang/sv-SE.rc [iso-8859-1] Thu Jan 16 00:56:59 2014 @@ -15,7 +15,7 @@ BEGIN ICON IDI_SNDREC32, -1, 19, 14, 21, 20 LTEXT "ReactOS_sndrec32, version 1.0", IDC_STATIC, 56, 16, 114, 8, SS_NOPREFIX - LTEXT "Copyright (C) 2009", IDC_STATIC, 55, 25, 114, 8 + LTEXT "Copyright (C) 2009", IDC_STATIC, 56, 25, 114, 8 DEFPUSHBUTTON "OK", IDOK, 139, 54, 50, 14, WS_GROUP END @@ -23,18 +23,43 @@ BEGIN POPUP "Arkiv" BEGIN - MENUITEM "Ny", ID_NEW + MENUITEM "Ny", ID_FILE_NEW MENUITEM "Ãppna...", ID_FILE_OPEN MENUITEM "Spara", ID_FILE_SAVE, GRAYED MENUITEM "Spara som...", ID_FILE_SAVEAS, GRAYED + MENUITEM "Restore...", ID_FILE_RESTORE, GRAYED + MENUITEM "Properties", ID_FILE_PROPERTIES MENUITEM SEPARATOR - MENUITEM "Avsluta", ID_EXIT + MENUITEM "Avsluta", ID_FILE_EXIT END - MENUITEM "todo1", 0 - MENUITEM "todo2", 0 + POPUP "&Edit" + BEGIN + MENUITEM "&Copy", ID_EDIT_COPY + MENUITEM "&Paste Insert", ID_EDIT_PASTE, GRAYED + MENUITEM "Paste Mi&x", ID_EDIT_PASTEMIX, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Insert File...", ID_EDIT_INSERTFILE + MENUITEM "&Mix with File...", ID_EDIT_MIXFILE + MENUITEM SEPARATOR + MENUITEM "Delete &Before Current Position",ID_EDIT_DELETEBEFORE, GRAYED + MENUITEM "Delete &After Current Position",ID_EDIT_DELETEAFTER, GRAYED + MENUITEM SEPARATOR + MENUITEM "A&udio Properties", ID_EDIT_AUDIOPROPS + END + POPUP "Effect&s" + BEGIN + MENUITEM "&Increase Volume (by 25%)", ID_EFFECTS_INCVOL + MENUITEM "&Decrease Volume", ID_EFFECTS_DECVOL + MENUITEM SEPARATOR + MENUITEM "&Increase Speed (by 100%)", ID_EFFECTS_INCSPD + MENUITEM "&Decrease Speed", ID_EFFECTS_DECSPD + MENUITEM SEPARATOR + MENUITEM "&Add Echo", ID_EFFECTS_ECHO + MENUITEM "&Reverse", ID_EFFECTS_REVERSE + END POPUP "HjÃ¤lp" BEGIN - MENUITEM "Om...", ID__ABOUT + MENUITEM "Om...", ID_ABOUT END END Modified: trunk/reactos/base/applications/sndrec32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/lang/tr-TR.rc [iso-8859-1] Thu Jan 16 00:56:59 2014 @@ -15,7 +15,7 @@ BEGIN ICON IDI_SNDREC32, -1, 19, 14, 21, 20 LTEXT "Ses Kaydedicisi: SÃ¼rÃ¼m 1.0", IDC_STATIC, 56, 16, 114, 8, SS_NOPREFIX - LTEXT "Tekif HakkÄ± - 2009", IDC_STATIC, 55, 25, 114, 8 + LTEXT "Tekif HakkÄ± - 2009", IDC_STATIC, 56, 25, 114, 8 DEFPUSHBUTTON "Tamam", IDOK, 139, 54, 50, 14, WS_GROUP END @@ -23,18 +23,43 @@ BEGIN POPUP "&KÃ¼tÃ¼k" BEGIN - MENUITEM "&Yeni", ID_NEW + MENUITEM "&Yeni", ID_FILE_NEW MENUITEM "&AÃ§...", ID_FILE_OPEN MENUITEM "&Kaydet", ID_FILE_SAVE, GRAYED MENUITEM "Ay&rÄ± Kaydet...", ID_FILE_SAVEAS, GRAYED + MENUITEM "Restore...", ID_FILE_RESTORE, GRAYED + MENUITEM "Properties", ID_FILE_PROPERTIES MENUITEM SEPARATOR - MENUITEM "&ÃÄ±kÄ±Å", ID_EXIT + MENUITEM "&ÃÄ±kÄ±Å", ID_FILE_EXIT END - MENUITEM "YapÄ±lacak", 0 - MENUITEM "YapÄ±lacak_2", 0 + POPUP "&Edit" + BEGIN + MENUITEM "&Copy", ID_EDIT_COPY + MENUITEM "&Paste Insert", ID_EDIT_PASTE, GRAYED + MENUITEM "Paste Mi&x", ID_EDIT_PASTEMIX, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Insert File...", ID_EDIT_INSERTFILE + MENUITEM "&Mix with File...", ID_EDIT_MIXFILE + MENUITEM SEPARATOR + MENUITEM "Delete &Before Current Position",ID_EDIT_DELETEBEFORE, GRAYED + MENUITEM "Delete &After Current Position",ID_EDIT_DELETEAFTER, GRAYED + MENUITEM SEPARATOR + MENUITEM "A&udio Properties", ID_EDIT_AUDIOPROPS + END + POPUP "Effect&s" + BEGIN + MENUITEM "&Increase Volume (by 25%)", ID_EFFECTS_INCVOL + MENUITEM "&Decrease Volume", ID_EFFECTS_DECVOL + MENUITEM SEPARATOR + MENUITEM "&Increase Speed (by 100%)", ID_EFFECTS_INCSPD + MENUITEM "&Decrease Speed", ID_EFFECTS_DECSPD + MENUITEM SEPARATOR + MENUITEM "&Add Echo", ID_EFFECTS_ECHO + MENUITEM "&Reverse", ID_EFFECTS_REVERSE + END POPUP "&YardÄ±m" BEGIN - MENUITEM "&HakkÄ±nda", ID__ABOUT + MENUITEM "&HakkÄ±nda", ID_ABOUT END END Modified: trunk/reactos/base/applications/sndrec32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/lang/uk-UA.rc [iso-8859-1] Thu Jan 16 00:56:59 2014 @@ -15,7 +15,7 @@ BEGIN ICON IDI_SNDREC32, -1, 19, 14, 21, 20 LTEXT "reactOS_sndrec32, Ð²ÐµÑÑÑÑ 1.0", IDC_STATIC, 56, 16, 114, 8, SS_NOPREFIX - LTEXT "Copyright (C) 2009", IDC_STATIC, 55, 25, 114, 8 + LTEXT "Copyright (C) 2009", IDC_STATIC, 56, 25, 114, 8 DEFPUSHBUTTON "OK", IDOK, 139, 54, 50, 14, WS_GROUP END @@ -23,18 +23,43 @@ BEGIN POPUP "Ð¤Ð°Ð¹Ð»" BEGIN - MENUITEM "ÐÐ¾Ð²Ð¸Ð¹", ID_NEW + MENUITEM "ÐÐ¾Ð²Ð¸Ð¹", ID_FILE_NEW MENUITEM "ÐÑÐ´ÐºÑÐ¸ÑÐ¸...", ID_FILE_OPEN MENUITEM "ÐÐ±ÐµÑÐµÐ³ÑÐ¸", ID_FILE_SAVE, GRAYED MENUITEM "ÐÐ±ÐµÑÐµÐ³ÑÐ¸ ÑÐº...", ID_FILE_SAVEAS, GRAYED + MENUITEM "Restore...", ID_FILE_RESTORE, GRAYED + MENUITEM "Properties", ID_FILE_PROPERTIES MENUITEM SEPARATOR - MENUITEM "ÐÐ¸ÑÑÐ´", ID_EXIT + MENUITEM "ÐÐ¸ÑÑÐ´", ID_FILE_EXIT END - MENUITEM "todo1", 0 - MENUITEM "todo2", 0 + POPUP "&Edit" + BEGIN + MENUITEM "&Copy", ID_EDIT_COPY + MENUITEM "&Paste Insert", ID_EDIT_PASTE, GRAYED + MENUITEM "Paste Mi&x", ID_EDIT_PASTEMIX, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Insert File...", ID_EDIT_INSERTFILE + MENUITEM "&Mix with File...", ID_EDIT_MIXFILE + MENUITEM SEPARATOR + MENUITEM "Delete &Before Current Position",ID_EDIT_DELETEBEFORE, GRAYED + MENUITEM "Delete &After Current Position",ID_EDIT_DELETEAFTER, GRAYED + MENUITEM SEPARATOR + MENUITEM "A&udio Properties",ID_EDIT_AUDIOPROPS + END + POPUP "Effect&s" + BEGIN + MENUITEM "&Increase Volume (by 25%)", ID_EFFECTS_INCVOL + MENUITEM "&Decrease Volume", ID_EFFECTS_DECVOL + MENUITEM SEPARATOR + MENUITEM "&Increase Speed (by 100%)", ID_EFFECTS_INCSPD + MENUITEM "&Decrease Speed", ID_EFFECTS_DECSPD + MENUITEM SEPARATOR + MENUITEM "&Add Echo", ID_EFFECTS_ECHO + MENUITEM "&Reverse", ID_EFFECTS_REVERSE + END POPUP "?" BEGIN - MENUITEM "ÐÑÐ¾ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ñ...", ID__ABOUT + MENUITEM "ÐÑÐ¾ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ñ...", ID_ABOUT END END Modified: trunk/reactos/base/applications/sndrec32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/lang/zh-CN.rc [iso-8859-1] Thu Jan 16 00:56:59 2014 @@ -15,7 +15,7 @@ BEGIN ICON IDI_SNDREC32, -1, 19, 14, 21, 20 LTEXT "ReactOS å½é³æºï¼çæ¬ 1.0", IDC_STATIC, 56, 16, 114, 8, SS_NOPREFIX - LTEXT "çæææ (C) 2009", IDC_STATIC, 55, 25, 114, 8 + LTEXT "çæææ (C) 2009", IDC_STATIC, 56, 25, 114, 8 DEFPUSHBUTTON "ç¡®å®", IDOK, 139, 54, 50, 14, WS_GROUP END @@ -23,18 +23,43 @@ BEGIN POPUP "æä»¶" BEGIN - MENUITEM "æ°å»º", ID_NEW + MENUITEM "æ°å»º", ID_FILE_NEW MENUITEM "æå¼...", ID_FILE_OPEN MENUITEM "ä¿å", ID_FILE_SAVE, GRAYED MENUITEM "å¦åä¸º...", ID_FILE_SAVEAS, GRAYED + MENUITEM "Restore...", ID_FILE_RESTORE, GRAYED + MENUITEM "Properties", ID_FILE_PROPERTIES MENUITEM SEPARATOR - MENUITEM "éåº", ID_EXIT + MENUITEM "éåº", ID_FILE_EXIT END - MENUITEM "todo1", 0 - MENUITEM "todo2", 0 + POPUP "&Edit" + BEGIN + MENUITEM "&Copy", ID_EDIT_COPY + MENUITEM "&Paste Insert", ID_EDIT_PASTE, GRAYED + MENUITEM "Paste Mi&x", ID_EDIT_PASTEMIX, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Insert File...", ID_EDIT_INSERTFILE + MENUITEM "&Mix with File...", ID_EDIT_MIXFILE + MENUITEM SEPARATOR + MENUITEM "Delete &Before Current Position",ID_EDIT_DELETEBEFORE, GRAYED + MENUITEM "Delete &After Current Position",ID_EDIT_DELETEAFTER, GRAYED + MENUITEM SEPARATOR + MENUITEM "A&udio Properties", ID_EDIT_AUDIOPROPS + END + POPUP "Effect&s" + BEGIN + MENUITEM "&Increase Volume (by 25%)", ID_EFFECTS_INCVOL + MENUITEM "&Decrease Volume", ID_EFFECTS_DECVOL + MENUITEM SEPARATOR + MENUITEM "&Increase Speed (by 100%)", ID_EFFECTS_INCSPD + MENUITEM "&Decrease Speed", ID_EFFECTS_DECSPD + MENUITEM SEPARATOR + MENUITEM "&Add Echo", ID_EFFECTS_ECHO + MENUITEM "&Reverse", ID_EFFECTS_REVERSE + END POPUP "å¸®å©" BEGIN - MENUITEM "å³äº...", ID__ABOUT + MENUITEM "å³äº...", ID_ABOUT END END Modified: trunk/reactos/base/applications/sndrec32/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/lang/zh-TW.rc [iso-8859-1] Thu Jan 16 00:56:59 2014 @@ -21,7 +21,7 @@ BEGIN ICON IDI_SNDREC32, -1, 19, 14, 21, 20 LTEXT "ReactOS éé³æ©ï¼çæ¬ 1.0", IDC_STATIC, 56, 16, 114, 8, SS_NOPREFIX - LTEXT "çæ¬ææ (C) 2009", IDC_STATIC, 55, 25, 114, 8 + LTEXT "çæ¬ææ (C) 2009", IDC_STATIC, 56, 25, 114, 8 DEFPUSHBUTTON "ç¢ºå®", IDOK, 139, 54, 50, 14, WS_GROUP END @@ -29,18 +29,43 @@ BEGIN POPUP "æªæ¡" BEGIN - MENUITEM "æ°å¢", ID_NEW + MENUITEM "æ°å¢", ID_FILE_NEW MENUITEM "éå...", ID_FILE_OPEN MENUITEM "å²å", ID_FILE_SAVE, GRAYED MENUITEM "å¦åçº...", ID_FILE_SAVEAS, GRAYED + MENUITEM "Restore...", ID_FILE_RESTORE, GRAYED + MENUITEM "Properties", ID_FILE_PROPERTIES MENUITEM SEPARATOR - MENUITEM "çµæ", ID_EXIT + MENUITEM "çµæ", ID_FILE_EXIT END - MENUITEM "todo1", 0 - MENUITEM "todo2", 0 + POPUP "&Edit" + BEGIN + MENUITEM "&Copy", ID_EDIT_COPY + MENUITEM "&Paste Insert", ID_EDIT_PASTE, GRAYED + MENUITEM "Paste Mi&x", ID_EDIT_PASTEMIX, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Insert File...", ID_EDIT_INSERTFILE + MENUITEM "&Mix with File...", ID_EDIT_MIXFILE + MENUITEM SEPARATOR + MENUITEM "Delete &Before Current Position",ID_EDIT_DELETEBEFORE, GRAYED + MENUITEM "Delete &After Current Position",ID_EDIT_DELETEAFTER, GRAYED + MENUITEM SEPARATOR + MENUITEM "A&udio Properties", ID_EDIT_AUDIOPROPS + END + POPUP "Effect&s" + BEGIN + MENUITEM "&Increase Volume (by 25%)", ID_EFFECTS_INCVOL + MENUITEM "&Decrease Volume", ID_EFFECTS_DECVOL + MENUITEM SEPARATOR + MENUITEM "&Increase Speed (by 100%)", ID_EFFECTS_INCSPD + MENUITEM "&Decrease Speed", ID_EFFECTS_DECSPD + MENUITEM SEPARATOR + MENUITEM "&Add Echo", ID_EFFECTS_ECHO + MENUITEM "&Reverse", ID_EFFECTS_REVERSE + END POPUP "èªªæ" BEGIN - MENUITEM "éæ¼...", ID__ABOUT + MENUITEM "éæ¼...", ID_ABOUT END END Modified: trunk/reactos/base/applications/sndrec32/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/resource.h [iso-8859-1] Thu Jan 16 00:56:59 2014 @@ -38,13 +38,27 @@ #define IDS_STRING406 406 #define IDS_STRCHAN 406 -#define ID_FILE_NEW 32771 -#define ID_FILE_OPEN 32772 -#define ID_FILE_SAVE 32773 -#define ID_FILE_SAVEAS 32774 -#define ID_FILE_EXIT 32775 -#define ID__ABOUT 32776 -#define ID_EXIT 32777 -#define ID_NEW 32778 +#define ID_FILE_NEW 32771 +#define ID_FILE_OPEN 32772 +#define ID_FILE_SAVE 32773 +#define ID_FILE_SAVEAS 32774 +#define ID_FILE_RESTORE 32775 +#define ID_FILE_PROPERTIES 32776 +#define ID_FILE_EXIT 32777 +#define ID_ABOUT 32778 +#define ID_EDIT_COPY 32779 +#define ID_EDIT_PASTE 32780 +#define ID_EDIT_PASTEMIX 32781 +#define ID_EDIT_INSERTFILE 32782 +#define ID_EDIT_MIXFILE 32783 +#define ID_EDIT_DELETEBEFORE 32784 +#define ID_EDIT_DELETEAFTER 32785 +#define ID_EDIT_AUDIOPROPS 32786 +#define ID_EFFECTS_INCVOL 32787 +#define ID_EFFECTS_DECVOL 32788 +#define ID_EFFECTS_INCSPD 32789 +#define ID_EFFECTS_DECSPD 32790 +#define ID_EFFECTS_ECHO 32791 +#define ID_EFFECTS_REVERSE 32792 #define IDC_STATIC -1 Modified: trunk/reactos/base/applications/sndrec32/sndrec32.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/sndrec32.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/sndrec32.cpp [iso-8859-1] Thu Jan 16 00:56:59 2014 @@ -3,6 +3,7 @@ * FILE: base/applications/sndrec32/sndrec32.cpp * PURPOSE: Sound recording * PROGRAMMERS: Marco Pagliaricci (irc: rendar) + * Robert Naumann (gonzoMD) */ #include "stdafx.h" @@ -11,6 +12,7 @@ #include <commdlg.h> #include "sndrec32.h" +#include "shellapi.h" #ifndef _UNICODE #define gprintf _snprintf @@ -537,7 +539,7 @@ switch (wmId) { - case ID_NEW: + case ID_FILE_NEW: if (!isnew) { if (AUD_IN->current_status() == snd::WAVEIN_RECORDING) @@ -599,7 +601,7 @@ InvalidateRect(hWnd, &text2_rect, TRUE); break; - case ID__ABOUT: + case ID_ABOUT: DialogBox(hInst, MAKEINTRESOURCE(IDD_ABOUTBOX), hWnd, AboutDlgProc); return TRUE; break; @@ -621,11 +623,16 @@ write_wav(file_path); EnableMenuItem(GetMenu(hWnd), ID_FILE_SAVE, MF_ENABLED); } - break; - - case ID_EXIT: - DestroyWindow(hWnd); - break; + break; + + + case ID_EDIT_AUDIOPROPS: + ShellExecute( NULL, NULL, _T("rundll32.exe"), _T("shell32.dll,Control_RunDLL mmsys.cpl,ShowAudioPropertySheet"), NULL, SW_SHOWNORMAL ); + break; + + case ID_FILE_EXIT: + DestroyWindow( hWnd ); + break; /* Sndrec32 buttons routines */ case BUTSTART_ID:

10 years, 8 months

[dreimer] 61641: "Hack" to fix colors in themed mode in Windows AND ReactOS. Taken from WinSpy++ (http://www.catch22.net/software/winspy) by J Brown

by dreimer＠svn.reactos.org

Author: dreimer Date: Thu Jan 16 00:10:01 2014 New Revision: 61641 URL: http://svn.reactos.org/svn/reactos?rev=61641&view=rev Log: "Hack" to fix colors in themed mode in Windows AND ReactOS. Taken from WinSpy++ (http://www.catch22.net/software/winspy) by J Brown Modified: trunk/reactos/base/applications/msconfig/msconfig.c Modified: trunk/reactos/base/applications/msconfig/msconfig.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/msconfig.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig/msconfig.c [iso-8859-1] Thu Jan 16 00:10:01 2014 @@ -25,18 +25,72 @@ void MsConfig_OnTabWndSelChange(void); +//////////////////////////////////////////////////////////////////////////////// +// Taken from WinSpy++ 1.7 +// http://www.catch22.net/software/winspy +// Copyright (c) 2002 by J Brown +// + +// +// Copied from uxtheme.h +// If you have this new header, then delete these and +// #include <uxtheme.h> instead! +// +#define ETDT_DISABLE 0x00000001 +#define ETDT_ENABLE 0x00000002 +#define ETDT_USETABTEXTURE 0x00000004 +#define ETDT_ENABLETAB (ETDT_ENABLE | ETDT_USETABTEXTURE) + +// +typedef HRESULT (WINAPI * ETDTProc) (HWND, DWORD); + +// +// Try to call EnableThemeDialogTexture, if uxtheme.dll is present +// +BOOL EnableDialogTheme(HWND hwnd) +{ + HMODULE hUXTheme; + ETDTProc fnEnableThemeDialogTexture; + + hUXTheme = LoadLibrary(_T("uxtheme.dll")); + + if(hUXTheme) + { + fnEnableThemeDialogTexture = + (ETDTProc)GetProcAddress(hUXTheme, "EnableThemeDialogTexture"); + + if(fnEnableThemeDialogTexture) + { + fnEnableThemeDialogTexture(hwnd, ETDT_ENABLETAB); + + FreeLibrary(hUXTheme); + return TRUE; + } + else + { + // Failed to locate API! + FreeLibrary(hUXTheme); + return FALSE; + } + } + else + { + // Not running under XP? Just fail gracefully + return FALSE; + } +} BOOL OnCreate(HWND hWnd) { TCHAR szTemp[256]; TCITEM item; hTabWnd = GetDlgItem(hWnd, IDC_TAB); - hGeneralPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_GENERAL_PAGE), hWnd, GeneralPageWndProc); - hSystemPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_SYSTEM_PAGE), hWnd, SystemPageWndProc); - hFreeLdrPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_FREELDR_PAGE), hWnd, FreeLdrPageWndProc); - hServicesPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_SERVICES_PAGE), hWnd, ServicesPageWndProc); - hStartupPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_STARTUP_PAGE), hWnd, StartupPageWndProc); - hToolsPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_TOOLS_PAGE), hWnd, ToolsPageWndProc); + hGeneralPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_GENERAL_PAGE), hWnd, GeneralPageWndProc); EnableDialogTheme(hGeneralPage); + hSystemPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_SYSTEM_PAGE), hWnd, SystemPageWndProc); EnableDialogTheme(hSystemPage); + hFreeLdrPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_FREELDR_PAGE), hWnd, FreeLdrPageWndProc); EnableDialogTheme(hFreeLdrPage); + hServicesPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_SERVICES_PAGE), hWnd, ServicesPageWndProc); EnableDialogTheme(hServicesPage); + hStartupPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_STARTUP_PAGE), hWnd, StartupPageWndProc); EnableDialogTheme(hStartupPage); + hToolsPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_TOOLS_PAGE), hWnd, ToolsPageWndProc); EnableDialogTheme(hToolsPage); LoadString(hInst, IDS_MSCONFIG, szTemp, 256); SetWindowText(hWnd, szTemp);

10 years, 8 months

[dreimer] 61640: [MPLAY32] Three patches for mplay32 by Ricardo Hanke. Some more or less heavy tabs->spaces fixing and removing of spaces which are too much by myself CORE-7590 #resolve CORE-7594 #...

by dreimer＠svn.reactos.org

Author: dreimer Date: Wed Jan 15 23:59:44 2014 New Revision: 61640 URL: http://svn.reactos.org/svn/reactos?rev=61640&view=rev Log: [MPLAY32] Three patches for mplay32 by Ricardo Hanke. Some more or less heavy tabs->spaces fixing and removing of spaces which are too much by myself CORE-7590 #resolve CORE-7594 #resolve CORE-7613 #resolve Modified: trunk/reactos/base/applications/mplay32/lang/bg-BG.rc trunk/reactos/base/applications/mplay32/lang/cs-CZ.rc trunk/reactos/base/applications/mplay32/lang/de-DE.rc trunk/reactos/base/applications/mplay32/lang/en-US.rc trunk/reactos/base/applications/mplay32/lang/es-ES.rc trunk/reactos/base/applications/mplay32/lang/fr-FR.rc trunk/reactos/base/applications/mplay32/lang/he-IL.rc trunk/reactos/base/applications/mplay32/lang/it-IT.rc trunk/reactos/base/applications/mplay32/lang/ja-JP.rc trunk/reactos/base/applications/mplay32/lang/nl-NL.rc trunk/reactos/base/applications/mplay32/lang/no-NO.rc trunk/reactos/base/applications/mplay32/lang/pl-PL.rc trunk/reactos/base/applications/mplay32/lang/pt-BR.rc trunk/reactos/base/applications/mplay32/lang/ro-RO.rc trunk/reactos/base/applications/mplay32/lang/ru-RU.rc trunk/reactos/base/applications/mplay32/lang/sk-SK.rc trunk/reactos/base/applications/mplay32/lang/sq-AL.rc trunk/reactos/base/applications/mplay32/lang/sv-SE.rc trunk/reactos/base/applications/mplay32/lang/tr-TR.rc trunk/reactos/base/applications/mplay32/lang/uk-UA.rc trunk/reactos/base/applications/mplay32/lang/zh-CN.rc trunk/reactos/base/applications/mplay32/lang/zh-TW.rc trunk/reactos/base/applications/mplay32/mplay32.c trunk/reactos/base/applications/mplay32/mplay32.h trunk/reactos/base/applications/mplay32/resource.h Modified: trunk/reactos/base/applications/mplay32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/bg-BG.rc [iso-8859-1] Wed Jan 15 23:59:44 2014 @@ -12,6 +12,12 @@ MENUITEM "&ÐÐ°ÑÐ²Ð°ÑÑÐ½Ðµ", IDM_CLOSE_FILE MENUITEM SEPARATOR MENUITEM "ÐÐ·&ÑÐ¾Ð´", IDM_EXIT + END + POPUP "&Device" + BEGIN + MENUITEM "&Properties", IDM_DEVPROPS + MENUITEM SEPARATOR + MENUITEM "&Volume Control", IDM_VOLUMECTL END POPUP "ÐÐ¾Ð¼Ð¾&Ñ" BEGIN @@ -31,4 +37,5 @@ IDS_TOOLTIP_FORWARD "Ð¢ÑÑÑÐµÐ½Ðµ Ð½Ð°Ð¿ÑÐµÐ´" IDS_APPTITLE "ÐÑÐ»ÑÐ¸Ð¼ÐµÐ´Ð¸Ð¹Ð½Ð¸ÑÑ Ð²ÑÐ·Ð¿ÑÐ¾Ð¸Ð·Ð²Ð¾Ð´Ð¸ÑÐµÐ» Ð½Ð° Ð ÐµÐ°ÐºÑÐÐ¡" IDS_PLAY "ÐÑÐ·Ð¿ÑÐ¾Ð¸Ð·Ð²ÐµÐ¶Ð´Ð°Ð½Ðµ" + IDS_DEFAULTMCIERRMSG "No description is available for this error" END Modified: trunk/reactos/base/applications/mplay32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/cs-CZ.rc [iso-8859-1] Wed Jan 15 23:59:44 2014 @@ -13,6 +13,12 @@ MENUITEM "&ZavÅÃt", IDM_CLOSE_FILE MENUITEM SEPARATOR MENUITEM "&UkonÄit", IDM_EXIT + END + POPUP "&Device" + BEGIN + MENUITEM "&Properties", IDM_DEVPROPS + MENUITEM SEPARATOR + MENUITEM "&Volume Control", IDM_VOLUMECTL END POPUP "&NÃ¡povÄda" BEGIN @@ -32,4 +38,5 @@ IDS_TOOLTIP_FORWARD "PÅeskoÄit vpÅed" IDS_APPTITLE "ReactOS PÅehrÃ¡vaÄ multimÃ©diÃ" IDS_PLAY "PÅehrÃ¡t" + IDS_DEFAULTMCIERRMSG "No description is available for this error" END Modified: trunk/reactos/base/applications/mplay32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/de-DE.rc [iso-8859-1] Wed Jan 15 23:59:44 2014 @@ -8,6 +8,12 @@ MENUITEM "Sch&lieÃen", IDM_CLOSE_FILE MENUITEM SEPARATOR MENUITEM "&Beenden", IDM_EXIT + END + POPUP "&GerÃ¤t" + BEGIN + MENUITEM "&Eigenschaften", IDM_DEVPROPS + MENUITEM SEPARATOR + MENUITEM "&LautstÃ¤rkeregelung", IDM_VOLUMECTL END POPUP "&Hilfe" BEGIN @@ -27,4 +33,5 @@ IDS_TOOLTIP_FORWARD "Weiter" IDS_APPTITLE "ReactOS Multimedia Player" IDS_PLAY "Abspielen" + IDS_DEFAULTMCIERRMSG "FÃ¼r diesen Fehler steht keine Beschreibung zur VerfÃ¼gung" END Modified: trunk/reactos/base/applications/mplay32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/en-US.rc [iso-8859-1] Wed Jan 15 23:59:44 2014 @@ -8,6 +8,12 @@ MENUITEM "&Close", IDM_CLOSE_FILE MENUITEM SEPARATOR MENUITEM "&Exit", IDM_EXIT + END + POPUP "&Device" + BEGIN + MENUITEM "&Properties", IDM_DEVPROPS + MENUITEM SEPARATOR + MENUITEM "&Volume Control", IDM_VOLUMECTL END POPUP "&Help" BEGIN @@ -27,4 +33,5 @@ IDS_TOOLTIP_FORWARD "Skip Forward" IDS_APPTITLE "ReactOS Multimedia Player" IDS_PLAY "Play" + IDS_DEFAULTMCIERRMSG "No description is available for this error" END Modified: trunk/reactos/base/applications/mplay32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/es-ES.rc [iso-8859-1] Wed Jan 15 23:59:44 2014 @@ -8,6 +8,12 @@ MENUITEM "&Cerrar", IDM_CLOSE_FILE MENUITEM SEPARATOR MENUITEM "&Salir", IDM_EXIT + END + POPUP "&Device" + BEGIN + MENUITEM "&Properties", IDM_DEVPROPS + MENUITEM SEPARATOR + MENUITEM "&Volume Control", IDM_VOLUMECTL END POPUP "Ay&uda" BEGIN @@ -27,4 +33,5 @@ IDS_TOOLTIP_FORWARD "Marca siguiente" IDS_APPTITLE "Reproductor Multimedia de ReactOS" IDS_PLAY "Reproducir" + IDS_DEFAULTMCIERRMSG "No description is available for this error" END Modified: trunk/reactos/base/applications/mplay32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/fr-FR.rc [iso-8859-1] Wed Jan 15 23:59:44 2014 @@ -8,6 +8,12 @@ MENUITEM "&Fermer", IDM_CLOSE_FILE MENUITEM SEPARATOR MENUITEM "&Quitter", IDM_EXIT + END + POPUP "&Device" + BEGIN + MENUITEM "&Properties", IDM_DEVPROPS + MENUITEM SEPARATOR + MENUITEM "&Volume Control", IDM_VOLUMECTL END POPUP "&Aide" BEGIN @@ -27,4 +33,5 @@ IDS_TOOLTIP_FORWARD "Suivant" IDS_APPTITLE "ReactOS Multimedia Player" IDS_PLAY "Lire" + IDS_DEFAULTMCIERRMSG "No description is available for this error" END Modified: trunk/reactos/base/applications/mplay32/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/he-IL.rc [iso-8859-1] Wed Jan 15 23:59:44 2014 @@ -8,6 +8,12 @@ MENUITEM "&×¡×××¨", IDM_CLOSE_FILE MENUITEM SEPARATOR MENUITEM "&××¦×××", IDM_EXIT + END + POPUP "&Device" + BEGIN + MENUITEM "&Properties", IDM_DEVPROPS + MENUITEM SEPARATOR + MENUITEM "&Volume Control", IDM_VOLUMECTL END POPUP "&×¢××¨×" BEGIN @@ -27,4 +33,5 @@ IDS_TOOLTIP_FORWARD "××× ×§××××" IDS_APPTITLE "× ×× ×××××××××× ×©× ReactOS" IDS_PLAY "× ××" + IDS_DEFAULTMCIERRMSG "No description is available for this error" END Modified: trunk/reactos/base/applications/mplay32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/it-IT.rc [iso-8859-1] Wed Jan 15 23:59:44 2014 @@ -8,6 +8,12 @@ MENUITEM "&Chiudi", IDM_CLOSE_FILE MENUITEM SEPARATOR MENUITEM "&Esci", IDM_EXIT + END + POPUP "&Device" + BEGIN + MENUITEM "&Properties", IDM_DEVPROPS + MENUITEM SEPARATOR + MENUITEM "&Volume Control", IDM_VOLUMECTL END POPUP "&Aiuto" BEGIN @@ -27,4 +33,5 @@ IDS_TOOLTIP_FORWARD "Successivo" IDS_APPTITLE "Riproduttore multimediale ReactOS" IDS_PLAY "Riproduci" + IDS_DEFAULTMCIERRMSG "No description is available for this error" END Modified: trunk/reactos/base/applications/mplay32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/ja-JP.rc [iso-8859-1] Wed Jan 15 23:59:44 2014 @@ -8,6 +8,12 @@ MENUITEM "éãã(&C)", IDM_CLOSE_FILE MENUITEM SEPARATOR MENUITEM "çµäº(&E)", IDM_EXIT + END + POPUP "&Device" + BEGIN + MENUITEM "&Properties", IDM_DEVPROPS + MENUITEM SEPARATOR + MENUITEM "&Volume Control", IDM_VOLUMECTL END POPUP "ãã«ã(&H)" BEGIN @@ -27,4 +33,5 @@ IDS_TOOLTIP_FORWARD "åã¸ã¹ããã" IDS_APPTITLE "ReactOS ãã«ãã¡ãã£ã¢ ãã¬ã¼ã¤ã¼" IDS_PLAY "åç" + IDS_DEFAULTMCIERRMSG "No description is available for this error" END Modified: trunk/reactos/base/applications/mplay32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/nl-NL.rc [iso-8859-1] Wed Jan 15 23:59:44 2014 @@ -8,6 +8,12 @@ MENUITEM "&Sluiten", IDM_CLOSE_FILE MENUITEM SEPARATOR MENUITEM "&Afsluiten", IDM_EXIT + END + POPUP "&Device" + BEGIN + MENUITEM "&Properties", IDM_DEVPROPS + MENUITEM SEPARATOR + MENUITEM "&Volume Control", IDM_VOLUMECTL END POPUP "&Help" BEGIN @@ -27,4 +33,5 @@ IDS_TOOLTIP_FORWARD "Volgende" IDS_APPTITLE "ReactOS Multimedia Player" IDS_PLAY "Play" + IDS_DEFAULTMCIERRMSG "No description is available for this error" END Modified: trunk/reactos/base/applications/mplay32/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/no-NO.rc [iso-8859-1] Wed Jan 15 23:59:44 2014 @@ -8,6 +8,12 @@ MENUITEM "&Lukk", IDM_CLOSE_FILE MENUITEM SEPARATOR MENUITEM "&Avslutt", IDM_EXIT + END + POPUP "&Device" + BEGIN + MENUITEM "&Properties", IDM_DEVPROPS + MENUITEM SEPARATOR + MENUITEM "&Volume Control", IDM_VOLUMECTL END POPUP "&Hjelp" BEGIN @@ -27,4 +33,5 @@ IDS_TOOLTIP_FORWARD "Spole fremover" IDS_APPTITLE "ReactOS Multimedia avspiller" IDS_PLAY "Spill" + IDS_DEFAULTMCIERRMSG "No description is available for this error" END Modified: trunk/reactos/base/applications/mplay32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/pl-PL.rc [iso-8859-1] Wed Jan 15 23:59:44 2014 @@ -15,6 +15,12 @@ MENUITEM "&Zamknij", IDM_CLOSE_FILE MENUITEM SEPARATOR MENUITEM "&WyjdÅº", IDM_EXIT + END + POPUP "&Device" + BEGIN + MENUITEM "&Properties", IDM_DEVPROPS + MENUITEM SEPARATOR + MENUITEM "&Volume Control", IDM_VOLUMECTL END POPUP "&Pomoc" BEGIN @@ -34,4 +40,5 @@ IDS_TOOLTIP_FORWARD "Przeskocz do przodu" IDS_APPTITLE "ReactOS Multimedia Player" IDS_PLAY "OdtwÃ³rz" + IDS_DEFAULTMCIERRMSG "No description is available for this error" END Modified: trunk/reactos/base/applications/mplay32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/pt-BR.rc [iso-8859-1] Wed Jan 15 23:59:44 2014 @@ -10,6 +10,12 @@ MENUITEM "&Fechar", IDM_CLOSE_FILE MENUITEM SEPARATOR MENUITEM "&Sair", IDM_EXIT + END + POPUP "&Device" + BEGIN + MENUITEM "&Properties", IDM_DEVPROPS + MENUITEM SEPARATOR + MENUITEM "&Volume Control", IDM_VOLUMECTL END POPUP "A&juda" BEGIN @@ -29,4 +35,5 @@ IDS_TOOLTIP_FORWARD "Pular PrÃ³xima" IDS_APPTITLE "ReactOS Multimedia Player" IDS_PLAY "Executar" + IDS_DEFAULTMCIERRMSG "No description is available for this error" END Modified: trunk/reactos/base/applications/mplay32/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/ro-RO.rc [iso-8859-1] Wed Jan 15 23:59:44 2014 @@ -15,6 +15,12 @@ MENUITEM "Ã&nchide", IDM_CLOSE_FILE MENUITEM SEPARATOR MENUITEM "I&eÈire", IDM_EXIT + END + POPUP "&Device" + BEGIN + MENUITEM "&Properties", IDM_DEVPROPS + MENUITEM SEPARATOR + MENUITEM "&Volume Control", IDM_VOLUMECTL END POPUP "&?" BEGIN @@ -34,4 +40,5 @@ IDS_TOOLTIP_FORWARD "Salt la urmÄtor" IDS_APPTITLE "Lector multimedia" IDS_PLAY "Lecturare" + IDS_DEFAULTMCIERRMSG "No description is available for this error" END Modified: trunk/reactos/base/applications/mplay32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/ru-RU.rc [iso-8859-1] Wed Jan 15 23:59:44 2014 @@ -8,6 +8,12 @@ MENUITEM "&ÐÐ°ÐºÑÑÑÑ", IDM_CLOSE_FILE MENUITEM SEPARATOR MENUITEM "&ÐÑÑÐ¾Ð´", IDM_EXIT + END + POPUP "&Device" + BEGIN + MENUITEM "&Properties", IDM_DEVPROPS + MENUITEM SEPARATOR + MENUITEM "&Volume Control", IDM_VOLUMECTL END POPUP "&ÐÐ¾Ð¼Ð¾ÑÑ" BEGIN @@ -27,4 +33,5 @@ IDS_TOOLTIP_FORWARD "ÐÐ¿ÐµÑÐµÐ´" IDS_APPTITLE "ÐÑÐ¾Ð¸Ð³ÑÑÐ²Ð°ÑÐµÐ»Ñ ReactOS" IDS_PLAY "ÐÐ¾ÑÐ¿ÑÐ¾Ð¸Ð·Ð²ÐµÑÑÐ¸" + IDS_DEFAULTMCIERRMSG "No description is available for this error" END Modified: trunk/reactos/base/applications/mplay32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/sk-SK.rc [iso-8859-1] Wed Jan 15 23:59:44 2014 @@ -13,6 +13,12 @@ MENUITEM "&ZavrieÅ¥", IDM_CLOSE_FILE MENUITEM SEPARATOR MENUITEM "S&konÄiÅ¥", IDM_EXIT + END + POPUP "&Device" + BEGIN + MENUITEM "&Properties", IDM_DEVPROPS + MENUITEM SEPARATOR + MENUITEM "&Volume Control", IDM_VOLUMECTL END POPUP "&PomocnÃk" BEGIN @@ -32,4 +38,5 @@ IDS_TOOLTIP_FORWARD "PreskoÄiÅ¥ dopredu" IDS_APPTITLE "MultimediÃ¡lny prehrÃ¡vaÄ systÃ©mu ReactOS" IDS_PLAY "PrehraÅ¥" + IDS_DEFAULTMCIERRMSG "No description is available for this error" END Modified: trunk/reactos/base/applications/mplay32/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/sq-AL.rc [iso-8859-1] Wed Jan 15 23:59:44 2014 @@ -12,6 +12,12 @@ MENUITEM "&Mbylle", IDM_CLOSE_FILE MENUITEM SEPARATOR MENUITEM "&Dil", IDM_EXIT + END + POPUP "&Device" + BEGIN + MENUITEM "&Properties", IDM_DEVPROPS + MENUITEM SEPARATOR + MENUITEM "&Volume Control", IDM_VOLUMECTL END POPUP "&NdihmÃ«" BEGIN @@ -31,4 +37,5 @@ IDS_TOOLTIP_FORWARD "Kalo para" IDS_APPTITLE "Programi muzikor i ReactOS" IDS_PLAY "Fillo" + IDS_DEFAULTMCIERRMSG "No description is available for this error" END Modified: trunk/reactos/base/applications/mplay32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/sv-SE.rc [iso-8859-1] Wed Jan 15 23:59:44 2014 @@ -15,6 +15,12 @@ MENUITEM "&StÃ¤ng", IDM_CLOSE_FILE MENUITEM SEPARATOR MENUITEM "&Avsluta", IDM_EXIT + END + POPUP "&Device" + BEGIN + MENUITEM "&Properties", IDM_DEVPROPS + MENUITEM SEPARATOR + MENUITEM "&Volume Control", IDM_VOLUMECTL END POPUP "&HjÃ¤lp" BEGIN @@ -34,4 +40,5 @@ IDS_TOOLTIP_FORWARD "Spola fremÃ¥t" IDS_APPTITLE "ReactOS Multimediaspelare" IDS_PLAY "Play" + IDS_DEFAULTMCIERRMSG "No description is available for this error" END Modified: trunk/reactos/base/applications/mplay32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/tr-TR.rc [iso-8859-1] Wed Jan 15 23:59:44 2014 @@ -10,6 +10,12 @@ MENUITEM "&Kapat", IDM_CLOSE_FILE MENUITEM SEPARATOR MENUITEM "&ÃÄ±kÄ±Å", IDM_EXIT + END + POPUP "&Device" + BEGIN + MENUITEM "&Properties", IDM_DEVPROPS + MENUITEM SEPARATOR + MENUITEM "&Volume Control", IDM_VOLUMECTL END POPUP "&YardÄ±m" BEGIN @@ -29,4 +35,5 @@ IDS_TOOLTIP_FORWARD "Bir Sonraki" IDS_APPTITLE "Ortam OynatÄ±cÄ±sÄ±" IDS_PLAY "Ãal" + IDS_DEFAULTMCIERRMSG "No description is available for this error" END Modified: trunk/reactos/base/applications/mplay32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/uk-UA.rc [iso-8859-1] Wed Jan 15 23:59:44 2014 @@ -17,6 +17,12 @@ MENUITEM SEPARATOR MENUITEM "&ÐÐ¸ÑÑÐ´", IDM_EXIT END + POPUP "&Device" + BEGIN + MENUITEM "&Properties", IDM_DEVPROPS + MENUITEM SEPARATOR + MENUITEM "&Volume Control", IDM_VOLUMECTL + END POPUP "&ÐÐ¾Ð²ÑÐ´ÐºÐ°" BEGIN MENUITEM "&ÐÑÐ¾ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ñ...", IDM_ABOUT @@ -35,4 +41,5 @@ IDS_TOOLTIP_FORWARD "ÐÐ¿ÐµÑÐµÐ´" IDS_APPTITLE "ÐÑÐ¾Ð³ÑÐ°Ð²Ð°Ñ ReactOS" IDS_PLAY "ÐÑÐ´ÑÐ²Ð¾ÑÐ¸ÑÐ¸" + IDS_DEFAULTMCIERRMSG "No description is available for this error" END Modified: trunk/reactos/base/applications/mplay32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/zh-CN.rc [iso-8859-1] Wed Jan 15 23:59:44 2014 @@ -10,6 +10,12 @@ MENUITEM "å³é(&C)", IDM_CLOSE_FILE MENUITEM SEPARATOR MENUITEM "éåº(&E)", IDM_EXIT + END + POPUP "&Device" + BEGIN + MENUITEM "&Properties", IDM_DEVPROPS + MENUITEM SEPARATOR + MENUITEM "&Volume Control", IDM_VOLUMECTL END POPUP "å¸®å©(&H)" BEGIN @@ -29,4 +35,5 @@ IDS_TOOLTIP_FORWARD "ååè·³è¿" IDS_APPTITLE "ReactOS å¤åªä½ææ¾å¨" IDS_PLAY "ææ¾" + IDS_DEFAULTMCIERRMSG "No description is available for this error" END Modified: trunk/reactos/base/applications/mplay32/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/zh-TW.rc [iso-8859-1] Wed Jan 15 23:59:44 2014 @@ -17,6 +17,12 @@ MENUITEM SEPARATOR MENUITEM "çµæ(&E)", IDM_EXIT END + POPUP "&Device" + BEGIN + MENUITEM "&Properties", IDM_DEVPROPS + MENUITEM SEPARATOR + MENUITEM "&Volume Control", IDM_VOLUMECTL + END POPUP "èªªæ(&H)" BEGIN MENUITEM "éæ¼(&A)...", IDM_ABOUT @@ -35,4 +41,5 @@ IDS_TOOLTIP_FORWARD "å¿«è½" IDS_APPTITLE "ReactOS å¤åªé«ææ¾å¨" IDS_PLAY "ææ¾" + IDS_DEFAULTMCIERRMSG "No description is available for this error" END Modified: trunk/reactos/base/applications/mplay32/mplay32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/mplay32.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/mplay32.c [iso-8859-1] Wed Jan 15 23:59:44 2014 @@ -12,6 +12,7 @@ HINSTANCE hInstance = NULL; HWND hTrackBar = NULL; HWND hToolBar = NULL; +HMENU hMainMenu = NULL; TCHAR szAppTitle[256] = _T(""); TCHAR szPrevFile[MAX_PATH] = _T("\0"); WORD wDeviceId; @@ -19,17 +20,6 @@ BOOL bIsPaused = FALSE; UINT MaxFilePos = 0; -/* Known types table */ -static const TYPEBYEXT ExtTypes[] = -{ - { _T(".wav"), WAVE_FILE }, - { _T(".wave"), WAVE_FILE }, - { _T(".mid"), MIDI_FILE }, - { _T(".midi"), MIDI_FILE }, - { _T(".cda"), AUDIOCD_FILE }, - { _T(".avi"), AVI_FILE }, - { _T("\0"), 0 } -}; /* ToolBar Buttons */ static const TBBUTTON Buttons[] = @@ -44,6 +34,26 @@ {TBICON_FORWARD, IDC_FORWARD, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0} }; +void EnableMenuItems(void) +{ + MCI_GENERIC_PARMS mciGeneric; + DWORD dwError; + + EnableMenuItem(hMainMenu, IDM_CLOSE_FILE, MF_BYCOMMAND | MF_ENABLED); + + dwError = mciSendCommand(wDeviceId, MCI_CONFIGURE, MCI_TEST, (DWORD_PTR)&mciGeneric); + if (dwError == 0) + { + EnableMenuItem(hMainMenu, IDM_DEVPROPS, MF_BYCOMMAND | MF_ENABLED); + } +} + +void DisableMenuItems(void) +{ + EnableMenuItem(hMainMenu, IDM_CLOSE_FILE, MF_BYCOMMAND | MF_GRAYED); + EnableMenuItem(hMainMenu, IDM_DEVPROPS, MF_BYCOMMAND | MF_GRAYED); +} + static VOID SetImageList(HWND hwnd) { @@ -89,6 +99,21 @@ TB_SETIMAGELIST, 0, (LPARAM)hImageList)); +} + +static VOID +ShowMCIError(HWND hwnd, DWORD dwError) +{ + TCHAR szErrorMessage[256]; + TCHAR szTempMessage[300]; + + if (mciGetErrorString(dwError, szErrorMessage, sizeof(szErrorMessage) / sizeof(TCHAR)) == FALSE) + { + LoadString(hInstance, IDS_DEFAULTMCIERRMSG, szErrorMessage, sizeof(szErrorMessage) / sizeof(TCHAR)); + } + + _stprintf(szTempMessage, _T("MMSYS%u: %s"), dwError, szErrorMessage); + MessageBox(hwnd, szTempMessage, szAppTitle, MB_OK | MB_ICONEXCLAMATION); } static VOID @@ -141,43 +166,39 @@ SendMessage(hToolBar, TB_ADDBUTTONS, NumButtons, (LPARAM)Buttons); } -static UINT -IsSupportedFileExtension(LPTSTR lpFileName) -{ - TCHAR szExt[MAX_PATH]; - INT DotPos = 0, i, j; - - for (i = _tcslen(lpFileName); i >= 0; --i) - { - if (lpFileName[i] == '.') - { - DotPos = _tcslen(lpFileName) - i; - break; - } - } - - if (!DotPos) return UNSUPPORTED_FILE; - - szExt[DotPos + 1] = _T('\0'); - for (i = _tcslen(lpFileName), j = DotPos; j >= 0; --i, --j) - { - szExt[j] = lpFileName[i]; - } - - for (i = 0; ; i++) - { - if (ExtTypes[i].uType == UNSUPPORTED_FILE) - { - return UNSUPPORTED_FILE; - } - - if (_tcscmp(ExtTypes[i].szExt, szExt) == 0) - { - return ExtTypes[i].uType; - } - } - - return UNSUPPORTED_FILE; +static BOOL +IsSupportedFileExtension(LPTSTR lpFileName, LPTSTR lpDeviceName, LPDWORD dwSize) +{ + HKEY hKey; + DWORD dwType; + TCHAR *pathend; + + pathend = _tcsrchr(lpFileName, '.'); + + if (pathend == NULL) + { + return FALSE; + } + + pathend++; + + if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\MCI Extensions"), 0, KEY_READ, &hKey) == ERROR_SUCCESS) + { + if (RegQueryValueEx(hKey, pathend, NULL, &dwType, (LPBYTE)lpDeviceName, dwSize) == ERROR_SUCCESS) + { + RegCloseKey(hKey); + if (dwType != REG_SZ) + { + return FALSE; + } + + return TRUE; + } + + RegCloseKey(hKey); + } + + return FALSE; } static DWORD @@ -192,6 +213,8 @@ if (dwError) return dwError; bIsOpened = FALSE; } + + DisableMenuItems(); return TRUE; } @@ -218,7 +241,7 @@ dwError = mciSendCommand(0, MCI_OPEN, MCI_OPEN_TYPE | MCI_OPEN_ELEMENT | MCI_WAIT, (DWORD_PTR)&mciOpen); if (dwError != 0) { - MessageBox(0, _T("Can't open device! (1)"), NULL, MB_OK); + ShowMCIError(hwnd, dwError); return dwError; } @@ -227,7 +250,7 @@ dwError = mciSendCommand(mciOpen.wDeviceID, MCI_STATUS, MCI_STATUS_ITEM | MCI_WAIT, (DWORD_PTR)&mciStatus); if (dwError != 0) { - MessageBox(0, _T("Can't open device! (2)"), NULL, MB_OK); + ShowMCIError(hwnd, dwError); return dwError; } @@ -261,6 +284,9 @@ wDeviceId = mciOpen.wDeviceID; bIsOpened = TRUE; _tcscpy(szPrevFile, lpFileName); + + EnableMenuItems(); + return TRUE; } @@ -288,14 +314,14 @@ dwError = mciSendCommand(wDeviceId, MCI_SEEK, MCI_WAIT | MCI_TO, (DWORD_PTR)&mciSeek); if (dwError != 0) { - MessageBox(hwnd, _T("SeekPlayback: Can't seek!"), NULL, MB_OK); + ShowMCIError(hwnd, dwError); } mciPlay.dwCallback = (DWORD_PTR)hwnd; dwError = mciSendCommand(wDeviceId, MCI_PLAY, MCI_NOTIFY, (DWORD_PTR)&mciPlay); if (dwError != 0) { - MessageBox(hwnd, _T("SeekPlayback: Can't play!"), NULL, MB_OK); + ShowMCIError(hwnd, dwError); } } } @@ -357,7 +383,7 @@ dwError = mciSendCommand(wDeviceId, MCI_PAUSE, MCI_WAIT, (DWORD_PTR)&mciGeneric); if (dwError != 0) { - MessageBox(hwnd, _T("Can't pause!"), NULL, MB_OK); + ShowMCIError(hwnd, dwError); } bIsPaused = TRUE; } @@ -374,9 +400,22 @@ dwError = mciSendCommand(wDeviceId, MCI_RESUME, MCI_WAIT, (DWORD_PTR)&mciGeneric); if (dwError != 0) { - MessageBox(hwnd, _T("Can't resume!"), NULL, MB_OK); + ShowMCIError(hwnd, dwError); } bIsPaused = FALSE; + } +} + +static VOID +ShowDeviceProperties(HWND hwnd) +{ + MCI_GENERIC_PARMS mciGeneric; + DWORD dwError; + + dwError = mciSendCommand(wDeviceId, MCI_CONFIGURE, MCI_WAIT, (DWORD_PTR)&mciGeneric); + if (dwError != 0) + { + MessageBox(0, _T("Can't display the device properties!"), NULL, MB_OK); } } @@ -407,7 +446,9 @@ { MCI_PLAY_PARMS mciPlay; TCHAR szLocalFileName[MAX_PATH]; - UINT FileType; + TCHAR szDeviceName[MAX_PATH]; + DWORD dwSize; + BOOL IsSupported; MCIERROR mciError; if (lpFileName == NULL) @@ -427,25 +468,13 @@ return; } - FileType = IsSupportedFileExtension(szLocalFileName); - - switch (FileType) - { - case UNSUPPORTED_FILE: - MessageBox(hwnd, _T("Unsupported format!"), NULL, MB_OK); - return; - case WAVE_FILE: - OpenMciDevice(hwnd, _T("waveaudio"), szLocalFileName); - break; - case MIDI_FILE: - OpenMciDevice(hwnd, _T("sequencer"), szLocalFileName); - break; - case AUDIOCD_FILE: - OpenMciDevice(hwnd, _T("cdaudio"), szLocalFileName); - break; - case AVI_FILE: - OpenMciDevice(hwnd, _T("avivideo"), szLocalFileName); - break; + dwSize = sizeof(szDeviceName) - 2; + _tcsnset(szDeviceName, _T('\0'), dwSize / sizeof(TCHAR)); + IsSupported = IsSupportedFileExtension(szLocalFileName, szDeviceName, &dwSize); + + if (IsSupported == TRUE) + { + OpenMciDevice(hwnd, szDeviceName, szLocalFileName); } SetTimer(hwnd, IDT_PLAYTIMER, 100, (TIMERPROC) PlayTimerProc); @@ -459,7 +488,7 @@ mciError = mciSendCommand(wDeviceId, MCI_PLAY, MCI_NOTIFY | MCI_FROM /*| MCI_TO*/, (DWORD_PTR)&mciPlay); if (mciError != 0) { - MessageBox(hwnd, _T("Can't play!"), NULL, MB_OK); + ShowMCIError(hwnd, mciError); } } @@ -502,7 +531,20 @@ { case WM_CREATE: InitControls(hwnd); + hMainMenu = GetMenu(hwnd); break; + + case WM_DROPFILES: + { + HDROP drophandle; + TCHAR droppedfile[MAX_PATH]; + + drophandle = (HDROP)wParam; + DragQueryFile(drophandle, 0, droppedfile, sizeof(droppedfile)); + DragFinish(drophandle); + PlayFile(hwnd, droppedfile); + break; + } case WM_NOTIFY: { @@ -641,6 +683,14 @@ _tcscpy(szPrevFile, _T("\0")); break; + case IDM_DEVPROPS: + ShowDeviceProperties(hwnd); + break; + + case IDM_VOLUMECTL: + ShellExecute(hwnd, NULL, _T("SNDVOL32.EXE"), NULL, NULL, SW_SHOWNORMAL); + break; + case IDM_ABOUT: { HICON mplayIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_MAIN)); @@ -670,6 +720,7 @@ TCHAR szClassName[] = _T("ROSMPLAY32"); HWND hwnd; MSG msg; + DWORD dwError; hInstance = hInst; @@ -699,6 +750,16 @@ hInstance, NULL); + DragAcceptFiles(hwnd, TRUE); + + DisableMenuItems(); + + dwError = SearchPath(NULL, _T("SNDVOL32.EXE"), NULL, 0, NULL, NULL); + if (dwError == 0) + { + EnableMenuItem(hMainMenu, IDM_VOLUMECTL, MF_BYCOMMAND | MF_GRAYED); + } + /* Show it */ ShowWindow(hwnd, SW_SHOW); UpdateWindow(hwnd); Modified: trunk/reactos/base/applications/mplay32/mplay32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/mplay32.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/mplay32.h [iso-8859-1] Wed Jan 15 23:59:44 2014 @@ -3,9 +3,11 @@ #include <winbase.h> #include <winuser.h> #include <wingdi.h> +#include <winreg.h> #include <commdlg.h> #include <shellapi.h> #include <mmsystem.h> +#include <digitalv.h> #include <commctrl.h> #include <tchar.h> Modified: trunk/reactos/base/applications/mplay32/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/resource.h [iso-8859-1] Wed Jan 15 23:59:44 2014 @@ -24,6 +24,7 @@ #define IDS_TOOLTIP_FORWARD 107 #define IDS_ALL_TYPES_FILTER 108 #define IDS_PLAY 109 +#define IDS_DEFAULTMCIERRMSG 110 /* Menu */ #define IDR_MAINMENU 500 @@ -33,6 +34,8 @@ #define IDM_CLOSE_FILE 1001 #define IDM_EXIT 1002 #define IDM_ABOUT 1003 +#define IDM_VOLUMECTL 1004 +#define IDM_DEVPROPS 1005 /* ToolBar Icons */ #define TBICON_PLAY 0

10 years, 8 months

[dreimer] 61639: [NETSHELL] netshell - update icons by Lee Schroeder CORE-7152 #resolve

by dreimer＠svn.reactos.org

Author: dreimer Date: Wed Jan 15 23:31:18 2014 New Revision: 61639 URL: http://svn.reactos.org/svn/reactos?rev=61639&view=rev Log: [NETSHELL] netshell - update icons by Lee Schroeder CORE-7152 #resolve Modified: trunk/reactos/dll/win32/netshell/res/neterror.ico trunk/reactos/dll/win32/netshell/res/netidle.ico trunk/reactos/dll/win32/netshell/res/netoff.ico trunk/reactos/dll/win32/netshell/res/netrec.ico trunk/reactos/dll/win32/netshell/res/nettrans.ico trunk/reactos/dll/win32/netshell/res/nettrrec.ico Modified: trunk/reactos/dll/win32/netshell/res/neterror.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/res/net… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/netshell/res/netidle.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/res/net… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/netshell/res/netoff.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/res/net… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/netshell/res/netrec.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/res/net… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/netshell/res/nettrans.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/res/net… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/netshell/res/nettrrec.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/res/net… ============================================================================== Binary files - no diff available.

10 years, 8 months

[dreimer] 61638: [KBDHEB] Hebrew keyboard layout revamp by Baruch Rutman CORE-7218 #resolve

by dreimer＠svn.reactos.org

Author: dreimer Date: Wed Jan 15 23:23:51 2014 New Revision: 61638 URL: http://svn.reactos.org/svn/reactos?rev=61638&view=rev Log: [KBDHEB] Hebrew keyboard layout revamp by Baruch Rutman CORE-7218 #resolve Modified: trunk/reactos/dll/keyboard/kbdheb/kbdheb.c Modified: trunk/reactos/dll/keyboard/kbdheb/kbdheb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdheb/kbdheb… ============================================================================== --- trunk/reactos/dll/keyboard/kbdheb/kbdheb.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdheb/kbdheb.c [iso-8859-1] Wed Jan 15 23:23:51 2014 @@ -1,8 +1,9 @@ /* - * ReactOS Hebrew ASCII Keyboard layout - * Copyright (C) 2005 ReactOS + * ReactOS Hebrew Keyboard layout + * Copyright (C) 2005 - 2013 ReactOS * License: LGPL, see: LGPL.txt - * author: Royce Mitchell III + * Authors: Royce Mitchell III + * Baruch Rutman 2013 * * Thanks to: http://www.barcodeman.com/altek/mule/scandoc.php * and http://win.tue.nl/~aeb/linux/kbd/scancodes-1.html @@ -92,7 +93,10 @@ QOF, RESH, SHIN, - TAV + TAV, + + // symbols + SHEQEL = 0x20AA }; ROSDATA USHORT scancode_to_vk[] = @@ -291,23 +295,23 @@ /* Specials */ /* Ctrl-_ generates ? */ - { VK_OEM_PLUS ,0, {'=', '+'} }, - { VK_OEM_1 ,0, {PEY_SOFIT, PEY_SOFIT} }, - { 'Q' ,0, {TAV, TAV} }, - { 'W' ,0, {TSADI_SOFIT, TSADI_SOFIT} }, - { VK_OEM_7 ,0, {'\'','\"'} }, - { VK_OEM_3 ,0, {'`', '~'} }, - { VK_OEM_COMMA ,0, {',', '<'} }, - { VK_OEM_PERIOD ,0, {'.', '>'} }, - { VK_OEM_2 ,0, {'/', '?'} }, + { VK_OEM_PLUS, 0, {'=', '+'} }, + { VK_OEM_1, 0, {PEY_SOFIT, ':'} }, + { 'Q', 0, {TAV, '>'} }, + { 'W', 0, {TSADI_SOFIT, '<'} }, + { VK_OEM_7, CAPLOK, {'\'','W'} }, + { VK_OEM_3, 0, {';', '~'} }, + { VK_OEM_COMMA, 0, {',', '\"'} }, + { VK_OEM_PERIOD, 0, {'.', '?'} }, + { VK_OEM_2, CAPLOK, {'/', 'Q'} }, /* Keys that do not have shift states */ - { VK_TAB ,0, {'\t','\t'} }, - { VK_ADD ,0, {'+', '+'} }, + { VK_TAB, 0, {'\t','\t'} }, + { VK_ADD, 0, {'+', '+'} }, { VK_SUBTRACT,0, {'-', '-'} }, { VK_MULTIPLY,0, {'*', '*'} }, - { VK_DIVIDE ,0, {'/', '/'} }, - { VK_ESCAPE ,0, {0x1b,0x1b} }, - { VK_SPACE ,0, {' ', ' '} }, + { VK_DIVIDE, 0, {'/', '/'} }, + { VK_ESCAPE, 0, {0x1b,0x1b} }, + { VK_SPACE, 0, {' ', ' '} }, { 0, 0 } }; @@ -325,32 +329,32 @@ /* Normal, Shifted, Ctrl, C-S-x */ /* The alphabet */ - { 'A', 0, {SHIN, SHIN, 0x01, 0x01} }, - { 'B', 0, {NUN, NUN, 0x02, 0x02} }, - { 'C', 0, {BET, BET, 0x03, 0x03} }, - { 'D', 0, {GIMEL, GIMEL, 0x04, 0x04} }, - { 'E', 0, {QOF, QOF, 0x05, 0x05} }, - { 'F', 0, {KAF, KAF, 0x06, 0x06} }, - { 'G', 0, {AYIN, AYIN, 0x07, 0x07} }, - { 'H', 0, {YUD, YUD, 0x08, 0x08} }, - { 'I', 0, {NUN_SOFIT, NUN_SOFIT, 0x09, 0x09} }, - { 'J', 0, {HET, HET, 0x0a, 0x0a} }, - { 'K', 0, {LAMED, LAMED, 0x0b, 0x0b} }, - { 'L', 0, {KAF_SOFIT, KAF_SOFIT, 0x0c, 0x0c} }, - { 'M', 0, {TSADI, TSADI, 0x0d, 0x0d} }, - { 'N', 0, {MEM, MEM, 0x0e, 0x0e} }, - { 'O', 0, {MEM_SOFIT, MEM_SOFIT, 0x0f, 0x0f} }, - { 'P', 0, {PEY, PEY, 0x10, 0x10} }, - { VK_OEM_2, 0, {'/', '?', 0x11, 0x11} }, - { 'R', 0, {RESH, RESH, 0x12, 0x12} }, - { 'S', 0, {DALET, DALET, 0x13, 0x13} }, - { 'T', 0, {ALEF, ALEF, 0x14, 0x14} }, - { 'U', 0, {VAV, VAV, 0x15, 0x15} }, - { 'V', 0, {HEY, HEY, 0x16, 0x16} }, - { VK_OEM_7, 0, {'\'', '\"', 0x17, 0x17} }, - { 'X', 0, {SAMEKH, SAMEKH, 0x18, 0x18} }, - { 'Y', 0, {TET, TET, 0x19, 0x19} }, - { 'Z', 0, {ZAYIN, ZAYIN, 0x1a, 0x1a} }, + { 'A', CAPLOK, {SHIN, 'A', 0x01, 0x01} }, + { 'B', CAPLOK, {NUN, 'B', 0x02, 0x02} }, + { 'C', CAPLOK, {BET, 'C', 0x03, 0x03} }, + { 'D', CAPLOK, {GIMEL, 'D', 0x04, 0x04} }, + { 'E', CAPLOK, {QOF, 'E', 0x05, 0x05} }, + { 'F', CAPLOK, {KAF, 'F', 0x06, 0x06} }, + { 'G', CAPLOK, {AYIN, 'G', 0x07, 0x07} }, + { 'H', CAPLOK, {YUD, 'H', 0x08, 0x08} }, + { 'I', CAPLOK, {NUN_SOFIT, 'I', 0x09, 0x09} }, + { 'J', CAPLOK, {HET, 'J', 0x0a, 0x0a} }, + { 'K', CAPLOK, {LAMED, 'K', 0x0b, 0x0b} }, + { 'L', CAPLOK, {KAF_SOFIT, 'L', 0x0c, 0x0c} }, + { 'M', CAPLOK, {TSADI, 'M', 0x0d, 0x0d} }, + { 'N', CAPLOK, {MEM, 'N', 0x0e, 0x0e} }, + { 'O', CAPLOK, {MEM_SOFIT, 'O', 0x0f, 0x0f} }, + { 'P', CAPLOK, {PEY, 'P', 0x10, 0x10} }, + { VK_OEM_2, CAPLOK, {'/', 'Q', 0x11, 0x11} }, + { 'R', CAPLOK, {RESH, 'R', 0x12, 0x12} }, + { 'S', CAPLOK, {DALET, 'S', 0x13, 0x13} }, + { 'T', CAPLOK, {ALEF, 'T', 0x14, 0x14} }, + { 'U', CAPLOK, {VAV, 'U', 0x15, 0x15} }, + { 'V', CAPLOK, {HEY, 'V', 0x16, 0x16} }, + { VK_OEM_7, CAPLOK, {'\'', 'W', 0x17, 0x17} }, + { 'X', CAPLOK, {SAMEKH, 'X', 0x18, 0x18} }, + { 'Y', CAPLOK, {TET, 'Y', 0x19, 0x19} }, + { 'Z', CAPLOK, {ZAYIN, 'Z', 0x1a, 0x1a} }, /* Legacy Ascii generators */ { '2', 0, {'2', '@', WCH_NONE, 0} }, @@ -496,7 +500,7 @@ MAKELONG(0, 1), /* Version 1.0 */ - /* Ligatures -- Hebrew doesn't have any */ + /* Ligatures -- The Standard Hebrew Keyboard doesn't have any */ 0, 0, NULL

10 years, 8 months

[spetreolle] 61637: [THEMES] - Auto-start the Themes services - Enable "Show window contents while dragging"

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Wed Jan 15 23:12:01 2014 New Revision: 61637 URL: http://svn.reactos.org/svn/reactos?rev=61637&view=rev Log: [THEMES] - Auto-start the Themes services - Enable "Show window contents while dragging" Modified: trunk/reactos/boot/bootdata/hivedef.inf trunk/reactos/boot/bootdata/hivesys.inf Modified: trunk/reactos/boot/bootdata/hivedef.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivedef.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivedef.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivedef.inf [iso-8859-1] Wed Jan 15 23:12:01 2014 @@ -54,7 +54,7 @@ HKCU,"Control Panel\Desktop","CoolSwitchColumns",2,"7" HKCU,"Control Panel\Desktop","CoolSwitchRows",2,"3" HKCU,"Control Panel\Desktop","CursorBlinkRate",2,"530" -HKCU,"Control Panel\Desktop","DragFullWindows",2,"0" +HKCU,"Control Panel\Desktop","DragFullWindows",2,"1" HKCU,"Control Panel\Desktop","DragHeight",0x00000000,"4" HKCU,"Control Panel\Desktop","DragWidth",0x00000000,"4" HKCU,"Control Panel\Desktop","PaintDesktopVersion",0x00010001,"0" Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] Wed Jan 15 23:12:01 2014 @@ -1831,7 +1831,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Themes","Group",0x00000000,"UIGroup" HKLM,"SYSTEM\CurrentControlSet\Services\Themes","ImagePath",0x00020000,"%SystemRoot%\system32\thmsvc.exe" HKLM,"SYSTEM\CurrentControlSet\Services\Themes","ObjectName",0x00000000,"LocalSystem" -HKLM,"SYSTEM\CurrentControlSet\Services\Themes","Start",0x00010001,0x00000003 +HKLM,"SYSTEM\CurrentControlSet\Services\Themes","Start",0x00010001,0x00000002 HKLM,"SYSTEM\CurrentControlSet\Services\Themes","Type",0x00010001,0x00000020 ; Sound Blaster (NT4)

10 years, 8 months

[dreimer] 61636: [FONTVIEW] fontview - Add icon to main window by Lee Schroeder CORE-7400 #resolve

by dreimer＠svn.reactos.org

Author: dreimer Date: Wed Jan 15 23:09:46 2014 New Revision: 61636 URL: http://svn.reactos.org/svn/reactos?rev=61636&view=rev Log: [FONTVIEW] fontview - Add icon to main window by Lee Schroeder CORE-7400 #resolve Modified: trunk/reactos/base/applications/fontview/fontview.c trunk/reactos/base/applications/fontview/resource.h Modified: trunk/reactos/base/applications/fontview/fontview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… ============================================================================== --- trunk/reactos/base/applications/fontview/fontview.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/fontview.c [iso-8859-1] Wed Jan 15 23:09:46 2014 @@ -197,12 +197,12 @@ wincl.cbClsExtra = 0; wincl.cbWndExtra = 0; wincl.hInstance = hThisInstance; - wincl.hIcon = LoadIcon (NULL, IDI_APPLICATION); + wincl.hIcon = LoadIcon (GetModuleHandle(NULL), MAKEINTRESOURCE(IDI_TT)); wincl.hCursor = LoadCursor (NULL, IDC_ARROW); wincl.hbrBackground = (HBRUSH)COLOR_BACKGROUND; wincl.lpszMenuName = NULL; wincl.lpszClassName = g_szFontViewClassName; - wincl.hIconSm = LoadIcon (NULL, IDI_APPLICATION); + wincl.hIconSm = LoadIcon (GetModuleHandle(NULL), MAKEINTRESOURCE(IDI_TT)); /* Register the window class, and if it fails quit the program */ if (!RegisterClassExW (&wincl)) Modified: trunk/reactos/base/applications/fontview/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… ============================================================================== --- trunk/reactos/base/applications/fontview/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/resource.h [iso-8859-1] Wed Jan 15 23:09:46 2014 @@ -13,3 +13,5 @@ #define IDS_CHARSLOWER 700 #define IDS_CHARSUPPER 701 #define IDS_SPECIALCHARS 702 + +#define IDI_TT 800

10 years, 8 months

← Newer
1
...
23
24
25
26
27
28
29
...
43
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2014