May 2016 - Wine-commits - list.winehq.org

Jacek Caban : msctf: Added document manager' s AdviseSink and UnadviseSink implementation.
by Alexandre Julliard 05 May '16

05 May '16

Module: wine Branch: master Commit: a9d4b0344b90e090a3a533082b50c7a398994ec9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9d4b0344b90e090a3a533082… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 4 19:42:19 2016 +0200 msctf: Added document manager's AdviseSink and UnadviseSink implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctf/documentmgr.c | 28 +++++++++++++++++++++++++--- dlls/msctf/msctf_internal.h | 2 ++ 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/dlls/msctf/documentmgr.c b/dlls/msctf/documentmgr.c index d9ba057..cf4c601 100644 --- a/dlls/msctf/documentmgr.c +++ b/dlls/msctf/documentmgr.c @@ -50,6 +50,8 @@ typedef struct tagDocumentMgr { ITfContext* contextStack[2]; /* limit of 2 contexts */ ITfThreadMgrEventSink* ThreadMgrSink; + + struct list TransitoryExtensionSink; } DocumentMgr; typedef struct tagEnumTfContext { @@ -89,6 +91,7 @@ static void DocumentMgr_Destructor(DocumentMgr *This) ITfContext_Release(This->contextStack[0]); if (This->contextStack[1]) ITfContext_Release(This->contextStack[1]); + free_sinks(&This->TransitoryExtensionSink); CompartmentMgr_Destructor(This->CompartmentMgr); HeapFree(GetProcessHeap(),0,This); } @@ -298,15 +301,33 @@ static HRESULT WINAPI DocumentMgrSource_AdviseSink(ITfSource *iface, REFIID riid, IUnknown *punk, DWORD *pdwCookie) { DocumentMgr *This = impl_from_ITfSource(iface); - FIXME("STUB:(%p)\n",This); + + TRACE("(%p) %s %p %p\n", This, debugstr_guid(riid), punk, pdwCookie); + + if (!riid || !punk || !pdwCookie) + return E_INVALIDARG; + + if (IsEqualIID(riid, &IID_ITfTransitoryExtensionSink)) + { + WARN("semi-stub for ITfTransitoryExtensionSink: callback won't be used.\n"); + return advise_sink(&This->TransitoryExtensionSink, &IID_ITfTransitoryExtensionSink, + COOKIE_MAGIC_DMSINK, punk, pdwCookie); + } + + FIXME("(%p) Unhandled Sink: %s\n",This,debugstr_guid(riid)); return E_NOTIMPL; } static HRESULT WINAPI DocumentMgrSource_UnadviseSink(ITfSource *iface, DWORD pdwCookie) { DocumentMgr *This = impl_from_ITfSource(iface); - FIXME("STUB:(%p)\n",This); - return E_NOTIMPL; + + TRACE("(%p) %x\n",This,pdwCookie); + + if (get_Cookie_magic(pdwCookie)!=COOKIE_MAGIC_DMSINK) + return E_INVALIDARG; + + return unadvise_sink(pdwCookie); } static const ITfSourceVtbl DocumentMgrSourceVtbl = @@ -330,6 +351,7 @@ HRESULT DocumentMgr_Constructor(ITfThreadMgrEventSink *ThreadMgrSink, ITfDocumen This->ITfSource_iface.lpVtbl = &DocumentMgrSourceVtbl; This->refCount = 1; This->ThreadMgrSink = ThreadMgrSink; + list_init(&This->TransitoryExtensionSink); CompartmentMgr_Constructor((IUnknown*)&This->ITfDocumentMgr_iface, &IID_IUnknown, (IUnknown**)&This->CompartmentMgr); diff --git a/dlls/msctf/msctf_internal.h b/dlls/msctf/msctf_internal.h index 181c4fd..ed42b54 100644 --- a/dlls/msctf/msctf_internal.h +++ b/dlls/msctf/msctf_internal.h @@ -29,6 +29,7 @@ #define COOKIE_MAGIC_IPPSINK 0x0040 #define COOKIE_MAGIC_EDITCOOKIE 0x0050 #define COOKIE_MAGIC_COMPARTMENTSINK 0x0060 +#define COOKIE_MAGIC_DMSINK 0x0070 extern DWORD tlsIndex DECLSPEC_HIDDEN; extern TfClientId processId DECLSPEC_HIDDEN; @@ -75,6 +76,7 @@ typedef struct { ITfCompartmentEventSink *pITfCompartmentEventSink; ITfTextEditSink *pITfTextEditSink; ITfLanguageProfileNotifySink *pITfLanguageProfileNotifySink; + ITfTransitoryExtensionSink *pITfTransitoryExtensionSink; } interfaces; } Sink;

1 0

Jacek Caban : wininet/tests: Added IRD_NO_WAIT flag tests.
by Alexandre Julliard 04 May '16

04 May '16

Module: wine Branch: master Commit: e68e03c72ae3477d2fd47b19c413209bcc322d57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e68e03c72ae3477d2fd47b19c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 4 12:40:03 2016 +0200 wininet/tests: Added IRD_NO_WAIT flag tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/http.c | 178 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 177 insertions(+), 1 deletion(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index b853240..fde2254 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -109,7 +109,7 @@ static int expect[MAX_INTERNET_STATUS], optional[MAX_INTERNET_STATUS], wine_allow[MAX_INTERNET_STATUS], notified[MAX_INTERNET_STATUS]; static const char *status_string[MAX_INTERNET_STATUS]; -static HANDLE hCompleteEvent, conn_close_event, conn_wait_event; +static HANDLE hCompleteEvent, conn_close_event, conn_wait_event, server_req_rec_event; static DWORD req_error; #define TESTF_REDIRECT 0x01 @@ -2029,6 +2029,7 @@ struct server_info { static int test_cache_gzip; static const char *send_buffer; +static int server_socket; static DWORD CALLBACK server_thread(LPVOID param) { @@ -2367,6 +2368,12 @@ static DWORD CALLBACK server_thread(LPVOID param) WaitForSingleObject(conn_wait_event, INFINITE); send(c, page1_mid, page1_end - page1_mid, 0); } + if (strstr(buffer, "/socket")) + { + server_socket = c; + SetEvent(server_req_rec_event); + WaitForSingleObject(conn_wait_event, INFINITE); + } shutdown(c, 2); closesocket(c); c = -1; @@ -4626,6 +4633,174 @@ static void test_async_read(int port) CloseHandle( conn_wait_event ); } +typedef struct { + HINTERNET session; + HINTERNET connection; + HINTERNET request; +} test_request_t; + +static void server_send_string(const char *msg) +{ + send(server_socket, msg, strlen(msg), 0); +} + +static void WINAPI readex_callback(HINTERNET handle, DWORD_PTR context, DWORD status, void *info, DWORD info_size) +{ + switch(status) { + case INTERNET_STATUS_RECEIVING_RESPONSE: + case INTERNET_STATUS_RESPONSE_RECEIVED: + break; + default: + callback(handle, context, status, info, info_size); + } +} + +static void open_read_test_request(int port, test_request_t *req, const char *response) +{ + BOOL ret; + + req->session = InternetOpenA("winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, INTERNET_FLAG_ASYNC); + ok(req->session != NULL, "InternetOpenA failed\n"); + pInternetSetStatusCallbackA(req->session, readex_callback); + + SET_EXPECT(INTERNET_STATUS_HANDLE_CREATED); + req->connection = InternetConnectA(req->session, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0xdeadbeef); + ok(req->connection != NULL, "InternetConnectA failed %u\n", GetLastError()); + CHECK_NOTIFIED(INTERNET_STATUS_HANDLE_CREATED ); + + SET_EXPECT(INTERNET_STATUS_HANDLE_CREATED); + req->request = HttpOpenRequestA(req->connection, "GET", "/socket", NULL, NULL, NULL, INTERNET_FLAG_RELOAD, 0xdeadbeef); + ok(req->request != NULL, "HttpOpenRequestA failed %u\n", GetLastError()); + CHECK_NOTIFIED( INTERNET_STATUS_HANDLE_CREATED ); + + SET_OPTIONAL(INTERNET_STATUS_COOKIE_SENT); + SET_OPTIONAL(INTERNET_STATUS_DETECTING_PROXY); + SET_EXPECT(INTERNET_STATUS_CONNECTING_TO_SERVER); + SET_EXPECT(INTERNET_STATUS_CONNECTED_TO_SERVER); + SET_EXPECT(INTERNET_STATUS_SENDING_REQUEST); + SET_EXPECT(INTERNET_STATUS_REQUEST_SENT); + + SetLastError(0xdeadbeef); + ret = HttpSendRequestA(req->request, NULL, 0, NULL, 0); + ok(!ret, "HttpSendRequestA unexpectedly succeeded\n"); + ok(GetLastError() == ERROR_IO_PENDING, "expected ERROR_IO_PENDING, got %u\n", GetLastError()); + ok(req_error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", req_error); + + WaitForSingleObject(server_req_rec_event, INFINITE); + + CLEAR_NOTIFIED(INTERNET_STATUS_COOKIE_SENT); + CLEAR_NOTIFIED(INTERNET_STATUS_DETECTING_PROXY); + CHECK_NOTIFIED(INTERNET_STATUS_CONNECTING_TO_SERVER); + CHECK_NOTIFIED(INTERNET_STATUS_CONNECTED_TO_SERVER); + CHECK_NOTIFIED(INTERNET_STATUS_SENDING_REQUEST); + + SET_EXPECT(INTERNET_STATUS_REQUEST_COMPLETE); + + server_send_string(response); + WaitForSingleObject(hCompleteEvent, INFINITE); + + CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_SENT); + CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_COMPLETE); +} + +#define readex_expect_sync_data(a,b,c,d,e) _readex_expect_sync_data(__LINE__,a,b,c,d,e) +static void _readex_expect_sync_data(unsigned line, HINTERNET req, DWORD flags, INTERNET_BUFFERSW *buf, + DWORD buf_size, const char *exdata) +{ + DWORD len = strlen(exdata); + BOOL ret; + + SET_EXPECT(INTERNET_STATUS_REQUEST_COMPLETE); + + memset(buf->lpvBuffer, 0xff, buf_size); + buf->dwBufferLength = buf_size; + ret = InternetReadFileExW(req, buf, flags, 0xdeadbeef); + ok_(__FILE__,line)(ret, "InternetReadFileExW failed: %u\n", GetLastError()); + ok_(__FILE__,line)(buf->dwBufferLength == len, "dwBufferLength = %u, expected %u\n", buf->dwBufferLength, len); + if(len) + ok_(__FILE__,line)(!memcmp(buf->lpvBuffer, exdata, len), "Unexpected data\n"); + + CLEAR_NOTIFIED(INTERNET_STATUS_REQUEST_COMPLETE); +} + +static void send_response_and_wait(const char *response, BOOL close_connection, INTERNET_BUFFERSW *buf) +{ + DWORD orig_size = buf->dwBufferLength; + + SET_EXPECT(INTERNET_STATUS_REQUEST_COMPLETE); + + if(response) + server_send_string(response); + + if(close_connection) { + char c; + SetEvent(conn_wait_event); + recv(server_socket, &c, 1, 0); + } + + WaitForSingleObject(hCompleteEvent, INFINITE); + + CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_COMPLETE); + + /* If IRF_NO_WAIT is used, buffer is not changed. */ + ok(buf->dwBufferLength == orig_size, "dwBufferLength = %u\n", buf->dwBufferLength); + ok(!*(int*)buf->lpvBuffer, "buffer data changed\n"); +} + +static void readex_expect_async(HINTERNET req, DWORD flags, INTERNET_BUFFERSW *buf, DWORD buf_size) +{ + BOOL ret; + + memset(buf->lpvBuffer, 0, buf_size); + buf->dwBufferLength = buf_size; + ret = InternetReadFileExW(req, buf, flags, 0xdeadbeef); + ok(!ret && GetLastError() == ERROR_IO_PENDING, "InternetReadFileExW returned %x (%u)\n", ret, GetLastError()); + ok(buf->dwBufferLength == buf_size, "dwBufferLength = %u, expected %u\n", buf->dwBufferLength, buf_size); + ok(!*(int*)buf->lpvBuffer, "buffer data changed\n"); +} + +static void test_http_read(int port) +{ + INTERNET_BUFFERSW ib; + test_request_t req; + char buf[4096]; + + hCompleteEvent = CreateEventW(NULL, FALSE, FALSE, NULL); + conn_wait_event = CreateEventW(NULL, FALSE, FALSE, NULL); + server_req_rec_event = CreateEventW(NULL, FALSE, FALSE, NULL); + + trace("Testing InternetReadFileExW with IRF_NO_WAIT flag...\n"); + + open_read_test_request(port, &req, + "HTTP/1.1 200 OK\r\n" + "Server: winetest\r\n" + "\r\n" + "xx"); + + memset(&ib, 0, sizeof(ib)); + ib.dwStructSize = sizeof(ib); + ib.lpvBuffer = buf; + + readex_expect_sync_data(req.request, IRF_NO_WAIT, &ib, sizeof(buf), "xx"); + + readex_expect_async(req.request, IRF_NO_WAIT, &ib, sizeof(buf)); + send_response_and_wait("1234567890", FALSE, &ib); + readex_expect_sync_data(req.request, IRF_NO_WAIT, &ib, 5, "12345"); + readex_expect_sync_data(req.request, IRF_NO_WAIT, &ib, sizeof(buf), "67890"); + + readex_expect_async(req.request, IRF_NO_WAIT, &ib, sizeof(buf)); + send_response_and_wait("12345", TRUE, &ib); + + readex_expect_sync_data(req.request, IRF_NO_WAIT, &ib, sizeof(buf), "12345"); + readex_expect_sync_data(req.request, IRF_NO_WAIT, &ib, sizeof(buf), ""); + + close_async_handle(req.session, hCompleteEvent, 2); + + CloseHandle(hCompleteEvent); + CloseHandle(conn_wait_event); + CloseHandle(server_req_rec_event); +} + static void test_http_connection(void) { struct server_info si; @@ -4676,6 +4851,7 @@ static void test_http_connection(void) test_accept_encoding(si.port); test_basic_auth_credentials_reuse(si.port); test_async_read(si.port); + test_http_read(si.port); /* send the basic request again to shutdown the server thread */ test_basic_request(si.port, "GET", "/quit");

1 0

Alex Henrie : ole32: Fix memory leak in FileMonikerImpl_ComposeWith.
by Alexandre Julliard 04 May '16

04 May '16

Module: wine Branch: master Commit: 776eebe80b9322325af44ccc6d743ba918d92b4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=776eebe80b9322325af44ccc6… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon May 2 19:00:05 2016 -0600 ole32: Fix memory leak in FileMonikerImpl_ComposeWith. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/filemoniker.c | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/ole32/filemoniker.c b/dlls/ole32/filemoniker.c index 9586be9..3cd7da4 100644 --- a/dlls/ole32/filemoniker.c +++ b/dlls/ole32/filemoniker.c @@ -694,39 +694,39 @@ FileMonikerImpl_ComposeWith(IMoniker* iface, IMoniker* pmkRight, lastIdx2=FileMonikerImpl_DecomposePath(str2,&strDec2)-1; if ((lastIdx1==-1 && lastIdx2>-1)||(lastIdx1==1 && lstrcmpW(strDec1[0],twoPoint)==0)) - return MK_E_SYNTAX; - - if(lstrcmpW(strDec1[lastIdx1],bkSlash)==0) - lastIdx1--; + res = MK_E_SYNTAX; + else{ + if(lstrcmpW(strDec1[lastIdx1],bkSlash)==0) + lastIdx1--; - /* for etch "..\" in the left of str2 remove the right element from str1 */ - for(i=0; ( (lastIdx1>=0) && (strDec2[i]!=NULL) && (lstrcmpW(strDec2[i],twoPoint)==0) ) ;i+=2){ + /* for each "..\" in the left of str2 remove the right element from str1 */ + for(i=0; ( (lastIdx1>=0) && (strDec2[i]!=NULL) && (lstrcmpW(strDec2[i],twoPoint)==0) ); i+=2){ - lastIdx1-=2; - } + lastIdx1-=2; + } - /* the length of the composed path string is raised by the sum of the two paths lengths */ - newStr=HeapAlloc(GetProcessHeap(),0,sizeof(WCHAR)*(lstrlenW(str1)+lstrlenW(str2)+1)); + /* the length of the composed path string is increased by the sum of the two paths' lengths */ + newStr=HeapAlloc(GetProcessHeap(),0,sizeof(WCHAR)*(lstrlenW(str1)+lstrlenW(str2)+1)); - if (newStr) - { - /* new path is the concatenation of the rest of str1 and str2 */ - for(*newStr=0,j=0;j<=lastIdx1;j++) - strcatW(newStr,strDec1[j]); + if (newStr){ + /* new path is the concatenation of the rest of str1 and str2 */ + for(*newStr=0,j=0;j<=lastIdx1;j++) + strcatW(newStr,strDec1[j]); - if ((strDec2[i]==NULL && lastIdx1>-1 && lastIdx2>-1) || lstrcmpW(strDec2[i],bkSlash)!=0) - strcatW(newStr,bkSlash); + if ((strDec2[i]==NULL && lastIdx1>-1 && lastIdx2>-1) || lstrcmpW(strDec2[i],bkSlash)!=0) + strcatW(newStr,bkSlash); - for(j=i;j<=lastIdx2;j++) - strcatW(newStr,strDec2[j]); + for(j=i;j<=lastIdx2;j++) + strcatW(newStr,strDec2[j]); - /* create a new moniker with the new string */ - res=CreateFileMoniker(newStr,ppmkComposite); + /* create a new moniker with the new string */ + res=CreateFileMoniker(newStr,ppmkComposite); - /* free all strings space memory used by this function */ - HeapFree(GetProcessHeap(),0,newStr); + /* free string memory used by this function */ + HeapFree(GetProcessHeap(),0,newStr); + } + else res = E_OUTOFMEMORY; } - else res = E_OUTOFMEMORY; free_stringtable(strDec1); free_stringtable(strDec2);

1 0

Michael Stefaniuc : user32: Use IsRectEmpty() instead of open coding it.
by Alexandre Julliard 04 May '16

04 May '16

Module: wine Branch: master Commit: 21e3de63deb163914b4547c28f92c23e9354b329 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21e3de63deb163914b4547c28… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue May 3 21:46:00 2016 +0200 user32: Use IsRectEmpty() instead of open coding it. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/uitools.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/uitools.c b/dlls/user32/uitools.c index 1afb1c89..68c3c8e 100644 --- a/dlls/user32/uitools.c +++ b/dlls/user32/uitools.c @@ -1483,7 +1483,7 @@ INT WINAPI FrameRect( HDC hdc, const RECT *rect, HBRUSH hbrush ) HBRUSH prevBrush; RECT r = *rect; - if ( (r.right <= r.left) || (r.bottom <= r.top) ) return 0; + if (IsRectEmpty(&r)) return 0; if (!(prevBrush = SelectObject( hdc, hbrush ))) return 0; PatBlt( hdc, r.left, r.top, 1, r.bottom - r.top, PATCOPY );

1 0

André Hentschel : msvcrt/tests: Don' t test function directly when reporting errno.
by Alexandre Julliard 04 May '16

04 May '16

Module: wine Branch: master Commit: a313c9b7f931363ed603f2dee4e58e6f8b57fb9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a313c9b7f931363ed603f2dee… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue May 3 19:03:14 2016 +0200 msvcrt/tests: Don't test function directly when reporting errno. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/file.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 42ec34b..9e2beee 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -2349,7 +2349,8 @@ static void test_close(void) (HANDLE)_get_osfhandle(fd1), h); ok((HANDLE)_get_osfhandle(fd2) == h, "handles mismatch (%p != %p)\n", (HANDLE)_get_osfhandle(fd2), h); - ok(!close(fd1), "close(fd1) failed (%d)\n", errno); + ret1 = close(fd1); + ok(!ret1, "close(fd1) failed (%d)\n", errno); ok(!GetHandleInformation(h, &flags), "GetHandleInformation succeeded\n"); ok(close(fd2), "close(fd2) succeeded\n");

1 0

Charles Davis : winemac.drv: Move create_bitmap_from_dib() above the import/export functions.
by Alexandre Julliard 04 May '16

04 May '16

Module: wine Branch: master Commit: 1dcf51f0fc7ca1a0da3569d41c706fb983f9d579 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1dcf51f0fc7ca1a0da3569d41… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Tue May 3 12:03:24 2016 -0700 winemac.drv: Move create_bitmap_from_dib() above the import/export functions. Signed-off-by: Charles Davis <cdavis5x(a)gmail.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/clipboard.c | 60 ++++++++++++++++++++++---------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index 188d4e2..2082cad 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -616,6 +616,36 @@ static HGLOBAL create_dib_from_bitmap(HBITMAP hBmp) /************************************************************************** + * create_bitmap_from_dib + * + * Given a packed DIB, creates a bitmap object from it. + */ +static HANDLE create_bitmap_from_dib(HANDLE dib) +{ + HANDLE ret = 0; + BITMAPINFO *bmi; + + if (dib && (bmi = GlobalLock(dib))) + { + HDC hdc; + unsigned int offset; + + hdc = GetDC(NULL); + + offset = bitmap_info_size(bmi, DIB_RGB_COLORS); + + ret = CreateDIBitmap(hdc, &bmi->bmiHeader, CBM_INIT, (LPBYTE)bmi + offset, + bmi, DIB_RGB_COLORS); + + GlobalUnlock(dib); + ReleaseDC(NULL, hdc); + } + + return ret; +} + + +/************************************************************************** * import_clipboard_data * * Generic import clipboard data routine. @@ -651,36 +681,6 @@ static HANDLE import_clipboard_data(CFDataRef data) /************************************************************************** - * create_bitmap_from_dib - * - * Given a packed DIB, creates a bitmap object from it. - */ -static HANDLE create_bitmap_from_dib(HANDLE dib) -{ - HANDLE ret = 0; - BITMAPINFO *bmi; - - if (dib && (bmi = GlobalLock(dib))) - { - HDC hdc; - unsigned int offset; - - hdc = GetDC(NULL); - - offset = bitmap_info_size(bmi, DIB_RGB_COLORS); - - ret = CreateDIBitmap(hdc, &bmi->bmiHeader, CBM_INIT, (LPBYTE)bmi + offset, - bmi, DIB_RGB_COLORS); - - GlobalUnlock(dib); - ReleaseDC(NULL, hdc); - } - - return ret; -} - - -/************************************************************************** * import_bmp_to_bitmap * * Import BMP data, converting to CF_BITMAP format.

1 0

Piotr Caban : msvcp90: Allocate facetvec of size at least 40 in locale:: _Locimp::_Locimp_Addfac.
by Alexandre Julliard 04 May '16

04 May '16

Module: wine Branch: master Commit: a8399b38724b674fd0920ea8c9095df123e04ac6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8399b38724b674fd0920ea8c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 4 14:29:35 2016 +0200 msvcp90: Allocate facetvec of size at least 40 in locale::_Locimp::_Locimp_Addfac. Matlab depends on facetvec internal buffer not being reallocated. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/locale.c | 4 ++-- dlls/msvcp90/tests/misc.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index d0fbee0..24cacc7 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -10204,8 +10204,8 @@ void __cdecl locale__Locimp__Locimp_Addfac(locale__Locimp *locimp, locale_facet MSVCP_size_t new_size = id+1; locale_facet **new_facetvec; - if(new_size < locale_id__Id_cnt+1) - new_size = locale_id__Id_cnt+1; + if(new_size < 40) + new_size = 40; new_facetvec = MSVCRT_operator_new(sizeof(locale_facet*)*new_size); if(!new_facetvec) { diff --git a/dlls/msvcp90/tests/misc.c b/dlls/msvcp90/tests/misc.c index 34d6090..2c61bcc 100644 --- a/dlls/msvcp90/tests/misc.c +++ b/dlls/msvcp90/tests/misc.c @@ -81,6 +81,22 @@ typedef struct { float imag; } complex_float; +typedef struct { + void *vtable; + size_t refs; +} locale_facet; + +typedef unsigned char MSVCP_bool; + +typedef struct _locale__Locimp { + locale_facet facet; + locale_facet **facetvec; + size_t facet_cnt; + int catmask; + MSVCP_bool transparent; + basic_string_char name; +} locale__Locimp; + static void* (__cdecl *p_set_invalid_parameter_handler)(void*); static _locale_t (__cdecl *p__get_current_locale)(void); static void (__cdecl *p__free_locale)(_locale_t); @@ -102,6 +118,7 @@ static MSVCP__Ctypevec* (__cdecl *p__Getctype)(MSVCP__Ctypevec*); static /*MSVCP__Collvec*/ULONGLONG (__cdecl *p__Getcoll)(void); static wctrans_t (__cdecl *p_wctrans)(const char*); static wint_t (__cdecl *p_towctrans)(wint_t, wctrans_t); +static void (__cdecl *p_locale__Locimp__Locimp_Addfac)(locale__Locimp*,locale_facet*,size_t); #undef __thiscall #ifdef __i386__ @@ -250,6 +267,8 @@ static BOOL init(void) SET(p_std_Ctraits_long_double__Isnan, "?_Isnan@?$_Ctraits(a)O@std@@SA_NO(a)Z"); if(sizeof(void*) == 8) { /* 64-bit initialization */ + SET(p_locale__Locimp__Locimp_Addfac, + "?_Locimp_Addfac(a)_Locimp@locale(a)std@@CAXPEAV123(a)PEAVfacet@23(a)_K@Z"); SET(p_char_assign, "?assign@?$char_traits(a)D@std@@SAXAEADAEBD(a)Z"); SET(p_wchar_assign, "?assign@?$char_traits(a)_W@std@@SAXAEA_WAEB_W(a)Z"); SET(p_short_assign, "?assign@?$char_traits(a)G@std@@SAXAEAGAEBG(a)Z"); @@ -310,6 +329,8 @@ static BOOL init(void) SET(p_complex_float_pow_cf, "??$pow(a)M@std@@YA?AV?$complex(a)M@0(a)AEBV10@AEBM(a)Z"); } else { + SET(p_locale__Locimp__Locimp_Addfac, + "?_Locimp_Addfac(a)_Locimp@locale(a)std@@CAXPAV123(a)PAVfacet@23(a)I@Z"); #ifdef __arm__ SET(p_char_assign, "?assign@?$char_traits(a)D@std@@SAXAADABD(a)Z"); SET(p_wchar_assign, "?assign@?$char_traits(a)_W@std@@SAXAA_WAB_W(a)Z"); @@ -1050,6 +1071,19 @@ static void test_vbtable_size_exports(void) } } + + +static void test_locale__Locimp__Locimp_Addfac(void) +{ + locale__Locimp locimp; + locale_facet facet; + + memset(&locimp, 0, sizeof(locimp)); + memset(&facet, 0, sizeof(facet)); + p_locale__Locimp__Locimp_Addfac(&locimp, &facet, 1); + ok(locimp.facet_cnt == 40, "locimp.facet_cnt = %d\n", (int)locimp.facet_cnt); +} + START_TEST(misc) { if(!init()) @@ -1068,6 +1102,7 @@ START_TEST(misc) test_Ctraits_math_functions(); test_complex(); test_vbtable_size_exports(); + test_locale__Locimp__Locimp_Addfac(); ok(!invalid_parameter, "invalid_parameter_handler was invoked too many times\n");

1 0

Piotr Caban : msvcr100: Add missing fields to lconv structure.
by Alexandre Julliard 04 May '16

04 May '16

Module: wine Branch: master Commit: de12cd580a49f00fd77fa84972d537cca64f3db5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de12cd580a49f00fd77fa8497… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 4 14:29:50 2016 +0200 msvcr100: Add missing fields to lconv structure. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/locale.c | 16 ++++++++-------- dlls/msvcrt/msvcrt.h | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index a1551c2..eed5a37 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -769,7 +769,7 @@ void free_locinfo(MSVCRT_pthreadlocinfo locinfo) MSVCRT_free(locinfo->lconv->mon_grouping); MSVCRT_free(locinfo->lconv->positive_sign); MSVCRT_free(locinfo->lconv->negative_sign); -#if _MSVCR_VER >= 120 +#if _MSVCR_VER >= 100 MSVCRT_free(locinfo->lconv->_W_decimal_point); MSVCRT_free(locinfo->lconv->_W_thousands_sep); MSVCRT_free(locinfo->lconv->_W_int_curr_symbol); @@ -908,7 +908,7 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category, LCID lcid[6] = { 0 }, lcid_tmp; unsigned short cp[6] = { 0 }; char buf[256]; -#if _MSVCR_VER >= 120 +#if _MSVCR_VER >= 100 MSVCRT_wchar_t wbuf[256]; #endif int i, ret, size; @@ -1262,7 +1262,7 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category, return NULL; } -#if _MSVCR_VER >= 120 +#if _MSVCR_VER >= 100 i = GetLocaleInfoW(lcid[MSVCRT_LC_MONETARY], LOCALE_SINTLSYMBOL |LOCALE_NOUSEROVERRIDE, wbuf, 256); if(i && (locinfo->lconv->_W_int_curr_symbol = MSVCRT_malloc(i * sizeof(MSVCRT_wchar_t)))) @@ -1355,7 +1355,7 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category, locinfo->lconv->p_sign_posn = 127; locinfo->lconv->n_sign_posn = 127; -#if _MSVCR_VER >= 120 +#if _MSVCR_VER >= 100 locinfo->lconv->_W_int_curr_symbol = MSVCRT_malloc(sizeof(MSVCRT_wchar_t)); locinfo->lconv->_W_currency_symbol = MSVCRT_malloc(sizeof(MSVCRT_wchar_t)); locinfo->lconv->_W_mon_decimal_point = MSVCRT_malloc(sizeof(MSVCRT_wchar_t)); @@ -1436,7 +1436,7 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category, return NULL; } -#if _MSVCR_VER >= 120 +#if _MSVCR_VER >= 100 i = GetLocaleInfoW(lcid[MSVCRT_LC_NUMERIC], LOCALE_SDECIMAL |LOCALE_NOUSEROVERRIDE, wbuf, 256); if(i && (locinfo->lconv->_W_decimal_point = MSVCRT_malloc(i * sizeof(MSVCRT_wchar_t)))) @@ -1475,7 +1475,7 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category, locinfo->lconv->thousands_sep[0] = '\0'; locinfo->lconv->grouping[0] = '\0'; -#if _MSVCR_VER >= 120 +#if _MSVCR_VER >= 100 locinfo->lconv->_W_decimal_point = MSVCRT_malloc(sizeof(MSVCRT_wchar_t[2])); locinfo->lconv->_W_thousands_sep = MSVCRT_malloc(sizeof(MSVCRT_wchar_t)); @@ -1719,7 +1719,7 @@ char* CDECL MSVCRT_setlocale(int category, const char* locale) swap_pointers((void**)&locinfo->lconv->negative_sign, (void**)&newlocinfo->lconv->negative_sign); -#if _MSVCR_VER >= 120 +#if _MSVCR_VER >= 100 swap_pointers((void**)&locinfo->lconv->_W_int_curr_symbol, (void**)&newlocinfo->lconv->_W_int_curr_symbol); swap_pointers((void**)&locinfo->lconv->_W_currency_symbol, @@ -1767,7 +1767,7 @@ char* CDECL MSVCRT_setlocale(int category, const char* locale) swap_pointers((void**)&locinfo->lconv->grouping, (void**)&newlocinfo->lconv->grouping); -#if _MSVCR_VER >= 120 +#if _MSVCR_VER >= 100 swap_pointers((void**)&locinfo->lconv->_W_decimal_point, (void**)&newlocinfo->lconv->_W_decimal_point); swap_pointers((void**)&locinfo->lconv->_W_thousands_sep, diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 5c26866..2d3fc94 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -410,7 +410,7 @@ struct MSVCRT_lconv { char n_sep_by_space; char p_sign_posn; char n_sign_posn; -#if _MSVCR_VER >= 120 +#if _MSVCR_VER >= 100 MSVCRT_wchar_t* _W_decimal_point; MSVCRT_wchar_t* _W_thousands_sep; MSVCRT_wchar_t* _W_int_curr_symbol;

1 0

Jacek Caban : msctf: Improved ITfKeystrokeMgr:: TestKeyUp and TestKeyDown stubs.
by Alexandre Julliard 04 May '16

04 May '16

Module: wine Branch: master Commit: dfebe8cb6399018fe1c689bade1e533f115ed4de URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfebe8cb6399018fe1c689bad… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 4 13:31:48 2016 +0200 msctf: Improved ITfKeystrokeMgr::TestKeyUp and TestKeyDown stubs. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctf/threadmgr.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/msctf/threadmgr.c b/dlls/msctf/threadmgr.c index 1e0ec4d..ac47545 100644 --- a/dlls/msctf/threadmgr.c +++ b/dlls/msctf/threadmgr.c @@ -832,7 +832,8 @@ static HRESULT WINAPI KeystrokeMgr_TestKeyDown(ITfKeystrokeMgr *iface, { ThreadMgr *This = impl_from_ITfKeystrokeMgr(iface); FIXME("STUB:(%p)\n",This); - return E_NOTIMPL; + *pfEaten = FALSE; + return S_OK; } static HRESULT WINAPI KeystrokeMgr_TestKeyUp(ITfKeystrokeMgr *iface, @@ -840,7 +841,8 @@ static HRESULT WINAPI KeystrokeMgr_TestKeyUp(ITfKeystrokeMgr *iface, { ThreadMgr *This = impl_from_ITfKeystrokeMgr(iface); FIXME("STUB:(%p)\n",This); - return E_NOTIMPL; + *pfEaten = FALSE; + return S_OK; } static HRESULT WINAPI KeystrokeMgr_KeyDown(ITfKeystrokeMgr *iface,

1 0

Jacek Caban : mshtml: Fixed GetNextDispID for the case when the first dynamic property is deleted.
by Alexandre Julliard 04 May '16

04 May '16

Module: wine Branch: master Commit: 6dd6c76299f02a311e37d20a4cef3a0f917f7076 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6dd6c76299f02a311e37d20a4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 4 15:21:49 2016 +0200 mshtml: Fixed GetNextDispID for the case when the first dynamic property is deleted. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/dispex.c | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 90e5c72..502affb 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -1601,6 +1601,20 @@ static HRESULT WINAPI DispatchEx_GetMemberName(IDispatchEx *iface, DISPID id, BS return S_OK; } +static HRESULT next_dynamic_id(DispatchEx *dispex, DWORD idx, DISPID *ret_id) +{ + while(idx < dispex->dynamic_data->prop_cnt && dispex->dynamic_data->props[idx].flags & DYNPROP_DELETED) + idx++; + + if(idx == dispex->dynamic_data->prop_cnt) { + *ret_id = DISPID_STARTENUM; + return S_FALSE; + } + + *ret_id = DISPID_DYNPROP_0+idx; + return S_OK; +} + static HRESULT WINAPI DispatchEx_GetNextDispID(IDispatchEx *iface, DWORD grfdex, DISPID id, DISPID *pid) { DispatchEx *This = impl_from_IDispatchEx(iface); @@ -1616,15 +1630,7 @@ static HRESULT WINAPI DispatchEx_GetNextDispID(IDispatchEx *iface, DWORD grfdex, if(!get_dynamic_data(This) || This->dynamic_data->prop_cnt <= idx) return DISP_E_UNKNOWNNAME; - while(++idx < This->dynamic_data->prop_cnt && This->dynamic_data->props[idx].flags & DYNPROP_DELETED); - - if(idx == This->dynamic_data->prop_cnt) { - *pid = DISPID_STARTENUM; - return S_FALSE; - } - - *pid = DISPID_DYNPROP_0+idx; - return S_OK; + return next_dynamic_id(This, idx+1, pid); } data = get_dispex_data(This); @@ -1649,10 +1655,8 @@ static HRESULT WINAPI DispatchEx_GetNextDispID(IDispatchEx *iface, DWORD grfdex, func++; } - if(get_dynamic_data(This) && This->dynamic_data->prop_cnt) { - *pid = DISPID_DYNPROP_0; - return S_OK; - } + if(get_dynamic_data(This) && This->dynamic_data->prop_cnt) + return next_dynamic_id(This, 0, pid); *pid = DISPID_STARTENUM; return S_FALSE;

1 0