Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 35067: - Revert my no_change_list modification, it turns out it's not needed, since when write_immed is set, changes aren't added to the list.
by fireball＠svn.reactos.org 03 Aug '08

03 Aug '08

Author: fireball Date: Sun Aug 3 07:50:10 2008 New Revision: 35067 URL: http://svn.reactos.org/svn/reactos?rev=35067&view=rev Log: - Revert my no_change_list modification, it turns out it's not needed, since when write_immed is set, changes aren't added to the list. Modified: trunk/rosapps/applications/sysutils/dosfsck/dosfsck.c trunk/rosapps/applications/sysutils/dosfsck/dosfsck.h trunk/rosapps/applications/sysutils/dosfsck/io.c Modified: trunk/rosapps/applications/sysutils/dosfsck/dosfsck.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/dosf… ============================================================================== --- trunk/rosapps/applications/sysutils/dosfsck/dosfsck.c [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/dosfsck/dosfsck.c [iso-8859-1] Sun Aug 3 07:50:10 2008 @@ -24,7 +24,7 @@ #include "check.h" -int interactive = 0,list = 0,test = 0,verbose = 0,write_immed = 0,no_change_list=0; +int interactive = 0,list = 0,test = 0,verbose = 0,write_immed = 0; int atari_format = 0; unsigned n_files = 0; void *mem_queue = NULL; Modified: trunk/rosapps/applications/sysutils/dosfsck/dosfsck.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/dosf… ============================================================================== --- trunk/rosapps/applications/sysutils/dosfsck/dosfsck.h [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/dosfsck/dosfsck.h [iso-8859-1] Sun Aug 3 07:50:10 2008 @@ -162,7 +162,7 @@ #define offsetof(t,e) ((int)&(((t *)0)->e)) #endif -extern int interactive,list,verbose,test,write_immed,no_change_list; +extern int interactive,list,verbose,test,write_immed; extern int atari_format; extern unsigned n_files; extern void *mem_queue; Modified: trunk/rosapps/applications/sysutils/dosfsck/io.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/dosf… ============================================================================== --- trunk/rosapps/applications/sysutils/dosfsck/io.c [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/dosfsck/io.c [iso-8859-1] Sun Aug 3 07:50:10 2008 @@ -194,16 +194,14 @@ die("Wrote %d bytes instead of %d at %I64d",did,size,pos); } - if (!no_change_list) - { - new = alloc(sizeof(CHANGE)); - new->pos = pos; - memcpy(new->data = alloc(new->size = size),data,size); - new->next = NULL; - if (last) last->next = new; - else changes = new; - last = new; - } + new = alloc(sizeof(CHANGE)); + new->pos = pos; + memcpy(new->data = alloc(new->size = size),data,size); + new->next = NULL; + if (last) last->next = new; + else changes = new; + last = new; + #else //SAE if (write_immed) { did_change = 1; @@ -230,7 +228,6 @@ int old_write_immed = write_immed; /* Disable writes to the list now */ - no_change_list = 1; write_immed = 1; while (changes) { @@ -255,7 +252,6 @@ } /* Restore values */ - no_change_list = 0; write_immed = old_write_immed; }

1 0

[fireball] 35066: - Fix warnings in io.c.
by fireball＠svn.reactos.org 03 Aug '08

03 Aug '08

Author: fireball Date: Sun Aug 3 07:46:43 2008 New Revision: 35066 URL: http://svn.reactos.org/svn/reactos?rev=35066&view=rev Log: - Fix warnings in io.c. Modified: trunk/rosapps/applications/sysutils/dosfsck/io.c Modified: trunk/rosapps/applications/sysutils/dosfsck/io.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/dosf… ============================================================================== --- trunk/rosapps/applications/sysutils/dosfsck/io.c [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/dosfsck/io.c [iso-8859-1] Sun Aug 3 07:46:43 2008 @@ -68,7 +68,7 @@ #endif #define llseek WIN32llseek -static int is_device = 0; +//static int is_device = 0; void fs_open(char *path,int rw) { @@ -139,8 +139,6 @@ #if 1 // TMN const size_t readsize_aligned = (size % 512) ? (size + (512 - (size % 512))) : size; // TMN: const loff_t seekpos_aligned = pos - (pos % 512); // TMN: - const size_t seek_delta = (size_t)(pos - seekpos_aligned); // TMN: - const size_t readsize = (size_t)(pos - seekpos_aligned) + readsize_aligned; // TMN: scratch = alloc(readsize_aligned); if (llseek(fd,seekpos_aligned,0) != seekpos_aligned) pdie("Seek to %lld",pos); okay = read(fd,scratch,readsize_aligned) == (int)readsize_aligned; @@ -166,7 +164,6 @@ const size_t readsize_aligned = (size % 512) ? (size + (512 - (size % 512))) : size; const loff_t seekpos_aligned = pos - (pos % 512); const size_t seek_delta = (size_t)(pos - seekpos_aligned); - const size_t readsize = (size_t)(pos - seekpos_aligned) + readsize_aligned; boolean use_read = (seek_delta != 0) || ((readsize_aligned-size) != 0); /* Aloc temp buffer if write is not aligned */ @@ -184,7 +181,7 @@ if (read(fd,scratch,readsize_aligned) < 0) pdie("Read %d bytes at %I64d",size,pos); /* Patch data in memory */ - memcpy(data, scratch+seek_delta, size); + memcpy(data, (char *)scratch+seek_delta, size); } /* Write it back */ @@ -229,7 +226,7 @@ static void fs_flush(void) { CHANGE *this; - int size; + //int size; int old_write_immed = write_immed; /* Disable writes to the list now */ @@ -300,9 +297,9 @@ static int WIN32open(const char *path, int oflag, ...) { HANDLE fh; - DWORD desiredAccess; - DWORD shareMode; - DWORD creationDisposition; + DWORD desiredAccess = 0; + DWORD shareMode = 0; + DWORD creationDisposition = 0; DWORD flagsAttributes = FILE_ATTRIBUTE_NORMAL; SECURITY_ATTRIBUTES securityAttributes; va_list ap;

1 0

[fireball] 35065: - Add proper write support. - Change fs_flush logic, so it reuses the same fs_write routine instead of duplicating code. - RosBE supports %I64d, so use it instead of %lld.
by fireball＠svn.reactos.org 03 Aug '08

03 Aug '08

Author: fireball Date: Sun Aug 3 07:24:15 2008 New Revision: 35065 URL: http://svn.reactos.org/svn/reactos?rev=35065&view=rev Log: - Add proper write support. - Change fs_flush logic, so it reuses the same fs_write routine instead of duplicating code. - RosBE supports %I64d, so use it instead of %lld. Modified: trunk/rosapps/applications/sysutils/dosfsck/dosfsck.c trunk/rosapps/applications/sysutils/dosfsck/dosfsck.h trunk/rosapps/applications/sysutils/dosfsck/io.c Modified: trunk/rosapps/applications/sysutils/dosfsck/dosfsck.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/dosf… ============================================================================== --- trunk/rosapps/applications/sysutils/dosfsck/dosfsck.c [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/dosfsck/dosfsck.c [iso-8859-1] Sun Aug 3 07:24:15 2008 @@ -24,7 +24,7 @@ #include "check.h" -int interactive = 0,list = 0,test = 0,verbose = 0,write_immed = 0; +int interactive = 0,list = 0,test = 0,verbose = 0,write_immed = 0,no_change_list=0; int atari_format = 0; unsigned n_files = 0; void *mem_queue = NULL; Modified: trunk/rosapps/applications/sysutils/dosfsck/dosfsck.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/dosf… ============================================================================== --- trunk/rosapps/applications/sysutils/dosfsck/dosfsck.h [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/dosfsck/dosfsck.h [iso-8859-1] Sun Aug 3 07:24:15 2008 @@ -162,7 +162,7 @@ #define offsetof(t,e) ((int)&(((t *)0)->e)) #endif -extern int interactive,list,verbose,test,write_immed; +extern int interactive,list,verbose,test,write_immed,no_change_list; extern int atari_format; extern unsigned n_files; extern void *mem_queue; Modified: trunk/rosapps/applications/sysutils/dosfsck/io.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/dosf… ============================================================================== --- trunk/rosapps/applications/sysutils/dosfsck/io.c [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/dosfsck/io.c [iso-8859-1] Sun Aug 3 07:24:15 2008 @@ -107,13 +107,8 @@ const size_t seek_delta = (size_t)(pos - seekpos_aligned); // TMN: const size_t readsize = (size_t)(pos - seekpos_aligned) + readsize_aligned; // TMN: char* tmpBuf = malloc(readsize_aligned); // TMN: -#ifdef _MSC_VER if (llseek(fd,seekpos_aligned,0) != seekpos_aligned) pdie("Seek to %I64d",pos); - if ((got = read(fd,tmpBuf,readsize_aligned)) < 0) pdie("Read %d bytes at %I64dd",size,pos); -#else - if (llseek(fd,seekpos_aligned,0) != seekpos_aligned) pdie("Seek to %lld",pos); - if ((got = read(fd,tmpBuf,readsize_aligned)) < 0) pdie("Read %d bytes at %lld",size,pos); -#endif + if ((got = read(fd,tmpBuf,readsize_aligned)) < 0) pdie("Read %d bytes at %I64d",size,pos); assert(got >= size); got = size; assert(seek_delta + size <= readsize); @@ -123,7 +118,7 @@ if (llseek(fd,pos,0) != pos) pdie("Seek to %lld",pos); if ((got = read(fd,data,size)) < 0) pdie("Read %d bytes at %lld",size,pos); #endif // TMN: - if (got != size) die("Got %d bytes instead of %d at %lld",got,size,pos); + if (got != size) die("Got %d bytes instead of %d at %I64d",got,size,pos); for (walk = changes; walk; walk = walk->next) { if (walk->pos < pos+size && walk->pos+walk->size > pos) { if (walk->pos < pos) @@ -166,32 +161,52 @@ int did; #if 1 //SAE - void *scratch; - const size_t readsize_aligned = (size % 512) ? (size + (512 - (size % 512))) : size; - const loff_t seekpos_aligned = pos - (pos % 512); - const size_t seek_delta = (size_t)(pos - seekpos_aligned); - const size_t readsize = (size_t)(pos - seekpos_aligned) + readsize_aligned; - scratch = alloc(readsize_aligned); - if (write_immed) { - did_change = 1; - if (llseek(fd,seekpos_aligned,0) != seekpos_aligned) pdie("Seek to %lld",pos); - if ((did = write(fd,data,readsize_aligned)) == (int)readsize_aligned) - { - free(scratch); - return; - } - if (did < 0) pdie("Write %d bytes at %lld",size,pos); - die("Wrote %d bytes instead of %d at %lld",did,size,pos); + void *scratch; + const size_t readsize_aligned = (size % 512) ? (size + (512 - (size % 512))) : size; + const loff_t seekpos_aligned = pos - (pos % 512); + const size_t seek_delta = (size_t)(pos - seekpos_aligned); + const size_t readsize = (size_t)(pos - seekpos_aligned) + readsize_aligned; + boolean use_read = (seek_delta != 0) || ((readsize_aligned-size) != 0); + + /* Aloc temp buffer if write is not aligned */ + if (use_read) + scratch = alloc(readsize_aligned); + else + scratch = data; + + did_change = 1; + if (llseek(fd,seekpos_aligned,0) != seekpos_aligned) pdie("Seek to %I64d",seekpos_aligned); + + if (use_read) + { + /* Read aligned data */ + if (read(fd,scratch,readsize_aligned) < 0) pdie("Read %d bytes at %I64d",size,pos); + + /* Patch data in memory */ + memcpy(data, scratch+seek_delta, size); + } + + /* Write it back */ + if ((did = write(fd,scratch,readsize_aligned)) == (int)readsize_aligned) + { + if (use_read) free(scratch); + return; + } + if (did < 0) pdie("Write %d bytes at %I64d",size,pos); + die("Wrote %d bytes instead of %d at %I64d",did,size,pos); } - new = alloc(sizeof(CHANGE)); - new->pos = pos; - memcpy(new->data = alloc(new->size = readsize_aligned),data,readsize_aligned); - new->next = NULL; - if (last) last->next = new; - else changes = new; - last = new; - + + if (!no_change_list) + { + new = alloc(sizeof(CHANGE)); + new->pos = pos; + memcpy(new->data = alloc(new->size = size),data,size); + new->next = NULL; + if (last) last->next = new; + else changes = new; + last = new; + } #else //SAE if (write_immed) { did_change = 1; @@ -215,10 +230,16 @@ { CHANGE *this; int size; + int old_write_immed = write_immed; + + /* Disable writes to the list now */ + no_change_list = 1; + write_immed = 1; while (changes) { this = changes; changes = changes->next; +#if 0 if (llseek(fd,this->pos,0) != this->pos) fprintf(stderr,"Seek to %lld failed: %s\n Did not write %d bytes.\n", (__int64)this->pos,strerror(errno),this->size); @@ -228,9 +249,17 @@ else if (size != this->size) fprintf(stderr,"Wrote %d bytes instead of %d bytes at %lld." "\n",size,this->size,(__int64)this->pos); +#else + fs_write(this->pos, this->size, this->data); +#endif + free(this->data); free(this); } + + /* Restore values */ + no_change_list = 0; + write_immed = old_write_immed; }

1 0

[fireball] 35064: - Revert 35039 on hpoussin's request.
by fireball＠svn.reactos.org 03 Aug '08

03 Aug '08

Author: fireball Date: Sun Aug 3 06:14:34 2008 New Revision: 35064 URL: http://svn.reactos.org/svn/reactos?rev=35064&view=rev Log: - Revert 35039 on hpoussin's request. Modified: trunk/reactos/tools/widl/typegen.c trunk/reactos/tools/widl/widl_ros.diff Modified: trunk/reactos/tools/widl/typegen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typegen.c?rev=3… ============================================================================== --- trunk/reactos/tools/widl/typegen.c [iso-8859-1] (original) +++ trunk/reactos/tools/widl/typegen.c [iso-8859-1] Sun Aug 3 06:14:34 2008 @@ -3299,9 +3299,8 @@ print_file(file, 0, "static void __RPC_USER %s_%sExprEval_%04u(PMIDL_STUB_MESSAGE pStubMsg)\n", iface, name, callback_offset); print_file(file, 0, "{\n"); - print_file (file, 1, "%s%s *%s = (%s%s *)(pStubMsg->StackTop - %u);\n", - is_struct(eval->structure->type) ? "struct " : "", name, var_name, - is_struct(eval->structure->type) ? "struct " : "", name, eval->baseoff); + print_file (file, 1, "%s *%s = (%s *)(pStubMsg->StackTop - %u);\n", + name, var_name, name, eval->baseoff); print_file(file, 1, "pStubMsg->Offset = 0;\n"); /* FIXME */ print_file(file, 1, "pStubMsg->MaxCount = (unsigned long)"); write_struct_expr(file, eval->expr, 1, fields, var_name); Modified: trunk/reactos/tools/widl/widl_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widl_ros.diff?r… ============================================================================== --- trunk/reactos/tools/widl/widl_ros.diff [iso-8859-1] (original) +++ trunk/reactos/tools/widl/widl_ros.diff [iso-8859-1] Sun Aug 3 06:14:34 2008 @@ -46,22 +46,6 @@ print_server("#include \"%s\"\n", header_name); fprintf(server, "\n"); } -Index: typegen.c -=================================================================== ---- typegen.c (revision 32187) -+++ typegen.c (working copy) -@@ -3299,8 +3299,9 @@ - print_file(file, 0, "static void __RPC_USER %s_%sExprEval_%04u(PMIDL_STUB_MESSAGE pStubMsg)\n", - iface, name, callback_offset); - print_file(file, 0, "{\n"); -- print_file (file, 1, "%s *%s = (%s *)(pStubMsg->StackTop - %u);\n", -- name, var_name, name, eval->baseoff); -+ print_file (file, 1, "%s%s *%s = (%s%s *)(pStubMsg->StackTop - %u);\n", -+ is_struct(eval->structure->type) ? "struct " : "", name, var_name, -+ is_struct(eval->structure->type) ? "struct " : "", name, eval->baseoff); - print_file(file, 1, "pStubMsg->Offset = 0;\n"); /* FIXME */ - print_file(file, 1, "pStubMsg->MaxCount = (unsigned long)"); - write_struct_expr(file, eval->expr, 1, fields, var_name); Index: typelib.c =================================================================== --- typelib.c (revision 32187)

1 0

[hpoussin] 35063: Workaround WIDL bug
by hpoussin＠svn.reactos.org 03 Aug '08

03 Aug '08

Author: hpoussin Date: Sun Aug 3 06:06:40 2008 New Revision: 35063 URL: http://svn.reactos.org/svn/reactos?rev=35063&view=rev Log: Workaround WIDL bug Modified: trunk/reactos/include/reactos/idl/lsa.idl Modified: trunk/reactos/include/reactos/idl/lsa.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/lsa.id… ============================================================================== --- trunk/reactos/include/reactos/idl/lsa.idl [iso-8859-1] (original) +++ trunk/reactos/include/reactos/idl/lsa.idl [iso-8859-1] Sun Aug 3 06:06:40 2008 @@ -38,8 +38,10 @@ SECURITY_DESCRIPTOR_CONTROL Control; PRPC_SID Owner; PRPC_SID Group; - PLSAPR_ACL Sacl; - PLSAPR_ACL Dacl; + LSAPR_ACL *Sacl; + /* FIXME: should be PLSAPR_ACL Sacl; */ + LSAPR_ACL *Dacl; + /* FIXME: should be PLSAPR_ACL Dacl; */ } LSAPR_SECURITY_DESCRIPTOR, *PLSAPR_SECURITY_DESCRIPTOR; cpp_quote("#if 0");

1 0

[cgutman] 35062: - Handle STATUS_REMOTE_NOT_LISTENING
by cgutman＠svn.reactos.org 03 Aug '08

03 Aug '08

Author: cgutman Date: Sun Aug 3 04:52:22 2008 New Revision: 35062 URL: http://svn.reactos.org/svn/reactos?rev=35062&view=rev Log: - Handle STATUS_REMOTE_NOT_LISTENING Modified: branches/aicom-network-fixes/dll/win32/msafd/misc/dllmain.c Modified: branches/aicom-network-fixes/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/dll/win32/m… ============================================================================== --- branches/aicom-network-fixes/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Sun Aug 3 04:52:22 2008 @@ -288,6 +288,7 @@ case STATUS_BUFFER_OVERFLOW: *Errno = WSAEMSGSIZE; break; case STATUS_INSUFFICIENT_RESOURCES: *Errno = WSA_NOT_ENOUGH_MEMORY; break; case STATUS_INVALID_CONNECTION: *Errno = WSAEAFNOSUPPORT; break; + case STATUS_REMOTE_NOT_LISTENING: *Errno = WSAECONNRESET; break; default: DbgPrint("MSAFD: Error %x is unknown\n", Status); *Errno = WSAEINVAL; break;

1 0

[cgutman] 35061: - Handle STATUS_INSUFFICIENT_RESOURCES
by cgutman＠svn.reactos.org 03 Aug '08

03 Aug '08

Author: cgutman Date: Sun Aug 3 04:40:13 2008 New Revision: 35061 URL: http://svn.reactos.org/svn/reactos?rev=35061&view=rev Log: - Handle STATUS_INSUFFICIENT_RESOURCES Modified: branches/aicom-network-fixes/dll/win32/msafd/misc/dllmain.c Modified: branches/aicom-network-fixes/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/dll/win32/m… ============================================================================== --- branches/aicom-network-fixes/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Sun Aug 3 04:40:13 2008 @@ -286,6 +286,7 @@ case STATUS_END_OF_FILE: *Errno = WSAESHUTDOWN; break; case STATUS_PENDING: *Errno = WSA_IO_PENDING; break; case STATUS_BUFFER_OVERFLOW: *Errno = WSAEMSGSIZE; break; + case STATUS_INSUFFICIENT_RESOURCES: *Errno = WSA_NOT_ENOUGH_MEMORY; break; case STATUS_INVALID_CONNECTION: *Errno = WSAEAFNOSUPPORT; break; default: DbgPrint("MSAFD: Error %x is unknown\n", Status);

1 0

[pschweitzer] 35060: Fixed French translation for cacls by Amine Khaldi
by pschweitzer＠svn.reactos.org 03 Aug '08

03 Aug '08

Author: pschweitzer Date: Sun Aug 3 04:18:24 2008 New Revision: 35060 URL: http://svn.reactos.org/svn/reactos?rev=35060&view=rev Log: Fixed French translation for cacls by Amine Khaldi Modified: trunk/reactos/base/applications/cacls/lang/fr-FR.rc Modified: trunk/reactos/base/applications/cacls/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cacls/la… ============================================================================== --- trunk/reactos/base/applications/cacls/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cacls/lang/fr-FR.rc [iso-8859-1] Sun Aug 3 04:18:24 2008 @@ -7,17 +7,17 @@ CACLS nomfichier [/T] [/E] [/C] [/G user:perm [...]] [/R user [...]]\n\ [/P user:perm [...]] [/D user [...]]\n\ nomfichier Affiche les ACLs du fichier.\n\ - /T Change les ACLs des fichiers specifiés dans\n\ + /T Change les ACLs des fichiers spécifiés dans\n\ le répertoire en cours et tous les sous-répertoires.\n\ /E Édite les ACL au lieu de les remplacer.\n\ /C Continuer en cas de refus d'accès.\n\ - /G user:perm Accorder des droit d'accès à l'utilisateur spécifié.\n\ + /G user:perm Accorder des droits d'accès à l'utilisateur spécifié.\n\ Perm peut valoir : R Lecture\n\ W Écriture\n\ C Modification (Écriture)\n\ F Contrôle total\n\ /R user Supprime les droits d'accès de l'utilisateur spécifié (valide uniquement avec /E).\n\ - /P user:perm Remplace les droits d'accès de l'utilisateur specifié.\n\ + /P user:perm Remplace les droits d'accès de l'utilisateur spécifié.\n\ Perm peut valoir : N Aucun \n\ R Lecture\n\ W Écriture\n\ @@ -27,11 +27,11 @@ Il est possible d'utiliser des caractères joker pour sélectionner plus d'un fichier avec une commande.\n\ Il est possible de spécifier plus d'un utilisateur dans une commande.\n\n\ Abréviations:\n\ - CI - Heritage du conteneur.\n\ + CI - Héritage du conteneur.\n\ Le ACE sera appliqué aux répertoires.\n\ OI - Héritage de l'objet.\n\ Le ACE sera appliqué aux fichiers.\n\ - IO - Heritage seul.\n\ + IO - Héritage seul.\n\ Le ACE ne sera pas appliqué au fichier/répertoire actuel.\n" IDS_ABBR_CI, "(CI)"

1 0

[sginsberg] 35059: - Use RtlCopyUnicodeString instead of RtlInitUnicodeString when copying a string
by sginsberg＠svn.reactos.org 03 Aug '08

03 Aug '08

Author: sginsberg Date: Sun Aug 3 03:53:27 2008 New Revision: 35059 URL: http://svn.reactos.org/svn/reactos?rev=35059&view=rev Log: - Use RtlCopyUnicodeString instead of RtlInitUnicodeString when copying a string Modified: trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c Modified: trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb_symbols.… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c [iso-8859-1] Sun Aug 3 03:53:27 2008 @@ -354,7 +354,7 @@ CacheEntry->FileName.Buffer = ExAllocatePoolWithTag(NonPagedPool, FileName->Length, TAG_KDBS); - RtlInitUnicodeString(&CacheEntry->FileName, FileName->Buffer); + RtlCopyUnicodeString(&CacheEntry->FileName, FileName); ASSERT(CacheEntry->FileName.Buffer); CacheEntry->RefCount = 1; CacheEntry->RosSymInfo = RosSymInfo;

1 0

[pschweitzer] 35058: Fixed rosapps build
by pschweitzer＠svn.reactos.org 03 Aug '08

03 Aug '08

Author: pschweitzer Date: Sun Aug 3 03:38:59 2008 New Revision: 35058 URL: http://svn.reactos.org/svn/reactos?rev=35058&view=rev Log: Fixed rosapps build Added: trunk/reactos/dll/win32/dbghelp/dbghelp_ros.diff (with props) Modified: trunk/reactos/dll/win32/dbghelp/dbghelp.spec trunk/reactos/dll/win32/dbghelp/symbol.c trunk/reactos/include/psdk/dbghelp.h Modified: trunk/reactos/dll/win32/dbghelp/dbghelp.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/dbghelp.… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/dbghelp.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/dbghelp.spec [iso-8859-1] Sun Aug 3 03:38:59 2008 @@ -40,8 +40,8 @@ @ stub SymEnumSym @ stdcall SymEnumSymbols(ptr double str ptr ptr) @ stdcall SymEnumSymbolsW(ptr double wstr ptr ptr) -@ stub SymEnumSymbolsForAddr -@ stub SymEnumSymbolsForAddrW +@ stdcall SymEnumSymbolsForAddr (ptr double ptr ptr) +@ stdcall SymEnumSymbolsForAddrW (ptr double ptr ptr) @ stdcall SymEnumTypes(ptr double ptr ptr) @ stdcall SymEnumTypesW(ptr double ptr ptr) @ stdcall SymEnumerateModules(long ptr ptr) Added: trunk/reactos/dll/win32/dbghelp/dbghelp_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/dbghelp_… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/dbghelp_ros.diff (added) +++ trunk/reactos/dll/win32/dbghelp/dbghelp_ros.diff [iso-8859-1] Sun Aug 3 03:38:59 2008 @@ -1,0 +1,50 @@ +Index: dbghelp.spec +=================================================================== +--- dbghelp.spec (revision 35049) ++++ dbghelp.spec (working copy) +@@ -40,8 +40,8 @@ + @ stub SymEnumSym + @ stdcall SymEnumSymbols(ptr double str ptr ptr) + @ stdcall SymEnumSymbolsW(ptr double wstr ptr ptr) +-@ stub SymEnumSymbolsForAddr +-@ stub SymEnumSymbolsForAddrW ++@ stdcall SymEnumSymbolsForAddr (ptr double ptr ptr) ++@ stdcall SymEnumSymbolsForAddrW (ptr double ptr ptr) + @ stdcall SymEnumTypes(ptr double ptr ptr) + @ stdcall SymEnumTypesW(ptr double ptr ptr) + @ stdcall SymEnumerateModules(long ptr ptr) +Index: symbol.c +=================================================================== +--- symbol.c (revision 35049) ++++ symbol.c (working copy) +@@ -1000,6 +1000,30 @@ + } + + /****************************************************************** ++ * SymEnumSymbolsForAddrW (DBGHELP.@) ++ * ++ */ ++BOOL WINAPI SymEnumSymbolsForAddrW(HANDLE hProcess, DWORD64 Address, ++ PSYM_ENUMERATESYMBOLS_CALLBACKW EnumSymbolsCallback, ++ PVOID UserContext) ++{ ++ UNIMPLEMENTED; ++ return FALSE; ++} ++ ++/****************************************************************** ++ * SymEnumSymbolsForAddr (DBGHELP.@) ++ * ++ */ ++BOOL WINAPI SymEnumSymbolsForAddr(HANDLE hProcess, DWORD64 Address, ++ PSYM_ENUMERATESYMBOLS_CALLBACK EnumSymbolsCallback, ++ PVOID UserContext) ++{ ++ UNIMPLEMENTED; ++ return FALSE; ++} ++ ++/****************************************************************** + * SymEnumSymbolsW (DBGHELP.@) + * + */ Propchange: trunk/reactos/dll/win32/dbghelp/dbghelp_ros.diff ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/dbghelp/symbol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/symbol.c… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/symbol.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/symbol.c [iso-8859-1] Sun Aug 3 03:38:59 2008 @@ -1000,6 +1000,30 @@ } /****************************************************************** + * SymEnumSymbolsForAddrW (DBGHELP.@) + * + */ +BOOL WINAPI SymEnumSymbolsForAddrW(HANDLE hProcess, DWORD64 Address, + PSYM_ENUMERATESYMBOLS_CALLBACKW EnumSymbolsCallback, + PVOID UserContext) +{ + UNIMPLEMENTED; + return FALSE; +} + +/****************************************************************** + * SymEnumSymbolsForAddr (DBGHELP.@) + * + */ +BOOL WINAPI SymEnumSymbolsForAddr(HANDLE hProcess, DWORD64 Address, + PSYM_ENUMERATESYMBOLS_CALLBACK EnumSymbolsCallback, + PVOID UserContext) +{ + UNIMPLEMENTED; + return FALSE; +} + +/****************************************************************** * SymEnumSymbolsW (DBGHELP.@) * */ Modified: trunk/reactos/include/psdk/dbghelp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dbghelp.h?rev… ============================================================================== --- trunk/reactos/include/psdk/dbghelp.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/dbghelp.h [iso-8859-1] Sun Aug 3 03:38:59 2008 @@ -375,10 +375,9 @@ #define SYMOPT_EXACT_SYMBOLS 0x00000400 #define SYMOPT_WILD_UNDERSCORE 0x00000800 #define SYMOPT_USE_DEFAULTS 0x00001000 -/* latest SDK defines: +/* latest SDK defines: */ #define SYMOPT_ALLOW_ABSOLUTE_SYMBOLS 0x00000800 #define SYMOPT_IGNORE_NT_SYMPATH 0x00001000 -*/ #define SYMOPT_INCLUDE_32BIT_MODULES 0x00002000 #define SYMOPT_PUBLICS_ONLY 0x00004000 #define SYMOPT_NO_PUBLICS 0x00008000

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs