December 2006 - Wine-commits

Francois Gouget : dmime: Remove resolve_STREAM_SEEK(), it is unused.
by Alexandre Julliard 06 Dec '06

06 Dec '06

Module: wine Branch: master Commit: 13b974bdff264ed614db8e2fd56a7c14414bf9a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13b974bdff264ed614db8e2fd… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Dec 6 12:06:17 2006 +0100 dmime: Remove resolve_STREAM_SEEK(), it is unused. --- dlls/dmime/dmutils.c | 14 -------------- dlls/dmime/dmutils.h | 2 -- 2 files changed, 0 insertions(+), 16 deletions(-) diff --git a/dlls/dmime/dmutils.c b/dlls/dmime/dmutils.c index 6b60598..992a2d2 100644 --- a/dlls/dmime/dmutils.c +++ b/dlls/dmime/dmutils.c @@ -233,20 +233,6 @@ HRESULT IDirectMusicUtils_IPersistStream return S_OK; } -/* translate STREAM_SEEK flag to string */ -const char *resolve_STREAM_SEEK (DWORD flag) { - switch (flag) { - case STREAM_SEEK_SET: - return wine_dbg_sprintf ("STREAM_SEEK_SET"); - case STREAM_SEEK_CUR: - return wine_dbg_sprintf ("STREAM_SEEK_CUR"); - case STREAM_SEEK_END: - return wine_dbg_sprintf ("STREAM_SEEK_END"); - default: - return wine_dbg_sprintf ("()"); - } -} - /* FOURCC to string conversion for debug messages */ const char *debugstr_fourcc (DWORD fourcc) { if (!fourcc) return "'null'"; diff --git a/dlls/dmime/dmutils.h b/dlls/dmime/dmutils.h index 4d3292a..8bca6b5 100644 --- a/dlls/dmime/dmutils.h +++ b/dlls/dmime/dmutils.h @@ -64,8 +64,6 @@ typedef struct { extern int even_or_odd (DWORD number); /* check whether chunkID is valid dmobject form chunk */ extern BOOL IS_VALID_DMFORM (FOURCC chunkID); -/* translate STREAM_SEEK flag to string */ -extern const char *resolve_STREAM_SEEK (DWORD flag); /* FOURCC to string conversion for debug messages */ extern const char *debugstr_fourcc (DWORD fourcc); /* DMUS_VERSION struct to string conversion for debug messages */

1 0

Francois Gouget : msvcmaker: Remove unneeded -I.. for the msvcrt tests.
by Alexandre Julliard 06 Dec '06

06 Dec '06

Module: wine Branch: master Commit: 72d5c0ddca0841f140ec59bf66ee24e43697aaac URL: http://source.winehq.org/git/wine.git/?a=commit;h=72d5c0ddca0841f140ec59bf6… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Dec 6 11:58:30 2006 +0100 msvcmaker: Remove unneeded -I.. for the msvcrt tests. --- tools/winapi/msvcmaker | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/tools/winapi/msvcmaker b/tools/winapi/msvcmaker index 6fac11d..87c6430 100755 --- a/tools/winapi/msvcmaker +++ b/tools/winapi/msvcmaker @@ -631,10 +631,6 @@ sub _generate_dsp($$) { push @defines2, "__WINETEST_OUTPUT_DIR=\\\"$output_dir2\\\""; push @defines2, qw(__i386__ _X86_); - if($project eq "msvcrt_test") { - push @includes, ".."; - } - if ($project =~ /_test$/) { push @includes, "$msvc_wine_dir\\$output_dir"; }

1 0

Francois Gouget : msvcmaker: Tweak the . dsp formatting to better match Visual Studio.
by Alexandre Julliard 06 Dec '06

06 Dec '06

Module: wine Branch: master Commit: f1698c4b0cc8e491b88e7fc1db1bde28bf51313d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1698c4b0cc8e491b88e7fc1d… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Dec 6 12:00:14 2006 +0100 msvcmaker: Tweak the .dsp formatting to better match Visual Studio. --- tools/winapi/msvcmaker | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/tools/winapi/msvcmaker b/tools/winapi/msvcmaker index 87c6430..25824f3 100755 --- a/tools/winapi/msvcmaker +++ b/tools/winapi/msvcmaker @@ -519,6 +519,7 @@ sub _generate_dsp($$) { print OUT "CPP=cl.exe\r\n"; print OUT "MTL=midl.exe\r\n" if !$lib && !$exe; print OUT "RSC=rc.exe\r\n"; + print OUT "\r\n"; my $n = 0; @@ -591,12 +592,15 @@ sub _generate_dsp($$) { } foreach my $define (@defines) { - print OUT " /D \"$define\""; + if ($define !~ /=/) { + print OUT " /D \"$define\""; + } else { + print OUT " /D $define"; + } } print OUT " /YX" if $lib || $exe; print OUT " /FD"; print OUT " /GZ" if $debug; - print OUT " " if $debug && ($lib || $exe); print OUT " /c"; print OUT "\r\n"; @@ -647,7 +651,7 @@ sub _generate_dsp($$) { } foreach my $define (@defines2) { - if ($define !~ /[\\\"]/) { + if ($define !~ /=/) { print OUT " /D \"$define\""; } else { print OUT " /D $define"; @@ -660,7 +664,6 @@ sub _generate_dsp($$) { print OUT " /FR" if !$lib; print OUT " /FD"; print OUT " /GZ" if $debug; - print OUT " " if $debug && $lib; print OUT " /c"; print OUT " /TP" if !$no_cpp; print OUT "\r\n"; @@ -696,12 +699,12 @@ sub _generate_dsp($$) { if($exe || $dll) { print OUT "LINK32=link.exe\r\n"; - print OUT "# ADD BASE LINK32 "; + print OUT "# ADD BASE LINK32"; my @libraries = qw(kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib); foreach my $library (@libraries) { - print OUT "$library "; + print OUT " $library"; } print OUT " /nologo"; print OUT " /dll" if $dll; @@ -712,11 +715,11 @@ sub _generate_dsp($$) { print OUT "\r\n"; print OUT "# ADD LINK32"; - print OUT " /nologo"; print OUT " libcmt.lib" if $project =~ /^ntdll$/; # FIXME: Kludge foreach my $import (@imports) { print OUT " $import.lib" if ($import ne "msvcrt"); } + print OUT " /nologo"; print OUT " /dll" if $dll; print OUT " /subsystem:console" if $console; print OUT " /debug" if $debug;

1 0

Francois Gouget : msvcmaker: Link with msvcrt(d). dll rather than with the static C library.
by Alexandre Julliard 06 Dec '06

06 Dec '06

Module: wine Branch: master Commit: baf85ad931e4bd45cb2d670fab85d1eeb2c66684 URL: http://source.winehq.org/git/wine.git/?a=commit;h=baf85ad931e4bd45cb2d670fa… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Dec 6 12:04:55 2006 +0100 msvcmaker: Link with msvcrt(d).dll rather than with the static C library. --- tools/winapi/msvcmaker | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/winapi/msvcmaker b/tools/winapi/msvcmaker index 25824f3..6ee5483 100755 --- a/tools/winapi/msvcmaker +++ b/tools/winapi/msvcmaker @@ -578,7 +578,7 @@ sub _generate_dsp($$) { print OUT "# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od"; @defines = (qw(WINVER=0x0501 _WIN32_WINNT=0x0501 _WIN32_IE=0x0600 WIN32 _DEBUG _MBCS _LIB)); } else { - print OUT "# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od"; + print OUT "# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od"; @defines = (qw(WINVER=0x0501 _WIN32_WINNT=0x0501 _WIN32_IE=0x0600 WIN32 _DEBUG _WINDOWS _MBCS _USRDLL), ("\U${project}\E_EXPORTS")); } } else { @@ -586,7 +586,7 @@ sub _generate_dsp($$) { print OUT "# ADD BASE CPP /nologo /W3 /GX /O2"; @defines = (qw(WINVER=0x0501 _WIN32_WINNT=0x0501 _WIN32_IE=0x0600 WIN32 NDEBUG _MBCS _LIB)); } else { - print OUT "# ADD BASE CPP /nologo /MT /W3 /GX /O2"; + print OUT "# ADD BASE CPP /nologo /MD /W3 /GX /O2"; @defines = (qw(WINVER=0x0501 _WIN32_WINNT=0x0501 _WIN32_IE=0x0600 WIN32 NDEBUG _WINDOWS _MBCS _USRDLL), ("\U${project}\E_EXPORTS")); } } @@ -607,18 +607,18 @@ sub _generate_dsp($$) { my @defines2; if($debug) { if($lib) { - print OUT "# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od"; + print OUT "# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od"; @defines2 = qw(WINVER=0x0501 _WIN32_WINNT=0x0501 _WIN32_IE=0x0600 WIN32 _DEBUG _WINDOWS _MBCS _LIB); } else { - print OUT "# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od"; + print OUT "# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od"; @defines2 = qw(WINVER=0x0501 _WIN32_WINNT=0x0501 _WIN32_IE=0x0600 _DEBUG WIN32 _WINDOWS _MBCS _USRDLL); } } else { if($lib) { - print OUT "# ADD CPP /nologo /MT /W3 /GX /O2"; + print OUT "# ADD CPP /nologo /MD /W3 /GX /O2"; @defines2 = qw(WINVER=0x0501 _WIN32_WINNT=0x0501 _WIN32_IE=0x0600 WIN32 NDEBUG _WINDOWS _MBCS _LIB); } else { - print OUT "# ADD CPP /nologo /MT /W3 /GX /O2"; + print OUT "# ADD CPP /nologo /MD /W3 /GX /O2"; @defines2 = qw(WINVER=0x0501 _WIN32_WINNT=0x0501 _WIN32_IE=0x0600 NDEBUG WIN32 _WINDOWS _MBCS _USRDLL); } }

1 0

Mike McCormack : msi: More tests for the SourceDir property.
by Alexandre Julliard 06 Dec '06

06 Dec '06

Module: wine Branch: master Commit: 01cc2c32340f6b07ac3e44183137f99ae763052f URL: http://source.winehq.org/git/wine.git/?a=commit;h=01cc2c32340f6b07ac3e44183… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Dec 6 15:00:13 2006 +0900 msi: More tests for the SourceDir property. --- dlls/msi/tests/package.c | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 29608f2..5a6a7a8 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -2901,6 +2901,11 @@ static void test_sourcedirprop(void) ok( r == ERROR_SUCCESS, "failed to get property: %d\n", r); ok( !lstrcmpA(source_dir, path), "Expected %s, got %s\n", path, source_dir); + size = MAX_PATH; + r = MsiGetProperty( hpkg, "SoUrCeDiR", source_dir, &size ); + ok( r == ERROR_SUCCESS, "failed to get property: %d\n", r); + ok( !lstrlenA(source_dir), "Expected emtpy source dir, got %s\n", source_dir); + MsiCloseHandle(hpkg); DeleteFileA(msifile); } @@ -2975,6 +2980,27 @@ static void test_prop_path(void) ok( !lstrcmpi(cwd, buffer), "SourceDir (%s) should be current dir (%s)\n", buffer, cwd); } + r = MsiSetProperty(hpkg, "SourceDir", "goo"); + ok( r == ERROR_SUCCESS, "property not set\n"); + + sz = sizeof buffer; + buffer[0] = 0; + r = MsiGetProperty(hpkg, "SourceDir", buffer, &sz); + ok( r == ERROR_SUCCESS, "property not set\n"); + ok( !lstrcmpi(buffer, "goo"), "SourceDir (%s) should be goo\n", buffer); + + sz = sizeof buffer; + buffer[0] = 0; + r = MsiGetSourcePath(hpkg, "SourceDir", buffer, &sz ); + ok( r == ERROR_SUCCESS, "failed to get source path\n"); + ok( !lstrcmpi(buffer, cwd), "SourceDir (%s) should be goo\n", buffer); + + sz = sizeof buffer; + buffer[0] = 0; + r = MsiGetProperty(hpkg, "SourceDir", buffer, &sz); + ok( r == ERROR_SUCCESS, "property not set\n"); + ok( !lstrcmpi(buffer, "goo"), "SourceDir (%s) should be goo\n", buffer); + MsiCloseHandle( hpkg ); DeleteFile(msifile); }

1 0

Chris Robinson : wgl: Fix for missing NV GLX extension.
by Alexandre Julliard 06 Dec '06

06 Dec '06

Module: wine Branch: master Commit: 28c2ebb937c46bbdb2d2c15c32913ddba32a93f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28c2ebb937c46bbdb2d2c15c3… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Tue Dec 5 21:30:36 2006 -0800 wgl: Fix for missing NV GLX extension. --- dlls/winex11.drv/opengl.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 3eb98b9..9178152 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -374,10 +374,6 @@ LOAD_FUNCPTR(glXMakeContextCurrent) LOAD_FUNCPTR(glXGetCurrentReadDrawable) LOAD_FUNCPTR(glXGetFBConfigs) -/* NV GLX Extension */ -LOAD_FUNCPTR(glXAllocateMemoryNV) -LOAD_FUNCPTR(glXFreeMemoryNV) - /* Standard OpenGL calls */ LOAD_FUNCPTR(glBindTexture) LOAD_FUNCPTR(glBitmap) @@ -392,6 +388,15 @@ LOAD_FUNCPTR(glNewList) LOAD_FUNCPTR(glPixelStorei) #undef LOAD_FUNCPTR +/* It doesn't matter if these fail. They'll only be used if the driver reports + the associated extension is available (and if a driver reports the extension + is available but fails to provide the functions, it's quite broken) */ +#define LOAD_FUNCPTR(f) p##f = (void*)pglXGetProcAddressARB((const unsigned char*)#f); +/* NV GLX Extension */ +LOAD_FUNCPTR(glXAllocateMemoryNV) +LOAD_FUNCPTR(glXFreeMemoryNV) +#undef LOAD_FUNCPTR + if(!X11DRV_WineGL_InitOpenglInfo()) { ERR("Intialization of OpenGL info failed, disabling OpenGL!\n"); wine_dlclose(opengl_handle, NULL, 0);

1 0

Francois Gouget : msvcmaker: Fix the code that sets __WINETEST_OUTPUT_DIR so it does not pollute $output_dir .
by Alexandre Julliard 06 Dec '06

06 Dec '06

Module: wine Branch: master Commit: bcf4a22a5e491d5e851076c2152c401360f3a680 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcf4a22a5e491d5e851076c21… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Dec 6 11:57:29 2006 +0100 msvcmaker: Fix the code that sets __WINETEST_OUTPUT_DIR so it does not pollute $output_dir. --- tools/winapi/msvcmaker | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/winapi/msvcmaker b/tools/winapi/msvcmaker index 4774f79..6fac11d 100755 --- a/tools/winapi/msvcmaker +++ b/tools/winapi/msvcmaker @@ -627,8 +627,8 @@ sub _generate_dsp($$) { push @defines2, qw(__WINE_USE_NATIVE_HEADERS); } my $output_dir2 = $output_dir; - $output_dir =~ s/\\/\\\\/g; - push @defines2, "__WINETEST_OUTPUT_DIR=\\\"$output_dir\\\""; + $output_dir2 =~ s/\\/\\\\/g; + push @defines2, "__WINETEST_OUTPUT_DIR=\\\"$output_dir2\\\""; push @defines2, qw(__i386__ _X86_); if($project eq "msvcrt_test") {

1 0

Eric Pouech : dbghelp: Added ability to internal store / reload a symbol with a constant value.
by Alexandre Julliard 06 Dec '06

06 Dec '06

Module: wine Branch: master Commit: 75033503e8aa668abe342f5d0542dc8322ba64b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75033503e8aa668abe342f5d0… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Tue Dec 5 22:13:30 2006 +0100 dbghelp: Added ability to internal store / reload a symbol with a constant value. Let dwarf and msc use this new feature. As we also add global symbol without addresses, don't take those constant symbols into account for searches by address. --- dlls/dbghelp/dbghelp_private.h | 6 ++++ dlls/dbghelp/dwarf.c | 46 ++++++++++++++++++++++++++++++- dlls/dbghelp/msc.c | 54 +++++++++++++++++-------------------- dlls/dbghelp/symbol.c | 58 +++++++++++++++++++++++++++++++++------- 4 files changed, 123 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=75033503e8aa668abe342…

1 0

Eric Pouech : winedbg: Added support for constant values passed by dbghelp.
by Alexandre Julliard 06 Dec '06

06 Dec '06

Module: wine Branch: master Commit: 32a8b2fa59cd4b4514d36f26134027cb0841ff4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=32a8b2fa59cd4b4514d36f261… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Tue Dec 5 22:13:33 2006 +0100 winedbg: Added support for constant values passed by dbghelp. --- programs/winedbg/symbol.c | 25 ++++++++++++++++++++++++- 1 files changed, 24 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/symbol.c b/programs/winedbg/symbol.c index 55e35ee..f714409 100644 --- a/programs/winedbg/symbol.c +++ b/programs/winedbg/symbol.c @@ -87,6 +87,29 @@ static BOOL fill_sym_lvalue(const SYMBOL lvalue->cookie = DLV_TARGET; lvalue->addr.Offset = (ULONG)((ULONG64)*pval + sym->Address); } + else if (sym->Flags & SYMFLAG_VALUEPRESENT) + { + struct dbg_type type; + VARIANT v; + DWORD* pdw; + + type.module = sym->ModBase; + type.id = sym->info; + + /* FIXME: this won't work for pointers, as we always for the + * dereference to be in debuggee address space while here + * it's in debugger address space + */ + if (!types_get_info(&type, TI_GET_VALUE, &v) || (v.n1.n2.vt & VT_BYREF)) + { + snprintf(buffer, sz, "Couldn't dereference pointer for const value"); + return FALSE; + } + pdw = (DWORD*)lexeme_alloc_size(sizeof(*pdw)); + lvalue->cookie = DLV_HOST; + lvalue->addr.Offset = (ULONG)(DWORD_PTR)pdw; + *pdw = sym->Value; + } else if (sym->Flags & SYMFLAG_LOCAL) { lvalue->cookie = DLV_TARGET; @@ -125,7 +148,7 @@ static BOOL CALLBACK sgv_cb(SYMBOL_INFO* { struct sgv_data* sgv = (struct sgv_data*)ctx; unsigned insp; - char tmp[32]; + char tmp[64]; if (sym->Flags & SYMFLAG_THUNK) {

1 0

Mike McCormack : msi: Add some tests for the ALTER query.
by Alexandre Julliard 06 Dec '06

06 Dec '06

Module: wine Branch: master Commit: 3578bf64d6525dfc1773791570a024dece8edf6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3578bf64d6525dfc177379157… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Dec 6 15:00:02 2006 +0900 msi: Add some tests for the ALTER query. --- dlls/msi/tests/package.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index f82a210..29608f2 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -1374,6 +1374,18 @@ static void test_properties_table(void) r = run_query(hdb, query); ok(r == ERROR_SUCCESS, "failed to create table\n"); + query = "ALTER `_Properties` ADD `foo` INTEGER"; + r = run_query(hdb, query); + ok(r == ERROR_BAD_QUERY_SYNTAX, "failed to add column\n"); + + query = "ALTER TABLE `_Properties` ADD `foo` INTEGER"; + r = run_query(hdb, query); + ok(r == ERROR_BAD_QUERY_SYNTAX, "failed to add column\n"); + + query = "ALTER TABLE `_Properties` ADD `extra` INTEGER"; + r = run_query(hdb, query); + todo_wine ok(r == ERROR_SUCCESS, "failed to add column\n"); + hpkg = package_from_db(hdb); ok( hpkg, "failed to create package\n");

1 0