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

André Hentschel : winemaker: winresrc. h is the right name.
by Alexandre Julliard 03 Apr '09

03 Apr '09

Module: wine Branch: master Commit: 47b1bffd02c1f16ffc98c110fd90842234c8fcde URL: http://source.winehq.org/git/wine.git/?a=commit;h=47b1bffd02c1f16ffc98c110f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Apr 2 18:53:12 2009 +0200 winemaker: winresrc.h is the right name. --- tools/winemaker | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index 56597c3..8221c88 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -1301,17 +1301,17 @@ sub fix_file($$$) if ($is_rc and !$is_mfc and /^(\s*)(\#\s*include\s*)\"afxres\.h\"/) { # VC6 automatically includes 'afxres.h', an MFC specific header, in # the RC files it generates (even in non-MFC projects). So we replace - # it with 'winres.h' its very close standard cousin so that non MFC + # it with 'winresrc.h' its very close standard cousin so that non MFC # projects can compile in Wine without the MFC sources. my $warning="mfc:afxres.h"; if (!defined $warnings{$warning}) { $warnings{$warning}="1"; - print STDERR "warning: In non-MFC projects, winemaker replaces the MFC specific header 'afxres.h' with 'winres.h'\n"; + print STDERR "warning: In non-MFC projects, winemaker replaces the MFC specific header 'afxres.h' with 'winresrc.h'\n"; print STDERR "warning: the above warning is issued only once\n"; } print FILEO "$1/* winemaker: $2\"afxres.h\" */\n"; - print FILEO "$1/* winemaker:warning: 'afxres.h' is an MFC specific header. Replacing it with 'winres.h' */\n"; - print FILEO "$1$2\"winres.h\"$'"; + print FILEO "$1/* winemaker:warning: 'afxres.h' is an MFC specific header. Replacing it with 'winresrc.h' */\n"; + print FILEO "$1$2\"winresrc.h\"$'"; $modified=1; } elsif (/^(\s*\#\s*include\s*)([\"<])([^\"]+)([\">])/) { @@ -1473,7 +1473,7 @@ sub fix_file($$$) print FILEO; } elsif ($rc_textinclude_state == 3 and /^(\s*\"\#\s*include\s*\"\")afxres\.h(\"\"\\r\\n\")/) { - print FILEO "$1winres.h$2$'"; + print FILEO "$1winresrc.h$2$'"; $modified=1; } elsif (/^\s*BEGIN(\W.*)?$/) {

1 0

André Hentschel : winemaker: Add project-parse function.
by Alexandre Julliard 03 Apr '09

03 Apr '09

Module: wine Branch: master Commit: dc21b4f613440706739463f74ca2906063cef5c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc21b4f613440706739463f74… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Apr 2 18:53:14 2009 +0200 winemaker: Add project-parse function. --- tools/winemaker | 623 +++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 606 insertions(+), 17 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dc21b4f61344070673946…

1 0

André Hentschel : winemaker: Add workspace-parse function.
by Alexandre Julliard 03 Apr '09

03 Apr '09

Module: wine Branch: master Commit: df5c4178a8f84cd4b96362844f00c9f1d4b973ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=df5c4178a8f84cd4b96362844… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Apr 2 18:53:24 2009 +0200 winemaker: Add workspace-parse function. --- tools/winemaker | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 72 insertions(+), 1 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index b35c1ae..1d6800b 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -1089,6 +1089,75 @@ sub source_scan_project_file($$$) } ## +# Scans the specified workspace file to find the project files +sub source_scan_workspace_file($); +sub source_scan_workspace_file($) +{ + my $filename=$_[0]; + my $path=dirname($filename); + my @components; + + if (! -e $filename) { + return; + } + + if (!open(FILEIWS,$filename)) { + print STDERR "error: unable to open $filename for reading:\n"; + print STDERR " $!\n"; + return; + } + + my $prj_name; + my $prj_path; + + if ($filename =~ /.dsw$/i) { + while (<FILEIWS>) { + # Remove any trailing CrLf + s/\r\n$/\n/; + + # catch a project definition + if (/^Project:\s\"(.*)\"=(.*)\s-/) { + $prj_name=$1; + $prj_path=$2; + @components=split /[\/\\]+/, $2; + $prj_path=search_from($path, \@components); + print "Name: $prj_name\nPath: $prj_path\n"; + source_scan_project_file(\@main_project,1,$prj_path); + next; + } elsif (/^#/) { + # ignore Comments + } elsif (/\w:/) { + print STDERR "unknown section $_\n"; + } elsif (/^Microsoft(.*)Studio(.*)File,\sFormat Version\s(.*)/) { + print "\nFileversion: $3\n"; + } + } + close(FILEIWS); + } elsif ($filename =~ /.sln$/i) { + while (<FILEIWS>) { + # Remove any trailing CrLf + s/\r\n$/\n/; + + # catch a project definition + if (/^Project(.*)=\s*"(.*)",\s*"(.*)",\s*"(.*)"/) { + $prj_name=$2; + $prj_path=$3; + @components=split /[\/\\]+/, $3; + $prj_path=search_from($path, \@components); + print "Name: $prj_name\nPath: $prj_path\n"; + source_scan_project_file(\@main_project,1,$prj_path); + next; + } elsif (/^Microsoft(.*)Studio(.*)File,\sFormat Version\s(.*)/) { + print "\nFileversion: $3\n"; + } + } + close(FILEIWS); + } + + @projects=sort { @$a[$P_PATH] cmp @$b[$P_PATH] } @projects; +} + +## # Scans the specified directory to: # - see if we should create a Makefile in this directory. We normally do # so if we find a project file and sources @@ -1572,6 +1641,8 @@ sub source_scan() } elsif (defined $opt_work_file) { if ($opt_work_file =~ /.dsp$/i or $opt_work_file =~ /.vcproj$/i) { source_scan_project_file(\@main_project,0,$opt_work_file); + } elsif ($opt_work_file =~ /.dsw$/i or $opt_work_file =~ /.sln$/i) { + source_scan_workspace_file($opt_work_file); } } } @@ -2425,7 +2496,7 @@ sub usage() print STDERR " [-Dmacro[=defn]] [-Idir] [-Pdir] [-idll] [-Ldir] [-llibrary]\n"; print STDERR " [--nodlls] [--nomsvcrt] [--interactive] [--single-target name]\n"; print STDERR " [--generated-files|--nogenerated-files]\n"; - print STDERR " work_directory|project_file\n"; + print STDERR " work_directory|project_file|workspace_file\n"; print STDERR "\nWinemaker is designed to recursively convert all the Windows sources found in\n"; print STDERR "the specified directory so that they can be compiled with Winelib. During this\n"; print STDERR "process it will modify and rename some of the files in that directory.\n";

1 0

André Hentschel : winemaker: Update man page.
by Alexandre Julliard 03 Apr '09

03 Apr '09

Module: wine Branch: master Commit: 8f74c2b1a77db74c8788eec687c2fb0ebf4bdf8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f74c2b1a77db74c8788eec68… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Apr 2 18:53:28 2009 +0200 winemaker: Update man page. --- tools/winemaker.man.in | 51 +++++++++++++++++++++-------------------------- 1 files changed, 23 insertions(+), 28 deletions(-) diff --git a/tools/winemaker.man.in b/tools/winemaker.man.in index fc57a3c..e8afb2d 100644 --- a/tools/winemaker.man.in +++ b/tools/winemaker.man.in @@ -1,5 +1,5 @@ .\" -*- nroff -*- -.TH WINEMAKER 1 "October 2005" "@PACKAGE_STRING@" "Wine Developers Manual" +.TH WINEMAKER 1 "February 2009" "@PACKAGE_STRING@" "Wine Developers Manual" .SH NAME winemaker \- generate a build infrastructure for compiling Windows programs on Unix .SH SYNOPSIS @@ -21,7 +21,7 @@ winemaker \- generate a build infrastructure for compiling Windows programs on U ] .br [ -.IR "-Dmacro[=defn] " "] [ " "-Idir " "] [ " "-Ldir " "] [ " "-idll" "] [ " "-llibrary " +.IR "-Dmacro[=defn] " "] [ " "-Idir " "] [ " "-Pdir " "] [ " "-idll" "] [ " "-Ldir " "] [ " "-llibrary " ] .br [ @@ -30,7 +30,8 @@ winemaker \- generate a build infrastructure for compiling Windows programs on U .br [ .IR "--generated-files " "] [ " "--nogenerated-files " "] -] +.br +.IR "work_directory" "| " "project_file" "| " "workspace_file" .SH DESCRIPTION .PP @@ -60,11 +61,12 @@ encounters something out of the ordinary, winemaker will warn you about it. the executables and libraries you are trying to build, match them with source files, and generate the corresponding Makefile.in files. .PP -- finally winemaker will generate a global Makefile.in file calling out to all -the others, and a configure script customized for use with Winelib. +- finally winemaker will generate a global Makefile for normal use. .PP - winemaker knows about MFC-based project and will generate customized files. .PP +- winemaker can read existing Projectfiles. It supports dsp, dsw, vcproj and sln files. +.PP .SH OPTIONS .TP .I --nobanner @@ -140,12 +142,15 @@ Adds the specified macro definition to the global list of macro definitions. .I -Idir Appends the specified directory to the global include path. .TP -.I -Ldir -Appends the specified directory to the global library path. +.I -Pdir +Appends the specified directory to the global dll path. .TP .I -idll Adds the Winelib library to the global list of Winelib libraries to import. .TP +.I -Ldir +Appends the specified directory to the global library path. +.TP .I -llibrary Adds the specified library to the global list of libraries to link with. .TP @@ -167,49 +172,39 @@ Tells winemaker not to generate the Makefile. .PP Here is a typical winemaker use: .PP -$ winemaker --lower-uppercase -DSTRICT +$ winemaker --lower-uppercase -DSTRICT . .PP The above tells winemaker to scan the current directory and its subdirectories for source files. Whenever if finds a file or directory which name is all uppercase, it should rename it to lowercase. It should then fix all these source files for compilation with Winelib and generate Makefiles. The '-DSTRICT' specifies that the STRICT macro must be set when compiling -these sources. Finally winemaker will create a global Makefile.in and -configure.in, and run autoconf to generate the configure script. +these sources. Finally winemaker will create a Makefile. .PP The next step would be: .PP -$ ./configure --with-wine=/usr/local/opt/wine -.PP -This generates the makefiles from the Makefile.in files. The generated -makefiles will fetch the Winelib headers and libraries from the Wine -installation located in /usr/local/opt/wine. -.PP -And finally: -.PP $ make .PP If at this point you get compilation errors (which is quite likely for a reasonably sized project) then you should consult the Winelib User Guide to find tips on how to resolve them. .PP -For an MFC-based project one would have run the following commands instead: +For an MFC-based project you would have to run the following commands instead: .PP -$ winemaker --lower-uppercase --mfc -.br -$ ./configure --with-wine=/usr/local/opt/wine \\ +$ winemaker --lower-uppercase --mfc . .br - --with-mfc=/usr/local/opt/mfc +$ make +.PP +For an existing project-file you would have to run the following commands: +.PP +$ winemaker --lower-all myproject.dsp .br $ make .PP .SH TODO / BUGS .PP -Winemaker should support the Visual Studio project files (.dsp for newer -versions and .mak for some older versions). This would allow it to be much -more accurate, especially for the macro, include and library path -settings. +In some cases you will have to edit the Makefile or sourcefiles by yourself. .PP Assuming that the windows executable/library is available, we could use a pedump-like tool to determine what kind of executable it is (graphical @@ -229,7 +224,7 @@ Winemaker does not support message files and the message compiler yet. .PP The Winelib User Guide: .PP -http://wine.codeweavers.com/docs/winelib-user/ +http://www.winehq.org/docs/winelib-guide/index .PP .BR wine (1) .PP

1 0

Piotr Caban : jscript: Added Math_LN2 implementation.
by Alexandre Julliard 03 Apr '09

03 Apr '09

Module: wine Branch: master Commit: d2aed1b752dabf5bc0b7bfe7432f02c182114c21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2aed1b752dabf5bc0b7bfe74… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Thu Apr 2 19:54:39 2009 +0200 jscript: Added Math_LN2 implementation. --- dlls/jscript/math.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/math.c b/dlls/jscript/math.c index 4f6c049..fc1651c 100644 --- a/dlls/jscript/math.c +++ b/dlls/jscript/math.c @@ -98,8 +98,8 @@ static HRESULT Math_LOG10E(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS static HRESULT Math_LN2(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + return math_constant(M_LN2, flags, retv); } static HRESULT Math_LN10(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp,

1 0

Piotr Caban : jscript: Added Math_LN2 tests.
by Alexandre Julliard 03 Apr '09

03 Apr '09

Module: wine Branch: master Commit: 885a9e9c0c3c7b339afcb321ec718bd341129b61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=885a9e9c0c3c7b339afcb321e… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Thu Apr 2 19:55:13 2009 +0200 jscript: Added Math_LN2 tests. --- dlls/jscript/tests/api.js | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index f370098..310884a 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -640,4 +640,9 @@ ok(Math.floor(Math.LOG10E*100) === 43, "Math.LOG10E = " + Math.LOG10E); Math.LOG10E = "test"; ok(Math.floor(Math.LOG10E*100) === 43, "modified Math.LOG10E = " + Math.LOG10E); +ok(typeof(Math.LN2) === "number", "typeof(Math.LN2) = " + typeof(Math.LN2)); +ok(Math.floor(Math.LN2*100) === 69, "Math.LN2 = " + Math.LN2); +Math.LN2 = "test"; +ok(Math.floor(Math.LN2*100) === 69, "modified Math.LN2 = " + Math.LN2); + reportSuccess();

1 0

Piotr Caban : jscript: Added Math_cos implementation.
by Alexandre Julliard 03 Apr '09

03 Apr '09

Module: wine Branch: master Commit: fe5785af096b514bb67e59a833e3bef9e622fc98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe5785af096b514bb67e59a83… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Thu Apr 2 19:55:30 2009 +0200 jscript: Added Math_cos implementation. --- dlls/jscript/math.c | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/math.c b/dlls/jscript/math.c index fc1651c..ac487d1 100644 --- a/dlls/jscript/math.c +++ b/dlls/jscript/math.c @@ -212,8 +212,22 @@ static HRESULT Math_ceil(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS * static HRESULT Math_cos(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + VARIANT v; + HRESULT hres; + + TRACE("\n"); + + if(!arg_cnt(dp)) { + if(retv) num_set_nan(retv); + return S_OK; + } + + hres = to_number(dispex->ctx, get_arg(dp, 0), ei, &v); + if(FAILED(hres)) + return hres; + + if(retv) num_set_val(retv, cos(num_val(&v))); + return S_OK; } static HRESULT Math_exp(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp,

1 0

Piotr Caban : jscript: Added Math_cos tests.
by Alexandre Julliard 03 Apr '09

03 Apr '09

Module: wine Branch: master Commit: 49ce878de726a7720740778a9a7a5f71c2d13e8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=49ce878de726a7720740778a9… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Thu Apr 2 19:55:44 2009 +0200 jscript: Added Math_cos tests. --- dlls/jscript/tests/api.js | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 310884a..30f2017 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -579,6 +579,36 @@ ok(tmp === Infinity, "Math.abs(-Infinite) = " + tmp); tmp = Math.abs(-3, 2); ok(tmp === 3, "Math.abs(-3, 2) = " + tmp); +tmp = Math.cos(0); +ok(tmp === 1, "Math.cos(0) = " + tmp); + +tmp = Math.cos(Math.PI/2); +ok(Math.floor(tmp*100) === 0, "Math.cos(Math.PI/2) = " + tmp); + +tmp = Math.cos(-Math.PI/2); +ok(Math.floor(tmp*100) === 0, "Math.cos(-Math.PI/2) = " + tmp); + +tmp = Math.cos(Math.PI/3, 2); +ok(Math.floor(tmp*100) === 50, "Math.cos(Math.PI/3, 2) = " + tmp); + +tmp = Math.cos(true); +ok(Math.floor(tmp*100) === 54, "Math.cos(true) = " + tmp); + +tmp = Math.cos(false); +ok(tmp === 1, "Math.cos(false) = " + tmp); + +tmp = Math.cos(); +ok(isNaN(tmp), "Math.cos() is not NaN"); + +tmp = Math.cos(NaN); +ok(isNaN(tmp), "Math.cos(NaN) is not NaN"); + +tmp = Math.cos(Infinity); +ok(isNaN(tmp), "Math.cos(Infinity) is not NaN"); + +tmp = Math.cos(-Infinity); +ok(isNaN(tmp), "Math.cos(-Infinity) is not NaN"); + tmp = Math.pow(2, 2); ok(tmp === 4, "Math.pow(2, 2) = " + tmp);

1 0

Michael Stefaniuc : winecfg: Use ULONG for a bitmask variable.
by Alexandre Julliard 02 Apr '09

02 Apr '09

Module: wine Branch: master Commit: e09fc21576e51de84d8bdbf993523decca144175 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e09fc21576e51de84d8bdbf99… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Apr 2 12:05:35 2009 +0200 winecfg: Use ULONG for a bitmask variable. --- programs/winecfg/drive.c | 6 +++--- programs/winecfg/drivedetect.c | 2 +- programs/winecfg/driveui.c | 2 +- programs/winecfg/winecfg.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/programs/winecfg/drive.c b/programs/winecfg/drive.c index 9e6077c..1afeced 100644 --- a/programs/winecfg/drive.c +++ b/programs/winecfg/drive.c @@ -72,9 +72,9 @@ static inline int letter_to_index(char letter) * so the edit dialog can display the currently used drive letter * alongside the available ones. */ -long drive_available_mask(char letter) +ULONG drive_available_mask(char letter) { - long result = 0; + ULONG result = 0; int i; WINE_TRACE("\n"); @@ -89,7 +89,7 @@ long drive_available_mask(char letter) result = ~result; if (letter) result |= DRIVE_MASK_BIT(letter); - WINE_TRACE("finished drive letter loop with %lx\n", result); + WINE_TRACE("finished drive letter loop with %x\n", result); return result; } diff --git a/programs/winecfg/drivedetect.c b/programs/winecfg/drivedetect.c index 178520b..8e55f56 100644 --- a/programs/winecfg/drivedetect.c +++ b/programs/winecfg/drivedetect.c @@ -43,7 +43,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(winecfg); BOOL gui_mode = TRUE; -static long working_mask = 0; +static ULONG working_mask = 0; typedef struct { diff --git a/programs/winecfg/driveui.c b/programs/winecfg/driveui.c index acad07a..de54f21 100644 --- a/programs/winecfg/driveui.c +++ b/programs/winecfg/driveui.c @@ -300,7 +300,7 @@ static void on_add_click(HWND dialog) then invoke the directory chooser dialog. */ char new = 'C'; /* we skip A and B, they are historically floppy drives */ - long mask = ~drive_available_mask(0); /* the mask is now which drives aren't available */ + ULONG mask = ~drive_available_mask(0); /* the mask is now which drives aren't available */ int i, c; while (mask & (1 << (new - 'A'))) diff --git a/programs/winecfg/winecfg.h b/programs/winecfg/winecfg.h index dcfb64d..d730d84 100644 --- a/programs/winecfg/winecfg.h +++ b/programs/winecfg/winecfg.h @@ -107,7 +107,7 @@ struct drive #define DRIVE_MASK_BIT(B) (1 << (toupper(B) - 'A')) -long drive_available_mask(char letter); +ULONG drive_available_mask(char letter); BOOL add_drive(char letter, const char *targetpath, const char *device, const WCHAR *label, DWORD serial, DWORD type); void delete_drive(struct drive *pDrive);

1 0

Paul Vriens : kernel32: Fix creation of empty sections in ini files.
by Alexandre Julliard 02 Apr '09

02 Apr '09

Module: wine Branch: master Commit: 9a10234ef2b5212ba44b82a797c478f190b4dad1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a10234ef2b5212ba44b82a79… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Apr 2 12:16:11 2009 +0200 kernel32: Fix creation of empty sections in ini files. --- dlls/kernel32/profile.c | 12 ++++++------ dlls/kernel32/tests/profile.c | 30 ++++++------------------------ 2 files changed, 12 insertions(+), 30 deletions(-) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index d44e819..8a787da 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -202,9 +202,9 @@ static void PROFILE_Save( HANDLE hFile, const PROFILESECTION *section, ENCODING for ( ; section; section = section->next) { - int len = 4; + int len = 0; - if (section->name[0]) len += strlenW(section->name); + if (section->name[0]) len += strlenW(section->name) + 4; for (key = section->key; key; key = key->next) { @@ -216,15 +216,15 @@ static void PROFILE_Save( HANDLE hFile, const PROFILESECTION *section, ENCODING if (!buffer) return; p = buffer; - *p++ = '['; if (section->name[0]) { + *p++ = '['; strcpyW( p, section->name ); p += strlenW(p); + *p++ = ']'; + *p++ = '\r'; + *p++ = '\n'; } - *p++ = ']'; - *p++ = '\r'; - *p++ = '\n'; for (key = section->key; key; key = key->next) { diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index 5120ec7..87c0a73 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -972,10 +972,7 @@ static void test_WritePrivateProfileString(void) "key5=string5\r\n"; ret = WritePrivateProfileStringA("App3", "key5", "string5", path); ok(ret == TRUE, "Expected TRUE, got %d\n", ret); - todo_wine - { - ok(check_file_data(path, data), "File doesn't match\n"); - } + ok(check_file_data(path, data), "File doesn't match\n"); /* lpString is NULL, key2 key is deleted */ data = "[App1]\r\n" @@ -987,10 +984,7 @@ static void test_WritePrivateProfileString(void) "key5=string5\r\n"; ret = WritePrivateProfileStringA("App1", "key2", NULL, path); ok(ret == TRUE, "Expected TRUE, got %d\n", ret); - todo_wine - { - ok(check_file_data(path, data), "File doesn't match\n"); - } + ok(check_file_data(path, data), "File doesn't match\n"); /* try to delete key2 again */ data = "[App1]\r\n" @@ -1002,10 +996,7 @@ static void test_WritePrivateProfileString(void) "key5=string5\r\n"; ret = WritePrivateProfileStringA("App1", "key2", NULL, path); ok(ret == TRUE, "Expected TRUE, got %d\n", ret); - todo_wine - { - ok(check_file_data(path, data), "File doesn't match\n"); - } + ok(check_file_data(path, data), "File doesn't match\n"); /* lpKeyName is NULL, App1 section is deleted */ data = "[App2]\r\n" @@ -1014,29 +1005,20 @@ static void test_WritePrivateProfileString(void) "key5=string5\r\n"; ret = WritePrivateProfileStringA("App1", NULL, "string1", path); ok(ret == TRUE, "Expected TRUE, got %d\n", ret); - todo_wine - { - ok(check_file_data(path, data), "File doesn't match\n"); - } + ok(check_file_data(path, data), "File doesn't match\n"); /* lpString is not needed to delete a section */ data = "[App3]\r\n" "key5=string5\r\n"; ret = WritePrivateProfileStringA("App2", NULL, NULL, path); ok(ret == TRUE, "Expected TRUE, got %d\n", ret); - todo_wine - { - ok(check_file_data(path, data), "File doesn't match\n"); - } + ok(check_file_data(path, data), "File doesn't match\n"); /* leave just the section */ data = "[App3]\r\n"; ret = WritePrivateProfileStringA("App3", "key5", NULL, path); ok(ret == TRUE, "Expected TRUE, got %d\n", ret); - todo_wine - { - ok(check_file_data(path, data), "File doesn't match\n"); - } + ok(check_file_data(path, data), "File doesn't match\n"); DeleteFileA(path); }

1 0