wine-commits January 2012

wine-commits@winehq.org

2 participants
972 discussions

Aric Stewart : wineqtdecoder: Release the csReceive critical section before delivering a sample.
by Alexandre Julliard 23 Jan '12

23 Jan '12

Module: wine Branch: master Commit: 7d9ce823c3d668ca226df3ba9206aaadbf564a88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d9ce823c3d668ca226df3ba9… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jan 23 08:43:53 2012 -0600 wineqtdecoder: Release the csReceive critical section before delivering a sample. --- dlls/wineqtdecoder/qtvdecoder.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wineqtdecoder/qtvdecoder.c b/dlls/wineqtdecoder/qtvdecoder.c index 79e06a5..8a41722 100644 --- a/dlls/wineqtdecoder/qtvdecoder.c +++ b/dlls/wineqtdecoder/qtvdecoder.c @@ -230,7 +230,9 @@ static void trackingCallback( IMediaSample_SetTime(pOutSample, &tStart, &tStop); } + LeaveCriticalSection(&This->tf.csReceive); hr = BaseOutputPinImpl_Deliver((BaseOutputPin*)This->tf.ppPins[1], pOutSample); + EnterCriticalSection(&This->tf.csReceive); if (hr != S_OK && hr != VFW_E_NOT_CONNECTED) ERR("Error sending sample (%x)\n", hr);

1 0

Aric Stewart : quartz: Use the csReceive critical sections in transform filters.
by Alexandre Julliard 23 Jan '12

23 Jan '12

Module: wine Branch: master Commit: da0650a20999c75935b44480cf555697d6d50177 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da0650a20999c75935b44480c… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jan 23 08:33:22 2012 -0600 quartz: Use the csReceive critical sections in transform filters. --- dlls/quartz/acmwrapper.c | 14 +++++++------- dlls/quartz/avidec.c | 9 ++++----- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c index 814bf84..1c840b7 100644 --- a/dlls/quartz/acmwrapper.c +++ b/dlls/quartz/acmwrapper.c @@ -69,12 +69,12 @@ static HRESULT WINAPI ACMWrapper_Receive(TransformFilter *tf, IMediaSample *pSam LONGLONG tStart = -1, tStop = -1, tMed; LONGLONG mtStart = -1, mtStop = -1, mtMed; - EnterCriticalSection(&This->tf.filter.csFilter); + EnterCriticalSection(&This->tf.csReceive); hr = IMediaSample_GetPointer(pSample, &pbSrcStream); if (FAILED(hr)) { ERR("Cannot get pointer to sample data (%x)\n", hr); - LeaveCriticalSection(&This->tf.filter.csFilter); + LeaveCriticalSection(&This->tf.csReceive); return hr; } @@ -105,7 +105,7 @@ static HRESULT WINAPI ACMWrapper_Receive(TransformFilter *tf, IMediaSample *pSam if (FAILED(hr)) { ERR("Unable to retrieve media type\n"); - LeaveCriticalSection(&This->tf.filter.csFilter); + LeaveCriticalSection(&This->tf.csReceive); return hr; } @@ -118,7 +118,7 @@ static HRESULT WINAPI ACMWrapper_Receive(TransformFilter *tf, IMediaSample *pSam if (FAILED(hr)) { ERR("Unable to get delivery buffer (%x)\n", hr); - LeaveCriticalSection(&This->tf.filter.csFilter); + LeaveCriticalSection(&This->tf.csReceive); return hr; } IMediaSample_SetPreroll(pOutSample, preroll); @@ -213,9 +213,9 @@ static HRESULT WINAPI ACMWrapper_Receive(TransformFilter *tf, IMediaSample *pSam TRACE("Sample stop time: %u.%03u\n", (DWORD)(tStart/10000000), (DWORD)((tStart/10000)%1000)); - LeaveCriticalSection(&This->tf.filter.csFilter); + LeaveCriticalSection(&This->tf.csReceive); hr = BaseOutputPinImpl_Deliver((BaseOutputPin*)This->tf.ppPins[1], pOutSample); - EnterCriticalSection(&This->tf.filter.csFilter); + EnterCriticalSection(&This->tf.csReceive); if (hr != S_OK && hr != VFW_E_NOT_CONNECTED) { if (FAILED(hr)) @@ -238,7 +238,7 @@ error: This->lasttime_real = tStop; This->lasttime_sent = tMed; - LeaveCriticalSection(&This->tf.filter.csFilter); + LeaveCriticalSection(&This->tf.csReceive); return hr; } diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index e7e1de7..011e5ff 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -114,7 +114,7 @@ static HRESULT WINAPI AVIDec_Receive(TransformFilter *tf, IMediaSample *pSample) LONGLONG tStart, tStop; DWORD flags = 0; - EnterCriticalSection(&This->tf.filter.csFilter); + EnterCriticalSection(&This->tf.csReceive); hr = IMediaSample_GetPointer(pSample, &pbSrcStream); if (FAILED(hr)) { @@ -192,18 +192,17 @@ static HRESULT WINAPI AVIDec_Receive(TransformFilter *tf, IMediaSample *pSample) else IMediaSample_SetMediaTime(pOutSample, NULL, NULL); - LeaveCriticalSection(&This->tf.filter.csFilter); + LeaveCriticalSection(&This->tf.csReceive); hr = BaseOutputPinImpl_Deliver((BaseOutputPin*)This->tf.ppPins[1], pOutSample); + EnterCriticalSection(&This->tf.csReceive); if (hr != S_OK && hr != VFW_E_NOT_CONNECTED) ERR("Error sending sample (%x)\n", hr); - IMediaSample_Release(pOutSample); - return hr; error: if (pOutSample) IMediaSample_Release(pOutSample); - LeaveCriticalSection(&This->tf.filter.csFilter); + LeaveCriticalSection(&This->tf.csReceive); return hr; }

1 0

Aric Stewart : strmbase: Do not hold the csReceive lock when calling the transform' s Receive function.
by Alexandre Julliard 23 Jan '12

23 Jan '12

Module: wine Branch: master Commit: e2200b31d6d61f83b55e8062c13d7c5c52ed3538 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2200b31d6d61f83b55e8062c… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jan 23 08:33:02 2012 -0600 strmbase: Do not hold the csReceive lock when calling the transform's Receive function. --- dlls/strmbase/transform.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index b44becf..981a201 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -81,12 +81,12 @@ static HRESULT WINAPI TransformFilter_Input_Receive(BaseInputPin *This, IMediaSa return S_FALSE; } + LeaveCriticalSection(&pTransform->csReceive); if (pTransform->pFuncsTable->pfnReceive) hr = pTransform->pFuncsTable->pfnReceive(pTransform, pInSample); else hr = S_FALSE; - LeaveCriticalSection(&pTransform->csReceive); return hr; }

1 0

Aric Stewart : winex11: Strip the _L or _R from X11DRV_GetKeyNameText when appropriate.
by Alexandre Julliard 23 Jan '12

23 Jan '12

Module: wine Branch: master Commit: f624876d3e4ff07f4c2cca8996ea5fe831b27dad URL: http://source.winehq.org/git/wine.git/?a=commit;h=f624876d3e4ff07f4c2cca899… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Jan 20 14:07:05 2012 -0600 winex11: Strip the _L or _R from X11DRV_GetKeyNameText when appropriate. --- dlls/winex11.drv/keyboard.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index c561102..160b986 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -2301,6 +2301,24 @@ INT CDECL X11DRV_GetKeyNameText(LONG lParam, LPWSTR lpBuffer, INT nSize) keys = keycode_to_keysym(display, keyc, 0); name = XKeysymToString(keys); wine_tsx11_unlock(); + + if (name && (vkey == VK_SHIFT || vkey == VK_CONTROL || vkey == VK_MENU)) + { + char* idx = strrchr(name, '_'); + if (idx && (strcasecmp(idx, "_r") == 0 || strcasecmp(idx, "_l") == 0)) + { + INT rc = 0; + TRACE("found scan=%04x keyc=%u keysym=%lx modified_string=%s\n", + scanCode, keyc, keys, debugstr_an(name,idx-name)); + if (lpBuffer && nSize) + { + rc = MultiByteToWideChar(CP_UNIXCP, 0, name, idx-name+1, lpBuffer, nSize); + if (rc > 0) lpBuffer[rc - 1] = 0; + } + return rc; + } + } + TRACE("found scan=%04x keyc=%u keysym=%04x string=%s\n", scanCode, keyc, (int)keys, debugstr_a(name)); if (lpBuffer && nSize && name)

1 0

Alistair Leslie-Hughes : mscoree: Implement DllGetClassObject.
by Alexandre Julliard 23 Jan '12

23 Jan '12

Module: wine Branch: master Commit: 3f1c63c5bdd8889b1e8fae34b20e0d04b06059c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f1c63c5bdd8889b1e8fae34b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jan 6 14:33:19 2012 +1100 mscoree: Implement DllGetClassObject. --- dlls/mscoree/corruntimehost.c | 144 ++++++++++++++++++++++++++++++++++++++++ dlls/mscoree/mscoree_main.c | 119 ++++++++++++++++++++++++++++++++- dlls/mscoree/mscoree_private.h | 2 + 3 files changed, 263 insertions(+), 2 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index 00966ee..ff789d4 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -38,6 +38,7 @@ #include "mscoree_private.h" #include "wine/debug.h" +#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL( mscoree ); @@ -939,3 +940,146 @@ HRESULT RuntimeHost_Destroy(RuntimeHost *This) HeapFree( GetProcessHeap(), 0, This ); return S_OK; } + +#define CHARS_IN_GUID 39 +#define ARRAYSIZE(array) (sizeof(array)/sizeof((array)[0])) + +HRESULT create_monodata(REFIID riid, LPVOID *ppObj ) +{ + static const WCHAR wszCodebase[] = {'C','o','d','e','B','a','s','e',0}; + static const WCHAR wszClass[] = {'C','l','a','s','s',0}; + static const WCHAR wszFileSlash[] = {'f','i','l','e',':','/','/','/',0}; + static const WCHAR wszCLSIDSlash[] = {'C','L','S','I','D','\\',0}; + static const WCHAR wszInprocServer32[] = {'\\','I','n','p','r','o','c','S','e','r','v','e','r','3','2',0}; + WCHAR path[CHARS_IN_GUID + ARRAYSIZE(wszCLSIDSlash) + ARRAYSIZE(wszInprocServer32) - 1]; + MonoDomain *domain; + MonoAssembly *assembly; + ICLRRuntimeInfo *info; + RuntimeHost *host; + HRESULT hr; + HKEY key; + LONG res; + int offset = 0; + WCHAR codebase[MAX_PATH + 8]; + WCHAR classname[350]; + WCHAR filename[MAX_PATH]; + + DWORD dwBufLen = 350; + + lstrcpyW(path, wszCLSIDSlash); + StringFromGUID2(riid, path + lstrlenW(wszCLSIDSlash), CHARS_IN_GUID); + lstrcatW(path, wszInprocServer32); + + TRACE("Registry key: %s\n", debugstr_w(path)); + + res = RegOpenKeyExW(HKEY_CLASSES_ROOT, path, 0, KEY_READ, &key); + if (res == ERROR_FILE_NOT_FOUND) + return CLASS_E_CLASSNOTAVAILABLE; + + res = RegGetValueW( key, NULL, wszClass, RRF_RT_REG_SZ, NULL, classname, &dwBufLen); + if(res != ERROR_SUCCESS) + { + WARN("Class value cannot be found.\n"); + hr = CLASS_E_CLASSNOTAVAILABLE; + goto cleanup; + } + + TRACE("classname (%s)\n", debugstr_w(classname)); + + dwBufLen = MAX_PATH + 8; + res = RegGetValueW( key, NULL, wszCodebase, RRF_RT_REG_SZ, NULL, codebase, &dwBufLen); + if(res != ERROR_SUCCESS) + { + WARN("CodeBase value cannot be found.\n"); + hr = CLASS_E_CLASSNOTAVAILABLE; + goto cleanup; + } + + /* Strip file:/// */ + if(strncmpW(codebase, wszFileSlash, strlenW(wszFileSlash)) == 0) + offset = strlenW(wszFileSlash); + + strcpyW(filename, codebase + offset); + + TRACE("codebase (%s)\n", debugstr_w(filename)); + + *ppObj = NULL; + + + hr = get_runtime_info(filename, NULL, NULL, 0, 0, FALSE, &info); + if (SUCCEEDED(hr)) + { + hr = ICLRRuntimeInfo_GetRuntimeHost(info, &host); + + if (SUCCEEDED(hr)) + hr = RuntimeHost_GetDefaultDomain(host, &domain); + + if (SUCCEEDED(hr)) + { + MonoImage *image; + MonoClass *klass; + MonoObject *result; + IUnknown *unk = NULL; + char *filenameA, *ns; + char *classA; + + hr = CLASS_E_CLASSNOTAVAILABLE; + + filenameA = WtoA(filename); + assembly = host->mono->mono_domain_assembly_open(domain, filenameA); + HeapFree(GetProcessHeap(), 0, filenameA); + if (!assembly) + { + ERR("Cannot open assembly %s\n", filenameA); + goto cleanup; + } + + image = host->mono->mono_assembly_get_image(assembly); + if (!image) + { + ERR("Couldn't get assembly image\n"); + goto cleanup; + } + + classA = WtoA(classname); + ns = strrchr(classA, '.'); + *ns = '\0'; + + klass = host->mono->mono_class_from_name(image, classA, ns+1); + HeapFree(GetProcessHeap(), 0, classA); + if (!klass) + { + ERR("Couldn't get class from image\n"); + goto cleanup; + } + + /* + * Use the default constructor for the .NET class. + */ + result = host->mono->mono_object_new(domain, klass); + host->mono->mono_runtime_object_init(result); + + hr = RuntimeHost_GetIUnknownForObject(host, result, &unk); + if (SUCCEEDED(hr)) + { + hr = IUnknown_QueryInterface(unk, &IID_IUnknown, ppObj); + + IUnknown_Release(unk); + } + else + hr = CLASS_E_CLASSNOTAVAILABLE; + } + else + hr = CLASS_E_CLASSNOTAVAILABLE; + } + else + hr = CLASS_E_CLASSNOTAVAILABLE; + +cleanup: + if(info) + ICLRRuntimeInfo_Release(info); + + RegCloseKey(key); + + return hr; +} diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 8b72ec8..b6ae490 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -52,6 +52,8 @@ WINE_DEFAULT_DEBUG_CHANNEL( mscoree ); static HINSTANCE MSCOREE_hInstance; +typedef HRESULT (*fnCreateInstance)(REFIID riid, LPVOID *ppObj); + char *WtoA(LPCWSTR wstr) { int length; @@ -89,6 +91,105 @@ static BOOL get_install_root(LPWSTR install_dir) return TRUE; } +typedef struct mscorecf +{ + IClassFactory IClassFactory_iface; + LONG ref; + + fnCreateInstance pfnCreateInstance; + + CLSID clsid; +} mscorecf; + +static inline mscorecf *impl_from_IClassFactory( IClassFactory *iface ) +{ + return CONTAINING_RECORD(iface, mscorecf, IClassFactory_iface); +} + +static HRESULT WINAPI mscorecf_QueryInterface(IClassFactory *iface, REFIID riid, LPVOID *ppobj ) +{ + TRACE("%s %p\n", debugstr_guid(riid), ppobj); + + if (IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IClassFactory)) + { + IClassFactory_AddRef( iface ); + *ppobj = iface; + return S_OK; + } + + ERR("interface %s not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI mscorecf_AddRef(IClassFactory *iface ) +{ + mscorecf *This = impl_from_IClassFactory(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("%p ref=%u\n", This, ref); + + return ref; +} + +static ULONG WINAPI mscorecf_Release(IClassFactory *iface ) +{ + mscorecf *This = impl_from_IClassFactory(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("%p ref=%u\n", This, ref); + + if (ref == 0) + { + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI mscorecf_CreateInstance(IClassFactory *iface,LPUNKNOWN pOuter, + REFIID riid, LPVOID *ppobj ) +{ + mscorecf *This = impl_from_IClassFactory( iface ); + HRESULT hr; + IUnknown *punk; + + TRACE("%p %s %p\n", pOuter, debugstr_guid(riid), ppobj ); + + *ppobj = NULL; + + if (pOuter) + return CLASS_E_NOAGGREGATION; + + hr = This->pfnCreateInstance( &This->clsid, (LPVOID*) &punk ); + if (SUCCEEDED(hr)) + { + hr = IUnknown_QueryInterface( punk, riid, ppobj ); + + IUnknown_Release( punk ); + } + else + { + WARN("Cannot create an instance object. 0x%08x\n", hr); + } + return hr; +} + +static HRESULT WINAPI mscorecf_LockServer(IClassFactory *iface, BOOL dolock) +{ + FIXME("(%p)->(%d),stub!\n",iface,dolock); + return S_OK; +} + +static const struct IClassFactoryVtbl mscorecf_vtbl = +{ + mscorecf_QueryInterface, + mscorecf_AddRef, + mscorecf_Release, + mscorecf_CreateInstance, + mscorecf_LockServer +}; + HRESULT WINAPI CorBindToRuntimeHost(LPCWSTR pwszVersion, LPCWSTR pwszBuildFlavor, LPCWSTR pwszHostConfigFile, VOID *pReserved, DWORD startupFlags, REFCLSID rclsid, @@ -504,11 +605,25 @@ HRESULT WINAPI CLRCreateInstance(REFCLSID clsid, REFIID riid, LPVOID *ppInterfac HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv) { - FIXME("(%s, %s, %p): stub\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + mscorecf *This; + HRESULT hr; + + TRACE("(%s, %s, %p): stub\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + if(!ppv) return E_INVALIDARG; - return E_NOTIMPL; + This = HeapAlloc(GetProcessHeap(), 0, sizeof(mscorecf)); + + This->IClassFactory_iface.lpVtbl = &mscorecf_vtbl; + This->pfnCreateInstance = &create_monodata; + This->ref = 1; + This->clsid = *rclsid; + + hr = IClassFactory_QueryInterface( &This->IClassFactory_iface, riid, ppv ); + IClassFactory_Release(&This->IClassFactory_iface); + + return hr; } HRESULT WINAPI DllRegisterServer(void) diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index a45a405..d033275 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -186,4 +186,6 @@ HRESULT WINAPI CLRMetaHost_GetRuntime(ICLRMetaHost* iface, LPCWSTR pwzVersion, R extern HRESULT CorDebug_Create(ICLRRuntimeHost *runtimehost, IUnknown** ppUnk) DECLSPEC_HIDDEN; +extern HRESULT create_monodata(REFIID riid, LPVOID *ppObj) DECLSPEC_HIDDEN; + #endif /* __MSCOREE_PRIVATE__ */

1 0

Austin English : kernel32: Add stubs for ExpungeConsoleCommandHistoryA/W.
by Alexandre Julliard 23 Jan '12

23 Jan '12

Module: wine Branch: master Commit: 15bce22683c71489be60f674db5197e093abf162 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15bce22683c71489be60f674d… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Jan 19 15:51:45 2012 -0600 kernel32: Add stubs for ExpungeConsoleCommandHistoryA/W. --- dlls/kernel32/console.c | 12 ++++++++++++ dlls/kernel32/kernel32.spec | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index facdf20..47e829e 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -3189,3 +3189,15 @@ DWORD WINAPI GetConsoleAliasesLengthW(LPWSTR unknown) SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return 0; } + +VOID WINAPI ExpungeConsoleCommandHistoryA(LPCSTR unknown) +{ + FIXME(": (%s) stub!\n", debugstr_a(unknown)); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); +} + +VOID WINAPI ExpungeConsoleCommandHistoryW(LPCWSTR unknown) +{ + FIXME(": (%s) stub!\n", debugstr_w(unknown)); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); +} diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 77c54d6..b1946ac 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -343,8 +343,8 @@ @ stub ExitVDM @ stdcall ExpandEnvironmentStringsA(str ptr long) @ stdcall ExpandEnvironmentStringsW(wstr ptr long) -@ stub ExpungeConsoleCommandHistoryA -@ stub ExpungeConsoleCommandHistoryW +@ stdcall ExpungeConsoleCommandHistoryA(str) +@ stdcall ExpungeConsoleCommandHistoryW(wstr) @ stub ExtendVirtualBuffer @ stdcall -i386 -private -norelay FT_Exit0() krnl386.exe16.FT_Exit0 @ stdcall -i386 -private -norelay FT_Exit12() krnl386.exe16.FT_Exit12

1 0

Austin English : kernel32: Add stubs for GetConsoleAliasesLengthA/W.
by Alexandre Julliard 23 Jan '12

23 Jan '12

Module: wine Branch: master Commit: eff816b55ca1a8ad2506e1c0d4fc398f8742ad80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eff816b55ca1a8ad2506e1c0d… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Jan 19 15:49:08 2012 -0600 kernel32: Add stubs for GetConsoleAliasesLengthA/W. --- dlls/kernel32/console.c | 14 ++++++++++++++ dlls/kernel32/kernel32.spec | 4 ++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 7238936..facdf20 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -3175,3 +3175,17 @@ DWORD WINAPI GetConsoleCommandHistoryLengthW(LPCWSTR unknown) SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return 0; } + +DWORD WINAPI GetConsoleAliasesLengthA(LPSTR unknown) +{ + FIXME(": (%s) stub!\n", debugstr_a(unknown)); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} + +DWORD WINAPI GetConsoleAliasesLengthW(LPWSTR unknown) +{ + FIXME(": (%s) stub!\n", debugstr_w(unknown)); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 456fb1a..77c54d6 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -460,8 +460,8 @@ @ stub GetConsoleAliasExesW @ stdcall GetConsoleAliasW(wstr ptr long wstr) @ stub GetConsoleAliasesA -@ stub GetConsoleAliasesLengthA -@ stub GetConsoleAliasesLengthW +@ stdcall GetConsoleAliasesLengthA(str) +@ stdcall GetConsoleAliasesLengthW(wstr) @ stub GetConsoleAliasesW @ stdcall GetConsoleCP() @ stub GetConsoleCharType

1 0

Austin English : kernel32: Add stubs for GetConsoleCommandHistoryLengthA/W.
by Alexandre Julliard 23 Jan '12

23 Jan '12

Module: wine Branch: master Commit: 4110068dc20b1678f772949d3429dc7985425f84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4110068dc20b1678f772949d3… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Jan 19 15:48:51 2012 -0600 kernel32: Add stubs for GetConsoleCommandHistoryLengthA/W. --- dlls/kernel32/console.c | 18 ++++++++++++++++++ dlls/kernel32/kernel32.spec | 4 ++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index b50bce1..7238936 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -3157,3 +3157,21 @@ DWORD WINAPI GetConsoleCommandHistoryW(DWORD unknown1, DWORD unknown2, DWORD unk SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return 0; } + +/* Undocumented, called by native doskey.exe */ +/* FIXME: Should use CONSOLE_GetHistory() above for full implementation */ +DWORD WINAPI GetConsoleCommandHistoryLengthA(LPCSTR unknown) +{ + FIXME(": (%s) stub!\n", debugstr_a(unknown)); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} + +/* Undocumented, called by native doskey.exe */ +/* FIXME: Should use CONSOLE_GetHistory() above for full implementation */ +DWORD WINAPI GetConsoleCommandHistoryLengthW(LPCWSTR unknown) +{ + FIXME(": (%s) stub!\n", debugstr_w(unknown)); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 9be4f00..456fb1a 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -466,8 +466,8 @@ @ stdcall GetConsoleCP() @ stub GetConsoleCharType @ stdcall GetConsoleCommandHistoryA(long long long) -@ stub GetConsoleCommandHistoryLengthA -@ stub GetConsoleCommandHistoryLengthW +@ stdcall GetConsoleCommandHistoryLengthA(str) +@ stdcall GetConsoleCommandHistoryLengthW(wstr) @ stdcall GetConsoleCommandHistoryW(long long long) @ stdcall GetConsoleCursorInfo(long ptr) @ stub GetConsoleCursorMode

1 0

Jason Edmeades : richedit: v1.0 richedit uses CR and LF for enter.
by Alexandre Julliard 23 Jan '12

23 Jan '12

Module: wine Branch: master Commit: efbde389c723a6ed239f6a330a5358e725646924 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efbde389c723a6ed239f6a330… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Thu Jan 19 21:35:56 2012 +0000 richedit: v1.0 richedit uses CR and LF for enter. --- dlls/riched20/editor.c | 6 ++- dlls/riched20/tests/editor.c | 109 +++++++++++++++++++++++++++++++++++++ dlls/riched32/tests/editor.c | 122 +++++++++++++++++++++++++++++++++++++++++- 3 files changed, 235 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=efbde389c723a6ed239f6…

1 0

Alexandre Julliard : oleaut32/tests: Use a better invalid color for the olepicture icon test.
by Alexandre Julliard 23 Jan '12

23 Jan '12

Module: wine Branch: master Commit: 9422c19329c010f9ba07a316f7409bc1b1caafe6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9422c19329c010f9ba07a316f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 23 15:14:58 2012 +0100 oleaut32/tests: Use a better invalid color for the olepicture icon test. --- dlls/oleaut32/tests/olepicture.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index 7f4d647..ecf88f6 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -675,9 +675,9 @@ static void test_Render(void) IPicture_get_Width(pic, &pWidth); IPicture_get_Height(pic, &pHeight); - SetPixelV(hdc, 0, 0, 0x00F0F0F0); - SetPixelV(hdc, 5, 5, 0x00F0F0F0); - SetPixelV(hdc, 10, 10, 0x00F0F0F0); + SetPixelV(hdc, 0, 0, 0x00223344); + SetPixelV(hdc, 5, 5, 0x00223344); + SetPixelV(hdc, 10, 10, 0x00223344); expected = GetPixel(hdc, 0, 0); hres = IPicture_Render(pic, hdc, 1, 1, 9, 9, 0, 0, pWidth, -pHeight, NULL);

1 0

← Newer
1
...
21
22
23
24
25
26
27
...
98
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 January 2012