August 2011 - Wine-commits - list.winehq.org

Nikolay Sivov : msxml3: Respect string length returned from ISAXAttributes.
by Alexandre Julliard 29 Aug '11

29 Aug '11

Module: wine Branch: master Commit: 9ae103f7f71a89d4b7cb07f85cb1d521af0f41bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ae103f7f71a89d4b7cb07f85… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Aug 27 15:01:57 2011 +0400 msxml3: Respect string length returned from ISAXAttributes. --- dlls/msxml3/mxwriter.c | 7 ++++--- dlls/msxml3/tests/saxreader.c | 12 ++++++------ 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index 31b8505..bf2411e 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -782,7 +782,7 @@ static HRESULT WINAPI mxwriter_saxcontent_startElement( for (i = 0; i < length; i++) { const WCHAR *str; - INT len; + INT len = 0; hr = ISAXAttributes_getQName(attr, i, &str, &len); if (FAILED(hr)) return hr; @@ -790,16 +790,17 @@ static HRESULT WINAPI mxwriter_saxcontent_startElement( /* space separator in front of every attribute */ xmlOutputBufferWriteString(This->buffer, " "); - s = xmlchar_from_wchar(str); + s = xmlchar_from_wcharn(str, len); xmlOutputBufferWriteString(This->buffer, (char*)s); heap_free(s); xmlOutputBufferWriteString(This->buffer, "=\""); + len = 0; hr = ISAXAttributes_getValue(attr, i, &str, &len); if (FAILED(hr)) return hr; - s = xmlchar_from_wchar(str); + s = xmlchar_from_wcharn(str, len); xmlOutputBufferWriteString(This->buffer, (char*)s); heap_free(s); diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 7419fe2..99a08c2 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -567,13 +567,13 @@ static HRESULT WINAPI isaxattributes_getQName( const WCHAR **pQName, int *pQNameLength) { - static const WCHAR attr1W[] = {'a',':','a','t','t','r','1',0}; - static const WCHAR attr2W[] = {'a','t','t','r','2',0}; + static const WCHAR attr1W[] = {'a',':','a','t','t','r','1','j','u','n','k',0}; + static const WCHAR attr2W[] = {'a','t','t','r','2','j','u','n','k',0}; ok(nIndex == 0 || nIndex == 1, "invalid index received %d\n", nIndex); *pQName = (nIndex == 0) ? attr1W : attr2W; - *pQNameLength = lstrlenW(*pQName); + *pQNameLength = (nIndex == 0) ? 7 : 5; return S_OK; } @@ -654,13 +654,13 @@ static HRESULT WINAPI isaxattributes_getValue( const WCHAR ** pValue, int * nValue) { - static const WCHAR attrval1W[] = {'a','1',0}; - static const WCHAR attrval2W[] = {'a','2',0}; + static const WCHAR attrval1W[] = {'a','1','j','u','n','k',0}; + static const WCHAR attrval2W[] = {'a','2','j','u','n','k',0}; ok(nIndex == 0 || nIndex == 1, "invalid index received %d\n", nIndex); *pValue = (nIndex == 0) ? attrval1W : attrval2W; - *nValue = lstrlenW(*pValue); + *nValue = 2; return S_OK; }

1 0

Alexandre Julliard : setupapi: Use the specified language for SxS manifest file names.
by Alexandre Julliard 29 Aug '11

29 Aug '11

Module: wine Branch: master Commit: 8306dd55f1713f0d0081daaa9f6c3f96c22ae064 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8306dd55f1713f0d0081daaa9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Aug 27 13:53:00 2011 +0200 setupapi: Use the specified language for SxS manifest file names. --- dlls/setupapi/fakedll.c | 34 +++++++++++++++++++++------------- 1 files changed, 21 insertions(+), 13 deletions(-) diff --git a/dlls/setupapi/fakedll.c b/dlls/setupapi/fakedll.c index e21507b..645b7e8 100644 --- a/dlls/setupapi/fakedll.c +++ b/dlls/setupapi/fakedll.c @@ -595,9 +595,9 @@ static BOOL next_xml_attr(xmlbuf_t* xmlbuf, xmlstr_t* name, xmlstr_t* value, } static void get_manifest_filename( const xmlstr_t *arch, const xmlstr_t *name, const xmlstr_t *key, - const xmlstr_t *version, WCHAR *buffer, DWORD size ) + const xmlstr_t *version, const xmlstr_t *lang, WCHAR *buffer, DWORD size ) { - static const WCHAR trailerW[] = {'_','n','o','n','e','_','d','e','a','d','b','e','e','f',0}; + static const WCHAR trailerW[] = {'_','d','e','a','d','b','e','e','f',0}; DWORD pos; pos = MultiByteToWideChar( CP_UTF8, 0, arch->ptr, arch->len, buffer, size ); @@ -607,12 +607,14 @@ static void get_manifest_filename( const xmlstr_t *arch, const xmlstr_t *name, c pos += MultiByteToWideChar( CP_UTF8, 0, key->ptr, key->len, buffer + pos, size - pos ); buffer[pos++] = '_'; pos += MultiByteToWideChar( CP_UTF8, 0, version->ptr, version->len, buffer + pos, size - pos ); + buffer[pos++] = '_'; + pos += MultiByteToWideChar( CP_UTF8, 0, lang->ptr, lang->len, buffer + pos, size - pos ); memcpy( buffer + pos, trailerW, sizeof(trailerW) ); strlwrW( buffer ); } static BOOL create_winsxs_dll( const WCHAR *dll_name, const xmlstr_t *arch, const xmlstr_t *name, - const xmlstr_t *key, const xmlstr_t *version, + const xmlstr_t *key, const xmlstr_t *version, const xmlstr_t *lang, const void *dll_data, size_t dll_size ) { static const WCHAR winsxsW[] = {'w','i','n','s','x','s','\\'}; @@ -633,7 +635,7 @@ static BOOL create_winsxs_dll( const WCHAR *dll_name, const xmlstr_t *arch, cons path[pos++] = '\\'; memcpy( path + pos, winsxsW, sizeof(winsxsW) ); pos += sizeof(winsxsW) / sizeof(WCHAR); - get_manifest_filename( arch, name, key, version, path + pos, path_len - pos ); + get_manifest_filename( arch, name, key, version, lang, path + pos, path_len - pos ); pos += strlenW( path + pos ); path[pos++] = '\\'; strcpyW( path + pos, filename ); @@ -651,7 +653,7 @@ static BOOL create_winsxs_dll( const WCHAR *dll_name, const xmlstr_t *arch, cons } static BOOL create_manifest( const xmlstr_t *arch, const xmlstr_t *name, const xmlstr_t *key, - const xmlstr_t *version, const void *data, DWORD len ) + const xmlstr_t *version, const xmlstr_t *lang, const void *data, DWORD len ) { static const WCHAR winsxsW[] = {'w','i','n','s','x','s','\\','m','a','n','i','f','e','s','t','s','\\'}; static const WCHAR extensionW[] = {'.','m','a','n','i','f','e','s','t',0}; @@ -668,7 +670,7 @@ static BOOL create_manifest( const xmlstr_t *arch, const xmlstr_t *name, const x path[pos++] = '\\'; memcpy( path + pos, winsxsW, sizeof(winsxsW) ); pos += sizeof(winsxsW) / sizeof(WCHAR); - get_manifest_filename( arch, name, key, version, path + pos, MAX_PATH - pos ); + get_manifest_filename( arch, name, key, version, lang, path + pos, MAX_PATH - pos ); strcatW( path + pos, extensionW ); handle = CreateFileW( path, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL ); if (handle == INVALID_HANDLE_VALUE && GetLastError() == ERROR_PATH_NOT_FOUND) @@ -701,13 +703,13 @@ static void register_manifest( const WCHAR *dll_name, const char *manifest, DWOR #endif xmlbuf_t buffer; xmlstr_t elem, attr_name, attr_value; - xmlstr_t name, version, arch, key; + xmlstr_t name, version, arch, key, lang; BOOL end = FALSE, error; buffer.ptr = manifest; buffer.end = manifest + len; - name.ptr = version.ptr = arch.ptr = key.ptr = NULL; - name.len = version.len = arch.len = key.len = 0; + name.ptr = version.ptr = arch.ptr = key.ptr = lang.ptr = NULL; + name.len = version.len = arch.len = key.len = lang.len = 0; while (next_xml_elem( &buffer, &elem )) { @@ -718,9 +720,15 @@ static void register_manifest( const WCHAR *dll_name, const char *manifest, DWOR else if (xmlstr_cmp(&attr_name, "version")) version = attr_value; else if (xmlstr_cmp(&attr_name, "processorArchitecture")) arch = attr_value; else if (xmlstr_cmp(&attr_name, "publicKeyToken")) key = attr_value; + else if (xmlstr_cmp(&attr_name, "language")) lang = attr_value; } if (!error && name.ptr && version.ptr && arch.ptr && key.ptr) { + if (!lang.ptr) + { + lang.ptr = "none"; + lang.len = strlen( lang.ptr ); + } if (!arch.len) /* fixup the architecture */ { char *new_buffer = HeapAlloc( GetProcessHeap(), 0, len + sizeof(current_arch) ); @@ -729,14 +737,14 @@ static void register_manifest( const WCHAR *dll_name, const char *manifest, DWOR memcpy( new_buffer + strlen(new_buffer), arch.ptr, len - (arch.ptr - manifest) ); arch.ptr = current_arch; arch.len = strlen( current_arch ); - if (create_winsxs_dll( dll_name, &arch, &name, &key, &version, dll_data, dll_size )) - create_manifest( &arch, &name, &key, &version, new_buffer, len + arch.len ); + if (create_winsxs_dll( dll_name, &arch, &name, &key, &version, &lang, dll_data, dll_size )) + create_manifest( &arch, &name, &key, &version, &lang, new_buffer, len + arch.len ); HeapFree( GetProcessHeap(), 0, new_buffer ); } else { - if (create_winsxs_dll( dll_name, &arch, &name, &key, &version, dll_data, dll_size )) - create_manifest( &arch, &name, &key, &version, manifest, len ); + if (create_winsxs_dll( dll_name, &arch, &name, &key, &version, &lang, dll_data, dll_size )) + create_manifest( &arch, &name, &key, &version, &lang, manifest, len ); } } }

1 0

Alexandre Julliard : ntdll: Try to match the language name when looking for a manifest file.
by Alexandre Julliard 29 Aug '11

29 Aug '11

Module: wine Branch: master Commit: 2febc9d41a9258447ac55976c327d4851bbd2ada URL: http://source.winehq.org/git/wine.git/?a=commit;h=2febc9d41a9258447ac55976c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Aug 27 13:54:03 2011 +0200 ntdll: Try to match the language name when looking for a manifest file. --- dlls/ntdll/actctx.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 80f69a8..cba0988 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -182,6 +182,7 @@ struct actctx_loader unsigned int allocated_dependencies; }; +static const WCHAR wildcardW[] = {'*',0}; static const WCHAR assemblyW[] = {'a','s','s','e','m','b','l','y',0}; static const WCHAR assemblyIdentityW[] = {'a','s','s','e','m','b','l','y','I','d','e','n','t','i','t','y',0}; static const WCHAR bindingRedirectW[] = {'b','i','n','d','i','n','g','R','e','d','i','r','e','c','t',0}; @@ -208,6 +209,7 @@ static const WCHAR iidW[] = {'i','i','d',0}; static const WCHAR languageW[] = {'l','a','n','g','u','a','g','e',0}; static const WCHAR manifestVersionW[] = {'m','a','n','i','f','e','s','t','V','e','r','s','i','o','n',0}; static const WCHAR nameW[] = {'n','a','m','e',0}; +static const WCHAR neutralW[] = {'n','e','u','t','r','a','l',0}; static const WCHAR newVersionW[] = {'n','e','w','V','e','r','s','i','o','n',0}; static const WCHAR oldVersionW[] = {'o','l','d','V','e','r','s','i','o','n',0}; static const WCHAR optionalW[] = {'o','p','t','i','o','n','a','l',0}; @@ -423,7 +425,6 @@ static BOOL is_matching_identity( const struct assembly_identity *id1, if (id1->language && id2->language && strcmpiW( id1->language, id2->language )) { - static const WCHAR wildcardW[] = {'*',0}; if (strcmpW( wildcardW, id1->language ) && strcmpW( wildcardW, id2->language )) return FALSE; } @@ -1799,12 +1800,12 @@ static WCHAR *lookup_manifest_file( HANDLE dir, struct assembly_identity *ai ) { static const WCHAR lookup_fmtW[] = {'%','s','_','%','s','_','%','s','_','%','u','.','%','u','.','*','.','*','_', - '*', /* FIXME */ - '.','m','a','n','i','f','e','s','t',0}; + '%','s','_','*','.','m','a','n','i','f','e','s','t',0}; WCHAR *lookup, *ret = NULL; UNICODE_STRING lookup_us; IO_STATUS_BLOCK io; + const WCHAR *lang = ai->language; unsigned int data_pos = 0, data_len; char buffer[8192]; @@ -1814,7 +1815,9 @@ static WCHAR *lookup_manifest_file( HANDLE dir, struct assembly_identity *ai ) + sizeof(lookup_fmtW) ))) return NULL; - sprintfW( lookup, lookup_fmtW, ai->arch, ai->name, ai->public_key, ai->version.major, ai->version.minor); + if (!lang || !strcmpiW( lang, neutralW )) lang = wildcardW; + sprintfW( lookup, lookup_fmtW, ai->arch, ai->name, ai->public_key, + ai->version.major, ai->version.minor, lang ); RtlInitUnicodeString( &lookup_us, lookup ); NtQueryDirectoryFile( dir, 0, NULL, NULL, &io, buffer, sizeof(buffer),

1 0

Alexandre Julliard : ntdll: Use the manifest with the highest matching version number.
by Alexandre Julliard 29 Aug '11

29 Aug '11

Module: wine Branch: master Commit: f8397ef229a7351226922f9ccf98ba7ff8adc061 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8397ef229a7351226922f9cc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Aug 27 13:55:51 2011 +0200 ntdll: Use the manifest with the highest matching version number. --- dlls/ntdll/actctx.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index cba0988..a539e54 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -1824,6 +1824,7 @@ static WCHAR *lookup_manifest_file( HANDLE dir, struct assembly_identity *ai ) FileBothDirectoryInformation, FALSE, &lookup_us, TRUE ); if (io.u.Status == STATUS_SUCCESS) { + ULONG min_build = ai->version.build, min_revision = ai->version.revision; FILE_BOTH_DIR_INFORMATION *dir_info; WCHAR *tmp; ULONG build, revision; @@ -1847,19 +1848,18 @@ static WCHAR *lookup_manifest_file( HANDLE dir, struct assembly_identity *ai ) tmp = (WCHAR *)dir_info->FileName + (strchrW(lookup, '*') - lookup); build = atoiW(tmp); - if (build < ai->version.build) continue; + if (build < min_build) continue; tmp = strchrW(tmp, '.') + 1; revision = atoiW(tmp); - if (build == ai->version.build && revision < ai->version.revision) - continue; - ai->version.build = build; - ai->version.revision = revision; + if (build == min_build && revision < min_revision) continue; + ai->version.build = min_build = build; + ai->version.revision = min_revision = revision; + RtlFreeHeap( GetProcessHeap(), 0, ret ); if ((ret = RtlAllocateHeap( GetProcessHeap(), 0, dir_info->FileNameLength + sizeof(WCHAR) ))) { memcpy( ret, dir_info->FileName, dir_info->FileNameLength ); ret[dir_info->FileNameLength/sizeof(WCHAR)] = 0; } - break; } } else WARN("no matching file for %s\n", debugstr_w(lookup));

1 0

Alexandre Julliard : ntdll: Prefer loading native manifests over Wine ones.
by Alexandre Julliard 29 Aug '11

29 Aug '11

Module: wine Branch: master Commit: 127b27414eb151fe48aa16e05399e37c115446ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=127b27414eb151fe48aa16e05… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Aug 27 14:42:49 2011 +0200 ntdll: Prefer loading native manifests over Wine ones. --- dlls/ntdll/actctx.c | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index a539e54..d31a6a3 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -1801,6 +1801,7 @@ static WCHAR *lookup_manifest_file( HANDLE dir, struct assembly_identity *ai ) static const WCHAR lookup_fmtW[] = {'%','s','_','%','s','_','%','s','_','%','u','.','%','u','.','*','.','*','_', '%','s','_','*','.','m','a','n','i','f','e','s','t',0}; + static const WCHAR wine_trailerW[] = {'d','e','a','d','b','e','e','f','.','m','a','n','i','f','e','s','t',0}; WCHAR *lookup, *ret = NULL; UNICODE_STRING lookup_us; @@ -1852,8 +1853,21 @@ static WCHAR *lookup_manifest_file( HANDLE dir, struct assembly_identity *ai ) tmp = strchrW(tmp, '.') + 1; revision = atoiW(tmp); if (build == min_build && revision < min_revision) continue; - ai->version.build = min_build = build; - ai->version.revision = min_revision = revision; + tmp = strchrW(tmp, '_') + 1; + tmp = strchrW(tmp, '_') + 1; + if (!strcmpiW( tmp, wine_trailerW )) + { + /* prefer a non-Wine manifest if we already have one */ + /* we'll still load the builtin dll if specified through DllOverrides */ + if (ret) continue; + } + else + { + min_build = build; + min_revision = revision; + } + ai->version.build = build; + ai->version.revision = revision; RtlFreeHeap( GetProcessHeap(), 0, ret ); if ((ret = RtlAllocateHeap( GetProcessHeap(), 0, dir_info->FileNameLength + sizeof(WCHAR) ))) {

1 0

Francois Gouget : advapi32/tests: Tweak the service start/ stop tests so they work on NT4.
by Alexandre Julliard 29 Aug '11

29 Aug '11

Module: wine Branch: master Commit: ac1a0d96e132333a67a657449e318351074ea9a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac1a0d96e132333a67a657449… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Aug 26 17:36:37 2011 +0200 advapi32/tests: Tweak the service start/stop tests so they work on NT4. --- dlls/advapi32/tests/service.c | 50 +++++++++++++++++++++++++++------------- 1 files changed, 34 insertions(+), 16 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index eecc86a..9b6e313 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -2065,12 +2065,11 @@ cleanup: CloseServiceHandle(scm_handle); } -static DWORD try_start_stop(SC_HANDLE svc_handle, const char* name, int todo) +static DWORD try_start_stop(SC_HANDLE svc_handle, const char* name, int todo, DWORD is_nt4) { BOOL ret; - DWORD needed, le1, le2; + DWORD le1, le2; SERVICE_STATUS status; - SERVICE_STATUS_PROCESS statusproc; ret = StartServiceA(svc_handle, 0, NULL); le1 = GetLastError(); @@ -2078,6 +2077,9 @@ static DWORD try_start_stop(SC_HANDLE svc_handle, const char* name, int todo) if (pQueryServiceStatusEx) { + DWORD needed; + SERVICE_STATUS_PROCESS statusproc; + ret = pQueryServiceStatusEx(svc_handle, SC_STATUS_PROCESS_INFO, (BYTE*)&statusproc, sizeof(statusproc), &needed); ok(ret, "%s: QueryServiceStatusEx() failed le=%u\n", name, GetLastError()); todo_wine ok(statusproc.dwCurrentState == SERVICE_STOPPED, "%s: should be stopped state=%x\n", name, statusproc.dwCurrentState); @@ -2092,11 +2094,14 @@ static DWORD try_start_stop(SC_HANDLE svc_handle, const char* name, int todo) else ok(le2 == le1, "%s: the second try should yield the same error: %u != %u\n", name, le1, le2); + status.dwCurrentState = 0xdeadbeef; ret = ControlService(svc_handle, SERVICE_CONTROL_STOP, &status); le2 = GetLastError(); ok(!ret, "%s: ControlService() should have failed\n", name); todo_wine ok(le2 == ERROR_SERVICE_NOT_ACTIVE, "%s: %d != ERROR_SERVICE_NOT_ACTIVE\n", name, le2); - todo_wine ok(status.dwCurrentState == SERVICE_STOPPED, "%s: should be stopped state=%x\n", name, status.dwCurrentState); + todo_wine ok(status.dwCurrentState == SERVICE_STOPPED || + broken(is_nt4), /* NT4 returns a random value */ + "%s: should be stopped state=%x\n", name, status.dwCurrentState); return le1; } @@ -2105,7 +2110,7 @@ static void test_start_stop(void) { BOOL ret; SC_HANDLE scm_handle, svc_handle; - DWORD le; + DWORD le, is_nt4; static const char servicename[] = "Winetest"; char cmd[MAX_PATH+20]; const char* displayname; @@ -2121,6 +2126,10 @@ static void test_start_stop(void) return; } + /* Detect NT4 */ + svc_handle = OpenServiceA(scm_handle, NULL, GENERIC_READ); + is_nt4=(svc_handle == NULL && GetLastError() == ERROR_INVALID_PARAMETER); + /* Do some cleanup in case a previous run crashed */ svc_handle = OpenServiceA(scm_handle, servicename, GENERIC_ALL); if (svc_handle) @@ -2144,21 +2153,30 @@ static void test_start_stop(void) ok(FALSE, "Could not create the service: %d\n", GetLastError()); goto cleanup; } - le = try_start_stop(svc_handle, displayname, 1); + le = try_start_stop(svc_handle, displayname, 1, is_nt4); todo_wine ok(le == ERROR_SERVICE_DISABLED, "%d != ERROR_SERVICE_DISABLED\n", le); - /* Then with a process that exits right away */ - displayname = "Winetest Exit Service"; - ret = ChangeServiceConfigA(svc_handle, SERVICE_NO_CHANGE, SERVICE_DEMAND_START, SERVICE_NO_CHANGE, NULL, NULL, NULL, NULL, NULL, NULL, displayname); + /* Then one with a bad path */ + displayname = "Winetest Bad Path"; + ret = ChangeServiceConfigA(svc_handle, SERVICE_NO_CHANGE, SERVICE_DEMAND_START, SERVICE_NO_CHANGE, "c:\\no_such_file.exe", NULL, NULL, NULL, NULL, NULL, displayname); ok(ret, "ChangeServiceConfig() failed le=%u\n", GetLastError()); - le = try_start_stop(svc_handle, displayname, 0); - todo_wine ok(le == ERROR_SERVICE_REQUEST_TIMEOUT, "%d != ERROR_SERVICE_REQUEST_TIMEOUT\n", le); + try_start_stop(svc_handle, displayname, 0, is_nt4); - /* Again with a bad path */ - displayname = "Winetest Bad Path"; - ret = ChangeServiceConfigA(svc_handle, SERVICE_NO_CHANGE, SERVICE_NO_CHANGE, SERVICE_NO_CHANGE, "no_such_file.exe", NULL, NULL, NULL, NULL, NULL, displayname); + if (is_nt4) + { + /* NT4 does not detect when a service fails to start and uses an + * insanely long timeout: 120s. So skip the rest of the tests. + */ + win_skip("Skip some service start/stop tests on NT4\n"); + goto cleanup; + } + + /* Again with a process that exits right away */ + displayname = "Winetest Exit Service"; + ret = ChangeServiceConfigA(svc_handle, SERVICE_NO_CHANGE, SERVICE_NO_CHANGE, SERVICE_NO_CHANGE, cmd, NULL, NULL, NULL, NULL, NULL, displayname); ok(ret, "ChangeServiceConfig() failed le=%u\n", GetLastError()); - try_start_stop(svc_handle, displayname, 0); + le = try_start_stop(svc_handle, displayname, 0, is_nt4); + todo_wine ok(le == ERROR_SERVICE_REQUEST_TIMEOUT, "%d != ERROR_SERVICE_REQUEST_TIMEOUT\n", le); /* And finally with a service that plays dead, forcing a timeout. * This time we will put no quotes. That should work too, even if there are @@ -2169,7 +2187,7 @@ static void test_start_stop(void) ret = ChangeServiceConfigA(svc_handle, SERVICE_NO_CHANGE, SERVICE_NO_CHANGE, SERVICE_NO_CHANGE, cmd, NULL, NULL, NULL, NULL, NULL, displayname); ok(ret, "ChangeServiceConfig() failed le=%u\n", GetLastError()); - le = try_start_stop(svc_handle, displayname, 0); + le = try_start_stop(svc_handle, displayname, 0, is_nt4); todo_wine ok(le == ERROR_SERVICE_REQUEST_TIMEOUT, "%d != ERROR_SERVICE_REQUEST_TIMEOUT\n", le); cleanup:

1 0

Matteo Bruni : wined3d: Keep track of the current texture type for each texture unit.
by Alexandre Julliard 29 Aug '11

29 Aug '11

Module: wine Branch: master Commit: 0386b44bad2315919aec3e5943e4266b84468284 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0386b44bad2315919aec3e594… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Aug 26 01:12:26 2011 +0200 wined3d: Keep track of the current texture type for each texture unit. --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/context.c | 10 +++++++++ dlls/wined3d/device.c | 3 +- dlls/wined3d/state.c | 3 +- dlls/wined3d/surface.c | 40 +++++++++++++------------------------ dlls/wined3d/texture.c | 6 +--- dlls/wined3d/wined3d_private.h | 6 +++- 7 files changed, 33 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0386b44bad2315919aec3…

1 0

Matteo Bruni : wined3d: Use dummy textures for all the texture targets.
by Alexandre Julliard 29 Aug '11

29 Aug '11

Module: wine Branch: master Commit: 7c6bd2f287144dc5be75e0aa249968a71dc46c73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c6bd2f287144dc5be75e0aa2… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Aug 26 01:12:27 2011 +0200 wined3d: Use dummy textures for all the texture targets. --- dlls/wined3d/context.c | 86 ++++++++++++++++++++++++++++++++++++++-- dlls/wined3d/device.c | 79 +++++++++++++++++++++++++++++++++---- dlls/wined3d/state.c | 4 +- dlls/wined3d/wined3d_private.h | 5 ++- 4 files changed, 159 insertions(+), 15 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7c6bd2f287144dc5be75e…

1 0

Matteo Bruni : d3d9/tests: Add unbound cube/volume texture tests.
by Alexandre Julliard 29 Aug '11

29 Aug '11

Module: wine Branch: master Commit: e46378c764cd0b9c5b87634f7fb4bc6a2cbf692b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e46378c764cd0b9c5b87634f7… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Aug 26 01:12:28 2011 +0200 d3d9/tests: Add unbound cube/volume texture tests. --- dlls/d3d9/tests/visual.c | 62 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 61 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 523bbc1..772aa2e 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -12188,7 +12188,7 @@ static void ds_size_test(IDirect3DDevice9 *device) static void unbound_sampler_test(IDirect3DDevice9 *device) { HRESULT hr; - IDirect3DPixelShader9 *ps; + IDirect3DPixelShader9 *ps, *ps_cube, *ps_volume; IDirect3DSurface9 *rt, *old_rt; DWORD color; @@ -12201,6 +12201,24 @@ static void unbound_sampler_test(IDirect3DDevice9 *device) 0x02000001, 0x800f0800, 0x80e40000, /* mov oC0, r0 */ 0x0000ffff, /* end */ }; + static const DWORD ps_code_cube[] = + { + 0xffff0200, /* ps_2_0 */ + 0x0200001f, 0x98000000, 0xa00f0800, /* dcl_cube s0 */ + 0x0200001f, 0x80000000, 0xb00f0000, /* dcl t0 */ + 0x03000042, 0x800f0000, 0xb0e40000, 0xa0e40800, /* texld r0, t0, s0 */ + 0x02000001, 0x800f0800, 0x80e40000, /* mov oC0, r0 */ + 0x0000ffff, /* end */ + }; + static const DWORD ps_code_volume[] = + { + 0xffff0200, /* ps_2_0 */ + 0x0200001f, 0xa0000000, 0xa00f0800, /* dcl_volume s0 */ + 0x0200001f, 0x80000000, 0xb00f0000, /* dcl t0 */ + 0x03000042, 0x800f0000, 0xb0e40000, 0xa0e40800, /* texld r0, t0, s0 */ + 0x02000001, 0x800f0800, 0x80e40000, /* mov oC0, r0 */ + 0x0000ffff, /* end */ + }; static const struct { @@ -12220,6 +12238,10 @@ static void unbound_sampler_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_CreatePixelShader(device, ps_code, &ps); ok(SUCCEEDED(hr), "IDirect3DDevice9_CreatePixelShader failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_CreatePixelShader(device, ps_code_cube, &ps_cube); + ok(SUCCEEDED(hr), "IDirect3DDevice9_CreatePixelShader failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_CreatePixelShader(device, ps_code_volume, &ps_volume); + ok(SUCCEEDED(hr), "IDirect3DDevice9_CreatePixelShader failed, hr %#x.\n", hr); hr = IDirect3DDevice9_CreateRenderTarget(device, 64, 64, D3DFMT_A8R8G8B8, D3DMULTISAMPLE_NONE, 0, TRUE, &rt, NULL); ok(SUCCEEDED(hr), "IDirect3DDevice9_CreateRenderTarget failed, hr %#x.\n", hr); @@ -12253,6 +12275,42 @@ static void unbound_sampler_test(IDirect3DDevice9 *device) color = getPixelColorFromSurface(rt, 32, 32); ok(color == 0xff000000, "Unbound sampler color is %#x.\n", color); + /* Now try with a cube texture */ + hr = IDirect3DDevice9_SetPixelShader(device, ps_cube); + ok(SUCCEEDED(hr), "IDirect3DDevice9_SetPixelShader failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "IDirect3DDevice9_BeginScene failed, hr %#x.\n", hr); + if (SUCCEEDED(hr)) + { + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(*quad)); + ok(SUCCEEDED(hr), "IDirect3DDevice9_DrawPrimitiveUP failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "IDirect3DDevice9_EndScene failed, hr %#x.\n", hr); + } + + color = getPixelColorFromSurface(rt, 32, 32); + ok(color == 0xff000000, "Unbound sampler color is %#x.\n", color); + + /* And then with a volume texture */ + hr = IDirect3DDevice9_SetPixelShader(device, ps_volume); + ok(SUCCEEDED(hr), "IDirect3DDevice9_SetPixelShader failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "IDirect3DDevice9_BeginScene failed, hr %#x.\n", hr); + if (SUCCEEDED(hr)) + { + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(*quad)); + ok(SUCCEEDED(hr), "IDirect3DDevice9_DrawPrimitiveUP failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "IDirect3DDevice9_EndScene failed, hr %#x.\n", hr); + } + + color = getPixelColorFromSurface(rt, 32, 32); + ok(color == 0xff000000, "Unbound sampler color is %#x.\n", color); + hr = IDirect3DDevice9_SetRenderTarget(device, 0, old_rt); ok(SUCCEEDED(hr), "IDirect3DDevice9_SetRenderTarget failed, hr %#x.\n", hr); @@ -12262,6 +12320,8 @@ static void unbound_sampler_test(IDirect3DDevice9 *device) IDirect3DSurface9_Release(rt); IDirect3DSurface9_Release(old_rt); IDirect3DPixelShader9_Release(ps); + IDirect3DPixelShader9_Release(ps_cube); + IDirect3DPixelShader9_Release(ps_volume); } static void update_surface_test(IDirect3DDevice9 *device)

1 0

Matteo Bruni : wined3d: Rename dummyTextureName variable.
by Alexandre Julliard 29 Aug '11

29 Aug '11

Module: wine Branch: master Commit: afeecfd974b643a2161bff90dbffcf5d5255a1c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=afeecfd974b643a2161bff90d… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Aug 26 01:12:29 2011 +0200 wined3d: Rename dummyTextureName variable. --- dlls/wined3d/context.c | 6 +++--- dlls/wined3d/device.c | 12 ++++++------ dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index c50e670..de0933c 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1263,7 +1263,7 @@ static void bind_dummy_textures(const struct wined3d_device *device, struct wine GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB + i)); checkGLcall("glActiveTextureARB"); - glBindTexture(GL_TEXTURE_2D, device->dummyTextureName[i]); + glBindTexture(GL_TEXTURE_2D, device->dummy_texture_2d[i]); checkGLcall("glBindTexture"); if (gl_info->supported[ARB_TEXTURE_RECTANGLE]) @@ -1601,7 +1601,7 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, /* If this happens to be the first context for the device, dummy textures * are not created yet. In that case, they will be created (and bound) by * create_dummy_textures right after this context is initialized. */ - if (device->dummyTextureName[0]) + if (device->dummy_texture_2d[0]) bind_dummy_textures(device, ret); LEAVE_GL(); @@ -1974,7 +1974,7 @@ void context_bind_texture(struct wined3d_context *context, GLenum target, GLuint /* nothing to do */ break; case GL_TEXTURE_2D: - glBindTexture(GL_TEXTURE_2D, device->dummyTextureName[unit]); + glBindTexture(GL_TEXTURE_2D, device->dummy_texture_2d[unit]); checkGLcall("glBindTexture"); break; case GL_TEXTURE_RECTANGLE_ARB: diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 8727ec0..91d8dd9 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -992,11 +992,11 @@ static void create_dummy_textures(struct wined3d_device *device, struct wined3d_ /* Make appropriate texture active */ context_active_texture(context, gl_info, i); - glGenTextures(1, &device->dummyTextureName[i]); + glGenTextures(1, &device->dummy_texture_2d[i]); checkGLcall("glGenTextures"); - TRACE("Dummy 2D texture %u given name %u.\n", i, device->dummyTextureName[i]); + TRACE("Dummy 2D texture %u given name %u.\n", i, device->dummy_texture_2d[i]); - glBindTexture(GL_TEXTURE_2D, device->dummyTextureName[i]); + glBindTexture(GL_TEXTURE_2D, device->dummy_texture_2d[i]); checkGLcall("glBindTexture"); glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, 1, 1, 0, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8, &color); @@ -1079,14 +1079,14 @@ static void destroy_dummy_textures(struct wined3d_device *device, const struct w checkGLcall("glDeleteTextures(count, device->dummy_texture_rect)"); } - glDeleteTextures(count, device->dummyTextureName); - checkGLcall("glDeleteTextures(count, device->dummyTextureName)"); + glDeleteTextures(count, device->dummy_texture_2d); + checkGLcall("glDeleteTextures(count, device->dummy_texture_2d)"); LEAVE_GL(); memset(device->dummy_texture_cube, 0, gl_info->limits.textures * sizeof(*device->dummy_texture_cube)); memset(device->dummy_texture_3d, 0, gl_info->limits.textures * sizeof(*device->dummy_texture_3d)); memset(device->dummy_texture_rect, 0, gl_info->limits.textures * sizeof(*device->dummy_texture_rect)); - memset(device->dummyTextureName, 0, gl_info->limits.textures * sizeof(*device->dummyTextureName)); + memset(device->dummy_texture_2d, 0, gl_info->limits.textures * sizeof(*device->dummy_texture_2d)); } static LONG fullscreen_style(LONG style) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 56c939a..47eee79 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1722,7 +1722,7 @@ struct wined3d_device struct wined3d_surface *logo_surface; /* Textures for when no other textures are mapped */ - UINT dummyTextureName[MAX_COMBINED_SAMPLERS]; + UINT dummy_texture_2d[MAX_COMBINED_SAMPLERS]; UINT dummy_texture_rect[MAX_COMBINED_SAMPLERS]; UINT dummy_texture_3d[MAX_COMBINED_SAMPLERS]; UINT dummy_texture_cube[MAX_COMBINED_SAMPLERS];

1 0