wine-commits December 2012

wine-commits@winehq.org

2 participants
549 discussions

Nikolay Sivov : shlwapi: Implement IsCharSpaceA().
by Alexandre Julliard 20 Dec '12

20 Dec '12

Module: wine Branch: master Commit: 16cc2b87530947415dcff6e545bdd77a232edbb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16cc2b87530947415dcff6e54… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 20 08:43:27 2012 +0400 shlwapi: Implement IsCharSpaceA(). --- dlls/shlwapi/ordinal.c | 19 ------------------- dlls/shlwapi/shlwapi.spec | 1 + dlls/shlwapi/string.c | 25 +++++++++++++++++++++++++ include/shlwapi.h | 4 ++++ 4 files changed, 30 insertions(+), 19 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 88f415b..19ab3d9 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -638,25 +638,6 @@ INT WINAPI SHStringFromGUIDW(REFGUID guid, LPWSTR lpszDest, INT cchMax) } /************************************************************************* - * @ [SHLWAPI.29] - * - * Determine if a Unicode character is a space. - * - * PARAMS - * wc [I] Character to check. - * - * RETURNS - * TRUE, if wc is a space, - * FALSE otherwise. - */ -BOOL WINAPI IsCharSpaceW(WCHAR wc) -{ - WORD CharType; - - return GetStringTypeW(CT_CTYPE1, &wc, 1, &CharType) && (CharType & C1_SPACE); -} - -/************************************************************************* * @ [SHLWAPI.30] * * Determine if a Unicode character is a blank. diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index 025d48a..bf33e62 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -566,6 +566,7 @@ @ stdcall HashData (ptr long ptr long) @ stdcall IntlStrEqWorkerA(long str str long) StrIsIntlEqualA @ stdcall IntlStrEqWorkerW(long wstr wstr long) StrIsIntlEqualW +@ stdcall IsCharSpaceA(long) @ stdcall PathAddBackslashA (str) @ stdcall PathAddBackslashW (wstr) @ stdcall PathAddExtensionA (str str) diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c index 18606ce..1a4ad14 100644 --- a/dlls/shlwapi/string.c +++ b/dlls/shlwapi/string.c @@ -2824,3 +2824,28 @@ end: HeapFree(GetProcessHeap(), 0, dllname); return hr; } + +BOOL WINAPI IsCharSpaceA(CHAR c) +{ + WORD CharType; + return GetStringTypeA(GetSystemDefaultLCID(), CT_CTYPE1, &c, 1, &CharType) && (CharType & C1_SPACE); +} + +/************************************************************************* + * @ [SHLWAPI.29] + * + * Determine if a Unicode character is a space. + * + * PARAMS + * wc [I] Character to check. + * + * RETURNS + * TRUE, if wc is a space, + * FALSE otherwise. + */ +BOOL WINAPI IsCharSpaceW(WCHAR wc) +{ + WORD CharType; + + return GetStringTypeW(CT_CTYPE1, &wc, 1, &CharType) && (CharType & C1_SPACE); +} diff --git a/include/shlwapi.h b/include/shlwapi.h index 067ef7b..a1436fa 100644 --- a/include/shlwapi.h +++ b/include/shlwapi.h @@ -935,6 +935,10 @@ HRESULT WINAPI StrRetToBufW(STRRET*,LPCITEMIDLIST,LPWSTR,UINT); HRESULT WINAPI StrRetToBSTR(STRRET*,LPCITEMIDLIST,BSTR*); +BOOL WINAPI IsCharSpaceA(CHAR); +BOOL WINAPI IsCharSpaceW(WCHAR); +#define IsCharSpace WINELIB_NAME_AW(IsCharSpace) + #endif /* NO_SHLWAPI_STRFCNS */

1 0

Nikolay Sivov : msxml3: More tests for DISPID_VALUE properties handling.
by Alexandre Julliard 20 Dec '12

20 Dec '12

Module: wine Branch: master Commit: 83e87a323202b3ee5d91400f8046d66442074f9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=83e87a323202b3ee5d91400f8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 20 13:12:03 2012 +0400 msxml3: More tests for DISPID_VALUE properties handling. --- dlls/msxml3/tests/domdoc.c | 138 +++++++++++++++++++++++++++++++++++++++++++- dlls/msxml3/tests/schema.c | 22 +++++++ 2 files changed, 157 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index d846db5..23ee499 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -9475,6 +9475,10 @@ static void test_mxnamespacemanager(void) hr = IVBMXNamespaceManager_getDeclaredPrefixes(mgr2, &prefixes); if (hr == S_OK) { + IDispatchEx *dispex; + VARIANT arg, ret; + DISPPARAMS dispparams; + ok(prefixes != NULL, "got %p\n", prefixes); EXPECT_REF(nsmgr, 2); EXPECT_REF(mgr2, 2); @@ -9488,6 +9492,25 @@ static void test_mxnamespacemanager(void) IUnknown_Release(unk1); IUnknown_Release(unk2); + + hr = IMXNamespacePrefixes_QueryInterface(prefixes, &IID_IDispatchEx, (void**)&dispex); + ok(hr == S_OK, "got 0x%08x\n", hr); + + V_VT(&arg) = VT_I4; + V_I4(&arg) = 0; + dispparams.cArgs = 1; + dispparams.cNamedArgs = 0; + dispparams.rgdispidNamedArgs = NULL; + dispparams.rgvarg = &arg; + + V_VT(&ret) = VT_EMPTY; + V_DISPATCH(&ret) = (void*)0x1; + hr = IDispatchEx_Invoke(dispex, DISPID_VALUE, &IID_NULL, 0, DISPATCH_METHOD, &dispparams, &ret, NULL, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&ret) == VT_DISPATCH, "got %d\n", V_VT(&ret)); + ok(V_DISPATCH(&ret) == NULL, "got %p\n", V_DISPATCH(&ret)); + + IDispatchEx_Release(dispex); IMXNamespacePrefixes_Release(prefixes); } IVBMXNamespaceManager_Release(mgr2); @@ -10004,7 +10027,7 @@ static void test_dispex(void) ok(did == DISPID_VALUE, "got %d\n", did); V_VT(&arg) = VT_I4; - V_I2(&arg) = 0; + V_I4(&arg) = 0; dispparams.cArgs = 0; dispparams.cNamedArgs = 0; dispparams.rgdispidNamedArgs = NULL; @@ -10018,7 +10041,7 @@ static void test_dispex(void) ok(V_DISPATCH(&ret) == (void*)0x1, "got %p\n", V_DISPATCH(&ret)); V_VT(&arg) = VT_I4; - V_I2(&arg) = 0; + V_I4(&arg) = 0; dispparams.cArgs = 2; dispparams.cNamedArgs = 0; dispparams.rgdispidNamedArgs = NULL; @@ -10032,7 +10055,7 @@ static void test_dispex(void) ok(V_DISPATCH(&ret) == (void*)0x1, "got %p\n", V_DISPATCH(&ret)); V_VT(&arg) = VT_I4; - V_I2(&arg) = 0; + V_I4(&arg) = 0; dispparams.cArgs = 1; dispparams.cNamedArgs = 0; dispparams.rgdispidNamedArgs = NULL; @@ -10090,6 +10113,26 @@ static void test_dispex(void) EXPECT_HR(hr, S_OK); IXMLDOMParseError_QueryInterface(error, &IID_IUnknown, (void**)&unk); test_domobj_dispex(unk); + + hr = IXMLDOMParseError_QueryInterface(error, &IID_IDispatchEx, (void**)&dispex); + ok(hr == S_OK, "got 0x%08x\n", hr); + + V_VT(&arg) = VT_I4; + V_I4(&arg) = 0; + dispparams.cArgs = 1; + dispparams.cNamedArgs = 0; + dispparams.rgdispidNamedArgs = NULL; + dispparams.rgvarg = &arg; + + V_VT(&ret) = VT_EMPTY; + V_DISPATCH(&ret) = (void*)0x1; + hr = IDispatchEx_Invoke(dispex, DISPID_VALUE, &IID_NULL, 0, DISPATCH_METHOD, &dispparams, &ret, NULL, NULL); + ok(hr == DISP_E_MEMBERNOTFOUND, "got 0x%08x\n", hr); + ok(V_VT(&ret) == VT_EMPTY, "got %d\n", V_VT(&ret)); + ok(V_DISPATCH(&ret) == (void*)0x1, "got %p\n", V_DISPATCH(&ret)); + + IDispatchEx_Release(dispex); + IUnknown_Release(unk); IXMLDOMParseError_Release(error); @@ -10142,6 +10185,95 @@ static void test_dispex(void) ok(did == DISPID_DOM_COLLECTION_BASE+1, "got 0x%08x\n", did); IDispatchEx_Release(dispex); + did = -1; + hr = IDispatchEx_GetDispID(dispex, _bstr_("item"), 0, &did); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(did == DISPID_VALUE, "got %d\n", did); + + V_VT(&arg) = VT_I4; + V_I4(&arg) = 0; + dispparams.cArgs = 0; + dispparams.cNamedArgs = 0; + dispparams.rgdispidNamedArgs = NULL; + dispparams.rgvarg = &arg; + + V_VT(&ret) = VT_EMPTY; + V_DISPATCH(&ret) = (void*)0x1; + hr = IDispatchEx_Invoke(dispex, DISPID_VALUE, &IID_NULL, 0, DISPATCH_METHOD, &dispparams, &ret, NULL, NULL); +todo_wine { + ok(hr == DISP_E_BADPARAMCOUNT, "got 0x%08x\n", hr); + ok(V_VT(&ret) == VT_EMPTY, "got %d\n", V_VT(&ret)); + ok(V_DISPATCH(&ret) == (void*)0x1, "got %p\n", V_DISPATCH(&ret)); +} + V_VT(&arg) = VT_I4; + V_I4(&arg) = 0; + dispparams.cArgs = 2; + dispparams.cNamedArgs = 0; + dispparams.rgdispidNamedArgs = NULL; + dispparams.rgvarg = &arg; + + V_VT(&ret) = VT_EMPTY; + V_DISPATCH(&ret) = (void*)0x1; + hr = IDispatchEx_Invoke(dispex, DISPID_VALUE, &IID_NULL, 0, DISPATCH_METHOD, &dispparams, &ret, NULL, NULL); +todo_wine { + ok(hr == DISP_E_BADPARAMCOUNT, "got 0x%08x\n", hr); + ok(V_VT(&ret) == VT_EMPTY, "got %d\n", V_VT(&ret)); + ok(V_DISPATCH(&ret) == (void*)0x1, "got %p\n", V_DISPATCH(&ret)); +} + V_VT(&arg) = VT_I4; + V_I4(&arg) = 0; + dispparams.cArgs = 1; + dispparams.cNamedArgs = 0; + dispparams.rgdispidNamedArgs = NULL; + dispparams.rgvarg = &arg; + + V_VT(&ret) = VT_EMPTY; + V_DISPATCH(&ret) = (void*)0x1; + hr = IDispatchEx_Invoke(dispex, DISPID_VALUE, &IID_NULL, 0, DISPATCH_METHOD, &dispparams, &ret, NULL, NULL); +todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&ret) == VT_DISPATCH, "got %d\n", V_VT(&ret)); + ok(V_DISPATCH(&ret) == NULL, "got %p\n", V_DISPATCH(&ret)); + + V_VT(&ret) = VT_EMPTY; + V_DISPATCH(&ret) = (void*)0x1; + hr = IDispatchEx_Invoke(dispex, DISPID_VALUE, &IID_NULL, 0, DISPATCH_PROPERTYGET, &dispparams, &ret, NULL, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&ret) == VT_DISPATCH, "got %d\n", V_VT(&ret)); + ok(V_DISPATCH(&ret) == NULL, "got %p\n", V_DISPATCH(&ret)); + + V_VT(&ret) = VT_EMPTY; + V_DISPATCH(&ret) = (void*)0x1; + hr = IDispatchEx_Invoke(dispex, DISPID_VALUE, &IID_NULL, 0, DISPATCH_PROPERTYGET|DISPATCH_METHOD, &dispparams, &ret, NULL, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&ret) == VT_DISPATCH, "got %d\n", V_VT(&ret)); + ok(V_DISPATCH(&ret) == NULL, "got %p\n", V_DISPATCH(&ret)); + + dispparams.cArgs = 0; + dispparams.cNamedArgs = 0; + dispparams.rgdispidNamedArgs = NULL; + dispparams.rgvarg = NULL; + + V_VT(&ret) = VT_EMPTY; + V_I4(&ret) = 1; + hr = IDispatchEx_Invoke(dispex, DISPID_DOM_NODELIST_LENGTH, &IID_NULL, 0, DISPATCH_PROPERTYGET, &dispparams, &ret, NULL, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&ret) == VT_I4, "got %d\n", V_VT(&ret)); + ok(V_I4(&ret) == 0, "got %d\n", V_I4(&ret)); + + dispparams.cArgs = 0; + dispparams.cNamedArgs = 0; + dispparams.rgdispidNamedArgs = NULL; + dispparams.rgvarg = NULL; + + V_VT(&ret) = VT_EMPTY; + V_I4(&ret) = 1; + hr = IDispatchEx_Invoke(dispex, DISPID_DOM_NODELIST_LENGTH, &IID_NULL, 0, DISPATCH_METHOD, &dispparams, &ret, NULL, NULL); + ok(hr == DISP_E_MEMBERNOTFOUND, "got 0x%08x\n", hr); +todo_wine { + ok(V_VT(&ret) == VT_EMPTY, "got %d\n", V_VT(&ret)); + ok(V_I4(&ret) == 1, "got %d\n", V_I4(&ret)); +} IXMLDOMNamedNodeMap_Release(map); IXMLDOMElement_Release(elem); diff --git a/dlls/msxml3/tests/schema.c b/dlls/msxml3/tests/schema.c index c350267..fe6e6b6 100644 --- a/dlls/msxml3/tests/schema.c +++ b/dlls/msxml3/tests/schema.c @@ -1463,8 +1463,11 @@ static void test_obj_dispex(IUnknown *obj) static void test_dispex(void) { IXMLDOMSchemaCollection *cache; + IDispatchEx *dispex; IUnknown *unk; HRESULT hr; + DISPPARAMS dispparams; + VARIANT arg, ret; cache = create_cache(&IID_IXMLDOMSchemaCollection); if (!cache) return; @@ -1474,6 +1477,25 @@ static void test_dispex(void) test_obj_dispex(unk); IUnknown_Release(unk); + hr = IXMLDOMSchemaCollection_QueryInterface(cache, &IID_IDispatchEx, (void**)&dispex); + ok(hr == S_OK, "got 0x%08x\n", hr); + + V_VT(&arg) = VT_I4; + V_I4(&arg) = 0; + dispparams.cArgs = 1; + dispparams.cNamedArgs = 0; + dispparams.rgdispidNamedArgs = NULL; + dispparams.rgvarg = &arg; + + V_VT(&ret) = VT_EMPTY; + V_DISPATCH(&ret) = (void*)0x1; + hr = IDispatchEx_Invoke(dispex, DISPID_VALUE, &IID_NULL, 0, DISPATCH_METHOD, &dispparams, &ret, NULL, NULL); + ok(hr == DISP_E_MEMBERNOTFOUND, "got 0x%08x\n", hr); + ok(V_VT(&ret) == VT_EMPTY, "got %d\n", V_VT(&ret)); + ok(V_DISPATCH(&ret) == (void*)0x1, "got %p\n", V_DISPATCH(&ret)); + + IDispatchEx_Release(dispex); + IXMLDOMSchemaCollection_Release(cache); }

1 0

Alistair Leslie-Hughes : oleaut32: Don' t output an error when the typelib cannot be found.
by Alexandre Julliard 20 Dec '12

20 Dec '12

Module: wine Branch: master Commit: f20427361c77e08ee852b0d304b5e2fef696491e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f20427361c77e08ee852b0d30… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Dec 14 14:05:09 2012 +1100 oleaut32: Don't output an error when the typelib cannot be found. --- dlls/oleaut32/typelib.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index fa9b050..722b0c4 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -2544,9 +2544,10 @@ static HRESULT TLB_PEFile_Open(LPCWSTR path, INT index, LPVOID *ppBase, DWORD *p return S_OK; } } - - hr = E_FAIL; } + + TRACE("No TYPELIB resource found\n"); + hr = E_FAIL; } TLB_PEFile_Release((IUnknown *)&This->lpvtbl); @@ -2949,8 +2950,6 @@ static HRESULT TLB_ReadTypeLib(LPCWSTR pszFileName, LPWSTR pszPath, UINT cchPath ret = TYPE_E_CANTLOADLIBRARY; IUnknown_Release(pFile); } - else - ret = TYPE_E_CANTLOADLIBRARY; if(*ppTypeLib) { ITypeLibImpl *impl = (ITypeLibImpl*)*ppTypeLib; @@ -2966,8 +2965,15 @@ static HRESULT TLB_ReadTypeLib(LPCWSTR pszFileName, LPWSTR pszPath, UINT cchPath list_add_head(&tlb_cache, &impl->entry); LeaveCriticalSection(&cache_section); ret = S_OK; - } else - ERR("Loading of typelib %s failed with error %d\n", debugstr_w(pszFileName), GetLastError()); + } + else + { + if(ret != E_FAIL) + ERR("Loading of typelib %s failed with error %d\n", debugstr_w(pszFileName), GetLastError()); + + ret = TYPE_E_CANTLOADLIBRARY; + } + return ret; }

1 0

Detlef Riekenberg : api-ms-win-downlevel-ole32-l1-1-0.dll: Add dll.
by Alexandre Julliard 20 Dec '12

20 Dec '12

Module: wine Branch: master Commit: cdec918b2600cc27296b1b0170ed5994868e513d URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdec918b2600cc27296b1b017… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Dec 20 08:50:01 2012 +0100 api-ms-win-downlevel-ole32-l1-1-0.dll: Add dll. --- configure | 1 + configure.ac | 1 + dlls/api-ms-win-downlevel-ole32-l1-1-0/Makefile.in | 3 + .../api-ms-win-downlevel-ole32-l1-1-0.spec | 48 ++++++++++++++++++++ tools/make_specfiles | 4 ++ 5 files changed, 57 insertions(+), 0 deletions(-) diff --git a/configure b/configure index a3453fa..3c5dccd 100755 --- a/configure +++ b/configure @@ -15352,6 +15352,7 @@ wine_fn_config_dll amstream enable_amstream wine_fn_config_test dlls/amstream/tests amstream_test wine_fn_config_dll api-ms-win-downlevel-advapi32-l1-1-0 enable_api_ms_win_downlevel_advapi32_l1_1_0 wine_fn_config_dll api-ms-win-downlevel-normaliz-l1-1-0 enable_api_ms_win_downlevel_normaliz_l1_1_0 +wine_fn_config_dll api-ms-win-downlevel-ole32-l1-1-0 enable_api_ms_win_downlevel_ole32_l1_1_0 wine_fn_config_dll api-ms-win-downlevel-shlwapi-l1-1-0 enable_api_ms_win_downlevel_shlwapi_l1_1_0 wine_fn_config_dll api-ms-win-downlevel-user32-l1-1-0 enable_api_ms_win_downlevel_user32_l1_1_0 wine_fn_config_dll api-ms-win-downlevel-version-l1-1-0 enable_api_ms_win_downlevel_version_l1_1_0 diff --git a/configure.ac b/configure.ac index 6642d38..4c2c45f 100644 --- a/configure.ac +++ b/configure.ac @@ -2531,6 +2531,7 @@ WINE_CONFIG_DLL(amstream) WINE_CONFIG_TEST(dlls/amstream/tests) WINE_CONFIG_DLL(api-ms-win-downlevel-advapi32-l1-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-normaliz-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-downlevel-ole32-l1-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-shlwapi-l1-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-user32-l1-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-version-l1-1-0) diff --git a/dlls/api-ms-win-downlevel-ole32-l1-1-0/Makefile.in b/dlls/api-ms-win-downlevel-ole32-l1-1-0/Makefile.in new file mode 100644 index 0000000..813b82d --- /dev/null +++ b/dlls/api-ms-win-downlevel-ole32-l1-1-0/Makefile.in @@ -0,0 +1,3 @@ +MODULE = api-ms-win-downlevel-ole32-l1-1-0.dll + +@MAKE_DLL_RULES@ diff --git a/dlls/api-ms-win-downlevel-ole32-l1-1-0/api-ms-win-downlevel-ole32-l1-1-0.spec b/dlls/api-ms-win-downlevel-ole32-l1-1-0/api-ms-win-downlevel-ole32-l1-1-0.spec new file mode 100644 index 0000000..a0eabe9 --- /dev/null +++ b/dlls/api-ms-win-downlevel-ole32-l1-1-0/api-ms-win-downlevel-ole32-l1-1-0.spec @@ -0,0 +1,48 @@ +@ stdcall CLSIDFromProgID(wstr ptr) ole32.CLSIDFromProgID +@ stdcall CLSIDFromString(wstr ptr) ole32.CLSIDFromString +@ stdcall CoCopyProxy(ptr ptr) ole32.CoCopyProxy +@ stdcall CoCreateFreeThreadedMarshaler(ptr ptr) ole32.CoCreateFreeThreadedMarshaler +@ stdcall CoCreateGuid(ptr) ole32.CoCreateGuid +@ stdcall CoCreateInstance(ptr ptr long ptr ptr) ole32.CoCreateInstance +@ stdcall CoCreateInstanceEx(ptr ptr long ptr long ptr) ole32.CoCreateInstanceEx +@ stdcall CoDisconnectObject(ptr long) ole32.CoDisconnectObject +@ stdcall CoFreeUnusedLibraries() ole32.CoFreeUnusedLibraries +@ stdcall CoFreeUnusedLibrariesEx(long long) ole32.CoFreeUnusedLibrariesEx +@ stub CoGetApartmentType +@ stdcall CoGetClassObject(ptr long ptr ptr ptr) ole32.CoGetClassObject +@ stdcall CoGetCurrentLogicalThreadId(ptr) ole32.CoGetCurrentLogicalThreadId +@ stdcall CoGetInterfaceAndReleaseStream(ptr ptr ptr) ole32.CoGetInterfaceAndReleaseStream +@ stdcall CoGetMalloc(long ptr) ole32.CoGetMalloc +@ stdcall CoGetMarshalSizeMax(ptr ptr ptr long ptr long) ole32.CoGetMarshalSizeMax +@ stdcall CoGetObjectContext(ptr ptr) ole32.CoGetObjectContext +@ stub CoGetStdMarshalEx +@ stdcall CoGetTreatAsClass(ptr ptr) ole32.CoGetTreatAsClass +@ stdcall CoImpersonateClient() ole32.CoImpersonateClient +@ stdcall CoInitializeEx(ptr long) ole32.CoInitializeEx +@ stdcall CoInitializeSecurity(ptr long ptr ptr long long ptr long ptr) ole32.CoInitializeSecurity +@ stdcall CoMarshalInterface(ptr ptr ptr long ptr long) ole32.CoMarshalInterface +@ stdcall CoMarshalInterThreadInterfaceInStream(ptr ptr ptr) ole32.CoMarshalInterThreadInterfaceInStream +@ stdcall CoRegisterClassObject(ptr ptr long long ptr) ole32.CoRegisterClassObject +@ stdcall CoRegisterInitializeSpy(ptr ptr) ole32.CoRegisterInitializeSpy +@ stdcall CoRegisterMessageFilter(ptr ptr) ole32.CoRegisterMessageFilter +@ stdcall CoReleaseMarshalData(ptr) ole32.CoReleaseMarshalData +@ stdcall CoRevertToSelf() ole32.CoRevertToSelf +@ stdcall CoRevokeClassObject(long) ole32.CoRevokeClassObject +@ stdcall CoRevokeInitializeSpy(int64) ole32.CoRevokeInitializeSpy +@ stdcall CoSetProxyBlanket(ptr long long ptr long long ptr long) ole32.CoSetProxyBlanket +@ stdcall CoTaskMemAlloc(long) ole32.CoTaskMemAlloc +@ stdcall CoTaskMemFree(ptr) ole32.CoTaskMemFree +@ stdcall CoTaskMemRealloc(ptr long) ole32.CoTaskMemRealloc +@ stdcall CoUninitialize() ole32.CoUninitialize +@ stdcall CoUnmarshalInterface(ptr ptr ptr) ole32.CoUnmarshalInterface +@ stdcall CoWaitForMultipleHandles(long long long ptr ptr) ole32.CoWaitForMultipleHandles +@ stdcall CreateStreamOnHGlobal(ptr long ptr) ole32.CreateStreamOnHGlobal +@ stdcall FreePropVariantArray(long ptr) ole32.FreePropVariantArray +@ stdcall GetHGlobalFromStream(ptr ptr) ole32.GetHGlobalFromStream +@ stdcall IIDFromString(wstr ptr) ole32.IIDFromString +@ stdcall ProgIDFromCLSID(ptr ptr) ole32.ProgIDFromCLSID +@ stdcall PropVariantClear(ptr) ole32.PropVariantClear +@ stdcall PropVariantCopy(ptr ptr) ole32.PropVariantCopy +@ stdcall StringFromCLSID(ptr ptr) ole32.StringFromCLSID +@ stdcall StringFromGUID2(ptr ptr long) ole32.StringFromGUID2 +@ stdcall StringFromIID(ptr ptr) ole32.StringFromIID diff --git a/tools/make_specfiles b/tools/make_specfiles index 11157ad..b24280e 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -125,6 +125,10 @@ my @dll_groups = "api-ms-win-downlevel-normaliz-l1-1-0", ], [ + "ole32", + "api-ms-win-downlevel-ole32-l1-1-0", + ], + [ "shlwapi", "api-ms-win-downlevel-shlwapi-l1-1-0", ],

1 0

Detlef Riekenberg : api-ms-win-downlevel-normaliz-l1-1-0: Add dll.
by Alexandre Julliard 20 Dec '12

20 Dec '12

Module: wine Branch: master Commit: dcce81854068e054cbc56b6bfc9baa520e43b803 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcce81854068e054cbc56b6bf… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Dec 20 08:50:00 2012 +0100 api-ms-win-downlevel-normaliz-l1-1-0: Add dll. --- configure | 1 + configure.ac | 1 + .../Makefile.in | 3 +++ .../api-ms-win-downlevel-normaliz-l1-1-0.spec | 2 ++ tools/make_specfiles | 4 ++++ 5 files changed, 11 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 7041f83..a3453fa 100755 --- a/configure +++ b/configure @@ -15351,6 +15351,7 @@ wine_fn_config_test dlls/advpack/tests advpack_test wine_fn_config_dll amstream enable_amstream wine_fn_config_test dlls/amstream/tests amstream_test wine_fn_config_dll api-ms-win-downlevel-advapi32-l1-1-0 enable_api_ms_win_downlevel_advapi32_l1_1_0 +wine_fn_config_dll api-ms-win-downlevel-normaliz-l1-1-0 enable_api_ms_win_downlevel_normaliz_l1_1_0 wine_fn_config_dll api-ms-win-downlevel-shlwapi-l1-1-0 enable_api_ms_win_downlevel_shlwapi_l1_1_0 wine_fn_config_dll api-ms-win-downlevel-user32-l1-1-0 enable_api_ms_win_downlevel_user32_l1_1_0 wine_fn_config_dll api-ms-win-downlevel-version-l1-1-0 enable_api_ms_win_downlevel_version_l1_1_0 diff --git a/configure.ac b/configure.ac index fa15fb6..6642d38 100644 --- a/configure.ac +++ b/configure.ac @@ -2530,6 +2530,7 @@ WINE_CONFIG_TEST(dlls/advpack/tests) WINE_CONFIG_DLL(amstream) WINE_CONFIG_TEST(dlls/amstream/tests) WINE_CONFIG_DLL(api-ms-win-downlevel-advapi32-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-downlevel-normaliz-l1-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-shlwapi-l1-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-user32-l1-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-version-l1-1-0) diff --git a/dlls/api-ms-win-downlevel-normaliz-l1-1-0/Makefile.in b/dlls/api-ms-win-downlevel-normaliz-l1-1-0/Makefile.in new file mode 100644 index 0000000..0fce8ac --- /dev/null +++ b/dlls/api-ms-win-downlevel-normaliz-l1-1-0/Makefile.in @@ -0,0 +1,3 @@ +MODULE = api-ms-win-downlevel-normaliz-l1-1-0.dll + +@MAKE_DLL_RULES@ diff --git a/dlls/api-ms-win-downlevel-normaliz-l1-1-0/api-ms-win-downlevel-normaliz-l1-1-0.spec b/dlls/api-ms-win-downlevel-normaliz-l1-1-0/api-ms-win-downlevel-normaliz-l1-1-0.spec new file mode 100644 index 0000000..04e68b6 --- /dev/null +++ b/dlls/api-ms-win-downlevel-normaliz-l1-1-0/api-ms-win-downlevel-normaliz-l1-1-0.spec @@ -0,0 +1,2 @@ +@ stdcall IdnToAscii(long wstr long ptr long) kernel32.IdnToAscii +@ stdcall IdnToUnicode(long wstr long ptr long) kernel32.IdnToUnicode diff --git a/tools/make_specfiles b/tools/make_specfiles index 20453ba..11157ad 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -121,6 +121,10 @@ my @dll_groups = "api-ms-win-downlevel-advapi32-l1-1-0", ], [ + "kernel32", + "api-ms-win-downlevel-normaliz-l1-1-0", + ], + [ "shlwapi", "api-ms-win-downlevel-shlwapi-l1-1-0", ],

1 0

Detlef Riekenberg : api-ms-win-downlevel-user32-l1-1-0: Add dll.
by Alexandre Julliard 20 Dec '12

20 Dec '12

Module: wine Branch: master Commit: 5b5e8d9b680e57f2d870b90ce3186b3c5530fcb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b5e8d9b680e57f2d870b90ce… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Dec 20 08:49:59 2012 +0100 api-ms-win-downlevel-user32-l1-1-0: Add dll. --- configure | 1 + configure.ac | 1 + .../api-ms-win-downlevel-user32-l1-1-0/Makefile.in | 3 ++ .../api-ms-win-downlevel-user32-l1-1-0.spec | 22 ++++++++++++++++++++ tools/make_specfiles | 4 +++ 5 files changed, 31 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 595ea7d..7041f83 100755 --- a/configure +++ b/configure @@ -15352,6 +15352,7 @@ wine_fn_config_dll amstream enable_amstream wine_fn_config_test dlls/amstream/tests amstream_test wine_fn_config_dll api-ms-win-downlevel-advapi32-l1-1-0 enable_api_ms_win_downlevel_advapi32_l1_1_0 wine_fn_config_dll api-ms-win-downlevel-shlwapi-l1-1-0 enable_api_ms_win_downlevel_shlwapi_l1_1_0 +wine_fn_config_dll api-ms-win-downlevel-user32-l1-1-0 enable_api_ms_win_downlevel_user32_l1_1_0 wine_fn_config_dll api-ms-win-downlevel-version-l1-1-0 enable_api_ms_win_downlevel_version_l1_1_0 wine_fn_config_dll apphelp enable_apphelp wine_fn_config_test dlls/apphelp/tests apphelp_test diff --git a/configure.ac b/configure.ac index 6e99a46..fa15fb6 100644 --- a/configure.ac +++ b/configure.ac @@ -2531,6 +2531,7 @@ WINE_CONFIG_DLL(amstream) WINE_CONFIG_TEST(dlls/amstream/tests) WINE_CONFIG_DLL(api-ms-win-downlevel-advapi32-l1-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-shlwapi-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-downlevel-user32-l1-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-version-l1-1-0) WINE_CONFIG_DLL(apphelp) WINE_CONFIG_TEST(dlls/apphelp/tests) diff --git a/dlls/api-ms-win-downlevel-user32-l1-1-0/Makefile.in b/dlls/api-ms-win-downlevel-user32-l1-1-0/Makefile.in new file mode 100644 index 0000000..eca911a --- /dev/null +++ b/dlls/api-ms-win-downlevel-user32-l1-1-0/Makefile.in @@ -0,0 +1,3 @@ +MODULE = api-ms-win-downlevel-user32-l1-1-0.dll + +@MAKE_DLL_RULES@ diff --git a/dlls/api-ms-win-downlevel-user32-l1-1-0/api-ms-win-downlevel-user32-l1-1-0.spec b/dlls/api-ms-win-downlevel-user32-l1-1-0/api-ms-win-downlevel-user32-l1-1-0.spec new file mode 100644 index 0000000..182d964 --- /dev/null +++ b/dlls/api-ms-win-downlevel-user32-l1-1-0/api-ms-win-downlevel-user32-l1-1-0.spec @@ -0,0 +1,22 @@ +@ stdcall CharLowerA(str) user32.CharLowerA +@ stdcall CharLowerBuffA(str long) user32.CharLowerBuffA +@ stdcall CharLowerBuffW(wstr long) user32.CharLowerBuffW +@ stdcall CharLowerW(wstr) user32.CharLowerW +@ stdcall CharNextA(str) user32.CharNextA +@ stdcall CharNextExA(long str long) user32.CharNextExA +@ stdcall CharNextW(wstr) user32.CharNextW +@ stdcall CharPrevA(str str) user32.CharPrevA +@ stdcall CharPrevExA(long str str long) user32.CharPrevExA +@ stdcall CharPrevW(wstr wstr) user32.CharPrevW +@ stdcall CharUpperA(str) user32.CharUpperA +@ stdcall CharUpperBuffA(str long) user32.CharUpperBuffA +@ stdcall CharUpperBuffW(wstr long) user32.CharUpperBuffW +@ stdcall CharUpperW(wstr) user32.CharUpperW +@ stdcall IsCharAlphaA(long) user32.IsCharAlphaA +@ stdcall IsCharAlphaNumericA(long) user32.IsCharAlphaNumericA +@ stdcall IsCharAlphaNumericW(long) user32.IsCharAlphaNumericW +@ stdcall IsCharAlphaW(long) user32.IsCharAlphaW +@ stdcall IsCharLowerA(long) user32.IsCharLowerA +@ stdcall IsCharLowerW(long) user32.IsCharLowerW +@ stdcall IsCharUpperA(long) user32.IsCharUpperA +@ stdcall IsCharUpperW(long) user32.IsCharUpperW diff --git a/tools/make_specfiles b/tools/make_specfiles index b5937be..20453ba 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -125,6 +125,10 @@ my @dll_groups = "api-ms-win-downlevel-shlwapi-l1-1-0", ], [ + "user32", + "api-ms-win-downlevel-user32-l1-1-0", + ], + [ "version", "api-ms-win-downlevel-version-l1-1-0", ],

1 0

Detlef Riekenberg : api-ms-win-downlevel-version-l1-1-0: Add dll.
by Alexandre Julliard 20 Dec '12

20 Dec '12

Module: wine Branch: master Commit: f8c041fef40b573b8f3ebfb33afa0870d37e6e49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8c041fef40b573b8f3ebfb33… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Dec 20 08:49:58 2012 +0100 api-ms-win-downlevel-version-l1-1-0: Add dll. --- configure | 1 + configure.ac | 1 + .../Makefile.in | 3 +++ .../api-ms-win-downlevel-version-l1-1-0.spec | 6 ++++++ tools/make_specfiles | 4 ++++ 5 files changed, 15 insertions(+), 0 deletions(-) diff --git a/configure b/configure index f852ed9..595ea7d 100755 --- a/configure +++ b/configure @@ -15352,6 +15352,7 @@ wine_fn_config_dll amstream enable_amstream wine_fn_config_test dlls/amstream/tests amstream_test wine_fn_config_dll api-ms-win-downlevel-advapi32-l1-1-0 enable_api_ms_win_downlevel_advapi32_l1_1_0 wine_fn_config_dll api-ms-win-downlevel-shlwapi-l1-1-0 enable_api_ms_win_downlevel_shlwapi_l1_1_0 +wine_fn_config_dll api-ms-win-downlevel-version-l1-1-0 enable_api_ms_win_downlevel_version_l1_1_0 wine_fn_config_dll apphelp enable_apphelp wine_fn_config_test dlls/apphelp/tests apphelp_test wine_fn_config_dll appwiz.cpl enable_appwiz_cpl po diff --git a/configure.ac b/configure.ac index e05dfe1..6e99a46 100644 --- a/configure.ac +++ b/configure.ac @@ -2531,6 +2531,7 @@ WINE_CONFIG_DLL(amstream) WINE_CONFIG_TEST(dlls/amstream/tests) WINE_CONFIG_DLL(api-ms-win-downlevel-advapi32-l1-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-shlwapi-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-downlevel-version-l1-1-0) WINE_CONFIG_DLL(apphelp) WINE_CONFIG_TEST(dlls/apphelp/tests) WINE_CONFIG_DLL(appwiz.cpl,,[po]) diff --git a/dlls/api-ms-win-downlevel-version-l1-1-0/Makefile.in b/dlls/api-ms-win-downlevel-version-l1-1-0/Makefile.in new file mode 100644 index 0000000..44b316b --- /dev/null +++ b/dlls/api-ms-win-downlevel-version-l1-1-0/Makefile.in @@ -0,0 +1,3 @@ +MODULE = api-ms-win-downlevel-version-l1-1-0.dll + +@MAKE_DLL_RULES@ diff --git a/dlls/api-ms-win-downlevel-version-l1-1-0/api-ms-win-downlevel-version-l1-1-0.spec b/dlls/api-ms-win-downlevel-version-l1-1-0/api-ms-win-downlevel-version-l1-1-0.spec new file mode 100644 index 0000000..e99d8a0 --- /dev/null +++ b/dlls/api-ms-win-downlevel-version-l1-1-0/api-ms-win-downlevel-version-l1-1-0.spec @@ -0,0 +1,6 @@ +@ stub GetFileVersionInfoExW +@ stub GetFileVersionInfoSizeExW +@ stdcall VerFindFileA(long str str str ptr ptr ptr ptr) version.VerFindFileA +@ stdcall VerFindFileW(long wstr wstr wstr ptr ptr ptr ptr) version.VerFindFileW +@ stdcall VerQueryValueA(ptr str ptr ptr) version.VerQueryValueA +@ stdcall VerQueryValueW(ptr wstr ptr ptr) version.VerQueryValueW diff --git a/tools/make_specfiles b/tools/make_specfiles index e582810..b5937be 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -124,6 +124,10 @@ my @dll_groups = "shlwapi", "api-ms-win-downlevel-shlwapi-l1-1-0", ], + [ + "version", + "api-ms-win-downlevel-version-l1-1-0", + ], ); my $update_flags = 0;

1 0

Frédéric Delanoy : xmllite: Avoid dead initialization (clang).
by Alexandre Julliard 20 Dec '12

20 Dec '12

Module: wine Branch: master Commit: 2952db640397f417115a54439e51df1d84e4098e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2952db640397f417115a54439… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Dec 20 00:29:19 2012 +0100 xmllite: Avoid dead initialization (clang). --- dlls/xmllite/reader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 5c027ef..9e32216 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -449,7 +449,7 @@ static int readerinput_get_utf8_convlen(xmlreaderinput *readerinput) static int readerinput_get_convlen(xmlreaderinput *readerinput, UINT cp) { encoded_buffer *buffer = &readerinput->buffer->encoded; - int len = buffer->written; + int len; if (cp == CP_UTF8) len = readerinput_get_utf8_convlen(readerinput);

1 0

Austin English : winedbg: stack_backtrace should not return a value.
by Alexandre Julliard 20 Dec '12

20 Dec '12

Module: wine Branch: master Commit: bc4e1efce30c5c5661ccd314d81824fc8c74fc07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc4e1efce30c5c5661ccd314d… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Dec 19 15:05:28 2012 -0600 winedbg: stack_backtrace should not return a value. --- programs/winedbg/stack.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/stack.c b/programs/winedbg/stack.c index 74dcc40..f49480a 100644 --- a/programs/winedbg/stack.c +++ b/programs/winedbg/stack.c @@ -447,7 +447,11 @@ void stack_backtrace(DWORD tid) /* backtrace every thread in every process except the debugger itself, * invoking via "bt all" */ - if (tid == -1) return backtrace_all(); + if (tid == -1) + { + backtrace_all(); + return; + } if (!dbg_curr_process) {

1 0

Austin English : widl: add_interface_typeinfo should not return a value.
by Alexandre Julliard 20 Dec '12

20 Dec '12

Module: wine Branch: master Commit: ecfb6539f6126ee753e9880fadd0d4031552e9d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecfb6539f6126ee753e9880fa… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Dec 19 15:03:10 2012 -0600 widl: add_interface_typeinfo should not return a value. --- tools/widl/write_msft.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 416f81d..918923b 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -2026,8 +2026,10 @@ static void add_interface_typeinfo(msft_typelib_t *typelib, type_t *interface) return; } - if (is_attr(interface->attrs, ATTR_DISPINTERFACE)) - return add_dispinterface_typeinfo(typelib, interface); + if (is_attr(interface->attrs, ATTR_DISPINTERFACE)) { + add_dispinterface_typeinfo(typelib, interface); + return; + } /* midl adds the parent interface first, unless the parent itself has no parent (i.e. it stops before IUnknown). */

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
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