Ros-diffs

ros-diffs@reactos.org

81390 discussions

[chorns] 12674: Add error reporting assistant.
by chorns＠svn.reactos.com 01 Jan '05

01 Jan '05

Add error reporting assistant. Modified: trunk/reactos/Makefile Modified: trunk/reactos/bootdata/packages/reactos.dff Added: trunk/reactos/subsys/system/reporterror/ Added: trunk/reactos/subsys/system/reporterror/En.rc Added: trunk/reactos/subsys/system/reporterror/Makefile Added: trunk/reactos/subsys/system/reporterror/manifest.xml Added: trunk/reactos/subsys/system/reporterror/reporterror.c Added: trunk/reactos/subsys/system/reporterror/reporterror.h Added: trunk/reactos/subsys/system/reporterror/reporterror.rc Added: trunk/reactos/subsys/system/reporterror/resources/ Added: trunk/reactos/subsys/system/reporterror/resources/header.bmp Added: trunk/reactos/subsys/system/reporterror/resources/watermark.bmp _____ Modified: trunk/reactos/Makefile --- trunk/reactos/Makefile 2005-01-01 01:03:31 UTC (rev 12673) +++ trunk/reactos/Makefile 2005-01-01 01:11:54 UTC (rev 12674) @@ -1,4 +1,3 @@ -# $Id$ # # Global makefile # @@ -101,8 +100,8 @@ # System applications # autochk cmd format services setup usetup welcome winlogon msiexec SYS_APPS = autochk calc cmd explorer expand format regedt32 regsvr32 \ - services setup taskmgr userinit usetup welcome vmwinst winlogon \ - regedit winefile notepad reactos + reporterror services setup taskmgr userinit usetup welcome vmwinst \ + winlogon regedit winefile notepad reactos # System services # rpcss eventlog _____ Modified: trunk/reactos/bootdata/packages/reactos.dff --- trunk/reactos/bootdata/packages/reactos.dff 2005-01-01 01:03:31 UTC (rev 12673) +++ trunk/reactos/bootdata/packages/reactos.dff 2005-01-01 01:11:54 UTC (rev 12674) @@ -148,6 +148,7 @@ subsys\system\regedit\regedit.exe 4 subsys\system\regedt32\regedt32.exe 1 subsys\system\regsvr32\regsvr32.exe 1 +subsys\system\reporterror\reporterror.exe 1 subsys\system\services\services.exe 1 subsys\system\setup\setup.exe 1 subsys\system\taskmgr\taskmgr.exe 1 Property changes on: trunk/reactos/subsys/system/reporterror ___________________________________________________________________ Name: svn:ignore + *.coff *.map *.exe *.sym *.a _____ Added: trunk/reactos/subsys/system/reporterror/En.rc --- trunk/reactos/subsys/system/reporterror/En.rc 2005-01-01 01:03:31 UTC (rev 12673) +++ trunk/reactos/subsys/system/reporterror/En.rc 2005-01-01 01:11:54 UTC (rev 12674) @@ -0,0 +1,53 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +IDD_FIRSTPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Error reporting assistant" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "The system recovered from an error.", -1, 115, 15, 160, 24 + LTEXT "Would you like to report the error to the ReactOS project?", -1, 115, 35, 160, 17 +END + +IDD_SUBMIT_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Error reporting assistant" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Please describe what you were trying to do when the error occurred.\n\nClick 'Next' to send the report to the ReacOS project or 'Cancel' to not send any information.",-1,10,0,225,40 + LTEXT "Your e-mail address (optional):",-1,10,40,120,20 + EDITTEXT IDE_SUBMIT_REPORT_YOUR_EMAIL, 110,40,150,12 + LTEXT "Description of problem (optional):",-1,10,55,120,20 + EDITTEXT IDE_SUBMIT_REPORT_PROBLEM_DESCRIPTION,10,65,250,55,ES_WANTRETURN|ES_MULT ILINE|ES_LEFT|WS_BORDER|WS_TABSTOP|WS_VSCROLL +END + +IDD_SUBMITTING_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Error reporting assistant" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "{STATUS}",IDC_SUBMISSION_STATUS,25,58,225,8 + CONTROL "", IDC_SUBMITTING_IN_PROGRESS, "msctls_progress32", PBS_MARQUEE | WS_CHILD | WS_VISIBLE | WS_BORDER, 25, 80, 225, 8 +END + +IDD_SUBMITTED_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Error reporting assistant" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Your error report was successfully sent to the ReactOS project.",-1,25,5,225,20 +END + +STRINGTABLE +BEGIN + IDS_WIZARD_NAME "Report error to the ReactOS project" + IDS_FAILED_TO_CONTACT_SERVER "The system was unable to contact the error reporting server.\nPlease make sure that your system is connected to the internet." + IDS_FAILED_TO_DELIVER_ERROR_REPORT "The system was unable to deliver the error report." +END + +STRINGTABLE +BEGIN + IDS_CONTACTING_SERVER "Contacting error reporting server..." + IDS_FAILED_TO_INITIALIZE_WINSOCK "Failed to initialize winsock (windows error code %d)" + IDS_FAILED_TO_LOCATE_SERVER "Failed to contact error reporting server" +END _____ Added: trunk/reactos/subsys/system/reporterror/Makefile --- trunk/reactos/subsys/system/reporterror/Makefile 2005-01-01 01:03:31 UTC (rev 12673) +++ trunk/reactos/subsys/system/reporterror/Makefile 2005-01-01 01:11:54 UTC (rev 12674) @@ -0,0 +1,20 @@ +PATH_TO_TOP = ../../.. + +TARGET_TYPE = program + +TARGET_APPTYPE = windows + +TARGET_NAME = reporterror + +TARGET_INSTALLDIR = system32 + +TARGET_CFLAGS = -D__USE_W32API -DUNICODE -D_WIN32_IE=0x0501 -D_WIN32_WINNT=0x0501 + +TARGET_SDKLIBS = advapi32.a comctl32.a comdlg32.a shell32.a ws2_32.a + +TARGET_OBJECTS = \ + $(TARGET_NAME).o + +include $(PATH_TO_TOP)/rules.mak + +include $(TOOLS_PATH)/helper.mk _____ Added: trunk/reactos/subsys/system/reporterror/manifest.xml --- trunk/reactos/subsys/system/reporterror/manifest.xml 2005-01-01 01:03:31 UTC (rev 12673) +++ trunk/reactos/subsys/system/reporterror/manifest.xml 2005-01-01 01:11:54 UTC (rev 12674) @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity + version="1.0.0.0" + processorArchitecture="X86" + name="ReactOS.ErrorReport" + type="win32" + /> + <description>ReactOS Error Reporting Assistant</description> + <dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="X86" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> + </dependency> +</assembly> _____ Added: trunk/reactos/subsys/system/reporterror/reporterror.c --- trunk/reactos/subsys/system/reporterror/reporterror.c 2005-01-01 01:03:31 UTC (rev 12673) +++ trunk/reactos/subsys/system/reporterror/reporterror.c 2005-01-01 01:11:54 UTC (rev 12674) @@ -0,0 +1,613 @@ +/* + * ReactOS Error Reporting Assistant + * Copyright (C) 2004-2005 Casper S. Hornstrup <chorns(a)users.sourceforge.net> + * Copyright (C) 2003-2004 Peter Willis <psyphreak(a)phreaker.net> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Error Reporting Assistant + * FILE: subsys/system/reporterror/reporterror.c + * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) + * Thomas Weidenmueller (w3seek(a)users.sourceforge.net) + */ +#include <windows.h> +#include <commctrl.h> +#include <stdio.h> +#include <string.h> +#include "reporterror.h" + +static LPSTR ErrorReportingServerName = "errors.reactos.com"; +static HINSTANCE hAppInstance; +static HANDLE hSubmissionThread = NULL; +static HWND hSubmissionNotifyWnd = NULL; +static LONG AbortSubmission = 0; +static LPERROR_REPORT ErrorReport = NULL; + +#define WM_ABORT_SUBMISSION (WM_USER + 2) +#define WM_CONTACTING_SERVER (WM_USER + 3) +#define WM_SUBMISSION_COMPLETE (WM_USER + 4) + +#define MAX_REQUEST_BUFFER_SIZE 20480 + +LPSTR +UrlEncode(LPSTR in, LPSTR out) +{ + CHAR buffer[4]; + UCHAR iu; + INT i; + + for (i = 0; i < strlen(in); i++) + { + iu = (UCHAR)in[i]; + memset(buffer, '\0', sizeof(buffer)); + if ((iu < 33 || iu > 126)) + sprintf(buffer, "%%%02x", iu); + else + sprintf(buffer, "%c", iu); + strcat(out, buffer); + } + return out; +} + +LPERROR_REPORT +FillErrorReport(HWND hwndDlg) +{ + INT size; + LPERROR_REPORT errorReport = malloc(sizeof(ERROR_REPORT)); + + size = 300; + errorReport->YourEmail = malloc(size); + GetDlgItemTextA(hwndDlg, + IDE_SUBMIT_REPORT_YOUR_EMAIL, + errorReport->YourEmail, + size); + + size = 10240; + errorReport->ProblemDescription = malloc(size); + GetDlgItemTextA(hwndDlg, + IDE_SUBMIT_REPORT_PROBLEM_DESCRIPTION, + errorReport->ProblemDescription, + size); + + return errorReport; +} + +ReleaseErrorReport(LPERROR_REPORT errorReport) +{ + if (errorReport->YourEmail) + free(errorReport->YourEmail); + if (errorReport->ProblemDescription) + free(errorReport->ProblemDescription); + free(errorReport); +} + +BOOL +ProcessMessage(VOID) +{ + MSG msg; + if (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) + { + TranslateMessage(&msg); + DispatchMessage(&msg); + return TRUE; + } + return FALSE; +} + +VOID +ProcessMessages(VOID) +{ + while (ProcessMessage()); +} + +VOID +InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DWORD Flags, DLGPROC DlgProc) +{ + ZeroMemory(psp, sizeof(PROPSHEETPAGE)); + psp->dwSize = sizeof(PROPSHEETPAGE); + psp->dwFlags = PSP_DEFAULT | Flags; + psp->hInstance = hAppInstance; + psp->pszTemplate = MAKEINTRESOURCE(idDlg); + psp->pfnDlgProc = DlgProc; +} + +INT_PTR CALLBACK +PageFirstPageProc( + HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + switch(uMsg) + { + case WM_NOTIFY: + { + LPNMHDR pnmh = (LPNMHDR)lParam; + switch (pnmh->code) + { + case PSN_SETACTIVE: + { + PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_NEXT); + break; + } + case PSN_WIZNEXT: + { + SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_SUBMIT_REPORT); + return TRUE; + } + } + break; + } + } + return FALSE; +} + +INT_PTR CALLBACK +PageSubmitReportProc( + HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + switch (uMsg) + { + case WM_NOTIFY: + { + LPNMHDR pnmh = (LPNMHDR)lParam; + switch (pnmh->code) + { + case PSN_SETACTIVE: + { + PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_NEXT); + break; + } + case PSN_WIZNEXT: + { + ErrorReport = FillErrorReport(hwndDlg); + SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_SUBMITTING_REPORT); + break; + } + } + break; + } + } + return FALSE; +} + +VOID +TerminateSubmission(BOOL Wait) +{ + if (hSubmissionThread != NULL) + { + if (Wait) + { + InterlockedExchange((LONG*)&AbortSubmission, 2); + WaitForSingleObject(hSubmissionThread, INFINITE); + } + else + InterlockedExchange((LONG*)&AbortSubmission, 1); + } +} + +INT +ConnectToServer(LPSTR host, + SOCKET *clientSocket, + LPWSTR errorMessage) +{ + struct sockaddr_in sin; + struct hostent *hp; + struct servent *sp; + INT error; + SOCKET s; + + *clientSocket = 0; + + hp = gethostbyname(host); + if (hp == NULL) + { + error = WSAGetLastError(); + wsprintf(errorMessage, L"Could not resolve DNS for %S (windows error code %d)", host, error); + return error; + } + + s = socket(hp->h_addrtype, SOCK_STREAM, 0); + if (s < 0) + { + error = WSAGetLastError(); + wsprintf(errorMessage, L"Could not create socket (windows error code %d)", error); + return error; + } + + memset(&sin, 0, sizeof(sin)); + sin.sin_family = hp->h_addrtype; + if (bind(s, (struct sockaddr *)&sin, sizeof(sin)) < 0) + { + error = WSAGetLastError(); + wsprintf(errorMessage, L"Could not resolve DNS for %S (windows error code %d)", host, error); + closesocket(s); + return error; + } + + memcpy((char *)&sin.sin_addr, hp->h_addr, hp->h_length); + sp = getservbyname("www", "tcp"); + if (sp == NULL) + { + error = WSAGetLastError(); + wsprintf(errorMessage, L"Could not get service (windows error code %d)", error); + closesocket(s); + return error; + } + + sin.sin_port = sp->s_port; + + if (connect(s, (struct sockaddr *)&sin, sizeof(sin)) < 0) + { + error = WSAGetLastError(); + wsprintf(errorMessage, L"Could not connect to server (windows error code %d)", error); + closesocket(s); + return error; + } + + *clientSocket = s; + return NO_ERROR; +} + +VOID +CreateHTTPPostRequest(LPSTR requestBuffer, + LPSTR hostname, + LPERROR_REPORT errorReport) +{ + LPSTR parameterBuffer; + LPSTR urlencodeBuffer; + + parameterBuffer = malloc(MAX_REQUEST_BUFFER_SIZE); + memset(parameterBuffer, '\0', MAX_REQUEST_BUFFER_SIZE); + + strcat(parameterBuffer, "errorReport="); + strcat(parameterBuffer, "<ErrorReportResponse>"); + strcat(parameterBuffer, "<YourEmail>"); + strcat(parameterBuffer, errorReport->YourEmail); + strcat(parameterBuffer, "</YourEmail>"); + strcat(parameterBuffer, "<ProblemDescription>"); + strcat(parameterBuffer, errorReport->ProblemDescription); + strcat(parameterBuffer, "</ProblemDescription>"); + strcat(parameterBuffer, "</ErrorReportResponse>"); + strcat(parameterBuffer, "\r\n"); + + urlencodeBuffer = malloc(MAX_REQUEST_BUFFER_SIZE); + memset(urlencodeBuffer, '\0', MAX_REQUEST_BUFFER_SIZE); + + UrlEncode(parameterBuffer, urlencodeBuffer); + sprintf(requestBuffer, "POST /Report.asmx/SubmitErrorReport HTTP/1.1\r\n" + "Host: %s\r\n" + "Content-Type: application/x-www-form-urlencoded\r\n" + "Content-Length: %d\r\n" + "\r\n" + "%s", + hostname, + strlen(urlencodeBuffer), + urlencodeBuffer); + + free(urlencodeBuffer); + free(parameterBuffer); +} + +#define CONTENT_LENGTH "Content-Length:" + +BOOL +WasErrorReportDelivered(LPSTR httpResponse) +{ + + return strstr(httpResponse, "</ErrorReportResponse>") != NULL; +} + +BOOL +ReceiveResponse(SOCKET socket, LPSTR responseBuffer, PULONG responseBufferSize) +{ + PCHAR pch = (PCHAR)responseBuffer; + ULONG length = 0; + INT contentLength = 0; + fd_set fdset[1]; + struct timeval timeout; + CHAR buf[4000]; + + FD_ZERO(&fdset); + FD_SET(socket, &fdset); + timeout.tv_sec = 5; + timeout.tv_usec = 0; + while (select(1, fdset, NULL, NULL, &timeout) > 0) + { + if (recv(socket, pch, 1, 0) == 1) + { + pch++; + length++; + if (WasErrorReportDelivered(responseBuffer)) + { + *responseBufferSize = length; + return TRUE; + } + } + else + break; + } + *responseBufferSize = 0; + return FALSE; +} + +BOOL +SubmitErrorReport(SOCKET socket, LPERROR_REPORT errorReport) +{ + BOOL wasErrorReportDelivered; + LPSTR requestBuffer; + LPSTR responseBuffer; + ULONG requestBufferSize = MAX_REQUEST_BUFFER_SIZE; + + requestBuffer = malloc(requestBufferSize); + memset(requestBuffer, '\0', requestBufferSize); + CreateHTTPPostRequest(requestBuffer, ErrorReportingServerName, errorReport); + send(socket, requestBuffer, strlen(requestBuffer), 0); + responseBuffer = malloc(requestBufferSize); + wasErrorReportDelivered = ReceiveResponse(socket, responseBuffer, IN OUT &requestBufferSize); + free(responseBuffer); + free(requestBuffer); + return wasErrorReportDelivered; +} + +VOID +DisconnectFromServer(SOCKET socket) +{ + closesocket(socket); +} + +DWORD STDCALL +SubmissionThread(LPVOID lpParameter) +{ + WCHAR errorMessage[1024]; + SOCKET socket; + HANDLE hThread; + INT error; + INT i; + + if (AbortSubmission != 0) + goto done; + + PostMessage(hSubmissionNotifyWnd, WM_CONTACTING_SERVER, IDS_CONTACTING_SERVER, 0); + + error = ConnectToServer(ErrorReportingServerName, &socket, errorMessage); + if (error != NO_ERROR) + { + MessageBox(NULL, errorMessage, NULL, MB_ICONWARNING); + + PostMessage(hSubmissionNotifyWnd, WM_ABORT_SUBMISSION, IDS_FAILED_TO_LOCATE_SERVER, 0); + goto cleanup; + } + + if (!SubmitErrorReport(socket, ErrorReport)) + { + PostMessage(hSubmissionNotifyWnd, WM_ABORT_SUBMISSION, IDS_FAILED_TO_DELIVER_ERROR_REPORT, 0); + goto cleanup; + } + + DisconnectFromServer(socket); +done: + switch (AbortSubmission) + { + case 0: + SendMessage(hSubmissionNotifyWnd, WM_SUBMISSION_COMPLETE, 0, 0); + break; + case 1: + SendMessage(hSubmissionNotifyWnd, WM_ABORT_SUBMISSION, 0, 0); + break; + } + +cleanup: + hThread = (HANDLE)InterlockedExchange((LONG*)&hSubmissionThread, 0); + if (hThread != NULL) + CloseHandle(hThread); + ReleaseErrorReport(ErrorReport); + ErrorReport = NULL; + return 0; +} + +BOOL +StartSubmissionThread(HWND hWndNotify) +{ + if (hSubmissionThread == NULL) + { + DWORD ThreadId; + hSubmissionNotifyWnd = hWndNotify; + AbortSubmission = 0; + hSubmissionThread = CreateThread(NULL, + 0, + SubmissionThread, + NULL, + CREATE_SUSPENDED, + &ThreadId); + if (hSubmissionThread == NULL) + return FALSE; + + ResumeThread(hSubmissionThread); + return TRUE; + } + + return FALSE; +} + +INT_PTR CALLBACK +PageSubmittingReportProc( + HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + switch (uMsg) + { + case WM_NOTIFY: + { + LPNMHDR pnmh = (LPNMHDR)lParam; + switch (pnmh->code) + { + case PSN_SETACTIVE: + { + SetDlgItemText(hwndDlg, IDC_SUBMISSION_STATUS, NULL); + SendDlgItemMessage(hwndDlg, IDC_SUBMITTING_IN_PROGRESS, PBM_SETMARQUEE, TRUE, 50); + PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK); + StartSubmissionThread(hwndDlg); + break; + } + case PSN_RESET: + { + TerminateSubmission(TRUE); + break; + } + case PSN_WIZBACK: + if (hSubmissionThread != NULL) + { + PropSheet_SetWizButtons(GetParent(hwndDlg), 0); + TerminateSubmission(FALSE); + SetWindowLong(hwndDlg, DWL_MSGRESULT, -1); + return -1; + } + else + { + SendDlgItemMessage(hwndDlg, IDC_SUBMITTING_IN_PROGRESS, PBM_SETMARQUEE, FALSE, 0); + SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_SUBMIT_REPORT); + } + break; + } + break; + } + case WM_CONTACTING_SERVER: + { + WCHAR Msg[1024]; + LoadString(hAppInstance, wParam, Msg, sizeof(Msg) / sizeof(WCHAR)); + SetDlgItemText(hwndDlg, IDC_SUBMISSION_STATUS, Msg); + break; + } + case WM_SUBMISSION_COMPLETE: + { + SendDlgItemMessage(hwndDlg, IDC_SUBMITTING_IN_PROGRESS, PBM_SETMARQUEE, FALSE, 0); + PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_NEXT); + PropSheet_SetCurSelByID(GetParent(hwndDlg), IDD_SUBMITTED_REPORT); + break; + } + case WM_ABORT_SUBMISSION: + { + /* Go back in case we aborted the submission thread */ + SendDlgItemMessage(hwndDlg, IDC_SUBMITTING_IN_PROGRESS, PBM_SETMARQUEE, FALSE, 0); + PropSheet_SetCurSelByID(GetParent(hwndDlg), IDD_SUBMIT_REPORT); + if (wParam != 0) + { + WCHAR Msg[1024]; + LoadString(hAppInstance, wParam, Msg, sizeof(Msg) / sizeof(WCHAR)); + MessageBox(GetParent(hwndDlg), Msg, NULL, MB_ICONWARNING); + } + break; + } + } + return FALSE; +} + +INT_PTR CALLBACK +PageSubmittedReportProc( + HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + switch(uMsg) + { + case WM_NOTIFY: + { + LPNMHDR pnmh = (LPNMHDR)lParam; + switch (pnmh->code) + { + case PSN_SETACTIVE: + { + EnableWindow(GetDlgItem(GetParent(hwndDlg), IDCANCEL), FALSE); + PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_FINISH); + break; + } + } + break; + } + } + return FALSE; +} + +static LONG +CreateWizard(VOID) +{ + PROPSHEETPAGE psp[8]; + PROPSHEETHEADER psh; + WCHAR Caption[1024]; + + LoadString(hAppInstance, IDS_WIZARD_NAME, Caption, sizeof(Caption) / sizeof(TCHAR)); + + ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); + psh.dwSize = sizeof(PROPSHEETHEADER); + psh.dwFlags = PSH_PROPSHEETPAGE | PSH_WIZARD97 | PSH_WATERMARK | PSH_HEADER; + psh.hwndParent = NULL; + psh.hInstance = hAppInstance; + psh.hIcon = 0; + psh.pszCaption = Caption; + psh.nPages = 4; + psh.nStartPage = 0; + psh.ppsp = psp; + psh.pszbmWatermark = MAKEINTRESOURCE(IDB_WATERMARK); + psh.pszbmHeader = MAKEINTRESOURCE(IDB_HEADER); + + InitPropSheetPage(&psp[0], IDD_FIRSTPAGE, PSP_HIDEHEADER, PageFirstPageProc); + InitPropSheetPage(&psp[1], IDD_SUBMIT_REPORT, PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE, PageSubmitReportProc); + InitPropSheetPage(&psp[2], IDD_SUBMITTING_REPORT, PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE, PageSubmittingReportProc); + InitPropSheetPage(&psp[3], IDD_SUBMITTED_REPORT, PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE, PageSubmittedReportProc); + + return (LONG)(PropertySheet(&psh) != -1); +} + +int WINAPI +WinMain(HINSTANCE hInstance, + HINSTANCE hPrevInstance, + LPSTR lpszCmdLine, + int nCmdShow) +{ + WORD wVersionRequested; + WSADATA wsaData; + INT error; + INT version; + WCHAR *lc; + + hAppInstance = hInstance; + + wVersionRequested = MAKEWORD(1, 1); + error = WSAStartup(wVersionRequested, &wsaData); + if (error != NO_ERROR) + { + WCHAR format[1024]; + WCHAR message[1024]; + LoadString(hAppInstance, IDS_FAILED_TO_INITIALIZE_WINSOCK, format, sizeof(format) / sizeof(WCHAR)); + wsprintf(message, format, error); + MessageBox(NULL, message, NULL, MB_ICONWARNING); + return; + } + + CreateWizard(); + + WSACleanup(); + + return 0; +} _____ Added: trunk/reactos/subsys/system/reporterror/reporterror.h --- trunk/reactos/subsys/system/reporterror/reporterror.h 2005-01-01 01:03:31 UTC (rev 12673) +++ trunk/reactos/subsys/system/reporterror/reporterror.h 2005-01-01 01:11:54 UTC (rev 12674) @@ -0,0 +1,50 @@ +#ifndef __REPORTERROR_H +#define __REPORTERROR_H + +#ifndef PSCB_BUTTONPRESSED +#define PSCB_BUTTONPRESSED (3) +#endif + +#ifndef PBS_MARQUEE +#define PBS_MARQUEE (8) +#endif + +/* metrics */ +#define PROPSHEETWIDTH 250 +#define PROPSHEETHEIGHT 120 +#define PROPSHEETPADDING 6 +#define SYSTEM_COLUMN (18 * PROPSHEETPADDING) +#define LABELLINE(x) (((PROPSHEETPADDING + 2) * x) + (x + 2)) +#define ICONSIZE 16 + +/* Resource IDs */ + +#define IDS_WIZARD_NAME 100 +#define IDS_FAILED_TO_CONTACT_SERVER 101 + +#define IDS_CONTACTING_SERVER 201 +#define IDS_FAILED_TO_INITIALIZE_WINSOCK 202 +#define IDS_FAILED_TO_LOCATE_SERVER 203 +#define IDS_FAILED_TO_DELIVER_ERROR_REPORT 204 + +#define IDD_FIRSTPAGE 100 +#define IDD_SUBMIT_REPORT 101 +#define IDD_SUBMITTING_REPORT 102 +#define IDD_SUBMITTED_REPORT 103 + +#define IDC_SUBMISSION_STATUS 200 +#define IDC_SUBMITTING_IN_PROGRESS 201 + +#define IDE_SUBMIT_REPORT_YOUR_EMAIL 300 +#define IDE_SUBMIT_REPORT_PROBLEM_DESCRIPTION 301 + +#define IDB_WATERMARK 100 +#define IDB_HEADER 101 + +typedef struct _ERROR_REPORT +{ + LPSTR YourEmail; + LPSTR ProblemDescription; +} ERROR_REPORT, *LPERROR_REPORT; + +#endif /* __REPORTERROR_H */ _____ Added: trunk/reactos/subsys/system/reporterror/reporterror.rc --- trunk/reactos/subsys/system/reporterror/reporterror.rc 2005-01-01 01:03:31 UTC (rev 12673) +++ trunk/reactos/subsys/system/reporterror/reporterror.rc 2005-01-01 01:11:54 UTC (rev 12674) @@ -0,0 +1,17 @@ +#include <defines.h> +#include "reporterror.h" + +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Error Reporting Assistant\0" +#define REACTOS_STR_INTERNAL_NAME "reporterror\0" +#define REACTOS_STR_ORIGINAL_FILENAME "reporterror.exe\0" +#include <reactos/version.rc> + +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +1 24 DISCARDABLE "manifest.xml" + +/* Bitmaps */ +IDB_WATERMARK BITMAP "resources/watermark.bmp" +IDB_HEADER BITMAP "resources/header.bmp" + +#include "En.rc" _____ Added: trunk/reactos/subsys/system/reporterror/resources/header.bmp (Binary files differ) Property changes on: trunk/reactos/subsys/system/reporterror/resources/header.bmp ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: trunk/reactos/subsys/system/reporterror/resources/watermark.bmp (Binary files differ) Property changes on: trunk/reactos/subsys/system/reporterror/resources/watermark.bmp ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

1 0

[ion] 12673: Modified NtDelayExecution Prototype/Function to use LARGE_INTEGER and not TIME, and renamed EX_MAXIMUM_WAIT_OBJECTS to MAXIMUM_WAIT_OBJECTS, which is the correct define to use (the ex define was an unnecessary duplicate)
by ion＠svn.reactos.com 01 Jan '05

01 Jan '05

Modified NtDelayExecution Prototype/Function to use LARGE_INTEGER and not TIME, and renamed EX_MAXIMUM_WAIT_OBJECTS to MAXIMUM_WAIT_OBJECTS, which is the correct define to use (the ex define was an unnecessary duplicate) Modified: trunk/reactos/include/ntos/ntdef.h Modified: trunk/reactos/include/ntos/zw.h Modified: trunk/reactos/ntoskrnl/ke/timer.c Modified: trunk/reactos/ntoskrnl/ke/wait.c Modified: trunk/reactos/ntoskrnl/rtl/rangelist.c _____ Modified: trunk/reactos/include/ntos/ntdef.h --- trunk/reactos/include/ntos/ntdef.h 2005-01-01 00:42:18 UTC (rev 12672) +++ trunk/reactos/include/ntos/ntdef.h 2005-01-01 01:03:31 UTC (rev 12673) @@ -11,7 +11,9 @@ #ifndef __INCLUDE_NTDEF_H #define __INCLUDE_NTDEF_H -#define EX_MAXIMUM_WAIT_OBJECTS (64) +#ifndef _USE_W32API +#define MAXIMUM_WAIT_OBJECTS (64) +#endif #if defined(_MSC_VER) && (_MSC_VER >= 1300) && defined(__cplusplus) # define TYPE_ALIGNMENT(t) __alignof(t) _____ Modified: trunk/reactos/include/ntos/zw.h --- trunk/reactos/include/ntos/zw.h 2005-01-01 00:42:18 UTC (rev 12672) +++ trunk/reactos/include/ntos/zw.h 2005-01-01 01:03:31 UTC (rev 12673) @@ -1,4 +1,4 @@ -/* $Id: zw.h,v 1.40 2004/12/30 08:05:10 hyperion Exp $ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -5241,7 +5241,7 @@ STDCALL NtDelayExecution( IN ULONG Alertable, - IN TIME *Interval + IN LARGE_INTEGER *Interval ); /* _____ Modified: trunk/reactos/ntoskrnl/ke/timer.c --- trunk/reactos/ntoskrnl/ke/timer.c 2005-01-01 00:42:18 UTC (rev 12672) +++ trunk/reactos/ntoskrnl/ke/timer.c 2005-01-01 01:03:31 UTC (rev 12673) @@ -1,4 +1,4 @@ -/* $Id: timer.c,v 1.93 2004/12/24 17:06:58 navaraf Exp $ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -138,7 +138,7 @@ NTSTATUS STDCALL NtDelayExecution(IN ULONG Alertable, - IN TIME* Interval) + IN LARGE_INTEGER* Interval) { NTSTATUS Status; LARGE_INTEGER Timeout; _____ Modified: trunk/reactos/ntoskrnl/ke/wait.c --- trunk/reactos/ntoskrnl/ke/wait.c 2005-01-01 00:42:18 UTC (rev 12672) +++ trunk/reactos/ntoskrnl/ke/wait.c 2005-01-01 01:03:31 UTC (rev 12673) @@ -492,7 +492,7 @@ DPRINT("Entering KeWaitForMultipleObjects(Count %lu Object[] %p) " "PsGetCurrentThread() %x\n", Count, Object, PsGetCurrentThread()); - ASSERT(0 < Count && Count <= EX_MAXIMUM_WAIT_OBJECTS); + ASSERT(0 < Count && Count <= MAXIMUM_WAIT_OBJECTS); CurrentThread = KeGetCurrentThread(); @@ -510,7 +510,7 @@ } else { - if (Count > EX_MAXIMUM_WAIT_OBJECTS) + if (Count > MAXIMUM_WAIT_OBJECTS) { DPRINT("(%s:%d) Too many objects!\n", __FILE__, __LINE__); return (STATUS_UNSUCCESSFUL); @@ -762,8 +762,8 @@ IN BOOLEAN Alertable, IN PLARGE_INTEGER UnsafeTime) { - KWAIT_BLOCK WaitBlockArray[EX_MAXIMUM_WAIT_OBJECTS]; - PVOID ObjectPtrArray[EX_MAXIMUM_WAIT_OBJECTS]; + KWAIT_BLOCK WaitBlockArray[MAXIMUM_WAIT_OBJECTS]; + PVOID ObjectPtrArray[MAXIMUM_WAIT_OBJECTS]; NTSTATUS Status; ULONG i, j; KPROCESSOR_MODE WaitMode; @@ -772,7 +772,7 @@ DPRINT("NtWaitForMultipleObjects(Count %lu Object[] %x, Alertable %d, " "Time %x)\n", Count,Object,Alertable,Time); - if (Count > EX_MAXIMUM_WAIT_OBJECTS) + if (Count > MAXIMUM_WAIT_OBJECTS) return STATUS_UNSUCCESSFUL; if (0 == Count) return STATUS_INVALID_PARAMETER; _____ Modified: trunk/reactos/ntoskrnl/rtl/rangelist.c --- trunk/reactos/ntoskrnl/rtl/rangelist.c 2005-01-01 00:42:18 UTC (rev 12672) +++ trunk/reactos/ntoskrnl/rtl/rangelist.c 2005-01-01 01:03:31 UTC (rev 12673) @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: rangelist.c,v 1.3 2004/10/22 16:30:58 navaraf Exp $ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries

1 0

[chorns] 12672: Move freeldr to reactos\boot\freeldr.
by chorns＠svn.reactos.com 01 Jan '05

01 Jan '05

Move freeldr to reactos\boot\freeldr. Deleted: trunk/freeldr/ Modified: trunk/reactos/Makefile Added: trunk/reactos/boot/ Added: trunk/reactos/boot/freeldr/ Modified: trunk/reactos/boot/freeldr/Makefile Deleted: trunk/reactos/boot/freeldr/bootsect/.cvsignore Modified: trunk/reactos/boot/freeldr/bootsect/Makefile Deleted: trunk/reactos/boot/freeldr/fdebug/.cvsignore Modified: trunk/reactos/boot/freeldr/fdebug/Makefile Deleted: trunk/reactos/boot/freeldr/freeldr/.cvsignore Modified: trunk/reactos/boot/freeldr/freeldr/Makefile Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/archmach.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.h Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.h Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pccons.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcrtc.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/portio.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxcons.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxdisk.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxfont.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxhw.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxmem.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxrtc.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxvideo.c Modified: trunk/reactos/boot/freeldr/freeldr/cmdline.c Modified: trunk/reactos/boot/freeldr/freeldr/include/cmdline.h Modified: trunk/reactos/boot/freeldr/freeldr/include/inffile.h Modified: trunk/reactos/boot/freeldr/freeldr/include/machine.h Modified: trunk/reactos/boot/freeldr/freeldr/inffile/inffile.c Modified: trunk/reactos/boot/freeldr/freeldr/machine.c Modified: trunk/reactos/boot/freeldr/install/Makefile Modified: trunk/reactos/boot/freeldr/rules.mak Deleted: trunk/reactos/boot/freeldr/tools/.cvsignore Modified: trunk/reactos/boot/freeldr/tools/Makefile Deleted: trunk/reactos/boot/freeldr/tools/hosttype.c Deleted: trunk/reactos/boot/freeldr/tools/rcopy.c Deleted: trunk/reactos/boot/freeldr/tools/rdel.c Deleted: trunk/reactos/boot/freeldr/tools/rmkdir.c Deleted: trunk/reactos/boot/freeldr/tools/rrmdir.c _____ Modified: trunk/reactos/Makefile --- trunk/reactos/Makefile 2004-12-31 21:31:39 UTC (rev 12671) +++ trunk/reactos/Makefile 2005-01-01 00:42:18 UTC (rev 12672) @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.277 2004/12/30 18:31:43 ion Exp $ +# $Id$ # # Global makefile # @@ -23,6 +23,9 @@ IMPLIB = implib endif +# Boot loaders +BOOT_LOADERS = freeldr + # Required to run the system COMPONENTS = ntoskrnl @@ -124,9 +127,8 @@ # Regression tests REGTESTS = regtests -all: bootstrap $(COMPONENTS) $(REGTESTS) $(HALS) $(BUS) $(LIB_FSLIB) $(DLLS) $(SUBSYS) \ - $(KERNEL_DRIVERS) $(SYS_APPS) $(SYS_SVC) \ - $(APPS) $(EXT_MODULES) +all: bootstrap $(BOOT_LOADERS) $(COMPONENTS) $(REGTESTS) $(HALS) $(BUS) $(LIB_FSLIB) \ + $(DLLS) $(SUBSYS) $(KERNEL_DRIVERS) $(SYS_APPS) $(SYS_SVC) $(APPS) $(EXT_MODULES) bootstrap: dk implib iface_native iface_additional @@ -136,21 +138,21 @@ $(SUBSYS:%=%_depends) $(SYS_SVC:%=%_depends) \ $(EXT_MODULES:%=%_depends) $(POSIX_LIBS:%=%_depends) -implib: hallib $(LIB_STATIC) $(COMPONENTS:%=%_implib) $(HALS:%=%_implib) $(BUS:%=%_implib) \ - $(LIB_STATIC:%=%_implib) $(LIB_FSLIB:%=%_implib) msvcrt_implib $(DLLS:%=%_implib) \ - $(KERNEL_DRIVERS:%=%_implib) $(SUBSYS:%=%_implib) \ - $(SYS_APPS:%=%_implib) $(SYS_SVC:%=%_implib) $(EXT_MODULES:%=%_implib) \ - $(REGTESTS:%=%_implib) +implib: hallib $(LIB_STATIC) $(COMPONENTS:%=%_implib) $(HALS:%=%_implib) \ + $(BUS:%=%_implib) $(LIB_STATIC:%=%_implib) $(LIB_FSLIB:%=%_implib) \ + msvcrt_implib $(DLLS:%=%_implib) $(KERNEL_DRIVERS:%=%_implib) \ + $(SUBSYS:%=%_implib) $(SYS_APPS:%=%_implib) $(SYS_SVC:%=%_implib) \ + $(EXT_MODULES:%=%_implib) $(REGTESTS:%=%_implib) -test: $(COMPONENTS:%=%_test) $(HALS:%=%_test) $(BUS:%=%_test) \ +test: $(BOOT_LOADERS:%=%_test) $(COMPONENTS:%=%_test) $(HALS:%=%_test) $(BUS:%=%_test) \ $(LIB_STATIC:%=%_test) $(LIB_FSLIB:%=%_test) msvcrt_test $(DLLS:%=%_test) \ $(KERNEL_DRIVERS:%=%_test) $(SUBSYS:%=%_test) \ $(SYS_SVC:%=%_test) $(EXT_MODULES:%=%_test) clean: tools dk_clean iface_native_clean iface_additional_clean hallib_clean \ - $(HALS:%=%_clean) $(COMPONENTS:%=%_clean) $(BUS:%=%_clean) \ - $(LIB_STATIC:%=%_clean) $(LIB_FSLIB:%=%_clean) msvcrt_clean \ - $(DLLS:%=%_clean) $(KERNEL_DRIVERS:%=%_clean) \ + $(BOOT_LOADERS:%=%_clean) $(HALS:%=%_clean) $(COMPONENTS:%=%_clean) \ + $(BUS:%=%_clean) $(LIB_STATIC:%=%_clean) $(LIB_FSLIB:%=%_clean) \ + msvcrt_clean $(DLLS:%=%_clean) $(KERNEL_DRIVERS:%=%_clean) \ $(SUBSYS:%=%_clean) $(SYS_APPS:%=%_clean) $(SYS_SVC:%=%_clean) \ $(NET_APPS:%=%_clean) $(APPS:%=%_clean) $(EXT_MODULES:%=%_clean) \ $(REGTESTS:%=%_clean) clean_after tools_clean @@ -159,19 +161,15 @@ $(HALFVERBOSEECHO) [RM] /include/roscfg.h $(RM) $(PATH_TO_TOP)/include/roscfg.h -fastinstall: tools install_dirs install_before \ - $(COMPONENTS:%=%_install) $(HALS:%=%_install) $(BUS:%=%_install) \ - $(LIB_STATIC:%=%_install) $(LIB_FSLIB:%=%_install) msvcrt_install $(DLLS:%=%_install) \ - $(KERNEL_DRIVERS:%=%_install) $(SUBSYS:%=%_install) \ - $(SYS_APPS:%=%_install) $(SYS_SVC:%=%_install) \ +fastinstall: tools install_dirs install_before $(COMPONENTS:%=%_install) $(HALS:%=%_install) \ + $(BUS:%=%_install) $(LIB_STATIC:%=%_install) $(LIB_FSLIB:%=%_install) \ + msvcrt_install $(DLLS:%=%_install) $(KERNEL_DRIVERS:%=%_install) \ + $(SUBSYS:%=%_install) $(SYS_APPS:%=%_install) $(SYS_SVC:%=%_install) \ $(APPS:%=%_install) $(EXT_MODULES:%=%_install) $(REGTESTS:%=%_install) install: fastinstall registry -FREELDR_DIR = ../freeldr +FREELDR_DIR = boot/freeldr -freeldr: - $(MAKE) -C $(FREELDR_DIR) - bootcd_directory_layout: $(HALFVERBOSEECHO) [RMKDIR] $(BOOTCD_DIR) $(RMKDIR) $(BOOTCD_DIR) @@ -183,26 +181,11 @@ $(RMKDIR) $(BOOTCD_DIR)/reactos $(HALFVERBOSEECHO) [RMKDIR] $(BOOTCD_DIR)/reactos/system32 $(RMKDIR) $(BOOTCD_DIR)/reactos/system32 - $(HALFVERBOSEECHO) [COPY] ${FREELDR_DIR}/bootsect/isoboot.bin to ${BOOTCD_DIR}/../isoboot.bin - $(CP) ${FREELDR_DIR}/bootsect/isoboot.bin ${BOOTCD_DIR}/../isoboot.bin - $(HALFVERBOSEECHO) [COPY] ${FREELDR_DIR}/bootsect/dosmbr.bin to ${BOOTCD_DIR}/loader/dosmbr.bin - $(CP) ${FREELDR_DIR}/bootsect/dosmbr.bin ${BOOTCD_DIR}/loader/dosmbr.bin - $(HALFVERBOSEECHO) [COPY] ${FREELDR_DIR}/bootsect/ext2.bin to ${BOOTCD_DIR}/loader/ext2.bin - $(CP) ${FREELDR_DIR}/bootsect/ext2.bin ${BOOTCD_DIR}/loader/ext2.bin - $(HALFVERBOSEECHO) [COPY] ${FREELDR_DIR}/bootsect/fat.bin to ${BOOTCD_DIR}/loader/fat.bin - $(CP) ${FREELDR_DIR}/bootsect/fat.bin ${BOOTCD_DIR}/loader/fat.bin - $(HALFVERBOSEECHO) [COPY] ${FREELDR_DIR}/bootsect/fat32.bin to ${BOOTCD_DIR}/loader/fat32.bin - $(CP) ${FREELDR_DIR}/bootsect/fat32.bin ${BOOTCD_DIR}/loader/fat32.bin - $(HALFVERBOSEECHO) [COPY] ${FREELDR_DIR}/bootsect/isoboot.bin to ${BOOTCD_DIR}/loader/isoboot.bin - $(CP) ${FREELDR_DIR}/bootsect/isoboot.bin ${BOOTCD_DIR}/loader/isoboot.bin - $(HALFVERBOSEECHO) [COPY] ${FREELDR_DIR}/freeldr/obj/i386/freeldr.sys to ${BOOTCD_DIR}/loader/freeldr.sys - $(CP) ${FREELDR_DIR}/freeldr/obj/i386/freeldr.sys ${BOOTCD_DIR}/loader/freeldr.sys - $(HALFVERBOSEECHO) [COPY] ${FREELDR_DIR}/freeldr/obj/i386/setupldr.sys to ${BOOTCD_DIR}/loader/setupldr.sys - $(CP) ${FREELDR_DIR}/freeldr/obj/i386/setupldr.sys ${BOOTCD_DIR}/loader/setupldr.sys -bootcd_bootstrap_files: $(COMPONENTS:%=%_bootcd) $(HALS:%=%_bootcd) $(BUS:%=%_bootcd) \ - $(LIB_STATIC:%=%_bootcd) $(LIB_FSLIB:%=%_bootcd) msvcrt_bootcd $(DLLS:%=%_bootcd) \ - $(KERNEL_DRIVERS:%=%_bootcd) $(SUBSYS:%=%_bootcd) $(SYS_APPS:%=%_bootcd) +bootcd_bootstrap_files: $(BOOT_LOADERS:%=%_bootcd) $(COMPONENTS:%=%_bootcd) \ + $(HALS:%=%_bootcd) $(BUS:%=%_bootcd) $(LIB_STATIC:%=%_bootcd) \ + $(LIB_FSLIB:%=%_bootcd) msvcrt_bootcd $(DLLS:%=%_bootcd) \ + $(KERNEL_DRIVERS:%=%_bootcd) $(SUBSYS:%=%_bootcd) $(SYS_APPS:%=%_bootcd) bootcd_install_before: $(HALFVERBOSEECHO) [RLINE] bootdata/autorun.inf to $(BOOTCD_DIR)/autorun.inf @@ -288,10 +271,28 @@ registry: tools $(MKHIVE) bootdata $(INSTALL_DIR)/system32/config bootdata/hiveinst.inf -.PHONY: all bootstrap depends implib test clean clean_before install freeldr bootcd_directory_layout \ +.PHONY: all bootstrap depends implib test clean clean_before install bootcd_directory_layout \ bootcd_bootstrap_files bootcd_install_before bootcd_basic bootcd_makecd ubootcd_unattend bootcd +# +# Boot Loaders +# +$(BOOT_LOADERS): %: + $(MAKE) -C boot/$* + +$(BOOT_LOADERS:%=%_test): %_test: + $(MAKE) -C boot/$* test + +$(BOOT_LOADERS:%=%_clean): %_clean: + $(MAKE) -C boot/$* clean + +$(BOOT_LOADERS:%=%_bootcd): %_bootcd: + $(MAKE) -C boot/$* bootcd + +.PHONY: $(BOOT_LOADERS) $(BOOT_LOADERS:%=%_test) $(BOOT_LOADERS:%=%_clean) \ + $(BOOT_LOADERS:%=%_bootcd) + $(COMPONENTS): dk # _____ Copied: trunk/reactos/boot/freeldr (from rev 12648, trunk/freeldr) _____ Modified: trunk/reactos/boot/freeldr/Makefile --- trunk/freeldr/Makefile 2004-12-31 16:52:45 UTC (rev 12648) +++ trunk/reactos/boot/freeldr/Makefile 2005-01-01 00:42:18 UTC (rev 12672) @@ -17,10 +17,7 @@ # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # -# Windows is default host environment -ifeq ($(HOST),) -HOST = mingw32-windows -endif +PATH_TO_TOP = ../.. include rules.mak @@ -31,10 +28,8 @@ $(MAKE) -C install $(MAKE) -C fdebug -freeldr: - $(MAKE) -C freeldr -.PHONY : freeldr - +test: + clean: $(MAKE) -C bootsect clean $(MAKE) -C freeldr clean @@ -42,4 +37,14 @@ $(MAKE) -C fdebug clean $(MAKE) -C tools clean +bootcd: + $(CP) bootsect/isoboot.bin ${BOOTCD_DIR}/../isoboot.bin + $(CP) bootsect/dosmbr.bin ${BOOTCD_DIR}/loader/dosmbr.bin + $(CP) bootsect/ext2.bin ${BOOTCD_DIR}/loader/ext2.bin + $(CP) bootsect/fat.bin ${BOOTCD_DIR}/loader/fat.bin + $(CP) bootsect/fat32.bin ${BOOTCD_DIR}/loader/fat32.bin + $(CP) bootsect/isoboot.bin ${BOOTCD_DIR}/loader/isoboot.bin + $(CP) freeldr/freeldr.sys ${BOOTCD_DIR}/loader/freeldr.sys + $(CP) freeldr/setupldr.sys ${BOOTCD_DIR}/loader/setupldr.sys + .PHONY : clean _____ Deleted: trunk/reactos/boot/freeldr/bootsect/.cvsignore --- trunk/freeldr/bootsect/.cvsignore 2004-12-31 16:52:45 UTC (rev 12648) +++ trunk/reactos/boot/freeldr/bootsect/.cvsignore 2005-01-01 00:42:18 UTC (rev 12672) @@ -1,3 +0,0 @@ -*.exe -*.bin -*.h _____ Modified: trunk/reactos/boot/freeldr/bootsect/Makefile --- trunk/freeldr/bootsect/Makefile 2004-12-31 16:52:45 UTC (rev 12648) +++ trunk/reactos/boot/freeldr/bootsect/Makefile 2005-01-01 00:42:18 UTC (rev 12672) @@ -17,15 +17,19 @@ # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # -BOOTCD_DIR = ../../bootcd +PATH_TO_TOP = ../../.. +include ../rules.mak + +BOOTCD_DIR = $(PATH_TO_TOP)/../bootcd + .PHONY : clean bootcd all: $(BIN2C) dosmbr.bin fat.bin fat32.bin isoboot.bin ext2.bin $(BIN2C) : - @$(MAKE) --no-print-directory -C $(TOOLSDIR) + @$(MAKE) --no-print-directory -C $(FREELDR_TOOLS_PATH) dosmbr.bin : dosmbr.asm @echo ===================================================== Assembling dosmbr Property changes on: trunk/reactos/boot/freeldr/fdebug ___________________________________________________________________ Name: svn:ignore - *.res + *.res *.exe _____ Deleted: trunk/reactos/boot/freeldr/fdebug/.cvsignore --- trunk/freeldr/fdebug/.cvsignore 2004-12-31 16:52:45 UTC (rev 12648) +++ trunk/reactos/boot/freeldr/fdebug/.cvsignore 2005-01-01 00:42:18 UTC (rev 12672) @@ -1 +0,0 @@ -*.res _____ Modified: trunk/reactos/boot/freeldr/fdebug/Makefile --- trunk/freeldr/fdebug/Makefile 2004-12-31 16:52:45 UTC (rev 12648) +++ trunk/reactos/boot/freeldr/fdebug/Makefile 2005-01-01 00:42:18 UTC (rev 12672) @@ -16,8 +16,11 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # - +PATH_TO_TOP = ../../.. + +include ../rules.mak + FLAGS = -Wall OBJS = rs232.o fdebug.o fdebug.res @@ -32,7 +35,7 @@ fdebug.res: fdebug.rc resource.h @echo ===================================================== Compiling $* - $(WINDRES) -o fdebug.res fdebug.rc -O coff + $(RC) -o fdebug.res fdebug.rc -O coff fdebug.o: fdebug.c rs232.h @echo ===================================================== Compiling $* Property changes on: trunk/reactos/boot/freeldr/freeldr ___________________________________________________________________ Name: svn:ignore - obj + *.d *.map *.exe *.sys _____ Deleted: trunk/reactos/boot/freeldr/freeldr/.cvsignore --- trunk/freeldr/freeldr/.cvsignore 2004-12-31 16:52:45 UTC (rev 12648) +++ trunk/reactos/boot/freeldr/freeldr/.cvsignore 2005-01-01 00:42:18 UTC (rev 12672) @@ -1 +0,0 @@ -obj _____ Modified: trunk/reactos/boot/freeldr/freeldr/Makefile --- trunk/freeldr/freeldr/Makefile 2004-12-31 16:52:45 UTC (rev 12648) +++ trunk/reactos/boot/freeldr/freeldr/Makefile 2005-01-01 00:42:18 UTC (rev 12672) @@ -17,89 +17,46 @@ # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # -############################################# -# CHANGE THESE FOR YOUR OUTPUT -# -TARGET = i386 +PATH_TO_TOP = ../../.. + +include ../rules.mak + +TARGET = i386 ifeq ($(DEBUG),) # Debugging information on (bigger binary) -#DEBUG = yes +#DEBUG = yes # Debugging information off (smaller binary) -DEBUG = no +DEBUG = no endif -OBJDIR = obj -OUTPUT_DIR = $(OBJDIR)/$(TARGET) +SRCDIR = . -BOOTCD_DIR = ../../bootcd +BOOTCD_DIR = $(PATH_TO_TOP)/bootcd -############################################# -# COMPILER AND LINKER PROGRAMS -# -TOOLSDIR = $(SRCDIR)/../tools +TOOLSDIR = $(SRCDIR)/../tools -RM = $(subst /,$(SEP),$(TOOLSDIR))$(SEP)rdel -CP = $(subst /,$(SEP),$(TOOLSDIR))$(SEP)rcopy -MKDIR = $(subst /,$(SEP),$(TOOLSDIR))$(SEP)rmkdir -RMDIR = $(subst /,$(SEP),$(TOOLSDIR))$(SEP)rrmdir -OBJCOPY = objcopy -NM = nm -OBJDUMP = objdump -DEPTOOL = $(subst /,$(SEP),$(TOOLSDIR))$(SEP)deptool -HOSTTOOL = $(subst /,$(SEP),$(TOOLSDIR))$(SEP)hosttype -TOOLS = $(DEPTOOL) $(HOSTTOOL) +DEPTOOL = $(subst /,$(SEP),$(FREELDR_TOOLS_PATH))$(SEP)deptool +TOOLS = $(DEPTOOL) -HOSTTYPE = $(shell $(HOSTTOOL)) +preall : all -#---------------------------------------------------------------------- ------------------------------- -# TEST IF WE ARE IN THE TARGET DIRECTORY -# IF NOT WE WILL CHANGE TO THE TARGET DIRECTORY AND RUN MAKE FROM THERE -#---------------------------------------------------------------------- ------------------------------- -#ifeq (,$(filter $(CURDIR)/$(OUTPUT_DIR),$(notdir $(CURDIR)))) -ifneq ($(CURDIR), $(SRCDIR)/$(OUTPUT_DIR)) - -SRCDIR = $(CURDIR) - -.SUFFIXES: - -############################################# -# VARIABLE TO CHANGE TO TARGET DIRECTORY AND INVOKE MAKE FROM THERE -# -MAKETARGET = $(MAKE) --no-print-directory -C $(OUTPUT_DIR) \ - -f ../../Makefile SRCDIR=$(CURDIR) $(MAKECMDGOALS) - -.PHONY: CHANGE_TO_TARGET -CHANGE_TO_TARGET setupldr : BUILD_TOOLS $(OBJDIR) $(OBJDIR)/$(TARGET) - @echo Calculating source file dependencies... - +@$(MAKETARGET) - .PHONY: BUILD_TOOLS BUILD_TOOLS: - @$(MAKE) --no-print-directory -C $(TOOLSDIR) + @$(MAKE) --no-print-directory -C $(FREELDR_TOOLS_PATH) -$(OBJDIR): - @echo Creating directory: $(OBJDIR) - @$(MKDIR) $(OBJDIR) - -$(OBJDIR)/$(TARGET): $(OBJDIR) - @echo Creating directory: $(OBJDIR)/$(TARGET) - @$(MKDIR) $(OBJDIR)/$(TARGET) - - -Makefile : ; - -% :: CHANGE_TO_TARGET - ############################################# .PHONY : clean clean: - @$(MAKE) --no-print-directory -C $(TOOLSDIR) - @echo Cleaning directory $(OBJDIR)/$(TARGET) - @-$(RM) $(OBJDIR)/$(TARGET)/* - @echo Removing directory $(OBJDIR)/$(TARGET) - @-$(RMDIR) $(OBJDIR)/$(TARGET) - @-$(RMDIR) $(OBJDIR) + @-$(RM) $(ALL_OBJS) + @-$(RM) $(ALL_OBJS:.o=.d) + @-$(RM) freeldr.exe + @-$(RM) freeldr.sys + @-$(RM) freeldr.map + @-$(RM) setupldr.exe + @-$(RM) setupldr.sys + @-$(RM) setupldr.map + @$(MAKE) --no-print-directory -C $(FREELDR_TOOLS_PATH) @echo Clean ALL done. ############################################# @@ -117,31 +74,19 @@ $(MKDIR) $(BOOTCD_DIR)/disk/loader .PHONY : boot_loader -boot_loader : $(OBJDIR)/$(TARGET)/freeldr.sys - $(CP) $(OBJDIR)/$(TARGET)/freeldr.sys $(BOOTCD_DIR)/disk/loader/freeldr.sys +boot_loader : freeldr.sys + $(CP) freeldr.sys $(BOOTCD_DIR)/disk/loader/freeldr.sys $(CP) ../freeldr.ini $(BOOTCD_DIR)/disk/loader/freeldr.ini .PHONY : setup_loader -setup_loader : $(OBJDIR)/$(TARGET)/setupldr.sys - $(CP) $(OBJDIR)/$(TARGET)/setupldr.sys $(BOOTCD_DIR)/disk/loader/setupldr.sys +setup_loader : setupldr.sys + $(CP) setupldr.sys $(BOOTCD_DIR)/disk/loader/setupldr.sys -############################################# -#---------------------------------------------------------------------- ------------------------------- -# END MAGIC TARGET DIRECTORY CHANGE STUFF -#---------------------------------------------------------------------- ------------------------------- -else - -############################################# -# COMPILER COMMAND LINE OPTIONS -# COMPILER_OPTIONS = -Wall -Werror -nostdlib -nostdinc -ffreestanding -fno-builtin -fno-inline \ -fno-zero-initialized-in-bss -O1 -MD # FreeLoader does not use any of the standard libraries, includes, or built-in functions -############################################# -# COMPILER DEFINES -# ifeq ($(DEBUG),yes) COMPILER_DEBUG_DEFINES = -DDEBUG else @@ -150,132 +95,110 @@ COMPILER_DEFINES = -D__$(TARGET)__ $(COMPILER_DEBUG_DEFINES) -############################################# -# INCLUDE DIRECTORY OPTIONS -# COMPILER_INCLUDES = -I$(SRCDIR)/include -############################################# -# COMPILER FLAGS -# -CFLAGS = $(COMPILER_OPTIONS) \ - $(COMPILER_DEFINES) \ - $(COMPILER_INCLUDES) +CFLAGS = $(COMPILER_OPTIONS) \ + $(COMPILER_DEFINES) \ + $(COMPILER_INCLUDES) -############################################# -# LINKER COMMAND LINE OPTIONS -# -#LINKER_OPTIONS = -N -Ttext=0x8000 --oformat=binary -s LINKER_OPTIONS = -N -Ttext=0x8000 -############################################# -# LINKER FLAGS -# LFLAGS = $(LINKER_OPTIONS) -############################################# -# NASM FLAGS -# -ifeq ($(HOSTTYPE), dos) - NASMFLAGS = -f coff +ifeq ($(HOST),mingw32-linux) + NASMFLAGS = -f win32 else - ifeq ($(HOSTTYPE), win32) - NASMFLAGS = -f win32 - else - NASMFLAGS = -f elf - endif + NASMFLAGS = -f elf endif -############################################# -# LIST ALL THE OBJECT FILE GROUPS -# # fathelp.o must come first in the link line because it contains bootsector helper code # arch.o must come second in the link line because it contains the startup code -ARCH_OBJS = fathelp.o \ - arch.o \ - i386idt.o \ - i386trap.o \ - i386cpu.o \ - i386pnp.o \ - boot.o \ - linux.o \ - mb.o \ - i386rtl.o \ - i386vid.o \ - drvmap.o \ - int386.o \ - i386disk.o \ - portio.o \ - hardware.o \ - hwacpi.o \ - hwapm.o \ - hwcpu.o \ - hwpci.o \ - archmach.o \ - machpc.o \ - machxbox.o \ - pccons.o \ - pcdisk.o \ - pcmem.o \ - pcrtc.o \ - pcvideo.o \ - xboxcons.o \ - xboxdisk.o \ - xboxfont.o \ - xboxhw.o \ - xboxmem.o \ - xboxrtc.o \ - xboxvideo.o \ - _alloca.o # For Mingw32 builds +ARCH_I386_OBJS = fathelp.o \ + arch.o \ + i386idt.o \ + i386trap.o \ + i386cpu.o \ + i386pnp.o \ + boot.o \ + linux.o \ + mb.o \ + i386rtl.o \ + i386vid.o \ + drvmap.o \ + int386.o \ + i386disk.o \ + portio.o \ + hardware.o \ + hwacpi.o \ + hwapm.o \ + hwcpu.o \ + hwpci.o \ + archmach.o \ + machpc.o \ + machxbox.o \ + pccons.o \ + pcdisk.o \ + pcmem.o \ + pcrtc.o \ + pcvideo.o \ + xboxcons.o \ + xboxdisk.o \ + xboxfont.o \ + xboxhw.o \ + xboxmem.o \ + xboxrtc.o \ + xboxvideo.o \ + _alloca.o # For Mingw32 builds +ARCH_OBJS = $(addprefix i386/,$(ARCH_I386_OBJS)) -RTL_OBJS = print.o \ - stdlib.o \ - string.o \ - list.o \ - memcmp.o \ - memcpy.o \ - memmove.o \ - memset.o +RTL_OBJS = print.o \ + stdlib.o \ + string.o \ + list.o \ + memcmp.o \ + memcpy.o \ + memmove.o \ + memset.o -FS_OBJS = fs.o \ - fat.o \ - iso.o \ - ext2.o \ - ntfs.o \ - fsrec.o +FS_OBJS = fs.o \ + fat.o \ + iso.o \ + ext2.o \ + ntfs.o \ + fsrec.o -UI_OBJS = tui.o \ - tuimenu.o \ - ui.o \ - gui.o +UI_OBJS = tui.o \ + tuimenu.o \ + ui.o \ + gui.o -REACTOS_OBJS= arcname.o \ - binhive.o \ - registry.o +REACTOS_OBJS = arcname.o \ + binhive.o \ + registry.o COMM_OBJS = rs232.o -DISK_OBJS = disk.o \ - partition.o +DISK_OBJS = disk.o \ + partition.o -MM_OBJS = mm.o \ - meminit.o +MM_OBJS = mm.o \ + meminit.o -CACHE_OBJS = cache.o \ - blocklist.o +CACHE_OBJS = cache.o \ + blocklist.o -INIFILE_OBJS= inifile.o \ - ini_init.o \ - parse.o +INIFILE_OBJS = inifile.o \ + ini_init.o \ + parse.o -INFFILE_OBJS= inffile.o +INFFILE_OBJS = inffile.o -VIDEO_OBJS = video.o \ - fade.o \ - palette.o \ - pixel.o \ - bank.o +VIDEO_OBJS = video.o \ + fade.o \ + palette.o \ + pixel.o \ + bank.o # libgcc2.o contains code (__udivdi3, __umoddi3) necessary to do # 64-bit division on the i386 (and other 32-bit) architectures @@ -283,87 +206,61 @@ MATH_OBJS = libgcc2.o BASE_OBJS = freeldr.o \ - debug.o \ - multiboot.o \ - version.o \ - cmdline.o \ - machine.o + debug.o \ + multiboot.o \ + version.o \ + cmdline.o \ + machine.o -FREELDR_OBJS= bootmgr.o \ - drivemap.o \ - miscboot.o \ - options.o \ - linuxboot.o \ - oslist.o \ - custom.o +FREELDR_OBJS = bootmgr.o \ + drivemap.o \ + miscboot.o \ + options.o \ + linuxboot.o \ + oslist.o \ + custom.o -ROSLDR_OBJS = reactos.o +ROSLDR_OBJS = reactos.o -SETUPLDR_OBJS= setupldr.o +SETUPLDR_OBJS = setupldr.o -COMMON_OBJS = $(ARCH_OBJS) \ - $(RTL_OBJS) \ - $(FS_OBJS) \ - $(UI_OBJS) \ - $(REACTOS_OBJS) \ - $(COMM_OBJS) \ - $(DISK_OBJS) \ - $(MM_OBJS) \ - $(CACHE_OBJS) \ - $(VIDEO_OBJS) \ - $(MATH_OBJS) \ - $(BASE_OBJS) +COMMON_OBJS = $(addprefix arch/,$(ARCH_OBJS)) \ + $(addprefix rtl/,$(RTL_OBJS)) \ + $(addprefix fs/,$(FS_OBJS)) \ + $(addprefix ui/,$(UI_OBJS)) \ + $(addprefix reactos/,$(REACTOS_OBJS)) \ + $(addprefix comm/,$(COMM_OBJS)) \ + $(addprefix disk/,$(DISK_OBJS)) \ + $(addprefix mm/,$(MM_OBJS)) \ + $(addprefix cache/,$(CACHE_OBJS)) \ + $(addprefix video/,$(VIDEO_OBJS)) \ + $(addprefix math/,$(MATH_OBJS)) \ + $(BASE_OBJS) -SPECIAL_OBJS = $(INIFILE_OBJS) \ - $(INFFILE_OBJS) \ - $(FREELDR_OBJS) \ - $(ROSLDR_OBJS) \ - $(SETUPLDR_OBJS) - +SPECIAL_OBJS = $(addprefix inifile/,$(INIFILE_OBJS)) \ + $(addprefix inffile/,$(INFFILE_OBJS)) \ + $(FREELDR_OBJS) \ + $(addprefix reactos/,$(ROSLDR_OBJS)) \ + $(addprefix reactos/,$(SETUPLDR_OBJS)) -F_OBJS = $(COMMON_OBJS) \ - $(INIFILE_OBJS) \ - $(ROSLDR_OBJS) \ - $(FREELDR_OBJS) +F_OBJS = $(COMMON_OBJS) \ + $(addprefix inifile/,$(INIFILE_OBJS)) \ + $(addprefix reactos/,$(ROSLDR_OBJS)) \ + $(FREELDR_OBJS) -S_OBJS = $(COMMON_OBJS) \ - $(INIFILE_OBJS) \ - $(INFFILE_OBJS) \ - $(SETUPLDR_OBJS) +S_OBJS = $(COMMON_OBJS) \ + $(addprefix inifile/,$(INIFILE_OBJS)) \ + $(addprefix inffile/,$(INFFILE_OBJS)) \ + $(addprefix reactos/,$(SETUPLDR_OBJS)) -############################################# -# ALL THE OBJECTS -# -ALL_OBJS = $(COMMON_OBJS) \ - $(SPECIAL_OBJS) +ALL_OBJS = $(COMMON_OBJS) \ + $(SPECIAL_OBJS) -############################################# -# SET THE VPATH SO MAKE CAN FIND THE SOURCE FILES -# -VPATH = $(SRCDIR)/ \ - $(SRCDIR)/arch/$(TARGET) \ - $(SRCDIR)/rtl \ - $(SRCDIR)/fs \ - $(SRCDIR)/ui \ - $(SRCDIR)/reactos \ - $(SRCDIR)/comm \ - $(SRCDIR)/disk \ - $(SRCDIR)/mm \ - $(SRCDIR)/cache \ - $(SRCDIR)/inifile \ - $(SRCDIR)/inffile \ - $(SRCDIR)/video \ - $(SRCDIR)/math \ - $(SRCDIR)/include - -############################################# - all : freeldr.sys setupldr.sys @echo Make ALL done. -############################################# freeldr.sys : $(ALL_OBJS) @echo ===================================================== LINKING $@ @@ -375,7 +272,6 @@ endif @$(OBJCOPY) -O binary freeldr.exe freeldr.sys -############################################# setupldr.sys : $(ALL_OBJS) @echo ===================================================== LINKING $@ @@ -387,7 +283,6 @@ endif @$(OBJCOPY) -O binary setupldr.exe setupldr.sys -############################################# %.o :: %.c @echo ===================================================== Compiling $* @@ -402,12 +297,3 @@ %.o :: %.asm @echo ===================================================== Assembling $* @$(NASM_CMD) $(NASMFLAGS) -o $@ $< - -############################################# - -# Include the automagically generated dependencies --include $(ALL_OBJS:%.o=%.d) - -############################################# - -endif Property changes on: trunk/reactos/boot/freeldr/freeldr/arch/i386 ___________________________________________________________________ Name: svn:ignore + *.d _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/archmach.c --- trunk/freeldr/freeldr/arch/i386/archmach.c 2004-12-31 16:52:45 UTC (rev 12648) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/archmach.c 2005-01-01 00:42:18 UTC (rev 12672) @@ -1,4 +1,4 @@ -/* $Id: archmach.c,v 1.2 2004/11/09 23:36:19 gvg Exp $ +/* $Id$ * * FreeLoader * _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c --- trunk/freeldr/freeldr/arch/i386/machpc.c 2004-12-31 16:52:45 UTC (rev 12648) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c 2005-01-01 00:42:18 UTC (rev 12672) @@ -1,4 +1,4 @@ -/* $Id: machpc.c,v 1.7 2004/11/28 22:42:40 gvg Exp $ +/* $Id$ * * FreeLoader * _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.h --- trunk/freeldr/freeldr/arch/i386/machpc.h 2004-12-31 16:52:45 UTC (rev 12648) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.h 2005-01-01 00:42:18 UTC (rev 12672) @@ -1,4 +1,4 @@ -/* $Id: machpc.h,v 1.7 2004/11/28 22:42:40 gvg Exp $ +/* $Id$ * * FreeLoader * _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c --- trunk/freeldr/freeldr/arch/i386/machxbox.c 2004-12-31 16:52:45 UTC (rev 12648) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c 2005-01-01 00:42:18 UTC (rev 12672) @@ -1,4 +1,4 @@ -/* $Id: machxbox.c,v 1.7 2004/11/28 22:42:40 gvg Exp $ +/* $Id$ * * FreeLoader * _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.h --- trunk/freeldr/freeldr/arch/i386/machxbox.h 2004-12-31 16:52:45 UTC (rev 12648) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.h 2005-01-01 00:42:18 UTC (rev 12672) @@ -1,4 +1,4 @@ -/* $Id: machxbox.h,v 1.7 2004/11/28 22:42:40 gvg Exp $ +/* $Id$ * * FreeLoader * _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pccons.c --- trunk/freeldr/freeldr/arch/i386/pccons.c 2004-12-31 16:52:45 UTC (rev 12648) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/pccons.c 2005-01-01 00:42:18 UTC (rev 12672) @@ -1,4 +1,4 @@ -/* $Id: pccons.c,v 1.3 2004/11/14 22:04:38 gvg Exp $ +/* $Id$ * * FreeLoader * _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c --- trunk/freeldr/freeldr/arch/i386/pcmem.c 2004-12-31 16:52:45 UTC (rev 12648) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c 2005-01-01 00:42:18 UTC (rev 12672) @@ -1,4 +1,4 @@ -/* $Id: pcmem.c,v 1.2 2004/11/10 23:45:37 gvg Exp $ +/* $Id$ * * FreeLoader * _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcrtc.c --- trunk/freeldr/freeldr/arch/i386/pcrtc.c 2004-12-31 16:52:45 UTC (rev 12648) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/pcrtc.c 2005-01-01 00:42:18 UTC (rev 12672) @@ -1,4 +1,4 @@ -/* $Id: pcrtc.c,v 1.1 2004/11/14 22:04:38 gvg Exp $ +/* $Id$ * * FreeLoader * _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c --- trunk/freeldr/freeldr/arch/i386/pcvideo.c 2004-12-31 16:52:45 UTC (rev 12648) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c 2005-01-01 00:42:18 UTC (rev 12672) @@ -1,4 +1,4 @@ -/* $Id: pcvideo.c,v 1.3 2004/12/13 15:07:33 gvg Exp $ +/* $Id$ * * FreeLoader * _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/portio.c --- trunk/freeldr/freeldr/arch/i386/portio.c 2004-12-31 16:52:45 UTC (rev 12648) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/portio.c 2005-01-01 00:42:18 UTC (rev 12672) @@ -1,4 +1,4 @@ -/* $Id: portio.c,v 1.1 2003/01/19 01:03:58 bpalmer Exp $ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxcons.c --- trunk/freeldr/freeldr/arch/i386/xboxcons.c 2004-12-31 16:52:45 UTC (rev 12648) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxcons.c 2005-01-01 00:42:18 UTC (rev 12672) @@ -1,4 +1,4 @@ -/* $Id: xboxcons.c,v 1.1 2004/11/14 22:04:38 gvg Exp $ +/* $Id$ * * FreeLoader * _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxdisk.c --- trunk/freeldr/freeldr/arch/i386/xboxdisk.c 2004-12-31 16:52:45 UTC (rev 12648) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxdisk.c 2005-01-01 00:42:18 UTC (rev 12672) @@ -1,4 +1,4 @@ -/* $Id: xboxdisk.c,v 1.3 2004/11/12 17:17:07 gvg Exp $ +/* $Id$ * * FreeLoader * _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxfont.c --- trunk/freeldr/freeldr/arch/i386/xboxfont.c 2004-12-31 16:52:45 UTC (rev 12648) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxfont.c 2005-01-01 00:42:18 UTC (rev 12672) @@ -1,4 +1,4 @@ -/* $Id: xboxfont.c,v 1.2 2004/11/10 23:45:37 gvg Exp $ +/* $Id$ * * FreeLoader * _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxhw.c --- trunk/freeldr/freeldr/arch/i386/xboxhw.c 2004-12-31 16:52:45 UTC (rev 12648) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxhw.c 2005-01-01 00:42:18 UTC (rev 12672) @@ -1,4 +1,4 @@ -/* $Id: xboxhw.c,v 1.1 2004/11/28 22:42:40 gvg Exp $ +/* $Id$ * * FreeLoader * _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxmem.c --- trunk/freeldr/freeldr/arch/i386/xboxmem.c 2004-12-31 16:52:45 UTC (rev 12648) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxmem.c 2005-01-01 00:42:18 UTC (rev 12672) @@ -1,4 +1,4 @@ -/* $Id: xboxmem.c,v 1.3 2004/11/10 23:45:37 gvg Exp $ +/* $Id$ * * FreeLoader * _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxrtc.c --- trunk/freeldr/freeldr/arch/i386/xboxrtc.c 2004-12-31 16:52:45 UTC (rev 12648) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxrtc.c 2005-01-01 00:42:18 UTC (rev 12672) @@ -1,4 +1,4 @@ -/* $Id: xboxrtc.c,v 1.1 2004/11/14 22:04:38 gvg Exp $ +/* $Id$ * * FreeLoader * _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxvideo.c --- trunk/freeldr/freeldr/arch/i386/xboxvideo.c 2004-12-31 16:52:45 UTC (rev 12648) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxvideo.c 2005-01-01 00:42:18 UTC (rev 12672) @@ -1,4 +1,4 @@ -/* $Id: xboxvideo.c,v 1.5 2004/11/28 21:54:11 gvg Exp $ +/* $Id$ * * FreeLoader * Property changes on: trunk/reactos/boot/freeldr/freeldr/cache ___________________________________________________________________ Name: svn:ignore + *.d _____ Modified: trunk/reactos/boot/freeldr/freeldr/cmdline.c --- trunk/freeldr/freeldr/cmdline.c 2004-12-31 16:52:45 UTC (rev 12648) +++ trunk/reactos/boot/freeldr/freeldr/cmdline.c 2005-01-01 00:42:18 UTC (rev 12672) @@ -1,4 +1,4 @@ -/* $Id: cmdline.c,v 1.1 2004/11/01 20:49:32 gvg Exp $ +/* $Id$ * * FreeLoader * Copyright (C) 1998-2003 Brian Palmer <brianp(a)sginet.com> Property changes on: trunk/reactos/boot/freeldr/freeldr/comm ___________________________________________________________________ Name: svn:ignore + *.d Property changes on: trunk/reactos/boot/freeldr/freeldr/disk ___________________________________________________________________ Name: svn:ignore + *.d Property changes on: trunk/reactos/boot/freeldr/freeldr/fs [truncated at 1000 lines; 652 more skipped]

1 0

[ion] 12671: Fix some Rtl Prototype inconsistencies, more are in ntifs/winddk but i have fixed those in my header branch for when ntoskrnl will use them.
by ion＠svn.reactos.com 31 Dec '04

31 Dec '04

Fix some Rtl Prototype inconsistencies, more are in ntifs/winddk but i have fixed those in my header branch for when ntoskrnl will use them. Modified: trunk/reactos/include/ntos/rtl.h Modified: trunk/reactos/lib/rtl/unicode.c _____ Modified: trunk/reactos/include/ntos/rtl.h --- trunk/reactos/include/ntos/rtl.h 2004-12-31 21:26:43 UTC (rev 12670) +++ trunk/reactos/include/ntos/rtl.h 2004-12-31 21:31:39 UTC (rev 12671) @@ -1,4 +1,4 @@ -/* $Id: rtl.h,v 1.41 2004/12/30 18:30:03 ion Exp $ +/* $Id$ * */ #ifndef __DDK_RTL_H @@ -381,7 +381,7 @@ STDCALL RtlAppendUnicodeToString ( PUNICODE_STRING Destination, - PWSTR Source + PCWSTR Source ); SIZE_T STDCALL @@ -861,7 +861,7 @@ BOOLEAN STDCALL RtlCreateUnicodeString (OUT PUNICODE_STRING Destination, - IN PWSTR Source); + IN PCWSTR Source); BOOLEAN STDCALL RtlCreateUnicodeStringFromAsciiz (OUT PUNICODE_STRING Destination, @@ -2791,7 +2791,7 @@ FASTCALL RtlpCreateUnicodeString( IN OUT PUNICODE_STRING UniDest, - IN PWSTR Source, + IN PCWSTR Source, IN POOL_TYPE PoolType); NTSTATUS _____ Modified: trunk/reactos/lib/rtl/unicode.c --- trunk/reactos/lib/rtl/unicode.c 2004-12-31 21:26:43 UTC (rev 12670) +++ trunk/reactos/lib/rtl/unicode.c 2004-12-31 21:31:39 UTC (rev 12671) @@ -2240,7 +2240,7 @@ STDCALL RtlCreateUnicodeString( IN OUT PUNICODE_STRING UniDest, - IN PWSTR Source) + IN PCWSTR Source) { DPRINT("RtlCreateUnicodeString\n"); @@ -2255,7 +2255,7 @@ FASTCALL RtlpCreateUnicodeString( IN OUT PUNICODE_STRING UniDest, - IN PWSTR Source, + IN PCWSTR Source, IN POOL_TYPE PoolType) { ULONG Length; @@ -2392,7 +2392,7 @@ */ NTSTATUS STDCALL RtlAppendUnicodeToString(IN OUT PUNICODE_STRING Destination, - IN PWSTR Source) + IN PCWSTR Source) { ULONG slen;

1 0

[ion] 12670: Remove generated file
by ion＠svn.reactos.com 31 Dec '04

31 Dec '04

Remove generated file Deleted: trunk/reactos/lib/unicode/wine_unicode.map _____ Deleted: trunk/reactos/lib/unicode/wine_unicode.map --- trunk/reactos/lib/unicode/wine_unicode.map 2004-12-31 20:05:16 UTC (rev 12669) +++ trunk/reactos/lib/unicode/wine_unicode.map 2004-12-31 21:26:43 UTC (rev 12670) @@ -1,5805 +0,0 @@ - -wine_unicode.nostrip.dll: file format pei-i386 - -Disassembly of section .text: - -6b201000 <_DllMainCRTStartup@12>: -6b201000: 55 push %ebp -6b201001: 89 e5 mov %esp,%ebp -6b201003: 83 ec 18 sub $0x18,%esp -6b201006: 89 75 fc mov %esi,0xfffffffc(%ebp) -6b201009: 8b 75 0c mov 0xc(%ebp),%esi -6b20100c: 89 5d f8 mov %ebx,0xfffffff8(%ebp) -6b20100f: 83 fe 01 cmp $0x1,%esi -6b201012: 74 5c je 6b201070 <_DllMainCRTStartup@12+0x70> -6b201014: 89 74 24 04 mov %esi,0x4(%esp) -6b201018: 8b 55 10 mov 0x10(%ebp),%edx -6b20101b: 89 54 24 08 mov %edx,0x8(%esp) -6b20101f: 8b 55 08 mov 0x8(%ebp),%edx -6b201022: 89 14 24 mov %edx,(%esp) -6b201025: e8 26 40 00 00 call 6b205050 <_DllMain@12> -6b20102a: 83 ec 0c sub $0xc,%esp -6b20102d: 83 fe 01 cmp $0x1,%esi -6b201030: 89 c3 mov %eax,%ebx -6b201032: 74 2c je 6b201060 <_DllMainCRTStartup@12+0x60> -6b201034: 85 f6 test %esi,%esi -6b201036: 75 0c jne 6b201044 <_DllMainCRTStartup@12+0x44> -6b201038: 8b 0d 00 50 2f 6b mov 0x6b2f5000,%ecx -6b20103e: 85 c9 test %ecx,%ecx -6b201040: 75 10 jne 6b201052 <_DllMainCRTStartup@12+0x52> -6b201042: 31 db xor %ebx,%ebx -6b201044: 89 d8 mov %ebx,%eax -6b201046: 8b 5d f8 mov 0xfffffff8(%ebp),%ebx -6b201049: 8b 75 fc mov 0xfffffffc(%ebp),%esi -6b20104c: 89 ec mov %ebp,%esp -6b20104e: 5d pop %ebp -6b20104f: c2 0c 00 ret $0xc -6b201052: e8 59 00 00 00 call 6b2010b0 <___dll_exit> -6b201057: eb eb jmp 6b201044 <_DllMainCRTStartup@12+0x44> -6b201059: 8d b4 26 00 00 00 00 lea 0x0(%esi),%esi -6b201060: 85 c0 test %eax,%eax -6b201062: 75 d0 jne 6b201034 <_DllMainCRTStartup@12+0x34> -6b201064: e8 47 00 00 00 call 6b2010b0 <___dll_exit> -6b201069: eb c9 jmp 6b201034 <_DllMainCRTStartup@12+0x34> -6b20106b: 90 nop -6b20106c: 8d 74 26 00 lea 0x0(%esi),%esi -6b201070: c7 04 24 80 00 00 00 movl $0x80,(%esp) -6b201077: e8 04 44 00 00 call 6b205480 <_malloc> -6b20107c: a3 00 50 2f 6b mov %eax,0x6b2f5000 -6b201081: 85 c0 test %eax,%eax -6b201083: 74 1a je 6b20109f <_DllMainCRTStartup@12+0x9f> -6b201085: c7 00 00 00 00 00 movl $0x0,(%eax) -6b20108b: a3 10 50 2f 6b mov %eax,0x6b2f5010 -6b201090: e8 cb 40 00 00 call 6b205160 <__pei386_runtime_relocator> -6b201095: e8 56 40 00 00 call 6b2050f0 <___main> -6b20109a: e9 75 ff ff ff jmp 6b201014 <_DllMainCRTStartup@12+0x14> -6b20109f: e8 cc 43 00 00 call 6b205470 <__errno> -6b2010a4: c7 00 0c 00 00 00 movl $0xc,(%eax) -6b2010aa: 31 c0 xor %eax,%eax -6b2010ac: eb 98 jmp 6b201046 <_DllMainCRTStartup@12+0x46> -6b2010ae: 89 f6 mov %esi,%esi - -6b2010b0 <___dll_exit>: -6b2010b0: 55 push %ebp -6b2010b1: 89 e5 mov %esp,%ebp -6b2010b3: 83 ec 08 sub $0x8,%esp -6b2010b6: 89 5d fc mov %ebx,0xfffffffc(%ebp) -6b2010b9: 8b 15 00 50 2f 6b mov 0x6b2f5000,%edx -6b2010bf: 85 d2 test %edx,%edx -6b2010c1: 74 29 je 6b2010ec <___dll_exit+0x3c> -6b2010c3: 8b 1d 10 50 2f 6b mov 0x6b2f5010,%ebx -6b2010c9: 83 eb 04 sub $0x4,%ebx -6b2010cc: 39 d3 cmp %edx,%ebx -6b2010ce: 72 0d jb 6b2010dd <___dll_exit+0x2d> -6b2010d0: 8b 03 mov (%ebx),%eax -6b2010d2: 85 c0 test %eax,%eax -6b2010d4: 75 2a jne 6b201100 <___dll_exit+0x50> -6b2010d6: 83 eb 04 sub $0x4,%ebx -6b2010d9: 39 d3 cmp %edx,%ebx -6b2010db: 73 f3 jae 6b2010d0 <___dll_exit+0x20> -6b2010dd: 89 14 24 mov %edx,(%esp) -6b2010e0: e8 7b 43 00 00 call 6b205460 <_free> -6b2010e5: 31 c0 xor %eax,%eax -6b2010e7: a3 00 50 2f 6b mov %eax,0x6b2f5000 -6b2010ec: c7 04 24 00 00 00 00 movl $0x0,(%esp) -6b2010f3: e8 58 43 00 00 call 6b205450 <_fflush> -6b2010f8: 8b 5d fc mov 0xfffffffc(%ebp),%ebx -6b2010fb: 89 ec mov %ebp,%esp -6b2010fd: 5d pop %ebp -6b2010fe: c3 ret -6b2010ff: 90 nop -6b201100: ff d0 call *%eax -6b201102: 8b 15 00 50 2f 6b mov 0x6b2f5000,%edx -6b201108: eb cc jmp 6b2010d6 <___dll_exit+0x26> -6b20110a: 8d b6 00 00 00 00 lea 0x0(%esi),%esi - -6b201110 <_atexit>: -6b201110: 55 push %ebp -6b201111: 89 e5 mov %esp,%ebp -6b201113: 83 ec 18 sub $0x18,%esp -6b201116: c7 44 24 08 10 50 2f movl $0x6b2f5010,0x8(%esp) -6b20111d: 6b -6b20111e: 8b 55 08 mov 0x8(%ebp),%edx -6b201121: c7 44 24 04 00 50 2f movl $0x6b2f5000,0x4(%esp) -6b201128: 6b -6b201129: 89 14 24 mov %edx,(%esp) -6b20112c: e8 0f 43 00 00 call 6b205440 <___dllonexit> -6b201131: 85 c0 test %eax,%eax -6b201133: 0f 95 c2 setne %dl -6b201136: 89 ec mov %ebp,%esp -6b201138: 5d pop %ebp -6b201139: 0f b6 c2 movzbl %dl,%eax -6b20113c: 48 dec %eax -6b20113d: c3 ret -6b20113e: 89 f6 mov %esi,%esi - -6b201140 <__onexit>: -6b201140: 55 push %ebp -6b201141: 89 e5 mov %esp,%ebp -6b201143: 83 ec 18 sub $0x18,%esp -6b201146: c7 44 24 08 10 50 2f movl $0x6b2f5010,0x8(%esp) -6b20114d: 6b -6b20114e: 8b 55 08 mov 0x8(%ebp),%edx -6b201151: c7 44 24 04 00 50 2f movl $0x6b2f5000,0x4(%esp) -6b201158: 6b -6b201159: 89 14 24 mov %edx,(%esp) -6b20115c: e8 df 42 00 00 call 6b205440 <___dllonexit> -6b201161: 89 ec mov %ebp,%esp -6b201163: 5d pop %ebp -6b201164: c3 ret -6b201165: 90 nop -6b201166: 90 nop -6b201167: 90 nop -6b201168: 90 nop -6b201169: 90 nop -6b20116a: 90 nop -6b20116b: 90 nop -6b20116c: 90 nop -6b20116d: 90 nop -6b20116e: 90 nop -6b20116f: 90 nop - -6b201170 <___do_sjlj_init>: -6b201170: 55 push %ebp -6b201171: 89 e5 mov %esp,%ebp -6b201173: 5d pop %ebp -6b201174: e9 87 40 00 00 jmp 6b205200 <___w32_sharedptr_initialize> -6b201179: 90 nop -6b20117a: 90 nop -6b20117b: 90 nop -6b20117c: 90 nop -6b20117d: 90 nop -6b20117e: 90 nop -6b20117f: 90 nop - -6b201180 <_cmp_codepage>: -6b201180: 55 push %ebp -6b201181: 89 e5 mov %esp,%ebp -6b201183: 8b 45 0c mov 0xc(%ebp),%eax -6b201186: 8b 00 mov (%eax),%eax -6b201188: 8b 10 mov (%eax),%edx -6b20118a: 8b 45 08 mov 0x8(%ebp),%eax -6b20118d: 29 d0 sub %edx,%eax -6b20118f: 5d pop %ebp -6b201190: c3 ret - -6b201191 <_wine_cp_get_table>: -6b201191: 55 push %ebp -6b201192: 89 e5 mov %esp,%ebp -6b201194: 83 ec 08 sub $0x8,%esp -6b201197: 83 ec 0c sub $0xc,%esp -6b20119a: 68 80 11 20 6b push $0x6b201180 -6b20119f: 6a 04 push $0x4 -6b2011a1: 6a 3b push $0x3b -6b2011a3: 68 40 c7 21 6b push $0x6b21c740 -6b2011a8: ff 75 08 pushl 0x8(%ebp) -6b2011ab: e8 e0 42 00 00 call 6b205490 <_bsearch> -6b2011b0: 83 c4 20 add $0x20,%esp -6b2011b3: 89 45 fc mov %eax,0xfffffffc(%ebp) -6b2011b6: 8b 45 fc mov 0xfffffffc(%ebp),%eax -6b2011b9: 85 c0 test %eax,%eax -6b2011bb: 75 09 jne 6b2011c6 <_wine_cp_get_table+0x35> -6b2011bd: c7 45 f8 00 00 00 00 movl $0x0,0xfffffff8(%ebp) -6b2011c4: eb 08 jmp 6b2011ce <_wine_cp_get_table+0x3d> -6b2011c6: 8b 45 fc mov 0xfffffffc(%ebp),%eax -6b2011c9: 8b 00 mov (%eax),%eax -6b2011cb: 89 45 f8 mov %eax,0xfffffff8(%ebp) -6b2011ce: 8b 45 f8 mov 0xfffffff8(%ebp),%eax -6b2011d1: c9 leave -6b2011d2: c3 ret - -6b2011d3 <_wine_cp_enum_table>: -6b2011d3: 55 push %ebp -6b2011d4: 89 e5 mov %esp,%ebp -6b2011d6: 83 ec 04 sub $0x4,%esp -6b2011d9: 83 7d 08 3a cmpl $0x3a,0x8(%ebp) -6b2011dd: 76 09 jbe 6b2011e8 <_wine_cp_enum_table+0x15> -6b2011df: c7 45 fc 00 00 00 00 movl $0x0,0xfffffffc(%ebp) -6b2011e6: eb 0d jmp 6b2011f5 <_wine_cp_enum_table+0x22> -6b2011e8: 8b 45 08 mov 0x8(%ebp),%eax -6b2011eb: 8b 04 85 40 c7 21 6b mov 0x6b21c740(,%eax,4),%eax -6b2011f2: 89 45 fc mov %eax,0xfffffffc(%ebp) -6b2011f5: 8b 45 fc mov 0xfffffffc(%ebp),%eax -6b2011f8: c9 leave -6b2011f9: c3 ret -6b2011fa: 90 nop -6b2011fb: 90 nop -6b2011fc: 90 nop -6b2011fd: 90 nop -6b2011fe: 90 nop -6b2011ff: 90 nop - -6b201200 <_wine_fold_string>: -6b201200: 55 push %ebp -6b201201: 89 e5 mov %esp,%ebp -6b201203: 83 ec 18 sub $0x18,%esp -6b201206: 8b 45 14 mov 0x14(%ebp),%eax -6b201209: 89 45 fc mov %eax,0xfffffffc(%ebp) -6b20120c: 83 7d 10 ff cmpl $0xffffffff,0x10(%ebp) -6b201210: 75 12 jne 6b201224 <_wine_fold_string+0x24> -6b201212: 83 ec 0c sub $0xc,%esp -6b201215: ff 75 0c pushl 0xc(%ebp) -6b201218: e8 83 42 00 00 call 6b2054a0 <_wcslen> -6b20121d: 83 c4 10 add $0x10,%esp -6b201220: 40 inc %eax -6b201221: 89 45 10 mov %eax,0x10(%ebp) -6b201224: 83 7d 18 00 cmpl $0x0,0x18(%ebp) -6b201228: 75 5e jne 6b201288 <_wine_fold_string+0x88> -6b20122a: 8b 45 10 mov 0x10(%ebp),%eax -6b20122d: 89 45 18 mov %eax,0x18(%ebp) -6b201230: 8b 45 08 mov 0x8(%ebp),%eax -6b201233: c1 e8 0d shr $0xd,%eax -6b201236: 83 e0 01 and $0x1,%eax -6b201239: 85 c0 test %eax,%eax -6b20123b: 74 31 je 6b20126e <_wine_fold_string+0x6e> -6b20123d: 8d 45 10 lea 0x10(%ebp),%eax -6b201240: ff 08 decl (%eax) -6b201242: 83 7d 10 ff cmpl $0xffffffff,0x10(%ebp) -6b201246: 74 35 je 6b20127d <_wine_fold_string+0x7d> -6b201248: 83 ec 0c sub $0xc,%esp -6b20124b: 8b 45 0c mov 0xc(%ebp),%eax -6b20124e: 66 8b 00 mov (%eax),%ax -6b201251: 25 ff ff 00 00 and $0xffff,%eax -6b201256: 50 push %eax -6b201257: e8 ce 02 00 00 call 6b20152a <_get_ligature_len> -6b20125c: 83 c4 10 add $0x10,%esp -6b20125f: 89 c2 mov %eax,%edx -6b201261: 8d 45 18 lea 0x18(%ebp),%eax -6b201264: 01 10 add %edx,(%eax) -6b201266: 8d 45 0c lea 0xc(%ebp),%eax -6b201269: 83 00 02 addl $0x2,(%eax) -6b20126c: eb cf jmp 6b20123d <_wine_fold_string+0x3d> -6b20126e: 8b 45 08 mov 0x8(%ebp),%eax -6b201271: c1 e8 06 shr $0x6,%eax -6b201274: 83 e0 01 and $0x1,%eax -6b201277: 85 c0 test %eax,%eax -6b201279: 74 02 je 6b20127d <_wine_fold_string+0x7d> -6b20127b: eb 00 jmp 6b20127d <_wine_fold_string+0x7d> -6b20127d: 8b 45 18 mov 0x18(%ebp),%eax -6b201280: 89 45 ec mov %eax,0xffffffec(%ebp) -6b201283: e9 78 01 00 00 jmp 6b201400 <_wine_fold_string+0x200> -6b201288: 8b 45 10 mov 0x10(%ebp),%eax -6b20128b: 3b 45 18 cmp 0x18(%ebp),%eax -6b20128e: 7e 0c jle 6b20129c <_wine_fold_string+0x9c> -6b201290: c7 45 ec 00 00 00 00 movl $0x0,0xffffffec(%ebp) -6b201297: e9 64 01 00 00 jmp 6b201400 <_wine_fold_string+0x200> -6b20129c: 8b 55 10 mov 0x10(%ebp),%edx -6b20129f: 8d 45 18 lea 0x18(%ebp),%eax -6b2012a2: 29 10 sub %edx,(%eax) -6b2012a4: c7 45 f4 00 00 00 00 movl $0x0,0xfffffff4(%ebp) -6b2012ab: 8b 45 f4 mov 0xfffffff4(%ebp),%eax -6b2012ae: 3b 45 10 cmp 0x10(%ebp),%eax -6b2012b1: 0f 8d 3c 01 00 00 jge 6b2013f3 <_wine_fold_string+0x1f3> -6b2012b7: 8b 45 0c mov 0xc(%ebp),%eax -6b2012ba: 66 8b 00 mov (%eax),%ax -6b2012bd: 66 89 45 f2 mov %ax,0xfffffff2(%ebp) -6b2012c1: 8b 45 08 mov 0x8(%ebp),%eax -6b2012c4: c1 e8 0d shr $0xd,%eax -6b2012c7: 83 e0 01 and $0x1,%eax -6b2012ca: 85 c0 test %eax,%eax -6b2012cc: 0f 84 a4 00 00 00 je 6b201376 <_wine_fold_string+0x176> -6b2012d2: 83 ec 0c sub $0xc,%esp -6b2012d5: 66 8b 45 f2 mov 0xfffffff2(%ebp),%ax -6b2012d9: 25 ff ff 00 00 and $0xffff,%eax -6b2012de: 50 push %eax -6b2012df: e8 bb 01 00 00 call 6b20149f <_get_ligature> -6b2012e4: 83 c4 10 add $0x10,%esp -6b2012e7: 89 45 f8 mov %eax,0xfffffff8(%ebp) -6b2012ea: 8b 45 f8 mov 0xfffffff8(%ebp),%eax -6b2012ed: 66 83 38 00 cmpw $0x0,(%eax) -6b2012f1: 0f 84 8e 00 00 00 je 6b201385 <_wine_fold_string+0x185> -6b2012f7: 8d 45 18 lea 0x18(%ebp),%eax -6b2012fa: ff 08 decl (%eax) -6b2012fc: 83 7d 18 ff cmpl $0xffffffff,0x18(%ebp) -6b201300: 75 0c jne 6b20130e <_wine_fold_string+0x10e> -6b201302: c7 45 ec 00 00 00 00 movl $0x0,0xffffffec(%ebp) -6b201309: e9 f2 00 00 00 jmp 6b201400 <_wine_fold_string+0x200> -6b20130e: 8b 55 14 mov 0x14(%ebp),%edx -6b201311: 8b 45 f8 mov 0xfffffff8(%ebp),%eax -6b201314: 66 8b 00 mov (%eax),%ax -6b201317: 66 89 02 mov %ax,(%edx) -6b20131a: 8b 45 f8 mov 0xfffffff8(%ebp),%eax -6b20131d: 83 c0 04 add $0x4,%eax -6b201320: 66 83 38 00 cmpw $0x0,(%eax) -6b201324: 74 3b je 6b201361 <_wine_fold_string+0x161> -6b201326: 8d 45 18 lea 0x18(%ebp),%eax -6b201329: ff 08 decl (%eax) -6b20132b: 83 7d 18 ff cmpl $0xffffffff,0x18(%ebp) -6b20132f: 75 0c jne 6b20133d <_wine_fold_string+0x13d> -6b201331: c7 45 ec 00 00 00 00 movl $0x0,0xffffffec(%ebp) -6b201338: e9 c3 00 00 00 jmp 6b201400 <_wine_fold_string+0x200> -6b20133d: 8d 45 14 lea 0x14(%ebp),%eax -6b201340: 83 00 02 addl $0x2,(%eax) -6b201343: 8b 55 14 mov 0x14(%ebp),%edx -6b201346: 8b 45 f8 mov 0xfffffff8(%ebp),%eax -6b201349: 83 c0 02 add $0x2,%eax -6b20134c: 66 8b 00 mov (%eax),%ax -6b20134f: 66 89 02 mov %ax,(%edx) -6b201352: 8b 45 f8 mov 0xfffffff8(%ebp),%eax -6b201355: 83 c0 04 add $0x4,%eax -6b201358: 66 8b 00 mov (%eax),%ax -6b20135b: 66 89 45 f2 mov %ax,0xfffffff2(%ebp) -6b20135f: eb 0d jmp 6b20136e <_wine_fold_string+0x16e> -6b201361: 8b 45 f8 mov 0xfffffff8(%ebp),%eax -6b201364: 83 c0 02 add $0x2,%eax -6b201367: 66 8b 00 mov (%eax),%ax -6b20136a: 66 89 45 f2 mov %ax,0xfffffff2(%ebp) -6b20136e: 8d 45 14 lea 0x14(%ebp),%eax -6b201371: 83 00 02 addl $0x2,(%eax) -6b201374: eb 0f jmp 6b201385 <_wine_fold_string+0x185> -6b201376: 8b 45 08 mov 0x8(%ebp),%eax -6b201379: c1 e8 06 shr $0x6,%eax -6b20137c: 83 e0 01 and $0x1,%eax -6b20137f: 85 c0 test %eax,%eax -6b201381: 74 02 je 6b201385 <_wine_fold_string+0x185> -6b201383: eb 00 jmp 6b201385 <_wine_fold_string+0x185> -6b201385: 8b 45 08 mov 0x8(%ebp),%eax -6b201388: c1 e8 07 shr $0x7,%eax -6b20138b: 83 e0 01 and $0x1,%eax -6b20138e: 85 c0 test %eax,%eax -6b201390: 74 19 je 6b2013ab <_wine_fold_string+0x1ab> -6b201392: 83 ec 0c sub $0xc,%esp -6b201395: 66 8b 45 f2 mov 0xfffffff2(%ebp),%ax -6b201399: 25 ff ff 00 00 and $0xffff,%eax -6b20139e: 50 push %eax -6b20139f: e8 ae 00 00 00 call 6b201452 <_to_unicode_digit> -6b2013a4: 83 c4 10 add $0x10,%esp -6b2013a7: 66 89 45 f2 mov %ax,0xfffffff2(%ebp) -6b2013ab: 8b 45 08 mov 0x8(%ebp),%eax -6b2013ae: c1 e8 04 shr $0x4,%eax -6b2013b1: 83 e0 01 and $0x1,%eax -6b2013b4: 85 c0 test %eax,%eax -6b2013b6: 74 19 je 6b2013d1 <_wine_fold_string+0x1d1> -6b2013b8: 83 ec 0c sub $0xc,%esp -6b2013bb: 66 8b 45 f2 mov 0xfffffff2(%ebp),%ax -6b2013bf: 25 ff ff 00 00 and $0xffff,%eax -6b2013c4: 50 push %eax -6b2013c5: e8 3b 00 00 00 call 6b201405 <_to_unicode_native> -6b2013ca: 83 c4 10 add $0x10,%esp -6b2013cd: 66 89 45 f2 mov %ax,0xfffffff2(%ebp) -6b2013d1: 8b 45 14 mov 0x14(%ebp),%eax -6b2013d4: 89 c2 mov %eax,%edx -6b2013d6: 66 8b 45 f2 mov 0xfffffff2(%ebp),%ax -6b2013da: 66 89 02 mov %ax,(%edx) -6b2013dd: 8d 45 14 lea 0x14(%ebp),%eax -6b2013e0: 83 00 02 addl $0x2,(%eax) -6b2013e3: 8d 45 0c lea 0xc(%ebp),%eax -6b2013e6: 83 00 02 addl $0x2,(%eax) -6b2013e9: 8d 45 f4 lea 0xfffffff4(%ebp),%eax -6b2013ec: ff 00 incl (%eax) -6b2013ee: e9 b8 fe ff ff jmp 6b2012ab <_wine_fold_string+0xab> -6b2013f3: 8b 55 fc mov 0xfffffffc(%ebp),%edx -6b2013f6: 8b 45 14 mov 0x14(%ebp),%eax -6b2013f9: 29 d0 sub %edx,%eax -6b2013fb: d1 f8 sar %eax -6b2013fd: 89 45 ec mov %eax,0xffffffec(%ebp) -6b201400: 8b 45 ec mov 0xffffffec(%ebp),%eax -6b201403: c9 leave -6b201404: c3 ret - -6b201405 <_to_unicode_native>: -6b201405: 55 push %ebp -6b201406: 89 e5 mov %esp,%ebp -6b201408: 83 ec 04 sub $0x4,%esp -6b20140b: 8b 45 08 mov 0x8(%ebp),%eax -6b20140e: 66 89 45 fe mov %ax,0xfffffffe(%ebp) -6b201412: 66 8b 45 fe mov 0xfffffffe(%ebp),%ax -6b201416: 66 c1 e8 08 shr $0x8,%ax -6b20141a: 25 ff ff 00 00 and $0xffff,%eax -6b20141f: 66 8b 84 00 60 bf 20 mov 0x6b20bf60(%eax,%eax,1),%ax -6b201426: 6b -6b201427: 89 c2 mov %eax,%edx -6b201429: 81 e2 ff ff 00 00 and $0xffff,%edx -6b20142f: 66 8b 45 fe mov 0xfffffffe(%ebp),%ax -6b201433: 25 ff ff 00 00 and $0xffff,%eax -6b201438: 25 ff 00 00 00 and $0xff,%eax -6b20143d: 01 c2 add %eax,%edx -6b20143f: 66 8b 45 fe mov 0xfffffffe(%ebp),%ax -6b201443: 66 03 84 12 60 bf 20 add 0x6b20bf60(%edx,%edx,1),%ax -6b20144a: 6b -6b20144b: 25 ff ff 00 00 and $0xffff,%eax -6b201450: c9 leave -6b201451: c3 ret - -6b201452 <_to_unicode_digit>: -6b201452: 55 push %ebp -6b201453: 89 e5 mov %esp,%ebp -6b201455: 83 ec 04 sub $0x4,%esp -6b201458: 8b 45 08 mov 0x8(%ebp),%eax -6b20145b: 66 89 45 fe mov %ax,0xfffffffe(%ebp) -6b20145f: 66 8b 45 fe mov 0xfffffffe(%ebp),%ax -6b201463: 66 c1 e8 08 shr $0x8,%ax -6b201467: 25 ff ff 00 00 and $0xffff,%eax -6b20146c: 66 8b 84 00 80 9e 20 mov 0x6b209e80(%eax,%eax,1),%ax -6b201473: 6b -6b201474: 89 c2 mov %eax,%edx -6b201476: 81 e2 ff ff 00 00 and $0xffff,%edx -6b20147c: 66 8b 45 fe mov 0xfffffffe(%ebp),%ax -6b201480: 25 ff ff 00 00 and $0xffff,%eax -6b201485: 25 ff 00 00 00 and $0xff,%eax -6b20148a: 01 c2 add %eax,%edx -6b20148c: 66 8b 45 fe mov 0xfffffffe(%ebp),%ax -6b201490: 66 03 84 12 80 9e 20 add 0x6b209e80(%edx,%edx,1),%ax -6b201497: 6b -6b201498: 25 ff ff 00 00 and $0xffff,%eax -6b20149d: c9 leave -6b20149e: c3 ret - -6b20149f <_get_ligature>: -6b20149f: 55 push %ebp -6b2014a0: 89 e5 mov %esp,%ebp -6b2014a2: 83 ec 14 sub $0x14,%esp -6b2014a5: 8b 45 08 mov 0x8(%ebp),%eax -6b2014a8: 66 89 45 fe mov %ax,0xfffffffe(%ebp) -6b2014ac: c7 45 f8 00 00 00 00 movl $0x0,0xfffffff8(%ebp) -6b2014b3: c7 45 f4 22 00 00 00 movl $0x22,0xfffffff4(%ebp) -6b2014ba: 8b 45 f8 mov 0xfffffff8(%ebp),%eax -6b2014bd: 3b 45 f4 cmp 0xfffffff4(%ebp),%eax -6b2014c0: 7f 5c jg 6b20151e <_get_ligature+0x7f> -6b2014c2: 8b 45 f4 mov 0xfffffff4(%ebp),%eax -6b2014c5: 8b 55 f8 mov 0xfffffff8(%ebp),%edx -6b2014c8: 01 c2 add %eax,%edx -6b2014ca: 89 d0 mov %edx,%eax -6b2014cc: c1 f8 1f sar $0x1f,%eax -6b2014cf: c1 e8 1f shr $0x1f,%eax -6b2014d2: 8d 04 02 lea (%edx,%eax,1),%eax -6b2014d5: d1 f8 sar %eax -6b2014d7: 89 45 f0 mov %eax,0xfffffff0(%ebp) -6b2014da: 8b 45 f0 mov 0xfffffff0(%ebp),%eax -6b2014dd: 66 8b 84 00 40 c8 21 mov 0x6b21c840(%eax,%eax,1),%ax -6b2014e4: 6b -6b2014e5: 66 3b 45 fe cmp 0xfffffffe(%ebp),%ax -6b2014e9: 73 09 jae 6b2014f4 <_get_ligature+0x55> -6b2014eb: 8b 45 f0 mov 0xfffffff0(%ebp),%eax -6b2014ee: 40 inc %eax -6b2014ef: 89 45 f8 mov %eax,0xfffffff8(%ebp) -6b2014f2: eb c6 jmp 6b2014ba <_get_ligature+0x1b> -6b2014f4: 8b 45 f0 mov 0xfffffff0(%ebp),%eax -6b2014f7: 66 8b 84 00 40 c8 21 mov 0x6b21c840(%eax,%eax,1),%ax -6b2014fe: 6b -6b2014ff: 66 3b 45 fe cmp 0xfffffffe(%ebp),%ax -6b201503: 76 09 jbe 6b20150e <_get_ligature+0x6f> -6b201505: 8b 45 f0 mov 0xfffffff0(%ebp),%eax -6b201508: 48 dec %eax -6b201509: 89 45 f4 mov %eax,0xfffffff4(%ebp) -6b20150c: eb ac jmp 6b2014ba <_get_ligature+0x1b> -6b20150e: 8b 45 f0 mov 0xfffffff0(%ebp),%eax -6b201511: c1 e0 03 shl $0x3,%eax -6b201514: 05 a0 c8 21 6b add $0x6b21c8a0,%eax -6b201519: 89 45 ec mov %eax,0xffffffec(%ebp) -6b20151c: eb 07 jmp 6b201525 <_get_ligature+0x86> -6b20151e: c7 45 ec b8 c9 21 6b movl $0x6b21c9b8,0xffffffec(%ebp) -6b201525: 8b 45 ec mov 0xffffffec(%ebp),%eax -6b201528: c9 leave -6b201529: c3 ret - -6b20152a <_get_ligature_len>: -6b20152a: 55 push %ebp -6b20152b: 89 e5 mov %esp,%ebp -6b20152d: 83 ec 14 sub $0x14,%esp -6b201530: 8b 45 08 mov 0x8(%ebp),%eax -6b201533: 66 89 45 fe mov %ax,0xfffffffe(%ebp) -6b201537: c7 45 f8 00 00 00 00 movl $0x0,0xfffffff8(%ebp) -6b20153e: c7 45 f4 22 00 00 00 movl $0x22,0xfffffff4(%ebp) -6b201545: 8b 45 f8 mov 0xfffffff8(%ebp),%eax -6b201548: 3b 45 f4 cmp 0xfffffff4(%ebp),%eax -6b20154b: 7f 61 jg 6b2015ae <_get_ligature_len+0x84> -6b20154d: 8b 45 f4 mov 0xfffffff4(%ebp),%eax -6b201550: 8b 55 f8 mov 0xfffffff8(%ebp),%edx -6b201553: 01 c2 add %eax,%edx -6b201555: 89 d0 mov %edx,%eax -6b201557: c1 f8 1f sar $0x1f,%eax -6b20155a: c1 e8 1f shr $0x1f,%eax -6b20155d: 8d 04 02 lea (%edx,%eax,1),%eax -6b201560: d1 f8 sar %eax -6b201562: 89 45 f0 mov %eax,0xfffffff0(%ebp) -6b201565: 8b 45 f0 mov 0xfffffff0(%ebp),%eax -6b201568: 66 8b 84 00 40 c8 21 mov 0x6b21c840(%eax,%eax,1),%ax -6b20156f: 6b -6b201570: 66 3b 45 fe cmp 0xfffffffe(%ebp),%ax -6b201574: 73 09 jae 6b20157f <_get_ligature_len+0x55> -6b201576: 8b 45 f0 mov 0xfffffff0(%ebp),%eax -6b201579: 40 inc %eax -6b20157a: 89 45 f8 mov %eax,0xfffffff8(%ebp) -6b20157d: eb c6 jmp 6b201545 <_get_ligature_len+0x1b> -6b20157f: 8b 45 f0 mov 0xfffffff0(%ebp),%eax -6b201582: 66 8b 84 00 40 c8 21 mov 0x6b21c840(%eax,%eax,1),%ax -6b201589: 6b -6b20158a: 66 3b 45 fe cmp 0xfffffffe(%ebp),%ax -6b20158e: 76 09 jbe 6b201599 <_get_ligature_len+0x6f> -6b201590: 8b 45 f0 mov 0xfffffff0(%ebp),%eax -6b201593: 48 dec %eax -6b201594: 89 45 f4 mov %eax,0xfffffff4(%ebp) -6b201597: eb ac jmp 6b201545 <_get_ligature_len+0x1b> -6b201599: 8b 45 f0 mov 0xfffffff0(%ebp),%eax -6b20159c: 66 8b 04 c5 a6 c8 21 mov 0x6b21c8a6(,%eax,8),%ax -6b2015a3: 6b -6b2015a4: 25 ff ff 00 00 and $0xffff,%eax -6b2015a9: 89 45 ec mov %eax,0xffffffec(%ebp) -6b2015ac: eb 07 jmp 6b2015b5 <_get_ligature_len+0x8b> -6b2015ae: c7 45 ec 00 00 00 00 movl $0x0,0xffffffec(%ebp) -6b2015b5: 8b 45 ec mov 0xffffffec(%ebp),%eax -6b2015b8: c9 leave -6b2015b9: c3 ret -6b2015ba: 90 nop -6b2015bb: 90 nop -6b2015bc: 90 nop -6b2015bd: 90 nop -6b2015be: 90 nop -6b2015bf: 90 nop - -6b2015c0 <_get_decomposition>: -6b2015c0: 55 push %ebp -6b2015c1: 89 e5 mov %esp,%ebp -6b2015c3: 83 ec 10 sub $0x10,%esp -6b2015c6: 8b 45 08 mov 0x8(%ebp),%eax -6b2015c9: 66 89 45 fe mov %ax,0xfffffffe(%ebp) -6b2015cd: c7 45 f8 a0 a3 21 6b movl $0x6b21a3a0,0xfffffff8(%ebp) -6b2015d4: 8b 55 0c mov 0xc(%ebp),%edx -6b2015d7: 66 8b 45 fe mov 0xfffffffe(%ebp),%ax -6b2015db: 66 89 02 mov %ax,(%edx) -6b2015de: 66 8b 45 fe mov 0xfffffffe(%ebp),%ax -6b2015e2: 66 c1 e8 08 shr $0x8,%ax -6b2015e6: 25 ff ff 00 00 and $0xffff,%eax -6b2015eb: 8d 14 00 lea (%eax,%eax,1),%edx -6b2015ee: 8b 45 f8 mov 0xfffffff8(%ebp),%eax -6b2015f1: 66 8b 04 02 mov (%edx,%eax,1),%ax -6b2015f5: 25 ff ff 00 00 and $0xffff,%eax -6b2015fa: 01 c0 add %eax,%eax -6b2015fc: 05 a0 a3 21 6b add $0x6b21a3a0,%eax -6b201601: 89 45 f8 mov %eax,0xfffffff8(%ebp) -6b201604: 66 8b 45 fe mov 0xfffffffe(%ebp),%ax -6b201608: 25 ff ff 00 00 and $0xffff,%eax -6b20160d: 83 e0 0f and $0xf,%eax -6b201610: 8d 0c 00 lea (%eax,%eax,1),%ecx -6b201613: 66 8b 45 fe mov 0xfffffffe(%ebp),%ax -6b201617: 66 c1 e8 04 shr $0x4,%ax -6b20161b: 25 ff ff 00 00 and $0xffff,%eax -6b201620: 83 e0 0f and $0xf,%eax -6b201623: 8d 14 00 lea (%eax,%eax,1),%edx -6b201626: 8b 45 f8 mov 0xfffffff8(%ebp),%eax -6b201629: 66 8b 04 02 mov (%edx,%eax,1),%ax -6b20162d: 25 ff ff 00 00 and $0xffff,%eax -6b201632: 8d 04 01 lea (%ecx,%eax,1),%eax -6b201635: 01 c0 add %eax,%eax -6b201637: 05 a0 a3 21 6b add $0x6b21a3a0,%eax -6b20163c: 89 45 f8 mov %eax,0xfffffff8(%ebp) -6b20163f: 8b 45 f8 mov 0xfffffff8(%ebp),%eax -6b201642: 66 83 38 00 cmpw $0x0,(%eax) -6b201646: 75 09 jne 6b201651 <_get_decomposition+0x91> -6b201648: c7 45 f0 01 00 00 00 movl $0x1,0xfffffff0(%ebp) -6b20164f: eb 58 jmp 6b2016a9 <_get_decomposition+0xe9> -6b201651: 83 7d 10 01 cmpl $0x1,0x10(%ebp) -6b201655: 77 09 ja 6b201660 <_get_decomposition+0xa0> -6b201657: c7 45 f0 00 00 00 00 movl $0x0,0xfffffff0(%ebp) -6b20165e: eb 49 jmp 6b2016a9 <_get_decomposition+0xe9> -6b201660: 83 ec 04 sub $0x4,%esp -6b201663: 8b 45 10 mov 0x10(%ebp),%eax -6b201666: 48 dec %eax -6b201667: 50 push %eax -6b201668: ff 75 0c pushl 0xc(%ebp) -6b20166b: 8b 45 f8 mov 0xfffffff8(%ebp),%eax -6b20166e: 66 8b 00 mov (%eax),%ax -6b201671: 25 ff ff 00 00 and $0xffff,%eax -6b201676: 50 push %eax -6b201677: e8 44 ff ff ff call 6b2015c0 <_get_decomposition> -6b20167c: 83 c4 10 add $0x10,%esp -6b20167f: 89 45 f4 mov %eax,0xfffffff4(%ebp) -6b201682: 83 7d f4 00 cmpl $0x0,0xfffffff4(%ebp) -6b201686: 74 1b je 6b2016a3 <_get_decomposition+0xe3> -6b201688: 8b 45 f4 mov 0xfffffff4(%ebp),%eax -6b20168b: 8d 0c 00 lea (%eax,%eax,1),%ecx -6b20168e: 8b 55 0c mov 0xc(%ebp),%edx -6b201691: 8b 45 f8 mov 0xfffffff8(%ebp),%eax -6b201694: 83 c0 02 add $0x2,%eax -6b201697: 66 8b 00 mov (%eax),%ax -6b20169a: 66 89 04 11 mov %ax,(%ecx,%edx,1) -6b20169e: 8d 45 f4 lea 0xfffffff4(%ebp),%eax -6b2016a1: ff 00 incl (%eax) -6b2016a3: 8b 45 f4 mov 0xfffffff4(%ebp),%eax -6b2016a6: 89 45 f0 mov %eax,0xfffffff0(%ebp) -6b2016a9: 8b 45 f0 mov 0xfffffff0(%ebp),%eax -6b2016ac: c9 leave -6b2016ad: c3 ret - -6b2016ae <_mbstowcs_sbcs_decompose>: -6b2016ae: 55 push %ebp -6b2016af: 89 e5 mov %esp,%ebp -6b2016b1: 83 ec 18 sub $0x18,%esp -6b2016b4: 8b 45 08 mov 0x8(%ebp),%eax -6b2016b7: 8b 40 10 mov 0x10(%eax),%eax -6b2016ba: 89 45 fc mov %eax,0xfffffffc(%ebp) -6b2016bd: 83 7d 18 00 cmpl $0x0,0x18(%ebp) -6b2016c1: 75 53 jne 6b201716 <_mbstowcs_sbcs_decompose+0x68> -6b2016c3: c7 45 f8 00 00 00 00 movl $0x0,0xfffffff8(%ebp) -6b2016ca: 83 7d 10 00 cmpl $0x0,0x10(%ebp) -6b2016ce: 74 3b je 6b20170b <_mbstowcs_sbcs_decompose+0x5d> -6b2016d0: 6a 04 push $0x4 -6b2016d2: 8d 45 f0 lea 0xfffffff0(%ebp),%eax -6b2016d5: 50 push %eax -6b2016d6: 8b 45 0c mov 0xc(%ebp),%eax -6b2016d9: 8a 00 mov (%eax),%al -6b2016db: 25 ff 00 00 00 and $0xff,%eax -6b2016e0: 8d 14 00 lea (%eax,%eax,1),%edx -6b2016e3: 8b 45 fc mov 0xfffffffc(%ebp),%eax -6b2016e6: 66 8b 04 02 mov (%edx,%eax,1),%ax -6b2016ea: 25 ff ff 00 00 and $0xffff,%eax -6b2016ef: 50 push %eax -6b2016f0: e8 cb fe ff ff call 6b2015c0 <_get_decomposition> -6b2016f5: 83 c4 0c add $0xc,%esp -6b2016f8: 89 c2 mov %eax,%edx -6b2016fa: 8d 45 f8 lea 0xfffffff8(%ebp),%eax -6b2016fd: 01 10 add %edx,(%eax) -6b2016ff: 8d 45 10 lea 0x10(%ebp),%eax -6b201702: ff 08 decl (%eax) -6b201704: 8d 45 0c lea 0xc(%ebp),%eax -6b201707: ff 00 incl (%eax) -6b201709: eb bf jmp 6b2016ca <_mbstowcs_sbcs_decompose+0x1c> -6b20170b: 8b 45 f8 mov 0xfffffff8(%ebp),%eax -6b20170e: 89 45 e8 mov %eax,0xffffffe8(%ebp) -6b201711: e9 80 00 00 00 jmp 6b201796 <_mbstowcs_sbcs_decompose+0xe8> -6b201716: 8b 45 18 mov 0x18(%ebp),%eax -6b201719: 89 45 f8 mov %eax,0xfffffff8(%ebp) -6b20171c: 83 7d 10 00 cmpl $0x0,0x10(%ebp) -6b201720: 74 58 je 6b20177a <_mbstowcs_sbcs_decompose+0xcc> -6b201722: 83 7d f8 00 cmpl $0x0,0xfffffff8(%ebp) -6b201726: 74 52 je 6b20177a <_mbstowcs_sbcs_decompose+0xcc> -6b201728: ff 75 f8 pushl 0xfffffff8(%ebp) -6b20172b: ff 75 14 pushl 0x14(%ebp) -6b20172e: 8b 45 0c mov 0xc(%ebp),%eax -6b201731: 8a 00 mov (%eax),%al -6b201733: 25 ff 00 00 00 and $0xff,%eax -6b201738: 8d 14 00 lea (%eax,%eax,1),%edx -6b20173b: 8b 45 fc mov 0xfffffffc(%ebp),%eax -6b20173e: 66 8b 04 02 mov (%edx,%eax,1),%ax -6b201742: 25 ff ff 00 00 and $0xffff,%eax -6b201747: 50 push %eax -6b201748: e8 73 fe ff ff call 6b2015c0 <_get_decomposition> -6b20174d: 83 c4 0c add $0xc,%esp -6b201750: 89 45 ec mov %eax,0xffffffec(%ebp) -6b201753: 83 7d ec 00 cmpl $0x0,0xffffffec(%ebp) -6b201757: 75 02 jne 6b20175b <_mbstowcs_sbcs_decompose+0xad> -6b201759: eb 1f jmp 6b20177a <_mbstowcs_sbcs_decompose+0xcc> -6b20175b: 8b 55 ec mov 0xffffffec(%ebp),%edx -6b20175e: 8d 45 f8 lea 0xfffffff8(%ebp),%eax -6b201761: 29 10 sub %edx,(%eax) -6b201763: 8b 45 ec mov 0xffffffec(%ebp),%eax -6b201766: 8d 14 00 lea (%eax,%eax,1),%edx -6b201769: 8d 45 14 lea 0x14(%ebp),%eax -6b20176c: 01 10 add %edx,(%eax) -6b20176e: 8d 45 10 lea 0x10(%ebp),%eax -6b201771: ff 08 decl (%eax) -6b201773: 8d 45 0c lea 0xc(%ebp),%eax -6b201776: ff 00 incl (%eax) -6b201778: eb a2 jmp 6b20171c <_mbstowcs_sbcs_decompose+0x6e> -6b20177a: 83 7d 10 00 cmpl $0x0,0x10(%ebp) -6b20177e: 74 09 je 6b201789 <_mbstowcs_sbcs_decompose+0xdb> -6b201780: c7 45 e8 ff ff ff ff movl $0xffffffff,0xffffffe8(%ebp) -6b201787: eb 0d jmp 6b201796 <_mbstowcs_sbcs_decompose+0xe8> -6b201789: 8b 45 f8 mov 0xfffffff8(%ebp),%eax -6b20178c: 8b 55 18 mov 0x18(%ebp),%edx -6b20178f: 29 c2 sub %eax,%edx -6b201791: 89 d0 mov %edx,%eax -6b201793: 89 45 e8 mov %eax,0xffffffe8(%ebp) -6b201796: 8b 45 e8 mov 0xffffffe8(%ebp),%eax -6b201799: c9 leave -6b20179a: c3 ret - -6b20179b <_mbstowcs_dbcs_decompose>: -6b20179b: 55 push %ebp -6b20179c: 89 e5 mov %esp,%ebp -6b20179e: 83 ec 28 sub $0x28,%esp -6b2017a1: 8b 45 08 mov 0x8(%ebp),%eax -6b2017a4: 8b 40 10 mov 0x10(%eax),%eax -6b2017a7: 89 45 fc mov %eax,0xfffffffc(%ebp) -6b2017aa: 8b 45 08 mov 0x8(%ebp),%eax -6b2017ad: 8b 40 14 mov 0x14(%eax),%eax -6b2017b0: 89 45 f8 mov %eax,0xfffffff8(%ebp) -6b2017b3: 83 7d 18 00 cmpl $0x0,0x18(%ebp) -6b2017b7: 0f 85 b7 00 00 00 jne 6b201874 <_mbstowcs_dbcs_decompose+0xd9> -6b2017bd: c7 45 f4 00 00 00 00 movl $0x0,0xfffffff4(%ebp) -6b2017c4: 83 7d 10 00 cmpl $0x0,0x10(%ebp) -6b2017c8: 0f 84 9b 00 00 00 je 6b201869 <_mbstowcs_dbcs_decompose+0xce> -6b2017ce: 8b 45 0c mov 0xc(%ebp),%eax -6b2017d1: ba 00 00 00 00 mov $0x0,%edx -6b2017d6: 8a 10 mov (%eax),%dl -6b2017d8: 8b 45 f8 mov 0xfffffff8(%ebp),%eax -6b2017db: 8a 04 02 mov (%edx,%eax,1),%al -6b2017de: 88 45 df mov %al,0xffffffdf(%ebp) -6b2017e1: 80 7d df 00 cmpb $0x0,0xffffffdf(%ebp) -6b2017e5: 74 3c je 6b201823 <_mbstowcs_dbcs_decompose+0x88> -6b2017e7: 8d 45 10 lea 0x10(%ebp),%eax -6b2017ea: ff 08 decl (%eax) -6b2017ec: 83 7d 10 00 cmpl $0x0,0x10(%ebp) -6b2017f0: 75 02 jne 6b2017f4 <_mbstowcs_dbcs_decompose+0x59> -6b2017f2: eb 75 jmp 6b201869 <_mbstowcs_dbcs_decompose+0xce> -6b2017f4: 8d 45 0c lea 0xc(%ebp),%eax -6b2017f7: ff 00 incl (%eax) -6b2017f9: b8 00 00 00 00 mov $0x0,%eax -6b2017fe: 8a 45 df mov 0xffffffdf(%ebp),%al -6b201801: 89 c2 mov %eax,%edx -6b201803: c1 e2 08 shl $0x8,%edx -6b201806: 8b 45 0c mov 0xc(%ebp),%eax -6b201809: 8a 00 mov (%eax),%al -6b20180b: 25 ff 00 00 00 and $0xff,%eax -6b201810: 8d 04 02 lea (%edx,%eax,1),%eax -6b201813: 8d 14 00 lea (%eax,%eax,1),%edx -6b201816: 8b 45 fc mov 0xfffffffc(%ebp),%eax -6b201819: 66 8b 04 02 mov (%edx,%eax,1),%ax -6b20181d: 66 89 45 f2 mov %ax,0xfffffff2(%ebp) -6b201821: eb 18 jmp 6b20183b <_mbstowcs_dbcs_decompose+0xa0> -6b201823: 8b 45 0c mov 0xc(%ebp),%eax -6b201826: 8a 00 mov (%eax),%al -6b201828: 25 ff 00 00 00 and $0xff,%eax -6b20182d: 8d 14 00 lea (%eax,%eax,1),%edx -6b201830: 8b 45 fc mov 0xfffffffc(%ebp),%eax -6b201833: 66 8b 04 02 mov (%edx,%eax,1),%ax -6b201837: 66 89 45 f2 mov %ax,0xfffffff2(%ebp) -6b20183b: 6a 04 push $0x4 -6b20183d: 8d 45 e0 lea 0xffffffe0(%ebp),%eax -6b201840: 50 push %eax -6b201841: 66 8b 45 f2 mov 0xfffffff2(%ebp),%ax -6b201845: 25 ff ff 00 00 and $0xffff,%eax -6b20184a: 50 push %eax -6b20184b: e8 70 fd ff ff call 6b2015c0 <_get_decomposition> -6b201850: 83 c4 0c add $0xc,%esp -6b201853: 89 c2 mov %eax,%edx -6b201855: 8d 45 f4 lea 0xfffffff4(%ebp),%eax -6b201858: 01 10 add %edx,(%eax) -6b20185a: 8d 45 10 lea 0x10(%ebp),%eax -6b20185d: ff 08 decl (%eax) -6b20185f: 8d 45 0c lea 0xc(%ebp),%eax -6b201862: ff 00 incl (%eax) -6b201864: e9 5b ff ff ff jmp 6b2017c4 <_mbstowcs_dbcs_decompose+0x29> -6b201869: 8b 45 f4 mov 0xfffffff4(%ebp),%eax -6b20186c: 89 45 d8 mov %eax,0xffffffd8(%ebp) -6b20186f: e9 eb 00 00 00 jmp 6b20195f <_mbstowcs_dbcs_decompose+0x1c4> -6b201874: 8b 45 18 mov 0x18(%ebp),%eax -6b201877: 89 45 f4 mov %eax,0xfffffff4(%ebp) -6b20187a: 83 7d 10 00 cmpl $0x0,0x10(%ebp) -6b20187e: 0f 84 bf 00 00 00 je 6b201943 <_mbstowcs_dbcs_decompose+0x1a8> -6b201884: 83 7d f4 00 cmpl $0x0,0xfffffff4(%ebp) -6b201888: 0f 84 b5 00 00 00 je 6b201943 <_mbstowcs_dbcs_decompose+0x1a8> -6b20188e: 8b 45 0c mov 0xc(%ebp),%eax -6b201891: ba 00 00 00 00 mov $0x0,%edx -6b201896: 8a 10 mov (%eax),%dl -6b201898: 8b 45 f8 mov 0xfffffff8(%ebp),%eax -6b20189b: 8a 04 02 mov (%edx,%eax,1),%al -6b20189e: 88 45 df mov %al,0xffffffdf(%ebp) -6b2018a1: 80 7d df 00 cmpb $0x0,0xffffffdf(%ebp) -6b2018a5: 74 3f je 6b2018e6 <_mbstowcs_dbcs_decompose+0x14b> -6b2018a7: 8d 45 10 lea 0x10(%ebp),%eax -6b2018aa: ff 08 decl (%eax) -6b2018ac: 83 7d 10 00 cmpl $0x0,0x10(%ebp) -6b2018b0: 75 05 jne 6b2018b7 <_mbstowcs_dbcs_decompose+0x11c> -6b2018b2: e9 8c 00 00 00 jmp 6b201943 <_mbstowcs_dbcs_decompose+0x1a8> -6b2018b7: 8d 45 0c lea 0xc(%ebp),%eax -6b2018ba: ff 00 incl (%eax) -6b2018bc: b8 00 00 00 00 mov $0x0,%eax -6b2018c1: 8a 45 df mov 0xffffffdf(%ebp),%al -6b2018c4: 89 c2 mov %eax,%edx -6b2018c6: c1 e2 08 shl $0x8,%edx -6b2018c9: 8b 45 0c mov 0xc(%ebp),%eax -6b2018cc: 8a 00 mov (%eax),%al -6b2018ce: 25 ff 00 00 00 and $0xff,%eax -6b2018d3: 8d 04 02 lea (%edx,%eax,1),%eax -6b2018d6: 8d 14 00 lea (%eax,%eax,1),%edx -6b2018d9: 8b 45 fc mov 0xfffffffc(%ebp),%eax -6b2018dc: 66 8b 04 02 mov (%edx,%eax,1),%ax -6b2018e0: 66 89 45 f2 mov %ax,0xfffffff2(%ebp) -6b2018e4: eb 18 jmp 6b2018fe <_mbstowcs_dbcs_decompose+0x163> -6b2018e6: 8b 45 0c mov 0xc(%ebp),%eax -6b2018e9: 8a 00 mov (%eax),%al -6b2018eb: 25 ff 00 00 00 and $0xff,%eax -6b2018f0: 8d 14 00 lea (%eax,%eax,1),%edx -6b2018f3: 8b 45 fc mov 0xfffffffc(%ebp),%eax -6b2018f6: 66 8b 04 02 mov (%edx,%eax,1),%ax -6b2018fa: 66 89 45 f2 mov %ax,0xfffffff2(%ebp) -6b2018fe: ff 75 f4 pushl 0xfffffff4(%ebp) -6b201901: ff 75 14 pushl 0x14(%ebp) -6b201904: 66 8b 45 f2 mov 0xfffffff2(%ebp),%ax -6b201908: 25 ff ff 00 00 and $0xffff,%eax -6b20190d: 50 push %eax -6b20190e: e8 ad fc ff ff call 6b2015c0 <_get_decomposition> -6b201913: 83 c4 0c add $0xc,%esp -6b201916: 89 45 ec mov %eax,0xffffffec(%ebp) -6b201919: 83 7d ec 00 cmpl $0x0,0xffffffec(%ebp) -6b20191d: 75 02 jne 6b201921 <_mbstowcs_dbcs_decompose+0x186> -6b20191f: eb 22 jmp 6b201943 <_mbstowcs_dbcs_decompose+0x1a8> -6b201921: 8b 45 ec mov 0xffffffec(%ebp),%eax -6b201924: 8d 14 00 lea (%eax,%eax,1),%edx -6b201927: 8d 45 14 lea 0x14(%ebp),%eax -6b20192a: 01 10 add %edx,(%eax) -6b20192c: 8b 55 ec mov 0xffffffec(%ebp),%edx -6b20192f: 8d 45 f4 lea 0xfffffff4(%ebp),%eax -6b201932: 29 10 sub %edx,(%eax) -6b201934: 8d 45 10 lea 0x10(%ebp),%eax -6b201937: ff 08 decl (%eax) -6b201939: 8d 45 0c lea 0xc(%ebp),%eax -6b20193c: ff 00 incl (%eax) -6b20193e: e9 37 ff ff ff jmp 6b20187a <_mbstowcs_dbcs_decompose+0xdf> -6b201943: 83 7d 10 00 cmpl $0x0,0x10(%ebp) -6b201947: 74 09 je 6b201952 <_mbstowcs_dbcs_decompose+0x1b7> -6b201949: c7 45 d8 ff ff ff ff movl $0xffffffff,0xffffffd8(%ebp) -6b201950: eb 0d jmp 6b20195f <_mbstowcs_dbcs_decompose+0x1c4> -6b201952: 8b 45 f4 mov 0xfffffff4(%ebp),%eax -6b201955: 8b 55 18 mov 0x18(%ebp),%edx -6b201958: 29 c2 sub %eax,%edx -6b20195a: 89 d0 mov %edx,%eax -6b20195c: 89 45 d8 mov %eax,0xffffffd8(%ebp) -6b20195f: 8b 45 d8 mov 0xffffffd8(%ebp),%eax -6b201962: c9 leave -6b201963: c3 ret - -6b201964 <_wine_cp_mbstowcs>: -6b201964: 55 push %ebp -6b201965: 89 e5 mov %esp,%ebp -6b201967: 83 ec 08 sub $0x8,%esp -6b20196a: 8b 45 08 mov 0x8(%ebp),%eax -6b20196d: 83 78 04 01 cmpl $0x1,0x4(%eax) -6b201971: 0f 85 8c 00 00 00 jne 6b201a03 <_wine_cp_mbstowcs+0x9f> -6b201977: 8b 45 0c mov 0xc(%ebp),%eax -6b20197a: c1 e8 03 shr $0x3,%eax -6b20197d: 83 e0 01 and $0x1,%eax -6b201980: 85 c0 test %eax,%eax -6b201982: 74 24 je 6b2019a8 <_wine_cp_mbstowcs+0x44> -6b201984: 83 ec 04 sub $0x4,%esp -6b201987: ff 75 14 pushl 0x14(%ebp) -6b20198a: ff 75 10 pushl 0x10(%ebp) -6b20198d: ff 75 08 pushl 0x8(%ebp) -6b201990: e8 91 05 00 00 call 6b201f26 <_check_invalid_chars_sbcs> -6b201995: 83 c4 10 add $0x10,%esp -6b201998: 85 c0 test %eax,%eax -6b20199a: 74 0c je 6b2019a8 <_wine_cp_mbstowcs+0x44> -6b20199c: c7 45 fc fe ff ff ff movl $0xfffffffe,0xfffffffc(%ebp) -6b2019a3: e9 ce 00 00 00 jmp 6b201a76 <_wine_cp_mbstowcs+0x112> -6b2019a8: 8b 45 0c mov 0xc(%ebp),%eax -6b2019ab: d1 e8 shr %eax -6b2019ad: 83 e0 01 and $0x1,%eax -6b2019b0: 85 c0 test %eax,%eax -6b2019b2: 75 33 jne 6b2019e7 <_wine_cp_mbstowcs+0x83> -6b2019b4: 83 7d 1c 00 cmpl $0x0,0x1c(%ebp) -6b2019b8: 75 0b jne 6b2019c5 <_wine_cp_mbstowcs+0x61> -6b2019ba: 8b 45 14 mov 0x14(%ebp),%eax -6b2019bd: 89 45 fc mov %eax,0xfffffffc(%ebp) -6b2019c0: e9 b1 00 00 00 jmp 6b201a76 <_wine_cp_mbstowcs+0x112> -6b2019c5: 83 ec 0c sub $0xc,%esp -6b2019c8: ff 75 1c pushl 0x1c(%ebp) -6b2019cb: ff 75 18 pushl 0x18(%ebp) -6b2019ce: ff 75 14 pushl 0x14(%ebp) -6b2019d1: ff 75 10 pushl 0x10(%ebp) -6b2019d4: ff 75 08 pushl 0x8(%ebp) -6b2019d7: e8 ea 02 00 00 call 6b201cc6 <_mbstowcs_sbcs> -6b2019dc: 83 c4 20 add $0x20,%esp -6b2019df: 89 45 fc mov %eax,0xfffffffc(%ebp) -6b2019e2: e9 8f 00 00 00 jmp 6b201a76 <_wine_cp_mbstowcs+0x112> -6b2019e7: ff 75 1c pushl 0x1c(%ebp) -6b2019ea: ff 75 18 pushl 0x18(%ebp) -6b2019ed: ff 75 14 pushl 0x14(%ebp) -6b2019f0: ff 75 10 pushl 0x10(%ebp) -6b2019f3: ff 75 08 pushl 0x8(%ebp) -6b2019f6: e8 b3 fc ff ff call 6b2016ae <_mbstowcs_sbcs_decompose> -6b2019fb: 83 c4 14 add $0x14,%esp -6b2019fe: 89 45 fc mov %eax,0xfffffffc(%ebp) -6b201a01: eb 73 jmp 6b201a76 <_wine_cp_mbstowcs+0x112> -6b201a03: 8b 45 0c mov 0xc(%ebp),%eax -6b201a06: c1 e8 03 shr $0x3,%eax -6b201a09: 83 e0 01 and $0x1,%eax -6b201a0c: 85 c0 test %eax,%eax -6b201a0e: 74 21 je 6b201a31 <_wine_cp_mbstowcs+0xcd> -6b201a10: 83 ec 04 sub $0x4,%esp -6b201a13: ff 75 14 pushl 0x14(%ebp) -6b201a16: ff 75 10 pushl 0x10(%ebp) -6b201a19: ff 75 08 pushl 0x8(%ebp) -6b201a1c: e8 b1 01 00 00 call 6b201bd2 <_check_invalid_chars_dbcs> -6b201a21: 83 c4 10 add $0x10,%esp -6b201a24: 85 c0 test %eax,%eax -6b201a26: 74 09 je 6b201a31 <_wine_cp_mbstowcs+0xcd> -6b201a28: c7 45 fc fe ff ff ff movl $0xfffffffe,0xfffffffc(%ebp) -6b201a2f: eb 45 jmp 6b201a76 <_wine_cp_mbstowcs+0x112> -6b201a31: 8b 45 0c mov 0xc(%ebp),%eax -6b201a34: d1 e8 shr %eax -6b201a36: 83 e0 01 and $0x1,%eax -6b201a39: 85 c0 test %eax,%eax -6b201a3b: 75 1f jne 6b201a5c <_wine_cp_mbstowcs+0xf8> -6b201a3d: 83 ec 0c sub $0xc,%esp -6b201a40: ff 75 1c pushl 0x1c(%ebp) -6b201a43: ff 75 18 pushl 0x18(%ebp) -6b201a46: ff 75 14 pushl 0x14(%ebp) -6b201a49: ff 75 10 pushl 0x10(%ebp) -6b201a4c: ff 75 08 pushl 0x8(%ebp) -6b201a4f: e8 27 00 00 00 call 6b201a7b <_mbstowcs_dbcs> -6b201a54: 83 c4 20 add $0x20,%esp -6b201a57: 89 45 fc mov %eax,0xfffffffc(%ebp) -6b201a5a: eb 1a jmp 6b201a76 <_wine_cp_mbstowcs+0x112> -6b201a5c: ff 75 1c pushl 0x1c(%ebp) -6b201a5f: ff 75 18 pushl 0x18(%ebp) -6b201a62: ff 75 14 pushl 0x14(%ebp) -6b201a65: ff 75 10 pushl 0x10(%ebp) -6b201a68: ff 75 08 pushl 0x8(%ebp) -6b201a6b: e8 2b fd ff ff call 6b20179b <_mbstowcs_dbcs_decompose> -6b201a70: 83 c4 14 add $0x14,%esp -6b201a73: 89 45 fc mov %eax,0xfffffffc(%ebp) -6b201a76: 8b 45 fc mov 0xfffffffc(%ebp),%eax -6b201a79: c9 leave -6b201a7a: c3 ret - -6b201a7b <_mbstowcs_dbcs>: -6b201a7b: 55 push %ebp -6b201a7c: 89 e5 mov %esp,%ebp -6b201a7e: 83 ec 18 sub $0x18,%esp -6b201a81: 8b 45 08 mov 0x8(%ebp),%eax -6b201a84: 8b 40 10 mov 0x10(%eax),%eax -6b201a87: 89 45 fc mov %eax,0xfffffffc(%ebp) -6b201a8a: 8b 45 08 mov 0x8(%ebp),%eax -6b201a8d: 8b 40 14 mov 0x14(%eax),%eax -6b201a90: 89 45 f8 mov %eax,0xfffffff8(%ebp) -6b201a93: 83 7d 18 00 cmpl $0x0,0x18(%ebp) -6b201a97: 75 1c jne 6b201ab5 <_mbstowcs_dbcs+0x3a> -6b201a99: 83 ec 04 sub $0x4,%esp -6b201a9c: ff 75 10 pushl 0x10(%ebp) -6b201a9f: ff 75 0c pushl 0xc(%ebp) -6b201aa2: ff 75 08 pushl 0x8(%ebp) -6b201aa5: e8 d1 00 00 00 call 6b201b7b <_get_length_dbcs> -6b201aaa: 83 c4 10 add $0x10,%esp -6b201aad: 89 45 ec mov %eax,0xffffffec(%ebp) -6b201ab0: e9 c1 00 00 00 jmp 6b201b76 <_mbstowcs_dbcs+0xfb> -6b201ab5: 8b 45 18 mov 0x18(%ebp),%eax -6b201ab8: 89 45 f4 mov %eax,0xfffffff4(%ebp) -6b201abb: 83 7d 10 00 cmpl $0x0,0x10(%ebp) -6b201abf: 0f 84 95 00 00 00 je 6b201b5a <_mbstowcs_dbcs+0xdf> -6b201ac5: 83 7d f4 00 cmpl $0x0,0xfffffff4(%ebp) -6b201ac9: 0f 84 8b 00 00 00 je 6b201b5a <_mbstowcs_dbcs+0xdf> -6b201acf: 8b 45 0c mov 0xc(%ebp),%eax -6b201ad2: ba 00 00 00 00 mov $0x0,%edx -6b201ad7: 8a 10 mov (%eax),%dl -6b201ad9: 8b 45 f8 mov 0xfffffff8(%ebp),%eax -6b201adc: 8a 04 02 mov (%edx,%eax,1),%al -6b201adf: 88 45 f3 mov %al,0xfffffff3(%ebp) -6b201ae2: 80 7d f3 00 cmpb $0x0,0xfffffff3(%ebp) -6b201ae6: 74 3e je 6b201b26 <_mbstowcs_dbcs+0xab> -6b201ae8: 8d 45 10 lea 0x10(%ebp),%eax -6b201aeb: ff 08 decl (%eax) -6b201aed: 83 7d 10 00 cmpl $0x0,0x10(%ebp) -6b201af1: 75 02 jne 6b201af5 <_mbstowcs_dbcs+0x7a> -6b201af3: eb 65 jmp 6b201b5a <_mbstowcs_dbcs+0xdf> -6b201af5: 8d 45 0c lea 0xc(%ebp),%eax -6b201af8: ff 00 incl (%eax) -6b201afa: 8b 4d 14 mov 0x14(%ebp),%ecx -6b201afd: b8 00 00 00 00 mov $0x0,%eax -6b201b02: 8a 45 f3 mov 0xfffffff3(%ebp),%al -6b201b05: 89 c2 mov %eax,%edx -6b201b07: c1 e2 08 shl $0x8,%edx -6b201b0a: 8b 45 0c mov 0xc(%ebp),%eax -6b201b0d: 8a 00 mov (%eax),%al -6b201b0f: 25 ff 00 00 00 and $0xff,%eax -6b201b14: 8d 04 02 lea (%edx,%eax,1),%eax -6b201b17: 8d 14 00 lea (%eax,%eax,1),%edx -6b201b1a: 8b 45 fc mov 0xfffffffc(%ebp),%eax -6b201b1d: 66 8b 04 02 mov (%edx,%eax,1),%ax -6b201b21: 66 89 01 mov %ax,(%ecx) -6b201b24: eb 1a jmp 6b201b40 <_mbstowcs_dbcs+0xc5> -6b201b26: 8b 4d 14 mov 0x14(%ebp),%ecx -6b201b29: 8b 45 0c mov 0xc(%ebp),%eax -6b201b2c: 8a 00 mov (%eax),%al -6b201b2e: 25 ff 00 00 00 and $0xff,%eax -6b201b33: 8d 14 00 lea (%eax,%eax,1),%edx -6b201b36: 8b 45 fc mov 0xfffffffc(%ebp),%eax -6b201b39: 66 8b 04 02 mov (%edx,%eax,1),%ax -6b201b3d: 66 89 01 mov %ax,(%ecx) -6b201b40: 8d 45 f4 lea 0xfffffff4(%ebp),%eax -6b201b43: ff 08 decl (%eax) -6b201b45: 8d 45 10 lea 0x10(%ebp),%eax -6b201b48: ff 08 decl (%eax) -6b201b4a: 8d 45 0c lea 0xc(%ebp),%eax -6b201b4d: ff 00 incl (%eax) [truncated at 1000 lines; 4810 more skipped]

1 0

[ion] 12669: Removed HEAP_NO_VALLOC from Heap Manager because the flag is redunant. Removed Version Differentation in epsapi because it's only meant to run on ROS, and we decide what to emulate. KJK agrees.
by ion＠svn.reactos.com 31 Dec '04

31 Dec '04

Removed HEAP_NO_VALLOC from Heap Manager because the flag is redunant. Removed Version Differentation in epsapi because it's only meant to run on ROS, and we decide what to emulate. KJK agrees. Modified: trunk/reactos/include/ntos/heap.h Modified: trunk/reactos/include/ntos/rtltypes.h Modified: trunk/reactos/lib/epsapi/enum/processes.c Modified: trunk/reactos/lib/ntdll/csr/lpc.c Modified: trunk/reactos/lib/rtl/heap.c Modified: trunk/reactos/lib/unicode/wine_unicode.map _____ Modified: trunk/reactos/include/ntos/heap.h --- trunk/reactos/include/ntos/heap.h 2004-12-31 19:43:35 UTC (rev 12668) +++ trunk/reactos/include/ntos/heap.h 2004-12-31 20:05:16 UTC (rev 12669) @@ -12,9 +12,6 @@ #ifndef __INCLUDE_HEAP_H #define __INCLUDE_HEAP_H -/* HeapAlloc, HeapReAlloc */ -#define HEAP_NO_VALLOC (256) - #ifndef __USE_W32API #define HEAP_NO_SERIALIZE (1) _____ Modified: trunk/reactos/include/ntos/rtltypes.h --- trunk/reactos/include/ntos/rtltypes.h 2004-12-31 19:43:35 UTC (rev 12668) +++ trunk/reactos/include/ntos/rtltypes.h 2004-12-31 20:05:16 UTC (rev 12669) @@ -1,4 +1,4 @@ -/* $Id: rtltypes.h,v 1.16 2004/10/24 20:37:26 weiden Exp $ +/* $Id$ * */ @@ -445,4 +445,8 @@ } RTL_GENERIC_TABLE; typedef RTL_GENERIC_TABLE *PRTL_GENERIC_TABLE; +typedef NTSTATUS +(*PHEAP_ENUMERATION_ROUTINE)(IN PVOID HeapHandle, + IN PVOID UserParam); + #endif /* __DDK_RTLTYPES_H */ _____ Modified: trunk/reactos/lib/epsapi/enum/processes.c --- trunk/reactos/lib/epsapi/enum/processes.c 2004-12-31 19:43:35 UTC (rev 12668) +++ trunk/reactos/lib/epsapi/enum/processes.c 2004-12-31 20:05:16 UTC (rev 12669) @@ -1,4 +1,4 @@ -/* $Id: processes.c,v 1.3 2004/11/08 00:34:46 weiden Exp $ +/* $Id$ */ /* * COPYRIGHT: See COPYING in the top level directory @@ -261,33 +261,9 @@ { static SIZE_T nOffsetOfThreads = 0; - /* get the offset of the Threads field (dependant on the kernel version) */ - if(!nOffsetOfThreads) - { - /* - FIXME: we should probably use the build number, instead, but it isn't - available as reliably as the major and minor version numbers - */ - switch(SharedUserData->NtMajorVersion) - { - /* NT 3 and 4 */ - case 3: - case 4: - { - nOffsetOfThreads = offsetof(SYSTEM_PROCESSES_NT4, Threads); - break; - } + /* get the offset of the Threads field */ + nOffsetOfThreads = offsetof(SYSTEM_PROCESSES, Threads); - /* NT 5 and later */ - case 5: - default: - { - nOffsetOfThreads = offsetof(SYSTEM_PROCESSES_NT5, Threads); - break; - } - } - } - return (PSYSTEM_THREADS)((ULONG_PTR)CurrentProcess + nOffsetOfThreads); } _____ Modified: trunk/reactos/lib/ntdll/csr/lpc.c --- trunk/reactos/lib/ntdll/csr/lpc.c 2004-12-31 19:43:35 UTC (rev 12668) +++ trunk/reactos/lib/ntdll/csr/lpc.c 2004-12-31 20:05:16 UTC (rev 12669) @@ -1,4 +1,4 @@ -/* $Id: lpc.c,v 1.15 2004/12/24 17:45:57 weiden Exp $ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -168,7 +168,7 @@ CsrSectionMapServerBase = LpcWrite.TargetViewBase; /* Create the heap for communication for csrss. */ - CsrCommHeap = RtlCreateHeap(HEAP_NO_VALLOC, + CsrCommHeap = RtlCreateHeap(0, CsrSectionMapBase, CsrSectionViewSize.u.LowPart, CsrSectionViewSize.u.LowPart, _____ Modified: trunk/reactos/lib/rtl/heap.c --- trunk/reactos/lib/rtl/heap.c 2004-12-31 19:43:35 UTC (rev 12668) +++ trunk/reactos/lib/rtl/heap.c 2004-12-31 20:05:16 UTC (rev 12669) @@ -30,7 +30,7 @@ #endif -static CRITICAL_SECTION RtlpProcessHeapsListLock; +static RTL_CRITICAL_SECTION RtlpProcessHeapsListLock; typedef struct tagARENA_INUSE @@ -98,7 +98,7 @@ SUBHEAP subheap; /* First sub-heap */ struct tagHEAP *next; /* Next heap for this process */ FREE_LIST_ENTRY freeList[HEAP_NB_FREE_LISTS]; /* Free lists */ - CRITICAL_SECTION critSection; /* Critical section for serialization */ + RTL_CRITICAL_SECTION critSection; /* Critical section for serialization */ ULONG flags; /* Heap flags */ ULONG magic; /* Magic number */ UCHAR filler[4]; /* Make multiple of 8 bytes */ @@ -306,23 +306,21 @@ address = (PVOID)((char *)subheap + subheap->commitSize); commitsize = size - subheap->commitSize; - if (!(flags & HEAP_NO_VALLOC)) + Status = NtAllocateVirtualMemory(NtCurrentProcess(), + &address, + 0, + &commitsize, + MEM_COMMIT, + PAGE_EXECUTE_READWRITE); + if (!NT_SUCCESS(Status)) { - Status = NtAllocateVirtualMemory(NtCurrentProcess(), - &address, - 0, - &commitsize, - MEM_COMMIT, - PAGE_EXECUTE_READWRITE); - if (!NT_SUCCESS(Status)) - { - DPRINT( "Could not commit %08lx bytes at %p for heap %p\n", - size - subheap->commitSize, - ((char *)subheap + subheap->commitSize), - subheap->heap ); - return FALSE; - } + DPRINT( "Could not commit %08lx bytes at %p for heap %p\n", + size - subheap->commitSize, + ((char *)subheap + subheap->commitSize), + subheap->heap ); + return FALSE; } + subheap->commitSize += commitsize; return TRUE; } @@ -347,22 +345,19 @@ address = (PVOID)((char *)subheap + size); decommitsize = subheap->commitSize - size; - if (!(flags & HEAP_NO_VALLOC)) + Status = ZwFreeVirtualMemory(NtCurrentProcess(), + &address, + &decommitsize, + MEM_DECOMMIT); + if (!NT_SUCCESS(Status)) { - Status = ZwFreeVirtualMemory(NtCurrentProcess(), - &address, - &decommitsize, - MEM_DECOMMIT); - if (!NT_SUCCESS(Status)) - ; - { - DPRINT( "Could not decommit %08lx bytes at %p for heap %p\n", - subheap->commitSize - size, - ((char *)subheap + size), - subheap->heap ); - return FALSE; - } + DPRINT( "Could not decommit %08lx bytes at %p for heap %p\n", + subheap->commitSize - size, + ((char *)subheap + size), + subheap->heap ); + return FALSE; } + subheap->commitSize -= decommitsize; return TRUE; } @@ -438,6 +433,7 @@ { ARENA_FREE *pFree; ULONG size = (pArena->size & ARENA_SIZE_MASK) + sizeof(*pArena); + ULONG dummySize = 0; /* Check if we can merge with previous block */ @@ -475,14 +471,10 @@ pPrev->next = subheap->next; /* Free the memory */ subheap->magic = 0; - if (!(flags & HEAP_NO_VALLOC)) - { - ULONG dummySize = 0; - ZwFreeVirtualMemory(NtCurrentProcess(), - (PVOID*)&subheap, - &dummySize, - MEM_RELEASE); - } + ZwFreeVirtualMemory(NtCurrentProcess(), + (PVOID*)&subheap, + &dummySize, + MEM_RELEASE); return; } @@ -525,20 +517,17 @@ NTSTATUS Status; /* Commit memory */ - if (!(flags & HEAP_NO_VALLOC)) + Status = ZwAllocateVirtualMemory(NtCurrentProcess(), + &address, + 0, + (PULONG)&commitSize, + MEM_COMMIT, + PAGE_EXECUTE_READWRITE); + if (!NT_SUCCESS(Status)) { - Status = ZwAllocateVirtualMemory(NtCurrentProcess(), - &address, - 0, - (PULONG)&commitSize, - MEM_COMMIT, - PAGE_EXECUTE_READWRITE); - if (!NT_SUCCESS(Status)) - { - DPRINT("Could not commit %08lx bytes for sub-heap %p\n", - commitSize, address); - return FALSE; - } + DPRINT("Could not commit %08lx bytes for sub-heap %p\n", + commitSize, address); + return FALSE; } /* Fill the sub-heap structure */ @@ -619,7 +608,7 @@ /* Allocate the memory block */ address = BaseAddress; - if (!(flags & HEAP_NO_VALLOC)) + if (!address) { Status = ZwAllocateVirtualMemory(NtCurrentProcess(), &address, @@ -640,7 +629,7 @@ if (!HEAP_InitSubHeap( heap? heap : (HEAP *)address, address, flags, commitSize, totalSize )) { - if (address && !(flags & HEAP_NO_VALLOC)) + if (!BaseAddress) { ULONG dummySize = 0; ZwFreeVirtualMemory(NtCurrentProcess(), @@ -1150,15 +1139,11 @@ while (subheap) { SUBHEAP *next = subheap->next; - - if (!(flags & HEAP_NO_VALLOC)) - { - ULONG dummySize = 0; - ZwFreeVirtualMemory(NtCurrentProcess(), - (PVOID*)&subheap, - &dummySize, - MEM_RELEASE); - } + ULONG dummySize = 0; + ZwFreeVirtualMemory(NtCurrentProcess(), + (PVOID*)&subheap, + &dummySize, + MEM_RELEASE); subheap = next; } return (HANDLE)NULL; @@ -1730,8 +1715,8 @@ * @implemented */ NTSTATUS STDCALL -RtlEnumProcessHeaps(NTSTATUS STDCALL_FUNC(*func)(PVOID, LONG), - LONG lParam) +RtlEnumProcessHeaps(PHEAP_ENUMERATION_ROUTINE HeapEnumerationRoutine, + PVOID lParam) { NTSTATUS Status = STATUS_SUCCESS; HEAP** pptr; @@ -1740,7 +1725,7 @@ for (pptr = (HEAP**)&NtCurrentPeb()->ProcessHeaps; *pptr; pptr = &(*pptr)->next) { - Status = func(*pptr,lParam); + Status = HeapEnumerationRoutine(*pptr,lParam); if (!NT_SUCCESS(Status)) break; } _____ Modified: trunk/reactos/lib/unicode/wine_unicode.map --- trunk/reactos/lib/unicode/wine_unicode.map 2004-12-31 19:43:35 UTC (rev 12668) +++ trunk/reactos/lib/unicode/wine_unicode.map 2004-12-31 20:05:16 UTC (rev 12669) @@ -1,6011 +1,5805 @@ - -wine_unicode.nostrip.dll: file format pei-i386 - -Disassembly of section .text: - -6b201000 <_DllMainCRTStartup@12>: -6b201000: 55 push %ebp -6b201001: 89 e5 mov %esp,%ebp -6b201003: 83 ec 18 sub $0x18,%esp -6b201006: 89 75 fc mov %esi,0xfffffffc(%ebp) -6b201009: 8b 75 0c mov 0xc(%ebp),%esi -6b20100c: 89 5d f8 mov %ebx,0xfffffff8(%ebp) -6b20100f: 83 fe 01 cmp $0x1,%esi -6b201012: 74 4f je 6b201063 <_DllMainCRTStartup@12+0x63> -6b201014: 89 74 24 04 mov %esi,0x4(%esp) -6b201018: 8b 45 10 mov 0x10(%ebp),%eax -6b20101b: 89 44 24 08 mov %eax,0x8(%esp) -6b20101f: 8b 45 08 mov 0x8(%ebp),%eax -6b201022: 89 04 24 mov %eax,(%esp) -6b201025: e8 16 40 00 00 call 6b205040 <_DllMain@12> -6b20102a: 83 ec 0c sub $0xc,%esp -6b20102d: 83 fe 01 cmp $0x1,%esi -6b201030: 89 c3 mov %eax,%ebx -6b201032: 74 24 je 6b201058 <_DllMainCRTStartup@12+0x58> -6b201034: 85 f6 test %esi,%esi -6b201036: 75 0b jne 6b201043 <_DllMainCRTStartup@12+0x43> -6b201038: a1 00 50 2f 6b mov 0x6b2f5000,%eax -6b20103d: 85 c0 test %eax,%eax -6b20103f: 75 10 jne 6b201051 <_DllMainCRTStartup@12+0x51> -6b201041: 31 db xor %ebx,%ebx -6b201043: 89 d8 mov %ebx,%eax -6b201045: 8b 5d f8 mov 0xfffffff8(%ebp),%ebx -6b201048: 8b 75 fc mov 0xfffffffc(%ebp),%esi -6b20104b: 89 ec mov %ebp,%esp -6b20104d: 5d pop %ebp -6b20104e: c2 0c 00 ret $0xc -6b201051: e8 4a 00 00 00 call 6b2010a0 <___dll_exit> -6b201056: eb eb jmp 6b201043 <_DllMainCRTStartup@12+0x43> -6b201058: 85 c0 test %eax,%eax -6b20105a: 75 d8 jne 6b201034 <_DllMainCRTStartup@12+0x34> -6b20105c: e8 3f 00 00 00 call 6b2010a0 <___dll_exit> -6b201061: eb d1 jmp 6b201034 <_DllMainCRTStartup@12+0x34> -6b201063: c7 04 24 80 00 00 00 movl $0x80,(%esp) -6b20106a: e8 f1 43 00 00 call 6b205460 <_malloc> -6b20106f: a3 00 50 2f 6b mov %eax,0x6b2f5000 -6b201074: 85 c0 test %eax,%eax -6b201076: 74 17 je 6b20108f <_DllMainCRTStartup@12+0x8f> -6b201078: c7 00 00 00 00 00 movl $0x0,(%eax) -6b20107e: a3 10 50 2f 6b mov %eax,0x6b2f5010 -6b201083: e8 b8 40 00 00 call 6b205140 <__pei386_runtime_relocator> -6b201088: e8 53 40 00 00 call 6b2050e0 <___main> -6b20108d: eb 85 jmp 6b201014 <_DllMainCRTStartup@12+0x14> -6b20108f: e8 bc 43 00 00 call 6b205450 <__errno> -6b201094: c7 00 0c 00 00 00 movl $0xc,(%eax) -6b20109a: 31 c0 xor %eax,%eax -6b20109c: eb a7 jmp 6b201045 <_DllMainCRTStartup@12+0x45> -6b20109e: 89 f6 mov %esi,%esi - -6b2010a0 <___dll_exit>: -6b2010a0: 55 push %ebp -6b2010a1: 89 e5 mov %esp,%ebp -6b2010a3: 83 ec 08 sub $0x8,%esp -6b2010a6: 89 5d fc mov %ebx,0xfffffffc(%ebp) -6b2010a9: 8b 15 00 50 2f 6b mov 0x6b2f5000,%edx -6b2010af: 85 d2 test %edx,%edx -6b2010b1: 74 2a je 6b2010dd <___dll_exit+0x3d> -6b2010b3: 8b 1d 10 50 2f 6b mov 0x6b2f5010,%ebx -6b2010b9: 83 eb 04 sub $0x4,%ebx -6b2010bc: 39 d3 cmp %edx,%ebx -6b2010be: 72 0d jb 6b2010cd <___dll_exit+0x2d> -6b2010c0: 8b 03 mov (%ebx),%eax -6b2010c2: 85 c0 test %eax,%eax -6b2010c4: 75 2a jne 6b2010f0 <___dll_exit+0x50> -6b2010c6: 83 eb 04 sub $0x4,%ebx -6b2010c9: 39 d3 cmp %edx,%ebx -6b2010cb: 73 f3 jae 6b2010c0 <___dll_exit+0x20> -6b2010cd: 89 14 24 mov %edx,(%esp) -6b2010d0: e8 6b 43 00 00 call 6b205440 <_free> -6b2010d5: 31 d2 xor %edx,%edx -6b2010d7: 89 15 00 50 2f 6b mov %edx,0x6b2f5000 -6b2010dd: c7 04 24 00 00 00 00 movl $0x0,(%esp) -6b2010e4: e8 47 43 00 00 call 6b205430 <_fflush> -6b2010e9: 8b 5d fc mov 0xfffffffc(%ebp),%ebx -6b2010ec: 89 ec mov %ebp,%esp -6b2010ee: 5d pop %ebp -6b2010ef: c3 ret -6b2010f0: ff d0 call *%eax -6b2010f2: 8b 15 00 50 2f 6b mov 0x6b2f5000,%edx -6b2010f8: eb cc jmp 6b2010c6 <___dll_exit+0x26> -6b2010fa: 8d b6 00 00 00 00 lea 0x0(%esi),%esi - -6b201100 <_atexit>: -6b201100: 55 push %ebp -6b201101: 89 e5 mov %esp,%ebp -6b201103: 83 ec 18 sub $0x18,%esp -6b201106: c7 44 24 08 10 50 2f movl $0x6b2f5010,0x8(%esp) -6b20110d: 6b -6b20110e: 8b 45 08 mov 0x8(%ebp),%eax -6b201111: c7 44 24 04 00 50 2f movl $0x6b2f5000,0x4(%esp) -6b201118: 6b -6b201119: 89 04 24 mov %eax,(%esp) -6b20111c: e8 ff 42 00 00 call 6b205420 <___dllonexit> -6b201121: 85 c0 test %eax,%eax -6b201123: 0f 95 c0 setne %al -6b201126: 89 ec mov %ebp,%esp -6b201128: 5d pop %ebp -6b201129: 0f b6 c0 movzbl %al,%eax -6b20112c: 48 dec %eax -6b20112d: c3 ret -6b20112e: 89 f6 mov %esi,%esi - -6b201130 <__onexit>: -6b201130: 55 push %ebp -6b201131: 89 e5 mov %esp,%ebp -6b201133: 83 ec 18 sub $0x18,%esp -6b201136: c7 44 24 08 10 50 2f movl $0x6b2f5010,0x8(%esp) -6b20113d: 6b -6b20113e: 8b 45 08 mov 0x8(%ebp),%eax -6b201141: c7 44 24 04 00 50 2f movl $0x6b2f5000,0x4(%esp) -6b201148: 6b -6b201149: 89 04 24 mov %eax,(%esp) -6b20114c: e8 cf 42 00 00 call 6b205420 <___dllonexit> -6b201151: 89 ec mov %ebp,%esp -6b201153: 5d pop %ebp -6b201154: c3 ret -6b201155: 90 nop -6b201156: 90 nop -6b201157: 90 nop -6b201158: 90 nop -6b201159: 90 nop -6b20115a: 90 nop -6b20115b: 90 nop -6b20115c: 90 nop -6b20115d: 90 nop -6b20115e: 90 nop -6b20115f: 90 nop - -6b201160 <___do_sjlj_init>: -6b201160: 55 push %ebp -6b201161: 89 e5 mov %esp,%ebp -6b201163: 5d pop %ebp -6b201164: e9 77 40 00 00 jmp 6b2051e0 <___w32_sharedptr_initialize> -6b201169: 90 nop -6b20116a: 90 nop -6b20116b: 90 nop -6b20116c: 90 nop -6b20116d: 90 nop -6b20116e: 90 nop -6b20116f: 90 nop - -6b201170 <_cmp_codepage>: -6b201170: 55 push %ebp -6b201171: 89 e5 mov %esp,%ebp -6b201173: 8b 45 0c mov 0xc(%ebp),%eax -6b201176: 8b 00 mov (%eax),%eax -6b201178: 8b 10 mov (%eax),%edx -6b20117a: 8b 45 08 mov 0x8(%ebp),%eax -6b20117d: 29 d0 sub %edx,%eax -6b20117f: 5d pop %ebp -6b201180: c3 ret - -6b201181 <_wine_cp_get_table>: - - -/* get the table of a given code page */ -const union cptable *wine_cp_get_table( unsigned int codepage ) -{ -6b201181: 55 push %ebp -6b201182: 89 e5 mov %esp,%ebp -6b201184: 83 ec 08 sub $0x8,%esp - const union cptable **res; - - if (!(res = bsearch( (void *)codepage, cptables, NB_CODEPAGES, -6b201187: 83 ec 0c sub $0xc,%esp -6b20118a: 68 70 11 20 6b push $0x6b201170 -6b20118f: 6a 04 push $0x4 -6b201191: 6a 3b push $0x3b -6b201193: 68 40 c7 21 6b push $0x6b21c740 -6b201198: ff 75 08 pushl 0x8(%ebp) -6b20119b: e8 d0 42 00 00 call 6b205470 <_bsearch> -6b2011a0: 83 c4 20 add $0x20,%esp -6b2011a3: 89 45 fc mov %eax,0xfffffffc(%ebp) -6b2011a6: 8b 45 fc mov 0xfffffffc(%ebp),%eax -6b2011a9: 85 c0 test %eax,%eax -6b2011ab: 75 09 jne 6b2011b6 <_wine_cp_get_table+0x35> - sizeof(cptables[0]), cmp_codepage ))) return NULL; -6b2011ad: c7 45 f8 00 00 00 00 movl $0x0,0xfffffff8(%ebp) -6b2011b4: eb 08 jmp 6b2011be <_wine_cp_get_table+0x3d> - return *res; -6b2011b6: 8b 45 fc mov 0xfffffffc(%ebp),%eax -6b2011b9: 8b 00 mov (%eax),%eax -6b2011bb: 89 45 f8 mov %eax,0xfffffff8(%ebp) -} -6b2011be: 8b 45 f8 mov 0xfffffff8(%ebp),%eax -6b2011c1: c9 leave -6b2011c2: c3 ret - -6b2011c3 <_wine_cp_enum_table>: - - -/* enum valid codepages */ -const union cptable *wine_cp_enum_table( unsigned int index ) -{ -6b2011c3: 55 push %ebp -6b2011c4: 89 e5 mov %esp,%ebp -6b2011c6: 83 ec 04 sub $0x4,%esp - if (index >= NB_CODEPAGES) return NULL; -6b2011c9: 83 7d 08 3a cmpl $0x3a,0x8(%ebp) -6b2011cd: 76 09 jbe 6b2011d8 <_wine_cp_enum_table+0x15> -6b2011cf: c7 45 fc 00 00 00 00 movl $0x0,0xfffffffc(%ebp) -6b2011d6: eb 0d jmp 6b2011e5 <_wine_cp_enum_table+0x22> - return cptables[index]; -6b2011d8: 8b 45 08 mov 0x8(%ebp),%eax -6b2011db: 8b 04 85 40 c7 21 6b mov 0x6b21c740(,%eax,4),%eax -6b2011e2: 89 45 fc mov %eax,0xfffffffc(%ebp) -} -6b2011e5: 8b 45 fc mov 0xfffffffc(%ebp),%eax -6b2011e8: c9 leave -6b2011e9: c3 ret -6b2011ea: 90 nop -6b2011eb: 90 nop -6b2011ec: 90 nop -6b2011ed: 90 nop -6b2011ee: 90 nop -6b2011ef: 90 nop - -6b2011f0 <_wine_fold_string>: -6b2011f0: 55 push %ebp -6b2011f1: 89 e5 mov %esp,%ebp -6b2011f3: 83 ec 18 sub $0x18,%esp -6b2011f6: 8b 45 14 mov 0x14(%ebp),%eax -6b2011f9: 89 45 fc mov %eax,0xfffffffc(%ebp) -6b2011fc: 83 7d 10 ff cmpl $0xffffffff,0x10(%ebp) -6b201200: 75 12 jne 6b201214 <_wine_fold_string+0x24> -6b201202: 83 ec 0c sub $0xc,%esp -6b201205: ff 75 0c pushl 0xc(%ebp) -6b201208: e8 73 42 00 00 call 6b205480 <_wcslen> -6b20120d: 83 c4 10 add $0x10,%esp -6b201210: 40 inc %eax -6b201211: 89 45 10 mov %eax,0x10(%ebp) -6b201214: 83 7d 18 00 cmpl $0x0,0x18(%ebp) -6b201218: 75 5e jne 6b201278 <_wine_fold_string+0x88> -6b20121a: 8b 45 10 mov 0x10(%ebp),%eax -6b20121d: 89 45 18 mov %eax,0x18(%ebp) -6b201220: 8b 45 08 mov 0x8(%ebp),%eax -6b201223: c1 e8 0d shr $0xd,%eax -6b201226: 83 e0 01 and $0x1,%eax -6b201229: 85 c0 test %eax,%eax -6b20122b: 74 31 je 6b20125e <_wine_fold_string+0x6e> -6b20122d: 8d 45 10 lea 0x10(%ebp),%eax -6b201230: ff 08 decl (%eax) -6b201232: 83 7d 10 ff cmpl $0xffffffff,0x10(%ebp) -6b201236: 74 35 je 6b20126d <_wine_fold_string+0x7d> -6b201238: 83 ec 0c sub $0xc,%esp -6b20123b: 8b 45 0c mov 0xc(%ebp),%eax -6b20123e: 66 8b 00 mov (%eax),%ax -6b201241: 25 ff ff 00 00 and $0xffff,%eax -6b201246: 50 push %eax -6b201247: e8 d0 02 00 00 call 6b20151c <_get_ligature_len> -6b20124c: 83 c4 10 add $0x10,%esp -6b20124f: 89 c2 mov %eax,%edx -6b201251: 8d 45 18 lea 0x18(%ebp),%eax -6b201254: 01 10 add %edx,(%eax) -6b201256: 8d 45 0c lea 0xc(%ebp),%eax -6b201259: 83 00 02 addl $0x2,(%eax) -6b20125c: eb cf jmp 6b20122d <_wine_fold_string+0x3d> -6b20125e: 8b 45 08 mov 0x8(%ebp),%eax -6b201261: c1 e8 06 shr $0x6,%eax -6b201264: 83 e0 01 and $0x1,%eax -6b201267: 85 c0 test %eax,%eax -6b201269: 74 02 je 6b20126d <_wine_fold_string+0x7d> -6b20126b: eb 00 jmp 6b20126d <_wine_fold_string+0x7d> -6b20126d: 8b 45 18 mov 0x18(%ebp),%eax -6b201270: 89 45 ec mov %eax,0xffffffec(%ebp) -6b201273: e9 78 01 00 00 jmp 6b2013f0 <_wine_fold_string+0x200> -6b201278: 8b 45 10 mov 0x10(%ebp),%eax -6b20127b: 3b 45 18 cmp 0x18(%ebp),%eax -6b20127e: 7e 0c jle 6b20128c <_wine_fold_string+0x9c> -6b201280: c7 45 ec 00 00 00 00 movl $0x0,0xffffffec(%ebp) -6b201287: e9 64 01 00 00 jmp 6b2013f0 <_wine_fold_string+0x200> -6b20128c: 8b 55 10 mov 0x10(%ebp),%edx -6b20128f: 8d 45 18 lea 0x18(%ebp),%eax -6b201292: 29 10 sub %edx,(%eax) -6b201294: c7 45 f4 00 00 00 00 movl $0x0,0xfffffff4(%ebp) -6b20129b: 8b 45 f4 mov 0xfffffff4(%ebp),%eax -6b20129e: 3b 45 10 cmp 0x10(%ebp),%eax -6b2012a1: 0f 8d 3c 01 00 00 jge 6b2013e3 <_wine_fold_string+0x1f3> -6b2012a7: 8b 45 0c mov 0xc(%ebp),%eax -6b2012aa: 66 8b 00 mov (%eax),%ax -6b2012ad: 66 89 45 f2 mov %ax,0xfffffff2(%ebp) -6b2012b1: 8b 45 08 mov 0x8(%ebp),%eax -6b2012b4: c1 e8 0d shr $0xd,%eax -6b2012b7: 83 e0 01 and $0x1,%eax -6b2012ba: 85 c0 test %eax,%eax -6b2012bc: 0f 84 a4 00 00 00 je 6b201366 <_wine_fold_string+0x176> -6b2012c2: 83 ec 0c sub $0xc,%esp -6b2012c5: 66 8b 45 f2 mov 0xfffffff2(%ebp),%ax -6b2012c9: 25 ff ff 00 00 and $0xffff,%eax -6b2012ce: 50 push %eax -6b2012cf: e8 bd 01 00 00 call 6b201491 <_get_ligature> -6b2012d4: 83 c4 10 add $0x10,%esp -6b2012d7: 89 45 f8 mov %eax,0xfffffff8(%ebp) -6b2012da: 8b 45 f8 mov 0xfffffff8(%ebp),%eax -6b2012dd: 66 83 38 00 cmpw $0x0,(%eax) -6b2012e1: 0f 84 8e 00 00 00 je 6b201375 <_wine_fold_string+0x185> -6b2012e7: 8d 45 18 lea 0x18(%ebp),%eax -6b2012ea: ff 08 decl (%eax) -6b2012ec: 83 7d 18 ff cmpl $0xffffffff,0x18(%ebp) -6b2012f0: 75 0c jne 6b2012fe <_wine_fold_string+0x10e> -6b2012f2: c7 45 ec 00 00 00 00 movl $0x0,0xffffffec(%ebp) -6b2012f9: e9 f2 00 00 00 jmp 6b2013f0 <_wine_fold_string+0x200> -6b2012fe: 8b 55 14 mov 0x14(%ebp),%edx -6b201301: 8b 45 f8 mov 0xfffffff8(%ebp),%eax -6b201304: 66 8b 00 mov (%eax),%ax -6b201307: 66 89 02 mov %ax,(%edx) -6b20130a: 8b 45 f8 mov 0xfffffff8(%ebp),%eax -6b20130d: 83 c0 04 add $0x4,%eax -6b201310: 66 83 38 00 cmpw $0x0,(%eax) -6b201314: 74 3b je 6b201351 <_wine_fold_string+0x161> -6b201316: 8d 45 18 lea 0x18(%ebp),%eax -6b201319: ff 08 decl (%eax) -6b20131b: 83 7d 18 ff cmpl $0xffffffff,0x18(%ebp) -6b20131f: 75 0c jne 6b20132d <_wine_fold_string+0x13d> -6b201321: c7 45 ec 00 00 00 00 movl $0x0,0xffffffec(%ebp) -6b201328: e9 c3 00 00 00 jmp 6b2013f0 <_wine_fold_string+0x200> -6b20132d: 8d 45 14 lea 0x14(%ebp),%eax -6b201330: 83 00 02 addl $0x2,(%eax) -6b201333: 8b 55 14 mov 0x14(%ebp),%edx -6b201336: 8b 45 f8 mov 0xfffffff8(%ebp),%eax -6b201339: 83 c0 02 add $0x2,%eax -6b20133c: 66 8b 00 mov (%eax),%ax -6b20133f: 66 89 02 mov %ax,(%edx) -6b201342: 8b 45 f8 mov 0xfffffff8(%ebp),%eax -6b201345: 83 c0 04 add $0x4,%eax -6b201348: 66 8b 00 mov (%eax),%ax -6b20134b: 66 89 45 f2 mov %ax,0xfffffff2(%ebp) -6b20134f: eb 0d jmp 6b20135e <_wine_fold_string+0x16e> -6b201351: 8b 45 f8 mov 0xfffffff8(%ebp),%eax -6b201354: 83 c0 02 add $0x2,%eax -6b201357: 66 8b 00 mov (%eax),%ax -6b20135a: 66 89 45 f2 mov %ax,0xfffffff2(%ebp) -6b20135e: 8d 45 14 lea 0x14(%ebp),%eax -6b201361: 83 00 02 addl $0x2,(%eax) -6b201364: eb 0f jmp 6b201375 <_wine_fold_string+0x185> -6b201366: 8b 45 08 mov 0x8(%ebp),%eax -6b201369: c1 e8 06 shr $0x6,%eax -6b20136c: 83 e0 01 and $0x1,%eax -6b20136f: 85 c0 test %eax,%eax -6b201371: 74 02 je 6b201375 <_wine_fold_string+0x185> -6b201373: eb 00 jmp 6b201375 <_wine_fold_string+0x185> -6b201375: 8b 45 08 mov 0x8(%ebp),%eax -6b201378: c1 e8 07 shr $0x7,%eax -6b20137b: 83 e0 01 and $0x1,%eax -6b20137e: 85 c0 test %eax,%eax -6b201380: 74 19 je 6b20139b <_wine_fold_string+0x1ab> -6b201382: 83 ec 0c sub $0xc,%esp -6b201385: 66 8b 45 f2 mov 0xfffffff2(%ebp),%ax -6b201389: 25 ff ff 00 00 and $0xffff,%eax -6b20138e: 50 push %eax -6b20138f: e8 af 00 00 00 call 6b201443 <_to_unicode_digit> -6b201394: 83 c4 10 add $0x10,%esp -6b201397: 66 89 45 f2 mov %ax,0xfffffff2(%ebp) -6b20139b: 8b 45 08 mov 0x8(%ebp),%eax -6b20139e: c1 e8 04 shr $0x4,%eax -6b2013a1: 83 e0 01 and $0x1,%eax -6b2013a4: 85 c0 test %eax,%eax -6b2013a6: 74 19 je 6b2013c1 <_wine_fold_string+0x1d1> -6b2013a8: 83 ec 0c sub $0xc,%esp -6b2013ab: 66 8b 45 f2 mov 0xfffffff2(%ebp),%ax -6b2013af: 25 ff ff 00 00 and $0xffff,%eax -6b2013b4: 50 push %eax -6b2013b5: e8 3b 00 00 00 call 6b2013f5 <_to_unicode_native> -6b2013ba: 83 c4 10 add $0x10,%esp -6b2013bd: 66 89 45 f2 mov %ax,0xfffffff2(%ebp) -6b2013c1: 8b 45 14 mov 0x14(%ebp),%eax -6b2013c4: 89 c2 mov %eax,%edx -6b2013c6: 66 8b 45 f2 mov 0xfffffff2(%ebp),%ax -6b2013ca: 66 89 02 mov %ax,(%edx) -6b2013cd: 8d 45 14 lea 0x14(%ebp),%eax -6b2013d0: 83 00 02 addl $0x2,(%eax) -6b2013d3: 8d 45 0c lea 0xc(%ebp),%eax -6b2013d6: 83 00 02 addl $0x2,(%eax) -6b2013d9: 8d 45 f4 lea 0xfffffff4(%ebp),%eax -6b2013dc: ff 00 incl (%eax) -6b2013de: e9 b8 fe ff ff jmp 6b20129b <_wine_fold_string+0xab> -6b2013e3: 8b 55 fc mov 0xfffffffc(%ebp),%edx -6b2013e6: 8b 45 14 mov 0x14(%ebp),%eax -6b2013e9: 29 d0 sub %edx,%eax -6b2013eb: d1 f8 sar %eax -6b2013ed: 89 45 ec mov %eax,0xffffffec(%ebp) -6b2013f0: 8b 45 ec mov 0xffffffec(%ebp),%eax -6b2013f3: c9 leave -6b2013f4: c3 ret - -6b2013f5 <_to_unicode_native>: -6b2013f5: 55 push %ebp -6b2013f6: 89 e5 mov %esp,%ebp -6b2013f8: 83 ec 04 sub $0x4,%esp -6b2013fb: 8b 45 08 mov 0x8(%ebp),%eax -6b2013fe: 66 89 45 fe mov %ax,0xfffffffe(%ebp) -6b201402: 66 8b 45 fe mov 0xfffffffe(%ebp),%ax -6b201406: 66 c1 e8 08 shr $0x8,%ax -6b20140a: 25 ff ff 00 00 and $0xffff,%eax -6b20140f: 66 8b 84 00 60 bf 20 mov 0x6b20bf60(%eax,%eax,1),%ax -6b201416: 6b -6b201417: 89 c2 mov %eax,%edx -6b201419: 81 e2 ff ff 00 00 and $0xffff,%edx -6b20141f: 66 8b 45 fe mov 0xfffffffe(%ebp),%ax -6b201423: 25 ff ff 00 00 and $0xffff,%eax -6b201428: 25 ff 00 00 00 and $0xff,%eax -6b20142d: 8d 14 10 lea (%eax,%edx,1),%edx -6b201430: 66 8b 45 fe mov 0xfffffffe(%ebp),%ax -6b201434: 66 03 84 12 60 bf 20 add 0x6b20bf60(%edx,%edx,1),%ax -6b20143b: 6b -6b20143c: 25 ff ff 00 00 and $0xffff,%eax -6b201441: c9 leave -6b201442: c3 ret - -6b201443 <_to_unicode_digit>: -6b201443: 55 push %ebp -6b201444: 89 e5 mov %esp,%ebp -6b201446: 83 ec 04 sub $0x4,%esp -6b201449: 8b 45 08 mov 0x8(%ebp),%eax -6b20144c: 66 89 45 fe mov %ax,0xfffffffe(%ebp) -6b201450: 66 8b 45 fe mov 0xfffffffe(%ebp),%ax -6b201454: 66 c1 e8 08 shr $0x8,%ax -6b201458: 25 ff ff 00 00 and $0xffff,%eax -6b20145d: 66 8b 84 00 80 9e 20 mov 0x6b209e80(%eax,%eax,1),%ax -6b201464: 6b -6b201465: 89 c2 mov %eax,%edx -6b201467: 81 e2 ff ff 00 00 and $0xffff,%edx -6b20146d: 66 8b 45 fe mov 0xfffffffe(%ebp),%ax -6b201471: 25 ff ff 00 00 and $0xffff,%eax -6b201476: 25 ff 00 00 00 and $0xff,%eax -6b20147b: 8d 14 10 lea (%eax,%edx,1),%edx -6b20147e: 66 8b 45 fe mov 0xfffffffe(%ebp),%ax -6b201482: 66 03 84 12 80 9e 20 add 0x6b209e80(%edx,%edx,1),%ax -6b201489: 6b -6b20148a: 25 ff ff 00 00 and $0xffff,%eax -6b20148f: c9 leave -6b201490: c3 ret - -6b201491 <_get_ligature>: -6b201491: 55 push %ebp -6b201492: 89 e5 mov %esp,%ebp -6b201494: 83 ec 14 sub $0x14,%esp -6b201497: 8b 45 08 mov 0x8(%ebp),%eax -6b20149a: 66 89 45 fe mov %ax,0xfffffffe(%ebp) -6b20149e: c7 45 f8 00 00 00 00 movl $0x0,0xfffffff8(%ebp) -6b2014a5: c7 45 f4 22 00 00 00 movl $0x22,0xfffffff4(%ebp) -6b2014ac: 8b 45 f8 mov 0xfffffff8(%ebp),%eax -6b2014af: 3b 45 f4 cmp 0xfffffff4(%ebp),%eax -6b2014b2: 7f 5c jg 6b201510 <_get_ligature+0x7f> -6b2014b4: 8b 45 f4 mov 0xfffffff4(%ebp),%eax -6b2014b7: 8b 55 f8 mov 0xfffffff8(%ebp),%edx -6b2014ba: 01 c2 add %eax,%edx -6b2014bc: 89 d0 mov %edx,%eax -6b2014be: c1 f8 1f sar $0x1f,%eax -6b2014c1: c1 e8 1f shr $0x1f,%eax -6b2014c4: 8d 04 02 lea (%edx,%eax,1),%eax -6b2014c7: d1 f8 sar %eax -6b2014c9: 89 45 f0 mov %eax,0xfffffff0(%ebp) -6b2014cc: 8b 45 f0 mov 0xfffffff0(%ebp),%eax -6b2014cf: 66 8b 84 00 40 c8 21 mov 0x6b21c840(%eax,%eax,1),%ax -6b2014d6: 6b -6b2014d7: 66 3b 45 fe cmp 0xfffffffe(%ebp),%ax -6b2014db: 73 09 jae 6b2014e6 <_get_ligature+0x55> -6b2014dd: 8b 45 f0 mov 0xfffffff0(%ebp),%eax -6b2014e0: 40 inc %eax -6b2014e1: 89 45 f8 mov %eax,0xfffffff8(%ebp) -6b2014e4: eb c6 jmp 6b2014ac <_get_ligature+0x1b> -6b2014e6: 8b 45 f0 mov 0xfffffff0(%ebp),%eax -6b2014e9: 66 8b 84 00 40 c8 21 mov 0x6b21c840(%eax,%eax,1),%ax -6b2014f0: 6b -6b2014f1: 66 3b 45 fe cmp 0xfffffffe(%ebp),%ax -6b2014f5: 76 09 jbe 6b201500 <_get_ligature+0x6f> -6b2014f7: 8b 45 f0 mov 0xfffffff0(%ebp),%eax -6b2014fa: 48 dec %eax -6b2014fb: 89 45 f4 mov %eax,0xfffffff4(%ebp) -6b2014fe: eb ac jmp 6b2014ac <_get_ligature+0x1b> -6b201500: 8b 45 f0 mov 0xfffffff0(%ebp),%eax -6b201503: c1 e0 03 shl $0x3,%eax -6b201506: 05 a0 c8 21 6b add $0x6b21c8a0,%eax -6b20150b: 89 45 ec mov %eax,0xffffffec(%ebp) -6b20150e: eb 07 jmp 6b201517 <_get_ligature+0x86> -6b201510: c7 45 ec b8 c9 21 6b movl $0x6b21c9b8,0xffffffec(%ebp) -6b201517: 8b 45 ec mov 0xffffffec(%ebp),%eax -6b20151a: c9 leave -6b20151b: c3 ret - -6b20151c <_get_ligature_len>: -6b20151c: 55 push %ebp -6b20151d: 89 e5 mov %esp,%ebp -6b20151f: 83 ec 14 sub $0x14,%esp -6b201522: 8b 45 08 mov 0x8(%ebp),%eax -6b201525: 66 89 45 fe mov %ax,0xfffffffe(%ebp) -6b201529: c7 45 f8 00 00 00 00 movl $0x0,0xfffffff8(%ebp) -6b201530: c7 45 f4 22 00 00 00 movl $0x22,0xfffffff4(%ebp) -6b201537: 8b 45 f8 mov 0xfffffff8(%ebp),%eax -6b20153a: 3b 45 f4 cmp 0xfffffff4(%ebp),%eax -6b20153d: 7f 61 jg 6b2015a0 <_get_ligature_len+0x84> -6b20153f: 8b 45 f4 mov 0xfffffff4(%ebp),%eax -6b201542: 8b 55 f8 mov 0xfffffff8(%ebp),%edx -6b201545: 01 c2 add %eax,%edx -6b201547: 89 d0 mov %edx,%eax -6b201549: c1 f8 1f sar $0x1f,%eax -6b20154c: c1 e8 1f shr $0x1f,%eax -6b20154f: 8d 04 02 lea (%edx,%eax,1),%eax -6b201552: d1 f8 sar %eax -6b201554: 89 45 f0 mov %eax,0xfffffff0(%ebp) -6b201557: 8b 45 f0 mov 0xfffffff0(%ebp),%eax -6b20155a: 66 8b 84 00 40 c8 21 mov 0x6b21c840(%eax,%eax,1),%ax -6b201561: 6b -6b201562: 66 3b 45 fe cmp 0xfffffffe(%ebp),%ax -6b201566: 73 09 jae 6b201571 <_get_ligature_len+0x55> -6b201568: 8b 45 f0 mov 0xfffffff0(%ebp),%eax -6b20156b: 40 inc %eax -6b20156c: 89 45 f8 mov %eax,0xfffffff8(%ebp) -6b20156f: eb c6 jmp 6b201537 <_get_ligature_len+0x1b> -6b201571: 8b 45 f0 mov 0xfffffff0(%ebp),%eax -6b201574: 66 8b 84 00 40 c8 21 mov 0x6b21c840(%eax,%eax,1),%ax -6b20157b: 6b -6b20157c: 66 3b 45 fe cmp 0xfffffffe(%ebp),%ax -6b201580: 76 09 jbe 6b20158b <_get_ligature_len+0x6f> -6b201582: 8b 45 f0 mov 0xfffffff0(%ebp),%eax -6b201585: 48 dec %eax -6b201586: 89 45 f4 mov %eax,0xfffffff4(%ebp) -6b201589: eb ac jmp 6b201537 <_get_ligature_len+0x1b> -6b20158b: 8b 45 f0 mov 0xfffffff0(%ebp),%eax -6b20158e: 66 8b 04 c5 a6 c8 21 mov 0x6b21c8a6(,%eax,8),%ax -6b201595: 6b -6b201596: 25 ff ff 00 00 and $0xffff,%eax -6b20159b: 89 45 ec mov %eax,0xffffffec(%ebp) -6b20159e: eb 07 jmp 6b2015a7 <_get_ligature_len+0x8b> -6b2015a0: c7 45 ec 00 00 00 00 movl $0x0,0xffffffec(%ebp) -6b2015a7: 8b 45 ec mov 0xffffffec(%ebp),%eax -6b2015aa: c9 leave -6b2015ab: c3 ret -6b2015ac: 90 nop -6b2015ad: 90 nop -6b2015ae: 90 nop -6b2015af: 90 nop - -6b2015b0 <_get_decomposition>: -6b2015b0: 55 push %ebp -6b2015b1: 89 e5 mov %esp,%ebp -6b2015b3: 83 ec 10 sub $0x10,%esp -6b2015b6: 8b 45 08 mov 0x8(%ebp),%eax -6b2015b9: 66 89 45 fe mov %ax,0xfffffffe(%ebp) -6b2015bd: c7 45 f8 a0 a3 21 6b movl $0x6b21a3a0,0xfffffff8(%ebp) -6b2015c4: 8b 55 0c mov 0xc(%ebp),%edx -6b2015c7: 66 8b 45 fe mov 0xfffffffe(%ebp),%ax -6b2015cb: 66 89 02 mov %ax,(%edx) -6b2015ce: 66 8b 45 fe mov 0xfffffffe(%ebp),%ax -6b2015d2: 66 c1 e8 08 shr $0x8,%ax -6b2015d6: 25 ff ff 00 00 and $0xffff,%eax -6b2015db: 8d 14 00 lea (%eax,%eax,1),%edx -6b2015de: 8b 45 f8 mov 0xfffffff8(%ebp),%eax -6b2015e1: 66 8b 04 02 mov (%edx,%eax,1),%ax -6b2015e5: 25 ff ff 00 00 and $0xffff,%eax -6b2015ea: 01 c0 add %eax,%eax -6b2015ec: 05 a0 a3 21 6b add $0x6b21a3a0,%eax -6b2015f1: 89 45 f8 mov %eax,0xfffffff8(%ebp) -6b2015f4: 66 8b 45 fe mov 0xfffffffe(%ebp),%ax -6b2015f8: 25 ff ff 00 00 and $0xffff,%eax -6b2015fd: 83 e0 0f and $0xf,%eax -6b201600: 8d 0c 00 lea (%eax,%eax,1),%ecx -6b201603: 66 8b 45 fe mov 0xfffffffe(%ebp),%ax -6b201607: 66 c1 e8 04 shr $0x4,%ax -6b20160b: 25 ff ff 00 00 and $0xffff,%eax -6b201610: 83 e0 0f and $0xf,%eax -6b201613: 8d 14 00 lea (%eax,%eax,1),%edx -6b201616: 8b 45 f8 mov 0xfffffff8(%ebp),%eax -6b201619: 66 8b 04 02 mov (%edx,%eax,1),%ax -6b20161d: 25 ff ff 00 00 and $0xffff,%eax -6b201622: 8d 04 01 lea (%ecx,%eax,1),%eax -6b201625: 01 c0 add %eax,%eax -6b201627: 05 a0 a3 21 6b add $0x6b21a3a0,%eax -6b20162c: 89 45 f8 mov %eax,0xfffffff8(%ebp) -6b20162f: 8b 45 f8 mov 0xfffffff8(%ebp),%eax -6b201632: 66 83 38 00 cmpw $0x0,(%eax) -6b201636: 75 09 jne 6b201641 <_get_decomposition+0x91> -6b201638: c7 45 f0 01 00 00 00 movl $0x1,0xfffffff0(%ebp) -6b20163f: eb 58 jmp 6b201699 <_get_decomposition+0xe9> -6b201641: 83 7d 10 01 cmpl $0x1,0x10(%ebp) -6b201645: 77 09 ja 6b201650 <_get_decomposition+0xa0> -6b201647: c7 45 f0 00 00 00 00 movl $0x0,0xfffffff0(%ebp) -6b20164e: eb 49 jmp 6b201699 <_get_decomposition+0xe9> -6b201650: 83 ec 04 sub $0x4,%esp -6b201653: 8b 45 10 mov 0x10(%ebp),%eax -6b201656: 48 dec %eax -6b201657: 50 push %eax -6b201658: ff 75 0c pushl 0xc(%ebp) -6b20165b: 8b 45 f8 mov 0xfffffff8(%ebp),%eax -6b20165e: 66 8b 00 mov (%eax),%ax -6b201661: 25 ff ff 00 00 and $0xffff,%eax -6b201666: 50 push %eax -6b201667: e8 44 ff ff ff call 6b2015b0 <_get_decomposition> -6b20166c: 83 c4 10 add $0x10,%esp -6b20166f: 89 45 f4 mov %eax,0xfffffff4(%ebp) -6b201672: 83 7d f4 00 cmpl $0x0,0xfffffff4(%ebp) -6b201676: 74 1b je 6b201693 <_get_decomposition+0xe3> -6b201678: 8b 45 f4 mov 0xfffffff4(%ebp),%eax -6b20167b: 8d 0c 00 lea (%eax,%eax,1),%ecx -6b20167e: 8b 55 0c mov 0xc(%ebp),%edx -6b201681: 8b 45 f8 mov 0xfffffff8(%ebp),%eax -6b201684: 83 c0 02 add $0x2,%eax -6b201687: 66 8b 00 mov (%eax),%ax -6b20168a: 66 89 04 11 mov %ax,(%ecx,%edx,1) -6b20168e: 8d 45 f4 lea 0xfffffff4(%ebp),%eax -6b201691: ff 00 incl (%eax) -6b201693: 8b 45 f4 mov 0xfffffff4(%ebp),%eax -6b201696: 89 45 f0 mov %eax,0xfffffff0(%ebp) -6b201699: 8b 45 f0 mov 0xfffffff0(%ebp),%eax -6b20169c: c9 leave -6b20169d: c3 ret - -6b20169e <_mbstowcs_sbcs_decompose>: -6b20169e: 55 push %ebp -6b20169f: 89 e5 mov %esp,%ebp -6b2016a1: 83 ec 18 sub $0x18,%esp -6b2016a4: 8b 45 08 mov 0x8(%ebp),%eax -6b2016a7: 8b 40 10 mov 0x10(%eax),%eax -6b2016aa: 89 45 fc mov %eax,0xfffffffc(%ebp) -6b2016ad: 83 7d 18 00 cmpl $0x0,0x18(%ebp) -6b2016b1: 75 53 jne 6b201706 <_mbstowcs_sbcs_decompose+0x68> -6b2016b3: c7 45 f8 00 00 00 00 movl $0x0,0xfffffff8(%ebp) -6b2016ba: 83 7d 10 00 cmpl $0x0,0x10(%ebp) -6b2016be: 74 3b je 6b2016fb <_mbstowcs_sbcs_decompose+0x5d> -6b2016c0: 6a 04 push $0x4 -6b2016c2: 8d 45 f0 lea 0xfffffff0(%ebp),%eax -6b2016c5: 50 push %eax -6b2016c6: 8b 45 0c mov 0xc(%ebp),%eax -6b2016c9: 8a 00 mov (%eax),%al -6b2016cb: 25 ff 00 00 00 and $0xff,%eax -6b2016d0: 8d 14 00 lea (%eax,%eax,1),%edx -6b2016d3: 8b 45 fc mov 0xfffffffc(%ebp),%eax -6b2016d6: 66 8b 04 02 mov (%edx,%eax,1),%ax -6b2016da: 25 ff ff 00 00 and $0xffff,%eax -6b2016df: 50 push %eax -6b2016e0: e8 cb fe ff ff call 6b2015b0 <_get_decomposition> -6b2016e5: 83 c4 0c add $0xc,%esp -6b2016e8: 89 c2 mov %eax,%edx -6b2016ea: 8d 45 f8 lea 0xfffffff8(%ebp),%eax -6b2016ed: 01 10 add %edx,(%eax) -6b2016ef: 8d 45 10 lea 0x10(%ebp),%eax -6b2016f2: ff 08 decl (%eax) -6b2016f4: 8d 45 0c lea 0xc(%ebp),%eax -6b2016f7: ff 00 incl (%eax) -6b2016f9: eb bf jmp 6b2016ba <_mbstowcs_sbcs_decompose+0x1c> -6b2016fb: 8b 45 f8 mov 0xfffffff8(%ebp),%eax -6b2016fe: 89 45 e8 mov %eax,0xffffffe8(%ebp) -6b201701: e9 80 00 00 00 jmp 6b201786 <_mbstowcs_sbcs_decompose+0xe8> -6b201706: 8b 45 18 mov 0x18(%ebp),%eax -6b201709: 89 45 f8 mov %eax,0xfffffff8(%ebp) -6b20170c: 83 7d 10 00 cmpl $0x0,0x10(%ebp) -6b201710: 74 58 je 6b20176a <_mbstowcs_sbcs_decompose+0xcc> -6b201712: 83 7d f8 00 cmpl $0x0,0xfffffff8(%ebp) -6b201716: 74 52 je 6b20176a <_mbstowcs_sbcs_decompose+0xcc> -6b201718: ff 75 f8 pushl 0xfffffff8(%ebp) -6b20171b: ff 75 14 pushl 0x14(%ebp) -6b20171e: 8b 45 0c mov 0xc(%ebp),%eax -6b201721: 8a 00 mov (%eax),%al -6b201723: 25 ff 00 00 00 and $0xff,%eax -6b201728: 8d 14 00 lea (%eax,%eax,1),%edx -6b20172b: 8b 45 fc mov 0xfffffffc(%ebp),%eax -6b20172e: 66 8b 04 02 mov (%edx,%eax,1),%ax -6b201732: 25 ff ff 00 00 and $0xffff,%eax -6b201737: 50 push %eax -6b201738: e8 73 fe ff ff call 6b2015b0 <_get_decomposition> -6b20173d: 83 c4 0c add $0xc,%esp -6b201740: 89 45 ec mov %eax,0xffffffec(%ebp) -6b201743: 83 7d ec 00 cmpl $0x0,0xffffffec(%ebp) -6b201747: 75 02 jne 6b20174b <_mbstowcs_sbcs_decompose+0xad> -6b201749: eb 1f jmp 6b20176a <_mbstowcs_sbcs_decompose+0xcc> -6b20174b: 8b 55 ec mov 0xffffffec(%ebp),%edx -6b20174e: 8d 45 f8 lea 0xfffffff8(%ebp),%eax -6b201751: 29 10 sub %edx,(%eax) -6b201753: 8b 45 ec mov 0xffffffec(%ebp),%eax -6b201756: 8d 14 00 lea (%eax,%eax,1),%edx -6b201759: 8d 45 14 lea 0x14(%ebp),%eax -6b20175c: 01 10 add %edx,(%eax) -6b20175e: 8d 45 10 lea 0x10(%ebp),%eax -6b201761: ff 08 decl (%eax) -6b201763: 8d 45 0c lea 0xc(%ebp),%eax -6b201766: ff 00 incl (%eax) -6b201768: eb a2 jmp 6b20170c <_mbstowcs_sbcs_decompose+0x6e> [truncated at 1000 lines; 11129 more skipped]

1 0

[chorns] 12668: Tag ReactOS 0.1.4.
by chorns＠svn.reactos.com 31 Dec '04

31 Dec '04

Tag ReactOS 0.1.4. Added: tags/ReactOS-0.1.4/ _____ Copied: tags/ReactOS-0.1.4 (from rev 6269, branches/ros-branch-0_1_14)

1 0

[chorns] 12667: Remove tag ReactOS 0.1.4.
by chorns＠svn.reactos.com 31 Dec '04

31 Dec '04

Remove tag ReactOS 0.1.4. Deleted: tags/ReactOS-0.1.4/

1 0

[chorns] 12666: Tag ReactOS 0.1.5.
by chorns＠svn.reactos.com 31 Dec '04

31 Dec '04

Tag ReactOS 0.1.5. Added: tags/ReactOS-0.1.5/ _____ Copied: tags/ReactOS-0.1.5 (from rev 6688, branches/ros-branch-0_1_5)

1 0

[chorns] 12665: Remove tag ReactOS 0.1.5.
by chorns＠svn.reactos.com 31 Dec '04

31 Dec '04

Remove tag ReactOS 0.1.5. Deleted: tags/ReactOS-0.1.5/

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