diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 9c6afe20a82..3ff4ffdb173 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -84,7 +84,7 @@ mode_t FILE_umask = 0; * PARAMS * handle [O] Variable that receives the file handle on return * access [I] Access desired by the caller to the file - * attr [I] Structue describing the file to be opened + * attr [I] Structure describing the file to be opened * io [O] Receives details about the result of the operation * sharing [I] Type of shared access the caller requires * options [I] Options for the file open diff --git a/dlls/shlwapi/reg.c b/dlls/shlwapi/reg.c index cbc716f41d5..e06bb293b28 100644 --- a/dlls/shlwapi/reg.c +++ b/dlls/shlwapi/reg.c @@ -1835,16 +1835,16 @@ BOOL WINAPI GetMIMETypeSubKeyW(LPCWSTR lpszType, LPWSTR lpszBuffer, DWORD dwLen) /************************************************************************* * @ [SHLWAPI.330] * - * Get the files extension for a given Mime type. + * Get the file extension for a given Mime type. * * PARAMS * lpszType [I] Mime type to get the file extension for - * lpExt [O] Destingtion for the resulting extension - * iLen [I] Length og lpExt in characters + * lpExt [O] Destination for the resulting extension + * iLen [I] Length of lpExt in characters * * RETURNS * Success: TRUE. lpExt contains the file extension. - * Failure: FALSE, if any paramater is invalid or the extension cannot be + * Failure: FALSE, if any parameter is invalid or the extension cannot be * retrieved. If iLen > 0, lpExt is set to an empty string. * * NOTES diff --git a/dlls/twain/README b/dlls/twain/README index 57ad63c663c..a1b1940b60d 100644 --- a/dlls/twain/README +++ b/dlls/twain/README @@ -1,7 +1,7 @@ ----- Old Corel README, probably outdated ---------------------------------- 1. INTRODUCTION -This library (twain32.dll) is an implementation of TWAIN API for providing image acquisition devices (scanner or digital camera) support. It uses SANE drivers as the backend and translates TWAIN API calls into SANE API calls. Unlike the twain32 library on Windows platform, it combines the Data Source Manager and Data Sources into a single library. Thus it is our responsiblity to provide a graphical user interface and capability negotiation, which usually are performed by data sources. +This library (twain_32.dll) is an implementation of TWAIN API for providing image acquisition devices (scanner or digital camera) support. It uses SANE drivers as the backend and translates TWAIN API calls into SANE API calls. Unlike the twain32 library on Windows platform, it combines the Data Source Manager and Data Sources into a single library. Thus it is our responsiblity to provide a graphical user interface and capability negotiation, which usually are performed by data sources. 2. WHAT'S IMPLEMENTED @@ -12,7 +12,7 @@ This library (twain32.dll) is an implementation of TWAIN API for providing image - The operation triplets that deal with the UI (such as DG_CONTROL/DAT_USERINTERFACE/MSG_ENABLEDS, MSG_DISABLEDS and MSG_ENABLEDSUIONLY) are partially implemented although it does not really do much. -- The operation triplets that deal with native image transfering (DG_IMAGE/DAT_IMAGENATIVEXFER/MSG_GET) are also partially implemented. Still need to figure out how to convert the image data obtained from sane to the Windows DIB format. +- The operation triplets that deal with native image transfers (DG_IMAGE/DAT_IMAGENATIVEXFER/MSG_GET) are also partially implemented. Still need to figure out how to convert the image data obtained from sane to the Windows DIB format. - Only the CAP_ICAPXFERMECH capability is implemented. diff --git a/dlls/twain/ds_image.c b/dlls/twain/ds_image.c index 01716164212..c9fc1b04ca0 100644 --- a/dlls/twain/ds_image.c +++ b/dlls/twain/ds_image.c @@ -103,7 +103,7 @@ TW_UINT16 TWAIN_ImageInfoGet (pTW_IDENTITY pOrigin, pTW_IDENTITY pDest, { if (pSource->currentState == 6) { - /* return general image description information about the image about to be transfer */ + /* return general image description information about the image about to be transferred */ status = sane_get_parameters (pSource->deviceHandle, &pSource->sane_param); } @@ -265,7 +265,7 @@ TW_UINT16 TWAIN_ImageNativeXferGet (pTW_IDENTITY pOrigin, pTW_IDENTITY pDest, sizeof (buffer), &buff_len); if (status == SANE_STATUS_GOOD) { - /* FIXME: put code for coverting the image data into DIB here */ + /* FIXME: put code for converting the image data into DIB here */ } else if (status != SANE_STATUS_EOF) diff --git a/dlls/twain/dsm_ctrl.c b/dlls/twain/dsm_ctrl.c index 30644dacbf2..adc007a6f96 100644 --- a/dlls/twain/dsm_ctrl.c +++ b/dlls/twain/dsm_ctrl.c @@ -237,7 +237,7 @@ TW_UINT16 TWAIN_OpenDS (pTW_IDENTITY pOrigin, TW_MEMREF pData) if (pIdentity->ProductName[0] != '\0') { - /* Make sure the source to be open exists in the device list */ + /* Make sure the source to be opened exists in the device list */ for (i = 0; device_list[i]; i ++) { if (strcmp (device_list[i]->name, pIdentity->ProductName) == 0) diff --git a/dlls/twain/twain_i.h b/dlls/twain/twain_i.h index e7be1cc1b70..bc8f664905e 100644 --- a/dlls/twain/twain_i.h +++ b/dlls/twain/twain_i.h @@ -32,7 +32,7 @@ #include "winbase.h" #include "twain.h" -/* internel information about an active data source */ +/* internal information about an active data source */ typedef struct tagActiveDS { struct tagActiveDS *next; /* next active DS */ @@ -45,7 +45,7 @@ typedef struct tagActiveDS #ifdef HAVE_SANE SANE_Handle deviceHandle; /* device handle */ SANE_Parameters sane_param; /* parameters about the image - transfered */ + transferred */ #endif /* Capabiblities */ TW_UINT16 capXferMech; /* ICAP_XFERMECH */ diff --git a/dlls/winaspi/aspi.h b/dlls/winaspi/aspi.h index 006b69170da..93153201c44 100644 --- a/dlls/winaspi/aspi.h +++ b/dlls/winaspi/aspi.h @@ -43,7 +43,7 @@ extern "C" { /* WNASPI32/WINASPI defs */ #define HOST_TO_TARGET(prb) (((prb->SRB_Flags>>3) & 0x3) == 0x2) #define TARGET_TO_HOST(prb) (((prb->SRB_Flags>>3) & 0x3) == 0x1) -#define NO_DATA_TRANSFERED(prb) (((prb->SRB_Flags>>3) & 0x3) == 0x3) +#define NO_DATA_TRANSFERRED(prb) (((prb->SRB_Flags>>3) & 0x3) == 0x3) #define INQUIRY_VENDOR 8 diff --git a/dlls/winaspi/winaspi16.c b/dlls/winaspi/winaspi16.c index df6289df20f..bf17eb58eb2 100644 --- a/dlls/winaspi/winaspi16.c +++ b/dlls/winaspi/winaspi16.c @@ -154,7 +154,7 @@ ASPI_DebugPrintCmd(SRB_ExecSCSICmd16 *prb, UINT16 mode) else if (HOST_TO_TARGET(prb)) { TRACE("\tData transfer: Host to target. Length checked.\n"); } - else if (NO_DATA_TRANSFERED(prb)) { + else if (NO_DATA_TRANSFERRED(prb)) { TRACE("\tData transfer: none\n"); } else { diff --git a/dlls/winaspi/winaspi32.c b/dlls/winaspi/winaspi32.c index ab5cef8296a..74359837c3b 100644 --- a/dlls/winaspi/winaspi32.c +++ b/dlls/winaspi/winaspi32.c @@ -167,7 +167,7 @@ ASPI_DebugPrintCmd(SRB_ExecSCSICmd *prb) else if (HOST_TO_TARGET(prb)) { TRACE("\tData transfer: Host to target. Length checked.\n"); } - else if (NO_DATA_TRANSFERED(prb)) { + else if (NO_DATA_TRANSFERRED(prb)) { TRACE("\tData transfer: none\n"); } else { diff --git a/dlls/winaspi/winescsi.h b/dlls/winaspi/winescsi.h index ee88c35e595..4b9dd7ac372 100644 --- a/dlls/winaspi/winescsi.h +++ b/dlls/winaspi/winescsi.h @@ -93,7 +93,7 @@ ASPI_GetHCforController( int controller ); /* WNASPI32/WINASPI defs */ #define HOST_TO_TARGET(prb) (((prb->SRB_Flags>>3) & 0x3) == 0x2) #define TARGET_TO_HOST(prb) (((prb->SRB_Flags>>3) & 0x3) == 0x1) -#define NO_DATA_TRANSFERED(prb) (((prb->SRB_Flags>>3) & 0x3) == 0x3) +#define NO_DATA_TRANSFERRED(prb) (((prb->SRB_Flags>>3) & 0x3) == 0x3) #define INQUIRY_VENDOR 8 diff --git a/include/winbase.h b/include/winbase.h index be87a65dbe5..1dc02bc79a5 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -492,7 +492,7 @@ typedef struct _OVERLAPPED { HANDLE hEvent; } OVERLAPPED, *LPOVERLAPPED; -typedef VOID (CALLBACK *LPOVERLAPPED_COMPLETION_ROUTINE)(DWORD dwErrorCode, DWORD dwNumberOfBytesTransfered, LPOVERLAPPED lpOverlapped); +typedef VOID (CALLBACK *LPOVERLAPPED_COMPLETION_ROUTINE)(DWORD,DWORD,LPOVERLAPPED); /* Process startup information. */