April 2012 - Wine-Commits - list.winehq.org

Henri Verbeet : ddrawex: Don' t return a pointer to the implementation in IDirectDrawFactoryImpl_QueryInterface ().
by Alexandre Julliard April 5, 2012

April 5, 2012

Module: wine Branch: master Commit: d8d89887d1c5356a2bfdd7cfe72ed439e8b624f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8d89887d1c5356a2bfdd7cfe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 4 20:37:23 2012 +0200 ddrawex: Don't return a pointer to the implementation in IDirectDrawFactoryImpl_QueryInterface(). --- dlls/ddrawex/main.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ddrawex/main.c b/dlls/ddrawex/main.c index 46c5716..568a5c6 100644 --- a/dlls/ddrawex/main.c +++ b/dlls/ddrawex/main.c @@ -168,19 +168,19 @@ static inline IDirectDrawFactoryImpl *impl_from_IDirectDrawFactory(IDirectDrawFa static HRESULT WINAPI IDirectDrawFactoryImpl_QueryInterface(IDirectDrawFactory *iface, REFIID riid, void **obj) { - IDirectDrawFactoryImpl *This = impl_from_IDirectDrawFactory(iface); - - TRACE("(%p)->(%s,%p)\n", This, debugstr_guid(riid), obj); + TRACE("(%p)->(%s,%p)\n", iface, debugstr_guid(riid), obj); if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirectDrawFactory)) { IDirectDrawFactory_AddRef(iface); - *obj = This; + *obj = iface; return S_OK; } - WARN("(%p)->(%s,%p),not found\n",This,debugstr_guid(riid),obj); + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + + *obj = NULL; return E_NOINTERFACE; }

1 0

Andrew Eikum : wineoss.drv: Prefix device names with direction indication.
by Alexandre Julliard April 5, 2012

April 5, 2012

Module: wine Branch: master Commit: 81ca5d09b6b4f488c57bc958009bd89981119385 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81ca5d09b6b4f488c57bc9580… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Apr 4 13:16:09 2012 -0500 wineoss.drv: Prefix device names with direction indication. --- dlls/wineoss.drv/mmdevdrv.c | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index d8e6468..70ea416 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -458,6 +458,9 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, GUID **guids, oss_sysinfo sysinfo; static int print_once = 0; + static const WCHAR outW[] = {'O','u','t',':',' ',0}; + static const WCHAR inW[] = {'I','n',':',' ',0}; + TRACE("%d %p %p %p %p\n", flow, ids, guids, num, def_index); mixer_fd = open("/dev/mixer", O_RDONLY, 0); @@ -536,7 +539,8 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, GUID **guids, if((flow == eCapture && (ai.caps & PCM_CAP_INPUT)) || (flow == eRender && (ai.caps & PCM_CAP_OUTPUT))){ - size_t len; + size_t len, prefix_len; + const WCHAR *prefix; dev_item = HeapAlloc(GetProcessHeap(), 0, sizeof(*dev_item)); @@ -547,6 +551,15 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, GUID **guids, (*guids)[*num] = dev_item->guid; len = MultiByteToWideChar(CP_UNIXCP, 0, ai.name, -1, NULL, 0); + if(flow == eRender){ + prefix = outW; + prefix_len = (sizeof(outW) / sizeof(*outW)) - 1; + len += prefix_len; + }else{ + prefix = inW; + prefix_len = (sizeof(inW) / sizeof(*inW)) - 1; + len += prefix_len; + } (*ids)[*num] = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); if(!(*ids)[*num]){ @@ -558,8 +571,9 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, GUID **guids, close(mixer_fd); return E_OUTOFMEMORY; } + memcpy((*ids)[*num], prefix, prefix_len * sizeof(WCHAR)); MultiByteToWideChar(CP_UNIXCP, 0, ai.name, -1, - (*ids)[*num], len); + (*ids)[*num] + prefix_len, len - prefix_len); list_add_tail(&g_devices, &dev_item->entry);

1 0

Henri Verbeet : d3dx9: Also print the format as FOURCC in get_format_info() .
by Alexandre Julliard April 5, 2012

April 5, 2012

Module: wine Branch: master Commit: f89d5d05039873c12d900cfb2a779ac95afe3414 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f89d5d05039873c12d900cfb2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 4 20:37:22 2012 +0200 d3dx9: Also print the format as FOURCC in get_format_info(). --- dlls/d3dx9_36/util.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/util.c b/dlls/d3dx9_36/util.c index 0ed315c..62ff996 100644 --- a/dlls/d3dx9_36/util.c +++ b/dlls/d3dx9_36/util.c @@ -166,8 +166,8 @@ const PixelFormatDesc *get_format_info(D3DFORMAT format) { unsigned int i = 0; while(formats[i].format != format && formats[i].format != D3DFMT_UNKNOWN) i++; - if(formats[i].format == D3DFMT_UNKNOWN) - FIXME("Unknown format %#x\n", format); + if (formats[i].format == D3DFMT_UNKNOWN) + FIXME("Unknown format %#x (as FOURCC %s).\n", format, debugstr_an((const char *)&format, 4)); return &formats[i]; }

1 0

Henri Verbeet : wined3d: Properly determine the viewport size for front buffer blits in SetupForBlit ().
by Alexandre Julliard April 5, 2012

April 5, 2012

Module: wine Branch: master Commit: baff64a27aa18dd76b17017b4977dc22aa3ebad1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=baff64a27aa18dd76b17017b4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 4 20:37:20 2012 +0200 wined3d: Properly determine the viewport size for front buffer blits in SetupForBlit(). --- dlls/wined3d/context.c | 48 ++++++++++++++++++++++++++++++++++++------------ 1 files changed, 36 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 7d16d3c..bba4112 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1638,6 +1638,26 @@ static void set_blit_dimension(UINT width, UINT height) checkGLcall("glViewport"); } +static void context_get_rt_size(const struct wined3d_context *context, SIZE *size) +{ + const struct wined3d_surface *rt = context->current_rt; + + if (rt->container.type == WINED3D_CONTAINER_SWAPCHAIN + && rt->container.u.swapchain->front_buffer == rt) + { + RECT window_size; + + GetClientRect(context->win_handle, &window_size); + size->cx = window_size.right - window_size.left; + size->cy = window_size.bottom - window_size.top; + + return; + } + + size->cx = rt->resource.width; + size->cy = rt->resource.height; +} + /***************************************************************************** * SetupForBlit * @@ -1659,21 +1679,24 @@ static void SetupForBlit(const struct wined3d_device *device, struct wined3d_con { int i; const struct wined3d_gl_info *gl_info = context->gl_info; - UINT width = context->current_rt->resource.width; - UINT height = context->current_rt->resource.height; DWORD sampler; + SIZE rt_size; TRACE("Setting up context %p for blitting\n", context); - if(context->last_was_blit) { - if(context->blit_w != width || context->blit_h != height) { + + context_get_rt_size(context, &rt_size); + + if (context->last_was_blit) + { + if (context->blit_w != rt_size.cx || context->blit_h != rt_size.cy) + { ENTER_GL(); - set_blit_dimension(width, height); + set_blit_dimension(rt_size.cx, rt_size.cy); LEAVE_GL(); - context->blit_w = width; context->blit_h = height; - /* No need to dirtify here, the states are still dirtified because they weren't - * applied since the last SetupForBlit call. Otherwise last_was_blit would not - * be set - */ + context->blit_w = rt_size.cx; + context->blit_h = rt_size.cy; + /* No need to dirtify here, the states are still dirtified because + * they weren't applied since the last SetupForBlit() call. */ } TRACE("Context is already set up for blitting, nothing to do\n"); return; @@ -1839,12 +1862,13 @@ static void SetupForBlit(const struct wined3d_device *device, struct wined3d_con glDisable(GL_CLIP_PLANE5); checkGLcall("glDisable(clip plane 5)"); context_invalidate_state(context, STATE_RENDER(WINED3D_RS_CLIPPING)); - set_blit_dimension(width, height); + set_blit_dimension(rt_size.cx, rt_size.cy); device->frag_pipe->enable_extension(FALSE); LEAVE_GL(); - context->blit_w = width; context->blit_h = height; + context->blit_w = rt_size.cx; + context->blit_h = rt_size.cy; context_invalidate_state(context, STATE_VIEWPORT); context_invalidate_state(context, STATE_TRANSFORM(WINED3D_TS_PROJECTION)); }

1 0

Hans Leidekker : kernel32/tests: Add tests for GetModuleHandleEx.
by Alexandre Julliard April 5, 2012

April 5, 2012

Module: wine Branch: master Commit: 7133c000cdedc0ab7d02970e5009ed99127a4e46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7133c000cdedc0ab7d02970e5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 5 11:15:28 2012 +0200 kernel32/tests: Add tests for GetModuleHandleEx. --- dlls/kernel32/tests/module.c | 185 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 184 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/module.c b/dlls/kernel32/tests/module.c index e86b63b..70940f5 100644 --- a/dlls/kernel32/tests/module.c +++ b/dlls/kernel32/tests/module.c @@ -23,8 +23,9 @@ static DWORD (WINAPI *pGetDllDirectoryA)(DWORD,LPSTR); static DWORD (WINAPI *pGetDllDirectoryW)(DWORD,LPWSTR); - static BOOL (WINAPI *pSetDllDirectoryA)(LPCSTR); +static BOOL (WINAPI *pGetModuleHandleExA)(DWORD,LPCSTR,HMODULE*); +static BOOL (WINAPI *pGetModuleHandleExW)(DWORD,LPCWSTR,HMODULE*); static BOOL is_unicode_enabled = TRUE; @@ -495,9 +496,190 @@ static void init_pointers(void) MAKEFUNC(GetDllDirectoryA); MAKEFUNC(GetDllDirectoryW); MAKEFUNC(SetDllDirectoryA); + MAKEFUNC(GetModuleHandleExA); + MAKEFUNC(GetModuleHandleExW); #undef MAKEFUNC } +static void testGetModuleHandleEx(void) +{ + static const WCHAR kernel32W[] = {'k','e','r','n','e','l','3','2',0}; + static const WCHAR nosuchmodW[] = {'n','o','s','u','c','h','m','o','d',0}; + BOOL ret; + DWORD error; + HMODULE mod, mod_kernel32; + + if (!pGetModuleHandleExA || !pGetModuleHandleExW) + { + win_skip( "GetModuleHandleEx not available\n" ); + return; + } + + SetLastError( 0xdeadbeef ); + ret = pGetModuleHandleExA( 0, NULL, NULL ); + error = GetLastError(); + todo_wine ok( !ret, "unexpected success\n" ); + todo_wine ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + + SetLastError( 0xdeadbeef ); + ret = pGetModuleHandleExA( 0, "kernel32", NULL ); + error = GetLastError(); + todo_wine ok( !ret, "unexpected success\n" ); + todo_wine ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + + SetLastError( 0xdeadbeef ); + mod = (HMODULE)0xdeadbeef; + ret = pGetModuleHandleExA( 0, "kernel32", &mod ); + ok( ret, "unexpected failure %u\n", GetLastError() ); + ok( mod != (HMODULE)0xdeadbeef, "got %p\n", mod ); + FreeLibrary( mod ); + + SetLastError( 0xdeadbeef ); + mod = (HMODULE)0xdeadbeef; + ret = pGetModuleHandleExA( 0, "nosuchmod", &mod ); + error = GetLastError(); + ok( !ret, "unexpected success\n" ); + ok( error == ERROR_MOD_NOT_FOUND, "got %u\n", error ); + todo_wine ok( mod == NULL, "got %p\n", mod ); + + SetLastError( 0xdeadbeef ); + ret = pGetModuleHandleExW( 0, NULL, NULL ); + error = GetLastError(); + todo_wine ok( !ret, "unexpected success\n" ); + todo_wine ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + + SetLastError( 0xdeadbeef ); + ret = pGetModuleHandleExW( 0, kernel32W, NULL ); + error = GetLastError(); + todo_wine ok( !ret, "unexpected success\n" ); + todo_wine ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + + SetLastError( 0xdeadbeef ); + mod = (HMODULE)0xdeadbeef; + ret = pGetModuleHandleExW( 0, kernel32W, &mod ); + ok( ret, "unexpected failure %u\n", GetLastError() ); + ok( mod != (HMODULE)0xdeadbeef, "got %p\n", mod ); + FreeLibrary( mod ); + + SetLastError( 0xdeadbeef ); + mod = (HMODULE)0xdeadbeef; + ret = pGetModuleHandleExW( 0, nosuchmodW, &mod ); + error = GetLastError(); + ok( !ret, "unexpected success\n" ); + ok( error == ERROR_MOD_NOT_FOUND, "got %u\n", error ); + todo_wine ok( mod == NULL, "got %p\n", mod ); + + SetLastError( 0xdeadbeef ); + ret = pGetModuleHandleExA( GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, NULL, NULL ); + error = GetLastError(); + todo_wine ok( !ret, "unexpected success\n" ); + todo_wine ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + + SetLastError( 0xdeadbeef ); + ret = pGetModuleHandleExA( GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, "kernel32", NULL ); + error = GetLastError(); + todo_wine ok( !ret, "unexpected success\n" ); + todo_wine ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + + SetLastError( 0xdeadbeef ); + mod = (HMODULE)0xdeadbeef; + ret = pGetModuleHandleExA( GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, "kernel32", &mod ); + ok( ret, "unexpected failure %u\n", GetLastError() ); + ok( mod != (HMODULE)0xdeadbeef, "got %p\n", mod ); + + SetLastError( 0xdeadbeef ); + mod = (HMODULE)0xdeadbeef; + ret = pGetModuleHandleExA( GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, "nosuchmod", &mod ); + error = GetLastError(); + ok( !ret, "unexpected success\n" ); + ok( error == ERROR_MOD_NOT_FOUND, "got %u\n", error ); + todo_wine ok( mod == NULL, "got %p\n", mod ); + + SetLastError( 0xdeadbeef ); + ret = pGetModuleHandleExW( GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, NULL, NULL ); + error = GetLastError(); + todo_wine ok( !ret, "unexpected success\n" ); + todo_wine ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + + SetLastError( 0xdeadbeef ); + ret = pGetModuleHandleExW( GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, kernel32W, NULL ); + error = GetLastError(); + todo_wine ok( !ret, "unexpected success\n" ); + todo_wine ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + + SetLastError( 0xdeadbeef ); + mod = (HMODULE)0xdeadbeef; + ret = pGetModuleHandleExW( GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, kernel32W, &mod ); + ok( ret, "unexpected failure %u\n", GetLastError() ); + ok( mod != (HMODULE)0xdeadbeef, "got %p\n", mod ); + + SetLastError( 0xdeadbeef ); + mod = (HMODULE)0xdeadbeef; + ret = pGetModuleHandleExW( GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, nosuchmodW, &mod ); + error = GetLastError(); + ok( !ret, "unexpected success\n" ); + ok( error == ERROR_MOD_NOT_FOUND, "got %u\n", error ); + todo_wine ok( mod == NULL, "got %p\n", mod ); + + mod_kernel32 = LoadLibraryA( "kernel32" ); + + SetLastError( 0xdeadbeef ); + ret = pGetModuleHandleExA( GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, NULL, NULL ); + error = GetLastError(); + todo_wine ok( !ret, "unexpected success\n" ); + todo_wine ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + + SetLastError( 0xdeadbeef ); + ret = pGetModuleHandleExA( GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (LPCSTR)mod_kernel32, NULL ); + error = GetLastError(); + todo_wine ok( !ret, "unexpected success\n" ); + todo_wine ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + + SetLastError( 0xdeadbeef ); + mod = (HMODULE)0xdeadbeef; + ret = pGetModuleHandleExA( GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (LPCSTR)mod_kernel32, &mod ); + ok( ret, "unexpected failure %u\n", GetLastError() ); + ok( mod == mod_kernel32, "got %p\n", mod ); + FreeLibrary( mod ); + + SetLastError( 0xdeadbeef ); + mod = (HMODULE)0xdeadbeef; + ret = pGetModuleHandleExA( GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (LPCSTR)0xbeefdead, &mod ); + error = GetLastError(); + ok( !ret, "unexpected success\n" ); + ok( error == ERROR_MOD_NOT_FOUND, "got %u\n", error ); + ok( mod == NULL, "got %p\n", mod ); + + SetLastError( 0xdeadbeef ); + ret = pGetModuleHandleExW( GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, NULL, NULL ); + error = GetLastError(); + todo_wine ok( !ret, "unexpected success\n" ); + todo_wine ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + + SetLastError( 0xdeadbeef ); + ret = pGetModuleHandleExW( GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (LPCWSTR)mod_kernel32, NULL ); + error = GetLastError(); + todo_wine ok( !ret, "unexpected success\n" ); + todo_wine ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + + SetLastError( 0xdeadbeef ); + mod = (HMODULE)0xdeadbeef; + ret = pGetModuleHandleExW( GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (LPCWSTR)mod_kernel32, &mod ); + ok( ret, "unexpected failure %u\n", GetLastError() ); + ok( mod == mod_kernel32, "got %p\n", mod ); + FreeLibrary( mod ); + + SetLastError( 0xdeadbeef ); + mod = (HMODULE)0xdeadbeef; + ret = pGetModuleHandleExW( GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (LPCWSTR)0xbeefdead, &mod ); + error = GetLastError(); + ok( !ret, "unexpected success\n" ); + ok( error == ERROR_MOD_NOT_FOUND, "got %u\n", error ); + ok( mod == NULL, "got %p\n", mod ); + + FreeLibrary( mod_kernel32 ); +} + START_TEST(module) { WCHAR filenameW[MAX_PATH]; @@ -525,4 +707,5 @@ START_TEST(module) testLoadLibraryA_Wrong(); testGetProcAddress_Wrong(); testLoadLibraryEx(); + testGetModuleHandleEx(); }

1 0

Hans Leidekker : kernel32: GetModuleHandleEx already clears the module handle on failure.
by Alexandre Julliard April 5, 2012

April 5, 2012

Module: wine Branch: master Commit: 31ffa5477336ca06fc24e9ef83eff396c6a718f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31ffa5477336ca06fc24e9ef8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 5 11:16:37 2012 +0200 kernel32: GetModuleHandleEx already clears the module handle on failure. --- dlls/kernel32/module.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index d4978cf..6b91a4c 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -570,7 +570,7 @@ HMODULE WINAPI DECLSPEC_HOTPATCH GetModuleHandleA(LPCSTR module) { HMODULE ret; - if (!GetModuleHandleExA( GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, module, &ret )) ret = 0; + GetModuleHandleExA( GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, module, &ret ); return ret; } @@ -583,7 +583,7 @@ HMODULE WINAPI GetModuleHandleW(LPCWSTR module) { HMODULE ret; - if (!GetModuleHandleExW( GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, module, &ret )) ret = 0; + GetModuleHandleExW( GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, module, &ret ); return ret; }

1 0

Hans Leidekker : kernel32: Clear the module handle on failure in GetModuleHandleEx.
by Alexandre Julliard April 5, 2012

April 5, 2012

Module: wine Branch: master Commit: f96c7278e72a28f96ddb535de8746f4a9780fc9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f96c7278e72a28f96ddb535de… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 5 11:16:08 2012 +0200 kernel32: Clear the module handle on failure in GetModuleHandleEx. --- dlls/kernel32/module.c | 4 +++- dlls/kernel32/tests/module.c | 8 ++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index 739392f..d4978cf 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -548,7 +548,9 @@ BOOL WINAPI GetModuleHandleExW( DWORD flags, LPCWSTR name, HMODULE *module ) !(flags & GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT)) LdrUnlockLoaderLock( 0, magic ); - *module = ret; + if (status == STATUS_SUCCESS) *module = ret; + else *module = NULL; + return (status == STATUS_SUCCESS); } diff --git a/dlls/kernel32/tests/module.c b/dlls/kernel32/tests/module.c index 30da85f..f88c8cb 100644 --- a/dlls/kernel32/tests/module.c +++ b/dlls/kernel32/tests/module.c @@ -540,7 +540,7 @@ static void testGetModuleHandleEx(void) error = GetLastError(); ok( !ret, "unexpected success\n" ); ok( error == ERROR_MOD_NOT_FOUND, "got %u\n", error ); - todo_wine ok( mod == NULL, "got %p\n", mod ); + ok( mod == NULL, "got %p\n", mod ); SetLastError( 0xdeadbeef ); ret = pGetModuleHandleExW( 0, NULL, NULL ); @@ -567,7 +567,7 @@ static void testGetModuleHandleEx(void) error = GetLastError(); ok( !ret, "unexpected success\n" ); ok( error == ERROR_MOD_NOT_FOUND, "got %u\n", error ); - todo_wine ok( mod == NULL, "got %p\n", mod ); + ok( mod == NULL, "got %p\n", mod ); SetLastError( 0xdeadbeef ); ret = pGetModuleHandleExA( GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, NULL, NULL ); @@ -593,7 +593,7 @@ static void testGetModuleHandleEx(void) error = GetLastError(); ok( !ret, "unexpected success\n" ); ok( error == ERROR_MOD_NOT_FOUND, "got %u\n", error ); - todo_wine ok( mod == NULL, "got %p\n", mod ); + ok( mod == NULL, "got %p\n", mod ); SetLastError( 0xdeadbeef ); ret = pGetModuleHandleExW( GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, NULL, NULL ); @@ -619,7 +619,7 @@ static void testGetModuleHandleEx(void) error = GetLastError(); ok( !ret, "unexpected success\n" ); ok( error == ERROR_MOD_NOT_FOUND, "got %u\n", error ); - todo_wine ok( mod == NULL, "got %p\n", mod ); + ok( mod == NULL, "got %p\n", mod ); mod_kernel32 = LoadLibraryA( "kernel32" );

1 0

Eric Pouech : winedbg: Fix set instruction when sizeof(int) <> sizeof register.
by Alexandre Julliard April 5, 2012

April 5, 2012

Module: wine Branch: master Commit: 88949b2c59f5613ff1a3964e7ce538474578d6c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88949b2c59f5613ff1a3964e7… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Wed Apr 4 22:30:38 2012 +0200 winedbg: Fix set instruction when sizeof(int) <> sizeof register. --- programs/winedbg/be_arm.c | 8 ++++++++ programs/winedbg/be_cpu.h | 2 ++ programs/winedbg/be_i386.c | 8 ++++++++ programs/winedbg/be_ppc.c | 8 ++++++++ programs/winedbg/be_sparc.c | 8 ++++++++ programs/winedbg/be_x86_64.c | 8 ++++++++ programs/winedbg/dbg.y | 2 +- programs/winedbg/debugger.h | 3 ++- programs/winedbg/memory.c | 4 ++-- programs/winedbg/types.c | 37 +++++++++++++++++++++++++++++-------- 10 files changed, 76 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=88949b2c59f5613ff1a39…

1 0

Henri Verbeet : ddrawex: Don' t return a pointer to the implementation in IDirectDrawClassFactoryImpl_QueryInterface ().
by Alexandre Julliard April 5, 2012

April 5, 2012

Module: wine Branch: master Commit: 13f483a2a24c95e21601c03ad05c8c0e4c482cdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=13f483a2a24c95e21601c03ad… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 4 20:37:24 2012 +0200 ddrawex: Don't return a pointer to the implementation in IDirectDrawClassFactoryImpl_QueryInterface(). --- dlls/ddrawex/main.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ddrawex/main.c b/dlls/ddrawex/main.c index 568a5c6..d1c0fda 100644 --- a/dlls/ddrawex/main.c +++ b/dlls/ddrawex/main.c @@ -58,19 +58,19 @@ static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) static HRESULT WINAPI IDirectDrawClassFactoryImpl_QueryInterface(IClassFactory *iface, REFIID riid, void **obj) { - IClassFactoryImpl *This = impl_from_IClassFactory(iface); - - TRACE("(%p)->(%s,%p)\n", This, debugstr_guid(riid), obj); + TRACE("(%p)->(%s,%p)\n", iface, debugstr_guid(riid), obj); if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IClassFactory)) { IClassFactory_AddRef(iface); - *obj = This; + *obj = iface; return S_OK; } - WARN("(%p)->(%s,%p),not found\n",This,debugstr_guid(riid),obj); + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + + *obj = NULL; return E_NOINTERFACE; }

1 0

Andrew Eikum : winealsa.drv: Prefix device names with direction indication.
by Alexandre Julliard April 5, 2012

April 5, 2012

Module: wine Branch: master Commit: ea231aba407dcb90ba463ba3114be8e84617e8b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea231aba407dcb90ba463ba31… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Apr 4 13:15:33 2012 -0500 winealsa.drv: Prefix device names with direction indication. --- dlls/winealsa.drv/mmdevdrv.c | 79 ++++++++++++++++++++++++++++------------- 1 files changed, 54 insertions(+), 25 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index a3ac27b..c99186b 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -339,11 +339,60 @@ static BOOL alsa_try_open(const char *devnode, snd_pcm_stream_t stream) return TRUE; } +static WCHAR *construct_device_id(EDataFlow flow, const WCHAR *chunk1, const char *chunk2) +{ + WCHAR *ret; + const WCHAR *prefix; + DWORD len_wchars = 0, chunk1_len, copied = 0, prefix_len; + + static const WCHAR dashW[] = {' ','-',' ',0}; + static const size_t dashW_len = (sizeof(dashW) / sizeof(*dashW)) - 1; + static const WCHAR outW[] = {'O','u','t',':',' ',0}; + static const WCHAR inW[] = {'I','n',':',' ',0}; + + if(flow == eRender){ + prefix = outW; + prefix_len = (sizeof(outW) / sizeof(*outW)) - 1; + len_wchars += prefix_len; + }else{ + prefix = inW; + prefix_len = (sizeof(inW) / sizeof(*inW)) - 1; + len_wchars += prefix_len; + } + if(chunk1){ + chunk1_len = strlenW(chunk1); + len_wchars += chunk1_len; + } + if(chunk1 && chunk2) + len_wchars += dashW_len; + if(chunk2) + len_wchars += MultiByteToWideChar(CP_UNIXCP, 0, chunk2, -1, NULL, 0) - 1; + len_wchars += 1; /* NULL byte */ + + ret = HeapAlloc(GetProcessHeap(), 0, len_wchars * sizeof(WCHAR)); + + memcpy(ret, prefix, prefix_len * sizeof(WCHAR)); + copied += prefix_len; + if(chunk1){ + memcpy(ret + copied, chunk1, chunk1_len * sizeof(WCHAR)); + copied += chunk1_len; + } + if(chunk1 && chunk2){ + memcpy(ret + copied, dashW, dashW_len * sizeof(WCHAR)); + copied += dashW_len; + } + if(chunk2){ + MultiByteToWideChar(CP_UNIXCP, 0, chunk2, -1, ret + copied, len_wchars - copied); + }else + ret[copied] = 0; + + return ret; +} + static HRESULT alsa_get_card_devices(EDataFlow flow, snd_pcm_stream_t stream, WCHAR **ids, GUID *guids, UINT *num, snd_ctl_t *ctl, int card, const WCHAR *cardnameW) { - static const WCHAR dashW[] = {' ','-',' ',0}; int err, device; snd_pcm_info_t *info; @@ -377,8 +426,6 @@ static HRESULT alsa_get_card_devices(EDataFlow flow, snd_pcm_stream_t stream, continue; if(ids && guids){ - DWORD len, cardlen; - devname = snd_pcm_info_get_name(info); if(!devname){ WARN("Unable to get device name for card %d, device %d\n", card, @@ -386,21 +433,7 @@ static HRESULT alsa_get_card_devices(EDataFlow flow, snd_pcm_stream_t stream, continue; } - cardlen = lstrlenW(cardnameW); - len = MultiByteToWideChar(CP_UNIXCP, 0, devname, -1, NULL, 0); - len += lstrlenW(dashW); - len += cardlen; - ids[*num] = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - if(!ids[*num]){ - HeapFree(GetProcessHeap(), 0, info); - return E_OUTOFMEMORY; - } - memcpy(ids[*num], cardnameW, cardlen * sizeof(WCHAR)); - memcpy(ids[*num] + cardlen, dashW, lstrlenW(dashW) * sizeof(WCHAR)); - cardlen += lstrlenW(dashW); - MultiByteToWideChar(CP_UNIXCP, 0, devname, -1, ids[*num] + cardlen, - len - cardlen); - + ids[*num] = construct_device_id(flow, cardnameW, devname); get_device_guid(flow, devnode, &guids[*num]); } @@ -423,7 +456,7 @@ static void get_reg_devices(EDataFlow flow, snd_pcm_stream_t stream, WCHAR **ids static const WCHAR ALSAInputDevices[] = {'A','L','S','A','I','n','p','u','t','D','e','v','i','c','e','s',0}; HKEY key; WCHAR reg_devices[256]; - DWORD size = sizeof(reg_devices), type, len; + DWORD size = sizeof(reg_devices), type; const WCHAR *value_name = (stream == SND_PCM_STREAM_PLAYBACK) ? ALSAOutputDevices : ALSAInputDevices; /* @@ Wine registry key: HKCU\Software\Wine\Drivers\winealsa.drv */ @@ -445,10 +478,7 @@ static void get_reg_devices(EDataFlow flow, snd_pcm_stream_t stream, WCHAR **ids if(alsa_try_open(devname, stream)){ if(ids && guids){ - len = lstrlenW(p) + 1; - ids[*num] = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - memcpy(ids[*num], p, len * sizeof(WCHAR)); - + ids[*num] = construct_device_id(flow, p, NULL); get_device_guid(flow, devname, &guids[*num]); } ++*num; @@ -474,8 +504,7 @@ static HRESULT alsa_enum_devices(EDataFlow flow, WCHAR **ids, GUID *guids, if(alsa_try_open(defname, stream)){ if(ids && guids){ - *ids = HeapAlloc(GetProcessHeap(), 0, sizeof(defaultW)); - memcpy(*ids, defaultW, sizeof(defaultW)); + *ids = construct_device_id(flow, defaultW, NULL); get_device_guid(flow, defname, guids); } ++*num;

1 0