January 2012 - Wine-Commits

Alistair Leslie-Hughes : mscoree: Implement DllGetClassObject.
by Alexandre Julliard Jan. 23, 2012

Jan. 23, 2012

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

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

Jan. 23, 2012

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

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

Jan. 23, 2012

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 : quartz: Use the csReceive critical sections in transform filters.
by Alexandre Julliard Jan. 23, 2012

Jan. 23, 2012

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

Alex Henrie : comdlg32: Correctly handle filters with multiple file extensions in Save As dialogs.
by Alexandre Julliard Jan. 23, 2012

Jan. 23, 2012

Module: wine Branch: master Commit: 7a34094e6e3e8a321148c64b0c9e2b986e63a7d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a34094e6e3e8a321148c64b0… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Jan 20 14:52:18 2012 -0700 comdlg32: Correctly handle filters with multiple file extensions in Save As dialogs. --- dlls/comdlg32/filedlg.c | 61 ++++++++++++++++++++--------- dlls/comdlg32/tests/filedlg.c | 85 ++++++++++++++++++++++++++++++----------- 2 files changed, 104 insertions(+), 42 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 43df312..c31641b 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -2533,12 +2533,12 @@ BOOL FILEDLG95_OnOpen(HWND hwnd) /* Attach the file extension with file name*/ ext = PathFindExtensionW(lpstrPathAndFile); - if (! *ext) + if (! *ext && fodInfos->defext) { /* if no extension is specified with file name, then */ /* attach the extension from file filter or default one */ - const WCHAR *filterExt = NULL; + WCHAR *filterExt = NULL; LPWSTR lpstrFilter = NULL; static const WCHAR szwDot[] = {'.',0}; int PathLength = lstrlenW(lpstrPathAndFile); @@ -2548,15 +2548,39 @@ BOOL FILEDLG95_OnOpen(HWND hwnd) fodInfos->ofnInfos->nFilterIndex-1); if (lpstrFilter != (LPWSTR)CB_ERR) /* control is not empty */ - filterExt = PathFindExtensionW(lpstrFilter); + { + WCHAR* filterAtSemicolon; + filterExt = HeapAlloc(GetProcessHeap(), 0, lstrlenW(lpstrFilter) * sizeof(WCHAR) + sizeof(WCHAR)); + strcpyW(filterExt, lpstrFilter); + + /* if a semicolon-separated list of file extensions was given, do not include the + semicolon or anything after it in the extension. + example: if filterExt was "*.abc;*.def", it will become "*.abc" */ + filterAtSemicolon = strchrW(filterExt, ';'); + if (filterAtSemicolon) + { + filterAtSemicolon[0] = '\0'; + } + + /* strip the * or anything else from the extension, "*.abc" becomes "abc" */ + strcpyW(filterExt, PathFindExtensionW(filterExt) + 1); + + /* if the extension contains a glob, ignore it */ + if (strchrW(filterExt, '*') || strchrW(filterExt, '?')) + { + HeapFree(GetProcessHeap(), 0, filterExt); + filterExt = NULL; + } + } - if ( filterExt && *filterExt ) /* attach the file extension from file type filter*/ - filterExt = filterExt + 1; - else if ( fodInfos->defext ) /* attach the default file extension*/ - filterExt = fodInfos->defext; + if (!filterExt) + { + /* use the default file extension */ + filterExt = HeapAlloc(GetProcessHeap(), 0, lstrlenW(fodInfos->defext) * sizeof(WCHAR) + sizeof(WCHAR)); + strcpyW(filterExt, fodInfos->defext); + } - /* If extension contains a glob, ignore it */ - if ( filterExt && !strchrW(filterExt, '*') && !strchrW(filterExt, '?') ) + if (*filterExt) /* ignore filterExt="" */ { /* Attach the dot*/ lstrcatW(lpstrPathAndFile, szwDot); @@ -2564,20 +2588,19 @@ BOOL FILEDLG95_OnOpen(HWND hwnd) lstrcatW(lpstrPathAndFile, filterExt ); } + HeapFree(GetProcessHeap(), 0, filterExt); + /* In Open dialog: if file does not exist try without extension */ if (!(fodInfos->DlgInfos.dwDlgProp & FODPROP_SAVEDLG) && !PathFileExistsW(lpstrPathAndFile)) lpstrPathAndFile[PathLength] = '\0'; - } - if (fodInfos->defext) /* add default extension */ - { - /* Set/clear the output OFN_EXTENSIONDIFFERENT flag */ - if (*ext) - ext++; - if (!lstrcmpiW(fodInfos->defext, ext)) - fodInfos->ofnInfos->Flags &= ~OFN_EXTENSIONDIFFERENT; - else - fodInfos->ofnInfos->Flags |= OFN_EXTENSIONDIFFERENT; + /* Set/clear the output OFN_EXTENSIONDIFFERENT flag */ + if (*ext) + ext++; + if (!lstrcmpiW(fodInfos->defext, ext)) + fodInfos->ofnInfos->Flags &= ~OFN_EXTENSIONDIFFERENT; + else + fodInfos->ofnInfos->Flags |= OFN_EXTENSIONDIFFERENT; } /* In Save dialog: check if the file already exists */ diff --git a/dlls/comdlg32/tests/filedlg.c b/dlls/comdlg32/tests/filedlg.c index 8539d3d..0d1112f 100644 --- a/dlls/comdlg32/tests/filedlg.c +++ b/dlls/comdlg32/tests/filedlg.c @@ -1044,51 +1044,90 @@ static UINT_PTR WINAPI test_extension_wndproc(HWND dlg, UINT msg, WPARAM wParam, return FALSE; } -static const char *defext_filters[] = { - "TestFilter (*.pt*)\0*.pt*\0", - "TestFilter (*.ab?)\0*.ab?\0", - "TestFilter (*.*)\0*.*\0", - NULL /* is a test, not an endmark! */ -}; - #define ARRAY_SIZE(a) (sizeof(a)/sizeof((a)[0])) +static void test_extension_helper(OPENFILENAME* ofn, const char *filter, + const char *expected_filename) +{ + char *filename_ptr; + DWORD ret; + BOOL boolret; + + strcpy(ofn->lpstrFile, "deadbeef"); + ofn->lpstrFilter = filter; + + boolret = GetSaveFileNameA(ofn); + ok(boolret, "%s: expected TRUE\n", filter); + + ret = CommDlgExtendedError(); + ok(!ret, "%s: CommDlgExtendedError returned %#x\n", filter, ret); + + filename_ptr = ofn->lpstrFile + ofn->nFileOffset; + ok(strcmp(filename_ptr, expected_filename) == 0, + "%s: Filename is %s, expected %s\n", filter, filename_ptr, expected_filename); +} + static void test_extension(void) { OPENFILENAME ofn = { sizeof(OPENFILENAME)}; char filename[1024] = {0}; char curdir[MAX_PATH]; - char *filename_ptr; - const char *test_file_name = "deadbeef"; unsigned int i; - DWORD ret; BOOL boolret; + const char *defext_concrete_filters[] = { + "TestFilter (*.abc)\0*.abc\0", + "TestFilter (*.abc;)\0*.abc;\0", + "TestFilter (*.abc;*.def)\0*.abc;*.def\0", + }; + + const char *defext_wildcard_filters[] = { + "TestFilter (*.pt*)\0*.pt*\0", + "TestFilter (*.pt*;*.abc)\0*.pt*;*.abc\0", + "TestFilter (*.ab?)\0*.ab?\0", + "TestFilter (*.*)\0*.*\0", + NULL /* is a test, not an endmark! */ + }; + boolret = GetCurrentDirectoryA(sizeof(curdir), curdir); ok(boolret, "Failed to get current dir err %d\n", GetLastError()); - /* Ignore .* extension */ ofn.lStructSize = sizeof(ofn); ofn.hwndOwner = NULL; ofn.lpstrFile = filename; ofn.nMaxFile = MAX_PATH; ofn.Flags = OFN_EXPLORER | OFN_ENABLEHOOK; - ofn.lpstrDefExt = NULL; ofn.lpstrInitialDir = curdir; ofn.lpfnHook = test_extension_wndproc; ofn.nFileExtension = 0; - for (i = 0; i < ARRAY_SIZE(defext_filters); i++) { - ofn.lpstrFilter = defext_filters[i]; - strcpy(filename, test_file_name); - boolret = GetSaveFileNameA(&ofn); - ok(boolret, "%u: expected true\n", i); - ret = CommDlgExtendedError(); - ok(!ret, "%u: CommDlgExtendedError returned %#x\n", i, ret); - filename_ptr = ofn.lpstrFile + strlen( ofn.lpstrFile ) - strlen( test_file_name ); - ok( strlen(ofn.lpstrFile) >= strlen(test_file_name), "Filename %s is too short\n", ofn.lpstrFile ); - ok( strcmp(filename_ptr, test_file_name) == 0, - "Filename is %s, expected %s\n", filename_ptr, test_file_name ); + ofn.lpstrDefExt = NULL; + + /* Without lpstrDefExt, append no extension */ + test_extension_helper(&ofn, "TestFilter (*.abc) lpstrDefExt=NULL\0*.abc\0", "deadbeef"); + test_extension_helper(&ofn, "TestFilter (*.ab?) lpstrDefExt=NULL\0*.ab?\0", "deadbeef"); + + ofn.lpstrDefExt = ""; + + /* If lpstrDefExt="" and the filter has a concrete extension, append it */ + test_extension_helper(&ofn, "TestFilter (*.abc) lpstrDefExt=\"\"\0*.abc\0", "deadbeef.abc"); + + /* If lpstrDefExt="" and the filter has a wildcard extension, do nothing */ + test_extension_helper(&ofn, "TestFilter (*.ab?) lpstrDefExt=\"\"\0*.ab?\0", "deadbeef"); + + ofn.lpstrDefExt = "xyz"; + + /* Append concrete extensions from filters */ + for (i = 0; i < ARRAY_SIZE(defext_concrete_filters); i++) { + test_extension_helper(&ofn, defext_concrete_filters[i], "deadbeef.abc"); + } + + /* Append nothing from this filter */ + test_extension_helper(&ofn, "TestFilter (*.)\0*.\0", "deadbeef"); + + /* Ignore wildcard extensions in filters */ + for (i = 0; i < ARRAY_SIZE(defext_wildcard_filters); i++) { + test_extension_helper(&ofn, defext_wildcard_filters[i], "deadbeef.xyz"); } }

1 0

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

Jan. 23, 2012

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

Eric Pouech : dbghelp: Rewrote a simple regular expression matcher, and use for implementing SymMatchString[AW].
by Alexandre Julliard Jan. 23, 2012

Jan. 23, 2012

Module: wine Branch: master Commit: be9a7b9b97b5e3a9223be232dfd52ce49c0ec26c URL: http://source.winehq.org/git/wine.git/?a=commit;h=be9a7b9b97b5e3a9223be232d… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Jan 22 12:57:53 2012 +0100 dbghelp: Rewrote a simple regular expression matcher, and use for implementing SymMatchString[AW]. --- dlls/dbghelp/symbol.c | 176 ++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 152 insertions(+), 24 deletions(-) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index ac1824b..ed2ce01 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -1873,50 +1873,178 @@ DWORD WINAPI UnDecorateSymbolName(PCSTR DecoratedName, PSTR UnDecoratedName, return strlen(UnDecoratedName); } +#define WILDCHAR(x) (-(x)) + +static int re_fetch_char(const WCHAR** re) +{ + switch (**re) + { + case '\\': (*re)++; return *(*re)++; + case '*': case '[': case '?': case '+': case '#': case ']': return WILDCHAR(*(*re)++); + default: return *(*re)++; + } +} + +static inline int re_match_char(WCHAR ch1, WCHAR ch2, BOOL _case) +{ + return _case ? ch1 - ch2 : toupperW(ch1) - toupperW(ch2); +} + +static const WCHAR* re_match_one(const WCHAR* string, const WCHAR* elt, BOOL _case) +{ + int ch1, prev = 0; + unsigned state = 0; + + switch (ch1 = re_fetch_char(&elt)) + { + default: + return (ch1 >= 0 && re_match_char(*string, ch1, _case) == 0) ? ++string : NULL; + case WILDCHAR('?'): return *string ? ++string : NULL; + case WILDCHAR('*'): assert(0); + case WILDCHAR('['): break; + } + + for (;;) + { + ch1 = re_fetch_char(&elt); + if (ch1 == WILDCHAR(']')) return NULL; + if (state == 1 && ch1 == '-') state = 2; + else + { + if (re_match_char(*string, ch1, _case) == 0) return ++string; + switch (state) + { + case 0: + state = 1; + prev = ch1; + break; + case 1: + state = 0; + break; + case 2: + if (prev >= 0 && ch1 >= 0 && re_match_char(prev, *string, _case) <= 0 && + re_match_char(*string, ch1, _case) <= 0) + return ++string; + state = 0; + break; + } + } + } +} + +/****************************************************************** + * re_match_multi + * + * match a substring of *pstring according to *pre regular expression + * pstring and pre are only updated in case of successful match + */ +static BOOL re_match_multi(const WCHAR** pstring, const WCHAR** pre, BOOL _case) +{ + const WCHAR* re_end = *pre; + const WCHAR* string_end = *pstring; + const WCHAR* re_beg; + const WCHAR* string_beg; + const WCHAR* next; + int ch; + + while (*re_end && *string_end) + { + string_beg = string_end; + re_beg = re_end; + switch (ch = re_fetch_char(&re_end)) + { + case WILDCHAR(']'): case WILDCHAR('+'): case WILDCHAR('#'): return FALSE; + case WILDCHAR('*'): + /* transform '*' into '?#' */ + {static const WCHAR qmW[] = {'?',0}; re_beg = qmW;} + goto closure; + case WILDCHAR('['): + do + { + if (!(ch = re_fetch_char(&re_end))) return FALSE; + } while (ch != WILDCHAR(']')); + /* fall through */ + case WILDCHAR('?'): + default: + break; + } + + switch (*re_end) + { + case '+': + if (!(next = re_match_one(string_end, re_beg, _case))) return FALSE; + string_beg++; + /* fall through */ + case '#': + re_end++; + closure: + while ((next = re_match_one(string_end, re_beg, _case))) string_end = next; + for ( ; string_end >= string_beg; string_end--) + { + if (re_match_multi(&string_end, &re_end, _case)) goto found; + } + return FALSE; + default: + if (!(next = re_match_one(string_end, re_beg, _case))) return FALSE; + string_end = next; + } + re_beg = re_end; + } + + if (*re_end || *string_end) return FALSE; + +found: + *pre = re_end; + *pstring = string_end; + return TRUE; +} + /****************************************************************** * SymMatchStringA (DBGHELP.@) * */ BOOL WINAPI SymMatchStringA(PCSTR string, PCSTR re, BOOL _case) { - regex_t preg; - BOOL ret; + WCHAR* strW; + WCHAR* reW; + BOOL ret = FALSE; + DWORD sz; + if (!string || !re) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } TRACE("%s %s %c\n", string, re, _case ? 'Y' : 'N'); - compile_regex(re, -1, &preg, _case); - ret = match_regexp(&preg, string); - regfree(&preg); + sz = MultiByteToWideChar(CP_ACP, 0, string, -1, NULL, 0); + if ((strW = HeapAlloc(GetProcessHeap(), 0, sz * sizeof(WCHAR)))) + MultiByteToWideChar(CP_ACP, 0, string, -1, strW, sz); + sz = MultiByteToWideChar(CP_ACP, 0, re, -1, NULL, 0); + if ((reW = HeapAlloc(GetProcessHeap(), 0, sz * sizeof(WCHAR)))) + MultiByteToWideChar(CP_ACP, 0, re, -1, reW, sz); + + if (strW && reW) + ret = SymMatchStringW(strW, reW, _case); + HeapFree(GetProcessHeap(), 0, strW); + HeapFree(GetProcessHeap(), 0, reW); return ret; } /****************************************************************** * SymMatchStringW (DBGHELP.@) * - * FIXME: SymMatchStringA should convert and pass the strings to SymMatchStringW, - * but that needs a unicode RE library. */ BOOL WINAPI SymMatchStringW(PCWSTR string, PCWSTR re, BOOL _case) { - BOOL ret; - LPSTR s, r; - DWORD len; - TRACE("%s %s %c\n", debugstr_w(string), debugstr_w(re), _case ? 'Y' : 'N'); - len = WideCharToMultiByte( CP_ACP, 0, string, -1, NULL, 0, NULL, NULL ); - s = HeapAlloc( GetProcessHeap(), 0, len ); - WideCharToMultiByte( CP_ACP, 0, string, -1, s, len, NULL, NULL ); - - len = WideCharToMultiByte( CP_ACP, 0, re, -1, NULL, 0, NULL, NULL ); - r = HeapAlloc( GetProcessHeap(), 0, len ); - WideCharToMultiByte( CP_ACP, 0, re, -1, r, len, NULL, NULL ); - - ret = SymMatchStringA(s, r, _case); - - HeapFree( GetProcessHeap(), 0, r ); - HeapFree( GetProcessHeap(), 0, s ); - return ret; + if (!string || !re) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + return re_match_multi(&string, &re, _case); } /******************************************************************

1 0

Eric Pouech : dbghelp: Do all module and symbol names matching using unicode string ( and new regular expression matcher).
by Alexandre Julliard Jan. 23, 2012

Jan. 23, 2012

Module: wine Branch: master Commit: 026ec7f69072476a738279c4abbfabc298c0aa9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=026ec7f69072476a738279c4a… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Jan 22 12:57:59 2012 +0100 dbghelp: Do all module and symbol names matching using unicode string (and new regular expression matcher). --- dlls/dbghelp/dbghelp_private.h | 3 +- dlls/dbghelp/module.c | 3 - dlls/dbghelp/symbol.c | 242 +++++++++++++++++----------------------- dlls/dbghelp/type.c | 13 ++ 4 files changed, 118 insertions(+), 143 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=026ec7f69072476a73827…

1 0

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

Jan. 23, 2012

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

Eric Pouech : dbghelp: Use new regular expression matcher for files.
by Alexandre Julliard Jan. 23, 2012

Jan. 23, 2012

Module: wine Branch: master Commit: f3107df57631dd56d39e90dcdbe12299b584c250 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3107df57631dd56d39e90dcd… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Jan 22 12:58:04 2012 +0100 dbghelp: Use new regular expression matcher for files. --- dlls/dbghelp/symbol.c | 150 ++++++++++++++++++------------------------------ 1 files changed, 56 insertions(+), 94 deletions(-) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 96af50c..439b50e 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -30,9 +30,6 @@ #include <limits.h> #include <sys/types.h> #include <assert.h> -#ifdef HAVE_REGEX_H -# include <regex.h> -#endif #include "wine/debug.h" #include "dbghelp_private.h" @@ -138,101 +135,54 @@ static void symt_add_module_ht(struct module* module, struct symt_ht* ht) } } -#ifdef HAVE_REGEX_H - -static BOOL compile_file_regex(regex_t* re, const char* srcfile) +static WCHAR* file_regex(const char* srcfile) { - char *mask, *p; - BOOL ret; - - if (!srcfile || !*srcfile) return regcomp(re, ".*", REG_NOSUB); + WCHAR* mask; + WCHAR* p; - p = mask = HeapAlloc(GetProcessHeap(), 0, 5 * strlen(srcfile) + 4); - *p++ = '^'; - while (*srcfile) + if (!srcfile || !*srcfile) { - switch (*srcfile) - { - case '\\': - case '/': - *p++ = '['; - *p++ = '\\'; - *p++ = '\\'; - *p++ = '/'; - *p++ = ']'; - break; - case '.': - *p++ = '\\'; - *p++ = '.'; - break; - case '*': - *p++ = '.'; - *p++ = '*'; - break; - default: - *p++ = *srcfile; - break; - } - srcfile++; + if (!(p = mask = HeapAlloc(GetProcessHeap(), 0, 3 * sizeof(WCHAR)))) return NULL; + *p++ = '?'; + *p++ = '#'; } - *p++ = '$'; - *p = 0; - ret = !regcomp(re, mask, REG_NOSUB); - HeapFree(GetProcessHeap(), 0, mask); - if (!ret) + else { - FIXME("Couldn't compile %s\n", mask); - SetLastError(ERROR_INVALID_PARAMETER); - } - return ret; -} - -static int match_regexp( const regex_t *re, const char *str ) -{ - return !regexec( re, str, 0, NULL, 0 ); -} - -#else /* HAVE_REGEX_H */ - -/* if we don't have regexp support, fall back to a simple string comparison */ + DWORD sz = MultiByteToWideChar(CP_ACP, 0, srcfile, -1, NULL, 0); + WCHAR* srcfileW; -typedef struct -{ - char *str; - BOOL icase; -} regex_t; - -static void compile_regex(const char* str, int numchar, regex_t* re, BOOL _case) -{ - if (numchar == -1) numchar = strlen( str ); + /* FIXME: we use here the largest conversion for every char... could be optimized */ + p = mask = HeapAlloc(GetProcessHeap(), 0, (5 * strlen(srcfile) + 1 + sz) * sizeof(WCHAR)); + if (!mask) return NULL; + srcfileW = mask + 5 * strlen(srcfile) + 1; + MultiByteToWideChar(CP_ACP, 0, srcfile, -1, srcfileW, sz); - re->str = HeapAlloc( GetProcessHeap(), 0, numchar + 1 ); - memcpy( re->str, str, numchar ); - re->str[numchar] = 0; - re->icase = _case; -} - -static BOOL compile_file_regex(regex_t* re, const char* srcfile) -{ - if (!srcfile || !*srcfile) re->str = NULL; - else compile_regex( srcfile, -1, re, FALSE ); - return TRUE; -} - -static int match_regexp( const regex_t *re, const char *str ) -{ - if (!re->str) return 1; - if (re->icase) return !lstrcmpiA( re->str, str ); - return !strcmp( re->str, str ); -} - -static void regfree( regex_t *re ) -{ - HeapFree( GetProcessHeap(), 0, re->str ); + while (*srcfileW) + { + switch (*srcfileW) + { + case '\\': + case '/': + *p++ = '['; + *p++ = '\\'; + *p++ = '\\'; + *p++ = '/'; + *p++ = ']'; + break; + case '.': + *p++ = '?'; + break; + default: + *p++ = *srcfileW; + break; + } + srcfileW++; + } + } + *p = 0; + return mask; } -#endif /* HAVE_REGEX_H */ - struct symt_compiland* symt_new_compiland(struct module* module, unsigned long address, unsigned src_idx) { @@ -2136,7 +2086,7 @@ BOOL WINAPI SymEnumLines(HANDLE hProcess, ULONG64 base, PCSTR compiland, struct module_pair pair; struct hash_table_iter hti; struct symt_ht* sym; - regex_t re; + WCHAR* srcmask; struct line_info* dli; void* ptr; SRCCODEINFO sci; @@ -2150,7 +2100,7 @@ BOOL WINAPI SymEnumLines(HANDLE hProcess, ULONG64 base, PCSTR compiland, if (compiland) FIXME("Unsupported yet (filtering on compiland %s)\n", compiland); pair.requested = module_find_by_addr(pair.pcs, base, DMT_UNKNOWN); if (!module_get_debug(&pair)) return FALSE; - if (!compile_file_regex(&re, srcfile)) return FALSE; + if (!(srcmask = file_regex(srcfile))) return FALSE; sci.SizeOfStruct = sizeof(sci); sci.ModBase = base; @@ -2170,8 +2120,20 @@ BOOL WINAPI SymEnumLines(HANDLE hProcess, ULONG64 base, PCSTR compiland, if (dli->is_source_file) { file = source_get(pair.effective, dli->u.source_file); - if (!match_regexp(&re, file)) sci.FileName[0] = '\0'; - else strcpy(sci.FileName, file); + if (!file) sci.FileName[0] = '\0'; + else + { + DWORD sz = MultiByteToWideChar(CP_ACP, 0, file, -1, NULL, 0); + WCHAR* fileW; + + if ((fileW = HeapAlloc(GetProcessHeap(), 0, sz * sizeof(WCHAR)))) + MultiByteToWideChar(CP_ACP, 0, file, -1, fileW, sz); + if (SymMatchStringW(fileW, srcmask, FALSE)) + strcpy(sci.FileName, file); + else + sci.FileName[0] = '\0'; + HeapFree(GetProcessHeap(), 0, fileW); + } } else if (sci.FileName[0]) { @@ -2183,7 +2145,7 @@ BOOL WINAPI SymEnumLines(HANDLE hProcess, ULONG64 base, PCSTR compiland, } } } - regfree(&re); + HeapFree(GetProcessHeap(), 0, srcmask); return TRUE; }

1 0