October 2007 - Wine-Commits

Roderick Colenbrander : wined3d: Use EXT-versions of glBlend*.
by Alexandre Julliard Oct. 9, 2007

Oct. 9, 2007

Module: wine Branch: master Commit: c2bf124a90b7f02dd87cddc7d86bf16e1d0b761f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2bf124a90b7f02dd87cddc7d… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sat Oct 6 17:42:39 2007 +0200 wined3d: Use EXT-versions of glBlend*. --- dlls/wined3d/state.c | 4 ++-- include/wine/wined3d_gl.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 929260b..d9a2684 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -332,7 +332,7 @@ static void state_blendfactor(DWORD state, IWineD3DStateBlockImpl *stateblock, W TRACE("Setting BlendFactor to %d\n", stateblock->renderState[WINED3DRS_BLENDFACTOR]); D3DCOLORTOGLFLOAT4(stateblock->renderState[WINED3DRS_BLENDFACTOR], col); - GL_EXTCALL(glBlendColor (col[0],col[1],col[2],col[3])); + GL_EXTCALL(glBlendColorEXT (col[0],col[1],col[2],col[3])); checkGLcall("glBlendColor"); } @@ -481,7 +481,7 @@ static void state_blendop(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD } TRACE("glBlendEquation(%x)\n", glParm); - GL_EXTCALL(glBlendEquation(glParm)); + GL_EXTCALL(glBlendEquationEXT(glParm)); checkGLcall("glBlendEquation"); } diff --git a/include/wine/wined3d_gl.h b/include/wine/wined3d_gl.h index 3da14ef..5354fef 100644 --- a/include/wine/wined3d_gl.h +++ b/include/wine/wined3d_gl.h @@ -3222,9 +3222,9 @@ typedef enum _GL_SupportedExt { /** ARB Extensions **/ \ /* GL_ARB_draw_buffers */ \ USE_GL_FUNC(PGLFNDRAWBUFFERSARBPROC, glDrawBuffersARB); \ - /* GL_ARB_imaging */ \ - USE_GL_FUNC(PGLFNBLENDCOLORPROC, glBlendColor); \ - USE_GL_FUNC(PGLFNBLENDEQUATIONPROC, glBlendEquation); \ + /* GL_ARB_imaging, GL_EXT_blend_minmax */ \ + USE_GL_FUNC(PGLFNBLENDCOLORPROC, glBlendColorEXT); \ + USE_GL_FUNC(PGLFNBLENDEQUATIONPROC, glBlendEquationEXT); \ /* GL_ARB_multisample */ \ USE_GL_FUNC(WINED3D_PFNGLSAMPLECOVERAGEARBPROC, glSampleCoverageARB); \ /* GL_ARB_multitexture */ \

1 0

Jacek Caban : mshtml: Move most code from handle_editor_load to exec_editmode.
by Alexandre Julliard Oct. 9, 2007

Oct. 9, 2007

Module: wine Branch: master Commit: 99e6592c9d73b7b4b0a7d174f64c9cab7c83c9d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99e6592c9d73b7b4b0a7d174f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Oct 7 10:48:35 2007 +0200 mshtml: Move most code from handle_editor_load to exec_editmode. --- dlls/mshtml/editor.c | 23 ----------------------- dlls/mshtml/olecmd.c | 30 +++++++++++++++++++++++++++++- 2 files changed, 29 insertions(+), 24 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index 239bba5..20db6ee 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -505,29 +505,6 @@ void handle_edit_event(HTMLDocument *This, nsIDOMEvent *event) void handle_edit_load(HTMLDocument *This) { get_editor_controller(This->nscontainer); - - if(This->ui_active) { - OLECHAR wszHTMLDocument[30]; - RECT rcBorderWidths; - - if(This->ip_window) - IOleInPlaceUIWindow_SetActiveObject(This->ip_window, NULL, NULL); - if(This->hostui) - IDocHostUIHandler_HideUI(This->hostui); - - if(This->hostui) - IDocHostUIHandler_ShowUI(This->hostui, DOCHOSTUITYPE_AUTHOR, ACTOBJ(This), CMDTARGET(This), - This->frame, This->ip_window); - - LoadStringW(hInst, IDS_HTMLDOCUMENT, wszHTMLDocument, - sizeof(wszHTMLDocument)/sizeof(WCHAR)); - - if(This->ip_window) - IOleInPlaceUIWindow_SetActiveObject(This->ip_window, ACTOBJ(This), wszHTMLDocument); - - memset(&rcBorderWidths, 0, sizeof(rcBorderWidths)); - IOleInPlaceFrame_SetBorderSpace(This->frame, &rcBorderWidths); - } } static void set_ns_fontname(NSContainer *This, const char *fontname) diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index a137057..c56dce2 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -583,7 +583,35 @@ static HRESULT exec_editmode(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, update_doc(This, UPDATE_UI); - return IPersistMoniker_Load(PERSISTMON(This), TRUE, mon, NULL, 0); + hres = IPersistMoniker_Load(PERSISTMON(This), TRUE, mon, NULL, 0); + IMoniker_Release(mon); + if(FAILED(hres)) + return hres; + + if(This->ui_active) { + OLECHAR wszHTMLDocument[30]; + RECT rcBorderWidths; + + if(This->ip_window) + IOleInPlaceUIWindow_SetActiveObject(This->ip_window, NULL, NULL); + if(This->hostui) + IDocHostUIHandler_HideUI(This->hostui); + + if(This->hostui) + IDocHostUIHandler_ShowUI(This->hostui, DOCHOSTUITYPE_AUTHOR, ACTOBJ(This), CMDTARGET(This), + This->frame, This->ip_window); + + LoadStringW(hInst, IDS_HTMLDOCUMENT, wszHTMLDocument, + sizeof(wszHTMLDocument)/sizeof(WCHAR)); + + if(This->ip_window) + IOleInPlaceUIWindow_SetActiveObject(This->ip_window, ACTOBJ(This), wszHTMLDocument); + + memset(&rcBorderWidths, 0, sizeof(rcBorderWidths)); + IOleInPlaceFrame_SetBorderSpace(This->frame, &rcBorderWidths); + } + + return S_OK; } static HRESULT exec_htmleditmode(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, VARIANT *out)

1 0

Jacek Caban : actctx: Rename version to assembly_version.
by Alexandre Julliard Oct. 9, 2007

Oct. 9, 2007

Module: wine Branch: master Commit: 791be37a4636eefb15378cc4ef0318fe2d57e11b URL: http://source.winehq.org/git/wine.git/?a=commit;h=791be37a4636eefb15378cc4e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Oct 7 15:55:50 2007 +0200 actctx: Rename version to assembly_version. --- dlls/ntdll/actctx.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 4f0901b..2021cb8 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -72,7 +72,7 @@ struct file_info WCHAR *info; }; -struct version +struct assembly_version { USHORT major; USHORT minor; @@ -87,7 +87,7 @@ struct assembly_identity WCHAR *public_key; WCHAR *language; WCHAR *type; - struct version version; + struct assembly_version version; BOOL optional; }; @@ -272,7 +272,7 @@ static inline const char* debugstr_xmlstr(const xmlstr_t* str) return debugstr_wn(str->ptr, str->len); } -static inline const char* debugstr_version(const struct version *ver) +static inline const char* debugstr_version(const struct assembly_version *ver) { return wine_dbg_sprintf("%u.%u.%u.%u", ver->major, ver->minor, ver->build, ver->revision); } @@ -743,7 +743,7 @@ static BOOL parse_text_content(xmlbuf_t* xmlbuf, xmlstr_t* content) return TRUE; } -static BOOL parse_version(const xmlstr_t *str, struct version *version) +static BOOL parse_version(const xmlstr_t *str, struct assembly_version *version) { unsigned int ver[4]; unsigned int pos;

1 0

Juan Lang : crypt32: Remove some tests that fail inconsistently on Windows.
by Alexandre Julliard Oct. 9, 2007

Oct. 9, 2007

Module: wine Branch: master Commit: 57240ddd052d69ef5124a866da0583bcd9387b99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57240ddd052d69ef5124a866d… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sat Oct 6 10:42:05 2007 -0700 crypt32: Remove some tests that fail inconsistently on Windows. Reported by Steven Edwards. --- dlls/crypt32/tests/encode.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index eaed27b..f35c84b 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -1229,11 +1229,6 @@ static void test_encodeNameValue(DWORD dwEncoding) BOOL ret; CERT_NAME_VALUE value = { 0, { 0, NULL } }; - value.dwValueType = 14; - ret = CryptEncodeObjectEx(dwEncoding, X509_NAME_VALUE, &value, - CRYPT_ENCODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); - ok(!ret && GetLastError() == CRYPT_E_ASN1_CHOICE, - "Expected CRYPT_E_ASN1_CHOICE, got %08x\n", GetLastError()); value.dwValueType = CERT_RDN_ENCODED_BLOB; value.Value.pbData = printableCommonNameValue; value.Value.cbData = sizeof(printableCommonNameValue); @@ -1589,7 +1584,6 @@ static struct UnicodeExpectedError unicodeErrors[] = { { CERT_RDN_ANY_TYPE, oneW, 0, CRYPT_E_NOT_CHAR_STRING }, { CERT_RDN_ENCODED_BLOB, oneW, 0, CRYPT_E_NOT_CHAR_STRING }, { CERT_RDN_OCTET_STRING, oneW, 0, CRYPT_E_NOT_CHAR_STRING }, - { 14, oneW, 0, CRYPT_E_ASN1_CHOICE }, { CERT_RDN_NUMERIC_STRING, aW, 0, CRYPT_E_INVALID_NUMERIC_STRING }, { CERT_RDN_PRINTABLE_STRING, quoteW, 0, CRYPT_E_INVALID_PRINTABLE_STRING }, { CERT_RDN_IA5_STRING, nihongoURL, 7, CRYPT_E_INVALID_IA5_STRING },

1 0

Juan Lang : crypt32: Print values of failing time tests.
by Alexandre Julliard Oct. 9, 2007

Oct. 9, 2007

Module: wine Branch: master Commit: 6021eef5c9f399ddcea5efa2d2d3dfa6d8886011 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6021eef5c9f399ddcea5efa2d… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sat Oct 6 11:06:23 2007 -0700 crypt32: Print values of failing time tests. --- dlls/crypt32/tests/encode.c | 23 ++++++++++++++++++++++- 1 files changed, 22 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index f35c84b..a459dde 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -462,6 +462,26 @@ static void testTimeEncoding(DWORD dwEncoding, LPCSTR structType, "Expected CRYPT_E_BAD_ENCODE, got 0x%08x\n", GetLastError()); } +static const char *printSystemTime(const SYSTEMTIME *st) +{ + static char buf[22]; + + sprintf(buf, "%02d-%02d-%04d %02d:%02d:%02d.%03d", st->wMonth, st->wDay, + st->wYear, st->wHour, st->wMinute, st->wSecond, st->wMilliseconds); + return buf; +} + +static const char *printFileTime(const FILETIME *ft) +{ + static char buf[22]; + SYSTEMTIME st; + + FileTimeToSystemTime(ft, &st); + sprintf(buf, "%02d-%02d-%04d %02d:%02d:%02d.%03d", st.wMonth, st.wDay, + st.wYear, st.wHour, st.wMinute, st.wSecond, st.wMilliseconds); + return buf; +} + static void testTimeDecoding(DWORD dwEncoding, LPCSTR structType, const struct encodedFiletime *time) { @@ -482,7 +502,8 @@ static void testTimeDecoding(DWORD dwEncoding, LPCSTR structType, ok(ret, "CryptDecodeObjectEx failed: %d (0x%08x)\n", GetLastError(), GetLastError()); ok(!memcmp(&ft1, &ft2, sizeof(ft1)), - "Got unexpected value for time decoding\n"); + "Got unexpected value for time decoding:\nexpected %s, got %s\n", + printSystemTime(&time->sysTime), printFileTime(&ft2)); } else ok(!ret && GetLastError() == CRYPT_E_ASN1_BADTAG,

1 0

Kai Blin : secur32: ntlm_auth returns BH if the connection to winbindd fails.
by Alexandre Julliard Oct. 9, 2007

Oct. 9, 2007

Module: wine Branch: master Commit: fdfa760c8575c0813d137f8122d0c358e44a8b8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdfa760c8575c0813d137f812… Author: Kai Blin <kai.blin(a)gmail.com> Date: Sun Oct 7 00:57:12 2007 +0200 secur32: ntlm_auth returns BH if the connection to winbindd fails. --- dlls/secur32/ntlm.c | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index 4ae00a4..e700373 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -1138,6 +1138,10 @@ static SECURITY_STATUS SEC_ENTRY ntlm_AcceptSecurityContext( TRACE("Reply from ntlm_auth: %s\n", debugstr_a(buffer)); + /* At this point, we get a NA if the user didn't authenticate, but a BH + * if ntlm_auth could not connect to winbindd. Apart from running Wine + * as root, there is no way to fix this for now, so just handle this as + * a failed login. */ if(strncmp(buffer, "AF ", 3) != 0) { if(strncmp(buffer, "NA ", 3) == 0) @@ -1147,7 +1151,18 @@ static SECURITY_STATUS SEC_ENTRY ntlm_AcceptSecurityContext( } else { - ret = SEC_E_INTERNAL_ERROR; + size_t ntlm_pipe_err_len = strlen("BH NT_STATUS_ACCESS_DENIED"); + + if( (buffer_len >= ntlm_pipe_err_len) && + (strncmp(buffer, "BH NT_STATUS_ACCESS_DENIED", + ntlm_pipe_err_len) == 0)) + { + TRACE("Connection to winbindd failed\n"); + ret = SEC_E_LOGON_DENIED; + } + else + ret = SEC_E_INTERNAL_ERROR; + goto asc_end; } }

1 0

Juan Lang : setupapi: Remove a misleading fixme.
by Alexandre Julliard Oct. 9, 2007

Oct. 9, 2007

Module: wine Branch: master Commit: 216ab7d4cb268f2d5f73c09e47a205255822ed76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=216ab7d4cb268f2d5f73c09e4… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Oct 5 21:56:47 2007 -0700 setupapi: Remove a misleading fixme. --- dlls/setupapi/devinst.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 0ec77b9..9964b8d 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -796,8 +796,6 @@ BOOL WINAPI SetupDiClassGuidsFromNameExA( LPWSTR MachineNameW = NULL; BOOL bResult; - FIXME("\n"); - ClassNameW = MultiByteToUnicode(ClassName, CP_ACP); if (ClassNameW == NULL) return FALSE;

1 0

Dan Kegel : quartz: Make clock test less flaky.
by Alexandre Julliard Oct. 9, 2007

Oct. 9, 2007

Module: wine Branch: master Commit: 8e8f8401599dd49247b62294a77e3fe969ec8b8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e8f8401599dd49247b62294a… Author: Dan Kegel <dank(a)kegel.com> Date: Sat Oct 6 08:39:51 2007 -0700 quartz: Make clock test less flaky. --- dlls/quartz/tests/referenceclock.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/tests/referenceclock.c b/dlls/quartz/tests/referenceclock.c index 1d02615..2e50c5a 100644 --- a/dlls/quartz/tests/referenceclock.c +++ b/dlls/quartz/tests/referenceclock.c @@ -66,8 +66,9 @@ static void test_IReferenceClock_methods(const char * clockdesc, IReferenceClock ok (hr == S_OK, "%s - Expected S_OK, got 0x%08x\n", clockdesc, hr); /* FIXME: How much deviation should be allowed after a sleep? */ + /* 0.3% is common, and 0.4% is sometimes observed. Let's try 0.6%. */ diff = time2 - time1; - ok (9980000 <= diff && diff <= 10020000, "%s - Expected difference around 10000000, got %lu\n", clockdesc, diff); + ok (9940000 <= diff && diff <= 10060000, "%s - Expected difference around 10000000, got %lu\n", clockdesc, diff); }

1 0

Marcus Meissner : advpack: Handle localized C:\Program Files.
by Alexandre Julliard Oct. 9, 2007

Oct. 9, 2007

Module: wine Branch: master Commit: 0065387b83583a3ca7ec4fc5b87c104dd786d449 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0065387b83583a3ca7ec4fc5b… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Oct 6 17:13:19 2007 +0200 advpack: Handle localized C:\Program Files. --- dlls/advpack/tests/advpack.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/advpack/tests/advpack.c b/dlls/advpack/tests/advpack.c index 4c49e3f..c80b5e7 100644 --- a/dlls/advpack/tests/advpack.c +++ b/dlls/advpack/tests/advpack.c @@ -205,7 +205,7 @@ static void create_inf_file(void) append_str(&ptr, "49030=DestC\n"); append_str(&ptr, "[ProgramFilesDir]\n"); append_str(&ptr, "HKLM,\"Software\\Microsoft\\Windows\\CurrentVersion\","); - append_str(&ptr, "\"ProgramFilesDir\",,\"%%24%%\\%%LProgramF%%\"\n"); + append_str(&ptr, "\"ProgramFilesDir\",,\"%%24%%\\%%16422%%\"\n"); append_str(&ptr, "[section]\n"); append_str(&ptr, "NotACustomDestination=Version\n"); append_str(&ptr, "CustomDestination=CustInstDestSection\n"); @@ -218,9 +218,8 @@ static void create_inf_file(void) append_str(&ptr, "CustomHDestination=CustInstDestSection\n"); append_str(&ptr, "[Strings]\n"); append_str(&ptr, "DefaultAppPath=\"Application Name\"\n"); - append_str(&ptr, "LProgramF=\"Program Files\"\n"); append_str(&ptr, "[DestA]\n"); - append_str(&ptr, "HKLM,\"Software\\Garbage\",\"ProgramFilesDir\",,'%%24%%\\%%LProgramF%%'\n"); + append_str(&ptr, "HKLM,\"Software\\Garbage\",\"ProgramFilesDir\",,'%%16422%%'\n"); append_str(&ptr, "[DestB]\n"); append_str(&ptr, "'HKLM','Software\\Microsoft\\Windows\\CurrentVersion',"); append_str(&ptr, "'ProgramFilesDir',,\"%%24%%\"\n");

1 0

Stefan Dösinger : d3d9: Do not rely on CreateVertexShader failing.
by Alexandre Julliard Oct. 9, 2007

Oct. 9, 2007

Module: wine Branch: master Commit: 6486a79e2af755a0d0ed80cfebd8ab88f669d62d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6486a79e2af755a0d0ed80cfe… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Oct 6 16:57:20 2007 +0200 d3d9: Do not rely on CreateVertexShader failing. --- dlls/d3d9/tests/visual.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index af64fbe..b376e9d 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -1356,6 +1356,7 @@ static void z_range_test(IDirect3DDevice9 *device) DWORD color; IDirect3DVertexShader9 *shader; IDirect3DVertexDeclaration9 *decl; + D3DCAPS9 caps; const DWORD shader_code[] = { 0xfffe0101, /* vs_1_1 */ 0x0000001f, 0x80000000, 0x900f0000, /* dcl_position v0 */ @@ -1453,12 +1454,15 @@ static void z_range_test(IDirect3DDevice9 *device) ok(color == 0x00ffffff, "Z range failed: Got color 0x%08x, expected 0x00ffffff.\n", color); /* Test the shader path */ - hr = IDirect3DDevice9_CreateVertexShader(device, shader_code, &shader); - if(FAILED(hr)) { - skip("Can't create test vertex shader, most likely shaders not supported\n"); + IDirect3DDevice9_GetDeviceCaps(device, &caps); + if (caps.VertexShaderVersion < D3DVS_VERSION(1, 1)) { + skip("Vertex shaders not supported\n"); goto out; } + hr = IDirect3DDevice9_CreateVertexShader(device, shader_code, &shader); + ok(hr == D3D_OK, "IDirect3DDevice9_CreateVertexShader returned %s\n", DXGetErrorString9(hr)); hr = IDirect3DDevice9_CreateVertexDeclaration(device, decl_elements, &decl); + ok(hr == D3D_OK, "IDirect3DDevice9_CreateVertexDeclaration returned %s\n", DXGetErrorString9(hr)); hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.4, 0);

1 0