May 2012 - Wine-commits - list.winehq.org

Henri Verbeet : wined3d: Determine index buffer location based on vertex buffer locations.
by Alexandre Julliard 03 May '12

03 May '12

Module: wine Branch: master Commit: 29893d81621b50e3acca1f2c34767867a9256ecb URL: http://source.winehq.org/git/wine.git/?a=commit;h=29893d81621b50e3acca1f2c3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 2 21:47:58 2012 +0200 wined3d: Determine index buffer location based on vertex buffer locations. --- dlls/wined3d/device.c | 11 +++++++++++ dlls/wined3d/drawprim.c | 2 +- dlls/wined3d/state.c | 3 ++- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 0b0b600..c659e47 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -404,6 +404,7 @@ void device_update_stream_info(struct wined3d_device *device, const struct wined { struct wined3d_stream_info *stream_info = &device->strided_streams; const struct wined3d_state *state = &device->stateBlock->state; + DWORD prev_all_vbo = stream_info->all_vbo; if (device->up_strided) { @@ -445,6 +446,16 @@ void device_update_stream_info(struct wined3d_device *device, const struct wined device->useDrawStridedSlow = FALSE; } } + + if (state->index_buffer && !state->user_stream) + { + if (prev_all_vbo != stream_info->all_vbo) + device_invalidate_state(device, STATE_INDEXBUFFER); + if (stream_info->all_vbo) + wined3d_buffer_preload(state->index_buffer); + else + buffer_get_sysmem(state->index_buffer, gl_info); + } } static void device_preload_texture(const struct wined3d_state *state, unsigned int idx) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 18b8f3f..2e30175 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -676,7 +676,7 @@ void drawPrimitive(struct wined3d_device *device, UINT index_count, UINT StartId if (!state->user_stream) { struct wined3d_buffer *index_buffer = state->index_buffer; - if (!index_buffer->buffer_object) + if (!index_buffer->buffer_object || !stream_info->all_vbo) idxData = index_buffer->resource.allocatedMemory; else idxData = NULL; diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 5e6c537..fc6fedc 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4817,9 +4817,10 @@ static void scissorrect(struct wined3d_context *context, const struct wined3d_st static void indexbuffer(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { + const struct wined3d_stream_info *stream_info = &context->swapchain->device->strided_streams; const struct wined3d_gl_info *gl_info = context->gl_info; - if (state->user_stream || !state->index_buffer) + if (state->user_stream || !state->index_buffer || !stream_info->all_vbo) { GL_EXTCALL(glBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, 0)); }

1 0

Vincent Povirk : mscoree: Detect when a CLR DLL requests vtable fixups.
by Alexandre Julliard 03 May '12

03 May '12

Module: wine Branch: master Commit: d2d1c6d8246df302a8c91596fec43b66fd338f97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2d1c6d8246df302a8c91596f… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Oct 20 13:23:35 2011 -0500 mscoree: Detect when a CLR DLL requests vtable fixups. --- dlls/mscoree/assembly.c | 102 +++++++++++++++++++++++++++++++++------- dlls/mscoree/corruntimehost.c | 38 +++++++++++++++ dlls/mscoree/mscoree_main.c | 15 ------ dlls/mscoree/mscoree_private.h | 15 +++++- 4 files changed, 134 insertions(+), 36 deletions(-) diff --git a/dlls/mscoree/assembly.c b/dlls/mscoree/assembly.c index 07723f9..a1e3dc7 100644 --- a/dlls/mscoree/assembly.c +++ b/dlls/mscoree/assembly.c @@ -63,10 +63,13 @@ typedef struct tagCLRTABLE struct tagASSEMBLY { - LPWSTR path; + int is_mapped_file; + /* mapped files */ + LPWSTR path; HANDLE hfile; HANDLE hmap; + BYTE *data; IMAGE_NT_HEADERS *nthdr; @@ -89,6 +92,29 @@ static inline LPWSTR strdupW(LPCWSTR src) return dest; } +void* assembly_rva_to_va(ASSEMBLY *assembly, ULONG rva) +{ + if (assembly->is_mapped_file) + return ImageRvaToVa(assembly->nthdr, assembly->data, rva, NULL); + else + return assembly->data + rva; +} + +static ULONG assembly_datadir_get_data(ASSEMBLY *assembly, + IMAGE_DATA_DIRECTORY *datadir, void **data) +{ + if (!datadir->VirtualAddress || !datadir->Size) + { + *data = NULL; + return 0; + } + else + { + *data = assembly_rva_to_va(assembly, datadir->VirtualAddress); + return datadir->Size; + } +} + static HRESULT parse_metadata_header(ASSEMBLY *assembly, DWORD *hdrsz) { METADATAHDR *metadatahdr; @@ -97,7 +123,7 @@ static HRESULT parse_metadata_header(ASSEMBLY *assembly, DWORD *hdrsz) ULONG rva; rva = assembly->corhdr->MetaData.VirtualAddress; - ptr = ImageRvaToVa(assembly->nthdr, assembly->data, rva, NULL); + ptr = assembly_rva_to_va(assembly, rva); if (!ptr) return E_FAIL; @@ -158,20 +184,24 @@ static HRESULT parse_pe_header(ASSEMBLY *assembly) if (!datadirs) return E_FAIL; - if (!datadirs[IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].VirtualAddress || - !datadirs[IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].Size) - { - return E_FAIL; - } - - assembly->corhdr = ImageRvaToVa(assembly->nthdr, assembly->data, - datadirs[IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].VirtualAddress, NULL); - if (!assembly->corhdr) + if (!assembly_datadir_get_data(assembly, &datadirs[IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR], (void**)&assembly->corhdr)) return E_FAIL; return S_OK; } +HRESULT parse_headers(ASSEMBLY *assembly) +{ + HRESULT hr; + + hr = parse_pe_header(assembly); + + if (SUCCEEDED(hr)) + hr = parse_clr_metadata(assembly); + + return hr; +} + HRESULT assembly_create(ASSEMBLY **out, LPCWSTR file) { ASSEMBLY *assembly; @@ -183,6 +213,8 @@ HRESULT assembly_create(ASSEMBLY **out, LPCWSTR file) if (!assembly) return E_OUTOFMEMORY; + assembly->is_mapped_file = 1; + assembly->path = strdupW(file); if (!assembly->path) { @@ -213,10 +245,7 @@ HRESULT assembly_create(ASSEMBLY **out, LPCWSTR file) goto failed; } - hr = parse_pe_header(assembly); - if (FAILED(hr)) goto failed; - - hr = parse_clr_metadata(assembly); + hr = parse_headers(assembly); if (FAILED(hr)) goto failed; *out = assembly; @@ -227,16 +256,43 @@ failed: return hr; } +HRESULT assembly_from_hmodule(ASSEMBLY **out, HMODULE hmodule) +{ + ASSEMBLY *assembly; + HRESULT hr; + + *out = NULL; + + assembly = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ASSEMBLY)); + if (!assembly) + return E_OUTOFMEMORY; + + assembly->is_mapped_file = 0; + + assembly->data = (BYTE*)hmodule; + + hr = parse_headers(assembly); + if (SUCCEEDED(hr)) + *out = assembly; + else + assembly_release(assembly); + + return hr; +} + HRESULT assembly_release(ASSEMBLY *assembly) { if (!assembly) return S_OK; + if (assembly->is_mapped_file) + { + UnmapViewOfFile(assembly->data); + CloseHandle(assembly->hmap); + CloseHandle(assembly->hfile); + } HeapFree(GetProcessHeap(), 0, assembly->metadatahdr); HeapFree(GetProcessHeap(), 0, assembly->path); - UnmapViewOfFile(assembly->data); - CloseHandle(assembly->hmap); - CloseHandle(assembly->hfile); HeapFree(GetProcessHeap(), 0, assembly); return S_OK; @@ -248,3 +304,13 @@ HRESULT assembly_get_runtime_version(ASSEMBLY *assembly, LPSTR *version) return S_OK; } + +HRESULT assembly_get_vtable_fixups(ASSEMBLY *assembly, VTableFixup **fixups, DWORD *count) +{ + ULONG size; + + size = assembly_datadir_get_data(assembly, &assembly->corhdr->VTableFixups, (void**)fixups); + *count = size / sizeof(VTableFixup); + + return S_OK; +} diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index 1750f12..31c02ea 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -803,6 +803,26 @@ static void get_utf8_args(int *argc, char ***argv) HeapFree(GetProcessHeap(), 0, argvw); } +static void FixupVTable(HMODULE hmodule) +{ + ASSEMBLY *assembly; + HRESULT hr; + VTableFixup *vtable_fixups; + ULONG vtable_fixup_count; + + hr = assembly_from_hmodule(&assembly, hmodule); + if (SUCCEEDED(hr)) + { + hr = assembly_get_vtable_fixups(assembly, &vtable_fixups, &vtable_fixup_count); + if (vtable_fixup_count) + FIXME("vtable fixups are not implemented; expect a crash\n"); + + assembly_release(assembly); + } + else + ERR("failed to read CLR headers, hr=%x\n", hr); +} + __int32 WINAPI _CorExeMain(void) { int exit_code; @@ -830,6 +850,8 @@ __int32 WINAPI _CorExeMain(void) if (!filenameA) return -1; + FixupVTable(GetModuleHandleW(NULL)); + hr = get_runtime_info(filename, NULL, NULL, 0, 0, FALSE, &info); if (SUCCEEDED(hr)) @@ -862,6 +884,22 @@ __int32 WINAPI _CorExeMain(void) return exit_code; } +BOOL WINAPI _CorDllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + FIXME("(%p, %d, %p): stub\n", hinstDLL, fdwReason, lpvReserved); + + switch (fdwReason) + { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + FixupVTable(hinstDLL); + break; + case DLL_PROCESS_DETACH: + break; + } + return TRUE; +} + HRESULT RuntimeHost_Construct(const CLRRuntimeInfo *runtime_version, loaded_mono *loaded_mono, RuntimeHost** result) { diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 1e06909..09f6dad 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -236,21 +236,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return TRUE; } -BOOL WINAPI _CorDllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - FIXME("(%p, %d, %p): stub\n", hinstDLL, fdwReason, lpvReserved); - - switch (fdwReason) - { - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; - case DLL_PROCESS_DETACH: - break; - } - return TRUE; -} - __int32 WINAPI _CorExeMain2(PBYTE ptrMemory, DWORD cntMemory, LPWSTR imageName, LPWSTR loaderName, LPWSTR cmdLine) { TRACE("(%p, %u, %s, %s, %s)\n", ptrMemory, cntMemory, debugstr_w(imageName), debugstr_w(loaderName), debugstr_w(cmdLine)); diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 62cf240..12a1e56 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -27,11 +27,20 @@ extern HRESULT CLRMetaHost_CreateInstance(REFIID riid, void **ppobj) DECLSPEC_HI extern HRESULT WINAPI CLRMetaHost_GetVersionFromFile(ICLRMetaHost* iface, LPCWSTR pwzFilePath, LPWSTR pwzBuffer, DWORD *pcchBuffer) DECLSPEC_HIDDEN; +typedef struct _VTableFixup { + DWORD rva; + WORD count; + WORD type; +} VTableFixup; + typedef struct tagASSEMBLY ASSEMBLY; -HRESULT assembly_create(ASSEMBLY **out, LPCWSTR file) DECLSPEC_HIDDEN; -HRESULT assembly_release(ASSEMBLY *assembly) DECLSPEC_HIDDEN; -HRESULT assembly_get_runtime_version(ASSEMBLY *assembly, LPSTR *version) DECLSPEC_HIDDEN; +extern void* assembly_rva_to_va(ASSEMBLY *assembly, ULONG rva) DECLSPEC_HIDDEN; +extern HRESULT assembly_create(ASSEMBLY **out, LPCWSTR file) DECLSPEC_HIDDEN; +extern HRESULT assembly_from_hmodule(ASSEMBLY **out, HMODULE hmodule) DECLSPEC_HIDDEN; +extern HRESULT assembly_release(ASSEMBLY *assembly) DECLSPEC_HIDDEN; +extern HRESULT assembly_get_runtime_version(ASSEMBLY *assembly, LPSTR *version) DECLSPEC_HIDDEN; +extern HRESULT assembly_get_vtable_fixups(ASSEMBLY *assembly, VTableFixup **fixups, DWORD *count) DECLSPEC_HIDDEN; /* Mono embedding */ typedef struct _MonoDomain MonoDomain;

1 0

Vincent Povirk : mscoree: Use the main HMODULE in _CorExeMain instead of loading a new exe.
by Alexandre Julliard 03 May '12

03 May '12

Module: wine Branch: master Commit: a824e8f659d5e21c82a9f1009b521715519ed88d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a824e8f659d5e21c82a9f1009… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed May 2 13:04:36 2012 -0500 mscoree: Use the main HMODULE in _CorExeMain instead of loading a new exe. --- dlls/mscoree/corruntimehost.c | 22 ++++++++++++++++++---- dlls/mscoree/metahost.c | 2 ++ dlls/mscoree/mscoree_private.h | 2 ++ 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index 31c02ea..35815f0 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -829,7 +829,9 @@ __int32 WINAPI _CorExeMain(void) int argc; char **argv; MonoDomain *domain; - MonoAssembly *assembly; + MonoImage *image; + MonoImageOpenStatus status; + MonoAssembly *assembly=NULL; WCHAR filename[MAX_PATH]; char *filenameA; ICLRRuntimeInfo *info; @@ -863,9 +865,21 @@ __int32 WINAPI _CorExeMain(void) if (SUCCEEDED(hr)) { - assembly = host->mono->mono_domain_assembly_open(domain, filenameA); + image = host->mono->mono_image_open_from_module_handle(GetModuleHandleW(NULL), + filenameA, 1, &status); - exit_code = host->mono->mono_jit_exec(domain, assembly, argc, argv); + if (image) + assembly = host->mono->mono_assembly_load_from(image, filenameA, &status); + + if (assembly) + { + exit_code = host->mono->mono_jit_exec(domain, assembly, argc, argv); + } + else + { + ERR("couldn't load %s, status=%d\n", debugstr_w(filename), status); + exit_code = -1; + } RuntimeHost_DeleteDomain(host, domain); } diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 1296e37..2c3322a 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -165,12 +165,14 @@ static HRESULT load_mono(CLRRuntimeInfo *This, loaded_mono **result) } while (0); LOAD_MONO_FUNCTION(mono_assembly_get_image); + LOAD_MONO_FUNCTION(mono_assembly_load_from); LOAD_MONO_FUNCTION(mono_assembly_open); LOAD_MONO_FUNCTION(mono_config_parse); LOAD_MONO_FUNCTION(mono_class_from_mono_type); LOAD_MONO_FUNCTION(mono_class_from_name); LOAD_MONO_FUNCTION(mono_class_get_method_from_name); LOAD_MONO_FUNCTION(mono_domain_assembly_open); + LOAD_MONO_FUNCTION(mono_image_open_from_module_handle); LOAD_MONO_FUNCTION(mono_install_assembly_preload_hook); LOAD_MONO_FUNCTION(mono_jit_exec); LOAD_MONO_FUNCTION(mono_jit_init); diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 12a1e56..357914f 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -147,6 +147,7 @@ struct loaded_mono BOOL is_shutdown; MonoImage* (CDECL *mono_assembly_get_image)(MonoAssembly *assembly); + MonoAssembly* (CDECL *mono_assembly_load_from)(MonoImage *image, const char *fname, MonoImageOpenStatus *status); MonoAssembly* (CDECL *mono_assembly_open)(const char *filename, MonoImageOpenStatus *status); MonoClass* (CDECL *mono_class_from_mono_type)(MonoType *type); MonoClass* (CDECL *mono_class_from_name)(MonoImage *image, const char* name_space, const char *name); @@ -154,6 +155,7 @@ struct loaded_mono void (CDECL *mono_config_parse)(const char *filename); MonoAssembly* (CDECL *mono_domain_assembly_open) (MonoDomain *domain, const char *name); void (CDECL *mono_free)(void *); + MonoImage* (CDECL *mono_image_open_from_module_handle)(HMODULE module_handle, char* fname, UINT has_entry_point, MonoImageOpenStatus* status); void (CDECL *mono_install_assembly_preload_hook)(MonoAssemblyPreLoadFunc func, void *user_data); int (CDECL *mono_jit_exec)(MonoDomain *domain, MonoAssembly *assembly, int argc, char *argv[]); MonoDomain* (CDECL *mono_jit_init)(const char *file);

1 0

Vincent Povirk : mscoree: Change _CorDllMain fixme to a trace.
by Alexandre Julliard 03 May '12

03 May '12

Module: wine Branch: master Commit: b15a77463ad959df108f31a9e76486365675077f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b15a77463ad959df108f31a9e… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed May 2 13:16:41 2012 -0500 mscoree: Change _CorDllMain fixme to a trace. --- dlls/mscoree/corruntimehost.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index 35815f0..ec68ea1 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -900,7 +900,7 @@ __int32 WINAPI _CorExeMain(void) BOOL WINAPI _CorDllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { - FIXME("(%p, %d, %p): stub\n", hinstDLL, fdwReason, lpvReserved); + TRACE("(%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); switch (fdwReason) {

1 0

Austin English : kernel32: Move GlobalMemoryStatus(Ex) to a different debug channel.
by Alexandre Julliard 03 May '12

03 May '12

Module: wine Branch: master Commit: e9dc02eaa300da4c28612681e86a8a95f75565c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9dc02eaa300da4c28612681e… Author: Austin English <austinenglish(a)gmail.com> Date: Wed May 2 14:32:14 2012 -0500 kernel32: Move GlobalMemoryStatus(Ex) to a different debug channel. --- dlls/kernel32/heap.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index d730a8a..34fbb75 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -64,6 +64,7 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(heap); +WINE_DECLARE_DEBUG_CHANNEL(globalmem); /* address where we try to map the system heap */ #define SYSTEM_HEAP_BASE ((void*)0x80000000) @@ -1289,7 +1290,7 @@ BOOL WINAPI GlobalMemoryStatusEx( LPMEMORYSTATUSEX lpmemex ) cached_memstatus = *lpmemex; - TRACE("<-- LPMEMORYSTATUSEX: dwLength %d, dwMemoryLoad %d, ullTotalPhys %s, ullAvailPhys %s," + TRACE_(globalmem)("<-- LPMEMORYSTATUSEX: dwLength %d, dwMemoryLoad %d, ullTotalPhys %s, ullAvailPhys %s," " ullTotalPageFile %s, ullAvailPageFile %s, ullTotalVirtual %s, ullAvailVirtual %s\n", lpmemex->dwLength, lpmemex->dwMemoryLoad, wine_dbgstr_longlong(lpmemex->ullTotalPhys), wine_dbgstr_longlong(lpmemex->ullAvailPhys), wine_dbgstr_longlong(lpmemex->ullTotalPageFile), @@ -1371,7 +1372,7 @@ VOID WINAPI GlobalMemoryStatus( LPMEMORYSTATUS lpBuffer ) if (lpBuffer->dwAvailPageFile > MAXLONG) lpBuffer->dwAvailPageFile = MAXLONG; } - TRACE("Length %u, MemoryLoad %u, TotalPhys %lx, AvailPhys %lx," + TRACE_(globalmem)("Length %u, MemoryLoad %u, TotalPhys %lx, AvailPhys %lx," " TotalPageFile %lx, AvailPageFile %lx, TotalVirtual %lx, AvailVirtual %lx\n", lpBuffer->dwLength, lpBuffer->dwMemoryLoad, lpBuffer->dwTotalPhys, lpBuffer->dwAvailPhys, lpBuffer->dwTotalPageFile, lpBuffer->dwAvailPageFile,

1 0

Austin English : kernel32: Only print a fixme once for FlushProcessWriteBuffers.
by Alexandre Julliard 03 May '12

03 May '12

Module: wine Branch: master Commit: b4432a6274dd4456acee3fc61cb980683f333657 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4432a6274dd4456acee3fc61… Author: Austin English <austinenglish(a)gmail.com> Date: Wed May 2 17:00:36 2012 -0500 kernel32: Only print a fixme once for FlushProcessWriteBuffers. --- dlls/kernel32/process.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index dca8561..1edf9ea 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -3863,5 +3863,8 @@ BOOL WINAPI GetProcessDEPPolicy(HANDLE process, LPDWORD flags, PBOOL permanent) */ VOID WINAPI FlushProcessWriteBuffers(void) { - FIXME(": stub\n"); + static int once = 0; + + if (!once++) + FIXME(": stub\n"); }

1 0

Francois Gouget : msi: Tweak msiexec's usage message.
by Alexandre Julliard 03 May '12

03 May '12

1 0

Alexandre Julliard : iphlpapi/tests: Avoid test failures when IPv6 is not supported.
by Alexandre Julliard 03 May '12

03 May '12

Module: wine Branch: master Commit: 153e163b27d27e5f8ce5d40151dd989f7a650de0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=153e163b27d27e5f8ce5d4015… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 3 10:10:45 2012 +0200 iphlpapi/tests: Avoid test failures when IPv6 is not supported. --- dlls/iphlpapi/tests/iphlpapi.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 188528e..aabcf04 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -552,7 +552,8 @@ static void testGetIcmpStatisticsEx(void) } apiReturn = pGetIcmpStatisticsEx(&stats, AF_INET6); - ok(apiReturn == NO_ERROR, "GetIcmpStatisticsEx returned %d, expected NO_ERROR\n", apiReturn); + ok(apiReturn == NO_ERROR || broken(apiReturn == ERROR_NOT_SUPPORTED), + "GetIcmpStatisticsEx returned %d, expected NO_ERROR\n", apiReturn); if (apiReturn == NO_ERROR && winetest_debug > 1) { INT i; @@ -610,7 +611,8 @@ static void testGetIpStatisticsEx(void) } apiReturn = pGetIpStatisticsEx(&stats, AF_INET6); - ok(apiReturn == NO_ERROR, "GetIpStatisticsEx returned %d, expected NO_ERROR\n", apiReturn); + ok(apiReturn == NO_ERROR || broken(apiReturn == ERROR_NOT_SUPPORTED), + "GetIpStatisticsEx returned %d, expected NO_ERROR\n", apiReturn); if (apiReturn == NO_ERROR && winetest_debug > 1) { trace( "IP Ex stats:\n" ); @@ -678,7 +680,8 @@ static void testGetTcpStatisticsEx(void) } apiReturn = pGetTcpStatisticsEx(&stats, AF_INET6); - ok(apiReturn == NO_ERROR, "GetTcpStatisticsEx returned %d, expected NO_ERROR\n", apiReturn); + ok(apiReturn == NO_ERROR || broken(apiReturn == ERROR_NOT_SUPPORTED), + "GetTcpStatisticsEx returned %d, expected NO_ERROR\n", apiReturn); if (apiReturn == NO_ERROR && winetest_debug > 1) { trace( "TCP stats:\n" ); @@ -728,7 +731,8 @@ static void testGetUdpStatisticsEx(void) } apiReturn = pGetUdpStatisticsEx(&stats, AF_INET6); - ok(apiReturn == NO_ERROR, "GetUdpStatisticsEx returned %d, expected NO_ERROR\n", apiReturn); + ok(apiReturn == NO_ERROR || broken(apiReturn == ERROR_NOT_SUPPORTED), + "GetUdpStatisticsEx returned %d, expected NO_ERROR\n", apiReturn); if (apiReturn == NO_ERROR && winetest_debug > 1) { trace( "UDP stats:\n" );

1 0

Alexandre Julliard : wininet/tests: Add more optional COOKIE_SENT messages.
by Alexandre Julliard 03 May '12

03 May '12

Module: wine Branch: master Commit: 9ec1f7ba1b0577fc045e4f77bdc48113126175d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ec1f7ba1b0577fc045e4f77b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 3 10:11:12 2012 +0200 wininet/tests: Add more optional COOKIE_SENT messages. --- dlls/wininet/tests/http.c | 25 ++++++++++--------------- 1 files changed, 10 insertions(+), 15 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index fddef12..4974c88 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -107,8 +107,7 @@ static DWORD req_error; #define TESTF_REDIRECT 0x01 #define TESTF_COMPRESSED 0x02 -#define TESTF_ALLOW_COOKIE 0x04 -#define TESTF_CHUNKED 0x08 +#define TESTF_CHUNKED 0x04 typedef struct { const char *url; @@ -128,7 +127,7 @@ static const test_data_t test_data[] = { "test.winehq.org", "/tests/data.php", "", - TESTF_CHUNKED|TESTF_ALLOW_COOKIE + TESTF_CHUNKED }, { "http://test.winehq.org/tests/redirect", @@ -144,7 +143,7 @@ static const test_data_t test_data[] = { "www.codeweavers.com", "", "Accept-Encoding: gzip, deflate", - TESTF_COMPRESSED|TESTF_ALLOW_COOKIE + TESTF_COMPRESSED }, { "http://test.winehq.org/tests/post.php", @@ -152,7 +151,7 @@ static const test_data_t test_data[] = { "test.winehq.org", "/tests/post.php", "Content-Type: application/x-www-form-urlencoded", - TESTF_ALLOW_COOKIE, + 0, "mode=Test", "mode => Test\n" } @@ -399,10 +398,8 @@ static void InternetReadFile_test(int flags, const test_data_t *test) CHECK_NOTIFIED(INTERNET_STATUS_HANDLE_CREATED); CHECK_NOT_NOTIFIED(INTERNET_STATUS_RESOLVING_NAME); CHECK_NOT_NOTIFIED(INTERNET_STATUS_NAME_RESOLVED); - if(test->flags & TESTF_ALLOW_COOKIE) { - SET_OPTIONAL(INTERNET_STATUS_COOKIE_SENT); - SET_OPTIONAL(INTERNET_STATUS_COOKIE_RECEIVED); - } + SET_OPTIONAL(INTERNET_STATUS_COOKIE_SENT); + SET_OPTIONAL(INTERNET_STATUS_COOKIE_RECEIVED); if (first_connection_to_test_url) { SET_EXPECT(INTERNET_STATUS_RESOLVING_NAME); @@ -456,10 +453,8 @@ static void InternetReadFile_test(int flags, const test_data_t *test) } HeapFree(GetProcessHeap(), 0, post_data); - if(test->flags & TESTF_ALLOW_COOKIE) { - CLEAR_NOTIFIED(INTERNET_STATUS_COOKIE_SENT); - CLEAR_NOTIFIED(INTERNET_STATUS_COOKIE_RECEIVED); - } + CLEAR_NOTIFIED(INTERNET_STATUS_COOKIE_SENT); + CLEAR_NOTIFIED(INTERNET_STATUS_COOKIE_RECEIVED); if (first_connection_to_test_url) { if (! proxy_active()) @@ -766,7 +761,7 @@ static void InternetReadFileExA_test(int flags) SET_EXPECT(INTERNET_STATUS_RESOLVING_NAME); SET_EXPECT(INTERNET_STATUS_NAME_RESOLVED); } - SET_OPTIONAL(INTERNET_STATUS_COOKIE_SENT); + SET_OPTIONAL2(INTERNET_STATUS_COOKIE_SENT, 2); SET_EXPECT(INTERNET_STATUS_CONNECTING_TO_SERVER); SET_EXPECT(INTERNET_STATUS_CONNECTED_TO_SERVER); SET_EXPECT2(INTERNET_STATUS_SENDING_REQUEST, 2); @@ -851,7 +846,7 @@ static void InternetReadFileExA_test(int flags) SET_EXPECT(INTERNET_STATUS_RESPONSE_RECEIVED); rc = InternetReadFileEx(hor, &inetbuffers, 0, 0xdeadcafe); ok(rc, "InternetReadFileEx failed with error %u\n", GetLastError()); - trace("read %i bytes\n", inetbuffers.dwBufferLength); + trace("read %i bytes\n", inetbuffers.dwBufferLength); todo_wine { CHECK_NOT_NOTIFIED(INTERNET_STATUS_RECEIVING_RESPONSE);

1 0

Alexandre Julliard : urlmon/tests: Fix a test failure on COOKIE_SENT status .
by Alexandre Julliard 03 May '12

03 May '12

Module: wine Branch: master Commit: 2ded2fe7ad41dfa0346c296db90801104dd8207a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ded2fe7ad41dfa0346c296db… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 3 10:23:19 2012 +0200 urlmon/tests: Fix a test failure on COOKIE_SENT status. --- dlls/urlmon/tests/url.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index c8c2a63..69a2716 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -1475,7 +1475,8 @@ static void test_WinInetHttpInfo(IWinInetHttpInfo *http_info, DWORD progress) size = sizeof(DWORD); hres = IWinInetHttpInfo_QueryInfo(http_info, HTTP_QUERY_STATUS_CODE|HTTP_QUERY_FLAG_NUMBER, &status, &size, NULL, NULL); - ok(hres == expect, "hres = %x, expected %x\n", hres, expect); + ok(hres == expect || (progress == BINDSTATUS_COOKIE_SENT && hres == S_FALSE), + "hres = %x, expected %x\n", hres, expect); if(hres == S_OK) { if(download_state==BEFORE_DOWNLOAD && progress!=BINDSTATUS_MIMETYPEAVAILABLE) ok(status == 0, "status = %d\n", status);

1 0