wine-commits May 2012

wine-commits@winehq.org

2 participants
737 discussions

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

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: 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

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

Henri Verbeet : wined3d: The wined3d object doesn't need a parent.
by Alexandre Julliard 03 May '12

03 May '12

Module: wine Branch: master Commit: 92671487050dfe0d377eb0248b9d458e7156e3ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=92671487050dfe0d377eb0248… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 2 21:47:57 2012 +0200 wined3d: The wined3d object doesn't need a parent. --- dlls/d3d8/d3d8_main.c | 2 +- dlls/d3d9/d3d9_main.c | 2 +- dlls/ddraw/ddraw.c | 3 +-- dlls/dxgi/factory.c | 2 +- dlls/wined3d/directx.c | 10 +--------- dlls/wined3d/wined3d.spec | 3 +-- dlls/wined3d/wined3d_main.c | 4 ++-- dlls/wined3d/wined3d_private.h | 3 +-- include/wine/wined3d.h | 3 +-- 9 files changed, 10 insertions(+), 22 deletions(-) diff --git a/dlls/d3d8/d3d8_main.c b/dlls/d3d8/d3d8_main.c index 7e7da43..46f6a5c 100644 --- a/dlls/d3d8/d3d8_main.c +++ b/dlls/d3d8/d3d8_main.c @@ -45,7 +45,7 @@ IDirect3D8* WINAPI DECLSPEC_HOTPATCH Direct3DCreate8(UINT SDKVersion) { object->IDirect3D8_iface.lpVtbl = &Direct3D8_Vtbl; object->ref = 1; - object->WineD3D = wined3d_create(8, WINED3D_LEGACY_DEPTH_BIAS, &object->IDirect3D8_iface); + object->WineD3D = wined3d_create(8, WINED3D_LEGACY_DEPTH_BIAS); TRACE("Created Direct3D object @ %p, WineObj @ %p\n", object, object->WineD3D); diff --git a/dlls/d3d9/d3d9_main.c b/dlls/d3d9/d3d9_main.c index abb98f3..6eed9b7 100644 --- a/dlls/d3d9/d3d9_main.c +++ b/dlls/d3d9/d3d9_main.c @@ -40,7 +40,7 @@ IDirect3D9* WINAPI DECLSPEC_HOTPATCH Direct3DCreate9(UINT SDKVersion) { object->ref = 1; wined3d_mutex_lock(); - object->WineD3D = wined3d_create(9, 0, object); + object->WineD3D = wined3d_create(9, 0); wined3d_mutex_unlock(); TRACE("SDKVersion = %x, Created Direct3D object @ %p, WineObj @ %p\n", SDKVersion, object, object->WineD3D); diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 4da67ef..057e6e1 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -5559,8 +5559,7 @@ HRESULT ddraw_init(struct ddraw *ddraw, enum wined3d_device_type device_type) ddraw->orig_width = GetSystemMetrics(SM_CXSCREEN); ddraw->orig_height = GetSystemMetrics(SM_CYSCREEN); - ddraw->wined3d = wined3d_create(7, WINED3D_LEGACY_DEPTH_BIAS, - &ddraw->IDirectDraw7_iface); + ddraw->wined3d = wined3d_create(7, WINED3D_LEGACY_DEPTH_BIAS); if (!ddraw->wined3d) { WARN("Failed to create a wined3d object.\n"); diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index d898c08..045baf8 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -300,7 +300,7 @@ HRESULT dxgi_factory_init(struct dxgi_factory *factory) factory->refcount = 1; EnterCriticalSection(&dxgi_cs); - factory->wined3d = wined3d_create(10, 0, factory); + factory->wined3d = wined3d_create(10, 0); if (!factory->wined3d) { LeaveCriticalSection(&dxgi_cs); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 3ae0945..9e3a86b 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -5031,13 +5031,6 @@ HRESULT CDECL wined3d_device_create(struct wined3d *wined3d, UINT adapter_idx, e return WINED3D_OK; } -void * CDECL wined3d_get_parent(const struct wined3d *wined3d) -{ - TRACE("wined3d %p.\n", wined3d); - - return wined3d->parent; -} - static void WINE_GLAPI invalid_func(const void *data) { ERR("Invalid vertex attribute function called\n"); @@ -5506,11 +5499,10 @@ const struct wined3d_parent_ops wined3d_null_parent_ops = }; /* Do not call while under the GL lock. */ -HRESULT wined3d_init(struct wined3d *wined3d, UINT version, DWORD flags, void *parent) +HRESULT wined3d_init(struct wined3d *wined3d, UINT version, DWORD flags) { wined3d->dxVersion = version; wined3d->ref = 1; - wined3d->parent = parent; wined3d->flags = flags; if (!InitAdapters(wined3d)) diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index f0821fb..679754f 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -6,7 +6,7 @@ @ cdecl wined3d_check_device_format_conversion(ptr long long long long) @ cdecl wined3d_check_device_multisample_type(ptr long long long long long ptr) @ cdecl wined3d_check_device_type(ptr long long long long long) -@ cdecl wined3d_create(long long ptr) +@ cdecl wined3d_create(long long) @ cdecl wined3d_decref(ptr) @ cdecl wined3d_enum_adapter_modes(ptr long long long ptr) @ cdecl wined3d_get_adapter_count(ptr) @@ -15,7 +15,6 @@ @ cdecl wined3d_get_adapter_mode_count(ptr long long) @ cdecl wined3d_get_adapter_monitor(ptr long) @ cdecl wined3d_get_device_caps(ptr long long ptr) -@ cdecl wined3d_get_parent(ptr) @ cdecl wined3d_incref(ptr) @ cdecl wined3d_register_software_device(ptr ptr) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index ad7a5fc..4e2226e 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -90,7 +90,7 @@ struct wined3d_settings wined3d_settings = }; /* Do not call while under the GL lock. */ -struct wined3d * CDECL wined3d_create(UINT version, DWORD flags, void *parent) +struct wined3d * CDECL wined3d_create(UINT version, DWORD flags) { struct wined3d *object; HRESULT hr; @@ -102,7 +102,7 @@ struct wined3d * CDECL wined3d_create(UINT version, DWORD flags, void *parent) return NULL; } - hr = wined3d_init(object, version, flags, parent); + hr = wined3d_init(object, version, flags); if (FAILED(hr)) { WARN("Failed to initialize wined3d object, hr %#x.\n", hr); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 94da438..976c4f4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1656,14 +1656,13 @@ void wined3d_get_draw_rect(const struct wined3d_state *state, RECT *rect) DECLSP struct wined3d { LONG ref; - void *parent; DWORD flags; UINT dxVersion; UINT adapter_count; struct wined3d_adapter adapters[1]; }; -HRESULT wined3d_init(struct wined3d *wined3d, UINT version, DWORD flags, void *parent) DECLSPEC_HIDDEN; +HRESULT wined3d_init(struct wined3d *wined3d, UINT version, DWORD flags) DECLSPEC_HIDDEN; BOOL wined3d_register_window(HWND window, struct wined3d_device *device) DECLSPEC_HIDDEN; void wined3d_unregister_window(HWND window) DECLSPEC_HIDDEN; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 9f32a8f..2006c92 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2009,7 +2009,7 @@ HRESULT __cdecl wined3d_check_device_multisample_type(const struct wined3d *wine HRESULT __cdecl wined3d_check_device_type(const struct wined3d *wined3d, UINT adapter_idx, enum wined3d_device_type device_type, enum wined3d_format_id display_format_id, enum wined3d_format_id backbuffer_format_id, BOOL windowed); -struct wined3d * __cdecl wined3d_create(UINT dxVersion, DWORD flags, void *parent); +struct wined3d * __cdecl wined3d_create(UINT version, DWORD flags); ULONG __cdecl wined3d_decref(struct wined3d *wined3d); HRESULT __cdecl wined3d_enum_adapter_modes(const struct wined3d *wined3d, UINT adapter_idx, enum wined3d_format_id format_id, UINT mode_idx, struct wined3d_display_mode *mode); @@ -2023,7 +2023,6 @@ UINT __cdecl wined3d_get_adapter_mode_count(const struct wined3d *wined3d, HMONITOR __cdecl wined3d_get_adapter_monitor(const struct wined3d *wined3d, UINT adapter_idx); HRESULT __cdecl wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapter_idx, enum wined3d_device_type device_type, WINED3DCAPS *caps); -void * __cdecl wined3d_get_parent(const struct wined3d *wined3d); ULONG __cdecl wined3d_incref(struct wined3d *wined3d); HRESULT __cdecl wined3d_register_software_device(struct wined3d *wined3d, void *init_function);

1 0

Henri Verbeet : ddraw: Get rid of the flag_info typedef.
by Alexandre Julliard 03 May '12

03 May '12

Module: wine Branch: master Commit: 5b680d60238a571404ec9a52acb8bbb529124f4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b680d60238a571404ec9a52a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 2 21:47:56 2012 +0200 ddraw: Get rid of the flag_info typedef. --- dlls/ddraw/ddraw_private.h | 6 +- dlls/ddraw/utils.c | 339 ++++++++++++++++++++++---------------------- 2 files changed, 173 insertions(+), 172 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5b680d60238a571404ec9…

1 0

Henri Verbeet : d3d9: Properly retrieve an interface pointer in d3d9_texture_3d_UnlockBox().
by Alexandre Julliard 03 May '12

03 May '12

Module: wine Branch: master Commit: 6b9f151c9e1e206949087e3435cc6064b73e95a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b9f151c9e1e206949087e343… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 2 21:47:55 2012 +0200 d3d9: Properly retrieve an interface pointer in d3d9_texture_3d_UnlockBox(). --- dlls/d3d9/texture.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index 6544edc..f453f90 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -1207,6 +1207,7 @@ static HRESULT WINAPI d3d9_texture_3d_UnlockBox(IDirect3DVolumeTexture9 *iface, { struct d3d9_texture *texture = impl_from_IDirect3DVolumeTexture9(iface); struct wined3d_resource *sub_resource; + IDirect3DVolume9Impl *volume_impl; HRESULT hr; TRACE("iface %p, level %u.\n", iface, level); @@ -1215,7 +1216,10 @@ static HRESULT WINAPI d3d9_texture_3d_UnlockBox(IDirect3DVolumeTexture9 *iface, if (!(sub_resource = wined3d_texture_get_sub_resource(texture->wined3d_texture, level))) hr = D3DERR_INVALIDCALL; else - hr = IDirect3DVolume9_UnlockBox((IDirect3DVolume9 *)wined3d_resource_get_parent(sub_resource)); + { + volume_impl = wined3d_resource_get_parent(sub_resource); + hr = IDirect3DVolume9_UnlockBox(&volume_impl->IDirect3DVolume9_iface); + } wined3d_mutex_unlock(); return hr;

1 0

Henri Verbeet : d3d9: Properly retrieve an interface pointer in d3d9_texture_3d_LockBox().
by Alexandre Julliard 03 May '12

03 May '12

Module: wine Branch: master Commit: 46a6f4c1a905191c9150b38210963b1a84bb050f URL: http://source.winehq.org/git/wine.git/?a=commit;h=46a6f4c1a905191c9150b3821… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 2 21:47:54 2012 +0200 d3d9: Properly retrieve an interface pointer in d3d9_texture_3d_LockBox(). --- dlls/d3d9/texture.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index 8f83ef7..6544edc 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -1184,6 +1184,7 @@ static HRESULT WINAPI d3d9_texture_3d_LockBox(IDirect3DVolumeTexture9 *iface, { struct d3d9_texture *texture = impl_from_IDirect3DVolumeTexture9(iface); struct wined3d_resource *sub_resource; + IDirect3DVolume9Impl *volume_impl; HRESULT hr; TRACE("iface %p, level %u, locked_box %p, box %p, flags %#x.\n", @@ -1193,8 +1194,10 @@ static HRESULT WINAPI d3d9_texture_3d_LockBox(IDirect3DVolumeTexture9 *iface, if (!(sub_resource = wined3d_texture_get_sub_resource(texture->wined3d_texture, level))) hr = D3DERR_INVALIDCALL; else - hr = IDirect3DVolume9_LockBox((IDirect3DVolume9 *)wined3d_resource_get_parent(sub_resource), - locked_box, box, flags); + { + volume_impl = wined3d_resource_get_parent(sub_resource); + hr = IDirect3DVolume9_LockBox(&volume_impl->IDirect3DVolume9_iface, locked_box, box, flags); + } wined3d_mutex_unlock(); return hr;

1 0

André Hentschel : winspool.drv: Support printer info level 8.
by Alexandre Julliard 03 May '12

03 May '12

Module: wine Branch: master Commit: c9fdc565e5753bf363943b2b1c88486334b00576 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9fdc565e5753bf363943b2b1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed May 2 19:40:09 2012 +0200 winspool.drv: Support printer info level 8. --- dlls/winspool.drv/info.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 2f09855..297cf7a 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -3992,6 +3992,10 @@ BOOL WINAPI GetPrinterW(HANDLE hPrinter, DWORD Level, LPBYTE pPrinter, } + case 8: + /* 8 is the global default printer info and 9 already gets it instead of the per-user one */ + /* still, PRINTER_INFO_8W is the same as PRINTER_INFO_9W */ + /* fall through */ case 9: { PRINTER_INFO_9W *pi9 = (PRINTER_INFO_9W *)pPrinter;

1 0

Alexandre Julliard : urlmon/tests: Allow multiple COOKIE_SENT notifications , and trace received progress messages.
by Alexandre Julliard 03 May '12

03 May '12

Module: wine Branch: master Commit: b3e5d2c1e538a4f61abe7f41e42a2c016e59f1d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3e5d2c1e538a4f61abe7f41e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 3 11:12:34 2012 +0200 urlmon/tests: Allow multiple COOKIE_SENT notifications, and trace received progress messages. --- dlls/urlmon/tests/protocol.c | 66 ++++++++++++++++++++++++++++++++++++++++- 1 files changed, 64 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index e33a407..9c864e2 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -568,8 +568,6 @@ static void call_continue(PROTOCOLDATA *protocol_data) HRESULT hres; if(state == STATE_CONNECTING) { - if(tested_protocol == HTTP_TEST || tested_protocol == HTTPS_TEST) - CLEAR_CALLED(ReportProgress_COOKIE_SENT); if(tested_protocol == HTTP_TEST || tested_protocol == HTTPS_TEST || tested_protocol == FTP_TEST) { if (http_is_first){ CLEAR_CALLED(ReportProgress_FINDINGRESOURCE); @@ -585,6 +583,8 @@ static void call_continue(PROTOCOLDATA *protocol_data) CHECK_CALLED(ReportProgress_REDIRECTING); state = test_async_req ? STATE_SENDINGREQUEST : STATE_STARTDOWNLOADING; } + else if(tested_protocol == HTTP_TEST || tested_protocol == HTTPS_TEST) + CLEAR_CALLED(ReportProgress_COOKIE_SENT); switch(state) { case STATE_SENDINGREQUEST: @@ -682,6 +682,63 @@ static HRESULT WINAPI ProtocolSink_Switch(IInternetProtocolSink *iface, PROTOCOL return S_OK; } +static const char *status_names[] = +{ + "0", + "FINDINGRESOURCE", + "CONNECTING", + "REDIRECTING", + "BEGINDOWNLOADDATA", + "DOWNLOADINGDATA", + "ENDDOWNLOADDATA", + "BEGINDOWNLOADCOMPONENTS", + "INSTALLINGCOMPONENTS", + "ENDDOWNLOADCOMPONENTS", + "USINGCACHEDCOPY", + "SENDINGREQUEST", + "CLASSIDAVAILABLE", + "MIMETYPEAVAILABLE", + "CACHEFILENAMEAVAILABLE", + "BEGINSYNCOPERATION", + "ENDSYNCOPERATION", + "BEGINUPLOADDATA", + "UPLOADINGDATA", + "ENDUPLOADINGDATA", + "PROTOCOLCLASSID", + "ENCODING", + "VERIFIEDMIMETYPEAVAILABLE", + "CLASSINSTALLLOCATION", + "DECODING", + "LOADINGMIMEHANDLER", + "CONTENTDISPOSITIONATTACH", + "FILTERREPORTMIMETYPE", + "CLSIDCANINSTANTIATE", + "IUNKNOWNAVAILABLE", + "DIRECTBIND", + "RAWMIMETYPE", + "PROXYDETECTING", + "ACCEPTRANGES", + "COOKIE_SENT", + "COMPACT_POLICY_RECEIVED", + "COOKIE_SUPPRESSED", + "COOKIE_STATE_UNKNOWN", + "COOKIE_STATE_ACCEPT", + "COOKIE_STATE_REJECT", + "COOKIE_STATE_PROMPT", + "COOKIE_STATE_LEASH", + "COOKIE_STATE_DOWNGRADE", + "POLICY_HREF", + "P3P_HEADER", + "SESSION_COOKIE_RECEIVED", + "PERSISTENT_COOKIE_RECEIVED", + "SESSION_COOKIES_ALLOWED", + "CACHECONTROL", + "CONTENTDISPOSITIONFILENAME", + "MIMETEXTPLAINMISMATCH", + "PUBLISHERAVAILABLE", + "DISPLAYNAMEAVAILABLE" +}; + static HRESULT WINAPI ProtocolSink_ReportProgress(IInternetProtocolSink *iface, ULONG ulStatusCode, LPCWSTR szStatusText) { @@ -689,6 +746,11 @@ static HRESULT WINAPI ProtocolSink_ReportProgress(IInternetProtocolSink *iface, '0','0','0','0','-','0','0','0','0','-','0','0','0','0','0','0','0','0','0','0','0','0','}',0}; static const WCHAR text_plain[] = {'t','e','x','t','/','p','l','a','i','n',0}; + if (ulStatusCode < sizeof(status_names)/sizeof(status_names[0])) + trace( "progress: %s %s\n", status_names[ulStatusCode], wine_dbgstr_w(szStatusText) ); + else + trace( "progress: %u %s\n", ulStatusCode, wine_dbgstr_w(szStatusText) ); + switch(ulStatusCode) { case BINDSTATUS_MIMETYPEAVAILABLE: CHECK_EXPECT(ReportProgress_MIMETYPEAVAILABLE);

1 0

← Newer
1
...
64
65
66
67
68
69
70
...
74
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2012