wine-commits December 2012

wine-commits@winehq.org

2 participants
549 discussions

Andrew Talbot : windowscodecs: Remove unneeded address-of operators from array names.
by Alexandre Julliard 07 Dec '12

07 Dec '12

Module: wine Branch: master Commit: 4bb2c61b39668a02f68e859afc2a8de7aa434b6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bb2c61b39668a02f68e859af… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Dec 6 22:41:52 2012 +0000 windowscodecs: Remove unneeded address-of operators from array names. --- dlls/windowscodecs/gifformat.c | 2 +- dlls/windowscodecs/jpegformat.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/gifformat.c b/dlls/windowscodecs/gifformat.c index ce63af9..84838e2 100644 --- a/dlls/windowscodecs/gifformat.c +++ b/dlls/windowscodecs/gifformat.c @@ -1362,7 +1362,7 @@ static HRESULT WINAPI GifDecoder_Block_GetReaderByIndex(IWICMetadataBlockReader if (!reader) return E_INVALIDARG; if (index == 0) - return create_metadata_reader(&This->LSD_data, sizeof(This->LSD_data), + return create_metadata_reader(This->LSD_data, sizeof(This->LSD_data), &CLSID_WICLSDMetadataReader, reader); for (i = 0; i < This->gif->Extensions.ExtensionBlockCount; i++) diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index 57f1b55..6463de5 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -1022,7 +1022,7 @@ static HRESULT WINAPI JpegEncoder_Frame_WritePixels(IWICBitmapFrameEncode *iface HeapFree(GetProcessHeap(), 0, swapped_data); return E_FAIL; } - This->cinfo.client_data = &jmpbuf; + This->cinfo.client_data = jmpbuf; if (!This->started_compress) { @@ -1189,7 +1189,7 @@ static HRESULT WINAPI JpegEncoder_Frame_Commit(IWICBitmapFrameEncode *iface) LeaveCriticalSection(&This->lock); return E_FAIL; } - This->cinfo.client_data = &jmpbuf; + This->cinfo.client_data = jmpbuf; pjpeg_finish_compress(&This->cinfo); @@ -1299,7 +1299,7 @@ static HRESULT WINAPI JpegEncoder_Initialize(IWICBitmapEncoder *iface, This->cinfo.err = &This->jerr; - This->cinfo.client_data = &jmpbuf; + This->cinfo.client_data = jmpbuf; if (setjmp(jmpbuf)) {

1 0

Qian Hong : ole32: Fix OleDraw() with NULL pUnk.
by Alexandre Julliard 06 Dec '12

06 Dec '12

Module: wine Branch: master Commit: 9b90ea557b12b7a0a25ce945ac4374f1aa702ae5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b90ea557b12b7a0a25ce945a… Author: Qian Hong <fracting(a)gmail.com> Date: Fri Dec 7 01:45:33 2012 +0800 ole32: Fix OleDraw() with NULL pUnk. --- dlls/ole32/ole2.c | 2 ++ dlls/ole32/tests/ole2.c | 7 +++++++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 4a36aec..1bd4c1a 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -2546,6 +2546,8 @@ HRESULT WINAPI OleDraw( HRESULT hres; IViewObject *viewobject; + if (!pUnk) return E_INVALIDARG; + hres = IUnknown_QueryInterface(pUnk, &IID_IViewObject, (void**)&viewobject); diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index eb8e6d3..27653c1 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -1934,9 +1934,16 @@ static void test_OleLockRunning(void) static void test_OleDraw(void) { HRESULT hr; + RECT rect; hr = OleDraw((IUnknown*)&viewobject, 0, (HDC)0x1, NULL); ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = OleDraw(NULL, 0, (HDC)0x1, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = OleDraw(NULL, 0, (HDC)0x1, &rect); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); } START_TEST(ole2)

1 0

Andrew Eikum : urlmon: Out string parameter should be ptr, not wstr.
by Alexandre Julliard 06 Dec '12

06 Dec '12

Module: wine Branch: master Commit: 533df157f83b74372a76433915a5accf974854a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=533df157f83b74372a7643391… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Dec 6 11:17:47 2012 -0600 urlmon: Out string parameter should be ptr, not wstr. --- dlls/urlmon/urlmon.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/urlmon.spec b/dlls/urlmon/urlmon.spec index 72bd21d..5be0b6a 100644 --- a/dlls/urlmon/urlmon.spec +++ b/dlls/urlmon/urlmon.spec @@ -10,7 +10,7 @@ @ stdcall BindAsyncMoniker(ptr long ptr ptr ptr) @ stdcall CoGetClassObjectFromURL(ptr wstr long long wstr ptr long ptr ptr ptr) @ stub CoInstall -@ stdcall CoInternetCombineUrl(wstr wstr long wstr long ptr long) +@ stdcall CoInternetCombineUrl(wstr wstr long ptr long ptr long) @ stdcall CoInternetCombineUrlEx(ptr wstr long ptr long) @ stdcall CoInternetCompareUrl(wstr wstr long) @ stdcall CoInternetCombineIUri(ptr ptr long ptr long)

1 0

André Hentschel : wintrust/tests: Unify test message in case of a FALSE return.
by Alexandre Julliard 06 Dec '12

06 Dec '12

Module: wine Branch: master Commit: aa80d16768de0ae3b17c247bd23cf98092680125 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa80d16768de0ae3b17c247bd… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Dec 6 12:55:53 2012 +0100 wintrust/tests: Unify test message in case of a FALSE return. --- dlls/wintrust/tests/crypt.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/wintrust/tests/crypt.c b/dlls/wintrust/tests/crypt.c index bee89cb..8534ce1 100644 --- a/dlls/wintrust/tests/crypt.c +++ b/dlls/wintrust/tests/crypt.c @@ -203,7 +203,7 @@ static void test_context(void) /* NULL GUID */ ret = pCryptCATAdminAcquireContext(&hca, NULL, 0); - ok(ret, "Expected success\n"); + ok(ret, "Expected success, got FALSE with %d\n", GetLastError()); ok(hca != NULL, "Expected a context handle, got NULL\n"); /* All NULL */ @@ -273,23 +273,23 @@ static void test_context(void) } ret = pCryptCATAdminReleaseContext(hca, 0); - ok(ret, "Expected success\n"); + ok(ret, "Expected success, got FALSE with %d\n", GetLastError()); /* Correct context handle and GUID */ ret = pCryptCATAdminAcquireContext(&hca, &unknown, 0); - ok(ret, "Expected success\n"); + ok(ret, "Expected success, got FALSE with %d\n", GetLastError()); ok(hca != NULL, "Expected a context handle, got NULL\n"); ret = pCryptCATAdminReleaseContext(hca, 0); - ok(ret, "Expected success\n"); + ok(ret, "Expected success, got FALSE with %d\n", GetLastError()); /* Flags not equal to 0 */ ret = pCryptCATAdminAcquireContext(&hca, &unknown, 1); - ok(ret, "Expected success\n"); + ok(ret, "Expected success, got FALSE with %d\n", GetLastError()); ok(hca != NULL, "Expected a context handle, got NULL\n"); ret = pCryptCATAdminReleaseContext(hca, 0); - ok(ret, "Expected success\n"); + ok(ret, "Expected success, got FALSE with %d\n", GetLastError()); } /* TODO: Check whether SHA-1 is the algorithm that's always used */ @@ -340,7 +340,7 @@ static void test_calchash(void) ok(file != INVALID_HANDLE_VALUE, "CreateFile failed %u\n", GetLastError()); SetLastError(0xdeadbeef); ret = pCryptCATAdminCalcHashFromFileHandle(file, &hashsize, NULL, 0); - ok(ret, "Expected success %u\n", GetLastError()); + ok(ret, "Expected success, got FALSE with %d\n", GetLastError()); ok(hashsize == 20," Expected a hash size of 20, got %d\n", hashsize); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); @@ -354,7 +354,7 @@ static void test_calchash(void) hash = HeapAlloc(GetProcessHeap(), 0, hashsize); SetLastError(0xdeadbeef); ret = pCryptCATAdminCalcHashFromFileHandle(file, &hashsize, hash, 0); - ok(ret, "Expected success %u\n", GetLastError()); + ok(ret, "Expected success, got FALSE with %d\n", GetLastError()); ok(hashsize == 20," Expected a hash size of 20, got %d\n", hashsize); ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", GetLastError()); @@ -376,7 +376,7 @@ static void test_calchash(void) hash = HeapAlloc(GetProcessHeap(), 0, hashsize); SetLastError(0xdeadbeef); ret = pCryptCATAdminCalcHashFromFileHandle(file, &hashsize, hash, 0); - ok(ret, "Expected success\n"); + ok(ret, "Expected success, got FALSE with %d\n", GetLastError()); ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", GetLastError()); ok(hashsize == sizeof(expectedhash) && @@ -766,7 +766,7 @@ static void test_create_catalog_file(void) ret = pCryptCATCDFClose(catcdf); todo_wine { - ok(ret, "Expected success\n"); + ok(ret, "Expected success, got FALSE with %d\n", GetLastError()); ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", GetLastError()); }

1 0

Jacek Caban : msxml3: Use IUri for storing XMLHTTPRequest URL.
by Alexandre Julliard 06 Dec '12

06 Dec '12

Module: wine Branch: master Commit: b7a26db5758883c47129835f5812df273c29483a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7a26db5758883c47129835f5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 6 14:24:46 2012 +0100 msxml3: Use IUri for storing XMLHTTPRequest URL. --- dlls/msxml3/httprequest.c | 100 +++++++++++++++++++++++++------------------- 1 files changed, 57 insertions(+), 43 deletions(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index 7fbb836..848a470 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -82,8 +82,8 @@ typedef struct /* request */ BINDVERB verb; BSTR custom; - BSTR siteurl; - BSTR url; + IUri *uri; + IUri *base_uri; BOOL async; struct list reqheaders; /* cached resulting custom request headers string length in WCHARs */ @@ -736,7 +736,7 @@ static HRESULT BindStatusCallback_create(httprequest* This, BindStatusCallback * { IMoniker *moniker; - hr = CreateURLMoniker(NULL, This->url, &moniker); + hr = CreateURLMonikerEx2(NULL, This->uri, &moniker, URL_MK_UNIFORM); if (hr == S_OK) { IStream *stream; @@ -772,10 +772,14 @@ static HRESULT httprequest_open(httprequest *This, BSTR method, BSTR url, if (!method || !url) return E_INVALIDARG; /* free previously set data */ - SysFreeString(This->url); + if(This->uri) { + IUri_Release(This->uri); + This->uri = NULL; + } + SysFreeString(This->user); SysFreeString(This->password); - This->url = This->user = This->password = NULL; + This->user = This->password = NULL; if (!strcmpiW(method, MethodGetW)) { @@ -802,22 +806,14 @@ static HRESULT httprequest_open(httprequest *This, BSTR method, BSTR url, return E_FAIL; } - /* try to combine with site url */ - if (This->siteurl && PathIsRelativeW(url)) - { - DWORD len = INTERNET_MAX_URL_LENGTH; - WCHAR *fullW = heap_alloc(len*sizeof(WCHAR)); - - hr = UrlCombineW(This->siteurl, url, fullW, &len, 0); - if (hr == S_OK) - { - TRACE("combined url %s\n", debugstr_w(fullW)); - This->url = SysAllocString(fullW); - } - heap_free(fullW); - } + if(This->base_uri) + hr = CoInternetCombineUrlEx(This->base_uri, url, 0, &This->uri, 0); else - This->url = SysAllocString(url); + hr = CreateUri(url, 0, 0, &This->uri); + if(FAILED(hr)) { + WARN("Could not create IUri object: %08x\n", hr); + return hr; + } VariantInit(&is_async); hr = VariantChangeType(&is_async, &async, 0, VT_BOOL); @@ -1141,10 +1137,12 @@ static void httprequest_release(httprequest *This) if (This->site) IUnknown_Release( This->site ); + if (This->uri) + IUri_Release(This->uri); + if (This->base_uri) + IUri_Release(This->base_uri); SysFreeString(This->custom); - SysFreeString(This->siteurl); - SysFreeString(This->url); SysFreeString(This->user); SysFreeString(This->password); @@ -1444,6 +1442,38 @@ static HRESULT WINAPI httprequest_ObjectWithSite_GetSite( IObjectWithSite *iface return IUnknown_QueryInterface( This->site, iid, ppvSite ); } +static void get_base_uri(httprequest *This) +{ + IServiceProvider *provider; + IHTMLDocument2 *doc; + IUri *uri; + BSTR url; + HRESULT hr; + + hr = IUnknown_QueryInterface(This->site, &IID_IServiceProvider, (void**)&provider); + if(FAILED(hr)) + return; + + hr = IServiceProvider_QueryService(provider, &SID_SContainerDispatch, &IID_IHTMLDocument2, (void**)&doc); + IServiceProvider_Release(provider); + if(FAILED(hr)) + return; + + hr = IHTMLDocument2_get_URL(doc, &url); + IHTMLDocument2_Release(doc); + if(FAILED(hr) || !url || !*url) + return; + + TRACE("host url %s\n", debugstr_w(url)); + + hr = CreateUri(url, 0, 0, &uri); + SysFreeString(url); + if(FAILED(hr)) + return; + + This->base_uri = uri; +} + static HRESULT WINAPI httprequest_ObjectWithSite_SetSite( IObjectWithSite *iface, IUnknown *punk ) { httprequest *This = impl_from_IObjectWithSite(iface); @@ -1452,32 +1482,15 @@ static HRESULT WINAPI httprequest_ObjectWithSite_SetSite( IObjectWithSite *iface if(This->site) IUnknown_Release( This->site ); + if(This->base_uri) + IUri_Release(This->base_uri); - SysFreeString(This->siteurl); - This->siteurl = NULL; This->site = punk; if (punk) { - IServiceProvider *provider; - HRESULT hr; - IUnknown_AddRef( punk ); - - hr = IUnknown_QueryInterface(This->site, &IID_IServiceProvider, (void**)&provider); - if (hr == S_OK) - { - IHTMLDocument2 *doc; - - hr = IServiceProvider_QueryService(provider, &SID_SContainerDispatch, &IID_IHTMLDocument2, (void**)&doc); - if (hr == S_OK) - { - hr = IHTMLDocument2_get_URL(doc, &This->siteurl); - IHTMLDocument2_Release(doc); - TRACE("host url %s, 0x%08x\n", debugstr_w(This->siteurl), hr); - } - IServiceProvider_Release(provider); - } + get_base_uri(This); } return S_OK; @@ -1831,7 +1844,8 @@ static void init_httprequest(httprequest *req) req->async = FALSE; req->verb = -1; req->custom = NULL; - req->url = req->siteurl = req->user = req->password = NULL; + req->uri = req->base_uri = NULL; + req->user = req->password = NULL; req->state = READYSTATE_UNINITIALIZED; req->sink = NULL;

1 0

Jacek Caban : mshtml: Properly handle NULL value in set_nsstyle_attr.
by Alexandre Julliard 06 Dec '12

06 Dec '12

Module: wine Branch: master Commit: 10a832cc042075b828322ea94a58af14720954f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10a832cc042075b828322ea94… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 6 14:24:14 2012 +0100 mshtml: Properly handle NULL value in set_nsstyle_attr. --- dlls/mshtml/htmlstyle.c | 12 +++++++----- dlls/mshtml/tests/style.c | 13 +++++++++++++ 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 6427bee..95d7a88 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -351,16 +351,18 @@ static LPWSTR fix_url_value(LPCWSTR val) return ret; } -HRESULT set_nsstyle_attr(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, LPCWSTR value, DWORD flags) +HRESULT set_nsstyle_attr(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, const WCHAR *value, DWORD flags) { nsAString str_name, str_value, str_empty; LPWSTR val = NULL; nsresult nsres; - if(flags & ATTR_FIX_PX) - val = fix_px_value(value); - if(flags & ATTR_FIX_URL) - val = fix_url_value(value); + if(value) { + if(flags & ATTR_FIX_PX) + val = fix_px_value(value); + if(flags & ATTR_FIX_URL) + val = fix_url_value(value); + } nsAString_InitDepend(&str_name, style_tbl[sid].name); nsAString_InitDepend(&str_value, val ? val : value); diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index fd0f78e..08b3a3c 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -1052,6 +1052,19 @@ static void test_body_style(IHTMLStyle *style) ok(!strcmp_wa(V_BSTR(&v), "70px"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = NULL; + hres = IHTMLStyle_put_height(style, v); + ok(hres == S_OK, "put_height failed: %08x\n", hres); + VariantClear(&v); + + V_VT(&v) = VT_EMPTY; + hres = IHTMLStyle_get_height(style, &v); + ok(hres == S_OK, "get_height failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(v)=%d\n", V_VT(&v)); + ok(!V_BSTR(&v), "V_BSTR(v) = %s, expected NULL\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + V_VT(&v) = VT_I4; V_I4(&v) = 64; hres = IHTMLStyle_put_height(style, v);

1 0

Jacek Caban : mshtml: Added SID_SContainerDispatch support.
by Alexandre Julliard 06 Dec '12

06 Dec '12

Module: wine Branch: master Commit: 36a47dd0f2493ce5e0fcc594ace17933c1dbf3d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36a47dd0f2493ce5e0fcc594a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 6 14:24:02 2012 +0100 mshtml: Added SID_SContainerDispatch support. --- dlls/mshtml/script.c | 9 +++++++++ dlls/mshtml/tests/script.c | 17 +++++++++++++++++ 2 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 90f9ba0..82a230d 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -649,6 +649,15 @@ static HRESULT WINAPI ASServiceProvider_QueryService(IServiceProvider *iface, RE riid, ppv); } + if(IsEqualGUID(&SID_SContainerDispatch, guidService)) { + TRACE("(%p)->(SID_SContainerDispatch)\n", This); + + if(!This->window || !This->window->doc) + return E_NOINTERFACE; + + return IHTMLDocument2_QueryInterface(&This->window->doc->basedoc.IHTMLDocument2_iface, riid, ppv); + } + FIXME("(%p)->(%s %s %p)\n", This, debugstr_guid(guidService), debugstr_guid(riid), ppv); return E_NOINTERFACE; } diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index 2f8b8ec..af1103d 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -2104,6 +2104,22 @@ static void test_ui(void) IActiveScriptSiteUIControl_Release(ui_control); } +static void test_sp(void) +{ + IServiceProvider *sp; + IUnknown *unk; + HRESULT hres; + + hres = IActiveScriptSite_QueryInterface(site, &IID_IServiceProvider, (void**)&sp); + ok(hres == S_OK, "Could not get IServiceProvider iface: %08x\n", hres); + + hres = IServiceProvider_QueryService(sp, &SID_SContainerDispatch, &IID_IHTMLDocument, (void**)&unk); + ok(hres == S_OK, "Could not get SID_SContainerDispatch service: %08x\n", hres); + IUnknown_Release(unk); + + IServiceProvider_Release(sp); +} + static void test_script_run(void) { IDispatchEx *document, *dispex; @@ -2329,6 +2345,7 @@ static void test_script_run(void) test_security(); test_ui(); + test_sp(); } static HRESULT WINAPI ActiveScriptParse_ParseScriptText(IActiveScriptParse *iface,

1 0

Piotr Caban : msvcr80: Copy _encode_pointer and _decode_pointer functions from msvcp90.
by Alexandre Julliard 06 Dec '12

06 Dec '12

Module: wine Branch: master Commit: 718959e854508f4541e0df72b51f91711da84ac5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=718959e854508f4541e0df72b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 6 13:23:56 2012 +0100 msvcr80: Copy _encode_pointer and _decode_pointer functions from msvcp90. --- dlls/msvcr80/msvcr80.c | 10 ++++++++++ dlls/msvcr80/msvcr80.spec | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/msvcr80/msvcr80.c b/dlls/msvcr80/msvcr80.c index 3953e0e..89a665b 100644 --- a/dlls/msvcr80/msvcr80.c +++ b/dlls/msvcr80/msvcr80.c @@ -37,3 +37,13 @@ BOOL WINAPI DllMain(HINSTANCE hdll, DWORD reason, LPVOID reserved) } return TRUE; } + +void * CDECL MSVCR80__decode_pointer(void * ptr) +{ + return DecodePointer(ptr); +} + +void * CDECL MSVCR80__encode_pointer(void * ptr) +{ + return EncodePointer(ptr); +} diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 84c0f0d..e9274f5 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -415,7 +415,7 @@ @ varargs _cwscanf_s(wstr) msvcrt._cwscanf_s @ varargs _cwscanf_s_l(wstr ptr) msvcrt._cwscanf_s_l @ extern _daylight msvcrt._daylight -@ cdecl _decode_pointer(ptr) msvcr90._decode_pointer +@ cdecl _decode_pointer(ptr) MSVCR80__decode_pointer @ cdecl _difftime32(long long) msvcrt._difftime32 @ cdecl _difftime64(long long) msvcrt._difftime64 @ stub _dosmaperr @@ -425,7 +425,7 @@ @ cdecl _dupenv_s(ptr ptr str) msvcrt._dupenv_s @ cdecl _ecvt(double long ptr ptr) msvcrt._ecvt @ cdecl _ecvt_s(str long double long ptr ptr) msvcrt._ecvt_s -@ cdecl _encode_pointer(ptr) msvcr90._encode_pointer +@ cdecl _encode_pointer(ptr) MSVCR80__encode_pointer @ cdecl _encoded_null() msvcr100._encoded_null @ cdecl _endthread() msvcrt._endthread @ cdecl _endthreadex(long) msvcrt._endthreadex

1 0

Piotr Caban : tools: Update make_specfiles script.
by Alexandre Julliard 06 Dec '12

06 Dec '12

Module: wine Branch: master Commit: 9228d9794c0c31f030d605281e2f2fa759771172 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9228d9794c0c31f030d605281… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 6 13:23:23 2012 +0100 tools: Update make_specfiles script. --- tools/make_specfiles | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/make_specfiles b/tools/make_specfiles index fdba89d..93f5ff1 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -28,9 +28,9 @@ my @dll_groups = ( [ "msvcrt", - "msvcr90", - "msvcirt", "msvcr100", + "msvcirt", + "msvcr90", "msvcr80", "msvcr71", "msvcr70",

1 0

Piotr Caban : msvcr: Move msvcrXX specific functions implementation to msvcr100.
by Alexandre Julliard 06 Dec '12

06 Dec '12

Module: wine Branch: master Commit: e7944878e6f7d3ab22255546a6727161a62aade8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7944878e6f7d3ab22255546a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 6 13:22:50 2012 +0100 msvcr: Move msvcrXX specific functions implementation to msvcr100. --- dlls/msvcr100/msvcr100.c | 323 ++++++++++++++++++++++++++++++++++++++++++ dlls/msvcr100/msvcr100.spec | 42 +++--- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 42 +++--- dlls/msvcr90/msvcr90.c | 329 ------------------------------------------- dlls/msvcr90/msvcr90.spec | 42 +++--- 7 files changed, 388 insertions(+), 394 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e7944878e6f7d3ab22255…

1 0

← Newer
1
...
40
41
42
43
44
45
46
...
55
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 December 2012