wine-commits February 2013

wine-commits@winehq.org

2 participants
459 discussions

André Hentschel : msvcrt/tests: Mark win8 behaviour as broken.
by Alexandre Julliard 28 Feb '13

28 Feb '13

Module: wine Branch: master Commit: 43bdfce43666392fb3fcfacba02c8a6a5a0d5395 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43bdfce43666392fb3fcfacba… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Feb 27 21:42:57 2013 +0100 msvcrt/tests: Mark win8 behaviour as broken. --- dlls/msvcrt/tests/time.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/tests/time.c b/dlls/msvcrt/tests/time.c index 30d9fa7..729e359 100644 --- a/dlls/msvcrt/tests/time.c +++ b/dlls/msvcrt/tests/time.c @@ -181,8 +181,8 @@ static void test_gmtime(void) errno = 0; gmt = -1; err = p_gmtime32_s(&gmt_tm_s, &gmt); - ok(gmt_tm_s.tm_year==-1 || broken(gmt_tm_s.tm_year==70 && gmt_tm->tm_sec<0), - "tm_year = %d\n", gmt_tm_s.tm_year); + ok(gmt_tm_s.tm_year == -1 || broken(gmt_tm_s.tm_year == 70 && gmt_tm_s.tm_sec < 0), + "tm_year = %d, tm_sec = %d\n", gmt_tm_s.tm_year, gmt_tm_s.tm_sec); if(gmt_tm_s.tm_year == -1) { ok(err==EINVAL, "err = %d\n", err); ok(errno==EINVAL, "errno = %d\n", errno);

1 0

Vincent Povirk : mscoree: Add WINE_MONO_VERBOSE environment setting.
by Alexandre Julliard 28 Feb '13

28 Feb '13

Module: wine Branch: master Commit: ad5c4671a5442917aaf16a1565132f2ad6ad4278 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad5c4671a5442917aaf16a156… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Feb 27 09:46:43 2013 -0600 mscoree: Add WINE_MONO_VERBOSE environment setting. --- dlls/mscoree/metahost.c | 10 ++++++++++ dlls/mscoree/mscoree_private.h | 1 + 2 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index eb3bc93..143494c 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -138,6 +138,8 @@ static HRESULT load_mono(CLRRuntimeInfo *This, loaded_mono **result) char mono_lib_path_a[MAX_PATH], mono_etc_path_a[MAX_PATH]; int trace_size; char trace_setting[256]; + int verbose_size; + char verbose_setting[256]; if (This->mono_abi_version <= 0 || This->mono_abi_version > NUM_ABI_VERSIONS) { @@ -204,6 +206,7 @@ static HRESULT load_mono(CLRRuntimeInfo *This, loaded_mono **result) LOAD_MONO_FUNCTION(mono_runtime_object_init); LOAD_MONO_FUNCTION(mono_runtime_quit); LOAD_MONO_FUNCTION(mono_set_dirs); + LOAD_MONO_FUNCTION(mono_set_verbose_level); LOAD_MONO_FUNCTION(mono_stringify_assembly_name); LOAD_MONO_FUNCTION(mono_string_new); LOAD_MONO_FUNCTION(mono_thread_attach); @@ -254,6 +257,13 @@ static HRESULT load_mono(CLRRuntimeInfo *This, loaded_mono **result) { (*result)->mono_jit_set_trace_options(trace_setting); } + + verbose_size = GetEnvironmentVariableA("WINE_MONO_VERBOSE", verbose_setting, sizeof(verbose_setting)); + + if (verbose_size) + { + (*result)->mono_set_verbose_level(verbose_setting[0] - '0'); + } } return S_OK; diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index f7e9c11..4677921 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -171,6 +171,7 @@ struct loaded_mono void (CDECL *mono_runtime_quit)(void); void (CDECL *mono_runtime_set_shutting_down)(void); void (CDECL *mono_set_dirs)(const char *assembly_dir, const char *config_dir); + void (CDECL *mono_set_verbose_level)(DWORD level); char* (CDECL *mono_stringify_assembly_name)(MonoAssemblyName *aname); void (CDECL *mono_thread_pool_cleanup)(void); void (CDECL *mono_thread_suspend_all_other_threads)(void);

1 0

Piotr Caban : ole32: Don' t pass CLSCTX_INPROC_SERVER and CLSCTX_INPROC_HANDLER flags to CoCreateInstance in DefaultHandler_Run .
by Alexandre Julliard 27 Feb '13

27 Feb '13

Module: wine Branch: master Commit: c0a17a4f098ea148e24f4bc802a6739e61b9f515 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0a17a4f098ea148e24f4bc80… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Feb 27 17:59:38 2013 +0100 ole32: Don't pass CLSCTX_INPROC_SERVER and CLSCTX_INPROC_HANDLER flags to CoCreateInstance in DefaultHandler_Run. --- dlls/ole32/defaulthandler.c | 2 +- dlls/ole32/tests/defaulthandler.c | 11 +---------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/dlls/ole32/defaulthandler.c b/dlls/ole32/defaulthandler.c index b4e8203..5e89977 100644 --- a/dlls/ole32/defaulthandler.c +++ b/dlls/ole32/defaulthandler.c @@ -1322,7 +1322,7 @@ static HRESULT WINAPI DefaultHandler_Run( release_delegates(This); - hr = CoCreateInstance(&This->clsid, NULL, CLSCTX_ALL, + hr = CoCreateInstance(&This->clsid, NULL, CLSCTX_LOCAL_SERVER | CLSCTX_REMOTE_SERVER, &IID_IOleObject, (void **)&This->pOleDelegate); if (FAILED(hr)) return hr; diff --git a/dlls/ole32/tests/defaulthandler.c b/dlls/ole32/tests/defaulthandler.c index 8091bc6..5da7ced 100644 --- a/dlls/ole32/tests/defaulthandler.c +++ b/dlls/ole32/tests/defaulthandler.c @@ -36,9 +36,6 @@ #define SET_EXPECT(func) \ expect_ ## func = TRUE -#define GET_EXPECT(func) \ - expect_ ## func - #define CHECK_EXPECT2(func) \ do { \ ok(expect_ ##func, "unexpected call " #func "\n"); \ @@ -184,12 +181,6 @@ static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID r *ppv = NULL; return E_NOINTERFACE; }else if(IsEqualGUID(riid, &IID_IClassFactory)) { - if(!GET_EXPECT(CF_QueryInterface_ClassFactory)) { - todo_wine CHECK_EXPECT(CF_QueryInterface_ClassFactory); - *ppv = NULL; - return E_NOINTERFACE; - } - CHECK_EXPECT(CF_QueryInterface_ClassFactory); *ppv = iface; return S_OK; @@ -268,7 +259,7 @@ static void test_default_handler_run(void) IUnknown_Release(unk); hres = IRunnableObject_Run(ro, NULL); - todo_wine ok(hres == REGDB_E_CLASSNOTREG, "Run returned: %x, expected REGDB_E_CLASSNOTREG\n", hres); + ok(hres == REGDB_E_CLASSNOTREG, "Run returned: %x, expected REGDB_E_CLASSNOTREG\n", hres); IRunnableObject_Release(ro); CoRevokeClassObject(class_reg);

1 0

Piotr Caban : ole32: Added more OleCreateDefaultHandler tests.
by Alexandre Julliard 27 Feb '13

27 Feb '13

Module: wine Branch: master Commit: 0cf2b77aed098a423874324e896de8ffe38e7a0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cf2b77aed098a423874324e8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Feb 27 17:59:26 2013 +0100 ole32: Added more OleCreateDefaultHandler tests. --- dlls/ole32/tests/defaulthandler.c | 196 +++++++++++++++++++++++++++++++++++++ 1 files changed, 196 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/defaulthandler.c b/dlls/ole32/tests/defaulthandler.c index a6469b7..8091bc6 100644 --- a/dlls/ole32/tests/defaulthandler.c +++ b/dlls/ole32/tests/defaulthandler.c @@ -22,6 +22,7 @@ #define CONST_VTABLE #include <stdarg.h> +#include <stdio.h> #include "windef.h" #include "winbase.h" @@ -29,6 +30,47 @@ #include "wine/test.h" +#define DEFINE_EXPECT(func) \ + static BOOL expect_ ## func = FALSE, called_ ## func = FALSE + +#define SET_EXPECT(func) \ + expect_ ## func = TRUE + +#define GET_EXPECT(func) \ + expect_ ## func + +#define CHECK_EXPECT2(func) \ + do { \ + ok(expect_ ##func, "unexpected call " #func "\n"); \ + called_ ## func = TRUE; \ + }while(0) + +#define CHECK_EXPECT(func) \ + do { \ + CHECK_EXPECT2(func); \ + expect_ ## func = FALSE; \ + }while(0) + +#define CHECK_CALLED(func) \ + do { \ + ok(called_ ## func, "expected " #func "\n"); \ + expect_ ## func = called_ ## func = FALSE; \ + }while(0) + +DEFINE_EXPECT(CF_QueryInterface_ClassFactory); +DEFINE_EXPECT(CF_CreateInstance); + +static const char *debugstr_guid(REFIID riid) +{ + static char buf[50]; + + sprintf(buf, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", + riid->Data1, riid->Data2, riid->Data3, riid->Data4[0], + riid->Data4[1], riid->Data4[2], riid->Data4[3], riid->Data4[4], + riid->Data4[5], riid->Data4[6], riid->Data4[7]); + + return buf; +} static HRESULT create_storage(IStorage **stg) { @@ -100,11 +142,165 @@ static void test_olestream(void) IStorage_Release(stg); } +static HRESULT WINAPI test_class_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) +{ + if(IsEqualGUID(riid, &IID_IUnknown)) { + *ppv = iface; + return S_OK; + }else if(IsEqualGUID(riid, &IID_IOleObject)) { + ok(0, "unexpected query for IOleObject interface\n"); + *ppv = NULL; + return E_NOINTERFACE; + } + + *ppv = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI test_class_AddRef(IUnknown *iface) +{ + return 2; +} + +static ULONG WINAPI test_class_Release(IUnknown *iface) +{ + return 1; +} + +static IUnknownVtbl test_class_vtbl = { + test_class_QueryInterface, + test_class_AddRef, + test_class_Release, +}; + +static IUnknown test_class = { &test_class_vtbl }; + +static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv) +{ + if(IsEqualGUID(riid, &IID_IUnknown)) { + *ppv = iface; + return S_OK; + }else if(IsEqualGUID(riid, &IID_IMarshal)) { + *ppv = NULL; + return E_NOINTERFACE; + }else if(IsEqualGUID(riid, &IID_IClassFactory)) { + if(!GET_EXPECT(CF_QueryInterface_ClassFactory)) { + todo_wine CHECK_EXPECT(CF_QueryInterface_ClassFactory); + *ppv = NULL; + return E_NOINTERFACE; + } + + CHECK_EXPECT(CF_QueryInterface_ClassFactory); + *ppv = iface; + return S_OK; + } + + ok(0, "unexpected interface: %s\n", debugstr_guid(riid)); + *ppv = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI ClassFactory_AddRef(IClassFactory *iface) +{ + return 2; +} + +static ULONG WINAPI ClassFactory_Release(IClassFactory *iface) +{ + return 1; +} + +static HRESULT WINAPI ClassFactory_CreateInstance(IClassFactory *iface, + IUnknown *pUnkOuter, REFIID riid, void **ppv) +{ + CHECK_EXPECT(CF_CreateInstance); + + ok(pUnkOuter == NULL, "pUnkOuter != NULL\n"); + todo_wine ok(IsEqualGUID(riid, &IID_IUnknown), "riid = %s\n", debugstr_guid(riid)); + if(IsEqualGUID(riid, &IID_IOleObject)) { + *ppv = NULL; + return E_NOINTERFACE; + } + + *ppv = &test_class; + return S_OK; +} + +static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL fLock) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static IClassFactoryVtbl ClassFactoryVtbl = { + ClassFactory_QueryInterface, + ClassFactory_AddRef, + ClassFactory_Release, + ClassFactory_CreateInstance, + ClassFactory_LockServer +}; + +static IClassFactory ClassFactory = { &ClassFactoryVtbl }; + +static void test_default_handler_run(void) +{ + const CLSID test_server_clsid = {0x0f77e570,0x80c3,0x11e2,{0x9e,0x96,0x08,0x00,0x20,0x0c,0x9a,0x66}}; + + IUnknown *unk; + IRunnableObject *ro; + DWORD class_reg; + HRESULT hres; + + if(!GetProcAddress(GetModuleHandle("ole32"), "CoRegisterSurrogateEx")) { + win_skip("skipping OleCreateDefaultHandler tests\n"); + return; + } + + hres = CoRegisterClassObject(&test_server_clsid, (IUnknown*)&ClassFactory, + CLSCTX_INPROC_SERVER, 0, &class_reg); + ok(hres == S_OK, "CoRegisterClassObject failed: %x\n", hres); + + hres = OleCreateDefaultHandler(&test_server_clsid, NULL, &IID_IUnknown, (void**)&unk); + ok(hres == S_OK, "OleCreateDefaultHandler failed: %x\n", hres); + + hres = IUnknown_QueryInterface(unk, &IID_IRunnableObject, (void**)&ro); + ok(hres == S_OK, "QueryInterface(IRunnableObject) failed: %x\n", hres); + IUnknown_Release(unk); + + hres = IRunnableObject_Run(ro, NULL); + todo_wine ok(hres == REGDB_E_CLASSNOTREG, "Run returned: %x, expected REGDB_E_CLASSNOTREG\n", hres); + IRunnableObject_Release(ro); + + CoRevokeClassObject(class_reg); + + hres = CoRegisterClassObject(&test_server_clsid, (IUnknown*)&ClassFactory, + CLSCTX_LOCAL_SERVER, 0, &class_reg); + ok(hres == S_OK, "CoRegisterClassObject failed: %x\n", hres); + + hres = OleCreateDefaultHandler(&test_server_clsid, NULL, &IID_IUnknown, (void**)&unk); + ok(hres == S_OK, "OleCreateDefaultHandler failed: %x\n", hres); + + hres = IUnknown_QueryInterface(unk, &IID_IRunnableObject, (void**)&ro); + ok(hres == S_OK, "QueryInterface(IRunnableObject) failed: %x\n", hres); + IUnknown_Release(unk); + + SET_EXPECT(CF_QueryInterface_ClassFactory); + SET_EXPECT(CF_CreateInstance); + hres = IRunnableObject_Run(ro, NULL); + todo_wine ok(hres == S_OK, "Run failed: %x\n", hres); + CHECK_CALLED(CF_QueryInterface_ClassFactory); + CHECK_CALLED(CF_CreateInstance); + IRunnableObject_Release(ro); + + CoRevokeClassObject(class_reg); +} + START_TEST(defaulthandler) { OleInitialize(NULL); test_olestream(); + test_default_handler_run(); OleUninitialize(); }

1 0

Byeongsik Jeon : gdi32: Fix the GdiGetCodePage() support ANSI_CHARSET font associated charset.
by Alexandre Julliard 27 Feb '13

27 Feb '13

Module: wine Branch: master Commit: 1c846e70f0edce2908e05a48fb78442a97ac67cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c846e70f0edce2908e05a48f… Author: Byeongsik Jeon <bsjeon(a)hanmail.net> Date: Tue Feb 26 10:31:20 2013 +0900 gdi32: Fix the GdiGetCodePage() support ANSI_CHARSET font associated charset. --- dlls/gdi32/font.c | 55 ++++++++++++++++++++++++++++++ dlls/gdi32/freetype.c | 46 +++++++++++++++++++++++++ dlls/gdi32/tests/font.c | 85 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 186 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index b274b83..65e09d3 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -590,11 +590,66 @@ HFONT WINAPI CreateFontW( INT height, INT width, INT esc, return CreateFontIndirectW( &logfont ); } +#define ASSOC_CHARSET_OEM 1 +#define ASSOC_CHARSET_ANSI 2 +#define ASSOC_CHARSET_SYMBOL 4 + +static DWORD get_associated_charset_info(void) +{ + static DWORD associated_charset = -1; + + if (associated_charset == -1) + { + static const WCHAR assoc_charset_reg_keyW[] = {'S','y','s','t','e','m','\\', + 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', + 'C','o','n','t','r','o','l','\\','F','o','n','t','A','s','s','o','c','\\', + 'A','s','s','o','c','i','a','t','e','d',' ','C','h','a','r','s','e','t','\0'}; + static const WCHAR ansiW[] = {'A','N','S','I','(','0','0',')','\0'}; + static const WCHAR oemW[] = {'O','E','M','(','F','F',')','\0'}; + static const WCHAR symbolW[] = {'S','Y','M','B','O','L','(','0','2',')','\0'}; + static const WCHAR yesW[] = {'Y','E','S','\0'}; + HKEY hkey; + WCHAR dataW[32]; + DWORD type, data_len; + + associated_charset = 0; + + if (RegOpenKeyW(HKEY_LOCAL_MACHINE, + assoc_charset_reg_keyW, &hkey) != ERROR_SUCCESS) + return 0; + + data_len = sizeof(dataW); + if (!RegQueryValueExW(hkey, ansiW, NULL, &type, (LPBYTE)dataW, &data_len) && + type == REG_SZ && !strcmpiW(dataW, yesW)) + associated_charset |= ASSOC_CHARSET_ANSI; + + data_len = sizeof(dataW); + if (!RegQueryValueExW(hkey, oemW, NULL, &type, (LPBYTE)dataW, &data_len) && + type == REG_SZ && !strcmpiW(dataW, yesW)) + associated_charset |= ASSOC_CHARSET_OEM; + + data_len = sizeof(dataW); + if (!RegQueryValueExW(hkey, symbolW, NULL, &type, (LPBYTE)dataW, &data_len) && + type == REG_SZ && !strcmpiW(dataW, yesW)) + associated_charset |= ASSOC_CHARSET_SYMBOL; + + RegCloseKey(hkey); + + TRACE("associated_charset = %d\n", associated_charset); + } + + return associated_charset; +} + static void update_font_code_page( DC *dc ) { CHARSETINFO csi; int charset = GetTextCharsetInfo( dc->hSelf, NULL, 0 ); + if (charset == ANSI_CHARSET && + get_associated_charset_info() & ASSOC_CHARSET_ANSI) + charset = DEFAULT_CHARSET; + /* Hmm, nicely designed api this one! */ if (TranslateCharsetInfo( ULongToPtr(charset), &csi, TCI_SRCCHARSET) ) dc->font_code_page = csi.ciACP; diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index b977b0d..d7cc777 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -3505,6 +3505,46 @@ static void set_value_key(HKEY hkey, const char *name, const char *value) RegDeleteValueA(hkey, name); } +static void update_font_association_info(UINT current_ansi_codepage) +{ + static const char *font_assoc_reg_key = "System\\CurrentControlSet\\Control\\FontAssoc"; + static const char *assoc_charset_subkey = "Associated Charset"; + + if (is_dbcs_ansi_cp(current_ansi_codepage)) + { + HKEY hkey; + if (RegCreateKeyA(HKEY_LOCAL_MACHINE, font_assoc_reg_key, &hkey) == ERROR_SUCCESS) + { + HKEY hsubkey; + if (RegCreateKeyA(hkey, assoc_charset_subkey, &hsubkey) == ERROR_SUCCESS) + { + switch (current_ansi_codepage) + { + case 932: + set_value_key(hsubkey, "ANSI(00)", "NO"); + set_value_key(hsubkey, "OEM(FF)", "NO"); + set_value_key(hsubkey, "SYMBOL(02)", "NO"); + break; + case 936: + case 949: + case 950: + set_value_key(hsubkey, "ANSI(00)", "YES"); + set_value_key(hsubkey, "OEM(FF)", "YES"); + set_value_key(hsubkey, "SYMBOL(02)", "NO"); + break; + } + RegCloseKey(hsubkey); + } + + /* TODO: Associated DefaultFonts */ + + RegCloseKey(hkey); + } + } + else + RegDeleteTreeA(HKEY_LOCAL_MACHINE, font_assoc_reg_key); +} + static void update_font_info(void) { static const WCHAR logpixels[] = { 'L','o','g','P','i','x','e','l','s',0 }; @@ -3538,6 +3578,7 @@ static void update_font_info(void) if (is_dbcs_ansi_cp(ansi_cp)) use_default_fallback = TRUE; + buf[0] = 0; len = sizeof(buf); if (RegQueryValueExA(hkey, "Codepages", 0, &type, (BYTE *)buf, &len) == ERROR_SUCCESS && type == REG_SZ) { @@ -3615,6 +3656,11 @@ static void update_font_info(void) } if (!done) FIXME("there is no font defaults for codepages %u,%u\n", ansi_cp, oem_cp); + + /* update locale dependent font association info in registry. + update only when codepages changed, not logpixels. */ + if (strcmp(buf, cpbuf) != 0) + update_font_association_info(ansi_cp); } static BOOL init_freetype(void) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 943f584..b72a423 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -2083,6 +2083,90 @@ static void test_font_charset(void) skip("Symbol or Wingdings is not installed\n"); } +static void test_GdiGetCodePage(void) +{ + static const struct _matching_data + { + UINT current_codepage; + LPCSTR lfFaceName; + UCHAR lfCharSet; + UINT expected_codepage; + } matching_data[] = { + {1251, "Arial", ANSI_CHARSET, 1252}, + {1251, "Tahoma", ANSI_CHARSET, 1252}, + + {1252, "Arial", ANSI_CHARSET, 1252}, + {1252, "Tahoma", ANSI_CHARSET, 1252}, + + {1253, "Arial", ANSI_CHARSET, 1252}, + {1253, "Tahoma", ANSI_CHARSET, 1252}, + + { 932, "Arial", ANSI_CHARSET, 1252}, /* Japanese Windows returns 1252, not 932 */ + { 932, "Tahoma", ANSI_CHARSET, 1252}, + { 932, "MS UI Gothic", ANSI_CHARSET, 1252}, + + { 936, "Arial", ANSI_CHARSET, 936}, + { 936, "Tahoma", ANSI_CHARSET, 936}, + { 936, "Simsun", ANSI_CHARSET, 936}, + + { 949, "Arial", ANSI_CHARSET, 949}, + { 949, "Tahoma", ANSI_CHARSET, 949}, + { 949, "Gulim", ANSI_CHARSET, 949}, + + { 950, "Arial", ANSI_CHARSET, 950}, + { 950, "Tahoma", ANSI_CHARSET, 950}, + { 950, "PMingLiU", ANSI_CHARSET, 950}, + }; + HDC hdc; + LOGFONT lf; + HFONT hfont; + UINT charset, acp; + DWORD codepage; + int i; + + if (!pGdiGetCodePage) + { + skip("GdiGetCodePage not available on this platform\n"); + return; + } + + acp = GetACP(); + + for (i = 0; i < sizeof(matching_data) / sizeof(struct _matching_data); i++) + { + /* only test data matched current locale codepage */ + if (matching_data[i].current_codepage != acp) + continue; + + if (!is_font_installed(matching_data[i].lfFaceName)) + { + skip("%s is not installed\n", matching_data[i].lfFaceName); + continue; + } + + hdc = GetDC(0); + + memset(&lf, 0, sizeof(lf)); + lf.lfHeight = -16; + lf.lfCharSet = matching_data[i].lfCharSet; + lstrcpyA(lf.lfFaceName, matching_data[i].lfFaceName); + hfont = CreateFontIndirectA(&lf); + ok(hfont != 0, "CreateFontIndirectA error %u\n", GetLastError()); + + hfont = SelectObject(hdc, hfont); + charset = GetTextCharset(hdc); + codepage = pGdiGetCodePage(hdc); + trace("acp=%d, lfFaceName=%s, lfCharSet=%d, GetTextCharset=%d, GdiGetCodePage=%d, expected codepage=%d\n", + acp, lf.lfFaceName, lf.lfCharSet, charset, codepage, matching_data[i].expected_codepage); + ok(codepage == matching_data[i].expected_codepage, + "GdiGetCodePage should have returned %d, got %d\n", matching_data[i].expected_codepage, codepage); + + hfont = SelectObject(hdc, hfont); + DeleteObject(hfont); + ReleaseDC(NULL, hdc); + } +} + static void test_GetFontUnicodeRanges(void) { LOGFONTA lf; @@ -4902,6 +4986,7 @@ START_TEST(font) test_GetOutlineTextMetrics(); test_SetTextJustification(); test_font_charset(); + test_GdiGetCodePage(); test_GetFontUnicodeRanges(); test_nonexistent_font(); test_orientation();

1 0

André Hentschel : msvcrt: Add a new file for the ARM exception handling.
by Alexandre Julliard 27 Feb '13

27 Feb '13

Module: wine Branch: master Commit: 874d077ca6d60f457dcf79f0604d519a4bee78d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=874d077ca6d60f457dcf79f06… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Feb 26 23:42:33 2013 +0100 msvcrt: Add a new file for the ARM exception handling. --- dlls/crtdll/crtdll.spec | 4 +- dlls/msvcr100/msvcr100.spec | 18 ++-- dlls/msvcr70/msvcr70.spec | 10 +- dlls/msvcr71/msvcr71.spec | 12 ++-- dlls/msvcr80/msvcr80.spec | 16 ++-- dlls/msvcr90/msvcr90.spec | 16 ++-- dlls/msvcrt/Makefile.in | 1 + dlls/msvcrt/except_arm.c | 187 +++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/msvcrt.h | 17 ++++ dlls/msvcrt/msvcrt.spec | 18 ++-- dlls/msvcrt20/msvcrt20.spec | 6 +- dlls/msvcrt40/msvcrt40.spec | 6 +- dlls/msvcrtd/msvcrtd.spec | 6 +- include/msvcrt/setjmp.h | 22 +++++ include/winnt.h | 39 +++++++++ 15 files changed, 322 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=874d077ca6d60f457dcf7…

1 0

Jörg Höhle : mmsystem: Always use CALLBACK_FUNCTION to update MIDI/WAVEHDR.dwFlags.
by Alexandre Julliard 27 Feb '13

27 Feb '13

Module: wine Branch: master Commit: f13394f7979d26def92afc2a7399c174147f4c8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f13394f7979d26def92afc2a7… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sat Feb 23 17:29:59 2013 +0100 mmsystem: Always use CALLBACK_FUNCTION to update MIDI/WAVEHDR.dwFlags. --- dlls/mmsystem.dll16/mmsystem.c | 29 +++++++++++++---------------- 1 files changed, 13 insertions(+), 16 deletions(-) diff --git a/dlls/mmsystem.dll16/mmsystem.c b/dlls/mmsystem.dll16/mmsystem.c index ac9915f..fe8f587 100644 --- a/dlls/mmsystem.dll16/mmsystem.c +++ b/dlls/mmsystem.dll16/mmsystem.c @@ -734,8 +734,7 @@ UINT16 WINAPI midiOutOpen16(HMIDIOUT16* lphMidiOut, UINT16 uDeviceID, { return MMSYSERR_NOMEM; } - if ((dwFlags & CALLBACK_TYPEMASK) != CALLBACK_NULL) - dwFlags = (dwFlags & ~CALLBACK_TYPEMASK) | CALLBACK_FUNCTION; + dwFlags = (dwFlags & ~CALLBACK_TYPEMASK) | CALLBACK_FUNCTION; ret = midiOutOpen(&hmo, uDeviceID, (DWORD)thunk, dwInstance, dwFlags); if (ret == MMSYSERR_NOERROR) { @@ -938,8 +937,7 @@ UINT16 WINAPI midiInOpen16(HMIDIIN16* lphMidiIn, UINT16 uDeviceID, { return MMSYSERR_NOMEM; } - if ((dwFlags & CALLBACK_TYPEMASK) != CALLBACK_NULL) - dwFlags = (dwFlags & ~CALLBACK_TYPEMASK) | CALLBACK_FUNCTION; + dwFlags = (dwFlags & ~CALLBACK_TYPEMASK) | CALLBACK_FUNCTION; ret = midiInOpen(&hmid, uDeviceID, (DWORD)thunk, dwInstance, dwFlags); if (ret == MMSYSERR_NOERROR) { @@ -1099,8 +1097,7 @@ MMRESULT16 WINAPI midiStreamOpen16(HMIDISTRM16* phMidiStrm, LPUINT16 devid, { return MMSYSERR_NOMEM; } - if ((fdwOpen & CALLBACK_TYPEMASK) != CALLBACK_NULL) - fdwOpen = (fdwOpen & ~CALLBACK_TYPEMASK) | CALLBACK_FUNCTION; + fdwOpen = (fdwOpen & ~CALLBACK_TYPEMASK) | CALLBACK_FUNCTION; ret = midiStreamOpen(&hMidiStrm32, &devid32, cMidi, (DWORD)thunk, dwInstance, fdwOpen); if (ret == MMSYSERR_NOERROR) { @@ -1233,8 +1230,7 @@ UINT16 WINAPI waveOutOpen16(HWAVEOUT16* lphWaveOut, UINT16 uDeviceID, { return MMSYSERR_NOMEM; } - if ((dwFlags & CALLBACK_TYPEMASK) != CALLBACK_NULL) - dwFlags = (dwFlags & ~CALLBACK_TYPEMASK) | CALLBACK_FUNCTION; + dwFlags = (dwFlags & ~CALLBACK_TYPEMASK) | CALLBACK_FUNCTION; /* since layout of WAVEFORMATEX is the same for 16/32 bits, we directly * call the 32 bit version * however, we need to promote correctly the wave mapper id @@ -1243,11 +1239,12 @@ UINT16 WINAPI waveOutOpen16(HWAVEOUT16* lphWaveOut, UINT16 uDeviceID, ret = waveOutOpen(&hWaveOut, (uDeviceID == (UINT16)-1) ? (UINT)-1 : uDeviceID, lpFormat, (DWORD)thunk, dwInstance, dwFlags); - if (lphWaveOut != NULL && ret == MMSYSERR_NOERROR) - *lphWaveOut = HWAVEOUT_16(hWaveOut); if (ret == MMSYSERR_NOERROR && !(dwFlags & WAVE_FORMAT_QUERY)) + { MMSYSTDRV_SetHandle(thunk, (void*)hWaveOut); - else MMSYSTDRV_DeleteThunk(thunk); + if (lphWaveOut != NULL) + *lphWaveOut = HWAVEOUT_16(hWaveOut); + } else MMSYSTDRV_DeleteThunk(thunk); return ret; } @@ -1512,8 +1509,7 @@ UINT16 WINAPI waveInOpen16(HWAVEIN16* lphWaveIn, UINT16 uDeviceID, { return MMSYSERR_NOMEM; } - if ((dwFlags & CALLBACK_TYPEMASK) != CALLBACK_NULL) - dwFlags = (dwFlags & ~CALLBACK_TYPEMASK) | CALLBACK_FUNCTION; + dwFlags = (dwFlags & ~CALLBACK_TYPEMASK) | CALLBACK_FUNCTION; /* since layout of WAVEFORMATEX is the same for 16/32 bits, we directly * call the 32 bit version * however, we need to promote correctly the wave mapper id @@ -1522,11 +1518,12 @@ UINT16 WINAPI waveInOpen16(HWAVEIN16* lphWaveIn, UINT16 uDeviceID, ret = waveInOpen(&hWaveIn, (uDeviceID == (UINT16)-1) ? (UINT)-1 : uDeviceID, lpFormat, (DWORD)thunk, dwInstance, dwFlags); - if (lphWaveIn != NULL && ret == MMSYSERR_NOERROR) - *lphWaveIn = HWAVEIN_16(hWaveIn); if (ret == MMSYSERR_NOERROR && !(dwFlags & WAVE_FORMAT_QUERY)) + { MMSYSTDRV_SetHandle(thunk, (void*)hWaveIn); - else MMSYSTDRV_DeleteThunk(thunk); + if (lphWaveIn != NULL) + *lphWaveIn = HWAVEOUT_16(hWaveIn); + } else MMSYSTDRV_DeleteThunk(thunk); return ret; }

1 0

Jörg Höhle : mmsystem: Do not rewrite input parameters.
by Alexandre Julliard 27 Feb '13

27 Feb '13

Module: wine Branch: master Commit: 1cc26cba6f7ad86d454b252f41ca93bb1005ddcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cc26cba6f7ad86d454b252f4… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Feb 19 22:54:17 2013 +0100 mmsystem: Do not rewrite input parameters. --- dlls/mmsystem.dll16/message16.c | 12 ------------ dlls/mmsystem.dll16/mmsystem.c | 38 ++++---------------------------------- 2 files changed, 4 insertions(+), 46 deletions(-) diff --git a/dlls/mmsystem.dll16/message16.c b/dlls/mmsystem.dll16/message16.c index 0935ca0..24ae6ef 100644 --- a/dlls/mmsystem.dll16/message16.c +++ b/dlls/mmsystem.dll16/message16.c @@ -188,8 +188,6 @@ static MMSYSTEM_MapType MMSYSTDRV_MidiOut_Map16To32W (UINT wMsg, DWORD_PTR* lpP mh32->dwBytesRecorded = mh16->dwBytesRecorded; mh32->dwUser = mh16->dwUser; mh32->dwFlags = mh16->dwFlags; - /* FIXME: nothing on mh32->lpNext */ - /* could link the mh32->lpNext at this level for memory house keeping */ mh32->dwOffset = (*lpParam2 >= sizeof(MIDIHDR)) ? mh16->dwOffset : 0; mh16->lpNext = mh32; /* for reuse in unprepare and write */ /* store size of passed MIDIHDR?? structure to know if dwOffset is available or not */ @@ -278,9 +276,6 @@ static MMSYSTEM_MapType MMSYSTDRV_MidiOut_UnMap16To32W(UINT wMsg, DWORD_PTR* lp LPMIDIHDR mh16 = MapSL(*(SEGPTR*)((LPSTR)mh32 - sizeof(LPMIDIHDR))); assert(mh16->lpNext == mh32); - mh16->dwBufferLength = mh32->dwBufferLength; - mh16->dwBytesRecorded = mh32->dwBytesRecorded; - mh16->dwUser = mh32->dwUser; mh16->dwFlags = mh32->dwFlags; if (mh16->reserved >= sizeof(MIDIHDR)) mh16->dwOffset = mh32->dwOffset; @@ -501,11 +496,8 @@ static MMSYSTEM_MapType MMSYSTDRV_WaveIn_UnMap16To32W(UINT wMsg, DWORD_PTR* lpP LPWAVEHDR wh16 = MapSL(*(SEGPTR*)((LPSTR)wh32 - sizeof(LPWAVEHDR))); assert(wh16->lpNext == wh32); - wh16->dwBufferLength = wh32->dwBufferLength; wh16->dwBytesRecorded = wh32->dwBytesRecorded; - wh16->dwUser = wh32->dwUser; wh16->dwFlags = wh32->dwFlags; - wh16->dwLoops = wh32->dwLoops; if (wMsg == WIDM_UNPREPARE && fn_ret == MMSYSERR_NOERROR) { HeapFree(GetProcessHeap(), 0, (LPSTR)wh32 - sizeof(LPWAVEHDR)); @@ -734,11 +726,7 @@ static MMSYSTEM_MapType MMSYSTDRV_WaveOut_UnMap16To32W(UINT wMsg, DWORD_PTR* lp LPWAVEHDR wh16 = MapSL(*(SEGPTR*)((LPSTR)wh32 - sizeof(LPWAVEHDR))); assert(wh16->lpNext == wh32); - wh16->dwBufferLength = wh32->dwBufferLength; - wh16->dwBytesRecorded = wh32->dwBytesRecorded; - wh16->dwUser = wh32->dwUser; wh16->dwFlags = wh32->dwFlags; - wh16->dwLoops = wh32->dwLoops; if (wMsg == WODM_UNPREPARE && fn_ret == MMSYSERR_NOERROR) { HeapFree(GetProcessHeap(), 0, (LPSTR)wh32 - sizeof(LPWAVEHDR)); diff --git a/dlls/mmsystem.dll16/mmsystem.c b/dlls/mmsystem.dll16/mmsystem.c index 58b46d9..ac9915f 100644 --- a/dlls/mmsystem.dll16/mmsystem.c +++ b/dlls/mmsystem.dll16/mmsystem.c @@ -104,20 +104,6 @@ void MMSYSTEM_MMTIME32to16(LPMMTIME16 mmt16, const MMTIME* mmt32) memcpy(&(mmt16->u), &(mmt32->u), sizeof(mmt16->u)); } -/****************************************************************** - * MMSYSTEM_MMTIME16to32 - * - * - */ -static void MMSYSTEM_MMTIME16to32(LPMMTIME mmt32, const MMTIME16* mmt16) -{ - mmt32->wType = mmt16->wType; - /* layout of rest is the same for 32/16, - * Note: mmt16->u is 2 bytes smaller than mmt32->u, which has padding - */ - memcpy(&(mmt32->u), &(mmt16->u), sizeof(mmt16->u)); -} - /************************************************************************** * timeGetSystemTime [MMSYSTEM.601] */ @@ -1153,7 +1139,7 @@ MMRESULT16 WINAPI midiStreamPosition16(HMIDISTRM16 hMidiStrm, LPMMTIME16 lpmmt16 if (!lpmmt16) return MMSYSERR_INVALPARAM; - MMSYSTEM_MMTIME16to32(&mmt32, lpmmt16); + mmt32.wType = lpmmt16->wType; ret = midiStreamPosition(HMIDISTRM_32(hMidiStrm), &mmt32, sizeof(MMTIME)); MMSYSTEM_MMTIME32to16(lpmmt16, &mmt32); return ret; @@ -1288,24 +1274,11 @@ UINT16 WINAPI waveOutPrepareHeader16(HWAVEOUT16 hWaveOut, /* [in] */ SEGPTR lpsegWaveOutHdr, /* [???] */ UINT16 uSize) /* [in] */ { - LPWAVEHDR lpWaveOutHdr = MapSL(lpsegWaveOutHdr); - UINT16 result; - TRACE("(%04X, %08x, %u);\n", hWaveOut, lpsegWaveOutHdr, uSize); - if (lpWaveOutHdr == NULL) return MMSYSERR_INVALPARAM; + if (lpsegWaveOutHdr == 0) return MMSYSERR_INVALPARAM; - if ((result = MMSYSTDRV_Message(HWAVEOUT_32(hWaveOut), WODM_PREPARE, lpsegWaveOutHdr, - uSize)) != MMSYSERR_NOTSUPPORTED) - return result; - - if (lpWaveOutHdr->dwFlags & WHDR_INQUEUE) - return WAVERR_STILLPLAYING; - - lpWaveOutHdr->dwFlags |= WHDR_PREPARED; - lpWaveOutHdr->dwFlags &= ~WHDR_DONE; - - return MMSYSERR_NOERROR; + return MMSYSTDRV_Message(HWAVEOUT_32(hWaveOut), WODM_PREPARE, lpsegWaveOutHdr, uSize); } /************************************************************************** @@ -1581,15 +1554,12 @@ UINT16 WINAPI waveInPrepareHeader16(HWAVEIN16 hWaveIn, /* [in] */ UINT16 uSize) /* [in] */ { LPWAVEHDR lpWaveInHdr = MapSL(lpsegWaveInHdr); - UINT16 ret; TRACE("(%04X, %p, %u);\n", hWaveIn, lpWaveInHdr, uSize); if (lpWaveInHdr == NULL) return MMSYSERR_INVALHANDLE; - lpWaveInHdr->dwBytesRecorded = 0; - ret = MMSYSTDRV_Message(HWAVEIN_32(hWaveIn), WIDM_PREPARE, lpsegWaveInHdr, uSize); - return ret; + return MMSYSTDRV_Message(HWAVEIN_32(hWaveIn), WIDM_PREPARE, lpsegWaveInHdr, uSize); } /**************************************************************************

1 0

Jörg Höhle : mmsystem: Use SEGPTR when the . spec says so.
by Alexandre Julliard 27 Feb '13

27 Feb '13

Module: wine Branch: master Commit: 5155e8011da8c2057d512b974a2ee55f8859b146 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5155e8011da8c2057d512b974… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Feb 19 22:06:04 2013 +0100 mmsystem: Use SEGPTR when the .spec says so. --- dlls/mmsystem.dll16/mmio16.c | 8 ++++---- dlls/mmsystem.dll16/mmsystem.c | 32 ++++++++++++++++---------------- include/wine/mmsystem16.h | 10 +++++----- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/dlls/mmsystem.dll16/mmio16.c b/dlls/mmsystem.dll16/mmio16.c index 1db82c2..df28a66 100644 --- a/dlls/mmsystem.dll16/mmio16.c +++ b/dlls/mmsystem.dll16/mmio16.c @@ -424,10 +424,10 @@ MMRESULT16 WINAPI mmioSetInfo16(HMMIO16 hmmio, const MMIOINFO16* lpmmioinfo, UIN /************************************************************************** * mmioSetBuffer [MMSYSTEM.1217] */ -MMRESULT16 WINAPI mmioSetBuffer16(HMMIO16 hmmio, LPSTR pchBuffer, +MMRESULT16 WINAPI mmioSetBuffer16(HMMIO16 hmmio, SEGPTR pchBuffer, LONG cchBuffer, UINT16 uFlags) { - MMRESULT ret = mmioSetBuffer(HMMIO_32(hmmio), MapSL((DWORD)pchBuffer), + MMRESULT ret = mmioSetBuffer(HMMIO_32(hmmio), MapSL(pchBuffer), cchBuffer, uFlags); if (ret == MMSYSERR_NOERROR) @@ -439,10 +439,10 @@ MMRESULT16 WINAPI mmioSetBuffer16(HMMIO16 hmmio, LPSTR pchBuffer, FIXME("really ?\n"); return MMSYSERR_INVALHANDLE; } - MMIO_SetSegmentedBuffer(thunk, (DWORD)pchBuffer, TRUE); + MMIO_SetSegmentedBuffer(thunk, pchBuffer, TRUE); } else - UnMapLS((DWORD)pchBuffer); + UnMapLS(pchBuffer); return ret; } diff --git a/dlls/mmsystem.dll16/mmsystem.c b/dlls/mmsystem.dll16/mmsystem.c index 1109ef4..58b46d9 100644 --- a/dlls/mmsystem.dll16/mmsystem.c +++ b/dlls/mmsystem.dll16/mmsystem.c @@ -814,12 +814,12 @@ UINT16 WINAPI midiOutShortMsg16(HMIDIOUT16 hMidiOut, DWORD dwMsg) * midiOutLongMsg [MMSYSTEM.209] */ UINT16 WINAPI midiOutLongMsg16(HMIDIOUT16 hMidiOut, /* [in] */ - LPMIDIHDR16 lpsegMidiOutHdr, /* [???] NOTE: SEGPTR */ + SEGPTR lpsegMidiOutHdr, /* [???] */ UINT16 uSize) /* [in] */ { - TRACE("(%04X, %p, %d)\n", hMidiOut, lpsegMidiOutHdr, uSize); + TRACE("(%04X, %08x, %d)\n", hMidiOut, lpsegMidiOutHdr, uSize); - return MMSYSTDRV_Message(HMIDIOUT_32(hMidiOut), MODM_LONGDATA, (DWORD_PTR)lpsegMidiOutHdr, uSize); + return MMSYSTDRV_Message(HMIDIOUT_32(hMidiOut), MODM_LONGDATA, lpsegMidiOutHdr, uSize); } /************************************************************************** @@ -895,10 +895,10 @@ DWORD WINAPI midiOutMessage16(HMIDIOUT16 hMidiOut, UINT16 uMessage, case MODM_GETVOLUME: return midiOutGetVolume16(hMidiOut, MapSL(dwParam1)); + /* lpMidiOutHdr is still a segmented pointer for these functions */ case MODM_LONGDATA: - return midiOutLongMsg16(hMidiOut, MapSL(dwParam1), dwParam2); + return midiOutLongMsg16(hMidiOut, dwParam1, dwParam2); case MODM_PREPARE: - /* lpMidiOutHdr is still a segmented pointer for this function */ return midiOutPrepareHeader16(hMidiOut, dwParam1, dwParam2); case MODM_UNPREPARE: return midiOutUnprepareHeader16(hMidiOut, dwParam1, dwParam2); @@ -1010,12 +1010,12 @@ UINT16 WINAPI midiInUnprepareHeader16(HMIDIIN16 hMidiIn, /* [in] */ * midiInAddBuffer [MMSYSTEM.308] */ UINT16 WINAPI midiInAddBuffer16(HMIDIIN16 hMidiIn, /* [in] */ - MIDIHDR16* lpsegMidiInHdr, /* [???] NOTE: SEGPTR */ + SEGPTR lpsegMidiInHdr, /* [???] */ UINT16 uSize) /* [in] */ { - TRACE("(%04X, %p, %d)\n", hMidiIn, lpsegMidiInHdr, uSize); + TRACE("(%04X, %08x, %d)\n", hMidiIn, lpsegMidiInHdr, uSize); - return MMSYSTDRV_Message(HMIDIIN_32(hMidiIn), MIDM_ADDBUFFER, (DWORD_PTR)lpsegMidiInHdr, uSize); + return MMSYSTDRV_Message(HMIDIIN_32(hMidiIn), MIDM_ADDBUFFER, lpsegMidiInHdr, uSize); } /************************************************************************** @@ -1077,7 +1077,7 @@ DWORD WINAPI midiInMessage16(HMIDIIN16 hMidiIn, UINT16 uMessage, case MIDM_UNPREPARE: return midiInUnprepareHeader16(hMidiIn, dwParam1, dwParam2); case MIDM_ADDBUFFER: - return midiInAddBuffer16(hMidiIn, MapSL(dwParam1), dwParam2); + return midiInAddBuffer16(hMidiIn, dwParam1, dwParam2); } return MMSYSTDRV_Message(HMIDIIN_32(hMidiIn), uMessage, dwParam1, dwParam2); } @@ -1330,12 +1330,12 @@ UINT16 WINAPI waveOutUnprepareHeader16(HWAVEOUT16 hWaveOut, /* [in] */ * waveOutWrite [MMSYSTEM.408] */ UINT16 WINAPI waveOutWrite16(HWAVEOUT16 hWaveOut, /* [in] */ - LPWAVEHDR lpsegWaveOutHdr, /* [???] NOTE: SEGPTR */ + SEGPTR lpsegWaveOutHdr, /* [???] */ UINT16 uSize) /* [in] */ { - TRACE("(%04X, %p, %u);\n", hWaveOut, lpsegWaveOutHdr, uSize); + TRACE("(%04X, %08x, %u);\n", hWaveOut, lpsegWaveOutHdr, uSize); - return MMSYSTDRV_Message(HWAVEOUT_32(hWaveOut), WODM_WRITE, (DWORD_PTR)lpsegWaveOutHdr, uSize); + return MMSYSTDRV_Message(HWAVEOUT_32(hWaveOut), WODM_WRITE, lpsegWaveOutHdr, uSize); } /************************************************************************** @@ -1616,14 +1616,14 @@ UINT16 WINAPI waveInUnprepareHeader16(HWAVEIN16 hWaveIn, /* [in] */ * waveInAddBuffer [MMSYSTEM.508] */ UINT16 WINAPI waveInAddBuffer16(HWAVEIN16 hWaveIn, /* [in] */ - WAVEHDR* lpsegWaveInHdr, /* [???] NOTE: SEGPTR */ + SEGPTR lpsegWaveInHdr, /* [???] */ UINT16 uSize) /* [in] */ { - TRACE("(%04X, %p, %u);\n", hWaveIn, lpsegWaveInHdr, uSize); + TRACE("(%04X, %08x, %u);\n", hWaveIn, lpsegWaveInHdr, uSize); - if (lpsegWaveInHdr == NULL) return MMSYSERR_INVALPARAM; + if (lpsegWaveInHdr == 0) return MMSYSERR_INVALPARAM; - return MMSYSTDRV_Message(HWAVEIN_32(hWaveIn), WIDM_ADDBUFFER, (DWORD_PTR)lpsegWaveInHdr, uSize); + return MMSYSTDRV_Message(HWAVEIN_32(hWaveIn), WIDM_ADDBUFFER, lpsegWaveInHdr, uSize); } /************************************************************************** diff --git a/include/wine/mmsystem16.h b/include/wine/mmsystem16.h index d30a1ba..05c11be 100644 --- a/include/wine/mmsystem16.h +++ b/include/wine/mmsystem16.h @@ -120,7 +120,7 @@ UINT16 WINAPI waveOutOpen16(HWAVEOUT16*,UINT16,const WAVEFORMATEX *,DWORD,DWO UINT16 WINAPI waveOutClose16(HWAVEOUT16); UINT16 WINAPI waveOutPrepareHeader16(HWAVEOUT16,SEGPTR,UINT16); UINT16 WINAPI waveOutUnprepareHeader16(HWAVEOUT16,SEGPTR,UINT16); -UINT16 WINAPI waveOutWrite16(HWAVEOUT16,WAVEHDR*,UINT16); +UINT16 WINAPI waveOutWrite16(HWAVEOUT16,SEGPTR,UINT16); UINT16 WINAPI waveOutPause16(HWAVEOUT16); UINT16 WINAPI waveOutRestart16(HWAVEOUT16); UINT16 WINAPI waveOutReset16(HWAVEOUT16); @@ -139,7 +139,7 @@ UINT16 WINAPI waveInOpen16(HWAVEIN16*,UINT16,const WAVEFORMATEX *,DWORD,DWORD UINT16 WINAPI waveInClose16(HWAVEIN16); UINT16 WINAPI waveInPrepareHeader16(HWAVEIN16,SEGPTR,UINT16); UINT16 WINAPI waveInUnprepareHeader16(HWAVEIN16,SEGPTR,UINT16); -UINT16 WINAPI waveInAddBuffer16(HWAVEIN16,WAVEHDR*,UINT16); +UINT16 WINAPI waveInAddBuffer16(HWAVEIN16,SEGPTR,UINT16); UINT16 WINAPI waveInStart16(HWAVEIN16); UINT16 WINAPI waveInStop16(HWAVEIN16); UINT16 WINAPI waveInReset16(HWAVEIN16); @@ -199,7 +199,7 @@ UINT16 WINAPI midiOutClose16(HMIDIOUT16); UINT16 WINAPI midiOutPrepareHeader16(HMIDIOUT16,SEGPTR,UINT16); UINT16 WINAPI midiOutUnprepareHeader16(HMIDIOUT16,SEGPTR,UINT16); UINT16 WINAPI midiOutShortMsg16(HMIDIOUT16,DWORD); -UINT16 WINAPI midiOutLongMsg16(HMIDIOUT16,MIDIHDR16*,UINT16); +UINT16 WINAPI midiOutLongMsg16(HMIDIOUT16,SEGPTR,UINT16); UINT16 WINAPI midiOutReset16(HMIDIOUT16); UINT16 WINAPI midiOutCachePatches16(HMIDIOUT16,UINT16,WORD*,UINT16); UINT16 WINAPI midiOutCacheDrumPatches16(HMIDIOUT16,UINT16,WORD*,UINT16); @@ -212,7 +212,7 @@ UINT16 WINAPI midiInOpen16(HMIDIIN16*,UINT16,DWORD,DWORD,DWORD); UINT16 WINAPI midiInClose16(HMIDIIN16); UINT16 WINAPI midiInPrepareHeader16(HMIDIIN16,SEGPTR,UINT16); UINT16 WINAPI midiInUnprepareHeader16(HMIDIIN16,SEGPTR,UINT16); -UINT16 WINAPI midiInAddBuffer16(HMIDIIN16,MIDIHDR16*,UINT16); +UINT16 WINAPI midiInAddBuffer16(HMIDIIN16,SEGPTR,UINT16); UINT16 WINAPI midiInStart16(HMIDIIN16); UINT16 WINAPI midiInStop16(HMIDIIN16); UINT16 WINAPI midiInReset16(HMIDIIN16); @@ -440,7 +440,7 @@ LONG WINAPI mmioWrite16(HMMIO16,HPCSTR,LONG); LONG WINAPI mmioSeek16(HMMIO16,LONG,INT16); MMRESULT16 WINAPI mmioGetInfo16(HMMIO16,MMIOINFO16*,UINT16); MMRESULT16 WINAPI mmioSetInfo16(HMMIO16,const MMIOINFO16*,UINT16); -UINT16 WINAPI mmioSetBuffer16(HMMIO16,LPSTR,LONG,UINT16); +UINT16 WINAPI mmioSetBuffer16(HMMIO16,SEGPTR,LONG,UINT16); UINT16 WINAPI mmioFlush16(HMMIO16,UINT16); UINT16 WINAPI mmioAdvance16(HMMIO16,MMIOINFO16*,UINT16); LRESULT WINAPI mmioSendMessage16(HMMIO16,UINT16,LPARAM,LPARAM);

1 0

Jacek Caban : vbscipt: Added string constants.
by Alexandre Julliard 27 Feb '13

27 Feb '13

Module: wine Branch: master Commit: 5f3c38ed61d8e062954953ec3a64fba6b19a445d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f3c38ed61d8e062954953ec3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 27 12:56:05 2013 +0100 vbscipt: Added string constants. --- dlls/vbscript/global.c | 80 ++++++++++--------------------------------- dlls/vbscript/tests/api.vbs | 14 +++++++ dlls/vbscript/vbdisp.c | 12 ++++++ dlls/vbscript/vbscript.h | 7 +++- 4 files changed, 50 insertions(+), 63 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 5b4af6f..9ff1f76 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1609,59 +1609,15 @@ static HRESULT Global_GetRef(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VA return E_NOTIMPL; } -static HRESULT Global_vbCr(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbCrLf(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbNewLine(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbFormFeed(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbLf(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbNullChar(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbNullString(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbTab(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbVerticalTab(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} +static const string_constant_t vbCr = {1, {'\r'}}; +static const string_constant_t vbCrLf = {2, {'\r','\n'}}; +static const string_constant_t vbNewLine = {2, {'\r','\n'}}; +static const string_constant_t vbFormFeed = {1, {0xc}}; +static const string_constant_t vbLf = {1, {'\n'}}; +static const string_constant_t vbNullChar = {1}; +static const string_constant_t vbNullString = {0}; +static const string_constant_t vbTab = {1, {'\t'}}; +static const string_constant_t vbVerticalTab = {1, {0xb}}; static const builtin_prop_t global_props[] = { {DISPID_GLOBAL_VBUSESYSTEM, NULL, BP_GET, VT_I2, 0}, @@ -1736,15 +1692,15 @@ static const builtin_prop_t global_props[] = { {DISPID_GLOBAL_VBRED, NULL, BP_GET, VT_I4, 0x0000ff}, {DISPID_GLOBAL_VBWHITE, NULL, BP_GET, VT_I4, 0xffffff}, {DISPID_GLOBAL_VBYELLOW, NULL, BP_GET, VT_I4, 0x00ffff}, - {DISPID_GLOBAL_VBCR, Global_vbCr, BP_GET}, - {DISPID_GLOBAL_VBCRLF, Global_vbCrLf, BP_GET}, - {DISPID_GLOBAL_VBNEWLINE, Global_vbNewLine, BP_GET}, - {DISPID_GLOBAL_VBFORMFEED, Global_vbFormFeed, BP_GET}, - {DISPID_GLOBAL_VBLF, Global_vbLf, BP_GET}, - {DISPID_GLOBAL_VBNULLCHAR, Global_vbNullChar, BP_GET}, - {DISPID_GLOBAL_VBNULLSTRING, Global_vbNullString, BP_GET}, - {DISPID_GLOBAL_VBTAB, Global_vbTab, BP_GET}, - {DISPID_GLOBAL_VBVERTICALTAB, Global_vbVerticalTab, BP_GET}, + {DISPID_GLOBAL_VBCR, NULL, BP_GET, VT_BSTR, (UINT_PTR)&vbCr}, + {DISPID_GLOBAL_VBCRLF, NULL, BP_GET, VT_BSTR, (UINT_PTR)&vbCrLf}, + {DISPID_GLOBAL_VBNEWLINE, NULL, BP_GET, VT_BSTR, (UINT_PTR)&vbNewLine}, + {DISPID_GLOBAL_VBFORMFEED, NULL, BP_GET, VT_BSTR, (UINT_PTR)&vbFormFeed}, + {DISPID_GLOBAL_VBLF, NULL, BP_GET, VT_BSTR, (UINT_PTR)&vbLf}, + {DISPID_GLOBAL_VBNULLCHAR, NULL, BP_GET, VT_BSTR, (UINT_PTR)&vbNullChar}, + {DISPID_GLOBAL_VBNULLSTRING, NULL, BP_GET, VT_BSTR, (UINT_PTR)&vbNullString}, + {DISPID_GLOBAL_VBTAB, NULL, BP_GET, VT_BSTR, (UINT_PTR)&vbTab}, + {DISPID_GLOBAL_VBVERTICALTAB, NULL, BP_GET, VT_BSTR, (UINT_PTR)&vbVerticalTab}, {DISPID_GLOBAL_CCUR, Global_CCur, 0, 1}, {DISPID_GLOBAL_CINT, Global_CInt, 0, 1}, {DISPID_GLOBAL_CLNG, Global_CLng, 0, 1}, diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 3e53813..0aaeefb 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -48,6 +48,11 @@ Sub TestConstantI4(name, val, exval) Call ok(getVT(val) = "VT_I4*", "getVT(" & name & ") = " & getVT(val)) End Sub +Sub TestConstantBSTR(name, val, exval) + Call ok(val = exval, name & " = " & val & " expected " & exval) + Call ok(getVT(val) = "VT_BSTR*", "getVT(" & name & ") = " & getVT(val)) +End Sub + TestConstant "vbEmpty", vbEmpty, 0 TestConstant "vbNull", vbNull, 1 TestConstant "vbLong", vbLong, 3 @@ -103,6 +108,15 @@ TestConstantI4 "vbMagenta", vbMagenta, &hff00ff& TestConstantI4 "vbRed", vbRed, &h0000ff& TestConstantI4 "vbWhite", vbWhite, &hffffff& TestConstantI4 "vbYellow", vbYellow, &h00ffff& +TestConstantBSTR "vbCr", vbCr, Chr(13) +TestConstantBSTR "vbCrLf", vbCrLf, Chr(13)&Chr(10) +TestConstantBSTR "vbNewLine", vbNewLine, Chr(13)&Chr(10) +TestConstantBSTR "vbFormFeed", vbFormFeed, Chr(12) +TestConstantBSTR "vbLf", vbLf, Chr(10) +TestConstantBSTR "vbNullChar", vbNullChar, Chr(0) +TestConstantBSTR "vbNullString", vbNullString, "" +TestConstantBSTR "vbTab", vbTab, chr(9) +TestConstantBSTR "vbVerticalTab", vbVerticalTab, chr(11) Sub TestCStr(arg, exval) dim x diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 0c39956..f06a5b6 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -160,6 +160,18 @@ static HRESULT invoke_builtin(vbdisp_t *This, const builtin_prop_t *prop, WORD f V_VT(res) = VT_I4; V_I4(res) = val; break; + case VT_BSTR: { + const string_constant_t *str = (const string_constant_t*)prop->max_args; + BSTR ret; + + ret = SysAllocStringLen(str->buf, str->len); + if(!ret) + return E_OUTOFMEMORY; + + V_VT(res) = VT_BSTR; + V_BSTR(res) = ret; + break; + } default: assert(0); } diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index db31b47..e25b524 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -86,7 +86,7 @@ typedef struct { HRESULT (*proc)(vbdisp_t*,VARIANT*,unsigned,VARIANT*); DWORD flags; unsigned min_args; - unsigned max_args; + UINT_PTR max_args; } builtin_prop_t; typedef struct _class_desc_t { @@ -334,6 +334,11 @@ HRESULT compile_script(script_ctx_t*,const WCHAR*,const WCHAR*,vbscode_t**) DECL HRESULT exec_script(script_ctx_t*,function_t*,IDispatch*,DISPPARAMS*,VARIANT*) DECLSPEC_HIDDEN; void release_dynamic_vars(dynamic_var_t*) DECLSPEC_HIDDEN; +typedef struct { + UINT16 len; + WCHAR buf[7]; +} string_constant_t; + #define TID_LIST \ XDIID(ErrObj) \ XDIID(GlobalObj)

1 0

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 February 2013