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

Hans Leidekker : server: Include groups in file mode calculation if the security descriptor matches the current user .
by Alexandre Julliard 19 Jul '11

19 Jul '11

Module: wine Branch: master Commit: 3321c450384e56e9153e0fff32b5933a18a7a6a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3321c450384e56e9153e0fff3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jul 19 09:52:54 2011 +0200 server: Include groups in file mode calculation if the security descriptor matches the current user. --- server/file.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/server/file.c b/server/file.c index fcfd572..07dab39 100644 --- a/server/file.c +++ b/server/file.c @@ -505,15 +505,15 @@ mode_t sd_to_mode( const struct security_descriptor *sd, const SID *owner ) { denied_mode |= (mode << 6) | (mode << 3) | mode; /* all */ } - else if (security_equal_sid( sid, owner )) - { - denied_mode |= (mode << 6); /* user only */ - } else if ((security_equal_sid( user, owner ) && token_sid_present( current->process->token, sid, TRUE ))) { denied_mode |= (mode << 6) | (mode << 3); /* user + group */ } + else if (security_equal_sid( sid, owner )) + { + denied_mode |= (mode << 6); /* user only */ + } break; case ACCESS_ALLOWED_ACE_TYPE: aa_ace = (const ACCESS_ALLOWED_ACE *)ace; @@ -523,15 +523,15 @@ mode_t sd_to_mode( const struct security_descriptor *sd, const SID *owner ) { new_mode |= (mode << 6) | (mode << 3) | mode; /* all */ } - else if (security_equal_sid( sid, owner )) - { - new_mode |= (mode << 6); /* user only */ - } else if ((security_equal_sid( user, owner ) && token_sid_present( current->process->token, sid, FALSE ))) { new_mode |= (mode << 6) | (mode << 3); /* user + group */ } + else if (security_equal_sid( sid, owner )) + { + new_mode |= (mode << 6); /* user only */ + } break; } }

1 0

Hans Leidekker : winhttp: Implement IDispatch for WinHttpRequest.
by Alexandre Julliard 19 Jul '11

19 Jul '11

Module: wine Branch: master Commit: 0daac59a357b7072f383b044e3f9c39202436b7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0daac59a357b7072f383b044e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jul 19 09:53:22 2011 +0200 winhttp: Implement IDispatch for WinHttpRequest. --- dlls/winhttp/Makefile.in | 2 +- dlls/winhttp/request.c | 95 ++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 88 insertions(+), 9 deletions(-) diff --git a/dlls/winhttp/Makefile.in b/dlls/winhttp/Makefile.in index 8cc2343..090c4ca 100644 --- a/dlls/winhttp/Makefile.in +++ b/dlls/winhttp/Makefile.in @@ -1,7 +1,7 @@ MODULE = winhttp.dll IMPORTLIB = winhttp IMPORTS = uuid shlwapi -DELAYIMPORTS = crypt32 advapi32 +DELAYIMPORTS = oleaut32 crypt32 advapi32 EXTRALIBS = @SOCKETLIBS@ C_SRCS = \ diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index d36c657..c936fdd 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2196,8 +2196,59 @@ static HRESULT WINAPI winhttp_request_GetTypeInfoCount( IWinHttpRequest *iface, UINT *count ) { - FIXME("\n"); - return E_NOTIMPL; + struct winhttp_request *request = impl_from_IWinHttpRequest( iface ); + + TRACE("%p, %p\n", request, count); + *count = 1; + return S_OK; +} + +enum type_id +{ + IWinHttpRequest_tid, + last_tid +}; + +static ITypeLib *winhttp_typelib; +static ITypeInfo *winhttp_typeinfo[last_tid]; + +static REFIID winhttp_tid_id[] = +{ + &IID_IWinHttpRequest +}; + +static HRESULT get_typeinfo( enum type_id tid, ITypeInfo **ret ) +{ + HRESULT hr; + + if (!winhttp_typelib) + { + ITypeLib *typelib; + + hr = LoadRegTypeLib( &LIBID_WinHttp, 5, 1, LOCALE_SYSTEM_DEFAULT, &typelib ); + if (FAILED(hr)) + { + ERR("LoadRegTypeLib failed: %08x\n", hr); + return hr; + } + if (InterlockedCompareExchangePointer( (void **)&winhttp_typelib, typelib, NULL )) + ITypeLib_Release( typelib ); + } + if (!winhttp_typeinfo[tid]) + { + ITypeInfo *typeinfo; + + hr = ITypeLib_GetTypeInfoOfGuid( winhttp_typelib, winhttp_tid_id[tid], &typeinfo ); + if (FAILED(hr)) + { + ERR("GetTypeInfoOfGuid(%s) failed: %08x\n", debugstr_guid(winhttp_tid_id[tid]), hr); + return hr; + } + if (InterlockedCompareExchangePointer( (void **)(winhttp_typeinfo + tid), typeinfo, NULL )) + ITypeInfo_Release( typeinfo ); + } + *ret = winhttp_typeinfo[tid]; + return S_OK; } static HRESULT WINAPI winhttp_request_GetTypeInfo( @@ -2206,8 +2257,10 @@ static HRESULT WINAPI winhttp_request_GetTypeInfo( LCID lcid, ITypeInfo **info ) { - FIXME("\n"); - return E_NOTIMPL; + struct winhttp_request *request = impl_from_IWinHttpRequest( iface ); + TRACE("%p, %u, %u, %p\n", request, index, lcid, info); + + return get_typeinfo( IWinHttpRequest_tid, info ); } static HRESULT WINAPI winhttp_request_GetIDsOfNames( @@ -2218,8 +2271,21 @@ static HRESULT WINAPI winhttp_request_GetIDsOfNames( LCID lcid, DISPID *dispid ) { - FIXME("\n"); - return E_NOTIMPL; + struct winhttp_request *request = impl_from_IWinHttpRequest( iface ); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("%p, %s, %p, %u, %u, %p\n", request, debugstr_guid(riid), names, count, lcid, dispid); + + if (!names || !count || !dispid) return E_INVALIDARG; + + hr = get_typeinfo( IWinHttpRequest_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames( typeinfo, names, count, dispid ); + ITypeInfo_Release( typeinfo ); + } + return hr; } static HRESULT WINAPI winhttp_request_Invoke( @@ -2233,8 +2299,21 @@ static HRESULT WINAPI winhttp_request_Invoke( EXCEPINFO *excep_info, UINT *arg_err ) { - FIXME("\n"); - return E_NOTIMPL; + struct winhttp_request *request = impl_from_IWinHttpRequest( iface ); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("%p, %d, %s, %d, %d, %p, %p, %p, %p\n", request, member, debugstr_guid(riid), + lcid, flags, params, result, excep_info, arg_err); + + hr = get_typeinfo( IWinHttpRequest_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke( typeinfo, &request->IWinHttpRequest_iface, member, flags, + params, result, excep_info, arg_err ); + ITypeInfo_Release( typeinfo ); + } + return hr; } static HRESULT WINAPI winhttp_request_SetProxy(

1 0

Henri Verbeet : ddraw: Just use SetWindowPos() in ddraw_set_display_mode().
by Alexandre Julliard 19 Jul '11

19 Jul '11

Module: wine Branch: master Commit: 04d541c26d4f50af2bf306dc11943bd12b26f233 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04d541c26d4f50af2bf306dc1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 19 12:56:11 2011 +0200 ddraw: Just use SetWindowPos() in ddraw_set_display_mode(). Instead of going through wined3d_device_restore_fullscreen_window() / wined3d_device_setup_fullscreen_window(). The main point of those functions is changing the window styles, but we don't actually need that here. More importantly, we filter the messages generated by those functions in wined3d, while tests show that messages generated by SetDisplayMode() / RestoreDisplayMode() are visible to the application. Applications depend on WM_SIZE in particular. --- dlls/ddraw/ddraw.c | 9 +++------ dlls/ddraw/tests/d3d.c | 48 +++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 48 insertions(+), 9 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index bde3703..5c80113 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -910,15 +910,12 @@ static HRESULT ddraw_set_display_mode(IDirectDrawImpl *ddraw, DWORD Width, DWORD * or some drawing is in progress */ + if (ddraw->cooperative_level & DDSCL_EXCLUSIVE) + SetWindowPos(ddraw->dest_window, HWND_TOP, 0, 0, Width, Height, SWP_SHOWWINDOW | SWP_NOACTIVATE); + /* TODO: Lose the primary surface */ hr = wined3d_device_set_display_mode(ddraw->wined3d_device, 0, &Mode); - if (ddraw->cooperative_level & DDSCL_EXCLUSIVE) - { - wined3d_device_restore_fullscreen_window(ddraw->wined3d_device, ddraw->dest_window); - wined3d_device_setup_fullscreen_window(ddraw->wined3d_device, ddraw->dest_window, Width, Height); - } - LeaveCriticalSection(&ddraw_cs); switch(hr) { diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 19a7961..ba81a63 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -4150,10 +4150,26 @@ static void test_coop_level_mode_set(void) { RECT fullscreen_rect, r, s; IDirectDraw7 *ddraw7; + WNDCLASSA wc = {0}; HWND window; HRESULT hr; ULONG ref; + static const UINT exclusive_messages[] = + { + WM_WINDOWPOSCHANGING, + WM_WINDOWPOSCHANGED, + WM_SIZE, + WM_DISPLAYCHANGE, + 0, + }; + + static const UINT normal_messages[] = + { + WM_DISPLAYCHANGE, + 0, + }; + hr = pDirectDrawCreateEx(NULL, (void **)&ddraw7, &IID_IDirectDraw7, NULL); if (FAILED(hr)) { @@ -4161,7 +4177,11 @@ static void test_coop_level_mode_set(void) return; } - window = CreateWindowA("static", "d3d7_test", WS_OVERLAPPEDWINDOW, + wc.lpfnWndProc = test_proc; + wc.lpszClassName = "d3d7_test_wndproc_wc"; + ok(RegisterClassA(&wc), "Failed to register window class.\n"); + + window = CreateWindowA("d3d7_test_wndproc_wc", "d3d7_test", WS_OVERLAPPEDWINDOW, 0, 0, 100, 100, 0, 0, 0, 0); SetRect(&fullscreen_rect, 0, 0, GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN)); @@ -4172,8 +4192,7 @@ static void test_coop_level_mode_set(void) if (FAILED(hr)) { IDirectDraw7_Release(ddraw7); - DestroyWindow(window); - return; + goto done; } GetWindowRect(window, &r); @@ -4181,17 +4200,27 @@ static void test_coop_level_mode_set(void) fullscreen_rect.left, fullscreen_rect.top, fullscreen_rect.right, fullscreen_rect.bottom, r.left, r.top, r.right, r.bottom); + expect_messages = exclusive_messages; + hr = IDirectDraw7_SetDisplayMode(ddraw7, 640, 480, 32, 0, 0); ok(SUCCEEDED(hr), "SetDipslayMode failed, hr %#x.\n", hr); + ok(!*expect_messages, "Expected message %#x, but didn't receive it.\n", *expect_messages); + expect_messages = NULL; + GetWindowRect(window, &r); ok(EqualRect(&r, &s), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", s.left, s.top, s.right, s.bottom, r.left, r.top, r.right, r.bottom); + expect_messages = exclusive_messages; + hr = IDirectDraw_RestoreDisplayMode(ddraw7); ok(SUCCEEDED(hr), "RestoreDisplayMode failed, hr %#x.\n", hr); + ok(!*expect_messages, "Expected message %#x, but didn't receive it.\n", *expect_messages); + expect_messages = NULL; + GetWindowRect(window, &r); ok(EqualRect(&r, &fullscreen_rect), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", fullscreen_rect.left, fullscreen_rect.top, fullscreen_rect.right, fullscreen_rect.bottom, @@ -4204,17 +4233,27 @@ static void test_coop_level_mode_set(void) fullscreen_rect.left, fullscreen_rect.top, fullscreen_rect.right, fullscreen_rect.bottom, r.left, r.top, r.right, r.bottom); + expect_messages = normal_messages; + hr = IDirectDraw7_SetDisplayMode(ddraw7, 640, 480, 32, 0, 0); ok(SUCCEEDED(hr), "SetDipslayMode failed, hr %#x.\n", hr); + ok(!*expect_messages, "Expected message %#x, but didn't receive it.\n", *expect_messages); + expect_messages = NULL; + GetWindowRect(window, &r); ok(EqualRect(&r, &fullscreen_rect), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", fullscreen_rect.left, fullscreen_rect.top, fullscreen_rect.right, fullscreen_rect.bottom, r.left, r.top, r.right, r.bottom); + expect_messages = normal_messages; + hr = IDirectDraw_RestoreDisplayMode(ddraw7); ok(SUCCEEDED(hr), "RestoreDisplayMode failed, hr %#x.\n", hr); + ok(!*expect_messages, "Expected message %#x, but didn't receive it.\n", *expect_messages); + expect_messages = NULL; + GetWindowRect(window, &r); ok(EqualRect(&r, &fullscreen_rect), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", fullscreen_rect.left, fullscreen_rect.top, fullscreen_rect.right, fullscreen_rect.bottom, @@ -4228,7 +4267,10 @@ static void test_coop_level_mode_set(void) fullscreen_rect.left, fullscreen_rect.top, fullscreen_rect.right, fullscreen_rect.bottom, r.left, r.top, r.right, r.bottom); +done: + expect_messages = NULL; DestroyWindow(window); + UnregisterClassA("d3d7_test_wndproc_wc", GetModuleHandleA(NULL)); } START_TEST(d3d)

1 0

Henri Verbeet : wined3d: Make the surface parameter to ffp_blit_p8_upload_palette() const.
by Alexandre Julliard 19 Jul '11

19 Jul '11

Module: wine Branch: master Commit: c5f8a33a86af8ece1966e2e4727a459eae5505ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5f8a33a86af8ece1966e2e47… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 19 12:56:12 2011 +0200 wined3d: Make the surface parameter to ffp_blit_p8_upload_palette() const. --- dlls/wined3d/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 7b10ec8..77d13df 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -6280,7 +6280,7 @@ static void ffp_blit_free(struct wined3d_device *device) { } /* This function is used in case of 8bit paletted textures using GL_EXT_paletted_texture */ /* Context activation is done by the caller. */ -static void ffp_blit_p8_upload_palette(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info) +static void ffp_blit_p8_upload_palette(const struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info) { BYTE table[256][4]; BOOL colorkey_active = (surface->CKeyFlags & WINEDDSD_CKSRCBLT) ? TRUE : FALSE;

1 0

Alexandre Julliard : winex11: Create a new message window every time we change clipping to avoid stale notifications .
by Alexandre Julliard 19 Jul '11

19 Jul '11

Module: wine Branch: master Commit: dc801b9831f990c5b9e61da93c258404820b2b38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc801b9831f990c5b9e61da93… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 18 21:19:55 2011 +0200 winex11: Create a new message window every time we change clipping to avoid stale notifications. --- dlls/winex11.drv/mouse.c | 52 +++++++++++++-------------------------------- 1 files changed, 15 insertions(+), 37 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 980552d..d70f152 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -359,27 +359,6 @@ static void disable_xinput2(void) #endif } -/*********************************************************************** - * create_clipping_msg_window - */ -static HWND create_clipping_msg_window(void) -{ - static const WCHAR class_name[] = {'_','_','x','1','1','d','r','v','_','c','l','i','p','_','c','l','a','s','s',0}; - static ATOM clip_class; - - if (!clip_class) - { - WNDCLASSW class; - ATOM atom; - - memset( &class, 0, sizeof(class) ); - class.lpfnWndProc = DefWindowProcW; - class.hInstance = GetModuleHandleW(0); - class.lpszClassName = class_name; - if ((atom = RegisterClassW( &class ))) clip_class = atom; - } - return CreateWindowW( class_name, NULL, 0, 0, 0, 0, 0, HWND_MESSAGE, 0, GetModuleHandleW(0), NULL ); -} /*********************************************************************** * grab_clipping_window @@ -388,6 +367,7 @@ static HWND create_clipping_msg_window(void) */ static BOOL grab_clipping_window( const RECT *clip, BOOL only_with_xinput ) { + static const WCHAR messageW[] = {'M','e','s','s','a','g','e',0}; struct x11drv_thread_data *data = x11drv_thread_data(); Window clip_window; HWND msg_hwnd = 0; @@ -395,19 +375,19 @@ static BOOL grab_clipping_window( const RECT *clip, BOOL only_with_xinput ) if (!data) return FALSE; if (!(clip_window = init_clip_window())) return TRUE; - /* create a clip message window unless we are already clipping */ - if (!data->clip_hwnd) - { - if (!(msg_hwnd = create_clipping_msg_window())) return TRUE; - enable_xinput2(); - } + if (!(msg_hwnd = CreateWindowW( messageW, NULL, 0, 0, 0, 0, 0, HWND_MESSAGE, 0, + GetModuleHandleW(0), NULL ))) + return TRUE; + + /* enable XInput2 unless we are already clipping */ + if (!data->clip_hwnd) enable_xinput2(); /* don't clip to 1x1 rectangle if we don't have XInput */ if (clip->right - clip->left == 1 && clip->bottom - clip->top == 1) only_with_xinput = TRUE; if (only_with_xinput && data->xi2_state != xi_enabled) { WARN( "XInput2 not supported, refusing to clip to %s\n", wine_dbgstr_rect(clip) ); - if (msg_hwnd) DestroyWindow( msg_hwnd ); + DestroyWindow( msg_hwnd ); ClipCursor( NULL ); return TRUE; } @@ -415,14 +395,14 @@ static BOOL grab_clipping_window( const RECT *clip, BOOL only_with_xinput ) TRACE( "clipping to %s win %lx\n", wine_dbgstr_rect(clip), clip_window ); wine_tsx11_lock(); - if (msg_hwnd) XUnmapWindow( data->display, clip_window ); + if (!data->clip_hwnd) XUnmapWindow( data->display, clip_window ); XMoveResizeWindow( data->display, clip_window, clip->left - virtual_screen_rect.left, clip->top - virtual_screen_rect.top, max( 1, clip->right - clip->left ), max( 1, clip->bottom - clip->top ) ); XMapWindow( data->display, clip_window ); /* if the rectangle is shrinking we may get a pointer warp */ - if (msg_hwnd || clip->left > clip_rect.left || clip->top > clip_rect.top || + if (!data->clip_hwnd || clip->left > clip_rect.left || clip->top > clip_rect.top || clip->right < clip_rect.right || clip->bottom < clip_rect.bottom) data->warp_serial = NextRequest( data->display ); @@ -435,16 +415,13 @@ static BOOL grab_clipping_window( const RECT *clip, BOOL only_with_xinput ) if (!clipping_cursor) { disable_xinput2(); - if (msg_hwnd) DestroyWindow( msg_hwnd ); + DestroyWindow( msg_hwnd ); return FALSE; } clip_rect = *clip; - if (msg_hwnd) - { - data->clip_hwnd = msg_hwnd; - sync_window_cursor( clip_window ); - SendMessageW( GetDesktopWindow(), WM_X11DRV_CLIP_CURSOR, 0, (LPARAM)msg_hwnd ); - } + if (!data->clip_hwnd) sync_window_cursor( clip_window ); + data->clip_hwnd = msg_hwnd; + SendMessageW( GetDesktopWindow(), WM_X11DRV_CLIP_CURSOR, 0, (LPARAM)msg_hwnd ); return TRUE; } @@ -499,6 +476,7 @@ LRESULT clip_cursor_notify( HWND hwnd, HWND new_clip_hwnd ) } else if (hwnd == data->clip_hwnd) /* this is a notification that clipping has been reset */ { + TRACE( "clip hwnd reset from %p\n", hwnd ); data->clip_hwnd = 0; data->clip_reset = GetTickCount(); disable_xinput2();

1 0

Alexandre Julliard : Revert "d3dx9_36: Improved constant table handle support."
by Alexandre Julliard 19 Jul '11

19 Jul '11

Module: wine Branch: master Commit: 5f484df06cd47772b42390692a3f18cd3167f41d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f484df06cd47772b42390692… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 18 21:45:13 2011 +0200 Revert "d3dx9_36: Improved constant table handle support." This reverts commit 48d03555a7a6931ee8ba0952ccb92c70925c6bed. It wasn't supposed to be committed. --- dlls/d3dx9_36/shader.c | 81 +++++++++++++++++++++-------------------------- 1 files changed, 36 insertions(+), 45 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 000b41d..50719b2 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -648,33 +648,6 @@ static DWORD calc_bytes(D3DXCONSTANT_DESC *desc) return 4 * desc->Elements * desc->Rows * desc->Columns; } -static ctab_constant *is_valid_constant(ID3DXConstantTableImpl *This, D3DXHANDLE parameter) -{ - UINT i; - - for (i = 0; i < This->desc.Constants; i++) - if ((ctab_constant *)parameter == &This->constants[i]) - return (ctab_constant *)parameter; - - return NULL; -} - -static ctab_constant *lookup_constant_by_name(ID3DXConstantTableImpl *This, ctab_constant *c, LPCSTR name) -{ - UINT i; - - TRACE("(%p, %p, %s)\n", This, c, name); - - if (c) - FIXME("Only top level constant supported\n"); - - for (i = 0; i < This->desc.Constants; i++) - if (!strcmp(This->constants[i].desc.Name, name)) - return &This->constants[i]; - - return NULL; -} - /*** IUnknown methods ***/ static HRESULT WINAPI ID3DXConstantTableImpl_QueryInterface(ID3DXConstantTable* iface, REFIID riid, void** ppvObject) { @@ -768,13 +741,16 @@ static HRESULT WINAPI ID3DXConstantTableImpl_GetConstantDesc(ID3DXConstantTable* return D3DERR_INVALIDCALL; /* Applications can pass the name of the constant in place of the handle */ - if (is_valid_constant(This, constant)) - constant_info = (ctab_constant *)constant; + if (!((UINT_PTR)constant >> 16)) + constant_info = &This->constants[(UINT_PTR)constant - 1]; else - constant_info = lookup_constant_by_name(This, NULL, (LPCSTR)constant); + { + D3DXHANDLE c = ID3DXConstantTable_GetConstantByName(iface, NULL, constant); + if (!c) + return D3DERR_INVALIDCALL; - if (!constant_info) - return D3DERR_INVALIDCALL; + constant_info = &This->constants[(UINT_PTR)c - 1]; + } if (desc) *desc = constant_info->desc; @@ -809,33 +785,39 @@ static D3DXHANDLE WINAPI ID3DXConstantTableImpl_GetConstant(ID3DXConstantTable* TRACE("(%p)->(%p, %d)\n", This, constant, index); - if (!constant) - { - if (index >= This->desc.Constants) - return NULL; - - return (D3DXHANDLE)&This->constants[index]; - } - else + if (constant) { - FIXME("Only top level constant supported\n"); + FIXME("Only top level constants supported\n"); return NULL; } + + if (index >= This->desc.Constants) + return NULL; + + return (D3DXHANDLE)(DWORD_PTR)(index + 1); } static D3DXHANDLE WINAPI ID3DXConstantTableImpl_GetConstantByName(ID3DXConstantTable* iface, D3DXHANDLE constant, LPCSTR name) { ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface); + UINT i; TRACE("(%p)->(%p, %s)\n", This, constant, name); if (!name) return NULL; - if (!constant || is_valid_constant(This, constant)) - return (D3DXHANDLE)lookup_constant_by_name(This, (ctab_constant *)constant, name); - else + if (constant) + { + FIXME("Only top level constants supported\n"); return NULL; + } + + for (i = 0; i < This->desc.Constants; i++) + if (!strcmp(This->constants[i].desc.Name, name)) + return (D3DXHANDLE)(DWORD_PTR)(i + 1); + + return NULL; } static D3DXHANDLE WINAPI ID3DXConstantTableImpl_GetConstantElement(ID3DXConstantTable* iface, D3DXHANDLE constant, UINT index) @@ -1235,6 +1217,13 @@ HRESULT WINAPI D3DXGetShaderConstantTableEx(CONST DWORD* byte_code, if (ctab_header->Target) TRACE("Target = %s\n", object->ctab + ctab_header->Target); + if (object->desc.Constants > 65535) + { + FIXME("Too many constants (%u)\n", object->desc.Constants); + hr = E_NOTIMPL; + goto error; + } + object->constants = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object->constants) * object->desc.Constants); if (!object->constants) @@ -1266,7 +1255,9 @@ HRESULT WINAPI D3DXGetShaderConstantTableEx(CONST DWORD* byte_code, error: - ID3DXConstantTableImpl_Release((ID3DXConstantTable *)object); + HeapFree(GetProcessHeap(), 0, object->constants); + HeapFree(GetProcessHeap(), 0, object->ctab); + HeapFree(GetProcessHeap(), 0, object); return hr; }

1 0

Louis Lenders : advapi32: SetLastError in ReadEventLog{A, W} stub to avoid applications from looping forever.
by Alexandre Julliard 19 Jul '11

19 Jul '11

Module: wine Branch: master Commit: 33e203422799916fc52a3c3e2dd8bf90dcfcae1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=33e203422799916fc52a3c3e2… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Tue Jul 19 01:21:55 2011 +0200 advapi32: SetLastError in ReadEventLog{A, W} stub to avoid applications from looping forever. --- dlls/advapi32/eventlog.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c index 2301502..2de75da 100644 --- a/dlls/advapi32/eventlog.c +++ b/dlls/advapi32/eventlog.c @@ -571,6 +571,8 @@ BOOL WINAPI ReadEventLogA( HANDLE hEventLog, DWORD dwReadFlags, DWORD dwRecordOf { FIXME("(%p,0x%08x,0x%08x,%p,0x%08x,%p,%p) stub\n", hEventLog, dwReadFlags, dwRecordOffset, lpBuffer, nNumberOfBytesToRead, pnBytesRead, pnMinNumberOfBytesNeeded); + + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -584,6 +586,8 @@ BOOL WINAPI ReadEventLogW( HANDLE hEventLog, DWORD dwReadFlags, DWORD dwRecordOf { FIXME("(%p,0x%08x,0x%08x,%p,0x%08x,%p,%p) stub\n", hEventLog, dwReadFlags, dwRecordOffset, lpBuffer, nNumberOfBytesToRead, pnBytesRead, pnMinNumberOfBytesNeeded); + + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; }

1 0

Frédéric Delanoy : cmd/tests: Add tests for recursive rmdir.
by Alexandre Julliard 19 Jul '11

19 Jul '11

Module: wine Branch: master Commit: 23cd306a7d44ac7547e31a6ac390e0c4378d5d3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=23cd306a7d44ac7547e31a6ac… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Jul 19 09:49:25 2011 +0200 cmd/tests: Add tests for recursive rmdir. --- programs/cmd/tests/test_builtins.cmd | 21 +++++++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 2 ++ 2 files changed, 23 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 982fd23..a0b243e 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -308,6 +308,27 @@ echo %ErrorLevel% if exist foo echo non-empty dir not removed rmdir foo\bar rmdir foo +rem Recursive rmdir +mkdir foo\bar\baz +rmdir /s /Q foo +if not exist foo ( + echo recursive rmdir succeeded +) else ( + rd foo\bar\baz + rd foo\bar + rd foo +) +mkdir foo\bar\baz +echo foo > foo\bar\brol +rmdir /s /Q foo +if not exist foo ( + echo recursive rmdir succeeded +) else ( + rd foo\bar\baz + del foo\bar\brol + rd foo\bar + rd foo +) echo -----------Testing Errorlevel----------- rem nt 4.0 doesn't really support a way of setting errorlevel, so this is weak diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 235d552..3ddd824 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -166,6 +166,8 @@ file not removed non-empty dir not removed 0 non-empty dir not removed +recursive rmdir succeeded +recursive rmdir succeeded -----------Testing Errorlevel----------- 1 errorlevel just right, good

1 0

Adam Martinson : msxml3: Don't include libxml/parser.h twice.
by Alexandre Julliard 18 Jul '11

18 Jul '11

Module: wine Branch: master Commit: 9a30a29db51e5d88619c737239a3b12ceb777965 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a30a29db51e5d88619c73723… Author: Adam Martinson <amartinson(a)codeweavers.com> Date: Mon Jul 18 11:15:14 2011 -0500 msxml3: Don't include libxml/parser.h twice. --- dlls/msxml3/schema.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c index 883ab07..d6b9904 100644 --- a/dlls/msxml3/schema.c +++ b/dlls/msxml3/schema.c @@ -26,7 +26,6 @@ #include <assert.h> #include <stdarg.h> #ifdef HAVE_LIBXML2 -# include <libxml/parser.h> # include <libxml/xmlerror.h> # include <libxml/tree.h> # include <libxml/xmlschemas.h>

1 0

Andrew Eikum : mmdevapi: Use a sane default if no buffer size is requested.
by Alexandre Julliard 18 Jul '11

18 Jul '11

Module: wine Branch: master Commit: 80fd691e9e8f78f978ca0537875849ac9bf60313 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80fd691e9e8f78f978ca05378… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Jul 18 11:19:30 2011 -0500 mmdevapi: Use a sane default if no buffer size is requested. --- dlls/mmdevapi/tests/render.c | 9 +++++++++ dlls/winealsa.drv/mmdevdrv.c | 2 ++ dlls/winecoreaudio.drv/mmdevdrv.c | 2 ++ dlls/wineoss.drv/mmdevdrv.c | 2 ++ 4 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index ad81709..4274e83 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -211,6 +211,15 @@ static void test_audioclient(void) hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, 0, 5000000, 0, NULL, NULL); ok(hr == E_POINTER, "Initialize with null format returns %08x\n", hr); + hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, 0, 0, 0, pwfx, NULL); + ok(hr == S_OK, "Initialize with 0 buffer size returns %08x\n", hr); + + IAudioClient_Release(ac); + + hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, + NULL, (void**)&ac); + ok(hr == S_OK, "Activation failed with %08x\n", hr); + hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, 0, 5000000, 0, pwfx, NULL); ok(hr == S_OK, "Valid Initialize returns %08x\n", hr); diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 080887a..4d92b17 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -799,6 +799,8 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, goto exit; } + if(!duration) + duration = 300000; /* 0.03s */ This->bufsize_frames = ceil((duration / 10000000.) * fmt->nSamplesPerSec); This->local_buffer = HeapAlloc(GetProcessHeap(), 0, This->bufsize_frames * fmt->nBlockAlign); diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 0f73095..fcb337d 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -862,6 +862,8 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, }else This->period_ms = MinimumPeriod / 10000; + if(!duration) + duration = 300000; /* 0.03s */ This->bufsize_frames = ceil(fmt->nSamplesPerSec * (duration / 10000000.)); if(This->dataflow == eCapture){ diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index ac684f7..0fd0364 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -819,6 +819,8 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, else This->period_us = DefaultPeriod / 10; + if(!duration) + duration = 300000; /* 0.03s */ This->bufsize_frames = ceil(fmt->nSamplesPerSec * (duration / 10000000.)); This->local_buffer = HeapAlloc(GetProcessHeap(), 0, This->bufsize_frames * fmt->nBlockAlign);

1 0