March 2009 - Wine-commits - list.winehq.org

Jacek Caban : urlmon: Added ftp pluggable protocol implementation.
by Alexandre Julliard 03 Mar '09

03 Mar '09

Module: wine Branch: master Commit: ad4a21bc994fc9d72e1ccfdc1be5b37ebc8f3832 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad4a21bc994fc9d72e1ccfdc1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 2 19:57:35 2009 +0100 urlmon: Added ftp pluggable protocol implementation. --- dlls/urlmon/ftp.c | 115 +++++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 94 insertions(+), 21 deletions(-) diff --git a/dlls/urlmon/ftp.c b/dlls/urlmon/ftp.c index f79641e..dbdd7a7 100644 --- a/dlls/urlmon/ftp.c +++ b/dlls/urlmon/ftp.c @@ -1,5 +1,5 @@ /* - * Copyright 2005 Jacek Caban + * Copyright 2005-2009 Jacek Caban for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -22,17 +22,64 @@ WINE_DEFAULT_DEBUG_CHANNEL(urlmon); typedef struct { + Protocol base; + const IInternetProtocolVtbl *lpInternetProtocolVtbl; const IInternetPriorityVtbl *lpInternetPriorityVtbl; LONG ref; } FtpProtocol; -#define PROTOCOL_THIS(iface) DEFINE_THIS(FtpProtocol, InternetProtocol, iface) - #define PROTOCOL(x) ((IInternetProtocol*) &(x)->lpInternetProtocolVtbl) #define PRIORITY(x) ((IInternetPriority*) &(x)->lpInternetPriorityVtbl) +#define ASYNCPROTOCOL_THIS(iface) DEFINE_THIS2(FtpProtocol, base, iface) + +static HRESULT FtpProtocol_open_request(Protocol *prot, LPCWSTR url, DWORD request_flags, + IInternetBindInfo *bind_info) +{ + FtpProtocol *This = ASYNCPROTOCOL_THIS(prot); + + This->base.request = InternetOpenUrlW(This->base.internet, url, NULL, 0, + request_flags|INTERNET_FLAG_EXISTING_CONNECT|INTERNET_FLAG_PASSIVE, + (DWORD_PTR)&This->base); + if (!This->base.request && GetLastError() != ERROR_IO_PENDING) { + WARN("InternetOpenUrl failed: %d\n", GetLastError()); + return INET_E_RESOURCE_NOT_FOUND; + } + + return S_OK; +} + +static HRESULT FtpProtocol_start_downloading(Protocol *prot) +{ + FtpProtocol *This = ASYNCPROTOCOL_THIS(prot); + DWORD size; + BOOL res; + + res = FtpGetFileSize(This->base.request, &size); + if(res) + This->base.content_length = size; + else + WARN("FtpGetFileSize failed: %d\n", GetLastError()); + + return S_OK; +} + +static void FtpProtocol_close_connection(Protocol *prot) +{ +} + +#undef ASYNCPROTOCOL_THIS + +static const ProtocolVtbl AsyncProtocolVtbl = { + FtpProtocol_open_request, + FtpProtocol_start_downloading, + FtpProtocol_close_connection +}; + +#define PROTOCOL_THIS(iface) DEFINE_THIS(FtpProtocol, InternetProtocol, iface) + static HRESULT WINAPI FtpProtocol_QueryInterface(IInternetProtocol *iface, REFIID riid, void **ppv) { FtpProtocol *This = PROTOCOL_THIS(iface); @@ -77,6 +124,7 @@ static ULONG WINAPI FtpProtocol_Release(IInternetProtocol *iface) TRACE("(%p) ref=%d\n", This, ref); if(!ref) { + protocol_close_connection(&This->base); heap_free(This); URLMON_UnlockModule(); @@ -90,16 +138,25 @@ static HRESULT WINAPI FtpProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, DWORD grfPI, DWORD dwReserved) { FtpProtocol *This = PROTOCOL_THIS(iface); - FIXME("(%p)->(%s %p %p %08x %d)\n", This, debugstr_w(szUrl), pOIProtSink, - pOIBindInfo, grfPI, dwReserved); - return E_NOTIMPL; + + static const WCHAR ftpW[] = {'f','t','p',':'}; + + TRACE("(%p)->(%s %p %p %08x %d)\n", This, debugstr_w(szUrl), pOIProtSink, + pOIBindInfo, grfPI, dwReserved); + + if(strncmpW(szUrl, ftpW, sizeof(ftpW)/sizeof(WCHAR))) + return MK_E_SYNTAX; + + return protocol_start(&This->base, PROTOCOL(This), szUrl, pOIProtSink, pOIBindInfo); } static HRESULT WINAPI FtpProtocol_Continue(IInternetProtocol *iface, PROTOCOLDATA *pProtocolData) { FtpProtocol *This = PROTOCOL_THIS(iface); - FIXME("(%p)->(%p)\n", This, pProtocolData); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, pProtocolData); + + return protocol_continue(&This->base, pProtocolData); } static HRESULT WINAPI FtpProtocol_Abort(IInternetProtocol *iface, HRESULT hrReason, @@ -113,8 +170,11 @@ static HRESULT WINAPI FtpProtocol_Abort(IInternetProtocol *iface, HRESULT hrReas static HRESULT WINAPI FtpProtocol_Terminate(IInternetProtocol *iface, DWORD dwOptions) { FtpProtocol *This = PROTOCOL_THIS(iface); - FIXME("(%p)->(%08x)\n", This, dwOptions); - return E_NOTIMPL; + + TRACE("(%p)->(%08x)\n", This, dwOptions); + + protocol_close_connection(&This->base); + return S_OK; } static HRESULT WINAPI FtpProtocol_Suspend(IInternetProtocol *iface) @@ -135,8 +195,10 @@ static HRESULT WINAPI FtpProtocol_Read(IInternetProtocol *iface, void *pv, ULONG cb, ULONG *pcbRead) { FtpProtocol *This = PROTOCOL_THIS(iface); - FIXME("(%p)->(%p %u %p)\n", This, pv, cb, pcbRead); - return E_NOTIMPL; + + TRACE("(%p)->(%p %u %p)\n", This, pv, cb, pcbRead); + + return protocol_read(&This->base, pv, cb, pcbRead); } static HRESULT WINAPI FtpProtocol_Seek(IInternetProtocol *iface, LARGE_INTEGER dlibMove, @@ -150,15 +212,19 @@ static HRESULT WINAPI FtpProtocol_Seek(IInternetProtocol *iface, LARGE_INTEGER d static HRESULT WINAPI FtpProtocol_LockRequest(IInternetProtocol *iface, DWORD dwOptions) { FtpProtocol *This = PROTOCOL_THIS(iface); - FIXME("(%p)->(%08x)\n", This, dwOptions); - return E_NOTIMPL; + + TRACE("(%p)->(%08x)\n", This, dwOptions); + + return protocol_lock_request(&This->base); } static HRESULT WINAPI FtpProtocol_UnlockRequest(IInternetProtocol *iface) { FtpProtocol *This = PROTOCOL_THIS(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + + TRACE("(%p)\n", This); + + return protocol_unlock_request(&This->base); } #undef PROTOCOL_THIS @@ -202,15 +268,21 @@ static ULONG WINAPI FtpPriority_Release(IInternetPriority *iface) static HRESULT WINAPI FtpPriority_SetPriority(IInternetPriority *iface, LONG nPriority) { FtpProtocol *This = PRIORITY_THIS(iface); - FIXME("(%p)->(%d)\n", This, nPriority); - return E_NOTIMPL; + + TRACE("(%p)->(%d)\n", This, nPriority); + + This->base.priority = nPriority; + return S_OK; } static HRESULT WINAPI FtpPriority_GetPriority(IInternetPriority *iface, LONG *pnPriority) { FtpProtocol *This = PRIORITY_THIS(iface); - FIXME("(%p)->(%p)\n", This, pnPriority); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, pnPriority); + + *pnPriority = This->base.priority; + return S_OK; } #undef PRIORITY_THIS @@ -231,8 +303,9 @@ HRESULT FtpProtocol_Construct(IUnknown *pUnkOuter, LPVOID *ppobj) URLMON_LockModule(); - ret = heap_alloc(sizeof(FtpProtocol)); + ret = heap_alloc_zero(sizeof(FtpProtocol)); + ret->base.vtbl = &AsyncProtocolVtbl; ret->lpInternetProtocolVtbl = &FtpProtocolVtbl; ret->lpInternetPriorityVtbl = &FtpPriorityVtbl; ret->ref = 1;

1 0

Jacek Caban : urlmon: Use pluggable protocol for ftp binding.
by Alexandre Julliard 03 Mar '09

03 Mar '09

Module: wine Branch: master Commit: e18e6ba3d8d7edb286dde64b2f6e22bc83e6b474 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e18e6ba3d8d7edb286dde64b2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 2 19:58:07 2009 +0100 urlmon: Use pluggable protocol for ftp binding. --- dlls/urlmon/umon.c | 65 ++++++++++----------------------------------------- 1 files changed, 13 insertions(+), 52 deletions(-) diff --git a/dlls/urlmon/umon.c b/dlls/urlmon/umon.c index bbaed5b..c338b15 100644 --- a/dlls/urlmon/umon.c +++ b/dlls/urlmon/umon.c @@ -532,8 +532,6 @@ static HRESULT URLMonikerImpl_BindToStorage_hack(LPCWSTR URLName, IBindCtx* pbc, if(SUCCEEDED(hres)) { URL_COMPONENTSW url; WCHAR *host, *path, *user, *pass; - DWORD dwService = 0; - BOOL bSuccess; TRACE("got bindinfo. bindf = %08x extrainfo = %s bindinfof = %08x bindverb = %08x iid %s\n", bindf, debugstr_w(bi.szExtraInfo), bi.grfBindInfoF, bi.dwBindVerb, debugstr_guid(&bi.iid)); @@ -583,23 +581,10 @@ static HRESULT URLMonikerImpl_BindToStorage_hack(LPCWSTR URLName, IBindCtx* pbc, break; } - switch ((DWORD) url.nScheme) - { - case INTERNET_SCHEME_FTP: - if (!url.nPort) - url.nPort = INTERNET_DEFAULT_FTP_PORT; - dwService = INTERNET_SERVICE_FTP; - break; - - case INTERNET_SCHEME_GOPHER: - if (!url.nPort) - url.nPort = INTERNET_DEFAULT_GOPHER_PORT; - dwService = INTERNET_SERVICE_GOPHER; - break; - } - + if (!url.nPort) + url.nPort = INTERNET_DEFAULT_GOPHER_PORT; bind->hconnect = InternetConnectW(bind->hinternet, host, url.nPort, user, pass, - dwService, 0, (DWORD_PTR)bind); + INTERNET_SERVICE_GOPHER, 0, (DWORD_PTR)bind); if (!bind->hconnect) { hres = HRESULT_FROM_WIN32(GetLastError()); @@ -612,37 +597,12 @@ static HRESULT URLMonikerImpl_BindToStorage_hack(LPCWSTR URLName, IBindCtx* pbc, hres = IBindStatusCallback_OnProgress(bind->pbscb, 0, 0, BINDSTATUS_CONNECTING, NULL); hres = IBindStatusCallback_OnProgress(bind->pbscb, 0, 0, BINDSTATUS_SENDINGREQUEST, NULL); - bSuccess = FALSE; - - switch (dwService) - { - case INTERNET_SERVICE_GOPHER: - bind->hrequest = GopherOpenFileW(bind->hconnect, - path, - 0, - INTERNET_FLAG_RELOAD, - 0); - if (bind->hrequest) - bSuccess = TRUE; - else - hres = HRESULT_FROM_WIN32(GetLastError()); - break; - - case INTERNET_SERVICE_FTP: - bind->hrequest = FtpOpenFileW(bind->hconnect, - path, - GENERIC_READ, - FTP_TRANSFER_TYPE_BINARY | - INTERNET_FLAG_TRANSFER_BINARY | - INTERNET_FLAG_RELOAD, - 0); - if (bind->hrequest) - bSuccess = TRUE; - else - hres = HRESULT_FROM_WIN32(GetLastError()); - break; - } - if(bSuccess) + bind->hrequest = GopherOpenFileW(bind->hconnect, + path, + 0, + INTERNET_FLAG_RELOAD, + 0); + if (bind->hrequest) { TRACE("res = %d gle = %u url len = %d\n", hres, GetLastError(), bind->expected_size); @@ -660,7 +620,10 @@ static HRESULT URLMonikerImpl_BindToStorage_hack(LPCWSTR URLName, IBindCtx* pbc, } InternetCloseHandle(bind->hrequest); hres = S_OK; + }else { + hres = HRESULT_FROM_WIN32(GetLastError()); } + InternetCloseHandle(bind->hconnect); InternetCloseHandle(bind->hinternet); @@ -704,9 +667,7 @@ static HRESULT WINAPI URLMonikerImpl_BindToStorage(IMoniker* iface, return E_FAIL; } - if(IsEqualGUID(&IID_IStream, riid) && - ( url.nScheme == INTERNET_SCHEME_FTP - || url.nScheme == INTERNET_SCHEME_GOPHER)) + if(IsEqualGUID(&IID_IStream, riid) && url.nScheme == INTERNET_SCHEME_GOPHER) return URLMonikerImpl_BindToStorage_hack(This->URLName, pbc, ppvObject); TRACE("(%p)->(%p %p %s %p)\n", This, pbc, pmkToLeft, debugstr_guid(riid), ppvObject);

1 0

Michael Stefaniuc : taskmgr: Cast to LPARAM the 4th argument passed to SendMessage.
by Alexandre Julliard 03 Mar '09

03 Mar '09

Module: wine Branch: master Commit: 87b15bb9fd1753993d169f610bca579db683667b URL: http://source.winehq.org/git/wine.git/?a=commit;h=87b15bb9fd1753993d169f610… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Mar 2 23:26:51 2009 +0100 taskmgr: Cast to LPARAM the 4th argument passed to SendMessage. Casting to long would truncate the pointers when compiling with MSVC for Win64. --- programs/taskmgr/taskmgr.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/taskmgr/taskmgr.c b/programs/taskmgr/taskmgr.c index 8ba832e..b30ed8e 100644 --- a/programs/taskmgr/taskmgr.c +++ b/programs/taskmgr/taskmgr.c @@ -151,7 +151,7 @@ static BOOL OnCreate(HWND hWnd) nParts[0] = 100; nParts[1] = 210; nParts[2] = 400; - SendMessageW(hStatusWnd, SB_SETPARTS, 3, (long)nParts); + SendMessageW(hStatusWnd, SB_SETPARTS, 3, (LPARAM)nParts); /* Create tab pages */ hTabWnd = GetDlgItem(hWnd, IDC_TAB); @@ -518,7 +518,7 @@ static void TaskManager_OnEnterMenuLoop(HWND hWnd) /* Update the status bar pane sizes */ nParts = -1; - SendMessageW(hStatusWnd, SB_SETPARTS, 1, (long)&nParts); + SendMessageW(hStatusWnd, SB_SETPARTS, 1, (LPARAM)&nParts); bInMenuLoop = TRUE; SendMessageW(hStatusWnd, SB_SETTEXTW, 0, 0); } @@ -538,7 +538,7 @@ static void TaskManager_OnExitMenuLoop(HWND hWnd) nParts[0] = 100; nParts[1] = 210; nParts[2] = rc.right; - SendMessageW(hStatusWnd, SB_SETPARTS, 3, (long)nParts); + SendMessageW(hStatusWnd, SB_SETPARTS, 3, (LPARAM)nParts); SendMessageW(hStatusWnd, SB_SETTEXT, 0, 0); wsprintfW(text, wszCPU_Usage, PerfDataGetProcessorUsage()); SendMessageW(hStatusWnd, SB_SETTEXTW, 1, (LPARAM)text);

1 0

Alexandre Julliard : kernel32: Fix the last error code for timeout in GetQueuedCompletionStatus.
by Alexandre Julliard 03 Mar '09

03 Mar '09

Module: wine Branch: master Commit: c47e32a7ccbe26ff72cf374e4a183fb6ad9f0e7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c47e32a7ccbe26ff72cf374e4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 2 20:35:23 2009 +0100 kernel32: Fix the last error code for timeout in GetQueuedCompletionStatus. --- dlls/kernel32/sync.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index be96633..38002d7 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -2230,7 +2230,8 @@ BOOL WINAPI GetQueuedCompletionStatus( HANDLE CompletionPort, LPDWORD lpNumberOf return TRUE; } - SetLastError( RtlNtStatusToDosError(status) ); + if (status == STATUS_TIMEOUT) SetLastError( WAIT_TIMEOUT ); + else SetLastError( RtlNtStatusToDosError(status) ); return FALSE; }

1 0

Vincent Povirk : kernel32/tests: Add named pipe test using i/ o completion ports.
by Alexandre Julliard 03 Mar '09

03 Mar '09

Module: wine Branch: master Commit: 392537bb338110c838d94e6beff7e916bccd2fe9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=392537bb338110c838d94e6be… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Feb 20 13:39:44 2009 -0600 kernel32/tests: Add named pipe test using i/o completion ports. --- dlls/kernel32/tests/pipe.c | 111 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 111 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 48d9e14..f4c5ad4 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -629,6 +629,112 @@ static DWORD CALLBACK serverThreadMain3(LPVOID arg) return 0; } +/** Trivial byte echo server - uses i/o completion ports */ +static DWORD CALLBACK serverThreadMain4(LPVOID arg) +{ + int i; + HANDLE hcompletion; + + trace("serverThreadMain4\n"); + /* Set up a simple echo server */ + hnp = CreateNamedPipe(PIPENAME "serverThreadMain4", PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED, + PIPE_TYPE_BYTE | PIPE_WAIT, + /* nMaxInstances */ 1, + /* nOutBufSize */ 1024, + /* nInBufSize */ 1024, + /* nDefaultWait */ NMPWAIT_USE_DEFAULT_WAIT, + /* lpSecurityAttrib */ NULL); + ok(hnp != INVALID_HANDLE_VALUE, "CreateNamedPipe failed\n"); + + hcompletion = CreateIoCompletionPort(hnp, NULL, 12345, 1); + ok(hcompletion != NULL, "CreateIoCompletionPort failed, error=%i\n", GetLastError()); + + for (i = 0; i < NB_SERVER_LOOPS; i++) { + char buf[512]; + DWORD written; + DWORD readden; + DWORD dummy; + DWORD success; + OVERLAPPED oConnect; + OVERLAPPED oRead; + OVERLAPPED oWrite; + OVERLAPPED *oResult; + DWORD err; + ULONG_PTR compkey; + + memset(&oConnect, 0, sizeof(oConnect)); + memset(&oRead, 0, sizeof(oRead)); + memset(&oWrite, 0, sizeof(oWrite)); + + /* Wait for client to connect */ + trace("Server calling overlapped ConnectNamedPipe...\n"); + success = ConnectNamedPipe(hnp, &oConnect); + err = GetLastError(); + ok(!success && (err == ERROR_IO_PENDING || err == ERROR_PIPE_CONNECTED) , "overlapped ConnectNamedPipe\n"); + trace("overlapped ConnectNamedPipe returned.\n"); + if (!success && err == ERROR_IO_PENDING) { + trace("ConnectNamedPipe GetQueuedCompletionStatus\n"); + success = GetQueuedCompletionStatus(hcompletion, &dummy, &compkey, &oResult, 0); + if (!success) + { + ok( GetLastError() == WAIT_TIMEOUT, + "ConnectNamedPipe GetQueuedCompletionStatus wrong error %u\n", GetLastError()); + success = GetQueuedCompletionStatus(hcompletion, &dummy, &compkey, &oResult, 10000); + } + ok(success, "ConnectNamedPipe GetQueuedCompletionStatus failed, errno=%i\n", GetLastError()); + if (success) + { + ok(compkey == 12345, "got completion key %i instead of 12345\n", (int)compkey); + ok(oResult == &oConnect, "got overlapped pointer %p instead of %p\n", oResult, &oConnect); + } + } + trace("overlapped ConnectNamedPipe operation complete.\n"); + + /* Echo bytes once */ + memset(buf, 0, sizeof(buf)); + + trace("Server reading...\n"); + success = ReadFile(hnp, buf, sizeof(buf), &readden, &oRead); + trace("Server ReadFile returned...\n"); + err = GetLastError(); + ok(success || err == ERROR_IO_PENDING, "overlapped ReadFile, err=%i\n", err); + success = GetQueuedCompletionStatus(hcompletion, &readden, &compkey, + &oResult, 10000); + ok(success, "ReadFile GetQueuedCompletionStatus failed, errno=%i\n", GetLastError()); + if (success) + { + ok(compkey == 12345, "got completion key %i instead of 12345\n", (int)compkey); + ok(oResult == &oRead, "got overlapped pointer %p instead of %p\n", oResult, &oRead); + } + trace("Server done reading.\n"); + + trace("Server writing...\n"); + success = WriteFile(hnp, buf, readden, &written, &oWrite); + trace("Server WriteFile returned...\n"); + err = GetLastError(); + ok(success || err == ERROR_IO_PENDING, "overlapped WriteFile\n"); + success = GetQueuedCompletionStatus(hcompletion, &written, &compkey, + &oResult, 10000); + ok(success, "WriteFile GetQueuedCompletionStatus failed, errno=%i\n", GetLastError()); + if (success) + { + ok(compkey == 12345, "got completion key %i instead of 12345\n", (int)compkey); + ok(oResult == &oWrite, "got overlapped pointer %p instead of %p\n", oResult, &oWrite); + ok(written == readden, "write file len\n"); + } + trace("Server done writing.\n"); + + /* finish this connection, wait for next one */ + ok(FlushFileBuffers(hnp), "FlushFileBuffers\n"); + ok(DisconnectNamedPipe(hnp), "DisconnectNamedPipe\n"); + } + + ok(CloseHandle(hnp), "CloseHandle named pipe failed, err=%i\n", GetLastError()); + ok(CloseHandle(hcompletion), "CloseHandle completion failed, err=%i\n", GetLastError()); + + return 0; +} + static void exercizeServer(const char *pipename, HANDLE serverThread) { int i; @@ -711,6 +817,11 @@ static void test_NamedPipe_2(void) ok(serverThread != INVALID_HANDLE_VALUE, "CreateThread\n"); exercizeServer(PIPENAME "serverThreadMain3", serverThread); + /* Try server #4 */ + serverThread = CreateThread(NULL, 0, serverThreadMain4, 0, 0, &serverThreadId); + ok(serverThread != INVALID_HANDLE_VALUE, "CreateThread\n"); + exercizeServer(PIPENAME "serverThreadMain4", serverThread); + ok(SetEvent( alarm_event ), "SetEvent\n"); CloseHandle( alarm_event ); trace("test_NamedPipe_2 returning\n");

1 0

Vitaliy Margolen : dinput: Add few special cases for key mappings.
by Alexandre Julliard 03 Mar '09

03 Mar '09

Module: wine Branch: master Commit: 8dac79d38b63372013ac6b4c26e2045e6e4b10b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8dac79d38b63372013ac6b4c2… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Fri Feb 27 09:20:08 2009 -0700 dinput: Add few special cases for key mappings. --- dlls/dinput/keyboard.c | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index f9c689b..de8c63c 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -87,11 +87,17 @@ static int KeyboardCallback( LPDIRECTINPUTDEVICE8A iface, WPARAM wparam, LPARAM TRACE("(%p) %ld,%ld\n", iface, wparam, lparam); - dik_code = map_dik_code(hook->scanCode & 0xff,hook->vkCode); - /* R-Shift is special - it is an extended key with separate scan code */ - if (hook->flags & LLKHF_EXTENDED && dik_code != 0x36) - dik_code |= 0x80; - + switch (hook->vkCode) + { + /* R-Shift is special - it is an extended key with separate scan code */ + case VK_RSHIFT : dik_code = DIK_RSHIFT; break; + case VK_PAUSE : dik_code = DIK_PAUSE; break; + case VK_NUMLOCK : dik_code = DIK_NUMLOCK; break; + case VK_SUBTRACT: dik_code = DIK_SUBTRACT; break; + default: + dik_code = map_dik_code(hook->scanCode & 0xff, hook->vkCode); + if (hook->flags & LLKHF_EXTENDED) dik_code |= 0x80; + } new_diks = hook->flags & LLKHF_UP ? 0 : 0x80; /* returns now if key event already known */

1 0

Francois Gouget : uninstaller: Use DELAYIMPORTS on the GUI dlls to speed up 'uninstaller --list'.
by Alexandre Julliard 03 Mar '09

03 Mar '09

Module: wine Branch: master Commit: 52e415f769e317c802503f293f609ce592e3441a URL: http://source.winehq.org/git/wine.git/?a=commit;h=52e415f769e317c802503f293… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Mar 2 19:26:35 2009 +0100 uninstaller: Use DELAYIMPORTS on the GUI dlls to speed up 'uninstaller --list'. --- programs/uninstaller/Makefile.in | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/programs/uninstaller/Makefile.in b/programs/uninstaller/Makefile.in index 3b151a7..0f7e0e4 100644 --- a/programs/uninstaller/Makefile.in +++ b/programs/uninstaller/Makefile.in @@ -5,7 +5,8 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = uninstaller.exe APPMODE = -mconsole -municode -IMPORTS = shlwapi shell32 user32 gdi32 advapi32 kernel32 +IMPORTS = advapi32 kernel32 +DELAYIMPORTS = shlwapi shell32 user32 gdi32 C_SRCS = \ main.c

1 0

Alexandre Julliard : server: Overlapped named pipes are never blocking, even if no APC was specified.
by Alexandre Julliard 03 Mar '09

03 Mar '09

Module: wine Branch: master Commit: 9dd3fe54675280254508e81ef11c42a95e64f0bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=9dd3fe54675280254508e81ef… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 2 20:33:52 2009 +0100 server: Overlapped named pipes are never blocking, even if no APC was specified. --- server/named_pipe.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/server/named_pipe.c b/server/named_pipe.c index 1651a67..c4d1993 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -605,7 +605,7 @@ static obj_handle_t pipe_server_ioctl( struct fd *fd, ioctl_code_t code, const a { case ps_idle_server: case ps_wait_connect: - if (blocking) + if (blocking && !is_overlapped( get_fd_options(fd) )) { async_data_t new_data = *async_data; if (!(wait_handle = alloc_wait_event( current->process ))) break;

1 0

Alexandre Julliard : server: Make the new named pipe server fd inherit the I/ O completion if it was set before connecting.
by Alexandre Julliard 03 Mar '09

03 Mar '09

Module: wine Branch: master Commit: 50171c5cc1c0c04bdca2fd2aeaa3ba8168c7236f URL: http://source.winehq.org/git/wine.git/?a=commit;h=50171c5cc1c0c04bdca2fd2ae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 2 20:34:39 2009 +0100 server: Make the new named pipe server fd inherit the I/O completion if it was set before connecting. --- server/async.c | 2 +- server/fd.c | 10 ++++++++-- server/file.h | 3 ++- server/named_pipe.c | 1 + 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/server/async.c b/server/async.c index 0a69f7a..91f0c44 100644 --- a/server/async.c +++ b/server/async.c @@ -214,7 +214,7 @@ struct async *create_async( struct thread *thread, struct async_queue *queue, co async->timeout = NULL; async->queue = (struct async_queue *)grab_object( queue ); async->completion = NULL; - if (queue->fd) fd_assign_completion( queue->fd, &async->completion, &async->comp_key ); + if (queue->fd) async->completion = fd_get_completion( queue->fd, &async->comp_key ); list_add_tail( &queue->queue, &async->queue_entry ); grab_object( async ); diff --git a/server/fd.c b/server/fd.c index c8b6f7a..d9688e1 100644 --- a/server/fd.c +++ b/server/fd.c @@ -1940,10 +1940,16 @@ static struct fd *get_handle_fd_obj( struct process *process, obj_handle_t handl return fd; } -void fd_assign_completion( struct fd *fd, struct completion **p_port, apc_param_t *p_key ) +struct completion *fd_get_completion( struct fd *fd, apc_param_t *p_key ) { *p_key = fd->comp_key; - *p_port = fd->completion ? (struct completion *)grab_object( fd->completion ) : NULL; + return fd->completion ? (struct completion *)grab_object( fd->completion ) : NULL; +} + +void fd_copy_completion( struct fd *src, struct fd *dst ) +{ + assert( !dst->completion ); + dst->completion = fd_get_completion( src, &dst->comp_key ); } /* flush a file buffers */ diff --git a/server/file.h b/server/file.h index 0eac537..1aaa284 100644 --- a/server/file.h +++ b/server/file.h @@ -143,7 +143,8 @@ extern void async_set_result( struct object *obj, unsigned int status, extern int async_waiting( struct async_queue *queue ); extern void async_terminate( struct async *async, unsigned int status ); extern void async_wake_up( struct async_queue *queue, unsigned int status ); -extern void fd_assign_completion( struct fd *fd, struct completion **p_port, apc_param_t *p_key ); +extern struct completion *fd_get_completion( struct fd *fd, apc_param_t *p_key ); +extern void fd_copy_completion( struct fd *src, struct fd *dst ); /* access rights that require Unix read permission */ #define FILE_UNIX_READ_ACCESS (FILE_READ_DATA|FILE_READ_ATTRIBUTES|FILE_READ_EA) diff --git a/server/named_pipe.c b/server/named_pipe.c index c4d1993..539509e 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -830,6 +830,7 @@ static struct object *named_pipe_open_file( struct object *obj, unsigned int acc server->fd = create_anonymous_fd( &pipe_server_fd_ops, fds[0], &server->obj, server->options ); if (client->fd && server->fd) { + fd_copy_completion( server->ioctl_fd, server->fd ); if (server->state == ps_wait_open) fd_async_wake_up( server->ioctl_fd, ASYNC_TYPE_WAIT, STATUS_SUCCESS ); set_server_state( server, ps_connected_server );

1 0

Maurilio Genovese : debian squeeze repository
by Jeremy Newman 02 Mar '09

02 Mar '09

Module: website Branch: master Commit: fd6e744f28fb202308c8784c8b8202e5e2249922 URL: http://source.winehq.org/git/website.git/?a=commit;h=fd6e744f28fb202308c878… Author: Maurilio Genovese <repository(a)lamaresh.net> Date: Sat Feb 28 15:29:41 2009 +0100 debian squeeze repository in attachment Maurilio Genovese >From df7599be6f10d02d7d6803a50263801b751790bd Mon Sep 17 00:00:00 2001 From: Maurilio Genovese <repository(a)lamaresh.net> Date: Sat, 28 Feb 2009 15:27:42 +0100 Subject: New Debian Squeeze repository --- templates/en/download.template | 2 +- templates/en/download/deblenny.template | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/en/download.template b/templates/en/download.template index 43d9479..f1fefbb 100644 --- a/templates/en/download.template +++ b/templates/en/download.template @@ -70,7 +70,7 @@ requested in exchange for hosting the Wine web site.</p> <img src="{$root}/images/distro/debian.png" width="50" height="50" alt="Debian Linux" border="0"></a> </td> <td> <b><a href="{$root}/download/deblenny">Debian</a></b> - binary .debs for Debian Etch, Lenny and Sid</td> + binary .debs for Debian Lenny, Squeeze and Sid</td> <td><a href="mailto:repository(a)lamaresh.net">Maurilio Genovese</a><br><a href="mailto:ben.klein(a)lamaresh.net">Ben Klein</a></td> </tr> diff --git a/templates/en/download/deblenny.template b/templates/en/download/deblenny.template index 3c404b5..98a3552 100644 --- a/templates/en/download/deblenny.template +++ b/templates/en/download/deblenny.template @@ -2,7 +2,7 @@  <h1 class="title"><a href="http://www.debian.org/" target="_new"><img src="{$root}/images/distro/debian.png" width="50" height="50" alt="Debian Linux" border="0"></a> -Wine for Debian Etch, Lenny and Sid +Wine for Debian Lenny, Squeeze and Sid <a href="http://www.debian.org/" target="_new"><img src="{$root}/images/distro/debian.png" width="50" height="50" alt="Debian Linux" border="0"></a></h1> <p>Debian-based distributions utilize a special tool for managing packages known as APT. APT is able to automagically install all of the needed dependencies for a software package, as well as keep the package up to date, by scanning what are known as APT repositories. Debian-based distributions have their own repositories of software that include Wine, however we keep our own repository of the latest available beta packages here for download.</p> @@ -22,11 +22,11 @@ Wine for Debian Etch, Lenny and Sid <div style="position:relative;left:20px">Open a terminal</div> <div style="position:relative;left:20px"><i>su</i> <font color="gray">#to log as root</font></div> <div style="position:relative;left:20px"><i>gedit /etc/apt/sources.list</i> <font color="gray">#to open repository file with a text editor (you can use gedit or another)</font></div> -<div style="position:relative;left:20px">Add this line for Etch: <i>deb http://www.lamaresh.net/apt etch main</i></div> <div style="position:relative;left:20px">Add this line for Lenny: <i>deb http://www.lamaresh.net/apt lenny main</i></div> +<div style="position:relative;left:20px">Add this line for Squeeze: <i>deb http://www.lamaresh.net/apt squeeze main</i></div> <div style="position:relative;left:20px">Add this line for Sid: <i>deb http://www.lamaresh.net/apt sid main</i></div> <div style="position:relative;left:20px">Save and close sources.list</div> -<div style="position:relative;left:20px"><i>wget -O - http://www.lamaresh.net/apt/key.gpg | apt-key add</i> <font color="gray">#to add gpg key</font></div> +<div style="position:relative;left:20px"><i>wget -O - http://www.lamaresh.net/apt/key.gpg | apt-key add - </i> <font color="gray">#to add gpg key</font></div> <div style="position:relative;left:20px"><i>apt-get update</i> <font color="gray">#to update package list</font></div> <div style="position:relative;left:20px"><i>apt-get install wine</i> <font color="gray">#to install latest wine version</font></div><p></p> <h2>Method 2: Download .deb and manually install it</h2>

1 0