November 2009 - Wine-commits

Maarten Lankhorst : include: Add propkeydef header.
by Alexandre Julliard 12 Nov '09

12 Nov '09

Module: wine Branch: master Commit: 201d3ce33f5523cd962d5f5ec3a7f8c784b8f17f URL: http://source.winehq.org/git/wine.git/?a=commit;h=201d3ce33f5523cd962d5f5ec… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Nov 12 13:45:05 2009 +0100 include: Add propkeydef header. --- include/Makefile.in | 1 + include/propkeydef.h | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+), 0 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index bf3c549..827d25e 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -388,6 +388,7 @@ SRCDIR_INCLUDES = \ poppack.h \ powrprof.h \ profinfo.h \ + propkeydef.h \ propvarutil.h \ prsht.h \ psapi.h \ diff --git a/include/propkeydef.h b/include/propkeydef.h new file mode 100644 index 0000000..8507ddb --- /dev/null +++ b/include/propkeydef.h @@ -0,0 +1,66 @@ +/* + * Copyright (C) 2009 Maarten Lankhorst + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef PID_FIRST_USABLE +#define PID_FIRST_USABLE 2 +#endif + +#ifndef REFPROPERTYKEY +#ifdef __cplusplus +#define REFPROPERTYKEY const PROPERTYKEY & +#else /*!__cplusplus*/ +#define REFPROPERTYKEY const PROPERTYKEY * __MIDL_CONST +#endif +#endif + +#undef DEFINE_PROPERTYKEY + +#ifdef INITGUID +#ifdef __cplusplus +#define DEFINE_PROPERTYKEY(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8, pid) \ + EXTERN_C const PROPERTYKEY name DECLSPEC_HIDDEN DECLSPEC_ANY; \ + EXTERN_C const PROPERTYKEY name = \ + { { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } }, pid } +#else +#define DEFINE_PROPERTYKEY(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8, pid) \ + const PROPERTYKEY name DECLSPEC_HIDDEN DECLSPEC_ANY; \ + const PROPERTYKEY name = \ + { { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } }, pid } +#endif +#else +#define DEFINE_PROPERTYKEY(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8, pid) \ + EXTERN_C const PROPERTYKEY name DECLSPEC_HIDDEN DECLSPEC_ANY +#endif + +#ifndef IsEqualPropertyKey +#define IsEqualPropertyKey(a,b) (((a).pid == (b).pid) && IsEqualIID((a).fmtid,(b).fmtid)) +#endif + +#ifndef _PROPERTYKEY_EQUALITY_OPERATORS_ +#define _PROPERTYKEY_EQUALITY_OPERATORS_ +#ifdef __cplusplus +inline bool operator==(REFPROPERTYKEY guidOne, REFPROPERTYKEY guidOther) +{ + return IsEqualPropertyKey(guidOne, guidTwo); +} +inline bool operator!=(REFPROPERTYKEY guidOne, REFPROPERTYKEY guidOther) +{ + return !(guidOne == guidOther); +} +#endif +#endif

1 0

Vincent Povirk : winex11.drv: Allow windows in a virtual desktop to have X focus.
by Alexandre Julliard 12 Nov '09

12 Nov '09

Module: wine Branch: master Commit: 05f00f4ed86697d6e0eb45e5157b867db08c75dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=05f00f4ed86697d6e0eb45e51… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Nov 11 13:29:58 2009 -0600 winex11.drv: Allow windows in a virtual desktop to have X focus. --- dlls/winex11.drv/window.c | 13 +++++-------- 1 files changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 4bbd5de..5df7df2 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2025,14 +2025,11 @@ void CDECL X11DRV_SetFocus( HWND hwnd ) wine_tsx11_lock(); changes.stack_mode = Above; XConfigureWindow( display, data->whole_window, CWStackMode, &changes ); - if (root_window == DefaultRootWindow(display)) - { - /* we must not use CurrentTime (ICCCM), so try to use last message time instead */ - /* FIXME: this is not entirely correct */ - XSetInputFocus( display, data->whole_window, RevertToParent, - /* CurrentTime */ - GetMessageTime() - EVENT_x11_time_to_win32_time(0)); - } + /* we must not use CurrentTime (ICCCM), so try to use last message time instead */ + /* FIXME: this is not entirely correct */ + XSetInputFocus( display, data->whole_window, RevertToParent, + /* CurrentTime */ + GetMessageTime() - EVENT_x11_time_to_win32_time(0)); wine_tsx11_unlock(); }

1 0

Vincent Povirk : winex11.drv: Allow explorer to focus other process windows .
by Alexandre Julliard 12 Nov '09

12 Nov '09

Module: wine Branch: master Commit: 6823f4aaf8b91b729062573e4eef94f9e29b7792 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6823f4aaf8b91b729062573e4… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Nov 11 14:37:51 2009 -0600 winex11.drv: Allow explorer to focus other process windows. When explorer gets a take focus message, it tries to focus the foreground window, but this doesn't work because set_focus can only focus windows in the current process. We have to look for the focus window in the foreground thread, not the current one, or we won't find the other process's windows. Since the other process may crash at any time, causing its windows to be destroyed, we also have to ignore the BadWindow error that will occur if that happens at a critical time. --- dlls/winex11.drv/event.c | 4 +++- dlls/winex11.drv/x11drv_main.c | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 345b675..8c23203 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -476,11 +476,13 @@ static void set_focus( Display *display, HWND hwnd, Time time ) { HWND focus; Window win; + GUITHREADINFO threadinfo; TRACE( "setting foreground window to %p\n", hwnd ); SetForegroundWindow( hwnd ); - focus = GetFocus(); + GetGUIThreadInfo(0, &threadinfo); + focus = threadinfo.hwndFocus; if (focus) focus = GetAncestor( focus, GA_ROOT ); win = X11DRV_get_whole_window(focus); diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 8299457..b97426e 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -188,7 +188,8 @@ static const char * const atom_names[NB_XATOMS - FIRST_XATOM] = */ static inline BOOL ignore_error( Display *display, XErrorEvent *event ) { - if (event->request_code == X_SetInputFocus && event->error_code == BadMatch) return TRUE; + if (event->request_code == X_SetInputFocus && + (event->error_code == BadMatch || event->error_code == BadWindow)) return TRUE; /* ignore a number of errors on gdi display caused by creating/destroying windows */ if (display == gdi_display)

1 0

Vincent Povirk : winex11.drv: Ignore FocusOut events on virtual desktop windows.
by Alexandre Julliard 12 Nov '09

12 Nov '09

Module: wine Branch: master Commit: 4622889bd5fd64122ee9bf6e80d48a99cf878b85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4622889bd5fd64122ee9bf6e8… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Nov 11 14:52:14 2009 -0600 winex11.drv: Ignore FocusOut events on virtual desktop windows. We don't want to send WM_CANCELMODE or set the foreground window to the desktop when a virtual desktop loses focus. It has its own focus independent of X. --- dlls/winex11.drv/event.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 8c23203..e8e4522 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -678,6 +678,7 @@ static void X11DRV_FocusOut( HWND hwnd, XEvent *xev ) wine_tsx11_unlock(); } if (hwnd != GetForegroundWindow()) return; + if (root_window != DefaultRootWindow(event->display)) return; SendMessageW( hwnd, WM_CANCELMODE, 0, 0 ); /* don't reset the foreground window, if the window which is

1 0

Owen Rudge : shell32: Add Unicode version of GetFileNameFromBrowse.
by Alexandre Julliard 12 Nov '09

12 Nov '09

Module: wine Branch: master Commit: e8f05eeff3c786c47bdb318f53ad714a29003917 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8f05eeff3c786c47bdb318f5… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Wed Nov 11 10:07:09 2009 -0600 shell32: Add Unicode version of GetFileNameFromBrowse. Implement GetFileNameFromBrowse as an AW function. --- dlls/shell32/shell32.spec | 2 +- dlls/shell32/shellord.c | 71 +++++++++++++++++++++++++++++++++++++++++++-- include/shlobj.h | 2 +- 3 files changed, 70 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index 546e6a5..f95690c 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -58,7 +58,7 @@ 60 stdcall -noname ExitWindowsDialog(long) 61 stdcall -noname RunFileDlg(long long long str str long) RunFileDlgAW 62 stdcall -noname PickIconDlg(long long long long) - 63 stdcall -noname GetFileNameFromBrowse(long long long long str str str) + 63 stdcall -noname GetFileNameFromBrowse(long long long long str str str) GetFileNameFromBrowseAW 64 stdcall -noname DriveType(long) 65 stdcall -noname InvalidateDriveType(long) 66 stdcall -noname IsNetDrive(long) diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index ac06e4b..fd942f7 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -167,10 +167,9 @@ DWORD WINAPI ParseFieldAW(LPCVOID src, DWORD nField, LPVOID dst, DWORD len) } /************************************************************************* - * GetFileNameFromBrowse [SHELL32.63] - * + * GetFileNameFromBrowseA [internal] */ -BOOL WINAPI GetFileNameFromBrowse( +BOOL WINAPI GetFileNameFromBrowseA( HWND hwndOwner, LPSTR lpstrFile, DWORD nMaxFile, @@ -215,6 +214,72 @@ BOOL WINAPI GetFileNameFromBrowse( } /************************************************************************* + * GetFileNameFromBrowseW [internal] + */ +BOOL WINAPI GetFileNameFromBrowseW( + HWND hwndOwner, + LPWSTR lpstrFile, + DWORD nMaxFile, + LPCWSTR lpstrInitialDir, + LPCWSTR lpstrDefExt, + LPCWSTR lpstrFilter, + LPCWSTR lpstrTitle) +{ + HMODULE hmodule; + BOOL (WINAPI *pGetOpenFileNameW)(LPOPENFILENAMEW); + OPENFILENAMEW ofn; + BOOL ret; + + TRACE("%p, %s, %d, %s, %s, %s, %s)\n", + hwndOwner, debugstr_w(lpstrFile), nMaxFile, debugstr_w(lpstrInitialDir), debugstr_w(lpstrDefExt), + debugstr_w(lpstrFilter), debugstr_w(lpstrTitle)); + + hmodule = LoadLibraryA("comdlg32.dll"); + if(!hmodule) return FALSE; + pGetOpenFileNameW = (void *)GetProcAddress(hmodule, "GetOpenFileNameW"); + if(!pGetOpenFileNameW) + { + FreeLibrary(hmodule); + return FALSE; + } + + memset(&ofn, 0, sizeof(ofn)); + + ofn.lStructSize = sizeof(ofn); + ofn.hwndOwner = hwndOwner; + ofn.lpstrFilter = lpstrFilter; + ofn.lpstrFile = lpstrFile; + ofn.nMaxFile = nMaxFile; + ofn.lpstrInitialDir = lpstrInitialDir; + ofn.lpstrTitle = lpstrTitle; + ofn.lpstrDefExt = lpstrDefExt; + ofn.Flags = OFN_EXPLORER | OFN_HIDEREADONLY | OFN_FILEMUSTEXIST; + ret = pGetOpenFileNameW(&ofn); + + FreeLibrary(hmodule); + return ret; +} + +/************************************************************************* + * GetFileNameFromBrowse [SHELL32.63] + * + */ +BOOL WINAPI GetFileNameFromBrowseAW( + HWND hwndOwner, + LPVOID lpstrFile, + DWORD nMaxFile, + LPCVOID lpstrInitialDir, + LPCVOID lpstrDefExt, + LPCVOID lpstrFilter, + LPCVOID lpstrTitle) +{ + if (SHELL_OsIsUnicode()) + return GetFileNameFromBrowseW(hwndOwner, lpstrFile, nMaxFile, lpstrInitialDir, lpstrDefExt, lpstrFilter, lpstrTitle); + + return GetFileNameFromBrowseA(hwndOwner, lpstrFile, nMaxFile, lpstrInitialDir, lpstrDefExt, lpstrFilter, lpstrTitle); +} + +/************************************************************************* * SHGetSetSettings [SHELL32.68] */ VOID WINAPI SHGetSetSettings(LPSHELLSTATE lpss, DWORD dwMask, BOOL bSet) diff --git a/include/shlobj.h b/include/shlobj.h index 15128c7..171cf3b 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -53,7 +53,7 @@ void WINAPI SHDestroyPropSheetExtArray(HPSXA); BOOL WINAPI SHFindFiles(LPCITEMIDLIST,LPCITEMIDLIST); DWORD WINAPI SHFormatDrive(HWND,UINT,UINT,UINT); void WINAPI SHFree(LPVOID); -BOOL WINAPI GetFileNameFromBrowse(HWND,LPSTR,DWORD,LPCSTR,LPCSTR,LPCSTR,LPCSTR); +BOOL WINAPI GetFileNameFromBrowse(HWND,LPWSTR,DWORD,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR); HRESULT WINAPI SHGetInstanceExplorer(IUnknown**); HRESULT WINAPI SHGetFolderPathAndSubDirA(HWND,int,HANDLE,DWORD,LPCSTR,LPSTR); HRESULT WINAPI SHGetFolderPathAndSubDirW(HWND,int,HANDLE,DWORD,LPCWSTR,LPWSTR);

1 0

Stefan Dösinger : wined3d: Create clip coords only if they are used.
by Alexandre Julliard 12 Nov '09

12 Nov '09

Module: wine Branch: master Commit: 0e77a381ea06f8a72caee54d7a8a3714c61e87c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e77a381ea06f8a72caee54d7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Nov 1 17:03:39 2009 +0100 wined3d: Create clip coords only if they are used. If GL vertex shader clipping is supported (GLSL or NVvp), we currently always calculate clipping results in the shader. They're gracefully discarded by opengl, but we need 6 constants / uniforms to calculate unused values. --- dlls/wined3d/arb_program_shader.c | 13 ++++++++++--- dlls/wined3d/glsl_shader.c | 13 ++++++++++--- dlls/wined3d/vertexshader.c | 1 + dlls/wined3d/wined3d_private.h | 3 ++- 4 files changed, 23 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 2066dda..9129758 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -648,7 +648,10 @@ static DWORD shader_generate_arb_declarations(IWineD3DBaseShader *iface, const s if(use_nv_clip(gl_info) && ctx->target_version >= NV2) { - clip_limit = gl_info->limits.clipplanes; + if(ctx->cur_vs_args->super.clip_enabled) + clip_limit = gl_info->limits.clipplanes; + else + clip_limit = 0; } else { @@ -2942,9 +2945,12 @@ static void vshader_add_footer(IWineD3DVertexShaderImpl *This, struct wined3d_sh if(use_nv_clip(gl_info) && priv_ctx->target_version >= NV2) { - for(i = 0; i < priv_ctx->vs_clipplanes; i++) + if(args->super.clip_enabled) { - shader_addline(buffer, "DP4 result.clip[%u].x, TMP_OUT, state.clip[%u].plane;\n", i, i); + for(i = 0; i < priv_ctx->vs_clipplanes; i++) + { + shader_addline(buffer, "DP4 result.clip[%u].x, TMP_OUT, state.clip[%u].plane;\n", i, i); + } } } else if(args->boolclip.clip_texcoord) @@ -4076,6 +4082,7 @@ static struct arb_ps_compiled_shader *find_arb_pshader(IWineD3DPixelShaderImpl * static inline BOOL vs_args_equal(const struct arb_vs_compile_args *stored, const struct arb_vs_compile_args *new, const DWORD use_map, BOOL skip_int) { if((stored->super.swizzle_map & use_map) != new->super.swizzle_map) return FALSE; + if(stored->super.clip_enabled != new->super.clip_enabled) return FALSE; if(stored->super.fog_src != new->super.fog_src) return FALSE; if(stored->boolclip_compare != new->boolclip_compare) return FALSE; if(stored->ps_signature != new->ps_signature) return FALSE; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 995fbcc..11a80b2 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -855,9 +855,13 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont * The shader code only uses 0.5, 2.0, 1.0, 128 and -128 in vertex shader code, so one vec4 should be enough * (Unfortunately the Nvidia driver doesn't store 128 and -128 in one float). * - * Writing gl_ClipPos requires one uniform for each clipplane as well. + * Writing gl_ClipVertex requires one uniform for each clipplane as well. */ - max_constantsF = gl_info->limits.glsl_vs_float_constants - 3 - gl_info->limits.clipplanes; + max_constantsF = gl_info->limits.glsl_vs_float_constants - 3; + if(ctx_priv->cur_vs_args->clip_enabled) + { + max_constantsF -= gl_info->limits.clipplanes; + } max_constantsF -= count_bits(This->baseShader.reg_maps.integer_constants); /* Strictly speaking a bool only uses one scalar, but the nvidia(Linux) compiler doesn't pack them properly, * so each scalar requires a full vec4. We could work around this by packing the booleans ourselves, but @@ -3874,7 +3878,9 @@ static GLuint shader_glsl_generate_vshader(const struct wined3d_context *context */ shader_addline(buffer, "gl_Position.y = gl_Position.y * posFixup.y;\n"); shader_addline(buffer, "gl_Position.xy += posFixup.zw * gl_Position.ww;\n"); - shader_addline(buffer, "gl_ClipVertex = gl_Position;\n"); + if(args->clip_enabled) { + shader_addline(buffer, "gl_ClipVertex = gl_Position;\n"); + } /* Z coord [0;1]->[-1;1] mapping, see comment in transform_projection in state.c * @@ -3966,6 +3972,7 @@ static GLhandleARB find_glsl_pshader(const struct wined3d_context *context, static inline BOOL vs_args_equal(const struct vs_compile_args *stored, const struct vs_compile_args *new, const DWORD use_map) { if((stored->swizzle_map & use_map) != new->swizzle_map) return FALSE; + if((stored->clip_enabled) != new->clip_enabled) return FALSE; return stored->fog_src == new->fog_src; } diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index 14779a5..63d8c9b 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -356,6 +356,7 @@ static const IWineD3DVertexShaderVtbl IWineD3DVertexShader_Vtbl = void find_vs_compile_args(IWineD3DVertexShaderImpl *shader, IWineD3DStateBlockImpl *stateblock, struct vs_compile_args *args) { args->fog_src = stateblock->renderState[WINED3DRS_FOGTABLEMODE] == WINED3DFOG_NONE ? VS_FOG_COORD : VS_FOG_Z; + args->clip_enabled = stateblock->renderState[WINED3DRS_CLIPPING] && stateblock->renderState[WINED3DRS_CLIPPLANEENABLE]; args->swizzle_map = ((IWineD3DDeviceImpl *)shader->baseShader.device)->strided_streams.swizzle_map; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3af2703..f423733 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -695,7 +695,8 @@ enum fog_src_type { }; struct vs_compile_args { - WORD fog_src; + BYTE fog_src; + BYTE clip_enabled; WORD swizzle_map; /* MAX_ATTRIBS, 16 */ };

1 0

Stefan Dösinger : d3d9: Abort the x8l8v8u8 test if the format is not supported.
by Alexandre Julliard 12 Nov '09

12 Nov '09

Module: wine Branch: master Commit: 7f961c0796aac64955e43a40952ef29b056f510b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f961c0796aac64955e43a409… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Nov 7 17:12:49 2009 +0100 d3d9: Abort the x8l8v8u8 test if the format is not supported. --- dlls/d3d9/tests/visual.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 55de959..b871ad7 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -4241,6 +4241,7 @@ static void x8l8v8u8_test(IDirect3DDevice9 *device) IDirect3D9_Release(d3d9); if(FAILED(hr)) { skip("No D3DFMT_X8L8V8U8 support\n"); + return; }; hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff0000, 0.0, 0);

1 0

Hans Leidekker : rpcrt4: Implement RpcBindingInqAuthInfo{, Ex}.
by Alexandre Julliard 12 Nov '09

12 Nov '09

Module: wine Branch: master Commit: 8abe95ddfad8787d9c950fa7061bdb5512f307b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8abe95ddfad8787d9c950fa70… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 12 14:45:49 2009 +0100 rpcrt4: Implement RpcBindingInqAuthInfo{, Ex}. --- dlls/rpcrt4/rpc_binding.c | 60 +++++++++++++++++++++++++++++++++++++------- 1 files changed, 50 insertions(+), 10 deletions(-) diff --git a/dlls/rpcrt4/rpc_binding.c b/dlls/rpcrt4/rpc_binding.c index 622918d..b264b9a 100644 --- a/dlls/rpcrt4/rpc_binding.c +++ b/dlls/rpcrt4/rpc_binding.c @@ -1450,9 +1450,22 @@ RpcBindingInqAuthInfoExA( RPC_BINDING_HANDLE Binding, RPC_CSTR *ServerPrincName, ULONG *AuthnSvc, RPC_AUTH_IDENTITY_HANDLE *AuthIdentity, ULONG *AuthzSvc, ULONG RpcQosVersion, RPC_SECURITY_QOS *SecurityQOS ) { - FIXME("%p %p %p %p %p %p %u %p\n", Binding, ServerPrincName, AuthnLevel, + RPC_STATUS status; + RPC_WSTR principal; + + TRACE("%p %p %p %p %p %p %u %p\n", Binding, ServerPrincName, AuthnLevel, AuthnSvc, AuthIdentity, AuthzSvc, RpcQosVersion, SecurityQOS); - return RPC_S_INVALID_BINDING; + + status = RpcBindingInqAuthInfoExW(Binding, ServerPrincName ? &principal : NULL, AuthnLevel, + AuthnSvc, AuthIdentity, AuthzSvc, RpcQosVersion, SecurityQOS); + if (status == RPC_S_OK && ServerPrincName) + { + *ServerPrincName = (RPC_CSTR)RPCRT4_strdupWtoA(principal); + RpcStringFreeW(&principal); + if (!*ServerPrincName) return ERROR_OUTOFMEMORY; + } + + return status; } /*********************************************************************** @@ -1463,9 +1476,38 @@ RpcBindingInqAuthInfoExW( RPC_BINDING_HANDLE Binding, RPC_WSTR *ServerPrincName, ULONG *AuthnSvc, RPC_AUTH_IDENTITY_HANDLE *AuthIdentity, ULONG *AuthzSvc, ULONG RpcQosVersion, RPC_SECURITY_QOS *SecurityQOS ) { - FIXME("%p %p %p %p %p %p %u %p\n", Binding, ServerPrincName, AuthnLevel, + RpcBinding *bind = Binding; + + TRACE("%p %p %p %p %p %p %u %p\n", Binding, ServerPrincName, AuthnLevel, AuthnSvc, AuthIdentity, AuthzSvc, RpcQosVersion, SecurityQOS); - return RPC_S_INVALID_BINDING; + + if (!bind->AuthInfo) return RPC_S_BINDING_HAS_NO_AUTH; + + if (SecurityQOS) + { + FIXME("QOS not implemented\n"); + return RPC_S_INVALID_BINDING; + } + + if (ServerPrincName) + { + if (bind->AuthInfo->server_principal_name) + { + *ServerPrincName = RPCRT4_strdupW(bind->AuthInfo->server_principal_name); + if (!*ServerPrincName) return ERROR_OUTOFMEMORY; + } + else *ServerPrincName = NULL; + } + if (AuthnLevel) *AuthnLevel = bind->AuthInfo->AuthnLevel; + if (AuthnSvc) *AuthnSvc = bind->AuthInfo->AuthnSvc; + if (AuthIdentity) *AuthIdentity = bind->AuthInfo->identity; + if (AuthzSvc) + { + FIXME("authorization service not implemented\n"); + *AuthzSvc = RPC_C_AUTHZ_NONE; + } + + return RPC_S_OK; } /*********************************************************************** @@ -1475,9 +1517,8 @@ RPCRTAPI RPC_STATUS RPC_ENTRY RpcBindingInqAuthInfoA( RPC_BINDING_HANDLE Binding, RPC_CSTR *ServerPrincName, ULONG *AuthnLevel, ULONG *AuthnSvc, RPC_AUTH_IDENTITY_HANDLE *AuthIdentity, ULONG *AuthzSvc ) { - FIXME("%p %p %p %p %p %p\n", Binding, ServerPrincName, AuthnLevel, - AuthnSvc, AuthIdentity, AuthzSvc); - return RPC_S_INVALID_BINDING; + return RpcBindingInqAuthInfoExA(Binding, ServerPrincName, AuthnLevel, AuthnSvc, AuthIdentity, + AuthzSvc, 0, NULL); } /*********************************************************************** @@ -1487,9 +1528,8 @@ RPCRTAPI RPC_STATUS RPC_ENTRY RpcBindingInqAuthInfoW( RPC_BINDING_HANDLE Binding, RPC_WSTR *ServerPrincName, ULONG *AuthnLevel, ULONG *AuthnSvc, RPC_AUTH_IDENTITY_HANDLE *AuthIdentity, ULONG *AuthzSvc ) { - FIXME("%p %p %p %p %p %p\n", Binding, ServerPrincName, AuthnLevel, - AuthnSvc, AuthIdentity, AuthzSvc); - return RPC_S_INVALID_BINDING; + return RpcBindingInqAuthInfoExW(Binding, ServerPrincName, AuthnLevel, AuthnSvc, AuthIdentity, + AuthzSvc, 0, NULL); } /***********************************************************************

1 0

Hans Leidekker : rpcrt4: Add tests for RpcBindingInqAuthInfo.
by Alexandre Julliard 12 Nov '09

12 Nov '09

Module: wine Branch: master Commit: 03aae9e41893a4b75cc95830e73a6c9cabcfd348 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03aae9e41893a4b75cc95830e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 12 14:46:23 2009 +0100 rpcrt4: Add tests for RpcBindingInqAuthInfo. --- dlls/rpcrt4/tests/rpc.c | 28 +++++++++++++++++++++++++++- 1 files changed, 27 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/tests/rpc.c b/dlls/rpcrt4/tests/rpc.c index 128391d..01d7392 100644 --- a/dlls/rpcrt4/tests/rpc.c +++ b/dlls/rpcrt4/tests/rpc.c @@ -208,12 +208,15 @@ static RPC_IF_HANDLE IFoo_v0_0_s_ifspec = (RPC_IF_HANDLE)& IFoo___RpcServerInter static void test_rpc_ncacn_ip_tcp(void) { RPC_STATUS status; - unsigned char *binding; + unsigned char *binding, *principal; handle_t IFoo_IfHandle; + ULONG level, authnsvc, authzsvc; + RPC_AUTH_IDENTITY_HANDLE identity; static unsigned char foo[] = "foo"; static unsigned char ncacn_ip_tcp[] = "ncacn_ip_tcp"; static unsigned char address[] = "127.0.0.1"; static unsigned char endpoint[] = "4114"; + static unsigned char spn[] = "principal"; status = RpcNetworkIsProtseqValid(foo); ok(status == RPC_S_INVALID_RPC_PROTSEQ, "return wrong\n"); @@ -265,6 +268,29 @@ todo_wine { ok(status == RPC_S_OK || broken(status == RPC_S_UNKNOWN_AUTHN_SERVICE), /* win9x */ "RpcBindingSetAuthInfo failed (%u)\n", status); + status = RpcBindingInqAuthInfo(IFoo_IfHandle, NULL, NULL, NULL, NULL, NULL); + ok(status == RPC_S_BINDING_HAS_NO_AUTH, "RpcBindingInqAuthInfo failed (%u)\n", + status); + + status = RpcBindingSetAuthInfo(IFoo_IfHandle, spn, RPC_C_AUTHN_LEVEL_PKT_PRIVACY, + RPC_C_AUTHN_WINNT, NULL, RPC_C_AUTHZ_NAME); + ok(status == RPC_S_OK, "RpcBindingSetAuthInfo failed (%u)\n", status); + + level = authnsvc = authzsvc = 0; + principal = (unsigned char *)0xdeadbeef; + identity = (RPC_AUTH_IDENTITY_HANDLE *)0xdeadbeef; + status = RpcBindingInqAuthInfo(IFoo_IfHandle, &principal, &level, &authnsvc, + &identity, &authzsvc); + + ok(status == RPC_S_OK, "RpcBindingInqAuthInfo failed (%u)\n", status); + ok(identity == NULL, "expected NULL identity\n"); + ok(principal != (unsigned char *)0xdeadbeef, "expected valid principal\n"); + ok(level == RPC_C_AUTHN_LEVEL_PKT_PRIVACY, "expected RPC_C_AUTHN_LEVEL_PKT_PRIVACY\n"); + ok(authnsvc == RPC_C_AUTHN_WINNT, "expected RPC_C_AUTHN_WINNT\n"); + todo_wine ok(authzsvc == RPC_C_AUTHZ_NAME, "expected RPC_C_AUTHZ_NAME\n"); + + RpcStringFree(&principal); + status = RpcMgmtStopServerListening(NULL); ok(status == RPC_S_OK, "RpcMgmtStopServerListening failed (%u)\n", status);

1 0

Henri Verbeet : wined3d: Report a driver version appropriate for the reported OS.
by Alexandre Julliard 12 Nov '09

12 Nov '09

Module: wine Branch: master Commit: 5487009624e00058ad643fd6fd1a83fd72b3c2ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=5487009624e00058ad643fd6f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 12 10:26:53 2009 +0100 wined3d: Report a driver version appropriate for the reported OS. --- dlls/wined3d/directx.c | 154 ++++++++++++++++++++++++++++++++++-------------- 1 files changed, 109 insertions(+), 45 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5487009624e00058ad643…

1 0