February 2009 - Wine-Commits

Jacek Caban : wininet: Move FtpOpenFile[AW] implementation to avoid forward declaration.
by Alexandre Julliard Feb. 11, 2009

Feb. 11, 2009

Module: wine Branch: master Commit: a83a817ad08845183dbe13889726fcfed7c996ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=a83a817ad08845183dbe13889… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 10 16:28:56 2009 +0100 wininet: Move FtpOpenFile[AW] implementation to avoid forward declaration. --- dlls/wininet/ftp.c | 227 ++++++++++++++++++++++++++-------------------------- 1 files changed, 113 insertions(+), 114 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 0289300..83e2b60 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -203,8 +203,6 @@ static BOOL FTP_FtpGetCurrentDirectoryW(LPWININETFTPSESSIONW lpwfs, LPWSTR lpszC static BOOL FTP_FtpRenameFileW(LPWININETFTPSESSIONW lpwfs, LPCWSTR lpszSrc, LPCWSTR lpszDest); static BOOL FTP_FtpRemoveDirectoryW(LPWININETFTPSESSIONW lpwfs, LPCWSTR lpszDirectory); static BOOL FTP_FtpDeleteFileW(LPWININETFTPSESSIONW lpwfs, LPCWSTR lpszFileName); -static HINTERNET FTP_FtpOpenFileW(LPWININETFTPSESSIONW lpwfs, LPCWSTR lpszFileName, - DWORD fdwAccess, DWORD dwFlags, DWORD_PTR dwContext); static BOOL FTP_FtpGetFileW(LPWININETFTPSESSIONW lpwfs, LPCWSTR lpszRemoteFile, LPCWSTR lpszNewFile, BOOL fFailIfExists, DWORD dwLocalFlagsAttribute, DWORD dwInternetFlags, DWORD_PTR dwContext); @@ -1075,118 +1073,6 @@ lend: return bSuccess; } -/*********************************************************************** - * FtpOpenFileA (WININET.@) - * - * Open a remote file for writing or reading - * - * RETURNS - * HINTERNET handle on success - * NULL on failure - * - */ -HINTERNET WINAPI FtpOpenFileA(HINTERNET hFtpSession, - LPCSTR lpszFileName, DWORD fdwAccess, DWORD dwFlags, - DWORD_PTR dwContext) -{ - LPWSTR lpwzFileName; - HINTERNET ret; - - lpwzFileName = lpszFileName?WININET_strdup_AtoW(lpszFileName):NULL; - ret = FtpOpenFileW(hFtpSession, lpwzFileName, fdwAccess, dwFlags, dwContext); - HeapFree(GetProcessHeap(), 0, lpwzFileName); - return ret; -} - - -static void AsyncFtpOpenFileProc(WORKREQUEST *workRequest) -{ - struct WORKREQ_FTPOPENFILEW const *req = &workRequest->u.FtpOpenFileW; - LPWININETFTPSESSIONW lpwfs = (LPWININETFTPSESSIONW) workRequest->hdr; - - TRACE("%p\n", lpwfs); - - FTP_FtpOpenFileW(lpwfs, req->lpszFilename, - req->dwAccess, req->dwFlags, req->dwContext); - HeapFree(GetProcessHeap(), 0, req->lpszFilename); -} - -/*********************************************************************** - * FtpOpenFileW (WININET.@) - * - * Open a remote file for writing or reading - * - * RETURNS - * HINTERNET handle on success - * NULL on failure - * - */ -HINTERNET WINAPI FtpOpenFileW(HINTERNET hFtpSession, - LPCWSTR lpszFileName, DWORD fdwAccess, DWORD dwFlags, - DWORD_PTR dwContext) -{ - LPWININETFTPSESSIONW lpwfs; - LPWININETAPPINFOW hIC = NULL; - HINTERNET r = NULL; - - TRACE("(%p,%s,0x%08x,0x%08x,0x%08lx)\n", hFtpSession, - debugstr_w(lpszFileName), fdwAccess, dwFlags, dwContext); - - lpwfs = (LPWININETFTPSESSIONW) WININET_GetObject( hFtpSession ); - if (!lpwfs) - { - INTERNET_SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - - if (WH_HFTPSESSION != lpwfs->hdr.htype) - { - INTERNET_SetLastError(ERROR_INTERNET_INCORRECT_HANDLE_TYPE); - goto lend; - } - - if ((!lpszFileName) || - ((fdwAccess != GENERIC_READ) && (fdwAccess != GENERIC_WRITE)) || - ((dwFlags & FTP_CONDITION_MASK) > FTP_TRANSFER_TYPE_BINARY)) - { - INTERNET_SetLastError(ERROR_INVALID_PARAMETER); - goto lend; - } - - if (lpwfs->download_in_progress != NULL) - { - INTERNET_SetLastError(ERROR_FTP_TRANSFER_IN_PROGRESS); - goto lend; - } - - hIC = lpwfs->lpAppInfo; - if (hIC->hdr.dwFlags & INTERNET_FLAG_ASYNC) - { - WORKREQUEST workRequest; - struct WORKREQ_FTPOPENFILEW *req; - - workRequest.asyncproc = AsyncFtpOpenFileProc; - workRequest.hdr = WININET_AddRef( &lpwfs->hdr ); - req = &workRequest.u.FtpOpenFileW; - req->lpszFilename = WININET_strdupW(lpszFileName); - req->dwAccess = fdwAccess; - req->dwFlags = dwFlags; - req->dwContext = dwContext; - - INTERNET_AsyncCall(&workRequest); - r = NULL; - } - else - { - r = FTP_FtpOpenFileW(lpwfs, lpszFileName, fdwAccess, dwFlags, dwContext); - } - -lend: - WININET_Release( &lpwfs->hdr ); - - return r; -} - /*********************************************************************** * FTPFILE_Destroy(internal) @@ -1365,6 +1251,119 @@ lend: /*********************************************************************** + * FtpOpenFileA (WININET.@) + * + * Open a remote file for writing or reading + * + * RETURNS + * HINTERNET handle on success + * NULL on failure + * + */ +HINTERNET WINAPI FtpOpenFileA(HINTERNET hFtpSession, + LPCSTR lpszFileName, DWORD fdwAccess, DWORD dwFlags, + DWORD_PTR dwContext) +{ + LPWSTR lpwzFileName; + HINTERNET ret; + + lpwzFileName = lpszFileName?WININET_strdup_AtoW(lpszFileName):NULL; + ret = FtpOpenFileW(hFtpSession, lpwzFileName, fdwAccess, dwFlags, dwContext); + HeapFree(GetProcessHeap(), 0, lpwzFileName); + return ret; +} + + +static void AsyncFtpOpenFileProc(WORKREQUEST *workRequest) +{ + struct WORKREQ_FTPOPENFILEW const *req = &workRequest->u.FtpOpenFileW; + LPWININETFTPSESSIONW lpwfs = (LPWININETFTPSESSIONW) workRequest->hdr; + + TRACE("%p\n", lpwfs); + + FTP_FtpOpenFileW(lpwfs, req->lpszFilename, + req->dwAccess, req->dwFlags, req->dwContext); + HeapFree(GetProcessHeap(), 0, req->lpszFilename); +} + +/*********************************************************************** + * FtpOpenFileW (WININET.@) + * + * Open a remote file for writing or reading + * + * RETURNS + * HINTERNET handle on success + * NULL on failure + * + */ +HINTERNET WINAPI FtpOpenFileW(HINTERNET hFtpSession, + LPCWSTR lpszFileName, DWORD fdwAccess, DWORD dwFlags, + DWORD_PTR dwContext) +{ + LPWININETFTPSESSIONW lpwfs; + LPWININETAPPINFOW hIC = NULL; + HINTERNET r = NULL; + + TRACE("(%p,%s,0x%08x,0x%08x,0x%08lx)\n", hFtpSession, + debugstr_w(lpszFileName), fdwAccess, dwFlags, dwContext); + + lpwfs = (LPWININETFTPSESSIONW) WININET_GetObject( hFtpSession ); + if (!lpwfs) + { + INTERNET_SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + + if (WH_HFTPSESSION != lpwfs->hdr.htype) + { + INTERNET_SetLastError(ERROR_INTERNET_INCORRECT_HANDLE_TYPE); + goto lend; + } + + if ((!lpszFileName) || + ((fdwAccess != GENERIC_READ) && (fdwAccess != GENERIC_WRITE)) || + ((dwFlags & FTP_CONDITION_MASK) > FTP_TRANSFER_TYPE_BINARY)) + { + INTERNET_SetLastError(ERROR_INVALID_PARAMETER); + goto lend; + } + + if (lpwfs->download_in_progress != NULL) + { + INTERNET_SetLastError(ERROR_FTP_TRANSFER_IN_PROGRESS); + goto lend; + } + + hIC = lpwfs->lpAppInfo; + if (hIC->hdr.dwFlags & INTERNET_FLAG_ASYNC) + { + WORKREQUEST workRequest; + struct WORKREQ_FTPOPENFILEW *req; + + workRequest.asyncproc = AsyncFtpOpenFileProc; + workRequest.hdr = WININET_AddRef( &lpwfs->hdr ); + req = &workRequest.u.FtpOpenFileW; + req->lpszFilename = WININET_strdupW(lpszFileName); + req->dwAccess = fdwAccess; + req->dwFlags = dwFlags; + req->dwContext = dwContext; + + INTERNET_AsyncCall(&workRequest); + r = NULL; + } + else + { + r = FTP_FtpOpenFileW(lpwfs, lpszFileName, fdwAccess, dwFlags, dwContext); + } + +lend: + WININET_Release( &lpwfs->hdr ); + + return r; +} + + +/*********************************************************************** * FtpGetFileA (WININET.@) * * Retrieve file from the FTP server

1 0

Christian Costa : d3dxof: Add support for DXFILELOAD_FROMRESOURCE source.
by Alexandre Julliard Feb. 10, 2009

Feb. 10, 2009

Module: wine Branch: master Commit: 3e6d9558b8c119282fc976778762f4de1dc4fdab URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e6d9558b8c119282fc976778… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Tue Feb 10 14:12:47 2009 +0100 d3dxof: Add support for DXFILELOAD_FROMRESOURCE source. --- dlls/d3dxof/d3dxof.c | 35 +++++++++++++++++++++++++++++++++++ dlls/d3dxof/d3dxof_private.h | 1 + 2 files changed, 36 insertions(+), 0 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index b9e4441..6a27cd5 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -131,6 +131,7 @@ static HRESULT WINAPI IDirectXFileImpl_CreateEnumObject(IDirectXFile* iface, LPV HANDLE hFile = INVALID_HANDLE_VALUE; HANDLE file_mapping = 0; LPBYTE buffer = NULL; + HGLOBAL resource_data = 0; LPBYTE file_buffer; DWORD file_size; @@ -169,6 +170,36 @@ static HRESULT WINAPI IDirectXFileImpl_CreateEnumObject(IDirectXFile* iface, LPV } file_buffer = buffer; } + else if (dwLoadOptions == DXFILELOAD_FROMRESOURCE) + { + HRSRC resource_info; + LPDXFILELOADRESOURCE lpdxflr = pvSource; + + TRACE("Source in resource (module = %p, name = %s, type = %s\n", lpdxflr->hModule, debugstr_a(lpdxflr->lpName), debugstr_a(lpdxflr->lpType)); + + resource_info = FindResourceA(lpdxflr->hModule, lpdxflr->lpName, lpdxflr->lpType); + if (!resource_info) + { + hr = DXFILEERR_RESOURCENOTFOUND; + goto error; + } + + file_size = SizeofResource(lpdxflr->hModule, resource_info); + + resource_data = LoadResource(lpdxflr->hModule, resource_info); + if (!resource_data) + { + hr = DXFILEERR_BADRESOURCE; + goto error; + } + + file_buffer = LockResource(resource_data); + if (!file_buffer) + { + hr = DXFILEERR_BADRESOURCE; + goto error; + } + } else if (dwLoadOptions == DXFILELOAD_FROMMEMORY) { lpdxflm = pvSource; @@ -289,6 +320,8 @@ error: CloseHandle(file_mapping); if (hFile != INVALID_HANDLE_VALUE) CloseHandle(hFile); + if (resource_data) + FreeResource(resource_data); *ppEnumObj = NULL; return hr; @@ -977,6 +1010,8 @@ static ULONG WINAPI IDirectXFileEnumObjectImpl_Release(IDirectXFileEnumObject* i CloseHandle(This->file_mapping); CloseHandle(This->hFile); } + else if (This->source == DXFILELOAD_FROMRESOURCE) + FreeResource(This->resource_data); HeapFree(GetProcessHeap(), 0, This); } diff --git a/dlls/d3dxof/d3dxof_private.h b/dlls/d3dxof/d3dxof_private.h index 978b312..67883ae 100644 --- a/dlls/d3dxof/d3dxof_private.h +++ b/dlls/d3dxof/d3dxof_private.h @@ -151,6 +151,7 @@ typedef struct { HANDLE hFile; HANDLE file_mapping; LPBYTE buffer; + HGLOBAL resource_data; parse_buffer buf; IDirectXFileImpl* pDirectXFile; ULONG nb_xobjects;

1 0

Christian Costa : d3dxof: Cleanup IDirectXFileImpl_CreateEnumObject a bit.
by Alexandre Julliard Feb. 10, 2009

Feb. 10, 2009

Module: wine Branch: master Commit: 279e49030a3861f8338674bddb56a81a3299da94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=279e49030a3861f8338674bdd… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Tue Feb 10 14:08:11 2009 +0100 d3dxof: Cleanup IDirectXFileImpl_CreateEnumObject a bit. --- dlls/d3dxof/d3dxof.c | 38 ++++++++++++++++++-------------------- 1 files changed, 18 insertions(+), 20 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index fb52a19..b9e4441 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -127,11 +127,12 @@ static HRESULT WINAPI IDirectXFileImpl_CreateEnumObject(IDirectXFile* iface, LPV IDirectXFileImpl *This = (IDirectXFileImpl *)iface; IDirectXFileEnumObjectImpl* object; HRESULT hr; - DWORD header[4]; + DWORD* header; HANDLE hFile = INVALID_HANDLE_VALUE; HANDLE file_mapping = 0; LPBYTE buffer = NULL; - DWORD file_size = 0; + LPBYTE file_buffer; + DWORD file_size; LPDXFILELOADMEMORY lpdxflm = NULL; @@ -152,11 +153,6 @@ static HRESULT WINAPI IDirectXFileImpl_CreateEnumObject(IDirectXFile* iface, LPV } file_size = GetFileSize(hFile, NULL); - if (file_size < 16) - { - hr = DXFILEERR_BADFILETYPE; - goto error; - } file_mapping = CreateFileMappingA(hFile, NULL, PAGE_READONLY, 0, 0, NULL); if (!file_mapping) @@ -171,7 +167,7 @@ static HRESULT WINAPI IDirectXFileImpl_CreateEnumObject(IDirectXFile* iface, LPV hr = DXFILEERR_BADFILETYPE; goto error; } - memcpy(header, buffer, 16); + file_buffer = buffer; } else if (dwLoadOptions == DXFILELOAD_FROMMEMORY) { @@ -179,7 +175,8 @@ static HRESULT WINAPI IDirectXFileImpl_CreateEnumObject(IDirectXFile* iface, LPV TRACE("Source in memory at %p with size %d\n", lpdxflm->lpMemory, lpdxflm->dSize); - memcpy(header, lpdxflm->lpMemory, 16); + file_buffer = lpdxflm->lpMemory; + file_size = lpdxflm->dSize; } else { @@ -188,6 +185,8 @@ static HRESULT WINAPI IDirectXFileImpl_CreateEnumObject(IDirectXFile* iface, LPV goto error; } + header = (DWORD*)file_buffer; + if (TRACE_ON(d3dxof)) { char string[17]; @@ -196,6 +195,12 @@ static HRESULT WINAPI IDirectXFileImpl_CreateEnumObject(IDirectXFile* iface, LPV TRACE("header = '%s'\n", string); } + if (file_size < 16) + { + hr = DXFILEERR_BADFILETYPE; + goto error; + } + if (header[0] != XOFFILE_FORMAT_MAGIC) { hr = DXFILEERR_BADFILETYPE; @@ -243,18 +248,11 @@ static HRESULT WINAPI IDirectXFileImpl_CreateEnumObject(IDirectXFile* iface, LPV object->buf.token_present = FALSE; object->buf.cur_subobject = 0; - if (dwLoadOptions == DXFILELOAD_FROMFILE) - { - object->buf.buffer = buffer + 16; - object->buf.rem_bytes = file_size - 16; - } - else - { - object->buf.buffer = ((LPBYTE)lpdxflm->lpMemory) + 16; - object->buf.rem_bytes = lpdxflm->dSize; - } + TRACE("File size is %d bytes\n", file_size); - TRACE("Object size is %d bytes\n", object->buf.rem_bytes + 16); + /* Go to data after header */ + object->buf.buffer = file_buffer + 16; + object->buf.rem_bytes = file_size - 16; *ppEnumObj = (LPDIRECTXFILEENUMOBJECT)object;

1 0

Christian Costa : d3dxof: Make is_keyword handle end of file correctly.
by Alexandre Julliard Feb. 10, 2009

Feb. 10, 2009

Module: wine Branch: master Commit: db30aa149ed90781973fdf2878d42702b91754cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=db30aa149ed90781973fdf287… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Tue Feb 10 14:07:19 2009 +0100 d3dxof: Make is_keyword handle end of file correctly. --- dlls/d3dxof/parsing.c | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index 13fc5bb..c849e5a 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -273,10 +273,20 @@ static WORD get_operator_token(char c) static BOOL is_keyword(parse_buffer* buf, const char* keyword) { - char tmp[9]; /* template keyword size + 1 */ + char tmp[8]; /* longest keyword size (template) */ DWORD len = strlen(keyword); - read_bytes(buf, tmp, len+1); - if (!strncasecmp(tmp, keyword,len) && is_separator(tmp[len])) + + if (!read_bytes(buf, tmp, len)) + return FALSE; + if (strncasecmp(tmp, keyword, len)) + { + rewind_bytes(buf, len); + return FALSE; + } + + if (!read_bytes(buf, tmp, 1)) + return TRUE; + if (is_separator(tmp[0])) { rewind_bytes(buf, 1); return TRUE;

1 0

Dylan Smith : richedit: Store paragraph in cursors.
by Alexandre Julliard Feb. 10, 2009

Feb. 10, 2009

Module: wine Branch: master Commit: ecb6c2169c1006382e2f5ece72f0e31bd297f305 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecb6c2169c1006382e2f5ece7… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon Feb 9 12:01:35 2009 -0500 richedit: Store paragraph in cursors. This prevents some needless searching for the start of the paragraph from a run stored in a cursor. Usually a pointer to the paragraph is already available when the cursor is set anyway. --- dlls/riched20/caret.c | 80 ++++++++++++++++++++++++++++++++-------------- dlls/riched20/editor.c | 52 +++++++++++++++++------------- dlls/riched20/editstr.h | 1 + dlls/riched20/paint.c | 6 +-- dlls/riched20/para.c | 49 +++++++++++++++++----------- dlls/riched20/run.c | 33 ++++++++++--------- dlls/riched20/table.c | 27 +++++++++++----- dlls/riched20/undo.c | 4 +- 8 files changed, 156 insertions(+), 96 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ecb6c2169c1006382e2f5…

1 0

Jeremy White : sane.ds: Add a log message to flag unsupported operations.
by Alexandre Julliard Feb. 10, 2009

Feb. 10, 2009

Module: wine Branch: master Commit: 2033312b437c993cce95c77fc3c2bd44885433b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2033312b437c993cce95c77fc… Author: Jeremy White <jwhite(a)winehq.org> Date: Mon Feb 9 13:02:47 2009 -0600 sane.ds: Add a log message to flag unsupported operations. --- dlls/sane.ds/capability.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/sane.ds/capability.c b/dlls/sane.ds/capability.c index 66cc1e4..b66624c 100644 --- a/dlls/sane.ds/capability.c +++ b/dlls/sane.ds/capability.c @@ -386,5 +386,8 @@ TW_UINT16 SANE_SaneCapability (pTW_CAPABILITY pCapability, TW_UINT16 action) if (twCC == TWCC_CAPUNSUPPORTED && action == MSG_QUERYSUPPORT) twCC = set_onevalue(pCapability, 0, TWTY_INT32); + if (twCC == TWCC_CAPUNSUPPORTED) + TRACE("capability 0x%x/action=%d being reported as unsupported\n", pCapability->Cap, action); + return twCC; }

1 0

Jeremy White : sane.ds: Indicate that we used a modal dialog.
by Alexandre Julliard Feb. 10, 2009

Feb. 10, 2009

Module: wine Branch: master Commit: 3f0645c79dce62df5c1a75c3959c816a9a10b809 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f0645c79dce62df5c1a75c39… Author: Jeremy White <jwhite(a)winehq.org> Date: Mon Feb 9 13:02:32 2009 -0600 sane.ds: Indicate that we used a modal dialog. --- dlls/sane.ds/ds_ctrl.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/sane.ds/ds_ctrl.c b/dlls/sane.ds/ds_ctrl.c index 2b90e9f..b0867cf 100644 --- a/dlls/sane.ds/ds_ctrl.c +++ b/dlls/sane.ds/ds_ctrl.c @@ -582,6 +582,7 @@ TW_UINT16 SANE_EnableDSUserInterface (pTW_IDENTITY pOrigin, activeDS.currentState = 5; /* Transitions to state 5 */ FIXME("showing UI\n"); rc = DoScannerUI(); + pUserInterface->ModalUI = TRUE; if (!rc) { if (activeDS.windowMessage)

1 0

Jeremy White : sane.ds: Revise the logic around processing events to reflect the need for us to generate and post a message to drive Sane events .
by Alexandre Julliard Feb. 10, 2009

Feb. 10, 2009

Module: wine Branch: master Commit: 0cab16c647f79c07f593d43c4c0b36f45177986c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cab16c647f79c07f593d43c4… Author: Jeremy White <jwhite(a)winehq.org> Date: Mon Feb 9 13:02:28 2009 -0600 sane.ds: Revise the logic around processing events to reflect the need for us to generate and post a message to drive Sane events. --- dlls/sane.ds/ds_ctrl.c | 40 ++++++++++++++++++++-------------------- dlls/sane.ds/sane_i.h | 4 ++-- dlls/sane.ds/ui.c | 6 ++++-- 3 files changed, 26 insertions(+), 24 deletions(-) diff --git a/dlls/sane.ds/ds_ctrl.c b/dlls/sane.ds/ds_ctrl.c index 2c8d312..2b90e9f 100644 --- a/dlls/sane.ds/ds_ctrl.c +++ b/dlls/sane.ds/ds_ctrl.c @@ -292,30 +292,25 @@ TW_UINT16 SANE_FileSystemRename (pTW_IDENTITY pOrigin, TW_UINT16 SANE_ProcessEvent (pTW_IDENTITY pOrigin, TW_MEMREF pData) { - TW_UINT16 twRC = TWRC_SUCCESS; + TW_UINT16 twRC = TWRC_NOTDSEVENT; pTW_EVENT pEvent = (pTW_EVENT) pData; + MSG *pMsg = pEvent->pEvent; - TRACE("DG_CONTROL/DAT_EVENT/MSG_PROCESSEVENT\n"); + TRACE("DG_CONTROL/DAT_EVENT/MSG_PROCESSEVENT msg 0x%x, wParam 0x%lx\n", pMsg->message, pMsg->wParam); - if (activeDS.currentState < 5 || activeDS.currentState > 7) + activeDS.twCC = TWCC_SUCCESS; + if (pMsg->message == activeDS.windowMessage && activeDS.windowMessage) { - twRC = TWRC_FAILURE; - activeDS.twCC = TWCC_SEQERROR; + twRC = TWRC_DSEVENT; + pEvent->TWMessage = pMsg->wParam; } else + pEvent->TWMessage = MSG_NULL; /* no message to the application */ + + if (activeDS.currentState < 5 || activeDS.currentState > 7) { - if (activeDS.pendingEvent.TWMessage != MSG_NULL) - { - pEvent->TWMessage = activeDS.pendingEvent.TWMessage; - activeDS.pendingEvent.TWMessage = MSG_NULL; - twRC = TWRC_NOTDSEVENT; - } - else - { - pEvent->TWMessage = MSG_NULL; /* no message to the application */ - twRC = TWRC_NOTDSEVENT; - } - activeDS.twCC = TWCC_SUCCESS; + twRC = TWRC_FAILURE; + activeDS.twCC = TWCC_SEQERROR; } return twRC; @@ -355,7 +350,8 @@ TW_UINT16 SANE_PendingXfersEndXfer (pTW_IDENTITY pOrigin, { activeDS.currentState = 5; /* Notify the application that it can close the data source */ - activeDS.pendingEvent.TWMessage = MSG_CLOSEDSREQ; + if (activeDS.windowMessage) + PostMessageA(activeDS.hwndOwner, activeDS.windowMessage, MSG_CLOSEDSREQ, 0); } twRC = TWRC_SUCCESS; activeDS.twCC = TWCC_SUCCESS; @@ -578,6 +574,8 @@ TW_UINT16 SANE_EnableDSUserInterface (pTW_IDENTITY pOrigin, else { activeDS.hwndOwner = pUserInterface->hParent; + if (! activeDS.windowMessage) + activeDS.windowMessage = RegisterWindowMessageA("SANE.DS ACTIVITY MESSAGE"); if (pUserInterface->ShowUI) { BOOL rc; @@ -586,7 +584,8 @@ TW_UINT16 SANE_EnableDSUserInterface (pTW_IDENTITY pOrigin, rc = DoScannerUI(); if (!rc) { - activeDS.pendingEvent.TWMessage = MSG_CLOSEDSREQ; + if (activeDS.windowMessage) + PostMessageA(activeDS.hwndOwner, activeDS.windowMessage, MSG_CLOSEDSREQ, 0); } #ifdef SONAME_LIBSANE else @@ -599,8 +598,9 @@ TW_UINT16 SANE_EnableDSUserInterface (pTW_IDENTITY pOrigin, else { /* no UI will be displayed, so source is ready to transfer data */ - activeDS.pendingEvent.TWMessage = MSG_XFERREADY; activeDS.currentState = 6; /* Transitions to state 6 directly */ + if (activeDS.windowMessage) + PostMessageA(activeDS.hwndOwner, activeDS.windowMessage, MSG_XFERREADY, 0); } activeDS.hwndOwner = pUserInterface->hParent; diff --git a/dlls/sane.ds/sane_i.h b/dlls/sane.ds/sane_i.h index 3c123d0..5a3a6d0 100644 --- a/dlls/sane.ds/sane_i.h +++ b/dlls/sane.ds/sane_i.h @@ -48,6 +48,7 @@ MAKE_FUNCPTR(sane_strstatus) #include "windef.h" #include "winbase.h" +#include "winuser.h" #include "twain.h" extern HINSTANCE SANE_instance; @@ -58,8 +59,7 @@ struct tagActiveDS struct tagActiveDS *next; /* next active DS */ TW_IDENTITY identity; /* identity */ TW_UINT16 currentState; /* current state */ - TW_EVENT pendingEvent; /* pending event to be sent to - application */ + UINT windowMessage; /* message to use to send status */ TW_UINT16 twCC; /* condition code */ HWND hwndOwner; /* window handle of the app */ HWND progressWnd; /* window handle of the scanning window */ diff --git a/dlls/sane.ds/ui.c b/dlls/sane.ds/ui.c index 236a91d..31b5152 100644 --- a/dlls/sane.ds/ui.c +++ b/dlls/sane.ds/ui.c @@ -996,11 +996,13 @@ static INT_PTR CALLBACK DialogProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM if (psn->lParam == TRUE) { activeDS.currentState = 6; - activeDS.pendingEvent.TWMessage = MSG_XFERREADY; + if (activeDS.windowMessage) + PostMessageA(activeDS.hwndOwner, activeDS.windowMessage, MSG_XFERREADY, 0); } break; case PSN_QUERYCANCEL: - activeDS.pendingEvent.TWMessage = MSG_CLOSEDSREQ; + if (activeDS.windowMessage) + PostMessageA(activeDS.hwndOwner, activeDS.windowMessage, MSG_CLOSEDSREQ, 0); break; case PSN_SETACTIVE: InitializeDialog(hwndDlg);

1 0

Jeremy White : sane.ds: Remove a duplicate assignment.
by Alexandre Julliard Feb. 10, 2009

Feb. 10, 2009

Module: wine Branch: master Commit: c00d81ab14d8c2ea36d0e072edcbec50b5f434e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c00d81ab14d8c2ea36d0e072e… Author: Jeremy White <jwhite(a)winehq.org> Date: Mon Feb 9 13:02:39 2009 -0600 sane.ds: Remove a duplicate assignment. --- dlls/sane.ds/ds_ctrl.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/sane.ds/ds_ctrl.c b/dlls/sane.ds/ds_ctrl.c index b0867cf..69ec633 100644 --- a/dlls/sane.ds/ds_ctrl.c +++ b/dlls/sane.ds/ds_ctrl.c @@ -604,7 +604,6 @@ TW_UINT16 SANE_EnableDSUserInterface (pTW_IDENTITY pOrigin, PostMessageA(activeDS.hwndOwner, activeDS.windowMessage, MSG_XFERREADY, 0); } - activeDS.hwndOwner = pUserInterface->hParent; twRC = TWRC_SUCCESS; activeDS.twCC = TWCC_SUCCESS; }

1 0

Jeremy White : sane.ds: Add stub support for ICAP_COMPRESSION.
by Alexandre Julliard Feb. 10, 2009

Feb. 10, 2009

Module: wine Branch: master Commit: b0ec8880e20b8476fa8ece9b1a160efd78e478ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0ec8880e20b8476fa8ece9b1… Author: Jeremy White <jwhite(a)winehq.org> Date: Mon Feb 9 13:02:05 2009 -0600 sane.ds: Add stub support for ICAP_COMPRESSION. --- dlls/sane.ds/capability.c | 48 ++++++++++++++++++++++++++++++++++++++++++++- dlls/twain_32/tests/dsm.c | 4 ++- 2 files changed, 50 insertions(+), 2 deletions(-) diff --git a/dlls/sane.ds/capability.c b/dlls/sane.ds/capability.c index 45c3f88..66cc1e4 100644 --- a/dlls/sane.ds/capability.c +++ b/dlls/sane.ds/capability.c @@ -126,7 +126,7 @@ static TW_UINT16 TWAIN_GetSupportedCaps(pTW_CAPABILITY pCapability) { TW_ARRAY *a; static const UINT16 supported_caps[] = { CAP_SUPPORTEDCAPS, CAP_XFERCOUNT, CAP_UICONTROLLABLE, - ICAP_XFERMECH, ICAP_PIXELTYPE }; + ICAP_XFERMECH, ICAP_PIXELTYPE, ICAP_COMPRESSION }; pCapability->hContainer = GlobalAlloc (0, FIELD_OFFSET( TW_ARRAY, ItemList[sizeof(supported_caps)] )); pCapability->ConType = TWON_ARRAY; @@ -303,6 +303,48 @@ static TW_UINT16 SANE_CAPUiControllable(pTW_CAPABILITY pCapability, TW_UINT16 ac return twCC; } +/* ICAP_COMPRESSION */ +static TW_UINT16 SANE_ICAPCompression (pTW_CAPABILITY pCapability, TW_UINT16 action) +{ + static const TW_UINT32 possible_values[] = { TWCP_NONE }; + TW_UINT32 val; + TW_UINT16 twCC = TWCC_BADCAP; + + TRACE("ICAP_COMPRESSION\n"); + + switch (action) + { + case MSG_QUERYSUPPORT: + twCC = set_onevalue(pCapability, TWTY_INT32, + TWQC_GET | TWQC_SET | TWQC_GETDEFAULT | TWQC_GETCURRENT | TWQC_RESET ); + break; + + case MSG_GET: + twCC = msg_get_enum(pCapability, possible_values, sizeof(possible_values) / sizeof(possible_values[0]), + TWTY_UINT16, TWCP_NONE, TWCP_NONE); + FIXME("Partial stub: We don't attempt to support compression\n"); + break; + + case MSG_SET: + twCC = msg_set(pCapability, &val); + if (twCC == TWCC_SUCCESS) + FIXME("Partial Stub: COMPRESSION set to %d, but ignored\n", val); + break; + + case MSG_GETDEFAULT: + twCC = set_onevalue(pCapability, TWTY_UINT16, TWCP_NONE); + break; + + case MSG_RESET: + /* .. fall through intentional .. */ + + case MSG_GETCURRENT: + twCC = set_onevalue(pCapability, TWTY_UINT16, TWCP_NONE); + break; + } + return twCC; +} + TW_UINT16 SANE_SaneCapability (pTW_CAPABILITY pCapability, TW_UINT16 action) { TW_UINT16 twCC = TWCC_CAPUNSUPPORTED; @@ -333,6 +375,10 @@ TW_UINT16 SANE_SaneCapability (pTW_CAPABILITY pCapability, TW_UINT16 action) case ICAP_XFERMECH: twCC = SANE_ICAPXferMech (pCapability, action); break; + + case ICAP_COMPRESSION: + twCC = SANE_ICAPCompression(pCapability, action); + break; } /* Twain specifies that you should return a 0 in response to QUERYSUPPORT, diff --git a/dlls/twain_32/tests/dsm.c b/dlls/twain_32/tests/dsm.c index f42add9..f0e5b4b 100644 --- a/dlls/twain_32/tests/dsm.c +++ b/dlls/twain_32/tests/dsm.c @@ -323,8 +323,10 @@ static void test_single_source(TW_IDENTITY *appid, TW_IDENTITY *source) Sources that supply image information must support DG_CONTROL / DAT_CAPABILITY / MSG_GET, MSG_GETCURRENT, MSG_GETDEFAULT on: */ - todo_wine ok(capabilities[ICAP_COMPRESSION], "ICAP_COMPRESSION not supported\n"); + if (capabilities[ICAP_COMPRESSION]) + test_onevalue_cap(appid, source, ICAP_COMPRESSION, TWTY_UINT16, + TWQC_GET | TWQC_GETDEFAULT | TWQC_GETCURRENT); todo_wine ok(capabilities[ICAP_PLANARCHUNKY], "ICAP_PLANARCHUNKY not supported\n"); todo_wine

1 0