wine-commits May 2013

wine-commits@winehq.org

2 participants
498 discussions

Ken Thomases : winemac: Extract application-level handling of mouse move events to a separate method .
by Alexandre Julliard 07 May '13

07 May '13

Module: wine Branch: master Commit: 76691853f527fe799a05f0d8cb75a4f2abfec4a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76691853f527fe799a05f0d8c… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue May 7 03:00:35 2013 -0500 winemac: Extract application-level handling of mouse move events to a separate method. --- dlls/winemac.drv/cocoa_app.m | 94 ++++++++++++++++++++++-------------------- 1 files changed, 49 insertions(+), 45 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 7a304a8..7f2ec7c 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1134,6 +1134,54 @@ int macdrv_err_on; return TRUE; } + - (void) handleMouseMove:(NSEvent*)anEvent + { + WineWindow* targetWindow; + + /* Because of the way -[NSWindow setAcceptsMouseMovedEvents:] works, the + event indicates its window is the main window, even if the cursor is + over a different window. Find the actual WineWindow that is under the + cursor and post the event as being for that window. */ + if ([anEvent type] == NSMouseMoved) + { + CGPoint cgpoint = CGEventGetLocation([anEvent CGEvent]); + NSPoint point = [self flippedMouseLocation:NSPointFromCGPoint(cgpoint)]; + NSInteger windowUnderNumber; + + windowUnderNumber = [NSWindow windowNumberAtPoint:point + belowWindowWithWindowNumber:0]; + targetWindow = (WineWindow*)[NSApp windowWithWindowNumber:windowUnderNumber]; + } + else + targetWindow = (WineWindow*)[anEvent window]; + + if ([targetWindow isKindOfClass:[WineWindow class]]) + { + BOOL absolute = forceNextMouseMoveAbsolute || (targetWindow != lastTargetWindow); + forceNextMouseMoveAbsolute = FALSE; + + // If we recently warped the cursor (other than in our cursor-clipping + // event tap), discard mouse move events until we see an event which is + // later than that time. + if (lastSetCursorPositionTime) + { + if ([anEvent timestamp] <= lastSetCursorPositionTime) + return; + + lastSetCursorPositionTime = 0; + absolute = TRUE; + } + + [targetWindow postMouseMovedEvent:anEvent absolute:absolute]; + lastTargetWindow = targetWindow; + } + else if (lastTargetWindow) + { + [[NSCursor arrowCursor] set]; + [self unhideCursor]; + lastTargetWindow = nil; + } + } // Returns TRUE if the event was handled and caller should do nothing more // with it. Returns FALSE if the caller should process it as normal and @@ -1152,51 +1200,7 @@ int macdrv_err_on; if (type == NSMouseMoved || type == NSLeftMouseDragged || type == NSRightMouseDragged || type == NSOtherMouseDragged) { - WineWindow* targetWindow; - - /* Because of the way -[NSWindow setAcceptsMouseMovedEvents:] works, the - event indicates its window is the main window, even if the cursor is - over a different window. Find the actual WineWindow that is under the - cursor and post the event as being for that window. */ - if (type == NSMouseMoved) - { - CGPoint cgpoint = CGEventGetLocation([anEvent CGEvent]); - NSPoint point = [self flippedMouseLocation:NSPointFromCGPoint(cgpoint)]; - NSInteger windowUnderNumber; - - windowUnderNumber = [NSWindow windowNumberAtPoint:point - belowWindowWithWindowNumber:0]; - targetWindow = (WineWindow*)[NSApp windowWithWindowNumber:windowUnderNumber]; - } - else - targetWindow = (WineWindow*)[anEvent window]; - - if ([targetWindow isKindOfClass:[WineWindow class]]) - { - BOOL absolute = forceNextMouseMoveAbsolute || (targetWindow != lastTargetWindow); - forceNextMouseMoveAbsolute = FALSE; - - // If we recently warped the cursor (other than in our cursor-clipping - // event tap), discard mouse move events until we see an event which is - // later than that time. - if (lastSetCursorPositionTime) - { - if ([anEvent timestamp] <= lastSetCursorPositionTime) - return; - - lastSetCursorPositionTime = 0; - absolute = TRUE; - } - - [targetWindow postMouseMovedEvent:anEvent absolute:absolute]; - lastTargetWindow = targetWindow; - } - else if (lastTargetWindow) - { - [[NSCursor arrowCursor] set]; - [self unhideCursor]; - lastTargetWindow = nil; - } + [self handleMouseMove:anEvent]; } else if (type == NSLeftMouseDown || type == NSLeftMouseUp || type == NSRightMouseDown || type == NSRightMouseUp ||

1 0

Dmitry Timoshkov : ole32: Add a semi-stub for CLSIDFromProgIDEx.
by Alexandre Julliard 07 May '13

07 May '13

Module: wine Branch: master Commit: 79ef449e32d2f852e37b89dc6e24dfd024b04d1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=79ef449e32d2f852e37b89dc6… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue May 7 11:51:36 2013 +0900 ole32: Add a semi-stub for CLSIDFromProgIDEx. --- dlls/ole32/compobj.c | 9 +++++++++ dlls/ole32/ole32.spec | 1 + 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 04d65c9..1857ac7 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -2098,6 +2098,15 @@ HRESULT WINAPI CLSIDFromProgID(LPCOLESTR progid, LPCLSID clsid) return __CLSIDFromString(buf2,clsid); } +/****************************************************************************** + * CLSIDFromProgIDEx [OLE32.@] + */ +HRESULT WINAPI CLSIDFromProgIDEx(LPCOLESTR progid, LPCLSID clsid) +{ + FIXME("%s,%p: semi-stub\n", debugstr_w(progid), clsid); + + return CLSIDFromProgID(progid, clsid); +} /***************************************************************************** * CoGetPSClsid [OLE32.@] diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index 9e3f80f..d71168e 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -4,6 +4,7 @@ @ stdcall CLIPFORMAT_UserSize(ptr long ptr) @ stdcall CLIPFORMAT_UserUnmarshal(ptr ptr ptr) @ stdcall CLSIDFromProgID(wstr ptr) +@ stdcall CLSIDFromProgIDEx(wstr ptr) @ stdcall CLSIDFromString(wstr ptr) @ stdcall CoAddRefServerProcess() @ stdcall CoAllowSetForegroundWindow(ptr ptr)

1 0

Stefan Leichter : include: Fix prototype of CryptUIWizDigitalSign.
by Alexandre Julliard 07 May '13

07 May '13

Module: wine Branch: master Commit: d0ea3642917006fac9a93f24f94eeb949dd5ec53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0ea3642917006fac9a93f24f… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Mon May 6 22:23:35 2013 +0200 include: Fix prototype of CryptUIWizDigitalSign. --- include/cryptuiapi.h | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/include/cryptuiapi.h b/include/cryptuiapi.h index 81c58af..7201cbc 100644 --- a/include/cryptuiapi.h +++ b/include/cryptuiapi.h @@ -240,6 +240,7 @@ typedef struct _CRYPTUI_WIZ_DIGITAL_SIGN_CONTEXT DWORD cbBlob; BYTE *pbBlob; } CRYPTUI_WIZ_DIGITAL_SIGN_CONTEXT, *PCRYPTUI_WIZ_DIGITAL_SIGN_CONTEXT; +typedef const CRYPTUI_WIZ_DIGITAL_SIGN_CONTEXT *PCCRYPTUI_WIZ_DIGITAL_SIGN_CONTEXT; /* Values for CryptUIWizDigitalSign's dwFlags */ #define CRYPTUI_WIZ_NO_UI 0x00000001 @@ -248,7 +249,7 @@ typedef struct _CRYPTUI_WIZ_DIGITAL_SIGN_CONTEXT BOOL WINAPI CryptUIWizDigitalSign(DWORD dwFlags, HWND hwndParent, LPCWSTR pwszWizardTitle, PCCRYPTUI_WIZ_DIGITAL_SIGN_INFO pDigitalSignInfo, - PCRYPTUI_WIZ_DIGITAL_SIGN_CONTEXT *ppSignContext); + PCCRYPTUI_WIZ_DIGITAL_SIGN_CONTEXT *ppSignContext); BOOL WINAPI CryptUIWizFreeDigitalSignContext( PCRYPTUI_WIZ_DIGITAL_SIGN_CONTEXT pSignContext);

1 0

Max Kellermann : msvcrt: Fix character/ byte confusion in buffer overflow branch.
by Alexandre Julliard 07 May '13

07 May '13

Module: wine Branch: master Commit: cee65e94094afcadac996473ff5f98beea2f7aac URL: http://source.winehq.org/git/wine.git/?a=commit;h=cee65e94094afcadac996473f… Author: Max Kellermann <max(a)duempel.org> Date: Mon May 6 22:21:03 2013 +0200 msvcrt: Fix character/byte confusion in buffer overflow branch. --- dlls/msvcrt/printf.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index 3ccb1c4..0fe27f7 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -48,7 +48,7 @@ static int FUNC_NAME(puts_clbk_str)(void *ctx, int len, const APICHAR *str) return len; if(out->len < len) { - memcpy(out->buf, str, out->len); + memcpy(out->buf, str, out->len*sizeof(APICHAR)); out->buf += out->len; out->len = 0; return -1;

1 0

Nikolay Sivov : msxml3: Always return False for nodes that can' t have children.
by Alexandre Julliard 06 May '13

06 May '13

Module: wine Branch: master Commit: 6cc0e706dd7f5afa340470a77ef9488896e4e213 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cc0e706dd7f5afa340470a77… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 6 16:03:06 2013 +0400 msxml3: Always return False for nodes that can't have children. --- dlls/msxml3/cdata.c | 2 +- dlls/msxml3/comment.c | 2 +- dlls/msxml3/msxml_private.h | 9 +++++++++ dlls/msxml3/text.c | 2 +- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c index 7fd4a37..61c0ce2 100644 --- a/dlls/msxml3/cdata.c +++ b/dlls/msxml3/cdata.c @@ -333,7 +333,7 @@ static HRESULT WINAPI domcdata_hasChildNodes( { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); TRACE("(%p)->(%p)\n", This, ret); - return node_has_childnodes(&This->node, ret); + return return_var_false(ret); } static HRESULT WINAPI domcdata_get_ownerDocument( diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c index be49e71..879ca48 100644 --- a/dlls/msxml3/comment.c +++ b/dlls/msxml3/comment.c @@ -332,7 +332,7 @@ static HRESULT WINAPI domcomment_hasChildNodes( { domcomment *This = impl_from_IXMLDOMComment( iface ); TRACE("(%p)->(%p)\n", This, ret); - return node_has_childnodes(&This->node, ret); + return return_var_false(ret); } static HRESULT WINAPI domcomment_get_ownerDocument( diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 6c24119..17e19a7 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -475,6 +475,15 @@ static inline HRESULT return_null_bstr(BSTR *p) return S_FALSE; } +static inline HRESULT return_var_false(VARIANT_BOOL *p) +{ + if(!p) + return E_INVALIDARG; + + *p = VARIANT_FALSE; + return S_FALSE; +} + extern IXMLDOMParseError *create_parseError( LONG code, BSTR url, BSTR reason, BSTR srcText, LONG line, LONG linepos, LONG filepos ) DECLSPEC_HIDDEN; extern HRESULT DOMDocument_create(MSXML_VERSION, IUnknown*, void**) DECLSPEC_HIDDEN; diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c index e9c64c1..fd8e33a 100644 --- a/dlls/msxml3/text.c +++ b/dlls/msxml3/text.c @@ -330,7 +330,7 @@ static HRESULT WINAPI domtext_hasChildNodes( { domtext *This = impl_from_IXMLDOMText( iface ); TRACE("(%p)->(%p)\n", This, ret); - return node_has_childnodes(&This->node, ret); + return return_var_false(ret); } static HRESULT WINAPI domtext_get_ownerDocument(

1 0

Nikolay Sivov : msxml3: Fix ignorable whitespace detection.
by Alexandre Julliard 06 May '13

06 May '13

Module: wine Branch: master Commit: 0403f34b78ef1f663f0703784e089e8396fb338c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0403f34b78ef1f663f0703784… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 5 15:44:06 2013 +0400 msxml3: Fix ignorable whitespace detection. --- dlls/msxml3/domdoc.c | 14 ++++++++- dlls/msxml3/tests/domdoc.c | 64 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 74 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 67902bd..b607997 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -416,10 +416,20 @@ static void sax_characters(void *ctx, const xmlChar *ch, int len) if (ctxt->node) { - /* during domdoc_loadXML() the xmlDocPtr->_private data is not available */ + /* Characters are reported with multiple calls, for example each charref is reported with a separate + call and then parser appends it to a single text node or creates a new node if not created. + It's not possible to tell if it's ignorable data or not just looking at data itself cause it could be + a space chars that separate charrefs or similar case. We only need to skip leading and trailing spaces, + or whole node if it has nothing but space chars, so to detect leading space node->last is checked that + contains text node pointer if already created, trailing spaces are detected directly looking at parser input + for next '<' opening bracket - similar logic is used by libxml2 itself. + + Note that during domdoc_loadXML() the xmlDocPtr->_private data is not available. */ if (!This->properties->preserving && !is_preserving_whitespace(ctxt->node) && - strn_isspace(ch, len)) + strn_isspace(ch, len) && + (!ctxt->node->last || + ((ctxt->node->last && (*ctxt->input->cur) == '<')))) return; } diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index d5f2413..cc79d4b 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -435,6 +435,13 @@ static const char szExampleXML[] = " </elem>\n" "</root>\n"; +static const char charrefsxml[] = +"<?xml version='1.0'?>" +"<a>" +"<b1> Text A end </b1>" +"<b2>AB C </b2>" +"</a>"; + static const CHAR szNodeTypesXML[] = "<?xml version='1.0'?>" "" @@ -4154,10 +4161,58 @@ static inline void _check_ws_preserved(int line, IXMLDOMDocument2* doc, char con IXMLDOMNode_Release(node2); } -static void test_whitespace(void) +static void test_preserve_charref(IXMLDOMDocument2 *doc, VARIANT_BOOL preserve) { + static const WCHAR b1_p[] = {' ','T','e','x','t',' ','A',' ','e','n','d',' ',0}; + static const WCHAR b1_i[] = {'T','e','x','t',' ','A',' ','e','n','d',0}; + static const WCHAR b2_p[] = {'A','B',' ','C',' ',0}; + static const WCHAR b2_i[] = {'A','B',' ','C',0}; + IXMLDOMNodeList *list; + IXMLDOMElement *root; + IXMLDOMNode *node; + const WCHAR *text; VARIANT_BOOL b; + HRESULT hr; + BSTR s; + + hr = IXMLDOMDocument2_put_preserveWhiteSpace(doc, preserve); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXMLDOMDocument2_loadXML(doc, _bstr_(charrefsxml), &b); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXMLDOMDocument2_get_documentElement(doc, &root); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXMLDOMElement_get_childNodes(root, &list); + ok(hr == S_OK, "got 0x%08x\n", hr); + IXMLDOMElement_Release(root); + + text = preserve == VARIANT_TRUE ? b1_p : b1_i; + hr = IXMLDOMNodeList_get_item(list, 0, &node); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IXMLDOMNode_get_text(node, &s); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(s, text), "0x%x, got %s\n", preserve, wine_dbgstr_w(s)); + SysFreeString(s); + IXMLDOMNode_Release(node); + + text = preserve == VARIANT_TRUE ? b2_p : b2_i; + hr = IXMLDOMNodeList_get_item(list, 1, &node); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IXMLDOMNode_get_text(node, &s); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(s, text), "0x%x, got %s\n", preserve, wine_dbgstr_w(s)); + SysFreeString(s); + IXMLDOMNode_Release(node); + + IXMLDOMNodeList_Release(list); +} + +static void test_whitespace(void) +{ IXMLDOMDocument2 *doc1, *doc2, *doc3, *doc4; + VARIANT_BOOL b; doc1 = create_document(&IID_IXMLDOMDocument2); doc2 = create_document(&IID_IXMLDOMDocument2); @@ -4224,10 +4279,15 @@ static void test_whitespace(void) check_ws_preserved(doc3, NULL); check_ws_ignored(doc4, NULL); - IXMLDOMDocument2_Release(doc1); IXMLDOMDocument2_Release(doc2); IXMLDOMDocument2_Release(doc3); IXMLDOMDocument2_Release(doc4); + + /* text with char references */ + test_preserve_charref(doc1, VARIANT_TRUE); + test_preserve_charref(doc1, VARIANT_FALSE); + IXMLDOMDocument2_Release(doc1); + free_bstrs(); }

1 0

Nikolay Sivov : oledb32: Use shared convert instance, use a single skip.
by Alexandre Julliard 06 May '13

06 May '13

Module: wine Branch: master Commit: ff8fa96bb24c51fe1072fad773ca256849ea035e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff8fa96bb24c51fe1072fad77… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 5 09:20:02 2013 +0400 oledb32: Use shared convert instance, use a single skip. --- dlls/oledb32/tests/convert.c | 191 ++++-------------------------------------- 1 files changed, 16 insertions(+), 175 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ff8fa96bb24c51fe1072f…

1 0

Christian Costa : d3dx9_36: Add stub for DisassembleEffect.
by Alexandre Julliard 06 May '13

06 May '13

Module: wine Branch: master Commit: bdc5c3211cd3f5330ca90da09a1158885ce3be8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdc5c3211cd3f5330ca90da09… Author: Christian Costa <titan.costa(a)gmail.com> Date: Sun May 5 20:44:14 2013 +0200 d3dx9_36: Add stub for DisassembleEffect. --- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/effect.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index 9b83135..b2511e8 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -119,7 +119,7 @@ @ stub D3DXCreateVolumeTextureFromResourceW(ptr long ptr ptr) @ stdcall D3DXDebugMute(long) @ stdcall D3DXDeclaratorFromFVF(long ptr) -@ stub D3DXDisassembleEffect(ptr long ptr) +@ stdcall D3DXDisassembleEffect(ptr long ptr) @ stub D3DXDisassembleShader(ptr long ptr ptr) @ stdcall D3DXFileCreate(ptr) @ stdcall D3DXFillCubeTexture(ptr ptr ptr) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index c4afbe5..be80ede 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -6196,3 +6196,10 @@ HRESULT WINAPI D3DXCreateEffectCompilerFromResourceW(HMODULE srcmodule, const WC return D3DXERR_INVALIDDATA; } + +HRESULT WINAPI D3DXDisassembleEffect(ID3DXEffect *effect, BOOL enable_color_code, ID3DXBuffer **disassembly) +{ + FIXME("(%p, %u, %p): stub\n", effect, enable_color_code, disassembly); + + return D3DXERR_INVALIDDATA; +}

1 0

Piotr Caban : msvcp60: Export basic_streambuf::pubseekoff function.
by Alexandre Julliard 06 May '13

06 May '13

Module: wine Branch: master Commit: a73c69700c9e3a179f5492edb1e0e1b710993053 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a73c69700c9e3a179f5492edb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 6 11:16:54 2013 +0200 msvcp60: Export basic_streambuf::pubseekoff function. --- dlls/msvcp60/ios.c | 14 ++++++++++++-- dlls/msvcp60/msvcp60.spec | 16 ++++++++-------- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index a5f573d..7e87607 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -1277,7 +1277,12 @@ fpos_int* __thiscall basic_streambuf_char_seekoff(basic_streambuf_char *this, /* ?pubseekoff@?$basic_streambuf@DU?$char_traits@D@std@@@std@@QAE?AV?$fpos@H@2@JHH@Z */ /* ?pubseekoff@?$basic_streambuf@DU?$char_traits@D@std@@@std@@QEAA?AV?$fpos@H@2@_JHH@Z */ -static fpos_int* basic_streambuf_char_pubseekoff(basic_streambuf_char *this, +/* ?pubseekoff@?$basic_streambuf@DU?$char_traits@D@std@@@std@@QAE?AV?$fpos@H@2@JFF@Z */ +/* ?pubseekoff@?$basic_streambuf@DU?$char_traits@D@std@@@std@@QEAA?AV?$fpos@H@2@_JFF@Z */ +/* ?pubseekoff@?$basic_streambuf@DU?$char_traits@D@std@@@std@@QAE?AV?$fpos@H@2@JW4seekdir@ios_base@2@H@Z */ +/* ?pubseekoff@?$basic_streambuf@DU?$char_traits@D@std@@@std@@QEAA?AV?$fpos@H@2@_JW4seekdir@ios_base@2@H@Z */ +DEFINE_THISCALL_WRAPPER(basic_streambuf_char_pubseekoff, 20) +fpos_int* __thiscall basic_streambuf_char_pubseekoff(basic_streambuf_char *this, fpos_int *ret, streamoff off, int way, int mode) { TRACE("(%p %ld %d %d)\n", this, off, way, mode); @@ -2006,7 +2011,12 @@ fpos_int* __thiscall basic_streambuf_wchar_seekoff(basic_streambuf_wchar *this, /* ?pubseekoff@?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@QEAA?AV?$fpos@H@2@_JHH@Z */ /* ?pubseekoff@?$basic_streambuf@GU?$char_traits@G@std@@@std@@QAE?AV?$fpos@H@2@JHH@Z */ /* ?pubseekoff@?$basic_streambuf@GU?$char_traits@G@std@@@std@@QEAA?AV?$fpos@H@2@_JHH@Z */ -static fpos_int* basic_streambuf_wchar_pubseekoff(basic_streambuf_wchar *this, +/* ?pubseekoff@?$basic_streambuf@GU?$char_traits@G@std@@@std@@QAE?AV?$fpos@H@2@JFF@Z */ +/* ?pubseekoff@?$basic_streambuf@GU?$char_traits@G@std@@@std@@QEAA?AV?$fpos@H@2@_JFF@Z */ +/* ?pubseekoff@?$basic_streambuf@GU?$char_traits@G@std@@@std@@QAE?AV?$fpos@H@2@JW4seekdir@ios_base@2@H@Z */ +/* ?pubseekoff@?$basic_streambuf@GU?$char_traits@G@std@@@std@@QEAA?AV?$fpos@H@2@_JW4seekdir@ioos_base@2@H@Z */ +DEFINE_THISCALL_WRAPPER(basic_streambuf_wchar_pubseekoff, 20) +fpos_int* __thiscall basic_streambuf_wchar_pubseekoff(basic_streambuf_wchar *this, fpos_int *ret, streamoff off, int way, int mode) { TRACE("(%p %ld %d %d)\n", this, off, way, mode); diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec index e15d43c..4e5a28e 100644 --- a/dlls/msvcp60/msvcp60.spec +++ b/dlls/msvcp60/msvcp60.spec @@ -3645,14 +3645,14 @@ @ cdecl -arch=win64 ?pubimbue@?$basic_streambuf@DU?$char_traits@D@std@@@std@@QEAA?AVlocale@2@AEBV32@@Z(ptr ptr ptr) basic_streambuf_char_pubimbue @ thiscall -arch=win32 ?pubimbue@?$basic_streambuf@GU?$char_traits@G@std@@@std@@QAE?AVlocale@2@ABV32@@Z(ptr ptr ptr) basic_streambuf_wchar_pubimbue @ cdecl -arch=win64 ?pubimbue@?$basic_streambuf@GU?$char_traits@G@std@@@std@@QEAA?AVlocale@2@AEBV32@@Z(ptr ptr ptr) basic_streambuf_wchar_pubimbue -@ stub -arch=win32 ?pubseekoff@?$basic_streambuf@DU?$char_traits@D@std@@@std@@QAE?AV?$fpos@H@2@JFF@Z -@ stub -arch=win64 ?pubseekoff@?$basic_streambuf@DU?$char_traits@D@std@@@std@@QEAA?AV?$fpos@H@2@_JFF@Z -@ stub -arch=win32 ?pubseekoff@?$basic_streambuf@DU?$char_traits@D@std@@@std@@QAE?AV?$fpos@H@2@JW4seekdir@ios_base@2@H@Z -@ stub -arch=win64 ?pubseekoff@?$basic_streambuf@DU?$char_traits@D@std@@@std@@QEAA?AV?$fpos@H@2@_JW4seekdir@ios_base@2@H@Z -@ stub -arch=win32 ?pubseekoff@?$basic_streambuf@GU?$char_traits@G@std@@@std@@QAE?AV?$fpos@H@2@JFF@Z -@ stub -arch=win64 ?pubseekoff@?$basic_streambuf@GU?$char_traits@G@std@@@std@@QEAA?AV?$fpos@H@2@_JFF@Z -@ stub -arch=win32 ?pubseekoff@?$basic_streambuf@GU?$char_traits@G@std@@@std@@QAE?AV?$fpos@H@2@JW4seekdir@ios_base@2@H@Z -@ stub -arch=win64 ?pubseekoff@?$basic_streambuf@GU?$char_traits@G@std@@@std@@QEAA?AV?$fpos@H@2@_JW4seekdir@ios_base@2@H@Z +@ thiscall -arch=win32 ?pubseekoff@?$basic_streambuf@DU?$char_traits@D@std@@@std@@QAE?AV?$fpos@H@2@JFF@Z(ptr ptr long long long) basic_streambuf_char_pubseekoff +@ cdecl -arch=win64 ?pubseekoff@?$basic_streambuf@DU?$char_traits@D@std@@@std@@QEAA?AV?$fpos@H@2@_JFF@Z(ptr ptr long long long) basic_streambuf_char_pubseekoff +@ thiscall -arch=win32 ?pubseekoff@?$basic_streambuf@DU?$char_traits@D@std@@@std@@QAE?AV?$fpos@H@2@JW4seekdir@ios_base@2@H@Z(ptr ptr long long long) basic_streambuf_char_pubseekoff +@ cdecl -arch=win64 ?pubseekoff@?$basic_streambuf@DU?$char_traits@D@std@@@std@@QEAA?AV?$fpos@H@2@_JW4seekdir@ios_base@2@H@Z(ptr ptr long long long) basic_streambuf_char_pubseekoff +@ thiscall -arch=win32 ?pubseekoff@?$basic_streambuf@GU?$char_traits@G@std@@@std@@QAE?AV?$fpos@H@2@JFF@Z(ptr ptr long long long) basic_streambuf_wchar_pubseekoff +@ cdecl -arch=win64 ?pubseekoff@?$basic_streambuf@GU?$char_traits@G@std@@@std@@QEAA?AV?$fpos@H@2@_JFF@Z(ptr ptr long long long) basic_streambuf_wchar_pubseekoff +@ thiscall -arch=win32 ?pubseekoff@?$basic_streambuf@GU?$char_traits@G@std@@@std@@QAE?AV?$fpos@H@2@JW4seekdir@ios_base@2@H@Z(ptr ptr long long long) basic_streambuf_wchar_pubseekoff +@ cdecl -arch=win64 ?pubseekoff@?$basic_streambuf@GU?$char_traits@G@std@@@std@@QEAA?AV?$fpos@H@2@_JW4seekdir@ios_base@2@H@Z(ptr ptr long long long) basic_streambuf_wchar_pubseekoff @ stub -arch=win32 ?pubseekpos@?$basic_streambuf@DU?$char_traits@D@std@@@std@@QAE?AV?$fpos@H@2@V32@F@Z @ stub -arch=win64 ?pubseekpos@?$basic_streambuf@DU?$char_traits@D@std@@@std@@QEAA?AV?$fpos@H@2@V32@F@Z @ thiscall -arch=win32 ?pubseekpos@?$basic_streambuf@DU?$char_traits@D@std@@@std@@QAE?AV?$fpos@H@2@V32@H@Z(ptr ptr long long int64 long long long) basic_streambuf_char_pubseekpos

1 0

Hans Leidekker : fusion: Fix alignment in parse_clr_metadata.
by Alexandre Julliard 06 May '13

06 May '13

Module: wine Branch: master Commit: aca88c2f80719bd6b5b3487b02c35de075cb49ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=aca88c2f80719bd6b5b3487b0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon May 6 10:07:00 2013 +0200 fusion: Fix alignment in parse_clr_metadata. --- dlls/fusion/assembly.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/fusion/assembly.c b/dlls/fusion/assembly.c index 920d8db..c2f98ec 100644 --- a/dlls/fusion/assembly.c +++ b/dlls/fusion/assembly.c @@ -595,8 +595,7 @@ static HRESULT parse_clr_metadata(ASSEMBLY *assembly) else if (!lstrcmpA(stream, "#Blob") || !lstrcmpA(stream, "Blob")) assembly->blobs = assembly_data_offset(assembly, ofs); - ptr += lstrlenA(stream) + 1; - ptr = (BYTE *)(((UINT_PTR)ptr + 3) & ~3); /* align on DWORD boundary */ + ptr += ((lstrlenA(stream) + 1) + 3) & ~3; /* align on DWORD boundary */ } return S_OK;

1 0

← Newer
1
...
42
43
44
45
46
47
48
49
50
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2013