Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gvg] 14796: Sync to Wine-20040419:
by gvg＠svn.reactos.com 25 Apr '05

25 Apr '05

Sync to Wine-20040419: Jon Griffiths <jon_p_griffiths(a)yahoo.com> - -Wunsigned fixes. Alexandre Julliard <julliard(a)winehq.org> - Use the correct file name in the "generated automatically" comments. - Don't crash on xrealloc(0) (found by Jon Griffiths). Marcus Meissner <meissner(a)suse.de> - Use correct movw instead of movl when handling segment registers. Modified: trunk/reactos/tools/winebuild/build.h Modified: trunk/reactos/tools/winebuild/main.c Modified: trunk/reactos/tools/winebuild/relay.c Modified: trunk/reactos/tools/winebuild/res16.c Modified: trunk/reactos/tools/winebuild/res32.c Modified: trunk/reactos/tools/winebuild/spec32.c Modified: trunk/reactos/tools/winebuild/utils.c _____ Modified: trunk/reactos/tools/winebuild/build.h --- trunk/reactos/tools/winebuild/build.h 2005-04-25 07:58:24 UTC (rev 14795) +++ trunk/reactos/tools/winebuild/build.h 2005-04-25 08:26:29 UTC (rev 14796) @@ -98,7 +98,7 @@ int nb_entry_points; /* number of used entry points */ int alloc_entry_points; /* number of allocated entry points */ int nb_names; /* number of entry points with names */ - int nb_resources; /* number of resources */ + unsigned int nb_resources; /* number of resources */ int characteristics; /* characteristics for the PE header */ int subsystem; /* subsystem id */ int subsystem_major; /* subsystem version major number */ @@ -203,6 +203,7 @@ extern int kill_at; extern char *input_file_name; +extern char *spec_file_name; extern const char *output_file_name; extern char **debug_channels; extern char **lib_path; _____ Modified: trunk/reactos/tools/winebuild/main.c --- trunk/reactos/tools/winebuild/main.c 2005-04-25 07:58:24 UTC (rev 14795) +++ trunk/reactos/tools/winebuild/main.c 2005-04-25 08:26:29 UTC (rev 14796) @@ -56,6 +56,7 @@ char **lib_path = NULL; char *input_file_name = NULL; +char *spec_file_name = NULL; const char *output_file_name = NULL; char *ld_command = "ld"; @@ -65,7 +66,6 @@ static const char *current_src_dir; static int nb_res_files; static char **res_files; -static char *spec_file_name; /* execution mode */ enum exec_mode_values _____ Modified: trunk/reactos/tools/winebuild/relay.c --- trunk/reactos/tools/winebuild/relay.c 2005-04-25 07:58:24 UTC (rev 14795) +++ trunk/reactos/tools/winebuild/relay.c 2005-04-25 08:26:29 UTC (rev 14796) @@ -171,7 +171,7 @@ else fprintf( outfile, "\tmovw " __ASM_NAME("CallTo16_TebSelector") ", %%fs\n" ); - fprintf( outfile, "\t.byte 0x64\n\tmovl (%d),%%gs\n", STRUCTOFFSET(TEB,gs_sel) ); + fprintf( outfile, "\t.byte 0x64\n\tmov (%d),%%gs\n", STRUCTOFFSET(TEB,gs_sel) ); /* Get address of wine_ldt_copy array into %ecx */ if ( UsePIC ) @@ -481,7 +481,7 @@ fprintf( outfile, "\tpushl %%ebx\n" ); fprintf( outfile, "\tpushl %%esi\n" ); fprintf( outfile, "\tpushl %%edi\n" ); - fprintf( outfile, "\t.byte 0x64\n\tmovl %%gs,(%d)\n", STRUCTOFFSET(TEB,gs_sel) ); + fprintf( outfile, "\t.byte 0x64\n\tmov %%gs,(%d)\n", STRUCTOFFSET(TEB,gs_sel) ); /* Setup exception frame */ fprintf( outfile, "\t.byte 0x64\n\tpushl (%d)\n", STACKOFFSET ); @@ -635,9 +635,9 @@ #endif fprintf( outfile, "\tmovw %%di,%%es\n" ); - fprintf( outfile, "\t.byte 0x2e\n\tmovl " __ASM_NAME("CallTo16_TebSelector") "-" __ASM_NAME("Call16_Ret_Start") ",%%fs\n" ); + fprintf( outfile, "\t.byte 0x2e\n\tmov " __ASM_NAME("CallTo16_TebSelector") "-" __ASM_NAME("Call16_Ret_Start") ",%%fs\n" ); - fprintf( outfile, "\t.byte 0x64\n\tmovl (%d),%%gs\n", STRUCTOFFSET(TEB,gs_sel) ); + fprintf( outfile, "\t.byte 0x64\n\tmov (%d),%%gs\n", STRUCTOFFSET(TEB,gs_sel) ); /* Restore the 32-bit stack */ _____ Modified: trunk/reactos/tools/winebuild/res16.c --- trunk/reactos/tools/winebuild/res16.c 2005-04-25 07:58:24 UTC (rev 14795) +++ trunk/reactos/tools/winebuild/res16.c 2005-04-25 08:26:29 UTC (rev 14796) @@ -215,7 +215,7 @@ /* build the 2-level (type,name) resource tree */ static struct res_tree *build_resource_tree( DLLSPEC *spec ) { - int i; + unsigned int i; struct res_tree *tree; struct res_type *type = NULL; @@ -270,7 +270,8 @@ { const struct resource *res; unsigned char *buffer, *p; - int i, total; + unsigned int i; + int total; if (!spec->nb_resources) return 0; @@ -292,8 +293,8 @@ /* output the resource definitions */ int output_res16_directory( unsigned char *buffer, DLLSPEC *spec ) { - int i, offset, res_offset = 0; - unsigned int j; + int offset, res_offset = 0; + unsigned int i, j; struct res_tree *tree; const struct res_type *type; const struct resource *res; _____ Modified: trunk/reactos/tools/winebuild/res32.c --- trunk/reactos/tools/winebuild/res32.c 2005-04-25 07:58:24 UTC (rev 14795) +++ trunk/reactos/tools/winebuild/res32.c 2005-04-25 08:26:29 UTC (rev 14796) @@ -267,7 +267,7 @@ /* build the 3-level (type,name,language) resource tree */ static struct res_tree *build_resource_tree( DLLSPEC *spec ) { - int i; + unsigned int i; struct res_tree *tree; struct res_type *type = NULL; struct res_name *name = NULL; @@ -297,7 +297,7 @@ /* free the resource tree */ static void free_resource_tree( struct res_tree *tree ) { - int i; + unsigned int i; for (i = 0; i < tree->nb_types; i++) free( tree->types[i].names ); free( tree->types ); @@ -318,8 +318,8 @@ /* output the resource definitions */ void output_resources( FILE *outfile, DLLSPEC *spec ) { - int i, j, k, nb_id_types; - unsigned int n, offset, data_offset; + int j, k, nb_id_types; + unsigned int i, n, offset, data_offset; struct res_tree *tree; struct res_type *type; struct res_name *name; _____ Modified: trunk/reactos/tools/winebuild/spec32.c --- trunk/reactos/tools/winebuild/spec32.c 2005-04-25 07:58:24 UTC (rev 14795) +++ trunk/reactos/tools/winebuild/spec32.c 2005-04-25 08:26:29 UTC (rev 14796) @@ -846,8 +846,11 @@ const char *name; int i; - fprintf(outfile, "; File generated automatically from %s; do not edit!\n\n", - input_file_name ); + if (spec_file_name) + fprintf( outfile, "; File generated automatically from %s; do not edit!\n\n", + spec_file_name ); + else + fprintf( outfile, "; File generated automatically; do not edit!\n\n" ); fprintf(outfile, "LIBRARY %s\n\n", spec->file_name); _____ Modified: trunk/reactos/tools/winebuild/utils.c --- trunk/reactos/tools/winebuild/utils.c 2005-04-25 07:58:24 UTC (rev 14795) +++ trunk/reactos/tools/winebuild/utils.c 2005-04-25 08:26:29 UTC (rev 14796) @@ -48,7 +48,7 @@ void *xrealloc (void *ptr, size_t size) { void *res = realloc (ptr, size); - if (res == NULL) + if (size && res == NULL) { fprintf (stderr, "Virtual memory exhausted.\n"); exit (1); @@ -145,9 +145,9 @@ /* output a standard header for generated files */ void output_standard_file_header( FILE *outfile ) { - if (input_file_name) + if (spec_file_name) fprintf( outfile, "/* File generated automatically from %s; do not edit! */\n", - input_file_name ); + spec_file_name ); else fprintf( outfile, "/* File generated automatically; do not edit! */\n" ); fprintf( outfile,

1 0

[gvg] 14795: SVN maintenance
by gvg＠svn.reactos.com 25 Apr '05

25 Apr '05

SVN maintenance Property changes on: trunk/reactos/drivers/video/miniport/xboxvmp ___________________________________________________________________ Name: svn:ignore - junk.tmp base.tmp temp.exp xboxvmp.coff *.o *.sym *.sys *.map + junk.tmp base.tmp temp.exp xboxvmp.coff xboxvmp.a *.o *.sym *.sys *.map .*.d

1 0

[gvg] 14794: SVN maintenance
by gvg＠svn.reactos.com 25 Apr '05

25 Apr '05

SVN maintenance Property changes on: trunk/reactos/ntoskrnl/dbgk ___________________________________________________________________ Name: svn:ignore + *.d *.o *.sym Property changes on: trunk/reactos/ntoskrnl/dbgk/dbgkutil.c ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Property changes on: trunk/reactos/ntoskrnl/dbgk/debug.c ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native

1 0

[weiden] 14793: add missing typecast
by weiden＠svn.reactos.com 24 Apr '05

24 Apr '05

add missing typecast Modified: trunk/reactos/tools/raddr2line.c _____ Modified: trunk/reactos/tools/raddr2line.c --- trunk/reactos/tools/raddr2line.c 2005-04-24 14:49:56 UTC (rev 14792) +++ trunk/reactos/tools/raddr2line.c 2005-04-24 20:12:14 UTC (rev 14793) @@ -57,7 +57,7 @@ size_t i; for ( i = 0; i < PEFileHeader->NumberOfSections; i++ ) { - if ( 0 == strcmp ( PESectionHeaders[i].Name, ".rossym" ) ) + if ( 0 == strcmp ( (char*)PESectionHeaders[i].Name, ".rossym" ) ) return &PESectionHeaders[i]; } return NULL;

1 0

[ekohl] 14792: Implement the time format page for the regional settings control panel.
by ekohl＠svn.reactos.com 24 Apr '05

24 Apr '05

Implement the time format page for the regional settings control panel. Modified: trunk/reactos/lib/cpl/intl/de.rc Modified: trunk/reactos/lib/cpl/intl/en.rc Modified: trunk/reactos/lib/cpl/intl/resource.h Modified: trunk/reactos/lib/cpl/intl/time.c _____ Modified: trunk/reactos/lib/cpl/intl/de.rc --- trunk/reactos/lib/cpl/intl/de.rc 2005-04-24 10:37:17 UTC (rev 14791) +++ trunk/reactos/lib/cpl/intl/de.rc 2005-04-24 14:49:56 UTC (rev 14792) @@ -34,7 +34,25 @@ CAPTION "Uhrzeit" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Property Page 4",-1,73,74,90,8 + GROUPBOX "Darstellung", -1, 7, 7, 228, 33, WS_CHILD | WS_VISIBLE + LTEXT "Beispiel:", -1, 13, 21, 54, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + EDITTEXT IDC_TIMESAMPLE, 68, 19, 84, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "&Zeitformat:", -1, 13, 52, 54, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_TIMEFORMAT, 68, 50, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "&Trennzeichen:", -1, 13, 70, 54, 10, WS_VISIBLE | WS_GROUP + COMBOBOX IDC_TIMESEPARATOR, 68, 68, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Symbol f³r &Vormittag:", -1, 13, 88, 54, 10, WS_VISIBLE | WS_GROUP + COMBOBOX IDC_TIMEAMSYMBOL, 68, 86, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Symbol f³r &Nachmittag:", -1, 13, 106, 54, 10, WS_VISIBLE | WS_GROUP + COMBOBOX IDC_TIMEPMSYMBOL, 68, 104, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP + GROUPBOX "", -1, 7, 132, 228, 88, WS_VISIBLE + LTEXT "Zeitformat\n\n" + "h = Stunde m = Minute s = Sekunde t = Vor-/Nachmittag\n\n" + "h = 12 Stunden\n" + "H = 24 Stunden\n\n" + "hh, mm, ss = f³hrende Null\n" + "h, m, s = keine f³hrende Null", + -1, 13, 141, 214, 74, WS_CHILD |WS_VISIBLE | WS_GROUP END _____ Modified: trunk/reactos/lib/cpl/intl/en.rc --- trunk/reactos/lib/cpl/intl/en.rc 2005-04-24 10:37:17 UTC (rev 14791) +++ trunk/reactos/lib/cpl/intl/en.rc 2005-04-24 14:49:56 UTC (rev 14792) @@ -34,7 +34,25 @@ CAPTION "Time" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Property Page 4",-1,73,74,90,8 + GROUPBOX "Appearance sample", -1, 7, 7, 228, 33, WS_CHILD | WS_VISIBLE + LTEXT "Time sample:", -1, 13, 21, 54, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + EDITTEXT IDC_TIMESAMPLE, 68, 19, 84, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "&Time format:", -1, 13, 52, 54, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_TIMEFORMAT, 68, 50, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Time &separator:", -1, 13, 70, 54, 10, WS_VISIBLE | WS_GROUP + COMBOBOX IDC_TIMESEPARATOR, 68, 68, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "A&M symbol:", -1, 13, 88, 54, 10, WS_VISIBLE | WS_GROUP + COMBOBOX IDC_TIMEAMSYMBOL, 68, 86, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "&PM symbol:", -1, 13, 106, 54, 10, WS_VISIBLE | WS_GROUP + COMBOBOX IDC_TIMEPMSYMBOL, 68, 104, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP + GROUPBOX "", -1, 7, 132, 228, 88, WS_VISIBLE + LTEXT "Time format notation\n\n" + "h = hour m = minute s = second t = am or pm\n\n" + "h = 12 hour\n" + "H = 24 hour\n\n" + "hh, mm, ss = leading zero\n" + "h, m, s = no leading zero", + -1, 13, 141, 214, 74, WS_CHILD |WS_VISIBLE | WS_GROUP END @@ -52,7 +70,7 @@ CAPTION "Input Locale" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Primary language", -1, 8, 11, 228, 74 + GROUPBOX "Primary language", -1, 8, 11, 228, 74 ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON LTEXT "Select the primary language and region you want to use:", -1, 38, 25, 193, 22 COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP _____ Modified: trunk/reactos/lib/cpl/intl/resource.h --- trunk/reactos/lib/cpl/intl/resource.h 2005-04-24 10:37:17 UTC (rev 14791) +++ trunk/reactos/lib/cpl/intl/resource.h 2005-04-24 14:49:56 UTC (rev 14792) @@ -3,16 +3,23 @@ #define IDC_CPLICON 1 -#define IDC_FLAGS 2 -#define IDC_ICON1 3 +#define IDC_FLAGS 2 +#define IDC_ICON1 3 #define IDD_GENERALPAGE 100 #define IDD_NUMBERSPAGE 101 #define IDD_CURRENCYPAGE 102 + #define IDD_TIMEPAGE 103 +#define IDC_TIMESAMPLE 107 +#define IDC_TIMEFORMAT 108 +#define IDC_TIMESEPARATOR 109 +#define IDC_TIMEAMSYMBOL 110 +#define IDC_TIMEPMSYMBOL 111 + #define IDD_DATEPAGE 104 #define IDD_LOCALEPAGE 105 -#define IDC_LANGUAGELIST 106 +#define IDC_LANGUAGELIST 106 #define IDS_CPLNAME 1000 #define IDS_CPLDESCRIPTION 1001 _____ Modified: trunk/reactos/lib/cpl/intl/time.c --- trunk/reactos/lib/cpl/intl/time.c 2005-04-24 10:37:17 UTC (rev 14791) +++ trunk/reactos/lib/cpl/intl/time.c 2005-04-24 14:49:56 UTC (rev 14792) @@ -16,8 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id$ - * +/* * PROJECT: ReactOS International Control Panel * FILE: lib/cpl/intl/time.c * PURPOSE: Time property page @@ -31,19 +30,187 @@ #include "intl.h" #include "resource.h" +/* + * TODO: + * - Enumerate available time formats (use EnumTimeformatsW) + */ +static VOID +UpdateTimeSample(HWND hWnd) +{ + WCHAR InBuffer[80]; + WCHAR OutBuffer[80]; + + GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_STIMEFORMAT, InBuffer, 80); + + GetTimeFormatW(LOCALE_USER_DEFAULT, 0, NULL, InBuffer, OutBuffer, 80); + + SendMessageW(hWnd, WM_SETTEXT, 0, (LPARAM)OutBuffer); +} + + /* Property page dialog callback */ INT_PTR CALLBACK TimePageProc(HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam) + UINT uMsg, + WPARAM wParam, + LPARAM lParam) { switch(uMsg) { case WM_INITDIALOG: + { + WCHAR Buffer[80]; + int nLen; + + /* Update the time format sample */ + UpdateTimeSample(GetDlgItem(hwndDlg, IDC_TIMESAMPLE)); + + /* Get the time format (max. 80 characters) */ + SendMessage(GetDlgItem(hwndDlg, IDC_TIMEFORMAT), + CB_LIMITTEXT, 80, 0); + + /* FIXME: add available time formats to the list */ + + GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_STIMEFORMAT, Buffer, 80); + SendMessageW(GetDlgItem(hwndDlg, IDC_TIMEFORMAT), + CB_ADDSTRING, + 0, + (LPARAM)Buffer); + SendMessage(GetDlgItem(hwndDlg, IDC_TIMEFORMAT), + CB_SETCURSEL, + 0, /* index */ + 0); + + /* Get the time separator (max. 4 characters) */ + SendMessage(GetDlgItem(hwndDlg, IDC_TIMESEPARATOR), + CB_LIMITTEXT, 4, 0); + GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_STIME, Buffer, 80); + SendMessageW(GetDlgItem(hwndDlg, IDC_TIMESEPARATOR), + CB_ADDSTRING, + 0, + (LPARAM)Buffer); + SendMessage(GetDlgItem(hwndDlg, IDC_TIMESEPARATOR), + CB_SETCURSEL, + 0, /* index */ + 0); + + /* Get the AM symbol (max. 9 characters) */ + SendMessage(GetDlgItem(hwndDlg, IDC_TIMEAMSYMBOL), + CB_LIMITTEXT, 9, 0); + nLen = GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_S1159, Buffer, 80); + SendMessageW(GetDlgItem(hwndDlg, IDC_TIMEAMSYMBOL), + CB_ADDSTRING, + 0, + (LPARAM)Buffer); + if (nLen != 0) + { + SendMessageW(GetDlgItem(hwndDlg, IDC_TIMEAMSYMBOL), + CB_ADDSTRING, + 0, + (LPARAM)L""); + } + SendMessage(GetDlgItem(hwndDlg, IDC_TIMEAMSYMBOL), + CB_SETCURSEL, + 0, /* index */ + 0); + + /* Get the PM symbol (max. 9 characters) */ + SendMessage(GetDlgItem(hwndDlg, IDC_TIMEPMSYMBOL), + CB_LIMITTEXT, 9, 0); + nLen = GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_S2359, Buffer, 80); + SendMessageW(GetDlgItem(hwndDlg, IDC_TIMEPMSYMBOL), + CB_ADDSTRING, + 0, + (LPARAM)Buffer); + if (nLen != 0) + { + SendMessageW(GetDlgItem(hwndDlg, IDC_TIMEPMSYMBOL), + CB_ADDSTRING, + 0, + (LPARAM)L""); + } + SendMessage(GetDlgItem(hwndDlg, IDC_TIMEPMSYMBOL), + CB_SETCURSEL, + 0, /* index */ + 0); + } break; + + case WM_COMMAND: + switch (LOWORD(wParam)) + { + case IDC_TIMEFORMAT: + case IDC_TIMESEPARATOR: + case IDC_TIMEAMSYMBOL: + case IDC_TIMEPMSYMBOL: + if (HIWORD(wParam) == CBN_SELCHANGE || + HIWORD(wParam) == CBN_EDITCHANGE) + { + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + } + break; + } + break; + + case WM_NOTIFY: + { + LPNMHDR lpnm = (LPNMHDR)lParam; + + if (lpnm->code == PSN_APPLY) + { + WCHAR Buffer[80]; + int nIndex; + + /* Set time format */ + nIndex = SendMessage(GetDlgItem(hwndDlg, IDC_TIMEFORMAT), + CB_GETCURSEL, 0, 0); + SendMessage(GetDlgItem(hwndDlg, IDC_TIMEFORMAT), + CB_GETLBTEXT, (WPARAM)nIndex, (LPARAM)Buffer); + SetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_STIMEFORMAT, Buffer); + + /* Set time separator */ + nIndex = SendMessage(GetDlgItem(hwndDlg, IDC_TIMESEPARATOR), + CB_GETCURSEL, 0, 0); + SendMessage(GetDlgItem(hwndDlg, IDC_TIMESEPARATOR), + CB_GETLBTEXT, (WPARAM)nIndex, (LPARAM)Buffer); + SetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_STIME, Buffer); + + /* Set the AM symbol */ + nIndex = SendMessage(GetDlgItem(hwndDlg, IDC_TIMEAMSYMBOL), + CB_GETCURSEL, 0, 0); + if (nIndex != CB_ERR) + { + SendMessage(GetDlgItem(hwndDlg, IDC_TIMEAMSYMBOL), + CB_GETLBTEXT, (WPARAM)nIndex, (LPARAM)Buffer); + SetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_S1159, Buffer); + } + else + { + SetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_S1159, L""); + } + + /* Set the PM symbol */ + nIndex = SendMessage(GetDlgItem(hwndDlg, IDC_TIMEPMSYMBOL), + CB_GETCURSEL, 0, 0); + if (nIndex != CB_ERR) + { + SendMessage(GetDlgItem(hwndDlg, IDC_TIMEPMSYMBOL), + CB_GETLBTEXT, (WPARAM)nIndex, (LPARAM)Buffer); + SetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_S2359, Buffer); + } + else + { + SetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_S2359, L""); + } + + /* Update the time format sample */ + UpdateTimeSample(GetDlgItem(hwndDlg, IDC_TIMESAMPLE)); + } + } + break; } + return FALSE; }

1 0

[mbosma] 14791: PackageManager: HTML Log
by mbosma＠svn.reactos.com 24 Apr '05

24 Apr '05

PackageManager: HTML Log Modified: trunk/rosapps/packmgr/lib/download.cpp Modified: trunk/rosapps/packmgr/lib/log.cpp Modified: trunk/rosapps/packmgr/lib/log.h _____ Modified: trunk/rosapps/packmgr/lib/download.cpp --- trunk/rosapps/packmgr/lib/download.cpp 2005-04-23 20:02:39 UTC (rev 14790) +++ trunk/rosapps/packmgr/lib/download.cpp 2005-04-24 10:37:17 UTC (rev 14791) @@ -27,7 +27,7 @@ // Download a file -char* PML_Download (pTree tree, const char* url, const char* server = "tree", const char* filename = NULL) +char* PML_Download (pTree tree, const char* url, const char* server = "tree", const char* filename = "packmgr.xml") { UINT i; static char downl [MAX_PATH]; // the full url @@ -43,6 +43,10 @@ else if(!strstr(filename, "\\")) GetTempPathA (200, path); + + else + strcpy(path, ""); + // create the local file name if(filename) @@ -51,7 +55,7 @@ DeleteFileA (path); } else - GetTempFileNameA (path, "pml", 0, path); + GetTempFileNameA (path, "pml", 1, path); // get the url if (!server) @@ -76,12 +80,11 @@ // is this a file link ? if (strstr(downl, "file://") || strstr(downl, "File://")) - {/* - if(downl[strlen(downl)] == '\') - downl[strlen(downl)] = '\0'; - */ + { if(!filename) + { return &downl[7]; + } else { @@ -90,6 +93,7 @@ } } + // download the file if(URLDownloadToFileA (NULL, downl, path, 0, NULL) != S_OK) { @@ -116,7 +120,7 @@ // download the file if(strstr(url, "file://")) - filename = PML_Download(tree, url, NULL); + filename = PML_Download(tree, url, NULL, NULL); else filename = PML_Download(tree, url); @@ -132,8 +136,7 @@ FILE* file = fopen(filename, "r"); if(!file) { - MessageBoxA(0,filename,0,0); - Log("! ERROR: Could not open the xml file \""); + Log("! ERROR: Could not open the xml file "); LogAdd(filename); return ERR_GENERIC; } _____ Modified: trunk/rosapps/packmgr/lib/log.cpp --- trunk/rosapps/packmgr/lib/log.cpp 2005-04-23 20:02:39 UTC (rev 14790) +++ trunk/rosapps/packmgr/lib/log.cpp 2005-04-24 10:37:17 UTC (rev 14791) @@ -28,10 +28,14 @@ char version[50]; char versionos[50]; - if (!LogCreated) { + if (!LogCreated) + { file = fopen(LOGFILE, "w"); LogCreated = true; + //HTML Header + fputs("<html><head><title>Logfile</title></head><body>", file); + // date and time time_t now; now = time(NULL); @@ -49,32 +53,43 @@ KERNEL_VERSION_MINOR, KERNEL_VERSION_PATCH_LEVEL); - fputs("# ReactOS Package Manager - Log File\n#\n# WARNING: This is still pre-alpha software.\n# Date: ", file); + fputs("<h2>ReactOS Package Manager - Log File</h2><br>\n", file); + fputs("WARNING: This is still pre-alpha software.<br>\n", file); + + fputs("Date: ", file); fputs(GTime, file); - fputs("\n#\n#", file); - fputs(version, file); - fputs("\n#", file); - fputs(versionos, file); - fputs("\n#\n", file); + fputs("<br>\n", file); + + fputs(version, file); + fputs("<br>\n", file); + fputs(versionos, file); + fputs("<br>\n", file); } + else file = fopen(LOGFILE, "a"); - if (file == NULL) { - + if (file == NULL) + { if (LogCreated) LogCreated = false; - return; + return Log(message); } + else { // Save log entry (+ add time) - fputs("\n", file); + fputs("<br>\n", file); + time_t now; now = time(NULL); strftime(GTime,sizeof GTime,"%I:%M:%S %p ",localtime(&now)); + + fputs("<b>", file); fputs(GTime, file); + fputs("</b>", file); + fputs(message, file); fclose(file); } _____ Modified: trunk/rosapps/packmgr/lib/log.h --- trunk/rosapps/packmgr/lib/log.h 2005-04-23 20:02:39 UTC (rev 14790) +++ trunk/rosapps/packmgr/lib/log.h 2005-04-24 10:37:17 UTC (rev 14791) @@ -13,7 +13,7 @@ #include <stdio.h> #include <string.h> -#define LOGFILE "packmgr.log" +#define LOGFILE "logfile.html" extern bool LogCreated;

1 0

[ion] 14790: Don't use hack for trap frames anymore, read TempEsp and TempSegSs for kernel-mode traps during debugging.
by ion＠svn.reactos.com 23 Apr '05

23 Apr '05

Don't use hack for trap frames anymore, read TempEsp and TempSegSs for kernel-mode traps during debugging. Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h Modified: trunk/reactos/ntoskrnl/kdbg/kdb_cli.c Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s _____ Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h --- trunk/reactos/ntoskrnl/include/internal/i386/ke.h 2005-04-23 19:23:00 UTC (rev 14789) +++ trunk/reactos/ntoskrnl/include/internal/i386/ke.h 2005-04-23 20:02:39 UTC (rev 14790) @@ -27,8 +27,8 @@ #define KTRAP_FRAME_DEBUGEIP (0x4) #define KTRAP_FRAME_DEBUGARGMARK (0x8) #define KTRAP_FRAME_DEBUGPOINTER (0xC) -#define KTRAP_FRAME_TEMPCS (0x10) -#define KTRAP_FRAME_TEMPEIP (0x14) +#define KTRAP_FRAME_TEMPSS (0x10) +#define KTRAP_FRAME_TEMPESP (0x14) #define KTRAP_FRAME_DR0 (0x18) #define KTRAP_FRAME_DR1 (0x1C) #define KTRAP_FRAME_DR2 (0x20) @@ -117,8 +117,8 @@ PVOID DebugEip; PVOID DebugArgMark; PVOID DebugPointer; - PVOID TempCs; - PVOID TempEip; + PVOID TempSegSs; + PVOID TempEsp; ULONG Dr0; ULONG Dr1; ULONG Dr2; _____ Modified: trunk/reactos/ntoskrnl/kdbg/kdb_cli.c --- trunk/reactos/ntoskrnl/kdbg/kdb_cli.c 2005-04-23 19:23:00 UTC (rev 14789) +++ trunk/reactos/ntoskrnl/kdbg/kdb_cli.c 2005-04-23 20:02:39 UTC (rev 14790) @@ -374,6 +374,19 @@ if (Argv[0][0] == 'r') /* regs */ { + ULONG Esp; + USHORT Ss; + + if (!(Tf->Cs & 1)) + { + Esp = (ULONG)Tf->TempEsp; + Ss = (USHORT)((ULONG)Tf->TempSegSs & 0xFFFF); + } + else + { + Esp = Tf->Esp; + Ss = Tf->Ss; + } KdbpPrint("CS:EIP 0x%04x:0x%08x\n" "SS:ESP 0x%04x:0x%08x\n" " EAX 0x%08x EBX 0x%08x\n" @@ -381,7 +394,7 @@ " ESI 0x%08x EDI 0x%08x\n" " EBP 0x%08x\n", Tf->Cs & 0xFFFF, Tf->Eip, - Tf->Ss, Tf->Esp, + Ss, Esp, Tf->Eax, Tf->Ebx, Tf->Ecx, Tf->Edx, Tf->Esi, Tf->Edi, _____ Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s --- trunk/reactos/ntoskrnl/ke/i386/trap.s 2005-04-23 19:23:00 UTC (rev 14789) +++ trunk/reactos/ntoskrnl/ke/i386/trap.s 2005-04-23 20:02:39 UTC (rev 14790) @@ -76,29 +76,6 @@ popl %edi popl %esi popl %ebx - -#ifdef KDBG - /* - * Cleanup the stack which was used to setup a trapframe with SS:ESP when called - * from kmode. - */ - movw 0xC(%esp), %bp /* Get CS from trapframe */ - cmpw $KERNEL_CS, %bp - jne 0f - - /* Copy EBP, CS:EIP and EFLAGS from the trapframe back onto the top of our stack. */ - movl 0x00(%esp), %ebp /* EBP */ - movl %ebp, 0x24(%esp) - movl 0x08(%esp), %ebp /* EIP */ - movl %ebp, 0x2C(%esp) - movl 0x0C(%esp), %ebp /* CS */ - movl %ebp, 0x30(%esp) - movl 0x10(%esp), %ebp /* EFLAGS */ - movl %ebp, 0x34(%esp) - - addl $0x24, %esp -0: -#endif /* DBG */ popl %ebp addl $0x4, %esp /* Ignore error code */ @@ -106,28 +83,7 @@ .globl _KiTrapProlog _KiTrapProlog: -#ifdef KDBG - /* - * If we were called from kmode we start setting up a new trapframe (with SS:ESP at the end) - */ - movw 0x14(%esp), %bx /* Get old CS */ - cmpw $KERNEL_CS, %bx - - jne 0f - leal 0x1C(%esp), %ebp - pushl %ss /* Old SS */ - pushl %ebp /* Old ESP */ - pushl 0x20(%esp) /* Old EFLAGS */ - pushl 0x20(%esp) /* Old CS */ - pushl 0x20(%esp) /* Old EIP */ - pushl 0x20(%esp) /* ErrorCode */ - pushl 0x20(%esp) /* Ebp */ - pushl 0x20(%esp) /* Ebx */ - pushl 0x20(%esp) /* Esi */ -0: -#endif /* DBG */ - pushl %edi pushl %fs @@ -191,8 +147,9 @@ pushl %eax /* Dr1 */ movl %dr0, %eax pushl %eax /* Dr0 */ - pushl $0 /* XXX: TempESP */ - pushl $0 /* XXX: TempCS */ + leal 0x64(%esp), %eax + pushl %eax /* XXX: TempESP */ + pushl %ss /* XXX: TempSS */ pushl $0 /* XXX: DebugPointer */ pushl $0 /* XXX: DebugArgMark */ movl 0x60(%esp), %ebx

1 0

[ion] 14789: Use fake frame in KDBG mode, not DBG
by ion＠svn.reactos.com 23 Apr '05

23 Apr '05

Use fake frame in KDBG mode, not DBG Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s _____ Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s --- trunk/reactos/ntoskrnl/ke/i386/trap.s 2005-04-23 18:41:02 UTC (rev 14788) +++ trunk/reactos/ntoskrnl/ke/i386/trap.s 2005-04-23 19:23:00 UTC (rev 14789) @@ -77,7 +77,7 @@ popl %esi popl %ebx -#ifdef DBG +#ifdef KDBG /* * Cleanup the stack which was used to setup a trapframe with SS:ESP when called * from kmode. @@ -106,7 +106,7 @@ .globl _KiTrapProlog _KiTrapProlog: -#ifdef DBG +#ifdef KDBG /* * If we were called from kmode we start setting up a new trapframe (with SS:ESP at the end) */

1 0

[chorns] 14788: ROS_BUILDNOSTRIP environment variable to control building of non-symbol-stripped executable output files
by chorns＠svn.reactos.com 23 Apr '05

23 Apr '05

ROS_BUILDNOSTRIP environment variable to control building of non-symbol-stripped executable output files Modified: branches/xmlbuildsystem/reactos/Makefile Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h _____ Modified: branches/xmlbuildsystem/reactos/Makefile --- branches/xmlbuildsystem/reactos/Makefile 2005-04-23 18:17:11 UTC (rev 14787) +++ branches/xmlbuildsystem/reactos/Makefile 2005-04-23 18:41:02 UTC (rev 14788) @@ -39,6 +39,14 @@ # without source code) or no (to not build any map files). The variable # defaults to no. # +# ROS_BUILDNOSTRIP +# This variable controls if non-symbol-stripped versions are to be built +# of executable output files. Non-symbol-stripped executable output files +# have .nostrip added to the filename just before the extension. The value +# can be either yes (to build non-symbol-stripped versions of executable +# output files) or no (to not build non-symbol-stripped versions of +# executable output files). The variable defaults to no. +# # ROS_RBUILDFLAGS # Pass parameters to rbuild. _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-04-23 18:17:11 UTC (rev 14787) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-04-23 18:41:02 UTC (rev 14788) @@ -1147,6 +1147,32 @@ } void +MingwModuleHandler::GenerateBuildNonSymbolStrippedCode () +{ + fprintf ( fMakefile, + "ifeq ($(ROS_BUILDNOSTRIP),yes)\n" ); + + string filename = module.GetPath (); + string outputFilename = PassThruCacheDirectory ( + filename, + backend->outputDirectory ); + string nostripFilename = PassThruCacheDirectory ( + GetBasename ( filename ) + ".nostrip" + GetExtension ( filename ), + backend->outputDirectory ); + CLEAN_FILE ( nostripFilename ); + + fprintf ( fMakefile, + "\t$(ECHO_CP)\n" ); + fprintf ( fMakefile, + "\t${cp} %s %s 1>$(NUL)\n", + outputFilename.c_str (), + nostripFilename.c_str () ); + + fprintf ( fMakefile, + "endif\n" ); +} + +void MergeStringVector ( const vector<string>& input, vector<string>& output ) { @@ -1289,6 +1315,8 @@ GenerateBuildMapCode (); + GenerateBuildNonSymbolStrippedCode (); + fprintf ( fMakefile, "\t$(ECHO_RSYM)\n" ); fprintf ( fMakefile, _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h 2005-04-23 18:17:11 UTC (rev 14787) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h 2005-04-23 18:41:02 UTC (rev 14788) @@ -169,6 +169,7 @@ std::string GetDefinitionFilename () const; static std::string RemoveVariables ( std::string path); void GenerateBuildMapCode (); + void GenerateBuildNonSymbolStrippedCode (); public: const Module& module; string_list clean_files;

1 0

[ion] 14787: forgot to delete this one too
by ion＠svn.reactos.com 23 Apr '05

23 Apr '05

forgot to delete this one too Deleted: trunk/reactos/lib/ntdll/rtl/i386/float.c _____ Deleted: trunk/reactos/lib/ntdll/rtl/i386/float.c --- trunk/reactos/lib/ntdll/rtl/i386/float.c 2005-04-23 18:16:59 UTC (rev 14786) +++ trunk/reactos/lib/ntdll/rtl/i386/float.c 2005-04-23 18:17:11 UTC (rev 14787) @@ -1,12 +0,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * PURPOSE: Floating point initializer - * FILE: lib/ntdll/rtl/i386/float.c - * PROGRAMER: Eric Kohl (ekohl(a)rz-online.de) - */ - -int _fltused = 0x9875; - -/* EOF */

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs