April 2008 - Wine-commits - list.winehq.org

Maarten Lankhorst : server: Make enum_winstations enumerate all the window stations with WINSTA_ENUMERATE right .
by Alexandre Julliard 17 Apr '08

17 Apr '08

Module: wine Branch: master Commit: 81069001ea65cd517b62e2a80cd28e35be044794 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81069001ea65cd517b62e2a80… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Apr 15 14:32:43 2008 -0700 server: Make enum_winstations enumerate all the window stations with WINSTA_ENUMERATE right. --- server/winstation.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/server/winstation.c b/server/winstation.c index 720bb12..cde4923 100644 --- a/server/winstation.c +++ b/server/winstation.c @@ -37,6 +37,7 @@ #include "process.h" #include "user.h" #include "file.h" +#include "security.h" #include "wine/unicode.h" @@ -636,16 +637,15 @@ DECL_HANDLER(set_user_object_info) /* enumerate window stations */ DECL_HANDLER(enum_winstation) { - unsigned int index = req->index; - obj_handle_t handle; - struct object *obj; + unsigned int index = 0; + struct winstation *winsta; - while ((handle = enumerate_handles( current->process, &winstation_ops, &index ))) + LIST_FOR_EACH_ENTRY( winsta, &winstation_list, struct winstation, entry ) { - if (!(obj = get_handle_obj( current->process, handle, WINSTA_ENUMERATE, &winstation_ops ))) - continue; - set_reply_data_obj_name( obj ); - release_object( obj ); + unsigned int access = WINSTA_ENUMERATE; + if (req->index > index++) continue; + if (!check_object_access( &winsta->obj, &access )) continue; + set_reply_data_obj_name( &winsta->obj ); clear_error(); reply->next = index; return;

1 0

Nikolay Sivov : gdiplus: Implement GdipCloneStringFormat.
by Alexandre Julliard 17 Apr '08

17 Apr '08

Module: wine Branch: master Commit: 6ba525d8c41978e1761fc66bacc02517a930d2e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ba525d8c41978e1761fc66ba… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Apr 16 21:47:12 2008 +0400 gdiplus: Implement GdipCloneStringFormat. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/stringformat.c | 15 +++++++++++++++ include/gdiplusflat.h | 1 + 3 files changed, 17 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 337ffb2..5c5e0a8 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -58,7 +58,7 @@ @ stdcall GdipClonePath(ptr ptr) @ stdcall GdipClonePen(ptr ptr) @ stub GdipCloneRegion -@ stub GdipCloneStringFormat +@ stdcall GdipCloneStringFormat(ptr ptr) @ stdcall GdipClosePathFigure(ptr) @ stdcall GdipClosePathFigures(ptr) @ stub GdipCombineRegionPath diff --git a/dlls/gdiplus/stringformat.c b/dlls/gdiplus/stringformat.c index 7de1c2c..bd5d6ad 100644 --- a/dlls/gdiplus/stringformat.c +++ b/dlls/gdiplus/stringformat.c @@ -152,3 +152,18 @@ GpStatus WINGDIPAPI GdipSetStringFormatFlags(GDIPCONST GpStringFormat *format, I return Ok; } + +GpStatus WINGDIPAPI GdipCloneStringFormat(GDIPCONST GpStringFormat *format, GpStringFormat **newFormat) +{ + if(!format || !newFormat) + return InvalidParameter; + + *newFormat = GdipAlloc(sizeof(GpStringFormat)); + if(!*newFormat) return OutOfMemory; + + **newFormat = *format; + + TRACE("%p %p\n",format,newFormat); + + return Ok; +} diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index e92c646..f615e5b 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -316,6 +316,7 @@ GpStatus WINGDIPAPI GdipSetStringFormatAlign(GpStringFormat*,StringAlignment); GpStatus WINGDIPAPI GdipSetStringFormatHotkeyPrefix(GpStringFormat*,INT); GpStatus WINGDIPAPI GdipSetStringFormatLineAlign(GpStringFormat*,StringAlignment); GpStatus WINGDIPAPI GdipSetStringFormatTrimming(GpStringFormat*,StringTrimming); +GpStatus WINGDIPAPI GdipCloneStringFormat(GDIPCONST GpStringFormat*,GpStringFormat**); #ifdef __cplusplus }

1 0

Nikolay Sivov : gdiplus: Implement GdipAddPathLine2I.
by Alexandre Julliard 17 Apr '08

17 Apr '08

Module: wine Branch: master Commit: 8360caabfa9dc7e45719c5331d7f339a7cc763af URL: http://source.winehq.org/git/wine.git/?a=commit;h=8360caabfa9dc7e45719c5331… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Apr 16 21:47:19 2008 +0400 gdiplus: Implement GdipAddPathLine2I. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphicspath.c | 24 ++++++++++++++++++++++++ include/gdiplusflat.h | 1 + 3 files changed, 26 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 5c5e0a8..4ccd213 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -17,7 +17,7 @@ @ stdcall GdipAddPathEllipse(ptr long long long long) @ stub GdipAddPathEllipseI @ stdcall GdipAddPathLine2(ptr ptr long) -@ stub GdipAddPathLine2I +@ stdcall GdipAddPathLine2I(ptr ptr long) @ stub GdipAddPathLine @ stdcall GdipAddPathLineI(ptr long long long long) @ stdcall GdipAddPathPath(ptr ptr long) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index adeaa89..5d5e5fc 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -217,6 +217,30 @@ GpStatus WINGDIPAPI GdipAddPathLine2(GpPath *path, GDIPCONST GpPointF *points, return Ok; } +GpStatus WINGDIPAPI GdipAddPathLine2I(GpPath *path, GDIPCONST GpPoint *points, INT count) +{ + GpPointF *pointsF; + INT i; + GpStatus stat; + + if(count <= 0) + return InvalidParameter; + + pointsF = GdipAlloc(sizeof(GpPointF) * count); + if(!pointsF) return OutOfMemory; + + for(i = 0;i < count; i++){ + pointsF[i].X = (REAL)points[i].X; + pointsF[i].Y = (REAL)points[i].Y; + } + + stat = GdipAddPathLine2(path, pointsF, count); + + GdipFree(pointsF); + + return stat; +} + GpStatus WINGDIPAPI GdipAddPathLineI(GpPath *path, INT x1, INT y1, INT x2, INT y2) { INT old_count; diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index f615e5b..bc97ef4 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -188,6 +188,7 @@ GpStatus WINGDIPAPI GdipAddPathEllipse(GpPath*,REAL,REAL,REAL,REAL); GpStatus WINGDIPAPI GdipAddPathEllipseI(GpPath*,INT,INT,INT,INT); GpStatus WINGDIPAPI GdipAddPathLine(GpPath*,REAL,REAL,REAL,REAL); GpStatus WINGDIPAPI GdipAddPathLine2(GpPath*,GDIPCONST GpPointF*,INT); +GpStatus WINGDIPAPI GdipAddPathLine2I(GpPath*,GDIPCONST GpPoint*,INT); GpStatus WINGDIPAPI GdipAddPathLineI(GpPath*,INT,INT,INT,INT); GpStatus WINGDIPAPI GdipAddPathPath(GpPath*,GDIPCONST GpPath*,BOOL); GpStatus WINGDIPAPI GdipClonePath(GpPath*,GpPath**);

1 0

Nikolay Sivov : gdiplus: Implement GdipAddPathArcI.
by Alexandre Julliard 17 Apr '08

17 Apr '08

Module: wine Branch: master Commit: fd0cbca787bda5f207d452a18f6a0e32cd57f1ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd0cbca787bda5f207d452a18… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Apr 16 21:47:25 2008 +0400 gdiplus: Implement GdipAddPathArcI. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphicspath.c | 6 ++++++ include/gdiplusflat.h | 1 + 3 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 4ccd213..d87979e 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -1,5 +1,5 @@ @ stdcall GdipAddPathArc(ptr long long long long long long) -@ stub GdipAddPathArcI +@ stdcall GdipAddPathArcI(ptr long long long long long long) @ stub GdipAddPathBezier @ stdcall GdipAddPathBezierI(ptr long long long long long long long long) @ stdcall GdipAddPathBeziers(ptr ptr long) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 5d5e5fc..5c2e287 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -97,6 +97,12 @@ GpStatus WINGDIPAPI GdipAddPathArc(GpPath *path, REAL x1, REAL y1, REAL x2, return Ok; } +GpStatus WINGDIPAPI GdipAddPathArcI(GpPath *path, INT x1, INT y1, INT x2, + INT y2, REAL startAngle, REAL sweepAngle) +{ + return GdipAddPathArc(path,(REAL)x1,(REAL)y1,(REAL)x2,(REAL)y2,startAngle,sweepAngle); +} + GpStatus WINGDIPAPI GdipAddPathBezierI(GpPath *path, INT x1, INT y1, INT x2, INT y2, INT x3, INT y3, INT x4, INT y4) { diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index bc97ef4..933475e 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -182,6 +182,7 @@ GpStatus WINGDIPAPI GdipSetSolidFillColor(GpSolidFill*,ARGB); GpStatus WINGDIPAPI GdipSetTextureTransform(GpTexture *,GDIPCONST GpMatrix*); GpStatus WINGDIPAPI GdipAddPathArc(GpPath*,REAL,REAL,REAL,REAL,REAL,REAL); +GpStatus WINGDIPAPI GdipAddPathArcI(GpPath*,INT,INT,INT,INT,REAL,REAL); GpStatus WINGDIPAPI GdipAddPathBezierI(GpPath*,INT,INT,INT,INT,INT,INT,INT,INT); GpStatus WINGDIPAPI GdipAddPathBeziers(GpPath*,GDIPCONST GpPointF*,INT); GpStatus WINGDIPAPI GdipAddPathEllipse(GpPath*,REAL,REAL,REAL,REAL);

1 0

Nikolay Sivov : gdiplus: Implement GdipCreateMatrix3I.
by Alexandre Julliard 17 Apr '08

17 Apr '08

Module: wine Branch: master Commit: 0f42f4c532ab21c3f7f8acce3c36cbb2661a7508 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f42f4c532ab21c3f7f8acce3… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Apr 17 03:02:05 2008 +0400 gdiplus: Implement GdipCreateMatrix3I. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/matrix.c | 17 +++++++++++++++++ include/gdiplusflat.h | 2 ++ 3 files changed, 20 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index d87979e..14e32eb 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -106,7 +106,7 @@ @ stub GdipCreateLineBrushI @ stdcall GdipCreateMatrix2(long long long long long long ptr) @ stdcall GdipCreateMatrix3(ptr ptr ptr) -@ stub GdipCreateMatrix3I +@ stdcall GdipCreateMatrix3I(ptr ptr ptr) @ stdcall GdipCreateMatrix(ptr) @ stdcall GdipCreateMetafileFromEmf(ptr long ptr) @ stub GdipCreateMetafileFromFile diff --git a/dlls/gdiplus/matrix.c b/dlls/gdiplus/matrix.c index 2ee4458..dee6460 100644 --- a/dlls/gdiplus/matrix.c +++ b/dlls/gdiplus/matrix.c @@ -89,6 +89,23 @@ GpStatus WINGDIPAPI GdipCreateMatrix3(GDIPCONST GpRectF *rect, return Ok; } +GpStatus WINGDIPAPI GdipCreateMatrix3I(GDIPCONST GpRect *rect, GDIPCONST GpPoint *pt, + GpMatrix **matrix) +{ + GpRectF rectF; + GpPointF ptF; + + rectF.X = (REAL)rect->X; + rectF.Y = (REAL)rect->Y; + rectF.Width = (REAL)rect->Width; + rectF.Height = (REAL)rect->Height; + + ptF.X = (REAL)pt->X; + ptF.Y = (REAL)pt->Y; + + return GdipCreateMatrix3(&rectF, &ptF, matrix); +} + GpStatus WINGDIPAPI GdipCloneMatrix(GpMatrix *matrix, GpMatrix **clone) { if(!matrix || !clone) diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 933475e..3819e99 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -219,6 +219,8 @@ GpStatus WINGDIPAPI GdipCreateMatrix(GpMatrix**); GpStatus WINGDIPAPI GdipCreateMatrix2(REAL,REAL,REAL,REAL,REAL,REAL,GpMatrix**); GpStatus WINGDIPAPI GdipCreateMatrix3(GDIPCONST GpRectF *,GDIPCONST GpPointF*, GpMatrix**); +GpStatus WINGDIPAPI GdipCreateMatrix3I(GDIPCONST GpRect*,GDIPCONST GpPoint*,GpMatrix**); + GpStatus WINGDIPAPI GdipDeleteMatrix(GpMatrix*); GpStatus WINGDIPAPI GdipGetMatrixElements(GDIPCONST GpMatrix*,REAL*); GpStatus WINGDIPAPI GdipMultiplyMatrix(GpMatrix*,GpMatrix*,GpMatrixOrder);

1 0

Nikolay Sivov : gdiplus: Implement GdipCreatePath2I.
by Alexandre Julliard 17 Apr '08

17 Apr '08

Module: wine Branch: master Commit: ae576c40b8b4d85ea39c8ef4c4a32dfc6646ad3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae576c40b8b4d85ea39c8ef4c… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Apr 17 03:02:27 2008 +0400 gdiplus: Implement GdipCreatePath2I. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphicspath.c | 21 +++++++++++++++++++++ include/gdiplusflat.h | 1 + 3 files changed, 23 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 14e32eb..f697e50 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -114,7 +114,7 @@ @ stdcall GdipCreateMetafileFromWmf(ptr long ptr ptr) @ stub GdipCreateMetafileFromWmfFile @ stdcall GdipCreatePath2(ptr ptr long long ptr) -@ stub GdipCreatePath2I +@ stdcall GdipCreatePath2I(ptr ptr long long ptr) @ stdcall GdipCreatePath(long ptr) @ stdcall GdipCreatePathGradient(ptr long long ptr) @ stdcall GdipCreatePathGradientFromPath(ptr ptr) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 5c2e287..0375f8e 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -403,6 +403,27 @@ GpStatus WINGDIPAPI GdipCreatePath2(GDIPCONST GpPointF* points, return Ok; } +GpStatus WINGDIPAPI GdipCreatePath2I(GDIPCONST GpPoint* points, + GDIPCONST BYTE* types, INT count, GpFillMode fill, GpPath **path) +{ + GpPointF *ptF; + GpStatus ret; + INT i; + + ptF = GdipAlloc(sizeof(GpPointF)*count); + + for(i = 0;i < count; i++){ + ptF[i].X = (REAL)points[i].X; + ptF[i].Y = (REAL)points[i].Y; + } + + ret = GdipCreatePath2(ptF, types, count, fill, path); + + GdipFree(ptF); + + return ret; +} + GpStatus WINGDIPAPI GdipDeletePath(GpPath *path) { if(!path) diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 3819e99..a9cdc54 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -198,6 +198,7 @@ GpStatus WINGDIPAPI GdipClosePathFigures(GpPath*); GpStatus WINGDIPAPI GdipCreatePath(GpFillMode,GpPath**); GpStatus WINGDIPAPI GdipCreatePath2(GDIPCONST GpPointF*,GDIPCONST BYTE*,INT, GpFillMode,GpPath**); +GpStatus WINGDIPAPI GdipCreatePath2I(GDIPCONST GpPoint*,GDIPCONST BYTE*,INT,GpFillMode,GpPath**); GpStatus WINGDIPAPI GdipDeletePath(GpPath*); GpStatus WINGDIPAPI GdipGetPathFillMode(GpPath*,GpFillMode*); GpStatus WINGDIPAPI GdipGetPathPoints(GpPath*,GpPointF*,INT);

1 0

Reece Dunn : shlwapi: Fixed the todo blocks in the SHCreateStreamOnFile tests.
by Alexandre Julliard 17 Apr '08

17 Apr '08

Module: wine Branch: master Commit: 8ea25acd7306994169ab5b46997629051d0aaa63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ea25acd7306994169ab5b469… Author: Reece Dunn <msclrhd(a)googlemail.com> Date: Tue Apr 15 21:16:03 2008 +0100 shlwapi: Fixed the todo blocks in the SHCreateStreamOnFile tests. --- dlls/shlwapi/istream.c | 37 +++++++++++++++---------------------- dlls/shlwapi/tests/istream.c | 31 ------------------------------- 2 files changed, 15 insertions(+), 53 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8ea25acd7306994169ab5…

1 0

Reece Dunn : shlwapi/tests: Enumerate the STGM sharing modes in the SHCreateStreamOnFile tests.
by Alexandre Julliard 17 Apr '08

17 Apr '08

Module: wine Branch: master Commit: fa7f16562e8b60abea2970d1d9f079547d62e3cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa7f16562e8b60abea2970d1d… Author: Reece Dunn <msclrhd(a)googlemail.com> Date: Sun Apr 13 14:05:07 2008 +0100 shlwapi/tests: Enumerate the STGM sharing modes in the SHCreateStreamOnFile tests. --- dlls/shlwapi/tests/istream.c | 70 ++++++++++++++++++++++++------------------ 1 files changed, 40 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fa7f16562e8b60abea297…

1 0

Alexandre Julliard : server: Keep a file descriptor open to the config directory to make sure we don' t write the registry in the wrong place.
by Alexandre Julliard 17 Apr '08

17 Apr '08

Module: wine Branch: master Commit: 161160f05ae2340ab5bb35307ca02056cbca68e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=161160f05ae2340ab5bb35307… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 17 12:41:34 2008 +0200 server: Keep a file descriptor open to the config directory to make sure we don't write the registry in the wrong place. --- server/registry.c | 57 +++++++++++++++++++--------------------------------- server/request.c | 11 ++++++++- server/request.h | 1 + 3 files changed, 31 insertions(+), 38 deletions(-) diff --git a/server/registry.c b/server/registry.c index 5084892..d2c0b23 100644 --- a/server/registry.c +++ b/server/registry.c @@ -112,7 +112,7 @@ static void set_periodic_save_timer(void); struct save_branch_info { struct key *key; - char *path; + const char *path; }; #define MAX_SAVE_BRANCH_INFO 3 @@ -1396,11 +1396,9 @@ static void load_init_registry_from_file( const char *filename, struct key *key assert( save_branch_count < MAX_SAVE_BRANCH_INFO ); - if ((save_branch_info[save_branch_count].path = strdup( filename ))) - { - save_branch_info[save_branch_count++].key = (struct key *)grab_object( key ); - make_object_static( &key->obj ); - } + save_branch_info[save_branch_count].path = filename; + save_branch_info[save_branch_count++].key = (struct key *)grab_object( key ); + make_object_static( &key->obj ); } static WCHAR *format_user_registry_path( const SID *sid, struct unicode_str *path ) @@ -1438,27 +1436,24 @@ void init_registry(void) WCHAR *current_user_path; struct unicode_str current_user_str; - const char *config = wine_get_config_dir(); - char *p, *filename; struct key *key; int dummy; + /* switch to the config dir */ + + if (fchdir( config_dir_fd ) == -1) fatal_perror( "chdir to config dir" ); + /* create the root key */ root_key = alloc_key( &root_name, time(NULL) ); assert( root_key ); make_object_static( &root_key->obj ); - if (!(filename = malloc( strlen(config) + 16 ))) fatal_error( "out of memory\n" ); - strcpy( filename, config ); - p = filename + strlen(filename); - /* load system.reg into Registry\Machine */ if (!(key = create_key( root_key, &HKLM_name, NULL, 0, time(NULL), &dummy ))) fatal_error( "could not create Machine registry key\n" ); - strcpy( p, "/system.reg" ); - load_init_registry_from_file( filename, key ); + load_init_registry_from_file( "system.reg", key ); release_object( key ); /* load userdef.reg into Registry\User\.Default */ @@ -1466,8 +1461,7 @@ void init_registry(void) if (!(key = create_key( root_key, &HKU_name, NULL, 0, time(NULL), &dummy ))) fatal_error( "could not create User\\.Default registry key\n" ); - strcpy( p, "/userdef.reg" ); - load_init_registry_from_file( filename, key ); + load_init_registry_from_file( "userdef.reg", key ); release_object( key ); /* load user.reg into HKEY_CURRENT_USER */ @@ -1478,14 +1472,14 @@ void init_registry(void) !(key = create_key( root_key, &current_user_str, NULL, 0, time(NULL), &dummy ))) fatal_error( "could not create HKEY_CURRENT_USER registry key\n" ); free( current_user_path ); - strcpy( p, "/user.reg" ); - load_init_registry_from_file( filename, key ); + load_init_registry_from_file( "user.reg", key ); release_object( key ); - free( filename ); - /* start the periodic save timer */ set_periodic_save_timer(); + + /* go back to the server dir */ + if (fchdir( server_dir_fd ) == -1) fatal_perror( "chdir to server dir" ); } /* save a registry branch to a file */ @@ -1532,8 +1526,8 @@ static void save_registry( struct key *key, obj_handle_t handle ) static int save_branch( struct key *key, const char *path ) { struct stat st; - char *p, *real, *tmp = NULL; - int fd, count = 0, ret = 0, by_symlink; + char *p, *tmp = NULL; + int fd, count = 0, ret = 0; FILE *f; if (!(key->flags & KEY_DIRTY)) @@ -1542,25 +1536,13 @@ static int save_branch( struct key *key, const char *path ) return 1; } - /* get the real path */ - - by_symlink = (!lstat(path, &st) && S_ISLNK (st.st_mode)); - if (!(real = malloc( PATH_MAX ))) return 0; - if (!realpath( path, real )) - { - free( real ); - real = NULL; - } - else path = real; - /* test the file type */ if ((fd = open( path, O_WRONLY )) != -1) { /* if file is not a regular file or has multiple links or is accessed * via symbolic links, write directly into it; otherwise use a temp file */ - if (by_symlink || - (!fstat( fd, &st ) && (!S_ISREG(st.st_mode) || st.st_nlink > 1))) + if (!lstat( path, &st ) && (!S_ISREG(st.st_mode) || st.st_nlink > 1)) { ftruncate( fd, 0 ); goto save; @@ -1610,7 +1592,6 @@ static int save_branch( struct key *key, const char *path ) done: free( tmp ); - free( real ); if (ret) make_clean( key ); return ret; } @@ -1620,9 +1601,11 @@ static void periodic_save( void *arg ) { int i; + if (fchdir( config_dir_fd ) == -1) return; save_timeout_user = NULL; for (i = 0; i < save_branch_count; i++) save_branch( save_branch_info[i].key, save_branch_info[i].path ); + if (fchdir( server_dir_fd ) == -1) fatal_perror( "chdir to server dir" ); set_periodic_save_timer(); } @@ -1638,6 +1621,7 @@ void flush_registry(void) { int i; + if (fchdir( config_dir_fd ) == -1) return; for (i = 0; i < save_branch_count; i++) { if (!save_branch( save_branch_info[i].key, save_branch_info[i].path )) @@ -1647,6 +1631,7 @@ void flush_registry(void) perror( " " ); } } + if (fchdir( server_dir_fd ) == -1) fatal_perror( "chdir to server dir" ); } diff --git a/server/request.c b/server/request.c index 9a2c7b1..8726e1c 100644 --- a/server/request.c +++ b/server/request.c @@ -120,6 +120,8 @@ static const struct fd_ops master_socket_fd_ops = struct thread *current = NULL; /* thread handling the current request */ unsigned int global_error = 0; /* global error code for when no thread is current */ timeout_t server_start_time = 0; /* server startup time */ +int server_dir_fd = -1; /* file descriptor for the server dir */ +int config_dir_fd = -1; /* file descriptor for the config dir */ static struct master_socket *master_socket; /* the master socket object */ static struct timeout_user *master_timeout; @@ -553,7 +555,8 @@ static void create_server_dir( const char *dir ) create_dir( server_dir, &st ); if (chdir( server_dir ) == -1) fatal_perror( "chdir %s", server_dir ); - if (stat( ".", &st2 ) == -1) fatal_perror( "stat %s", server_dir ); + if ((server_dir_fd = open( ".", O_RDONLY )) == -1) fatal_perror( "open %s", server_dir ); + if (fstat( server_dir_fd, &st2 ) == -1) fatal_perror( "stat %s", server_dir ); if (st.st_dev != st2.st_dev || st.st_ino != st2.st_ino) fatal_error( "chdir did not end up in %s\n", server_dir ); @@ -733,6 +736,7 @@ static void acquire_lock(void) void open_master_socket(void) { const char *server_dir = wine_get_server_dir(); + const char *config_dir = wine_get_config_dir(); int fd, pid, status, sync_pipe[2]; char dummy; @@ -740,7 +744,10 @@ void open_master_socket(void) assert( sizeof(union generic_request) == sizeof(struct request_max_size) ); assert( sizeof(union generic_reply) == sizeof(struct request_max_size) ); - if (!server_dir) fatal_error( "directory %s cannot be accessed\n", wine_get_config_dir() ); + if (!server_dir) fatal_error( "directory %s cannot be accessed\n", config_dir ); + if (chdir( config_dir ) == -1) fatal_perror( "chdir to %s", config_dir ); + if ((config_dir_fd = open( ".", O_RDONLY )) == -1) fatal_perror( "open %s", config_dir ); + create_server_dir( server_dir ); if (!foreground) diff --git a/server/request.h b/server/request.h index 283ad97..496c5ff 100644 --- a/server/request.h +++ b/server/request.h @@ -61,6 +61,7 @@ extern void close_master_socket( timeout_t timeout ); extern void shutdown_master_socket(void); extern int wait_for_lock(void); extern int kill_lock_owner( int sig ); +extern int server_dir_fd, config_dir_fd; extern void trace_request(void); extern void trace_reply( enum request req, const union generic_reply *reply );

1 0

James Hawkins : kernel32: Fix a test that fails in win2k.
by Alexandre Julliard 17 Apr '08

17 Apr '08

Module: wine Branch: master Commit: c009d1e9c431d461f37569d2ddf68921bf67bcab URL: http://source.winehq.org/git/wine.git/?a=commit;h=c009d1e9c431d461f37569d2d… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Wed Apr 16 16:02:21 2008 -0500 kernel32: Fix a test that fails in win2k. --- dlls/kernel32/tests/locale.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 47f50b1..60e6f11 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -1002,7 +1002,9 @@ static void test_CompareStringA(void) ok(ret == 2, "a vs a expected 2, got %d\n", ret); ret = CompareStringA(lcid, 0, "a\0b", 4, "a", 2); - ok(ret == 3, "a\\0b vs a expected 3, got %d\n", ret); + ok(ret == CSTR_EQUAL || /* win2k */ + ret == CSTR_GREATER_THAN, + "a\\0b vs a expected CSTR_EQUAL or CSTR_GREATER_THAN, got %d\n", ret); ret = CompareStringA(lcid, 0, "\2", 2, "\1", 2); todo_wine ok(ret != 2, "\\2 vs \\1 expected unequal\n");

1 0