Ros-dev June 2006

ros-dev@reactos.org

39 participants
57 discussions

[ros-diffs] [jimtabor] 22523: GetGlyphOutline, large wine port. Still testing.

by James Tabor

Hi, I have it half way done. Run the test program and you can see. Program works in W2k, XP and Wine. mingw32-gcc -mwindows -Os GetGlyphOutline.c -o ggo.exe I stopped messing with it two weeks ago, I needed to work on something else. When testing you can select the alphanumeric character with the keyboard. The original program had "a" but I changed it to "L" something simple to draw at first. You will see the problem. The test program from Dr. Dobb's Journal http://www.ddj.com/184409154?pgno=12 Thanks, James Runs and hides~

17 years

Re: [ros-dev] [ros-diffs] [greatlrd] 22718: Small clean up 1. Remove goto in the code, goto is slow and should be avoid. 2. reformat for adding {} around some code. 3. remove some NULL check after I did remove goto that is not longer need it.

by Saveliy Tretiakov

I don't like your changes to main(), you added a lot of code dublication, made it harder to read and maintain. This is repeated three times: DeleteCriticalSection(&LogListCs); // Close all log files. for(pLogf = LogListHead; pLogf; pLogf = ((PLOGFILE)pLogf)->Next) { LogfClose(pLogf); } HeapDestroy(MyHeap); greatlrd(a)svn.reactos.org wrote: > Author: greatlrd > Date: Fri Jun 30 20:42:21 2006 > New Revision: 22718 > > URL: http://svn.reactos.org/svn/reactos?rev=22718&view=rev > Log: > Small clean up > 1. Remove goto in the code, goto is slow and should be avoid. > 2. reformat for adding {} around some code. > 3. remove some NULL check after I did remove goto that is not longer need it. > > > Modified: > trunk/reactos/base/services/eventlog/eventlog.c > > Modified: trunk/reactos/base/services/eventlog/eventlog.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/eve… > ============================================================================== > --- trunk/reactos/base/services/eventlog/eventlog.c (original) > +++ trunk/reactos/base/services/eventlog/eventlog.c Fri Jun 30 20:42:21 2006 > @@ -61,7 +61,7 @@ > DWORD MaxValueLen, ValueLen, Type, ExpandedLen; > WCHAR *Buf = NULL, *Expanded = NULL; > LONG Result; > - BOOL ret = FALSE; > + BOOL ret = TRUE; > PLOGFILE pLogf; > > DPRINT("LoadLogFile: %S\n", LogName); > @@ -88,12 +88,14 @@ > if(Result != ERROR_SUCCESS) > { > DPRINT1("RegQueryValueEx failed: %d\n", GetLastError()); > - goto cleanup; > + HeapFree(MyHeap, 0, Buf); > + return FALSE; > } > if(Type != REG_EXPAND_SZ && Type != REG_SZ) > { > DPRINT1("%S\\File - value of wrong type %x.\n", LogName, Type); > - goto cleanup; > + HeapFree(MyHeap, 0, Buf); > + return FALSE; > } > > ExpandedLen = ExpandEnvironmentStrings(Buf, NULL, 0); > @@ -102,7 +104,8 @@ > if(!Expanded) > { > DPRINT1("Can't allocate heap!\n"); > - goto cleanup; > + HeapFree(MyHeap, 0, Buf); > + return FALSE; > } > > ExpandEnvironmentStrings(Buf, Expanded, ExpandedLen); > @@ -114,14 +117,11 @@ > if(pLogf == NULL) > { > DPRINT1("Failed to create %S!\n", Expanded); > - goto cleanup; > - } > - > - ret = TRUE; > - > -cleanup: > + ret = FALSE; > + } > + > HeapFree(MyHeap, 0, Buf); > - if(Expanded) HeapFree(MyHeap, 0, Expanded); > + HeapFree(MyHeap, 0, Expanded); > return ret; > } > > @@ -129,8 +129,7 @@ > { > LONG result; > DWORD MaxLognameLen, LognameLen; > - WCHAR *Buf = NULL; > - BOOL ret = FALSE; > + WCHAR *Buf = NULL; > INT i; > > RegQueryInfoKey(eventlogKey, NULL, NULL, NULL, NULL, &MaxLognameLen, > @@ -143,7 +142,7 @@ > if(!Buf) > { > DPRINT1("Error: can't allocate heap!\n"); > - return ret; > + return FALSE; > } > > i = 0; > @@ -159,7 +158,8 @@ > if(result != ERROR_SUCCESS) > { > DPRINT1("Failed to open %S key.\n", Buf); > - goto cleanup; > + HeapFree(MyHeap, 0, Buf); > + return FALSE; > } > > if(!LoadLogFile(SubKey, Buf)) > @@ -171,18 +171,14 @@ > i++; > } > > - ret = TRUE; > - > -cleanup: > HeapFree(MyHeap, 0, Buf); > - return ret; > + return TRUE; > } > > INT main() > { > WCHAR LogPath[MAX_PATH]; > - PLOGFILE pLogf; > - INT RetCode = 0; > + PLOGFILE pLogf; > LONG result; > HKEY elogKey; > > @@ -193,8 +189,15 @@ > if(MyHeap==NULL) > { > DPRINT1("FATAL ERROR, can't create heap.\n"); > - RetCode = 1; > - goto bye_bye; > + > + DeleteCriticalSection(&LogListCs); > + // Close all log files. > + for(pLogf = LogListHead; pLogf; pLogf = ((PLOGFILE)pLogf)->Next) > + { > + LogfClose(pLogf); > + } > + > + return 1; > } > > GetWindowsDirectory(LogPath, MAX_PATH); > @@ -214,8 +217,17 @@ > if(result != ERROR_SUCCESS) > { > DPRINT1("Fatal error: can't open eventlog registry key.\n"); > - RetCode = 1; > - goto bye_bye; > + > + DeleteCriticalSection(&LogListCs); > + > + // Close all log files. > + for(pLogf = LogListHead; pLogf; pLogf = ((PLOGFILE)pLogf)->Next) > + { > + LogfClose(pLogf); > + } > + > + HeapDestroy(MyHeap); > + return 1; > } > > LoadLogFiles(elogKey); > @@ -223,16 +235,16 @@ > > StartServiceCtrlDispatcher(ServiceTable); > > -bye_bye: > DeleteCriticalSection(&LogListCs); > > // Close all log files. > for(pLogf = LogListHead; pLogf; pLogf = ((PLOGFILE)pLogf)->Next) > + { > LogfClose(pLogf); > + } > > - if(MyHeap) HeapDestroy(MyHeap); > - > - return RetCode; > + HeapDestroy(MyHeap); > + return 0; > } > > VOID EventTimeToSystemTime(DWORD EventTime, > > > >

18 years, 2 months

unsubscribe

by Arun Bellatti (RBIN/ECM4)

Hello All, Please unsubscribe me from this group Regards Arum

18 years, 2 months

Re: [ros-dev] [ros-diffs] [janderwald] 22698: * fix resource inconsistency (pointed out by Lohnegrim) * halfplemented reading console options

by Thomas Weidenmueller

> URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/options.… > ============================================================================== > --- trunk/reactos/dll/win32/console/options.c (original) > +++ trunk/reactos/dll/win32/console/options.c Fri Jun 30 00:19:26 2006 > @@ -10,6 +10,10 @@ > #include "console.h" > > > +ConsoleInfo g_ConsoleInfo; Don't use a global variable for this. - Thomas

18 years, 2 months

Re: [ros-dev] [ros-diffs] [turner] 22683: expand %* to batch file params. b ug: #1629

by Murphy, Ged (Bolton)

Brandon Turner wrote: > Index: batch.c > =================================================================== > --- batch.c (revision 22683) > +++ batch.c (working copy) > @@ -275,8 +275,17 @@ > // > // Allocate enough memory to hold the params and copy them over > without modifications > // > - bc->raw_params = malloc(_tcslen(param)); > - _tcscpy(bc->raw_params,param); > + bc->raw_params = malloc((_tcslen(param)+1) * sizeof(TCHAR)); > + if (bc->raw_params != NULL) > + { > + memset (bc->raw_params, 0, _tcslen(bc->raw_params) * > sizeof(TCHAR)); > + _tcscpy(bc->raw_params,param); > + } > + else > + { > + error_out_of_memory(); > + return FALSE; > + } > > #ifdef _DEBUG > DebugPrintf (_T("Batch: returns TRUE\n")); > > > look better? > > Brandon Yeah :) Ged.

18 years, 2 months

Re: [ros-dev] [ros-diffs] [turner] 22683: expand %* to batch file params. b ug: #1629

by Murphy, Ged (Bolton)

turner(a)svn.reactos.org wrote: > + bc->raw_params = malloc(_tcslen(param)); > + _tcscpy(bc->raw_params,param); Please check the docs, I don't have access to any at the moment, but if I recall correctly both strlen and wcslen return the number of chars, not including the '/0'. This will therefore mean we miss off the '/0' for ASCII builds and only have half the required space for unicode builds. Ged.

18 years, 2 months

Re: [ros-dev] [ros-diffs] [ion] 22649: - Lesson One: Don't revert commits b ecause your eyes are inventing the word "copyright". I tried r eally hard, I really did, but I could not find even the word "copy", muc h less "copy right". - Lesson Two: What do

by Murphy, Ged (Bolton)

Aleksey Bragin wrote: > > But it's a nice excuse to raise traffic in [ros-dev] ! > :-) People love a good soap opera. Although we're still no closer to solving the issue ;) Ged.

18 years, 2 months

by Murphy, Ged (Bolton)

Alex Ionescu wrote: > > Like I said, PROGRAMMER implies the person who wrote this > file, not the > programmer of the entire project (I don't see why you'd think that... > just because my name is in lib\rtl\foo.c doesn't mean I wrote > *all* the kernel). I don't. Maybe I'm missing something here, but looking at the diff the code was already in sol.rc. This code was moved into En.rc, then a copy was taken of En.rc and named as De.rc, and translated into German So if 2 copies were made of existing code in sol.rc, and one of these copies was translated, all the original code still remains (with the exception of the translations). Thus, the programmer who wrote the original code is still the programmer. It's similar to me taking lib\rtl\foo.c splitting it into 2 files and naming myself as the programmer. As I said though, I might have something wrong here. Ged.

18 years, 2 months

by Murphy, Ged (Bolton)

Alex Ionescu wrote: > Probably because on the IRC channel you went all "hahah!! LOL @ > EmuandCo!!!" which I found extremly disrespectful attitude It has nothing to do with a disrespectful attitude. It's because I thought is was funny / cheeky, which I still agree with. People know me better than that. Can we save the cattiness for IRC please.

18 years, 2 months

Resource headers

by Murphy, Ged (Bolton)

Daniel Reimer wrote: > I did not want to cause problems with that... I know, which is why I didn't want to drag this through the mud. Anyway, now as we're on the topic, we might as well try and resolve it. So, should we be adding headers to resource file? If yes, what info should be in there. It's clear that the translator and programmer should be separate headings. My personal view is that we should leave headers out of resource files. If translators wanted to add their mark, then a line should be added at the top of the file saying /* translated by FOO */ Ged.

18 years, 2 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-dev June 2006