April 2009 - Wine-commits - list.winehq.org

Henri Verbeet : wined3d: Get rid of the "token" field from struct wined3d_shader_dst_param.
by Alexandre Julliard 14 Apr '09

14 Apr '09

Module: wine Branch: master Commit: d3fc7dca99715d9f9c9c06a33a9cf1bc15810e09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3fc7dca99715d9f9c9c06a33… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 13 09:27:43 2009 +0200 wined3d: Get rid of the "token" field from struct wined3d_shader_dst_param. --- dlls/wined3d/arb_program_shader.c | 1 - dlls/wined3d/baseshader.c | 1 - dlls/wined3d/glsl_shader.c | 5 ----- dlls/wined3d/vertexshader.c | 5 ----- dlls/wined3d/wined3d_private.h | 1 - 5 files changed, 0 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index ce20032..b5b5ad4 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1634,7 +1634,6 @@ static void shader_hw_mnxn(const struct wined3d_shader_instruction *ins) tmp_dst = ins->dst[0]; for (i = 0; i < nComponents; i++) { tmp_dst.write_mask = WINED3DSP_WRITEMASK_0 << i; - tmp_dst.token = (tmp_dst.token & ~WINED3DSP_WRITEMASK_ALL) | tmp_dst.write_mask; tmp_ins.src[1] = ins->src[1]+i; shader_hw_map2gl(&tmp_ins); } diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index f24f9bc..08415c2 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -221,7 +221,6 @@ static void shader_parse_dst_param(DWORD param, DWORD addr_param, struct wined3d dst->modifiers = param & WINED3DSP_DSTMOD_MASK; dst->shift = (param & WINED3DSP_DSTSHIFT_MASK) >> WINED3DSP_DSTSHIFT_SHIFT; dst->has_rel_addr = param & WINED3DSHADER_ADDRMODE_RELATIVE; - dst->token = param; dst->addr_token = addr_param; } diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 44e5e80..61c5701 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1505,7 +1505,6 @@ static void shader_glsl_color_correction(const struct wined3d_shader_instruction dst = ins->dst[0]; dst.write_mask = mask; - dst.token = (dst.token & ~WINED3DSP_WRITEMASK_ALL) | dst.write_mask; shader_glsl_add_dst_param(ins, &dst, &dst_param); arguments[0] = '\0'; @@ -1976,9 +1975,7 @@ static void shader_glsl_cmp(const struct wined3d_shader_instruction *ins) cmp_channel = WINED3DSP_WRITEMASK_0 << j; } } - dst.write_mask = dst_mask & write_mask; - dst.token = (dst.token & ~WINED3DSP_WRITEMASK_ALL) | dst.write_mask; /* Splitting the cmp instruction up in multiple lines imposes a problem: * The first lines may overwrite source parameters of the following lines. @@ -2059,7 +2056,6 @@ static void shader_glsl_cnd(const struct wined3d_shader_instruction *ins) } dst.write_mask = dst_mask & write_mask; - dst.token = (dst.token & ~WINED3DSP_WRITEMASK_ALL) | dst.write_mask; write_mask = shader_glsl_append_dst_ext(ins->buffer, ins, &dst); if (!write_mask) continue; @@ -2140,7 +2136,6 @@ static void shader_glsl_mnxn(const struct wined3d_shader_instruction *ins) for (i = 0; i < nComponents; ++i) { tmp_dst.write_mask = WINED3DSP_WRITEMASK_0 << i; - tmp_dst.token = (tmp_dst.token & ~WINED3DSP_WRITEMASK_ALL) | tmp_dst.write_mask; tmp_ins.src[1] = ins->src[1] + i; shader_glsl_dot(&tmp_ins); } diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index 32fba08..fdd8cd8 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -174,10 +174,6 @@ static void vshader_set_input( unsigned int regnum, BYTE usage, BYTE usage_idx) { - /* Fake register; set reserved bit, regnum, type: input, wmask: all */ - DWORD reg_token = (0x1 << 31) | - WINED3DSP_WRITEMASK_ALL | (WINED3DSPR_INPUT << WINED3DSP_REGTYPE_SHIFT) | regnum; - This->semantics_in[regnum].usage = usage; This->semantics_in[regnum].usage_idx = usage_idx; This->semantics_in[regnum].reg.register_type = WINED3DSPR_INPUT; @@ -186,7 +182,6 @@ static void vshader_set_input( This->semantics_in[regnum].reg.modifiers = 0; This->semantics_in[regnum].reg.shift = 0; This->semantics_in[regnum].reg.has_rel_addr = FALSE; - This->semantics_in[regnum].reg.token = reg_token; This->semantics_in[regnum].reg.addr_token = 0; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 429e2bd..3d911de 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -452,7 +452,6 @@ struct wined3d_shader_dst_param DWORD modifiers; DWORD shift; BOOL has_rel_addr; - DWORD token; DWORD addr_token; };

1 0

Hans Leidekker : user32: By default, return all zeroes in the first half of the keyboard layout name.
by Alexandre Julliard 14 Apr '09

14 Apr '09

Module: wine Branch: master Commit: ed70c76adde1a41a71c3eb3129a05fc39ccf1918 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed70c76adde1a41a71c3eb312… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 14 12:34:37 2009 +0200 user32: By default, return all zeroes in the first half of the keyboard layout name. --- dlls/user32/tests/input.c | 14 ++++++++++++++ dlls/winex11.drv/keyboard.c | 2 -- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index e4ad1de..4f3bd56 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1284,6 +1284,19 @@ static void test_get_async_key_state(void) ok(0 == GetAsyncKeyState(-1000000), "GetAsyncKeyState did not return 0\n"); } +static void test_keyboard_layout_name(void) +{ + BOOL ret; + char klid[KL_NAMELENGTH]; + + if (GetKeyboardLayout(0) != (HKL)(ULONG_PTR)0x04090409) return; + + klid[0] = 0; + ret = GetKeyboardLayoutNameA(klid); + ok(ret, "GetKeyboardLayoutNameA failed %u\n", GetLastError()); + ok(!strcmp(klid, "00000409"), "expected 00000409, got %s\n", klid); +} + START_TEST(input) { init_function_pointers(); @@ -1300,6 +1313,7 @@ START_TEST(input) test_key_map(); test_ToUnicode(); test_get_async_key_state(); + test_keyboard_layout_name(); if(pGetMouseMovePointsEx) test_GetMouseMovePointsEx(); diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 542e5a8..f7dad12 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1914,8 +1914,6 @@ BOOL CDECL X11DRV_GetKeyboardLayoutName(LPWSTR name) langid = PRIMARYLANGID(LANGIDFROMLCID(layout)); if (langid == LANG_CHINESE || langid == LANG_JAPANESE || langid == LANG_KOREAN) layout |= 0xe001 << 16; /* FIXME */ - else - layout |= layout << 16; sprintfW(name, formatW, layout); TRACE("returning %s\n", debugstr_w(name));

1 0

Aric Stewart : msctf/test: Test enabling and disabling Language Profiles.
by Alexandre Julliard 14 Apr '09

14 Apr '09

Module: wine Branch: master Commit: 5d3336ed73d22c4529be231ca7563c76bd3c3a30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d3336ed73d22c4529be231ca… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Apr 10 07:57:02 2009 -0500 msctf/test: Test enabling and disabling Language Profiles. --- dlls/msctf/tests/inputprocessor.c | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index d689034..20991e4 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -160,6 +160,27 @@ static void test_FindClosestCategory(void) ok(IsEqualGUID(&output,&GUID_TFCAT_TIP_KEYBOARD),"Wrong GUID\n"); } +static void test_Enable(void) +{ + HRESULT hr; + BOOL enabled = FALSE; + + hr = ITfInputProcessorProfiles_EnableLanguageProfile(g_ipp,&CLSID_FakeService, gLangid, &CLSID_FakeService, TRUE); + ok(SUCCEEDED(hr),"Failed to enable text service\n"); + hr = ITfInputProcessorProfiles_IsEnabledLanguageProfile(g_ipp,&CLSID_FakeService, gLangid, &CLSID_FakeService, &enabled); + ok(SUCCEEDED(hr),"Failed to get enabled state\n"); + ok(enabled == TRUE,"enabled state incorrect\n"); +} + +static void test_Disable(void) +{ + HRESULT hr; + + trace("Disabling\n"); + hr = ITfInputProcessorProfiles_EnableLanguageProfile(g_ipp,&CLSID_FakeService, gLangid, &CLSID_FakeService, FALSE); + ok(SUCCEEDED(hr),"Failed to disable text service\n"); +} + START_TEST(inputprocessor) { if (SUCCEEDED(initialize())) @@ -168,8 +189,10 @@ START_TEST(inputprocessor) test_Register(); test_RegisterCategory(); test_EnumInputProcessorInfo(); + test_Enable(); test_EnumLanguageProfiles(); test_FindClosestCategory(); + test_Disable(); test_UnregisterCategory(); test_Unregister(); }

1 0

Aric Stewart : msctf/tests: Add framework for a TextService for testing.
by Alexandre Julliard 14 Apr '09

14 Apr '09

Module: wine Branch: master Commit: afe5dba276526f27ef40981046effffca1c99a7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=afe5dba276526f27ef4098104… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Apr 10 07:55:45 2009 -0500 msctf/tests: Add framework for a TextService for testing. --- dlls/msctf/tests/inputprocessor.c | 215 ++++++++++++++++++++++++++++++++++++- 1 files changed, 213 insertions(+), 2 deletions(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 20991e4..13b81c7 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -23,15 +23,19 @@ #define COBJMACROS #include "wine/test.h" #include "winuser.h" +#include "initguid.h" #include "shlwapi.h" #include "shlguid.h" #include "comcat.h" -#include "initguid.h" #include "msctf.h" static ITfInputProcessorProfiles* g_ipp; static LANGID gLangid; -static ITfCategoryMgr * g_cm; +static ITfCategoryMgr * g_cm = NULL; +static ITfThreadMgr* g_tm = NULL; + +HRESULT RegisterTextService(REFCLSID rclsid); +HRESULT UnregisterTextService(); DEFINE_GUID(CLSID_FakeService, 0xEDE1A7AD,0x66DE,0x47E0,0xB6,0x20,0x3E,0x92,0xF8,0x24,0x6B,0xF3); DEFINE_GUID(CLSID_TF_InputProcessorProfiles, 0x33c53a50,0xf456,0x4884,0xb0,0x49,0x85,0xfd,0x64,0x3e,0xcf,0xed); @@ -41,6 +45,7 @@ DEFINE_GUID(GUID_TFCAT_TIP_SPEECH, 0xB5A73CD1,0x8355,0x426B,0xA1,0x61,0x25 DEFINE_GUID(GUID_TFCAT_TIP_HANDWRITING, 0x246ecb87,0xc2f2,0x4abe,0x90,0x5b,0xc8,0xb3,0x8a,0xdd,0x2c,0x43); DEFINE_GUID (GUID_TFCAT_DISPLAYATTRIBUTEPROVIDER, 0x046B8C80,0x1647,0x40F7,0x9B,0x21,0xB9,0x3B,0x81,0xAA,0xBC,0x1B); DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); +DEFINE_GUID(CLSID_TF_ThreadMgr, 0x529a9e6b,0x6587,0x4f23,0xab,0x9e,0x9c,0x7d,0x68,0x3e,0x3c,0x50); static HRESULT initialize(void) @@ -52,6 +57,9 @@ static HRESULT initialize(void) if (SUCCEEDED(hr)) hr = CoCreateInstance (&CLSID_TF_CategoryMgr, NULL, CLSCTX_INPROC_SERVER, &IID_ITfCategoryMgr, (void**)&g_cm); + if (SUCCEEDED(hr)) + hr = CoCreateInstance (&CLSID_TF_ThreadMgr, NULL, + CLSCTX_INPROC_SERVER, &IID_ITfThreadMgr, (void**)&g_tm); return hr; } @@ -61,6 +69,8 @@ static void cleanup(void) ITfInputProcessorProfiles_Release(g_ipp); if (g_cm) ITfCategoryMgr_Release(g_cm); + if (g_tm) + ITfThreadMgr_Release(g_tm); CoUninitialize(); } @@ -71,6 +81,8 @@ static void test_Register(void) static const WCHAR szDesc[] = {'F','a','k','e',' ','W','i','n','e',' ','S','e','r','v','i','c','e',0}; static const WCHAR szFile[] = {'F','a','k','e',' ','W','i','n','e',' ','S','e','r','v','i','c','e',' ','F','i','l','e',0}; + hr = RegisterTextService(&CLSID_FakeService); + ok(SUCCEEDED(hr),"Unable to register COM for TextService\n"); hr = ITfInputProcessorProfiles_Register(g_ipp, &CLSID_FakeService); ok(SUCCEEDED(hr),"Unable to register text service(%x)\n",hr); hr = ITfInputProcessorProfiles_AddLanguageProfile(g_ipp, &CLSID_FakeService, gLangid, &CLSID_FakeService, szDesc, sizeof(szDesc)/sizeof(WCHAR), szFile, sizeof(szFile)/sizeof(WCHAR), 1); @@ -82,6 +94,7 @@ static void test_Unregister(void) HRESULT hr; hr = ITfInputProcessorProfiles_Unregister(g_ipp, &CLSID_FakeService); ok(SUCCEEDED(hr),"Unable to unregister text service(%x)\n",hr); + UnregisterTextService(); } static void test_EnumInputProcessorInfo(void) @@ -200,3 +213,201 @@ START_TEST(inputprocessor) skip("Unable to create InputProcessor\n"); cleanup(); } + + + +/******************************************************************************************** + * Stub text service for testing + ********************************************************************************************/ + +static LONG TS_refCount; +static IClassFactory *cf; +static DWORD regid; + +typedef HRESULT (*LPFNCONSTRUCTOR)(IUnknown *pUnkOuter, IUnknown **ppvOut); + +typedef struct tagClassFactory +{ + const IClassFactoryVtbl *vtbl; + LONG ref; + LPFNCONSTRUCTOR ctor; +} ClassFactory; + +typedef struct tagTextService +{ + const ITfTextInputProcessorVtbl *TextInputProcessorVtbl; + LONG refCount; +} TextService; + +static void ClassFactory_Destructor(ClassFactory *This) +{ + HeapFree(GetProcessHeap(),0,This); + TS_refCount--; +} + +static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, LPVOID *ppvOut) +{ + *ppvOut = NULL; + if (IsEqualIID(riid, &IID_IClassFactory) || IsEqualIID(riid, &IID_IUnknown)) + { + IClassFactory_AddRef(iface); + *ppvOut = iface; + return S_OK; + } + + return E_NOINTERFACE; +} + +static ULONG WINAPI ClassFactory_AddRef(IClassFactory *iface) +{ + ClassFactory *This = (ClassFactory *)iface; + return InterlockedIncrement(&This->ref); +} + +static ULONG WINAPI ClassFactory_Release(IClassFactory *iface) +{ + ClassFactory *This = (ClassFactory *)iface; + ULONG ret = InterlockedDecrement(&This->ref); + + if (ret == 0) + ClassFactory_Destructor(This); + return ret; +} + +static HRESULT WINAPI ClassFactory_CreateInstance(IClassFactory *iface, IUnknown *punkOuter, REFIID iid, LPVOID *ppvOut) +{ + ClassFactory *This = (ClassFactory *)iface; + HRESULT ret; + IUnknown *obj; + + ret = This->ctor(punkOuter, &obj); + if (FAILED(ret)) + return ret; + ret = IUnknown_QueryInterface(obj, iid, ppvOut); + IUnknown_Release(obj); + return ret; +} + +static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL fLock) +{ + if(fLock) + InterlockedIncrement(&TS_refCount); + else + InterlockedDecrement(&TS_refCount); + + return S_OK; +} + +static const IClassFactoryVtbl ClassFactoryVtbl = { + /* IUnknown */ + ClassFactory_QueryInterface, + ClassFactory_AddRef, + ClassFactory_Release, + + /* IClassFactory*/ + ClassFactory_CreateInstance, + ClassFactory_LockServer +}; + +static HRESULT ClassFactory_Constructor(LPFNCONSTRUCTOR ctor, LPVOID *ppvOut) +{ + ClassFactory *This = HeapAlloc(GetProcessHeap(),0,sizeof(ClassFactory)); + This->vtbl = &ClassFactoryVtbl; + This->ref = 1; + This->ctor = ctor; + *ppvOut = (LPVOID)This; + TS_refCount++; + return S_OK; +} + +static void TextService_Destructor(TextService *This) +{ + HeapFree(GetProcessHeap(),0,This); +} + +static HRESULT WINAPI TextService_QueryInterface(ITfTextInputProcessor *iface, REFIID iid, LPVOID *ppvOut) +{ + TextService *This = (TextService *)iface; + *ppvOut = NULL; + + if (IsEqualIID(iid, &IID_IUnknown) || IsEqualIID(iid, &IID_ITfTextInputProcessor)) + { + *ppvOut = This; + } + + if (*ppvOut) + { + IUnknown_AddRef(iface); + return S_OK; + } + + return E_NOINTERFACE; +} + +static ULONG WINAPI TextService_AddRef(ITfTextInputProcessor *iface) +{ + TextService *This = (TextService *)iface; + return InterlockedIncrement(&This->refCount); +} + +static ULONG WINAPI TextService_Release(ITfTextInputProcessor *iface) +{ + TextService *This = (TextService *)iface; + ULONG ret; + + ret = InterlockedDecrement(&This->refCount); + if (ret == 0) + TextService_Destructor(This); + return ret; +} + +static HRESULT WINAPI TextService_Activate(ITfTextInputProcessor *iface, + ITfThreadMgr *ptim, TfClientId id) +{ + trace("TextService_Activate\n"); + return S_OK; +} + +static HRESULT WINAPI TextService_Deactivate(ITfTextInputProcessor *iface) +{ + trace("TextService_Deactivate\n"); + return S_OK; +} + +static const ITfTextInputProcessorVtbl TextService_TextInputProcessorVtbl= +{ + TextService_QueryInterface, + TextService_AddRef, + TextService_Release, + + TextService_Activate, + TextService_Deactivate +}; + +HRESULT TextService_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) +{ + TextService *This; + if (pUnkOuter) + return CLASS_E_NOAGGREGATION; + + This = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(TextService)); + if (This == NULL) + return E_OUTOFMEMORY; + + This->TextInputProcessorVtbl= &TextService_TextInputProcessorVtbl; + This->refCount = 1; + + *ppOut = (IUnknown *)This; + return S_OK; +} + +HRESULT RegisterTextService(REFCLSID rclsid) +{ + ClassFactory_Constructor( TextService_Constructor ,(LPVOID*)&cf); + return CoRegisterClassObject(rclsid, (IUnknown*) cf, CLSCTX_INPROC_SERVER, REGCLS_MULTIPLEUSE, &regid); +} + +HRESULT UnregisterTextService() +{ + return CoRevokeClassObject(regid); +}

1 0

Detlef Riekenberg : oleaut32: VarCat must use localized names for VT_BOOL.
by Alexandre Julliard 14 Apr '09

14 Apr '09

Module: wine Branch: master Commit: 66430491161b8dc13fc7dc7823b3a9cc9cbccf42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66430491161b8dc13fc7dc782… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sat Apr 11 00:30:42 2009 +0200 oleaut32: VarCat must use localized names for VT_BOOL. --- dlls/oleaut32/tests/vartest.c | 38 +++++++++++++++++++++++++++----------- dlls/oleaut32/variant.c | 14 ++++++++++---- dlls/oleaut32/variant.h | 3 +++ dlls/oleaut32/vartype.c | 8 +++++++- 4 files changed, 47 insertions(+), 16 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 648c959..24ef171 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -46,6 +46,11 @@ static INT (WINAPI *pVariantTimeToSystemTime)(double,LPSYSTEMTIME); static INT (WINAPI *pDosDateTimeToVariantTime)(USHORT,USHORT,double*); static INT (WINAPI *pVariantTimeToDosDateTime)(double,USHORT*,USHORT *); +static const WCHAR sz12[] = {'1','2','\0'}; +/* the strings are localized */ +static WCHAR sz12_false[32]; +static WCHAR sz12_true[32]; + /* Get a conversion function ptr, return if function not available */ #define CHECKPTR(func) p##func = (void*)GetProcAddress(hOleaut32, #func); \ if (!p##func) { trace("function " # func " not available, not testing it\n"); return; } @@ -95,7 +100,24 @@ static int IS_ANCIENT = 0; static void init(void) { - hOleaut32 = GetModuleHandle("oleaut32.dll"); + BSTR bstr; + HRESULT res; + + res = VarBstrFromBool(VARIANT_TRUE, LANG_USER_DEFAULT, VAR_LOCALBOOL, &bstr); + ok(SUCCEEDED(res) && (lstrlenW(bstr) > 0), + "Expected localized string for 'True'\n"); + lstrcpyW(sz12_true, sz12); + if (bstr) lstrcatW(sz12_true, bstr); + SysFreeString(bstr); + + res = VarBstrFromBool(VARIANT_FALSE, LANG_USER_DEFAULT, VAR_LOCALBOOL, &bstr); + ok(SUCCEEDED(res) && (lstrlenW(bstr) > 0), + "Expected localized string for 'False'\n"); + lstrcpyW(sz12_false, sz12); + if (bstr) lstrcatW(sz12_false, bstr); + SysFreeString(bstr); + + hOleaut32 = GetModuleHandle("oleaut32.dll"); /* Is a given function exported from oleaut32? */ #define HAVE_FUNC(func) ((void*)GetProcAddress(hOleaut32, #func) != NULL) @@ -2007,7 +2029,6 @@ static HRESULT (WINAPI *pVarSub)(LPVARIANT,LPVARIANT,LPVARIANT); static void test_VarSub(void) { - static const WCHAR sz12[] = {'1','2','\0'}; VARIANT left, right, exp, result, cy, dec; VARTYPE i; BSTR lbstr, rbstr; @@ -4856,7 +4877,6 @@ static HRESULT (WINAPI *pVarMul)(LPVARIANT,LPVARIANT,LPVARIANT); static void test_VarMul(void) { - static const WCHAR sz12[] = {'1','2','\0'}; VARIANT left, right, exp, result, cy, dec; VARTYPE i; BSTR lbstr, rbstr; @@ -5028,7 +5048,6 @@ static HRESULT (WINAPI *pVarAdd)(LPVARIANT,LPVARIANT,LPVARIANT); static void test_VarAdd(void) { - static const WCHAR sz12[] = {'1','2','\0'}; VARIANT left, right, exp, result, cy, dec; VARTYPE i; BSTR lbstr, rbstr; @@ -5215,14 +5234,11 @@ static void test_VarCat(void) { LCID lcid; VARIANT left, right, result, expected; - static const WCHAR sz12[] = {'1','2','\0'}; static const WCHAR sz34[] = {'3','4','\0'}; static const WCHAR sz1234[] = {'1','2','3','4','\0'}; static const WCHAR date_sz12[] = {'9','/','3','0','/','1','9','8','0','1','2','\0'}; static const WCHAR sz12_date[] = {'1','2','9','/','3','0','/','1','9','8','0','\0'}; static const WCHAR sz_empty[] = {'\0'}; - static const WCHAR sz12_true[] = {'1','2','T','r','u','e','\0'}; - static const WCHAR sz12_false[] = {'1','2','F','a','l','s','e','\0'}; TCHAR orig_date_format[128]; VARTYPE leftvt, rightvt, resultvt; HRESULT hres; @@ -5416,8 +5432,8 @@ static void test_VarCat(void) hres = VarCat(&left,&right,&result); ok(hres == S_OK, "VarCat failed with error 0x%08x\n", hres); hres = VarCmp(&result,&expected,lcid,0); - ok(hres == VARCMP_EQ || - broken(hres == VARCMP_GT), "Expected VARCMP_EQ, got %08x\n", hres); + ok(hres == VARCMP_EQ, "Expected VARCMP_EQ, got %08x for %s, %s\n", + hres, variantstr(&result), variantstr(&expected)); VariantClear(&left); VariantClear(&right); @@ -5433,8 +5449,8 @@ static void test_VarCat(void) hres = VarCat(&left,&right,&result); ok(hres == S_OK, "VarCat failed with error 0x%08x\n", hres); hres = VarCmp(&result,&expected,lcid,0); - ok(hres == VARCMP_EQ || - broken(hres == VARCMP_GT), "Expected VARCMP_EQ, got %08x\n", hres); + ok(hres == VARCMP_EQ, "Expected VARCMP_EQ, got %08x for %s, %s\n", + hres, variantstr(&result), variantstr(&expected)); VariantClear(&left); VariantClear(&right); diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 26a19bb..909cf8a 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -40,6 +40,7 @@ #include "wine/unicode.h" #include "winerror.h" #include "variant.h" +#include "resource.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(variant); @@ -2467,8 +2468,8 @@ HRESULT WINAPI VarCat(LPVARIANT left, LPVARIANT right, LPVARIANT out) { VARTYPE leftvt,rightvt,resultvt; HRESULT hres; - static const WCHAR str_true[] = {'T','r','u','e','\0'}; - static const WCHAR str_false[] = {'F','a','l','s','e','\0'}; + static WCHAR str_true[32]; + static WCHAR str_false[32]; static const WCHAR sz_empty[] = {'\0'}; leftvt = V_VT(left); rightvt = V_VT(right); @@ -2476,6 +2477,11 @@ HRESULT WINAPI VarCat(LPVARIANT left, LPVARIANT right, LPVARIANT out) TRACE("(%p->(%s%s),%p->(%s%s),%p)\n", left, debugstr_VT(left), debugstr_VF(left), right, debugstr_VT(right), debugstr_VF(right), out); + if (!str_true[0]) { + VARIANT_GetLocalisedText(LOCALE_USER_DEFAULT, IDS_FALSE, str_false); + VARIANT_GetLocalisedText(LOCALE_USER_DEFAULT, IDS_TRUE, str_true); + } + /* when both left and right are NULL the result is NULL */ if (leftvt == VT_NULL && rightvt == VT_NULL) { @@ -2558,7 +2564,7 @@ HRESULT WINAPI VarCat(LPVARIANT left, LPVARIANT right, LPVARIANT out) { if (leftvt == VT_BOOL) { - /* Bools are handled as True/False strings instead of 0/-1 as in MSDN */ + /* Bools are handled as localized True/False strings instead of 0/-1 as in MSDN */ V_VT(&bstrvar_left) = VT_BSTR; if (V_BOOL(left) == TRUE) V_BSTR(&bstrvar_left) = SysAllocString(str_true); @@ -2598,7 +2604,7 @@ HRESULT WINAPI VarCat(LPVARIANT left, LPVARIANT right, LPVARIANT out) { if (rightvt == VT_BOOL) { - /* Bools are handled as True/False strings instead of 0/-1 as in MSDN */ + /* Bools are handled as localized True/False strings instead of 0/-1 as in MSDN */ V_VT(&bstrvar_right) = VT_BSTR; if (V_BOOL(right) == TRUE) V_BSTR(&bstrvar_right) = SysAllocString(str_true); diff --git a/dlls/oleaut32/variant.h b/dlls/oleaut32/variant.h index 41f8a9a..c881b24 100644 --- a/dlls/oleaut32/variant.h +++ b/dlls/oleaut32/variant.h @@ -123,3 +123,6 @@ typedef struct tagVARIANT_NUMBER_CHARS WCHAR cCurrencyDecimalPoint; WCHAR cCurrencyDigitSeparator; } VARIANT_NUMBER_CHARS; + + +BOOL VARIANT_GetLocalisedText(LANGID, DWORD, WCHAR *); diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index 7843a7b..2d5ae7d 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -5961,7 +5961,13 @@ HRESULT WINAPI VarBoolFromCy(CY cyIn, VARIANT_BOOL *pBoolOut) return S_OK; } -static BOOL VARIANT_GetLocalisedText(LANGID langId, DWORD dwId, WCHAR *lpszDest) +/************************************************************************ + * VARIANT_GetLocalisedText [internal] + * + * Get a localized string from the resources + * + */ +BOOL VARIANT_GetLocalisedText(LANGID langId, DWORD dwId, WCHAR *lpszDest) { HRSRC hrsrc;

1 0

Ge van Geldorp : secur32: Implement more GetUserNameEx() formats.
by Alexandre Julliard 14 Apr '09

14 Apr '09

Module: wine Branch: master Commit: d31bb3f08d0d626167cc558beb201f3f55cb4a95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d31bb3f08d0d626167cc558be… Author: Ge van Geldorp <ge(a)gse.nl> Date: Sat Apr 11 20:44:40 2009 +0200 secur32: Implement more GetUserNameEx() formats. --- dlls/secur32/secur32.c | 10 ++-------- 1 files changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/secur32/secur32.c b/dlls/secur32/secur32.c index 73db395..8f599f0 100644 --- a/dlls/secur32/secur32.c +++ b/dlls/secur32/secur32.c @@ -1097,12 +1097,6 @@ BOOLEAN WINAPI GetUserNameExW( DWORD len; TRACE("(%d %p %p)\n", NameFormat, lpNameBuffer, nSize); - if (NameFormat == NameUnknown) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - switch (NameFormat) { case NameSamCompatible: @@ -1135,6 +1129,7 @@ BOOLEAN WINAPI GetUserNameExW( status = FALSE; } break; + case NameUnknown: case NameFullyQualifiedDN: case NameDisplay: case NameUniqueId: @@ -1143,8 +1138,7 @@ BOOLEAN WINAPI GetUserNameExW( case NameCanonicalEx: case NameServicePrincipal: case NameDnsDomain: - FIXME("NameFormat %d not implemented\n", NameFormat); - SetLastError(ERROR_CANT_ACCESS_DOMAIN_INFO); + SetLastError(ERROR_NONE_MAPPED); status = FALSE; break; default:

1 0

Ge van Geldorp : secur32/tests: Fix GetUserNameEx() tests.
by Alexandre Julliard 14 Apr '09

14 Apr '09

Module: wine Branch: master Commit: 74dba4e602ccd072bb88b4d107c0cc28b35ca650 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74dba4e602ccd072bb88b4d10… Author: Ge van Geldorp <ge(a)gse.nl> Date: Tue Apr 14 14:33:08 2009 +0200 secur32/tests: Fix GetUserNameEx() tests. --- dlls/secur32/tests/secur32.c | 38 ++++++++++++++++++++++---------------- 1 files changed, 22 insertions(+), 16 deletions(-) diff --git a/dlls/secur32/tests/secur32.c b/dlls/secur32/tests/secur32.c index 7e969bd..21bb83a 100644 --- a/dlls/secur32/tests/secur32.c +++ b/dlls/secur32/tests/secur32.c @@ -107,14 +107,13 @@ static void testGetUserNameExA(void) size = sizeof(name); ZeroMemory(name, sizeof(name)); rc = pGetUserNameExA(formats[i], name, &size); - ok(rc || ((formats[i] == NameUnknown) && - (GetLastError() == ERROR_INVALID_PARAMETER)) || - (GetLastError() == ERROR_CANT_ACCESS_DOMAIN_INFO) || - (GetLastError() == ERROR_NO_SUCH_DOMAIN) || - (GetLastError() == ERROR_NO_SUCH_USER) || - (GetLastError() == ERROR_NONE_MAPPED) || - (GetLastError() == ERROR_ACCESS_DENIED), - "GetUserNameExA(%d) failed: %d\n", + ok(rc || + (formats[i] == NameUnknown && + GetLastError() == ERROR_NO_SUCH_USER) || + GetLastError() == ERROR_NONE_MAPPED || + broken(formats[i] == NameDnsDomain && + GetLastError() == ERROR_INVALID_PARAMETER), + "GetUserNameExW(%d) failed: %d\n", formats[i], GetLastError()); } @@ -155,13 +154,12 @@ static void testGetUserNameExW(void) size = sizeof(nameW); ZeroMemory(nameW, sizeof(nameW)); rc = pGetUserNameExW(formats[i], nameW, &size); - ok(rc || ((formats[i] == NameUnknown) && - (GetLastError() == ERROR_INVALID_PARAMETER)) || - (GetLastError() == ERROR_CANT_ACCESS_DOMAIN_INFO) || - (GetLastError() == ERROR_NO_SUCH_DOMAIN) || - (GetLastError() == ERROR_NO_SUCH_USER) || - (GetLastError() == ERROR_NONE_MAPPED) || - (GetLastError() == ERROR_ACCESS_DENIED), + ok(rc || + (formats[i] == NameUnknown && + GetLastError() == ERROR_NO_SUCH_USER) || + GetLastError() == ERROR_NONE_MAPPED || + broken(formats[i] == NameDnsDomain && + GetLastError() == ERROR_INVALID_PARAMETER), "GetUserNameExW(%d) failed: %d\n", formats[i], GetLastError()); } @@ -212,7 +210,7 @@ static void test_InitSecurityInterface(void) if (!pInitSecurityInterfaceW) { - skip("InitSecurityInterfaceW not exported by secur32.dll\n"); + win_skip("InitSecurityInterfaceW not exported by secur32.dll\n"); return; } @@ -242,15 +240,23 @@ START_TEST(secur32) if (pGetComputerObjectNameA) testGetComputerObjectNameA(); + else + win_skip("GetComputerObjectNameA not exported by secur32.dll\n"); if (pGetComputerObjectNameW) testGetComputerObjectNameW(); + else + win_skip("GetComputerObjectNameW not exported by secur32.dll\n"); if (pGetUserNameExA) testGetUserNameExA(); + else + win_skip("GetUserNameExA not exported by secur32.dll\n"); if (pGetUserNameExW) testGetUserNameExW(); + else + win_skip("GetUserNameExW not exported by secur32.dll\n"); test_InitSecurityInterface();

1 0

Hans Leidekker : msi: Support setting summary information by importing a _SummaryInformation table .
by Alexandre Julliard 14 Apr '09

14 Apr '09

Module: wine Branch: master Commit: 184474ea66f076561da6a0da1b3b94a3c1bad034 URL: http://source.winehq.org/git/wine.git/?a=commit;h=184474ea66f076561da6a0da1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Apr 13 12:24:46 2009 +0200 msi: Support setting summary information by importing a _SummaryInformation table. --- dlls/msi/database.c | 20 ++++- dlls/msi/msipriv.h | 1 + dlls/msi/suminfo.c | 225 ++++++++++++++++++++++++++++++++++++++++++--------- 3 files changed, 205 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=184474ea66f076561da6a…

1 0

Henri Verbeet : wined3d: Pass a struct wined3d_shader_dst_param to shader_arb_get_write_mask().
by Alexandre Julliard 14 Apr '09

14 Apr '09

Module: wine Branch: master Commit: 18cdcc0b7ee643903eebe0e20dbcbb2c05bd28b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18cdcc0b7ee643903eebe0e20… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 13 09:27:43 2009 +0200 wined3d: Pass a struct wined3d_shader_dst_param to shader_arb_get_write_mask(). --- dlls/wined3d/arb_program_shader.c | 44 +++++++++++++++++++----------------- 1 files changed, 23 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index abc30bf..ce20032 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -404,20 +404,23 @@ static const char * const shift_tab[] = { }; static void shader_arb_get_write_mask(const struct wined3d_shader_instruction *ins, - const DWORD param, char *write_mask) + const struct wined3d_shader_dst_param *dst, char *write_mask) { char *ptr = write_mask; char vshader = shader_is_vshader_version(ins->reg_maps->shader_version); - if(vshader && shader_get_regtype(param) == WINED3DSPR_ADDR) { + if (vshader && dst->register_type == WINED3DSPR_ADDR) + { *ptr++ = '.'; *ptr++ = 'x'; - } else if ((param & WINED3DSP_WRITEMASK_ALL) != WINED3DSP_WRITEMASK_ALL) { + } + else if (dst->write_mask != WINED3DSP_WRITEMASK_ALL) + { *ptr++ = '.'; - if (param & WINED3DSP_WRITEMASK_0) *ptr++ = 'x'; - if (param & WINED3DSP_WRITEMASK_1) *ptr++ = 'y'; - if (param & WINED3DSP_WRITEMASK_2) *ptr++ = 'z'; - if (param & WINED3DSP_WRITEMASK_3) *ptr++ = 'w'; + if (dst->write_mask & WINED3DSP_WRITEMASK_0) *ptr++ = 'x'; + if (dst->write_mask & WINED3DSP_WRITEMASK_1) *ptr++ = 'y'; + if (dst->write_mask & WINED3DSP_WRITEMASK_2) *ptr++ = 'z'; + if (dst->write_mask & WINED3DSP_WRITEMASK_3) *ptr++ = 'w'; } *ptr = '\0'; @@ -577,7 +580,7 @@ static void shader_arb_add_dst_param(const struct wined3d_shader_instruction *in wined3d_dst->register_idx, wined3d_dst->has_rel_addr, register_name, &is_color); strcat(str, register_name); - shader_arb_get_write_mask(ins, wined3d_dst->token, write_mask); + shader_arb_get_write_mask(ins, wined3d_dst, write_mask); strcat(str, write_mask); } @@ -811,7 +814,7 @@ static void pshader_hw_bem(const struct wined3d_shader_instruction *ins) shader_arb_get_register_name(ins->shader, dst->register_type, dst->register_idx, dst->has_rel_addr, dst_name, &is_color); - shader_arb_get_write_mask(ins, dst->token, dst_wmask); + shader_arb_get_write_mask(ins, dst, dst_wmask); strcat(dst_name, dst_wmask); pshader_gen_input_modifier_line(ins->shader, buffer, ins->src[0], 0, src_name[0]); @@ -846,7 +849,7 @@ static void pshader_hw_cnd(const struct wined3d_shader_instruction *ins) /* Handle output register */ shader_arb_get_register_name(ins->shader, dst->register_type, dst->register_idx, dst->has_rel_addr, dst_name, &is_color); - shader_arb_get_write_mask(ins, dst->token, dst_wmask); + shader_arb_get_write_mask(ins, dst, dst_wmask); /* Generate input register names (with modifiers) */ pshader_gen_input_modifier_line(ins->shader, buffer, ins->src[0], 0, src_name[0]); @@ -882,7 +885,7 @@ static void pshader_hw_cmp(const struct wined3d_shader_instruction *ins) /* Handle output register */ shader_arb_get_register_name(ins->shader, dst->register_type, dst->register_idx, dst->has_rel_addr, dst_name, &is_color); - shader_arb_get_write_mask(ins, dst->token, dst_wmask); + shader_arb_get_write_mask(ins, dst, dst_wmask); /* Generate input register names (with modifiers) */ pshader_gen_input_modifier_line(ins->shader, buffer, ins->src[0], 0, src_name[0]); @@ -911,7 +914,7 @@ static void pshader_hw_dp2add(const struct wined3d_shader_instruction *ins) shader_arb_get_register_name(ins->shader, dst->register_type, dst->register_idx, dst->has_rel_addr, dst_name, &is_color); - shader_arb_get_write_mask(ins, dst->token, dst_wmask); + shader_arb_get_write_mask(ins, dst, dst_wmask); pshader_gen_input_modifier_line(ins->shader, buffer, ins->src[0], 0, src_name[0]); pshader_gen_input_modifier_line(ins->shader, buffer, ins->src[1], 1, src_name[1]); @@ -1015,7 +1018,7 @@ static void shader_hw_map2gl(const struct wined3d_shader_instruction *ins) shader_arb_get_register_name(ins->shader, dst->register_type, dst->register_idx, dst->has_rel_addr, output_rname, &is_color); strcpy(operands[0], output_rname); - shader_arb_get_write_mask(ins, dst->token, output_wmask); + shader_arb_get_write_mask(ins, dst, output_wmask); strcat(operands[0], output_wmask); arguments[0] = '\0'; @@ -1187,21 +1190,20 @@ static void pshader_hw_tex(const struct wined3d_shader_instruction *ins) static void pshader_hw_texcoord(const struct wined3d_shader_instruction *ins) { - DWORD dst = ins->dst[0].token; + const struct wined3d_shader_dst_param *dst = &ins->dst[0]; SHADER_BUFFER *buffer = ins->buffer; char tmp[20]; shader_arb_get_write_mask(ins, dst, tmp); if (ins->reg_maps->shader_version != WINED3DPS_VERSION(1,4)) { - DWORD reg = ins->dst[0].register_idx; + DWORD reg = dst->register_idx; shader_addline(buffer, "MOV_SAT T%u%s, fragment.texcoord[%u];\n", reg, tmp, reg); } else { - DWORD reg1 = ins->dst[0].register_idx; char reg_src[40]; pshader_gen_input_modifier_line(ins->shader, buffer, ins->src[0], 0, reg_src); - shader_addline(buffer, "MOV R%u%s, %s;\n", reg1, tmp, reg_src); + shader_addline(buffer, "MOV R%u%s, %s;\n", dst->register_idx, tmp, reg_src); } } @@ -1526,7 +1528,7 @@ static void pshader_hw_texdp3(const struct wined3d_shader_instruction *ins) /* Handle output register */ shader_arb_get_register_name(ins->shader, dst->register_type, dst->register_idx, dst->has_rel_addr, dst_str, &is_color); - shader_arb_get_write_mask(ins, dst->token, dst_mask); + shader_arb_get_write_mask(ins, dst, dst_mask); pshader_gen_input_modifier_line(ins->shader, buffer, ins->src[0], 0, src0); shader_addline(buffer, "DP3 %s%s, T%u, %s;\n", dst_str, dst_mask, dst->register_idx, src0); @@ -1547,7 +1549,7 @@ static void pshader_hw_texm3x3(const struct wined3d_shader_instruction *ins) shader_arb_get_register_name(ins->shader, dst->register_type, dst->register_idx, dst->has_rel_addr, dst_str, &is_color); - shader_arb_get_write_mask(ins, dst->token, dst_mask); + shader_arb_get_write_mask(ins, dst, dst_mask); pshader_gen_input_modifier_line(ins->shader, buffer, ins->src[0], 0, src0); shader_addline(buffer, "DP3 TMP.z, T%u, %s;\n", dst->register_idx, src0); @@ -1683,7 +1685,7 @@ static void shader_hw_nrm(const struct wined3d_shader_instruction *ins) shader_arb_get_register_name(ins->shader, dst->register_type, dst->register_idx, dst->has_rel_addr, dst_name, &is_color); - shader_arb_get_write_mask(ins, dst->token, dst_wmask); + shader_arb_get_write_mask(ins, dst, dst_wmask); pshader_gen_input_modifier_line(ins->shader, buffer, ins->src[0], 0, src_name); shader_addline(buffer, "DP3 TMP, %s, %s;\n", src_name, src_name); @@ -1713,7 +1715,7 @@ static void shader_hw_sincos(const struct wined3d_shader_instruction *ins) shader_arb_get_register_name(ins->shader, dst->register_type, dst->register_idx, dst->has_rel_addr, dst_name, &is_color); - shader_arb_get_write_mask(ins, dst->token, dst_wmask); + shader_arb_get_write_mask(ins, dst, dst_wmask); pshader_gen_input_modifier_line(ins->shader, buffer, ins->src[0], 0, src_name); shader_addline(buffer, "SCS%s %s%s, %s;\n", sat ? "_SAT" : "", dst_name, dst_wmask,

1 0

Christian Costa : quartz: Data may be incomplete at the end of file so do not assert if we have less data than expected .
by Alexandre Julliard 14 Apr '09

14 Apr '09

Module: wine Branch: master Commit: 74c07a141ec9d760f209cf6976e0406d4123ab6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=74c07a141ec9d760f209cf697… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Mon Apr 13 10:07:29 2009 +0200 quartz: Data may be incomplete at the end of file so do not assert if we have less data than expected. --- dlls/quartz/mpegsplit.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/mpegsplit.c b/dlls/quartz/mpegsplit.c index 373e537..14d01a1 100644 --- a/dlls/quartz/mpegsplit.c +++ b/dlls/quartz/mpegsplit.c @@ -176,7 +176,6 @@ static HRESULT FillBuffer(MPEGSplitterImpl *This, IMediaSample *pCurrentSample) /* Find the next valid header.. it <SHOULD> be right here */ assert(parse_header(fbuf, &length, &This->position) == S_OK); - assert(length == len || length + 4 == len); IMediaSample_SetActualDataLength(pCurrentSample, length); /* Queue the next sample */

1 0