wine-commits December 2005

wine-commits@winehq.org

3 participants
452 discussions

Aric Stewart : wcmd: mkdir recursive create
by Alexandre Julliard 03 Dec '05

03 Dec '05

Module: wine Branch: refs/heads/master Commit: 1d5adff0f1216f9930762c00cdb44d1e16e73836 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1d5adff0f1216f9930762c0… Author: Aric Stewart <aric(a)codeweavers.com> Date: Sat Dec 3 18:02:15 2005 +0100 wcmd: mkdir recursive create In at least both win2k and winxp mkdir from the command prompt can recursively create full directory paths. This implements that functionality. --- programs/wcmd/builtins.c | 49 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 48 insertions(+), 1 deletions(-) diff --git a/programs/wcmd/builtins.c b/programs/wcmd/builtins.c index 5652089..a47bc0a 100644 --- a/programs/wcmd/builtins.c +++ b/programs/wcmd/builtins.c @@ -150,11 +150,58 @@ char string[8], outpath[MAX_PATH], inpat * WCMD_create_dir * * Create a directory. + * + * this works recursivly. so mkdir dir1\dir2\dir3 will create dir1 and dir2 if + * they do not already exist. */ +BOOL create_full_path(CHAR* path) +{ + int len; + CHAR *new_path; + BOOL ret = TRUE; + + new_path = HeapAlloc(GetProcessHeap(),0,strlen(path)+1); + strcpy(new_path,path); + + while ((len = strlen(new_path)) && new_path[len - 1] == '\\') + new_path[len - 1] = 0; + + while (!CreateDirectory(new_path,NULL)) + { + CHAR *slash; + DWORD last_error = GetLastError(); + if (last_error == ERROR_ALREADY_EXISTS) + break; + + if (last_error != ERROR_PATH_NOT_FOUND) + { + ret = FALSE; + break; + } + + if (!(slash = strrchr(new_path,'\\')) && ! (slash = strrchr(new_path,'/'))) + { + ret = FALSE; + break; + } + + len = slash - new_path; + new_path[len] = 0; + if (!create_full_path(new_path)) + { + ret = FALSE; + break; + } + new_path[len] = '\\'; + } + HeapFree(GetProcessHeap(),0,new_path); + return ret; +} + void WCMD_create_dir (void) { - if (!CreateDirectory (param1, NULL)) WCMD_print_error (); + if (!create_full_path(param1)) WCMD_print_error (); } /****************************************************************************

1 0

Aric Cyr : Move standard WGL function declarations to wingdi.h.
by Alexandre Julliard 03 Dec '05

03 Dec '05

Module: wine Branch: refs/heads/master Commit: d0713d28e2b264d0aa719b765c5f4aa439a0d775 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d0713d28e2b264d0aa719b7… Author: Aric Cyr <aric.cyr(a)gmail.com> Date: Sat Dec 3 18:01:51 2005 +0100 Move standard WGL function declarations to wingdi.h. dlls/opengl32/wgl.h is now empty and no longer needed. --- dlls/opengl32/wgl.c | 4 +- dlls/opengl32/wgl.h | 77 ----------------------------------------------- dlls/opengl32/wgl_ext.c | 7 ++++ include/wingdi.h | 18 +++++++++++ 4 files changed, 26 insertions(+), 80 deletions(-) delete mode 100644 dlls/opengl32/wgl.h diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 812e9aa..e35680d 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -30,8 +30,8 @@ #include "winuser.h" #include "winerror.h" #include "winreg.h" +#include "wingdi.h" -#include "wgl.h" #include "wgl_ext.h" #include "opengl_ext.h" #include "wine/library.h" @@ -360,7 +360,7 @@ static int wgl_compar(const void *elt_a, ((const WGL_extension *) elt_b)->func_name); } -void* WINAPI wglGetProcAddress(LPCSTR lpszProc) { +PROC WINAPI wglGetProcAddress(LPCSTR lpszProc) { void *local_func; OpenGL_extension ext; OpenGL_extension *ext_ret; diff --git a/dlls/opengl32/wgl.h b/dlls/opengl32/wgl.h deleted file mode 100644 index a363c34..0000000 --- a/dlls/opengl32/wgl.h +++ /dev/null @@ -1,77 +0,0 @@ -/* Window-specific OpenGL functions implementation. - * - * Copyright (c) 2000 Lionel Ulmer - * Copyright (c) 2005 Raphael Junqueira - * - * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef __DLLS_OPENGL32_WGL_H -#define __DLLS_OPENGL32_WGL_H - -#include "wingdi.h" - -HGLRC WINAPI wglCreateContext(HDC hdc) ; -HGLRC WINAPI wglCreateLayerContext(HDC hdc, - int iLayerPlane) ; -BOOL WINAPI wglCopyContext(HGLRC hglrcSrc, - HGLRC hglrcDst, - UINT mask) ; -BOOL WINAPI wglDeleteContext(HGLRC hglrc) ; -BOOL WINAPI wglDescribeLayerPlane(HDC hdc, - int iPixelFormat, - int iLayerPlane, - UINT nBytes, - LPLAYERPLANEDESCRIPTOR plpd) ; -HGLRC WINAPI wglGetCurrentContext(void) ; -HDC WINAPI wglGetCurrentDC(void) ; -int WINAPI wglGetLayerPaletteEntries(HDC hdc, - int iLayerPlane, - int iStart, - int cEntries, - const COLORREF *pcr) ; -void * WINAPI wglGetProcAddress(LPCSTR lpszProc) ; -BOOL WINAPI wglMakeCurrent(HDC hdc, - HGLRC hglrc) ; -BOOL WINAPI wglRealizeLayerPalette(HDC hdc, - int iLayerPlane, - BOOL bRealize) ; -int WINAPI wglSetLayerPaletteEntries(HDC hdc, - int iLayerPlane, - int iStart, - int cEntries, - const COLORREF *pcr) ; -BOOL WINAPI wglShareLists(HGLRC hglrc1, - HGLRC hglrc2) ; -BOOL WINAPI wglSwapLayerBuffers(HDC hdc, - UINT fuPlanes); -BOOL WINAPI wglUseFontBitmaps(HDC hdc, - DWORD first, - DWORD count, - DWORD listBase) ; -BOOL WINAPI wglUseFontOutlines(HDC hdc, - DWORD first, - DWORD count, - DWORD listBase, - FLOAT deviation, - FLOAT extrusion, - int format, - LPGLYPHMETRICSFLOAT lpgmf) ; -const char * WINAPI wglGetExtensionsStringARB(HDC hdc) ; - -BOOL WINAPI wglMakeContextCurrentARB(HDC hDrawDC, HDC hReadDC, HGLRC hglrc); -HDC WINAPI wglGetCurrentReadDCARB(void) ; - -#endif /* __DLLS_OPENGL32_WGL_H */ diff --git a/dlls/opengl32/wgl_ext.c b/dlls/opengl32/wgl_ext.c index c4bc6cb..b323d7c 100644 --- a/dlls/opengl32/wgl_ext.c +++ b/dlls/opengl32/wgl_ext.c @@ -32,7 +32,6 @@ #include "winerror.h" #include "gdi.h" -#include "wgl.h" #include "wgl_ext.h" #include "opengl_ext.h" #include "wine/library.h" @@ -1120,6 +1119,12 @@ void wgl_ext_finalize_extensions(void) } } + +/* these are located in wgl.c for convenience of implementation */ +BOOL WINAPI wglMakeContextCurrentARB(HDC,HDC,HGLRC); +HDC WINAPI wglGetCurrentReadDCARB(void); + + /* * Putting this at the end to prevent having to write the prototypes :-) * diff --git a/include/wingdi.h b/include/wingdi.h index 89b1d07..032efbb 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -3678,6 +3678,24 @@ BOOL WINAPI PolyTextOutW(HDC,PPOLYT #define WGL_SWAP_UNDERLAY14 (1 << 29) #define WGL_SWAP_UNDERLAY15 (1 << 30) +/* WGL prototypes */ +HGLRC WINAPI wglCreateContext(HDC); +HGLRC WINAPI wglCreateLayerContext(HDC,INT); +BOOL WINAPI wglCopyContext(HGLRC,HGLRC,UINT); +BOOL WINAPI wglDeleteContext(HGLRC); +BOOL WINAPI wglDescribeLayerPlane(HDC,INT,INT,UINT,LPLAYERPLANEDESCRIPTOR); +HGLRC WINAPI wglGetCurrentContext(void); +HDC WINAPI wglGetCurrentDC(void); +INT WINAPI wglGetLayerPaletteEntries(HDC,INT,INT,INT,const COLORREF *); +PROC WINAPI wglGetProcAddress(LPCSTR); +BOOL WINAPI wglMakeCurrent(HDC,HGLRC); +BOOL WINAPI wglRealizeLayerPalette(HDC,INT,BOOL); +INT WINAPI wglSetLayerPaletteEntries(HDC,INT,INT,INT,const COLORREF *); +BOOL WINAPI wglShareLists(HGLRC,HGLRC); +BOOL WINAPI wglSwapLayerBuffers(HDC,UINT); +BOOL WINAPI wglUseFontBitmaps(HDC,DWORD,DWORD,DWORD); +BOOL WINAPI wglUseFontOutlines(HDC,DWORD,DWORD,DWORD,FLOAT,FLOAT,INT,LPGLYPHMETRICSFLOAT); + #ifdef __cplusplus } #endif

1 0

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard 02 Dec '05

02 Dec '05

Module: wine Branch: refs/heads/master Commit: 5127dc9f49d4505d08ceb353467939c0c4f58e04 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5127dc9f49d4505d08ceb35… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 2 15:15:09 2005 Assorted spelling fixes. --- dlls/ole32/usrmarshal.c | 4 ++-- dlls/wined3d/surface.c | 12 ++++++------ dlls/winspool/info.c | 2 +- tools/winapi/msvcmaker | 4 ++-- tools/winapi/winapi_check_options.pm | 18 +++++++++--------- tools/winapi/winapi_extract | 2 +- tools/winebuild/utils.c | 2 +- 7 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index 294be08..3bd46cb 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -333,7 +333,7 @@ unsigned char * __RPC_USER HGLOBAL_UserU size = *(ULONG *)pBuffer; pBuffer += sizeof(ULONG); - /* redunancy is bad - it means you have to check consistancy like + /* redundancy is bad - it means you have to check consistency like * this: */ if (*(ULONG *)pBuffer != handle) { @@ -341,7 +341,7 @@ unsigned char * __RPC_USER HGLOBAL_UserU return pBuffer; } pBuffer += sizeof(ULONG); - /* redunancy is bad - it means you have to check consistancy like + /* redundancy is bad - it means you have to check consistency like * this: */ if (*(ULONG *)pBuffer != size) { diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 0aa1446..e1711e6 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -320,19 +320,19 @@ HRESULT WINAPI IWineD3DSurfaceImpl_LockR if (0 == This->resource.usage || This->resource.usage & D3DUSAGE_DYNAMIC) { /* classic surface TODO: non 2d surfaces? - Thease resources may be POOL_SYSTEMMEM, so they must not access the device */ + These resources may be POOL_SYSTEMMEM, so they must not access the device */ TRACE("locking an ordinarary surface\n"); - /* Check to see if memory has already been allocated fro the sufrace*/ + /* Check to see if memory has already been allocated from the surface*/ if (NULL == This->resource.allocatedMemory) { /* TODO: check to see if an update has been performed on the surface (an update could just clobber allocatedMemory */ - /* Non-systemmemory surfaces */ + /* Non-system memory surfaces */ - /*Surface has no memory currently allocate to it!*/ + /*Surface has no memory currently allocated to it!*/ TRACE("(%p) Locking rect\n" , This); This->resource.allocatedMemory = HeapAlloc(GetProcessHeap() ,0 , This->pow2Size); if (0 != This->glDescription.textureName) { /* Now I have to copy thing bits back */ - This->activeLock = TRUE; /* When this flag is set to true, laoding the surface again won't free THis->resource.allocatedMemory */ - /* TODO: make activeLock a bit more intelegent, maybe implement a method to purge the texture memory. */ + This->activeLock = TRUE; /* When this flag is set to true, loading the surface again won't free THis->resource.allocatedMemory */ + /* TODO: make activeLock a bit more intelligent, maybe implement a method to purge the texture memory. */ ENTER_GL(); /* Make sure that the texture is loaded */ diff --git a/dlls/winspool/info.c b/dlls/winspool/info.c index ffee18a..3bdd01d 100644 --- a/dlls/winspool/info.c +++ b/dlls/winspool/info.c @@ -3243,7 +3243,7 @@ BOOL WINAPI GetPrinterDriverW(HANDLE hPr * RETURNS * Success: TRUE and in pcbNeeded the Bytes used in pDriverDirectory * Failure: FALSE and in pcbNeeded the Bytes required for pDriverDirectory, - * if cbBuf is to small + * if cbBuf is too small * * Native Values returned in pDriverDirectory on Success: *| NT(Windows NT x86): "%winsysdir%\\spool\\DRIVERS\\w32x86" diff --git a/tools/winapi/msvcmaker b/tools/winapi/msvcmaker index fd40f3d..1d31ae0 100755 --- a/tools/winapi/msvcmaker +++ b/tools/winapi/msvcmaker @@ -52,7 +52,7 @@ sub read_spec_file($) { while($lookahead || defined($_ = <IN>)) { $lookahead = 0; - s/^\s*?(.*?)\s*$/$1/; # remove whitespace at begining and end of line + s/^\s*?(.*?)\s*$/$1/; # remove whitespace at beginning and end of line s/^(.*?)\s*#.*$/$1/; # remove comments /^$/ && next; # skip empty lines @@ -137,7 +137,7 @@ MAKEFILE_IN: foreach my $makefile_in_fil $again = 0; } - s/^\s*?(.*?)\s*$/$1/; # remove whitespace at begining and end of line + s/^\s*?(.*?)\s*$/$1/; # remove whitespace at beginning and end of line s/^(.*?)\s*#.*$/$1/; # remove comments /^$/ && next; # skip empty lines diff --git a/tools/winapi/winapi_check_options.pm b/tools/winapi/winapi_check_options.pm index cd788fd..cccfaa4 100644 --- a/tools/winapi/winapi_check_options.pm +++ b/tools/winapi/winapi_check_options.pm @@ -75,7 +75,7 @@ my %options_long = ( "calling-convention-win16" => { default => 0, parent => "calling-convention", description => "calling convention checking (Win16)" }, "calling-convention-win32" => { default => 1, parent => "calling-convention", description => "calling convention checking (Win32)" }, "misplaced" => { default => 1, parent => "local", description => "check for misplaced functions" }, - "statements" => { default => 0, parent => "local", description => "check for statements inconsistances" }, + "statements" => { default => 0, parent => "local", description => "check for statements inconsistencies" }, "cross-call" => { default => 0, parent => ["statements", "win16", "win32"], description => "check for cross calling functions" }, "cross-call-win32-win16" => { default => 0, parent => "cross-call", description => "check for cross calls between win32 and win16" @@ -83,7 +83,7 @@ my %options_long = ( "cross-call-unicode-ascii" => { default => 0, parent => "cross-call", description => "check for cross calls between Unicode and ASCII" }, - "debug-messages" => { default => 0, parent => "statements", description => "check for debug messages inconsistances" }, + "debug-messages" => { default => 0, parent => "statements", description => "check for debug messages inconsistencies" }, "comments" => { default => 1, @@ -99,36 +99,36 @@ my %options_long = ( "documentation" => { default => 1, parent => "local", - description => "check for documentation inconsistances" + description => "check for documentation inconsistencies" }, "documentation-pedantic" => { default => 0, parent => "documentation", - description => "be pendantic when checking for documentation inconsistances" + description => "be pendantic when checking for documentation inconsistencies" }, "documentation-arguments" => { default => 1, parent => "documentation", - description => "check for arguments documentation inconsistances\n" + description => "check for arguments documentation inconsistencies\n" }, "documentation-comment-indent" => { default => 0, - parent => "documentation", description => "check for documentation comment indent inconsistances" + parent => "documentation", description => "check for documentation comment indent inconsistencies" }, "documentation-comment-width" => { default => 0, - parent => "documentation", description => "check for documentation comment width inconsistances" + parent => "documentation", description => "check for documentation comment width inconsistencies" }, "documentation-name" => { default => 1, parent => "documentation", - description => "check for documentation name inconsistances\n" + description => "check for documentation name inconsistencies\n" }, "documentation-ordinal" => { default => 1, parent => "documentation", - description => "check for documentation ordinal inconsistances\n" + description => "check for documentation ordinal inconsistencies\n" }, "documentation-wrong" => { default => 1, diff --git a/tools/winapi/winapi_extract b/tools/winapi/winapi_extract index 70b3f5a..040f228 100755 --- a/tools/winapi/winapi_extract +++ b/tools/winapi/winapi_extract @@ -70,7 +70,7 @@ if($options->spec_files || $options->win while($lookahead || defined($_ = <IN>)) { $lookahead = 0; - s/^\s*?(.*?)\s*$/$1/; # remove whitespace at begining and end of line + s/^\s*?(.*?)\s*$/$1/; # remove whitespace at beginning and end of line s/^(.*?)\s*#.*$/$1/; # remove comments /^$/ && next; # skip empty lines diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index dbfa07c..a4cbb6f 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -417,7 +417,7 @@ const char *get_stub_name( const ORDDEF * * The reason gas is written this way is that it's trying to mimick * native assemblers for the various architectures it runs on. gas - * provides other directives that work consistantly across + * provides other directives that work consistently across * architectures, but of course we want to work on all arches with or * without gas. Hence this function. *

1 0

Vitaliy Margolen : Move mapping (section) objects into directory name space.
by Alexandre Julliard 02 Dec '05

02 Dec '05

Module: wine Branch: refs/heads/master Commit: 348a3d912bf3d8c0523bf76566683dfc63ff050b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=348a3d912bf3d8c0523bf76… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Fri Dec 2 15:13:13 2005 Move mapping (section) objects into directory name space. --- dlls/kernel/virtual.c | 5 ++++- dlls/ntdll/virtual.c | 2 ++ include/wine/server_protocol.h | 4 +++- server/mapping.c | 23 ++++++++++++++++++----- server/protocol.def | 2 ++ server/trace.c | 2 ++ 6 files changed, 31 insertions(+), 7 deletions(-) diff --git a/dlls/kernel/virtual.c b/dlls/kernel/virtual.c index d3dee13..ef46e30 100644 --- a/dlls/kernel/virtual.c +++ b/dlls/kernel/virtual.c @@ -43,6 +43,8 @@ #include "excpt.h" #include "wine/debug.h" +#include "kernel_private.h" + WINE_DEFAULT_DEBUG_CHANNEL(virtual); WINE_DECLARE_DEBUG_CHANNEL(seh); @@ -318,6 +320,7 @@ HANDLE WINAPI CreateFileMappingW( HANDLE { RtlInitUnicodeString( &nameW, name ); attr.ObjectName = &nameW; + attr.RootDirectory = get_BaseNamedObjects_handle(); } sec_type = protect & sec_flags; @@ -406,7 +409,7 @@ HANDLE WINAPI OpenFileMappingW( DWORD ac return 0; } attr.Length = sizeof(attr); - attr.RootDirectory = 0; + attr.RootDirectory = get_BaseNamedObjects_handle(); attr.ObjectName = &nameW; attr.Attributes = OBJ_CASE_INSENSITIVE | (inherit ? OBJ_INHERIT : 0); attr.SecurityDescriptor = NULL; diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 93392f5..d04c79e 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1662,6 +1662,7 @@ NTSTATUS WINAPI NtCreateSection( HANDLE { req->access = access; req->attributes = (attr) ? attr->Attributes : 0; + req->rootdir = attr ? attr->RootDirectory : 0; req->file_handle = file; req->size_high = size ? size->u.HighPart : 0; req->size_low = size ? size->u.LowPart : 0; @@ -1690,6 +1691,7 @@ NTSTATUS WINAPI NtOpenSection( HANDLE *h { req->access = access; req->attributes = (attr) ? attr->Attributes : 0; + req->rootdir = attr ? attr->RootDirectory : 0; wine_server_add_data( req, attr->ObjectName->Buffer, len ); if (!(ret = wine_server_call( req ))) *handle = reply->handle; } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 982d840..4ab0136 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1407,6 +1407,7 @@ struct create_mapping_request struct request_header __header; unsigned int access; unsigned int attributes; + obj_handle_t rootdir; int size_high; int size_low; int protect; @@ -1435,6 +1436,7 @@ struct open_mapping_request struct request_header __header; unsigned int access; unsigned int attributes; + obj_handle_t rootdir; /* VARARG(name,unicode_str); */ }; struct open_mapping_reply @@ -4310,6 +4312,6 @@ union generic_reply struct query_symlink_reply query_symlink_reply; }; -#define SERVER_PROTOCOL_VERSION 204 +#define SERVER_PROTOCOL_VERSION 205 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/mapping.c b/server/mapping.c index b6e99e4..cf87361 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -273,15 +273,16 @@ inline static int get_file_size( struct return 1; } -static struct object *create_mapping( const struct unicode_str *name, unsigned int attr, - file_pos_t size, int protect, obj_handle_t handle ) +static struct object *create_mapping( struct directory *root, const struct unicode_str *name, + unsigned int attr, file_pos_t size, int protect, + obj_handle_t handle ) { struct mapping *mapping; int access = 0; if (!page_mask) init_page_size(); - if (!(mapping = create_named_object( sync_namespace, &mapping_ops, name, attr ))) + if (!(mapping = create_named_object_dir( root, name, attr, &mapping_ops ))) return NULL; if (get_error() == STATUS_OBJECT_NAME_EXISTS) return &mapping->obj; /* Nothing else to do */ @@ -378,25 +379,37 @@ DECL_HANDLER(create_mapping) { struct object *obj; struct unicode_str name; + struct directory *root = NULL; file_pos_t size = ((file_pos_t)req->size_high << 32) | req->size_low; reply->handle = 0; get_req_unicode_str( &name ); - if ((obj = create_mapping( &name, req->attributes, size, req->protect, req->file_handle ))) + if (req->rootdir && !(root = get_directory_obj( current->process, req->rootdir, 0 ))) + return; + + if ((obj = create_mapping( root, &name, req->attributes, size, req->protect, req->file_handle ))) { reply->handle = alloc_handle( current->process, obj, req->access, req->attributes & OBJ_INHERIT ); release_object( obj ); } + + if (root) release_object( root ); } /* open a handle to a mapping */ DECL_HANDLER(open_mapping) { struct unicode_str name; + struct directory *root = NULL; get_req_unicode_str( &name ); - reply->handle = open_object( sync_namespace, &name, &mapping_ops, req->access, req->attributes ); + if (req->rootdir && !(root = get_directory_obj( current->process, req->rootdir, 0 ))) + return; + + reply->handle = open_object_dir( root, &name, req->attributes, &mapping_ops, req->access ); + + if (root) release_object( root ); } /* get a mapping information */ diff --git a/server/protocol.def b/server/protocol.def index 4228258..297313c 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1045,6 +1045,7 @@ enum char_info_mode @REQ(create_mapping) unsigned int access; /* wanted access rights */ unsigned int attributes; /* object attributes */ + obj_handle_t rootdir; /* root directory */ int size_high; /* mapping size */ int size_low; /* mapping size */ int protect; /* protection flags (see below) */ @@ -1068,6 +1069,7 @@ enum char_info_mode @REQ(open_mapping) unsigned int access; /* wanted access rights */ unsigned int attributes; /* object attributes */ + obj_handle_t rootdir; /* root directory */ VARARG(name,unicode_str); /* object name */ @REPLY obj_handle_t handle; /* handle to the mapping */ diff --git a/server/trace.c b/server/trace.c index 3d4983a..5d5159a 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1448,6 +1448,7 @@ static void dump_create_mapping_request( { fprintf( stderr, " access=%08x,", req->access ); fprintf( stderr, " attributes=%08x,", req->attributes ); + fprintf( stderr, " rootdir=%p,", req->rootdir ); fprintf( stderr, " size_high=%d,", req->size_high ); fprintf( stderr, " size_low=%d,", req->size_low ); fprintf( stderr, " protect=%d,", req->protect ); @@ -1465,6 +1466,7 @@ static void dump_open_mapping_request( c { fprintf( stderr, " access=%08x,", req->access ); fprintf( stderr, " attributes=%08x,", req->attributes ); + fprintf( stderr, " rootdir=%p,", req->rootdir ); fprintf( stderr, " name=" ); dump_varargs_unicode_str( cur_size ); }

1 0

Vitaliy Margolen : Move timer objects into directory name space.
by Alexandre Julliard 02 Dec '05

02 Dec '05

Module: wine Branch: refs/heads/master Commit: 7c5cb7a229a9058bdee08c40d20401670e2f05f8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7c5cb7a229a9058bdee08c4… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Fri Dec 2 15:05:54 2005 Move timer objects into directory name space. --- dlls/kernel/sync.c | 2 ++ dlls/ntdll/sync.c | 2 ++ include/wine/server_protocol.h | 4 +++- server/protocol.def | 2 ++ server/timer.c | 22 +++++++++++++++++----- server/trace.c | 2 ++ 6 files changed, 28 insertions(+), 6 deletions(-) diff --git a/dlls/kernel/sync.c b/dlls/kernel/sync.c index 54f95a7..0c34098 100644 --- a/dlls/kernel/sync.c +++ b/dlls/kernel/sync.c @@ -927,6 +927,7 @@ HANDLE WINAPI CreateWaitableTimerW( SECU { RtlInitUnicodeString( &nameW, name ); attr.ObjectName = &nameW; + attr.RootDirectory = get_BaseNamedObjects_handle(); } status = NtCreateTimer(&handle, TIMER_ALL_ACCESS, &attr, @@ -979,6 +980,7 @@ HANDLE WINAPI OpenWaitableTimerW( DWORD { RtlInitUnicodeString( &nameW, name ); attr.ObjectName = &nameW; + attr.RootDirectory = get_BaseNamedObjects_handle(); } status = NtOpenTimer(&handle, access, &attr); diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 675b9b7..3cf448f 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -422,6 +422,7 @@ NTSTATUS WINAPI NtCreateTimer(OUT HANDLE { req->access = access; req->attributes = (attr) ? attr->Attributes : 0; + req->rootdir = attr ? attr->RootDirectory : 0; req->manual = (timer_type == NotificationTimer) ? TRUE : FALSE; if (len) wine_server_add_data( req, attr->ObjectName->Buffer, len ); status = wine_server_call( req ); @@ -449,6 +450,7 @@ NTSTATUS WINAPI NtOpenTimer(OUT PHANDLE { req->access = access; req->attributes = (attr) ? attr->Attributes : 0; + req->rootdir = attr ? attr->RootDirectory : 0; if (len) wine_server_add_data( req, attr->ObjectName->Buffer, len ); status = wine_server_call( req ); *handle = reply->handle; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index c144f24..982d840 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1885,6 +1885,7 @@ struct create_timer_request struct request_header __header; unsigned int access; unsigned int attributes; + obj_handle_t rootdir; int manual; /* VARARG(name,unicode_str); */ }; @@ -1901,6 +1902,7 @@ struct open_timer_request struct request_header __header; unsigned int access; unsigned int attributes; + obj_handle_t rootdir; /* VARARG(name,unicode_str); */ }; struct open_timer_reply @@ -4308,6 +4310,6 @@ union generic_reply struct query_symlink_reply query_symlink_reply; }; -#define SERVER_PROTOCOL_VERSION 203 +#define SERVER_PROTOCOL_VERSION 204 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index a691e90..4228258 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1360,6 +1360,7 @@ enum char_info_mode @REQ(create_timer) unsigned int access; /* wanted access rights */ unsigned int attributes; /* object attributes */ + obj_handle_t rootdir; /* root directory */ int manual; /* manual reset */ VARARG(name,unicode_str); /* object name */ @REPLY @@ -1371,6 +1372,7 @@ enum char_info_mode @REQ(open_timer) unsigned int access; /* wanted access rights */ unsigned int attributes; /* object attributes */ + obj_handle_t rootdir; /* root directory */ VARARG(name,unicode_str); /* object name */ @REPLY obj_handle_t handle; /* handle to the timer */ diff --git a/server/timer.c b/server/timer.c index 2576dcd..74419e5 100644 --- a/server/timer.c +++ b/server/timer.c @@ -72,12 +72,12 @@ static const struct object_ops timer_ops /* create a timer object */ -static struct timer *create_timer( const struct unicode_str *name, unsigned int attr, - int manual ) +static struct timer *create_timer( struct directory *root, const struct unicode_str *name, + unsigned int attr, int manual ) { struct timer *timer; - if ((timer = create_named_object( sync_namespace, &timer_ops, name, attr ))) + if ((timer = create_named_object_dir( root, name, attr, &timer_ops ))) { if (get_error() != STATUS_OBJECT_NAME_EXISTS) { @@ -209,24 +209,36 @@ DECL_HANDLER(create_timer) { struct timer *timer; struct unicode_str name; + struct directory *root = NULL; reply->handle = 0; get_req_unicode_str( &name ); - if ((timer = create_timer( &name, req->attributes, req->manual ))) + if (req->rootdir && !(root = get_directory_obj( current->process, req->rootdir, 0 ))) + return; + + if ((timer = create_timer( root, &name, req->attributes, req->manual ))) { reply->handle = alloc_handle( current->process, timer, req->access, req->attributes & OBJ_INHERIT ); release_object( timer ); } + + if (root) release_object( root ); } /* open a handle to a timer */ DECL_HANDLER(open_timer) { struct unicode_str name; + struct directory *root = NULL; get_req_unicode_str( &name ); - reply->handle = open_object( sync_namespace, &name, &timer_ops, req->access, req->attributes ); + if (req->rootdir && !(root = get_directory_obj( current->process, req->rootdir, 0 ))) + return; + + reply->handle = open_object_dir( root, &name, req->attributes, &timer_ops, req->access ); + + if (root) release_object( root ); } /* set a waitable timer */ diff --git a/server/trace.c b/server/trace.c index e50e71a..3d4983a 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1798,6 +1798,7 @@ static void dump_create_timer_request( c { fprintf( stderr, " access=%08x,", req->access ); fprintf( stderr, " attributes=%08x,", req->attributes ); + fprintf( stderr, " rootdir=%p,", req->rootdir ); fprintf( stderr, " manual=%d,", req->manual ); fprintf( stderr, " name=" ); dump_varargs_unicode_str( cur_size ); @@ -1812,6 +1813,7 @@ static void dump_open_timer_request( con { fprintf( stderr, " access=%08x,", req->access ); fprintf( stderr, " attributes=%08x,", req->attributes ); + fprintf( stderr, " rootdir=%p,", req->rootdir ); fprintf( stderr, " name=" ); dump_varargs_unicode_str( cur_size ); }

1 0

Vitaliy Margolen : Move semaphore objects into directory name space.
by Alexandre Julliard 02 Dec '05

02 Dec '05

Module: wine Branch: refs/heads/master Commit: 5daae3dfa9bc4403b26e742cc5446e3081e9bbd6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5daae3dfa9bc4403b26e742… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Fri Dec 2 15:01:17 2005 Move semaphore objects into directory name space. --- dlls/kernel/sync.c | 2 ++ dlls/ntdll/sync.c | 2 ++ include/wine/server_protocol.h | 4 +++- server/protocol.def | 2 ++ server/semaphore.c | 22 +++++++++++++++++----- server/trace.c | 2 ++ 6 files changed, 28 insertions(+), 6 deletions(-) diff --git a/dlls/kernel/sync.c b/dlls/kernel/sync.c index 659ee30..54f95a7 100644 --- a/dlls/kernel/sync.c +++ b/dlls/kernel/sync.c @@ -807,6 +807,7 @@ HANDLE WINAPI CreateSemaphoreW( SECURITY { RtlInitUnicodeString( &nameW, name ); attr.ObjectName = &nameW; + attr.RootDirectory = get_BaseNamedObjects_handle(); } status = NtCreateSemaphore( &ret, SEMAPHORE_ALL_ACCESS, &attr, initial, max ); @@ -858,6 +859,7 @@ HANDLE WINAPI OpenSemaphoreW( DWORD acce { RtlInitUnicodeString( &nameW, name ); attr.ObjectName = &nameW; + attr.RootDirectory = get_BaseNamedObjects_handle(); } status = NtOpenSemaphore( &ret, access, &attr ); diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index f5d85ae..675b9b7 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -85,6 +85,7 @@ NTSTATUS WINAPI NtCreateSemaphore( OUT P { req->access = access; req->attributes = (attr) ? attr->Attributes : 0; + req->rootdir = attr ? attr->RootDirectory : 0; req->initial = InitialCount; req->max = MaximumCount; if (len) wine_server_add_data( req, attr->ObjectName->Buffer, len ); @@ -111,6 +112,7 @@ NTSTATUS WINAPI NtOpenSemaphore( OUT PHA { req->access = access; req->attributes = (attr) ? attr->Attributes : 0; + req->rootdir = attr ? attr->RootDirectory : 0; if (len) wine_server_add_data( req, attr->ObjectName->Buffer, len ); ret = wine_server_call( req ); *SemaphoreHandle = reply->handle; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 1818846..c144f24 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -707,6 +707,7 @@ struct create_semaphore_request struct request_header __header; unsigned int access; unsigned int attributes; + obj_handle_t rootdir; unsigned int initial; unsigned int max; /* VARARG(name,unicode_str); */ @@ -738,6 +739,7 @@ struct open_semaphore_request struct request_header __header; unsigned int access; unsigned int attributes; + obj_handle_t rootdir; /* VARARG(name,unicode_str); */ }; struct open_semaphore_reply @@ -4306,6 +4308,6 @@ union generic_reply struct query_symlink_reply query_symlink_reply; }; -#define SERVER_PROTOCOL_VERSION 202 +#define SERVER_PROTOCOL_VERSION 203 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index 934ae42..a691e90 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -558,6 +558,7 @@ enum event_op { PULSE_EVENT, SET_EVENT, @REQ(create_semaphore) unsigned int access; /* wanted access rights */ unsigned int attributes; /* object attributes */ + obj_handle_t rootdir; /* root directory */ unsigned int initial; /* initial count */ unsigned int max; /* maximum count */ VARARG(name,unicode_str); /* object name */ @@ -579,6 +580,7 @@ enum event_op { PULSE_EVENT, SET_EVENT, @REQ(open_semaphore) unsigned int access; /* wanted access rights */ unsigned int attributes; /* object attributes */ + obj_handle_t rootdir; /* root directory */ VARARG(name,unicode_str); /* object name */ @REPLY obj_handle_t handle; /* handle to the semaphore */ diff --git a/server/semaphore.c b/server/semaphore.c index bff60c5..e8d9cbb 100644 --- a/server/semaphore.c +++ b/server/semaphore.c @@ -63,8 +63,8 @@ static const struct object_ops semaphore }; -static struct semaphore *create_semaphore( const struct unicode_str *name, unsigned int attr, - unsigned int initial, unsigned int max ) +static struct semaphore *create_semaphore( struct directory *root, const struct unicode_str *name, + unsigned int attr, unsigned int initial, unsigned int max ) { struct semaphore *sem; @@ -73,7 +73,7 @@ static struct semaphore *create_semaphor set_error( STATUS_INVALID_PARAMETER ); return NULL; } - if ((sem = create_named_object( sync_namespace, &semaphore_ops, name, attr ))) + if ((sem = create_named_object_dir( root, name, attr, &semaphore_ops ))) { if (get_error() != STATUS_OBJECT_NAME_EXISTS) { @@ -150,24 +150,36 @@ DECL_HANDLER(create_semaphore) { struct semaphore *sem; struct unicode_str name; + struct directory *root = NULL; reply->handle = 0; get_req_unicode_str( &name ); - if ((sem = create_semaphore( &name, req->attributes, req->initial, req->max ))) + if (req->rootdir && !(root = get_directory_obj( current->process, req->rootdir, 0 ))) + return; + + if ((sem = create_semaphore( root, &name, req->attributes, req->initial, req->max ))) { reply->handle = alloc_handle( current->process, sem, req->access, req->attributes & OBJ_INHERIT ); release_object( sem ); } + + if (root) release_object( root ); } /* open a handle to a semaphore */ DECL_HANDLER(open_semaphore) { struct unicode_str name; + struct directory *root = NULL; get_req_unicode_str( &name ); - reply->handle = open_object( sync_namespace, &name, &semaphore_ops, req->access, req->attributes ); + if (req->rootdir && !(root = get_directory_obj( current->process, req->rootdir, 0 ))) + return; + + reply->handle = open_object_dir( root, &name, req->attributes, &semaphore_ops, req->access ); + + if (root) release_object( root ); } /* release a semaphore */ diff --git a/server/trace.c b/server/trace.c index 04c4bb4..e50e71a 100644 --- a/server/trace.c +++ b/server/trace.c @@ -968,6 +968,7 @@ static void dump_create_semaphore_reques { fprintf( stderr, " access=%08x,", req->access ); fprintf( stderr, " attributes=%08x,", req->attributes ); + fprintf( stderr, " rootdir=%p,", req->rootdir ); fprintf( stderr, " initial=%08x,", req->initial ); fprintf( stderr, " max=%08x,", req->max ); fprintf( stderr, " name=" ); @@ -994,6 +995,7 @@ static void dump_open_semaphore_request( { fprintf( stderr, " access=%08x,", req->access ); fprintf( stderr, " attributes=%08x,", req->attributes ); + fprintf( stderr, " rootdir=%p,", req->rootdir ); fprintf( stderr, " name=" ); dump_varargs_unicode_str( cur_size ); }

1 0

Vitaliy Margolen : Move event and mutex objects into directory name space.
by Alexandre Julliard 02 Dec '05

02 Dec '05

Module: wine Branch: refs/heads/master Commit: f676bc8d85bdf890caece85e030099bde4ebc139 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f676bc8d85bdf890caece85… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Fri Dec 2 14:55:48 2005 Move event and mutex objects into directory name space. --- dlls/kernel/kernel_private.h | 3 +++ dlls/kernel/sync.c | 30 ++++++++++++++++++++++++++++++ dlls/ntdll/sync.c | 4 ++++ dlls/ntdll/tests/om.c | 12 ++++++------ include/wine/server_protocol.h | 6 +++++- server/console.c | 2 +- server/event.c | 22 +++++++++++++++++----- server/mutex.c | 21 +++++++++++++++++---- server/named_pipe.c | 2 +- server/object.h | 4 ++-- server/process.c | 2 +- server/protocol.def | 4 ++++ server/trace.c | 4 ++++ 13 files changed, 95 insertions(+), 21 deletions(-)

1 0

Jacek Caban : Sync the WebBrowser's window size with document's window.
by Alexandre Julliard 02 Dec '05

02 Dec '05

Module: wine Branch: refs/heads/master Commit: 84f0597d08a83844289ed6e7248eb72a9da828c8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=84f0597d08a83844289ed6e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 2 14:54:58 2005 Sync the WebBrowser's window size with document's window. --- dlls/shdocvw/dochost.c | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/dochost.c b/dlls/shdocvw/dochost.c index 257ac78..d5dc95c 100644 --- a/dlls/shdocvw/dochost.c +++ b/dlls/shdocvw/dochost.c @@ -88,6 +88,18 @@ static LRESULT navigate2(WebBrowser *Thi return 0; } +static LRESULT resize_document(WebBrowser *This, LONG width, LONG height) +{ + RECT rect = {0, 0, width, height}; + + TRACE("(%p)->(%ld %ld)\n", This, width, height); + + if(This->view) + IOleDocumentView_SetRect(This->view, &rect); + + return 0; +} + static LRESULT WINAPI doc_view_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { WebBrowser *This; @@ -96,13 +108,14 @@ static LRESULT WINAPI doc_view_proc(HWND if(msg == WM_CREATE) { This = *(WebBrowser**)lParam; - ERR("create %p\n", This); SetPropW(hwnd, wszTHIS, This); }else { This = GetPropW(hwnd, wszTHIS); } switch(msg) { + case WM_SIZE: + return resize_document(This, LOWORD(lParam), HIWORD(lParam)); case WB_WM_NAVIGATE2: return navigate2(This); }

1 0

CVSROOT/. loginfo
by Alexandre Julliard 02 Dec '05

02 Dec '05

ChangeSet ID: 21634 CVSROOT: /opt/cvs-commit Module name: CVSROOT Changes by: julliard(a)winehq.org 2005/12/02 09:43:52 Modified files: . : loginfo Log message: Don't send mail to wine-cvs for the wine module, this will be done from the git repository. Patch: http://cvs.winehq.org/patch.py?id=21634 Old revision New revision Changes Path 1.50 1.51 +2 -1 CVSROOT/loginfo Index: CVSROOT/loginfo diff -u -p CVSROOT/loginfo:1.50 CVSROOT/loginfo:1.51 --- CVSROOT/loginfo:1.50 2 Dec 2005 15:43:52 -0000 +++ CVSROOT/loginfo 2 Dec 2005 15:43:52 -0000 @@ -28,7 +28,8 @@ # Use this for testing ^test /usr/bin/perl $CVSROOT/CVSROOT/log_accum -m testing(a)winehq.org -f $CVSROOT/CVSROOT/commitlog -S -s %p %s +^wine /usr/bin/perl $CVSROOT/CVSROOT/log_accum -f $CVSROOT/CVSROOT/commitlog -S -s %p %s + # All others go to wine-cvs -^wine /usr/bin/perl $CVSROOT/CVSROOT/log_accum -m wine-cvs(a)winehq.org -f $CVSROOT/CVSROOT/commitlog -L 200 -p -S -s %p %s DEFAULT /usr/bin/perl $CVSROOT/CVSROOT/log_accum -m wine-cvs(a)winehq.org -f $CVSROOT/CVSROOT/commitlog -P winehq -L 200 -p -c -S -s %p %s

1 0

CVSROOT/. log_accum
by Alexandre Julliard 02 Dec '05

02 Dec '05

ChangeSet ID: 21633 CVSROOT: /opt/cvs-commit Module name: CVSROOT Changes by: julliard(a)winehq.org 2005/12/02 09:41:56 Modified files: . : log_accum Log message: Don't die if no mail recipient was specified. Patch: http://cvs.winehq.org/patch.py?id=21633 Old revision New revision Changes Path 1.31 1.32 +0 -1 CVSROOT/log_accum Index: CVSROOT/log_accum diff -u -p CVSROOT/log_accum:1.31 CVSROOT/log_accum:1.32 --- CVSROOT/log_accum:1.31 2 Dec 2005 15:41:56 -0000 +++ CVSROOT/log_accum 2 Dec 2005 15:41:56 -0000 @@ -600,7 +600,6 @@ while (@ARGV) { push @files, $arg; } } -($mailto) || die("No -m mail recipient specified\n"); if ($do_summary) {

1 0

← Newer
1
...
37
38
39
40
41
42
43
...
46
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 December 2005