wine-commits November 2010

wine-commits@winehq.org

2 participants
866 discussions

Vincent Povirk : mscoree: Implement config file parsing.
by Alexandre Julliard 11 Nov '10

11 Nov '10

Module: wine Branch: master Commit: 4ce33c69607e8f35e7ffc9c72d37d8362bf1efeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ce33c69607e8f35e7ffc9c72… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Oct 4 17:37:00 2010 -0500 mscoree: Implement config file parsing. --- dlls/mscoree/Makefile.in | 3 +- dlls/mscoree/assembly.c | 1 + dlls/mscoree/config.c | 469 ++++++++++++++++++++++++++++++++++++++++ dlls/mscoree/corruntimehost.c | 2 +- dlls/mscoree/metahost.c | 44 ++++- dlls/mscoree/mscoree_main.c | 4 + dlls/mscoree/mscoree_private.h | 15 ++ 7 files changed, 533 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4ce33c69607e8f35e7ffc…

1 0

Vincent Povirk : mscoree: Search for mono installs with the 2.0 abi.
by Alexandre Julliard 11 Nov '10

11 Nov '10

Module: wine Branch: master Commit: 4b3f30219323e4ff558dea528443092465d8568f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b3f30219323e4ff558dea528… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sun Oct 3 14:36:02 2010 -0500 mscoree: Search for mono installs with the 2.0 abi. --- dlls/mscoree/metahost.c | 24 ++++++++++++++++++++---- 1 files changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 018c1ee..35e0e32 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -66,7 +66,7 @@ static CRITICAL_SECTION_DEBUG runtime_list_cs_debug = }; static CRITICAL_SECTION runtime_list_cs = { &runtime_list_cs_debug, -1, 0, 0, 0, 0 }; -#define NUM_ABI_VERSIONS 1 +#define NUM_ABI_VERSIONS 2 static loaded_mono loaded_monos[NUM_ABI_VERSIONS]; @@ -122,8 +122,6 @@ static HRESULT load_mono(CLRRuntimeInfo *This, loaded_mono **result) if (!find_mono_dll(This->mono_path, mono_dll_path, This->mono_abi_version)) goto fail; - if (This->mono_abi_version != 1) goto fail; - (*result)->mono_handle = LoadLibraryW(mono_dll_path); if (!(*result)->mono_handle) goto fail; @@ -451,6 +449,8 @@ static BOOL find_mono_dll(LPCWSTR path, LPWSTR dll_path, int abi_version) { static const WCHAR mono_dll[] = {'\\','b','i','n','\\','m','o','n','o','.','d','l','l',0}; static const WCHAR libmono_dll[] = {'\\','b','i','n','\\','l','i','b','m','o','n','o','.','d','l','l',0}; + static const WCHAR mono2_dll[] = {'\\','b','i','n','\\','m','o','n','o','-','2','.','0','.','d','l','l',0}; + static const WCHAR libmono2_dll[] = {'\\','b','i','n','\\','l','i','b','m','o','n','o','-','2','.','0','.','d','l','l',0}; DWORD attributes=INVALID_FILE_ATTRIBUTES; if (abi_version == 1) @@ -466,6 +466,19 @@ static BOOL find_mono_dll(LPCWSTR path, LPWSTR dll_path, int abi_version) attributes = GetFileAttributesW(dll_path); } } + else if (abi_version == 2) + { + strcpyW(dll_path, path); + strcatW(dll_path, mono2_dll); + attributes = GetFileAttributesW(dll_path); + + if (attributes == INVALID_FILE_ATTRIBUTES) + { + strcpyW(dll_path, path); + strcatW(dll_path, libmono2_dll); + attributes = GetFileAttributesW(dll_path); + } + } return (attributes != INVALID_FILE_ATTRIBUTES); } @@ -514,6 +527,7 @@ static BOOL get_mono_path_from_registry(LPWSTR path, int abi_version) static BOOL get_mono_path_from_folder(LPCWSTR folder, LPWSTR mono_path, int abi_version) { static const WCHAR mono_one_dot_zero[] = {'\\','m','o','n','o','-','1','.','0', 0}; + static const WCHAR mono_two_dot_zero[] = {'\\','m','o','n','o','-','2','.','0', 0}; WCHAR mono_dll_path[MAX_PATH]; BOOL found = FALSE; @@ -521,6 +535,8 @@ static BOOL get_mono_path_from_folder(LPCWSTR folder, LPWSTR mono_path, int abi_ if (abi_version == 1) strcatW(mono_path, mono_one_dot_zero); + else if (abi_version == 2) + strcatW(mono_path, mono_two_dot_zero); found = find_mono_dll(mono_path, mono_dll_path, abi_version); @@ -593,7 +609,7 @@ static void find_runtimes(void) if (runtimes_initialized) goto end; - for (abi_version=1; abi_version>0; abi_version--) + for (abi_version=NUM_ABI_VERSIONS; abi_version>0; abi_version--) { if (!get_mono_path(mono_path, abi_version)) continue;

1 0

André Hentschel : krnl386: Mention DOSBox.
by Alexandre Julliard 11 Nov '10

11 Nov '10

Module: wine Branch: master Commit: ac816c2a82e44dff205e850743973bf97059bebd URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac816c2a82e44dff205e85074… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Nov 10 20:02:21 2010 +0100 krnl386: Mention DOSBox. --- dlls/krnl386.exe16/dosexe.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/krnl386.exe16/dosexe.c b/dlls/krnl386.exe16/dosexe.c index a3b84ea..55735f3 100644 --- a/dlls/krnl386.exe16/dosexe.c +++ b/dlls/krnl386.exe16/dosexe.c @@ -643,7 +643,8 @@ static DWORD WINAPI MZ_DOSVM( LPVOID lpExtra ) if (GetLastError() == ERROR_NOT_SUPPORTED) MESSAGE( "wine: Cannot start DOS application %s\n" - " because vm86 mode is not supported on this platform.\n", + " because vm86 mode is not supported on this platform.\n" + " Try running the application with DOSBox.\n", debugstr_a(env) ); else FIXME( "vm86 mode failed error %u\n", GetLastError() );

1 0

Eryk Wieliczko : msvcrt: Fixed (_w)fopen_s with test.
by Alexandre Julliard 11 Nov '10

11 Nov '10

Module: wine Branch: master Commit: c9bd269db11dcc7e3b0fe49135ba9d0d0a4f8eac URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9bd269db11dcc7e3b0fe4913… Author: Eryk Wieliczko <ewdevel(a)gmail.com> Date: Wed Nov 10 12:34:42 2010 +0100 msvcrt: Fixed (_w)fopen_s with test. --- dlls/msvcrt/file.c | 4 +- dlls/msvcrt/tests/file.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 93 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 329cdeb..91cd448 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -2742,7 +2742,7 @@ int CDECL MSVCRT_fopen_s(MSVCRT_FILE** pFile, const char *filename, const char *mode) { if (!MSVCRT_CHECK_PMT(pFile != NULL) || !MSVCRT_CHECK_PMT(filename != NULL) || - MSVCRT_CHECK_PMT(mode != NULL)) { + !MSVCRT_CHECK_PMT(mode != NULL)) { *MSVCRT__errno() = MSVCRT_EINVAL; return MSVCRT_EINVAL; } @@ -2769,7 +2769,7 @@ int CDECL MSVCRT__wfopen_s(MSVCRT_FILE** pFile, const MSVCRT_wchar_t *filename, const MSVCRT_wchar_t *mode) { if (!MSVCRT_CHECK_PMT(pFile != NULL) || !MSVCRT_CHECK_PMT(filename != NULL) || - MSVCRT_CHECK_PMT(mode != NULL)) { + !MSVCRT_CHECK_PMT(mode != NULL)) { *MSVCRT__errno() = MSVCRT_EINVAL; return MSVCRT_EINVAL; } diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index ef7b28d..488c219 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -36,6 +36,17 @@ static HANDLE proc_handles[2]; +static int (__cdecl *p_fopen_s)(FILE**, const char*, const char*); +static int (__cdecl *p__wfopen_s)(FILE**, const wchar_t*, const wchar_t*); + +static void init(void) +{ + HMODULE hmod = GetModuleHandleA("msvcrt.dll"); + + p_fopen_s = (void*)GetProcAddress(hmod, "fopen_s"); + p__wfopen_s = (void*)GetProcAddress(hmod, "_wfopen_s"); +} + static void test_filbuf( void ) { FILE *fp; @@ -1201,6 +1212,82 @@ static void test_fopen_fclose_fcloseall( void ) ok(_unlink(fname3) == 0, "Couldn't unlink file named '%s'\n", fname3); } +static void test_fopen_s( void ) +{ + const char name[] = "empty1"; + char buff[16]; + FILE *file; + int ret; + int len; + + if (!p_fopen_s) + { + win_skip("Skipping fopen_s test\n"); + return; + } + /* testing fopen_s */ + ret = p_fopen_s(&file, name, "w"); + ok(ret == 0, "fopen_s failed with %d\n", ret); + ok(file != 0, "fopen_s failed to return value\n"); + fwrite(name, sizeof(name), 1, file); + + ret = fclose(file); + ok(ret != EOF, "File failed to close\n"); + + file = fopen(name, "r"); + ok(file != 0, "fopen failed\n"); + len = fread(buff, 1, sizeof(name), file); + ok(len == sizeof(name), "File length supposed to be %d, not %d\n", sizeof(name), len); + buff[sizeof(name)] = '\0'; + ok(strcmp(name, buff) == 0, "File content mismatch! Got %s, expected %s\n", buff, name); + + ret = fclose(file); + ok(ret != EOF, "File failed to close\n"); + + ok(_unlink(name) == 0, "Couldn't unlink file named '%s'\n", name); +} + +static void test__wfopen_s( void ) +{ + const char name[] = "empty1"; + const WCHAR wname[] = { + 'e','m','p','t','y','1',0 + }; + const WCHAR wmode[] = { + 'w',0 + }; + char buff[16]; + FILE *file; + int ret; + int len; + + if (!p__wfopen_s) + { + win_skip("Skipping _wfopen_s test\n"); + return; + } + /* testing _wfopen_s */ + ret = p__wfopen_s(&file, wname, wmode); + ok(ret == 0, "_wfopen_s failed with %d\n", ret); + ok(file != 0, "_wfopen_s failed to return value\n"); + fwrite(name, sizeof(name), 1, file); + + ret = fclose(file); + ok(ret != EOF, "File failed to close\n"); + + file = fopen(name, "r"); + ok(file != 0, "fopen failed\n"); + len = fread(buff, 1, sizeof(name), file); + ok(len == sizeof(name), "File length supposed to be %d, not %d\n", sizeof(name), len); + buff[sizeof(name)] = '\0'; + ok(strcmp(name, buff) == 0, "File content mismatch! Got %s, expected %s\n", buff, name); + + ret = fclose(file); + ok(ret != EOF, "File failed to close\n"); + + ok(_unlink(name) == 0, "Couldn't unlink file named '%s'\n", name); +} + static void test_get_osfhandle(void) { int fd; @@ -1424,6 +1511,8 @@ START_TEST(file) int arg_c; char** arg_v; + init(); + arg_c = winetest_get_mainargs( &arg_v ); /* testing low-level I/O */ @@ -1450,6 +1539,8 @@ START_TEST(file) test_filbuf(); test_fdopen(); test_fopen_fclose_fcloseall(); + test_fopen_s(); + test__wfopen_s(); test_fileops(); test_asciimode(); test_asciimode2();

1 0

Henri Verbeet : wined3d: Remove some useless code.
by Alexandre Julliard 11 Nov '10

11 Nov '10

Module: wine Branch: master Commit: 3bbe658ef1b2a992ad44cd9503ad65889a1c6896 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bbe658ef1b2a992ad44cd950… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 11 12:39:20 2010 +0100 wined3d: Remove some useless code. --- dlls/wined3d/surface.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 394ae6d..dbac947 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1663,12 +1663,6 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_Map(IWineD3DSurface *iface, goto lock_end; } - if (This->Flags & SFLAG_INSYSMEM) { - TRACE("Local copy is up to date, not downloading data\n"); - surface_prepare_system_memory(This); /* Makes sure memory is allocated */ - goto lock_end; - } - /* surface_load_location() does not check if the rectangle specifies * the full surface. Most callers don't need that, so do it here. */ if (pRect && !pRect->top && !pRect->left

1 0

Henri Verbeet : wined3d: Simply use surface_modify_location() in IWineD3DSurfaceImpl_Map() with WINED3DLOCK_DISCARD.
by Alexandre Julliard 11 Nov '10

11 Nov '10

Module: wine Branch: master Commit: 78abb8ae07190714546ecc770680e54fcee20d66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78abb8ae07190714546ecc770… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 11 12:39:19 2010 +0100 wined3d: Simply use surface_modify_location() in IWineD3DSurfaceImpl_Map() with WINED3DLOCK_DISCARD. The call to surface_add_dirty_rect() would have taken care of evicting the other locations anyway, but we really shouldn't be touching the location flags directly. --- dlls/wined3d/surface.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index a18f067..394ae6d 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1655,11 +1655,11 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_Map(IWineD3DSurface *iface, TRACE("Warning: trying to lock unlockable surf@%p\n", This); } - if (Flags & WINED3DLOCK_DISCARD) { - /* Set SFLAG_INSYSMEM, so we'll never try to download the data from the texture. */ - TRACE("WINED3DLOCK_DISCARD flag passed, marking local copy as up to date\n"); - surface_prepare_system_memory(This); /* Makes sure memory is allocated */ - This->Flags |= SFLAG_INSYSMEM; + if (Flags & WINED3DLOCK_DISCARD) + { + TRACE("WINED3DLOCK_DISCARD flag passed, marking SYSMEM as up to date.\n"); + surface_prepare_system_memory(This); + surface_modify_location(This, SFLAG_INSYSMEM, TRUE); goto lock_end; }

1 0

Henri Verbeet : wined3d: Handle rendertargetlock_mode in surface_load_location().
by Alexandre Julliard 11 Nov '10

11 Nov '10

Module: wine Branch: master Commit: d3fd7b247b35d7c8c453afa2fc07e121ea75214b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3fd7b247b35d7c8c453afa2f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 11 12:39:18 2010 +0100 wined3d: Handle rendertargetlock_mode in surface_load_location(). --- dlls/wined3d/surface.c | 13 ++++--------- 1 files changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 428be78..a18f067 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1882,15 +1882,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_Unmap(IWineD3DSurface *iface) This->Flags |= SFLAG_INSYSMEM; } - switch(wined3d_settings.rendertargetlock_mode) { - case RTL_READTEX: - surface_load_location(This, SFLAG_INTEXTURE, NULL /* partial texture loading not supported yet */); - /* drop through */ - - case RTL_READDRAW: - surface_load_location(This, SFLAG_INDRAWABLE, fullsurface ? NULL : &This->dirtyRect); - break; - } + surface_load_location(This, SFLAG_INDRAWABLE, fullsurface ? NULL : &This->dirtyRect); if (!fullsurface) { @@ -4415,6 +4407,9 @@ HRESULT surface_load_location(IWineD3DSurfaceImpl *surface, DWORD flag, const RE } else if (flag == SFLAG_INDRAWABLE) { + if (wined3d_settings.rendertargetlock_mode == RTL_READTEX) + surface_load_location(surface, SFLAG_INTEXTURE, NULL); + if (surface->Flags & SFLAG_INTEXTURE) { RECT r;

1 0

Henri Verbeet : wined3d: Take the location into account in context_apply_fbo_state_blit().
by Alexandre Julliard 11 Nov '10

11 Nov '10

Module: wine Branch: master Commit: 1fa19d8e4203f920eb29b8a4fb79d32917ce221a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fa19d8e4203f920eb29b8a4f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 11 12:39:17 2010 +0100 wined3d: Take the location into account in context_apply_fbo_state_blit(). --- dlls/wined3d/context.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index b615a76..32df69b 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -504,7 +504,7 @@ static void context_apply_fbo_state(struct wined3d_context *context, GLenum targ void context_apply_fbo_state_blit(struct wined3d_context *context, GLenum target, IWineD3DSurfaceImpl *render_target, IWineD3DSurfaceImpl *depth_stencil, DWORD location) { - if (surface_is_offscreen(render_target)) + if (location != SFLAG_INDRAWABLE || surface_is_offscreen(render_target)) { UINT clear_size = (context->gl_info->limits.buffers - 1) * sizeof(*context->blit_targets); context->blit_targets[0] = render_target;

1 0

Jaime Rave : wined3d: Added Intel GM45 video card detection.
by Alexandre Julliard 11 Nov '10

11 Nov '10

Module: wine Branch: master Commit: 6bf3f67c018259e1c87189dcef31816023bd2e48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bf3f67c018259e1c87189dce… Author: Jaime Rave <jaimerave(a)ubuntu-co.com> Date: Wed Nov 10 00:32:33 2010 -0500 wined3d: Added Intel GM45 video card detection. --- dlls/wined3d/directx.c | 4 +++- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 4485491..d1ef660 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1114,7 +1114,8 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_INTEL, CARD_INTEL_I915G, "Intel(R) 82915G/GV/910GL Express Chipset Family", DRIVER_INTEL_GMA900, 64 }, {HW_VENDOR_INTEL, CARD_INTEL_I915GM, "Mobile Intel(R) 915GM/GMS,910GML Express Chipset Family", DRIVER_INTEL_GMA900, 64 }, {HW_VENDOR_INTEL, CARD_INTEL_I945GM, "Mobile Intel(R) 945GM Express Chipset Family", DRIVER_INTEL_GMA950, 64 }, - {HW_VENDOR_INTEL, CARD_INTEL_X3100, "Mobile Intel(R) 965 Express Chipset Family", DRIVER_INTEL_GMA3000, 128} + {HW_VENDOR_INTEL, CARD_INTEL_X3100, "Mobile Intel(R) 965 Express Chipset Family", DRIVER_INTEL_GMA3000, 128}, + {HW_VENDOR_INTEL, CARD_INTEL_GM45, "Mobile Intel(R) GM45 Express Chipset Family", DRIVER_INTEL_GMA3000, 512} }; static const struct driver_version_information *get_driver_version_info(enum wined3d_display_driver driver, @@ -1692,6 +1693,7 @@ static enum wined3d_pci_device select_card_ati_binary(const struct wined3d_gl_in static enum wined3d_pci_device select_card_intel(const struct wined3d_gl_info *gl_info, const char *gl_renderer) { + if (strstr(gl_renderer, "GM45")) return CARD_INTEL_GM45; if (strstr(gl_renderer, "X3100") || strstr(gl_renderer, "965GM")) { /* MacOS calls the card GMA X3100, otherwise known as GM965/GL960 */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8f6c96e..badd3bb 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1410,6 +1410,7 @@ enum wined3d_pci_device CARD_INTEL_I915GM = 0x2592, CARD_INTEL_I945GM = 0x27a2, /* Same as GMA 950? */ CARD_INTEL_X3100 = 0x2a02, /* Found in Macs. Same as GM965/GL960 */ + CARD_INTEL_GM45 = 0x2a42, }; struct wined3d_fbo_ops

1 0

Maarten Lankhorst : quartz: Reset state change after flushing.
by Alexandre Julliard 11 Nov '10

11 Nov '10

Module: wine Branch: master Commit: 5dd27f759701bd5b2ebf196f6dc126b6125d2f50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5dd27f759701bd5b2ebf196f6… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Nov 11 00:14:19 2010 +0100 quartz: Reset state change after flushing. This fixes IBasicVideo:GetCurrentImage. --- dlls/quartz/videorenderer.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 5fbedaf..e1cef40 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -944,8 +944,10 @@ static HRESULT WINAPI VideoRenderer_InputPin_EndFlush(IPin * iface) TRACE("(%p/%p)->()\n", This, iface); EnterCriticalSection(This->pin.pCritSec); - if (pVideoRenderer->filter.state == State_Paused) + if (pVideoRenderer->filter.state == State_Paused) { ResetEvent(pVideoRenderer->blocked); + ResetEvent(pVideoRenderer->hEvent); + } QualityControlRender_Start(&pVideoRenderer->qcimpl, pVideoRenderer->filter.rtStreamStart); hr = BaseInputPinImpl_EndFlush(iface);

1 0

← Newer
1
...
43
44
45
46
47
48
49
...
87
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 November 2010