December 2015 - Wine-Commits

Jacek Caban : mshtml: Added nsIChannel::Cancel implementation.
by Alexandre Julliard Dec. 21, 2015

Dec. 21, 2015

Module: wine Branch: master Commit: 86c097142bdc66bccab7dc5fd7b44a7bc86e43d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86c097142bdc66bccab7dc5fd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 21 14:31:29 2015 +0100 mshtml: Added nsIChannel::Cancel implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/binding.h | 2 ++ dlls/mshtml/navigate.c | 21 +++++++++++++++------ dlls/mshtml/nsio.c | 8 ++++++-- 3 files changed, 23 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/binding.h b/dlls/mshtml/binding.h index e173431..3a4e06b 100644 --- a/dlls/mshtml/binding.h +++ b/dlls/mshtml/binding.h @@ -55,6 +55,8 @@ typedef struct { REQUEST_METHOD request_method; struct list response_headers; struct list request_headers; + + nsChannelBSC *binding; } nsChannel; typedef struct { diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index ed61ab0..1854a70 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -927,6 +927,8 @@ static HRESULT on_start_nsrequest(nsChannelBSC *This) { nsresult nsres; + This->nschannel->binding = This; + /* FIXME: it's needed for http connections from BindToObject. */ if(!This->nschannel->response_status) This->nschannel->response_status = 200; @@ -972,11 +974,15 @@ static void on_stop_nsrequest(nsChannelBSC *This, HRESULT result) WARN("OnStopRequest failed: %08x\n", nsres); } - if(This->nschannel && This->nschannel->load_group) { - nsres = nsILoadGroup_RemoveRequest(This->nschannel->load_group, - (nsIRequest*)&This->nschannel->nsIHttpChannel_iface, NULL, request_result); - if(NS_FAILED(nsres)) - ERR("RemoveRequest failed: %08x\n", nsres); + if(This->nschannel) { + if(This->nschannel->load_group) { + nsres = nsILoadGroup_RemoveRequest(This->nschannel->load_group, + (nsIRequest*)&This->nschannel->nsIHttpChannel_iface, NULL, request_result); + if(NS_FAILED(nsres)) + ERR("RemoveRequest failed: %08x\n", nsres); + } + if(This->nschannel->binding == This) + This->nschannel->binding = NULL; } } @@ -1217,8 +1223,11 @@ static void nsChannelBSC_destroy(BSCallback *bsc) { nsChannelBSC *This = nsChannelBSC_from_BSCallback(bsc); - if(This->nschannel) + if(This->nschannel) { + if(This->nschannel->binding == This) + This->nschannel->binding = NULL; nsIHttpChannel_Release(&This->nschannel->nsIHttpChannel_iface); + } if(This->nslistener) nsIStreamListener_Release(This->nslistener); if(This->nscontext) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index a2615c4..a5a1ffd 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -617,9 +617,13 @@ static nsresult NSAPI nsChannel_Cancel(nsIHttpChannel *iface, nsresult aStatus) { nsChannel *This = impl_from_nsIHttpChannel(iface); - FIXME("(%p)->(%08x)\n", This, aStatus); + TRACE("(%p)->(%08x)\n", This, aStatus); - return NS_ERROR_NOT_IMPLEMENTED; + if(This->binding && This->binding->bsc.binding) + IBinding_Abort(This->binding->bsc.binding); + else + WARN("No binding to cancel\n"); + return NS_OK; } static nsresult NSAPI nsChannel_Suspend(nsIHttpChannel *iface)

1 0

Jactry Zeng : riched20/tests: Test EM_LINELENGTH with multibyte character.
by Alexandre Julliard Dec. 21, 2015

Dec. 21, 2015

Module: wine Branch: master Commit: 99f0f6b91b981407b9f18c8b499f339dcf76f5a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99f0f6b91b981407b9f18c8b4… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Mon Dec 21 21:00:28 2015 +0800 riched20/tests: Test EM_LINELENGTH with multibyte character. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/tests/editor.c | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index efa0b29..6c4195c 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -46,6 +46,7 @@ static CHAR string1[MAX_PATH], string2[MAX_PATH], string3[MAX_PATH]; format, string1, string2, string3); static HMODULE hmoduleRichEdit; +static BOOL is_lang_japanese; static HWND new_window(LPCSTR lpClassName, DWORD dwStyle, HWND parent) { HWND hwnd; @@ -486,6 +487,28 @@ static void test_EM_LINELENGTH(void) offset_test[i][0], result, offset_test[i][1]); } + /* Test with multibyte character */ + if (!is_lang_japanese) + skip("Skip multibyte character tests on non-Japanese platform\n"); + else + { + const char *text1 = + "wine\n" + "richedit\x8e\xf0\n" + "wine"; + int offset_test1[3][2] = { + {0, 4}, /* Line 1: |wine\n */ + {5, 9}, /* Line 2: |richedit\x8e\xf0\n */ + {15, 4}, /* Line 3: |wine */ + }; + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)text1); + for (i = 0; i < sizeof(offset_test1)/sizeof(offset_test1[0]); i++) { + result = SendMessageA(hwndRichEdit, EM_LINELENGTH, offset_test1[i][0], 0); + ok(result == offset_test1[i][1], "Length of line at offset %d is %ld, expected %d\n", + offset_test1[i][0], result, offset_test1[i][1]); + } + } + DestroyWindow(hwndRichEdit); } @@ -4009,7 +4032,7 @@ static void test_EM_SETTEXTEX(void) ok(result == 0, "EM_SETTEXTEX: Test UTF8 with BOM set wrong text: Result: %s\n", bufACP); /* Test multibyte character */ - if (PRIMARYLANGID(GetUserDefaultLangID()) != LANG_JAPANESE) + if (!is_lang_japanese) skip("Skip multibyte character tests on non-Japanese platform\n"); else { @@ -4882,7 +4905,7 @@ static void test_EM_REPLACESEL(int redraw) ok(r == 7, "EM_GETLINECOUNT returned %d, expected 7\n", r); /* Test with multibyte character */ - if (PRIMARYLANGID(GetUserDefaultLangID()) != LANG_JAPANESE) + if (!is_lang_japanese) skip("Skip multibyte character tests on non-Japanese platform\n"); else { @@ -8160,6 +8183,7 @@ START_TEST( editor ) * RICHED20.DLL, so the linker doesn't actually link to it. */ hmoduleRichEdit = LoadLibraryA("riched20.dll"); ok(hmoduleRichEdit != NULL, "error: %d\n", (int) GetLastError()); + is_lang_japanese = (PRIMARYLANGID(GetUserDefaultLangID()) == LANG_JAPANESE); test_WM_CHAR(); test_EM_FINDTEXT(FALSE);

1 0

Jactry Zeng : riched32/tests: Test EM_LINELENGTH with multibyte character.
by Alexandre Julliard Dec. 21, 2015

Dec. 21, 2015

Module: wine Branch: master Commit: d9ead0c899975780347916fe52f825681f8a16e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9ead0c899975780347916fe5… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Mon Dec 21 20:59:58 2015 +0800 riched32/tests: Test EM_LINELENGTH with multibyte character. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched32/tests/editor.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/dlls/riched32/tests/editor.c b/dlls/riched32/tests/editor.c index d3a286e..40daae0 100644 --- a/dlls/riched32/tests/editor.c +++ b/dlls/riched32/tests/editor.c @@ -35,6 +35,7 @@ #include <wine/test.h> static HMODULE hmoduleRichEdit; +static BOOL is_lang_japanese; static HWND new_window(LPCSTR lpClassName, DWORD dwStyle, HWND parent) { HWND hwnd; @@ -498,6 +499,32 @@ static void test_EM_LINELENGTH(void) offset_test[i][0], result, offset_test[i][1]); } + /* Test with multibyte character */ + if (!is_lang_japanese) + skip("Skip multibyte character tests on non-Japanese platform\n"); + else + { + const char *text1 = + "wine\n" + "richedit\x8e\xf0\n" + "wine"; + static int offset_test1[3][3] = { + {0, 4}, /* Line 1: |wine\n */ + {5, 10, 1}, /* Line 2: |richedit\x8e\xf0\n */ + {16, 4}, /* Line 3: |wine */ + }; + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)text1); + for (i = 0; i < sizeof(offset_test1)/sizeof(offset_test1[0]); i++) { + result = SendMessageA(hwndRichEdit, EM_LINELENGTH, offset_test1[i][0], 0); + if (offset_test1[i][2]) + todo_wine ok(result == offset_test1[i][1], "Length of line at offset %d is %ld, expected %d\n", + offset_test1[i][0], result, offset_test1[i][1]); + else + ok(result == offset_test1[i][1], "Length of line at offset %d is %ld, expected %d\n", + offset_test1[i][0], result, offset_test1[i][1]); + } + } + DestroyWindow(hwndRichEdit); } @@ -1211,6 +1238,7 @@ START_TEST( editor ) * RICHED32.DLL, so the linker doesn't actually link to it. */ hmoduleRichEdit = LoadLibraryA("riched32.dll"); ok(hmoduleRichEdit != NULL, "error: %d\n", (int) GetLastError()); + is_lang_japanese = (PRIMARYLANGID(GetUserDefaultLangID()) == LANG_JAPANESE); test_WM_SETTEXT(); test_EM_GETTEXTRANGE();

1 0

Piotr Caban : msxml3: Store information about ignorrable whitespace nodes in xmlNode._private variable.
by Alexandre Julliard Dec. 21, 2015

Dec. 21, 2015

Module: wine Branch: master Commit: bc0eca60c6e13c3ab74c1988c83e20266e14ea2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc0eca60c6e13c3ab74c1988c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 21 11:41:18 2015 +0100 msxml3: Store information about ignorrable whitespace nodes in xmlNode._private variable. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/domdoc.c | 7 +++++++ dlls/msxml3/msxml_private.h | 3 +++ dlls/msxml3/node.c | 5 +++-- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 184a01f..e9f2504 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -448,7 +448,14 @@ static void sax_characters(void *ctx, const xmlChar *ch, int len) (!ctxt->node->last || ((ctxt->node->last && (cur == '<' || ctxt->node->last->type != XML_TEXT_NODE)) ))) + { + /* Keep information about ignorable whitespace text node in previous or parent node */ + if (ctxt->node->last) + *(DWORD*)&ctxt->node->last->_private |= NODE_PRIV_TRAILING_IGNORABLE_WS; + else if (ctxt->node->type != XML_DOCUMENT_NODE) + *(DWORD*)&ctxt->node->_private |= NODE_PRIV_CHILD_IGNORABLE_WS; return; + } } xmlSAX2Characters(ctxt, ch, len); diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 6c0376f..56be916 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -559,4 +559,7 @@ HRESULT detach_bsc(bsc_t*) DECLSPEC_HIDDEN; /* ... */ #define E_XML_REQUIRED_ATTRIBUTE_MISSING 0xC00CE020 +#define NODE_PRIV_TRAILING_IGNORABLE_WS 0x40000000 +#define NODE_PRIV_CHILD_IGNORABLE_WS 0x80000000 +#define NODE_PRIV_REFCOUNT_MASK ~(NODE_PRIV_TRAILING_IGNORABLE_WS|NODE_PRIV_CHILD_IGNORABLE_WS) #endif /* __MSXML_PRIVATE__ */ diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 9c768bd..8914e05 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -398,7 +398,7 @@ HRESULT node_get_next_sibling(xmlnode *This, IXMLDOMNode **ret) static int node_get_inst_cnt(xmlNodePtr node) { - int ret = *(LONG *)&node->_private; + int ret = *(LONG *)&node->_private & NODE_PRIV_REFCOUNT_MASK; xmlNodePtr child; /* add attribute counts */ @@ -429,7 +429,8 @@ int xmlnode_get_inst_cnt(xmlnode *node) return node_get_inst_cnt(node->node); } -/* _private field holds a number of COM instances spawned from this libxml2 node */ +/* _private field holds a number of COM instances spawned from this libxml2 node + * most significant bits are used to store information about ignorrable whitespace nodes */ static void xmlnode_add_ref(xmlNodePtr node) { if (node->type == XML_DOCUMENT_NODE) return;

1 0

Alexandre Julliard : secur32/tests: Don' t check the exact number of cipher bits.
by Alexandre Julliard Dec. 21, 2015

Dec. 21, 2015

Module: wine Branch: master Commit: 9ab03dd7bbded6f9a2a93e5fec2f60b61125140a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ab03dd7bbded6f9a2a93e5fe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 21 18:20:29 2015 +0100 secur32/tests: Don't check the exact number of cipher bits. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/tests/schannel.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index 35100f7..51c22d5 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -927,8 +927,7 @@ todo_wine status = pQueryContextAttributesA(&context, SECPKG_ATTR_CONNECTION_INFO, (void*)&conn_info); ok(status == SEC_E_OK, "QueryContextAttributesW(SECPKG_ATTR_CONNECTION_INFO) failed: %08x\n", status); if(status == SEC_E_OK) { - ok(conn_info.dwCipherStrength == 128 || conn_info.dwCipherStrength == 168, - "conn_info.dwCipherStrength = %d\n", conn_info.dwCipherStrength); + ok(conn_info.dwCipherStrength >= 128, "conn_info.dwCipherStrength = %d\n", conn_info.dwCipherStrength); ok(conn_info.dwHashStrength >= 128, "conn_info.dwHashStrength = %d\n", conn_info.dwHashStrength); }

1 0

Michael Stefaniuc : dsound: Fail to create a version 8 3d buffer with DSBCAPS_CTRLPAN.
by Alexandre Julliard Dec. 21, 2015

Dec. 21, 2015

Module: wine Branch: master Commit: 0e5dcc2c841be0a4311d1915d073d2775fe436b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e5dcc2c841be0a4311d1915d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 21 12:08:09 2015 +0100 dsound: Fail to create a version 8 3d buffer with DSBCAPS_CTRLPAN. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/dsound.c | 5 +++++ dlls/dsound/tests/ds3d8.c | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index 7b93455..e50ef58 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -542,6 +542,11 @@ static HRESULT DirectSoundDevice_CreateSoundBuffer( return DSERR_INVALIDPARAM; } + if (from8 && (dsbd->dwFlags & DSBCAPS_CTRL3D) && (dsbd->dwFlags & DSBCAPS_CTRLPAN)) { + WARN("invalid parameter: DSBCAPS_CTRL3D and DSBCAPS_CTRLPAN cannot be used together\n"); + return DSERR_INVALIDPARAM; + } + hres = IDirectSoundBufferImpl_Create(device, &dsb, dsbd); if (dsb) { *ppdsb = (IDirectSoundBuffer*)&dsb->IDirectSoundBuffer8_iface; diff --git a/dlls/dsound/tests/ds3d8.c b/dlls/dsound/tests/ds3d8.c index 330f590..25eb010 100644 --- a/dlls/dsound/tests/ds3d8.c +++ b/dlls/dsound/tests/ds3d8.c @@ -654,7 +654,6 @@ static HRESULT test_secondary8(LPGUID lpGuid, BOOL play, /* Invalid flag combination */ bufdesc.dwFlags|=DSBCAPS_CTRLPAN; rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); - todo_wine ok(rc==DSERR_INVALIDPARAM, "IDirectSound8_CreateSoundBuffer(secondary) should have " "returned DSERR_INVALIDPARAM, returned %08x\n", rc);

1 0

Piotr Caban : winex11.drv: XDNDDropEffect stores OLE Drag&Drop effect so don' t use it WS_EX_ACCEPTFILES related drops.
by Alexandre Julliard Dec. 21, 2015

Dec. 21, 2015

Module: wine Branch: master Commit: ba21de83a6d28c6c418804c62bbb03ac04748754 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba21de83a6d28c6c418804c62… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 21 11:21:31 2015 +0100 winex11.drv: XDNDDropEffect stores OLE Drag&Drop effect so don't use it WS_EX_ACCEPTFILES related drops. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/xdnd.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index 0c34b4f..8b2c582 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -339,12 +339,10 @@ void X11DRV_XDND_PositionEvent( HWND hWnd, XClientMessageEvent *event ) if (XDNDAccepted) accept = 1; else if ((GetWindowLongW( hWnd, GWL_EXSTYLE ) & WS_EX_ACCEPTFILES) && - (effect & DROPEFFECT_COPY) && X11DRV_XDND_HasHDROP()) { accept = 1; effect = DROPEFFECT_COPY; - XDNDDropEffect = effect; } TRACE("action req: %ld accept(%d) at x(%d),y(%d)\n", @@ -432,7 +430,6 @@ void X11DRV_XDND_DropEvent( HWND hWnd, XClientMessageEvent *event ) /* Only send WM_DROPFILES if Drop didn't succeed or DROPEFFECT_NONE was set. * Doing both causes winamp to duplicate the dropped files (#29081) */ if ((GetWindowLongW( hWnd, GWL_EXSTYLE ) & WS_EX_ACCEPTFILES) && - (XDNDDropEffect & DROPEFFECT_COPY) && X11DRV_XDND_HasHDROP()) { HRESULT hr = X11DRV_XDND_SendDropFiles( hWnd );

1 0

Piotr Caban : winex11.drv: Reset XDNDAccepted flag if IDropTarget:: DragEnter fails.
by Alexandre Julliard Dec. 21, 2015

Dec. 21, 2015

Module: wine Branch: master Commit: 76f7d8c7abf7447016e4edaf91c06563cc860918 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76f7d8c7abf7447016e4edaf9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 21 11:21:27 2015 +0100 winex11.drv: Reset XDNDAccepted flag if IDropTarget::DragEnter fails. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/xdnd.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index 841eaff..0c34b4f 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -314,7 +314,10 @@ void X11DRV_XDND_PositionEvent( HWND hWnd, XClientMessageEvent *event ) TRACE("the application accepted the drop (effect = %d)\n", effect_ignore); } else + { + XDNDAccepted = FALSE; WARN("IDropTarget_DragEnter failed, error 0x%08X\n", hr); + } IDropTarget_Release(dropTarget); } }

1 0

Piotr Caban : winex11.drv: Ignore effect returned in IDropTarget:: DragEnter.
by Alexandre Julliard Dec. 21, 2015

Dec. 21, 2015

Module: wine Branch: master Commit: a2f3d9740642ca6d4a7c63175f7e8db34120c2b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2f3d9740642ca6d4a7c63175… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 21 11:21:12 2015 +0100 winex11.drv: Ignore effect returned in IDropTarget::DragEnter. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/xdnd.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index 01af480..b066751 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -305,17 +305,13 @@ void X11DRV_XDND_PositionEvent( HWND hWnd, XClientMessageEvent *event ) XDNDLastDropTargetWnd = dropTargetWindow; if (dropTarget) { + DWORD effect_ignore = effect; hr = IDropTarget_DragEnter(dropTarget, &XDNDDataObject, MK_LBUTTON, pointl, &effect); - if (SUCCEEDED(hr)) + if (hr == S_OK) { - if (effect != DROPEFFECT_NONE) - { - XDNDAccepted = TRUE; - TRACE("the application accepted the drop\n"); - } - else - TRACE("the application refused the drop\n"); + XDNDAccepted = TRUE; + TRACE("the application accepted the drop (effect = %d)\n", effect_ignore); } else WARN("IDropTarget_DragEnter failed, error 0x%08X\n", hr); @@ -340,7 +336,7 @@ void X11DRV_XDND_PositionEvent( HWND hWnd, XClientMessageEvent *event ) if (XDNDAccepted) accept = 1; else if ((GetWindowLongW( hWnd, GWL_EXSTYLE ) & WS_EX_ACCEPTFILES) && - (X11DRV_XDND_XdndActionToDROPEFFECT(event->data.l[4]) & DROPEFFECT_COPY) && + (effect & DROPEFFECT_COPY) && X11DRV_XDND_HasHDROP()) { accept = 1;

1 0

Nikolay Sivov : ole2nls: Fix CompareString() prototype.
by Alexandre Julliard Dec. 21, 2015

Dec. 21, 2015

Module: wine Branch: master Commit: e5d7d69f7225991ba6df6b1986cc04a3d2037940 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5d7d69f7225991ba6df6b198… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 21 12:15:59 2015 +0300 ole2nls: Fix CompareString() prototype. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole2nls.dll16/ole2nls.c | 5 ++--- include/wine/winbase16.h | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/ole2nls.dll16/ole2nls.c b/dlls/ole2nls.dll16/ole2nls.c index b21601b..68db449 100644 --- a/dlls/ole2nls.dll16/ole2nls.c +++ b/dlls/ole2nls.dll16/ole2nls.c @@ -104,10 +104,9 @@ INT16 WINAPI LCMapString16(LCID lcid, DWORD mapflags, LPCSTR srcstr, INT16 srcle /*********************************************************************** * CompareStringA (OLE2NLS.8) */ -UINT16 WINAPI CompareString16(DWORD lcid,DWORD fdwStyle, - LPCSTR s1,DWORD l1,LPCSTR s2,DWORD l2) +INT16 WINAPI CompareString16(LCID lcid, DWORD flags, LPCSTR str1, INT16 len1, LPCSTR str2, INT16 len2) { - return (UINT16)CompareStringA(lcid,fdwStyle,s1,l1,s2,l2); + return CompareStringA(lcid, flags, str1, len1, str2, len2); } /****************************************************************************** diff --git a/include/wine/winbase16.h b/include/wine/winbase16.h index 310d5f6..f2f32a2 100644 --- a/include/wine/winbase16.h +++ b/include/wine/winbase16.h @@ -435,7 +435,7 @@ VOID WINAPI _LeaveWin16Lock(void); INT16 WINAPI AccessResource16(HINSTANCE16,HRSRC16); ATOM WINAPI AddAtom16(LPCSTR); -UINT16 WINAPI CompareString16(DWORD,DWORD,LPCSTR,DWORD,LPCSTR,DWORD); +INT16 WINAPI CompareString16(LCID,DWORD,LPCSTR,INT16,LPCSTR,INT16); BOOL16 WINAPI CreateDirectory16(LPCSTR,LPVOID); BOOL16 WINAPI DefineHandleTable16(WORD); ATOM WINAPI DeleteAtom16(ATOM);

1 0