wine-commits November 2014

wine-commits@winehq.org

2 participants
394 discussions

Piotr Caban : ntdll: Handle ACTCTX_FLAG_ASSEMBLY_DIRECTORY_VALID flag when opening manifest in RtlCreateActivationContext.
by Alexandre Julliard 28 Nov '14

28 Nov '14

Module: wine Branch: master Commit: f87767bc35b0da4df7c7104c04943ed67e06ea78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f87767bc35b0da4df7c7104c0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 28 08:01:26 2014 +0100 ntdll: Handle ACTCTX_FLAG_ASSEMBLY_DIRECTORY_VALID flag when opening manifest in RtlCreateActivationContext. --- dlls/kernel32/tests/actctx.c | 59 ++++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/actctx.c | 25 ++++++++++++++++++- 2 files changed, 83 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index 1f5683f..c964743 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -2166,6 +2166,65 @@ todo_wine handle = pCreateActCtxA(&actctx); ok(handle == INVALID_HANDLE_VALUE, "got handle %p\n", handle); ok(GetLastError() == ERROR_RESOURCE_TYPE_NOT_FOUND, "got error %d\n", GetLastError()); + + /* load manifest from lpAssemblyDirectory directory */ + write_manifest("testdir.manifest", manifest1); + GetTempPathA(sizeof(path)/sizeof(path[0]), path); + SetCurrentDirectoryA(path); + strcat(path, "assembly_dir"); + strcpy(dir, path); + strcat(path, "\\testdir.manifest"); + + memset(&actctx, 0, sizeof(actctx)); + actctx.cbSize = sizeof(actctx); + actctx.dwFlags = ACTCTX_FLAG_ASSEMBLY_DIRECTORY_VALID; + actctx.lpSource = "testdir.manifest"; + actctx.lpAssemblyDirectory = dir; + + SetLastError(0xdeadbeef); + handle = pCreateActCtxA(&actctx); + ok(handle == INVALID_HANDLE_VALUE, "got handle %p\n", handle); + ok(GetLastError()==ERROR_PATH_NOT_FOUND || + broken(GetLastError()==ERROR_FILE_NOT_FOUND) /* WinXP */, + "got error %d\n", GetLastError()); + + CreateDirectoryA(dir, NULL); + memset(&actctx, 0, sizeof(actctx)); + actctx.cbSize = sizeof(actctx); + actctx.dwFlags = ACTCTX_FLAG_ASSEMBLY_DIRECTORY_VALID; + actctx.lpSource = "testdir.manifest"; + actctx.lpAssemblyDirectory = dir; + + SetLastError(0xdeadbeef); + handle = pCreateActCtxA(&actctx); + ok(handle == INVALID_HANDLE_VALUE, "got handle %p\n", handle); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "got error %d\n", GetLastError()); + SetCurrentDirectoryW(work_dir); + + write_manifest("assembly_dir\\testdir.manifest", manifest1); + memset(&actctx, 0, sizeof(actctx)); + actctx.cbSize = sizeof(actctx); + actctx.dwFlags = ACTCTX_FLAG_ASSEMBLY_DIRECTORY_VALID; + actctx.lpSource = "testdir.manifest"; + actctx.lpAssemblyDirectory = dir; + + handle = pCreateActCtxA(&actctx); + ok(handle != INVALID_HANDLE_VALUE, "got handle %p\n", handle); + pReleaseActCtx(handle); + + memset(&actctx, 0, sizeof(actctx)); + actctx.cbSize = sizeof(actctx); + actctx.dwFlags = ACTCTX_FLAG_ASSEMBLY_DIRECTORY_VALID; + actctx.lpSource = path; + actctx.lpAssemblyDirectory = dir; + + handle = pCreateActCtxA(&actctx); + ok(handle != INVALID_HANDLE_VALUE, "got handle %p\n", handle); + pReleaseActCtx(handle); + + delete_manifest_file("testdir.manifest"); + delete_manifest_file("assembly_dir\\testdir.manifest"); + RemoveDirectoryA(dir); } static BOOL init_funcs(void) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 9a9dec9..15c9994 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -4535,7 +4535,30 @@ NTSTATUS WINAPI RtlCreateActivationContext( HANDLE *handle, const void *ptr ) if (pActCtx->lpSource && !((pActCtx->dwFlags & ACTCTX_FLAG_RESOURCE_NAME_VALID) && (pActCtx->dwFlags & ACTCTX_FLAG_HMODULE_VALID))) { - if (!RtlDosPathNameToNtPathName_U(pActCtx->lpSource, &nameW, NULL, NULL)) + WCHAR *source = NULL; + BOOLEAN ret; + + if (pActCtx->dwFlags & ACTCTX_FLAG_ASSEMBLY_DIRECTORY_VALID && + RtlDetermineDosPathNameType_U(pActCtx->lpSource) == RELATIVE_PATH) + { + DWORD dir_len, source_len; + + dir_len = strlenW(pActCtx->lpAssemblyDirectory); + source_len = strlenW(pActCtx->lpSource); + if (!(source = RtlAllocateHeap( GetProcessHeap(), 0, (dir_len+source_len+2)*sizeof(WCHAR)))) + { + status = STATUS_NO_MEMORY; + goto error; + } + + memcpy(source, pActCtx->lpAssemblyDirectory, dir_len*sizeof(WCHAR)); + source[dir_len] = '\\'; + memcpy(source+dir_len+1, pActCtx->lpSource, (source_len+1)*sizeof(WCHAR)); + } + + ret = RtlDosPathNameToNtPathName_U(source ? source : pActCtx->lpSource, &nameW, NULL, NULL); + if (source) RtlFreeHeap( GetProcessHeap(), 0, source ); + if (!ret) { status = STATUS_NO_SUCH_FILE; goto error;

1 0

Sebastian Lackner : configure: Fix detection of gnutls on Ubuntu 14.10.
by Alexandre Julliard 28 Nov '14

28 Nov '14

Module: wine Branch: master Commit: 79e0cb3a26f8ddefa12a7bf1023cf442f4072b81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79e0cb3a26f8ddefa12a7bf10… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Sep 7 08:09:54 2014 +0200 configure: Fix detection of gnutls on Ubuntu 14.10. --- configure | 16 ++++++++-------- configure.ac | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/configure b/configure index 4b1a37d..6f45fee 100755 --- a/configure +++ b/configure @@ -6001,7 +6001,7 @@ else We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -6047,7 +6047,7 @@ else We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -6071,7 +6071,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -6116,7 +6116,7 @@ else We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -6140,7 +6140,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -11278,10 +11278,10 @@ _ACEOF if ac_fn_c_try_link "$LINENO"; then : case "$LIBEXT" in dll) ac_cv_lib_soname_gnutls=`$ac_cv_path_LDD conftest.exe | grep "gnutls" | sed -e "s/dll.*/dll/"';2,$d'` ;; - dylib) ac_cv_lib_soname_gnutls=`otool -L conftest$ac_exeext | grep "libgnutls\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/$libgnutls\.[0-9A-Za-z.]*dylib$.*$/\1/"';2,$d'` ;; - *) ac_cv_lib_soname_gnutls=`$READELF -d conftest$ac_exeext | grep "NEEDED.*libgnutls\\.$LIBEXT" | sed -e "s/^.*\\[\$libgnutls\\.$LIBEXT[^ ]*\$\\].*$/\1/"';2,$d'` + dylib) ac_cv_lib_soname_gnutls=`otool -L conftest$ac_exeext | grep "libgnutls\$-deb0\$\\{0,1\\}\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/$libgnutls\\(-deb0\$\\{0,1\\}\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;; + *) ac_cv_lib_soname_gnutls=`$READELF -d conftest$ac_exeext | grep "NEEDED.*libgnutls\$-deb0\$\\{0,1\\}\\.$LIBEXT" | sed -e "s/^.*\\[\$libgnutls\\(-deb0\$\\{0,1\\}\\.$LIBEXT[^ ]*\\)\\].*$/\1/"';2,$d'` if ${ac_cv_lib_soname_gnutls:+false} :; then : - ac_cv_lib_soname_gnutls=`$LDD conftest$ac_exeext | grep "libgnutls\\.$LIBEXT" | sed -e "s/^.*$libgnutls\.$LIBEXT[^ ]*$.*$/\1/"';2,$d'` + ac_cv_lib_soname_gnutls=`$LDD conftest$ac_exeext | grep "libgnutls\$-deb0\$\\{0,1\\}\\.$LIBEXT" | sed -e "s/^.*$libgnutls\\(-deb0\$\\{0,1\\}\.$LIBEXT[^ ]*\).*$/\1/"';2,$d'` fi ;; esac fi diff --git a/configure.ac b/configure.ac index 5521af2..edf5408 100644 --- a/configure.ac +++ b/configure.ac @@ -1359,7 +1359,7 @@ then [AC_CHECK_HEADER(gnutls/gnutls.h, [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <gnutls/gnutls.h> #include <gnutls/crypto.h>]], [[static typeof(gnutls_mac_get_key_size) *func; if (func) return 0;]])], - [WINE_CHECK_SONAME(gnutls,gnutls_global_init,,[GNUTLS_CFLAGS=""],[$GNUTLS_LIBS])])], + [WINE_CHECK_SONAME(gnutls,gnutls_global_init,,[GNUTLS_CFLAGS=""],[$GNUTLS_LIBS],[[libgnutls\$-deb0\$\\{0,1\\}]])])], [GNUTLS_CFLAGS=""])]) fi WINE_WARNING_WITH(gnutls,[test "x$ac_cv_lib_soname_gnutls" = "x"],

1 0

Stefan Dösinger : d3d/tests: Rename fog_interpolation_test for consistency.
by Alexandre Julliard 27 Nov '14

27 Nov '14

Module: wine Branch: master Commit: 871fc4a38fa44b5484eb651236b182efef790248 URL: http://source.winehq.org/git/wine.git/?a=commit;h=871fc4a38fa44b5484eb65123… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Nov 27 12:12:36 2014 +0100 d3d/tests: Rename fog_interpolation_test for consistency. --- dlls/d3d8/tests/visual.c | 6 +++--- dlls/d3d9/tests/visual.c | 6 +++--- dlls/ddraw/tests/ddraw7.c | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index ec406f1..a8a771e 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -5217,7 +5217,7 @@ done: DestroyWindow(window); } -static void fog_interpolation_test(void) +static void test_fog_interpolation(void) { HRESULT hr; IDirect3DDevice8 *device; @@ -5433,7 +5433,7 @@ static void test_negative_fixedfunction_fog(void) * parameters to 0.0 and 1.0 in the table fog case. */ {D3DFVF_XYZRHW, tquad, sizeof(*tquad), &identity, {-1.0f}, {0.0f}, D3DFOG_NONE, D3DFOG_LINEAR, 0x00808000, 0x00ff0000}, - /* fog_interpolation_test shows that vertex fog evaluates the fog + /* test_fog_interpolation shows that vertex fog evaluates the fog * equation in the vertex pipeline. Start = -1.0 && end = 0.0 shows * that the abs happens before the fog equation is evaluated. */ {D3DFVF_XYZ, quad, sizeof(*quad), &zero, { 0.0f}, {1.0f}, @@ -5565,6 +5565,6 @@ START_TEST(visual) volume_v16u16_test(); add_dirty_rect_test(); test_3dc_formats(); - fog_interpolation_test(); + test_fog_interpolation(); test_negative_fixedfunction_fog(); } diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 59f5ba8..d1aa3d4 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -16820,7 +16820,7 @@ done: DestroyWindow(window); } -static void fog_interpolation_test(void) +static void test_fog_interpolation(void) { HRESULT hr; IDirect3DDevice9 *device; @@ -17036,7 +17036,7 @@ static void test_negative_fixedfunction_fog(void) * parameters to 0.0 and 1.0 in the table fog case. */ {D3DFVF_XYZRHW, tquad, sizeof(*tquad), &identity, {-1.0f}, {0.0f}, D3DFOG_NONE, D3DFOG_LINEAR, 0x00808000, 0x00ff0000}, - /* fog_interpolation_test shows that vertex fog evaluates the fog + /* test_fog_interpolation shows that vertex fog evaluates the fog * equation in the vertex pipeline. Start = -1.0 && end = 0.0 shows * that the abs happens before the fog equation is evaluated. */ {D3DFVF_XYZ, quad, sizeof(*quad), &zero, { 0.0f}, {1.0f}, @@ -17226,6 +17226,6 @@ START_TEST(visual) stencil_cull_test(); test_per_stage_constant(); test_3dc_formats(); - fog_interpolation_test(); + test_fog_interpolation(); test_negative_fixedfunction_fog(); } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index e9510c4..0ac7d7e 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -7878,7 +7878,7 @@ static void test_surface_desc_lock(void) DestroyWindow(window); } -static void fog_interpolation_test(void) +static void test_fog_interpolation(void) { HRESULT hr; IDirect3DDevice7 *device; @@ -8069,7 +8069,7 @@ static void test_negative_fixedfunction_fog(void) /* r200 GPUs and presumably all d3d8 and older HW clamp the fog * parameters to 0.0 and 1.0 in the table fog case. */ {D3DFVF_XYZRHW, tquad, &identity, {-1.0f}, {0.0f}, D3DFOG_NONE, D3DFOG_LINEAR, 0x00808000, 0x00ff0000}, - /* fog_interpolation_test shows that vertex fog evaluates the fog + /* test_fog_interpolation shows that vertex fog evaluates the fog * equation in the vertex pipeline. Start = -1.0 && end = 0.0 shows * that the abs happens before the fog equation is evaluated. */ {D3DFVF_XYZ, quad, &zero, { 0.0f}, {1.0f}, D3DFOG_LINEAR, D3DFOG_NONE, 0x00808000, 0x00808000}, @@ -8229,6 +8229,6 @@ START_TEST(ddraw7) test_lost_device(); test_resource_priority(); test_surface_desc_lock(); - fog_interpolation_test(); + test_fog_interpolation(); test_negative_fixedfunction_fog(); }

1 0

Stefan Dösinger : d3d/tests: Table fog does not abs the fog coordinate.
by Alexandre Julliard 27 Nov '14

27 Nov '14

Module: wine Branch: master Commit: 96519f9be9471ce418f020fb31ac38e2f4d2ed14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96519f9be9471ce418f020fb3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Nov 27 12:12:35 2014 +0100 d3d/tests: Table fog does not abs the fog coordinate. --- dlls/d3d8/tests/visual.c | 86 +++++++++++++++++++++++++++++++++++++---------- dlls/d3d9/tests/visual.c | 86 +++++++++++++++++++++++++++++++++++++---------- dlls/ddraw/tests/ddraw7.c | 73 +++++++++++++++++++++++++++++++--------- 3 files changed, 193 insertions(+), 52 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=96519f9be9471ce418f02…

1 0

Stefan Dösinger : d3d/tests: Show that the vfog abs is not a property of D3DFOG_LINEAR.
by Alexandre Julliard 27 Nov '14

27 Nov '14

Module: wine Branch: master Commit: cfd741c6b60881f767c71f2b9a1f02252d7b4d95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfd741c6b60881f767c71f2b9… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Nov 27 12:12:34 2014 +0100 d3d/tests: Show that the vfog abs is not a property of D3DFOG_LINEAR. --- dlls/d3d8/tests/visual.c | 10 ++++++---- dlls/d3d9/tests/visual.c | 10 ++++++---- dlls/ddraw/tests/ddraw7.c | 10 ++++++---- 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 317df5a..1cd066c 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -5389,6 +5389,7 @@ static void test_negative_fixedfunction_fog(void) float f; DWORD d; } start, end; + D3DFOGMODE vfog; DWORD color; } tests[] = @@ -5396,8 +5397,9 @@ static void test_negative_fixedfunction_fog(void) /* fog_interpolation_test shows that vertex fog evaluates the fog * equation in the vertex pipeline. Start = -1.0 && end = 0.0 shows * that the abs happens before the fog equation is evaluated. */ - {{ 0.0f}, {1.0f}, 0x00808000}, - {{-1.0f}, {0.0f}, 0x0000ff00}, + {{ 0.0f}, {1.0f}, D3DFOG_LINEAR, 0x00808000}, + {{-1.0f}, {0.0f}, D3DFOG_LINEAR, 0x0000ff00}, + {{ 0.0f}, {1.0f}, D3DFOG_EXP, 0x009b6400}, }; static const D3DMATRIX proj_mat = {{{ @@ -5430,8 +5432,6 @@ static void test_negative_fixedfunction_fog(void) ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); hr = IDirect3DDevice8_SetRenderState(device, D3DRS_FOGCOLOR, 0x0000ff00); ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); - hr = IDirect3DDevice8_SetRenderState(device, D3DRS_FOGVERTEXMODE, D3DFOG_LINEAR); - ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); hr = IDirect3DDevice8_SetTransform(device, D3DTS_PROJECTION, &proj_mat); ok(SUCCEEDED(hr), "Failed to set projection transform, hr %#x.\n", hr); @@ -5444,6 +5444,8 @@ static void test_negative_fixedfunction_fog(void) ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); hr = IDirect3DDevice8_SetRenderState(device, D3DRS_FOGEND, tests[i].end.d); ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_FOGVERTEXMODE, tests[i].vfog); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); hr = IDirect3DDevice8_BeginScene(device); ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(*quad)); diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 6ee19b0..6bf9adc 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -16992,6 +16992,7 @@ static void test_negative_fixedfunction_fog(void) float f; DWORD d; } start, end; + D3DFOGMODE vfog; DWORD color; } tests[] = @@ -16999,8 +17000,9 @@ static void test_negative_fixedfunction_fog(void) /* fog_interpolation_test shows that vertex fog evaluates the fog * equation in the vertex pipeline. Start = -1.0 && end = 0.0 shows * that the abs happens before the fog equation is evaluated. */ - {{ 0.0f}, {1.0f}, 0x00808000}, - {{-1.0f}, {0.0f}, 0x0000ff00}, + {{ 0.0f}, {1.0f}, D3DFOG_LINEAR, 0x00808000}, + {{-1.0f}, {0.0f}, D3DFOG_LINEAR, 0x0000ff00}, + {{ 0.0f}, {1.0f}, D3DFOG_EXP, 0x009b6400}, }; static const D3DMATRIX proj_mat = {{{ @@ -17033,8 +17035,6 @@ static void test_negative_fixedfunction_fog(void) ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGCOLOR, 0x0000ff00); ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); - hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGVERTEXMODE, D3DFOG_LINEAR); - ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); hr = IDirect3DDevice9_SetTransform(device, D3DTS_PROJECTION, &proj_mat); ok(SUCCEEDED(hr), "Failed to set projection transform, hr %#x.\n", hr); @@ -17047,6 +17047,8 @@ static void test_negative_fixedfunction_fog(void) ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGEND, tests[i].end.d); ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGVERTEXMODE, tests[i].vfog); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); hr = IDirect3DDevice9_BeginScene(device); ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(*quad)); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 647ec82..a1dbd5e 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -8030,6 +8030,7 @@ static void test_negative_fixedfunction_fog(void) float f; DWORD d; } start, end; + D3DFOGMODE vfog; DWORD color; } tests[] = @@ -8037,8 +8038,9 @@ static void test_negative_fixedfunction_fog(void) /* fog_interpolation_test shows that vertex fog evaluates the fog * equation in the vertex pipeline. Start = -1.0 && end = 0.0 shows * that the abs happens before the fog equation is evaluated. */ - {{ 0.0f}, {1.0f}, 0x00808000}, - {{-1.0f}, {0.0f}, 0x0000ff00}, + {{ 0.0f}, {1.0f}, D3DFOG_LINEAR, 0x00808000}, + {{-1.0f}, {0.0f}, D3DFOG_LINEAR, 0x0000ff00}, + {{ 0.0f}, {1.0f}, D3DFOG_EXP, 0x009b6400}, }; static D3DMATRIX proj_mat = { @@ -8069,8 +8071,6 @@ static void test_negative_fixedfunction_fog(void) ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_FOGCOLOR, 0x0000ff00); ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); - hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_FOGVERTEXMODE, D3DFOG_LINEAR); - ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); hr = IDirect3DDevice7_SetTransform(device, D3DTRANSFORMSTATE_PROJECTION, &proj_mat); ok(SUCCEEDED(hr), "Failed to set projection transform, hr %#x.\n", hr); @@ -8083,6 +8083,8 @@ static void test_negative_fixedfunction_fog(void) ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_FOGEND, tests[i].end.d); ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_FOGVERTEXMODE, tests[i].vfog); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); hr = IDirect3DDevice7_BeginScene(device); ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); hr = IDirect3DDevice7_DrawPrimitive(device, D3DPT_TRIANGLESTRIP,

1 0

Stefan Dösinger : wined3d: Vertex fog uses the absolute eye position z.
by Alexandre Julliard 27 Nov '14

27 Nov '14

Module: wine Branch: master Commit: c9b10beb368d81fcc82edd83041896407f3a0a89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9b10beb368d81fcc82edd830… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Nov 27 12:12:33 2014 +0100 wined3d: Vertex fog uses the absolute eye position z. --- dlls/d3d8/tests/visual.c | 103 +++++++++++++++++++++++++++++++++++++++++++++ dlls/d3d9/tests/visual.c | 103 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 99 +++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/glsl_shader.c | 4 +- 4 files changed, 308 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c9b10beb368d81fcc82ed…

1 0

Hans Leidekker : user32: Add a stub implementation of IsTouchWindow.
by Alexandre Julliard 27 Nov '14

27 Nov '14

Module: wine Branch: master Commit: 9023a95e5b0a8d96bdf74d926d3715fafbf98266 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9023a95e5b0a8d96bdf74d926… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 27 12:17:26 2014 +0100 user32: Add a stub implementation of IsTouchWindow. --- dlls/user32/misc.c | 11 ++++++++++- dlls/user32/user32.spec | 1 + include/winuser.h | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index bcf6263..b3615e8 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -727,7 +727,16 @@ BOOL WINAPI SetGestureConfig( HWND hwnd, DWORD reserved, UINT id, PGESTURECONFIG { FIXME("(%p %08x %u %p %u): stub\n", hwnd, reserved, id, config, size); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + return FALSE; +} + +/********************************************************************** + * IsTouchWindow [USER32.@] + */ +BOOL WINAPI IsTouchWindow( HWND hwnd, PULONG flags ) +{ + FIXME("(%p %p): stub\n", hwnd, flags); + return FALSE; } static const WCHAR imeW[] = {'I','M','E',0}; diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index da02c58..a8bbe83 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -445,6 +445,7 @@ @ stdcall IsMenu(long) @ stdcall IsRectEmpty(ptr) # @ stub IsServerSideWindow +@ stdcall IsTouchWindow(long ptr) @ stdcall IsWinEventHookInstalled(long) @ stdcall IsWindow(long) @ stdcall IsWindowEnabled(long) diff --git a/include/winuser.h b/include/winuser.h index 303f5d3..3d9b937 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -3735,6 +3735,7 @@ WINUSERAPI BOOL WINAPI IsHungAppWindow(HWND); WINUSERAPI BOOL WINAPI IsIconic(HWND); WINUSERAPI BOOL WINAPI IsMenu(HMENU); WINUSERAPI BOOL WINAPI IsRectEmpty(const RECT*); +WINUSERAPI BOOL WINAPI IsTouchWindow(HWND,PULONG); WINUSERAPI BOOL WINAPI IsWinEventHookInstalled(DWORD); WINUSERAPI BOOL WINAPI IsWindow(HWND); WINUSERAPI BOOL WINAPI IsWindowEnabled(HWND);

1 0

Hans Leidekker : vssapi: Add stub implementations for a couple of functions.
by Alexandre Julliard 27 Nov '14

27 Nov '14

Module: wine Branch: master Commit: a4a48d3fc87fb62c7e9266978a197f36e9407cac URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4a48d3fc87fb62c7e9266978… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 27 12:16:54 2014 +0100 vssapi: Add stub implementations for a couple of functions. --- dlls/vssapi/Makefile.in | 3 ++ dlls/vssapi/main.c | 108 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/vssapi/vssapi.spec | 10 ++--- include/Makefile.in | 2 + include/vss.idl | 31 ++++++++++++++ include/vswriter.h | 47 +++++++++++++++++++++ 6 files changed, 196 insertions(+), 5 deletions(-) diff --git a/dlls/vssapi/Makefile.in b/dlls/vssapi/Makefile.in index 583ec1c..867a562 100644 --- a/dlls/vssapi/Makefile.in +++ b/dlls/vssapi/Makefile.in @@ -1 +1,4 @@ MODULE = vssapi.dll + +C_SRCS = \ + main.c diff --git a/dlls/vssapi/main.c b/dlls/vssapi/main.c new file mode 100644 index 0000000..133f4c5 --- /dev/null +++ b/dlls/vssapi/main.c @@ -0,0 +1,108 @@ +/* + * Copyright 2014 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" +#include "vss.h" +#include "vswriter.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL( vssapi ); + +#ifdef __i386__ /* thiscall functions are i386-specific */ + +#define THISCALL(func) __thiscall_ ## func +#define THISCALL_NAME(func) __ASM_NAME("__thiscall_" #func) +#define __thiscall __stdcall +#define DEFINE_THISCALL_WRAPPER(func,args) \ + extern void THISCALL(func)(void); \ + __ASM_GLOBAL_FUNC(__thiscall_ ## func, \ + "popl %eax\n\t" \ + "pushl %ecx\n\t" \ + "pushl %eax\n\t" \ + "jmp " __ASM_NAME(#func) __ASM_STDCALL(args) ) +#else /* __i386__ */ + +#define THISCALL(func) func +#define THISCALL_NAME(func) __ASM_NAME(#func) +#define __thiscall __cdecl +#define DEFINE_THISCALL_WRAPPER(func,args) /* nothing */ + +#endif /* __i386__ */ + +struct CVssWriter +{ + void **vtable; +}; + +/****************************************************************** + * ??0CVssWriter@@QAE@XZ (VSSAPI.@) + */ +DEFINE_THISCALL_WRAPPER( VSSAPI_CVssWriter_default_ctor, 4 ) +struct CVssWriter * __thiscall VSSAPI_CVssWriter_default_ctor( struct CVssWriter *writer ) +{ + FIXME( "%p\n", writer ); + writer->vtable = NULL; + return writer; +} + +/****************************************************************** + * ??1CVssWriter@@UAE@XZ (VSSAPI.@) + */ +DEFINE_THISCALL_WRAPPER( VSSAPI_CVssWriter_dtor, 4 ) +void __thiscall VSSAPI_CVssWriter_dtor( struct CVssWriter *writer ) +{ + FIXME( "%p\n", writer ); +} + +/****************************************************************** + * ?Initialize@CVssWriter@@QAGJU_GUID@@PBGW4VSS_USAGE_TYPE@@W4VSS_SOURCE_TYPE@@W4_VSS_APPLICATION_LEVEL@@KW4VSS_ALTERNATE_WRITER_STATE@@_N@Z + */ +DEFINE_THISCALL_WRAPPER( VSSAPI_CVssWriter_Initialize, 52 ) +HRESULT __thiscall VSSAPI_CVssWriter_Initialize( struct CVssWriter *writer, VSS_ID id, + LPCWSTR name, VSS_USAGE_TYPE usage_type, VSS_SOURCE_TYPE source_type, + VSS_APPLICATION_LEVEL level, DWORD timeout, VSS_ALTERNATE_WRITER_STATE alt_writer_state, + BOOL throttle, LPCWSTR instance ) +{ + FIXME( "%p, %s, %s, %u, %u, %u, %u, %u, %d, %s\n", writer, debugstr_guid(&id), + debugstr_w(name), usage_type, source_type, level, timeout, alt_writer_state, + throttle, debugstr_w(instance) ); + return S_OK; +} + +/****************************************************************** + * ?Subscribe@CVssWriter@@QAGJK@Z + */ +DEFINE_THISCALL_WRAPPER( VSSAPI_CVssWriter_Subscribe, 8 ) +HRESULT __thiscall VSSAPI_CVssWriter_Subscribe( struct CVssWriter *writer, DWORD flags ) +{ + FIXME( "%p, %x\n", writer, flags ); + return S_OK; +} + +/****************************************************************** + * ?Unsubscribe@CVssWriter@@QAGJXZ + */ +DEFINE_THISCALL_WRAPPER( VSSAPI_CVssWriter_Unsubscribe, 4 ) +HRESULT __thiscall VSSAPI_CVssWriter_Unsubscribe( struct CVssWriter *writer ) +{ + FIXME( "%p\n", writer ); + return S_OK; +} diff --git a/dlls/vssapi/vssapi.spec b/dlls/vssapi/vssapi.spec index 4ad38a3..77599ab 100644 --- a/dlls/vssapi/vssapi.spec +++ b/dlls/vssapi/vssapi.spec @@ -2,9 +2,9 @@ @ stub VssFreeSnapshotProperties @ stub ShouldBlockRevert @ stub ??0CVssJetWriter@@QAE@XZ -@ stub ??0CVssWriter@@QAE@XZ +@ thiscall -arch=i386 ??0CVssWriter@@QAE@XZ(ptr) VSSAPI_CVssWriter_default_ctor @ stub ??1CVssJetWriter@@UAE@XZ -@ stub ??1CVssWriter@@UAE@XZ +@ thiscall -arch=i386 ??1CVssWriter@@UAE@XZ(ptr) VSSAPI_CVssWriter_dtor @ stub ?AreComponentsSelected@CVssJetWriter@@IBG_NXZ @ stub ?AreComponentsSelected@CVssWriter@@IBG_NXZ @ stub ?CreateVssBackupComponents@@YGJPAPAVIVssBackupComponents@@@Z @@ -27,7 +27,7 @@ @ stub ?GetSnapshotDeviceName@CVssJetWriter@@IBGJPBGPAPBG@Z @ stub ?GetSnapshotDeviceName@CVssWriter@@IBGJPBGPAPBG@Z @ stub ?Initialize@CVssJetWriter@@QAGJU_GUID@@PBG_N211K@Z -@ stub ?Initialize@CVssWriter@@QAGJU_GUID@@PBGW4VSS_USAGE_TYPE@@W4VSS_SOURCE_TYPE@@W4_VSS_APPLICATION_LEVEL@@KW4VSS_ALTERNATE_WRITER_STATE@@_N@Z +@ thiscall -arch=i386 ?Initialize@CVssWriter@@QAGJU_GUID@@PBGW4VSS_USAGE_TYPE@@W4VSS_SOURCE_TYPE@@W4_VSS_APPLICATION_LEVEL@@KW4VSS_ALTERNATE_WRITER_STATE@@_N@Z(ptr ptr wstr long long long long long long wstr) VSSAPI_CVssWriter_Initialize @ stub ?InstallAlternateWriter@CVssWriter@@QAGJU_GUID@@0@Z @ stub ?IsBootableSystemStateBackedUp@CVssJetWriter@@IBG_NXZ @ stub ?IsBootableSystemStateBackedUp@CVssWriter@@IBG_NXZ @@ -67,9 +67,9 @@ @ stub ?OnVSSShutdown@CVssWriter@@UAG_NXZ @ stub ?SetWriterFailure@CVssJetWriter@@IAGJJ@Z @ stub ?SetWriterFailure@CVssWriter@@IAGJJ@Z -@ stub ?Subscribe@CVssWriter@@QAGJK@Z +@ thiscall -arch=i386 ?Subscribe@CVssWriter@@QAGJK@Z(ptr long) VSSAPI_CVssWriter_Subscribe @ stub ?Uninitialize@CVssJetWriter@@QAGXXZ -@ stub ?Unsubscribe@CVssWriter@@QAGJXZ +@ thiscall -arch=i386 ?Unsubscribe@CVssWriter@@QAGJXZ(ptr) VSSAPI_CVssWriter_Unsubscribe @ stub CreateVssBackupComponentsInternal @ stub CreateVssExamineWriterMetadataInternal @ stub CreateVssExpressWriterInternal diff --git a/include/Makefile.in b/include/Makefile.in index e8d2379..a952964 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -118,6 +118,7 @@ PUBLIC_IDL_H_SRCS = \ urlhist.idl \ urlmon.idl \ vmr9.idl \ + vss.idl \ wbemcli.idl \ wbemdisp.idl \ wbemprov.idl \ @@ -577,6 +578,7 @@ SRCDIR_INCLUDES = \ vmrender.idl \ vsstyle.h \ vssym32.h \ + vswriter.h \ werapi.h \ wfext.h \ wia.h \ diff --git a/include/vss.idl b/include/vss.idl new file mode 100644 index 0000000..62335ea --- /dev/null +++ b/include/vss.idl @@ -0,0 +1,31 @@ +/* + * Copyright 2014 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "oaidl.idl"; + +typedef GUID VSS_ID; + +typedef enum _VSS_APPLICATION_LEVEL +{ + VSS_APP_AUTO = -1, + VSS_APP_UNKNOWN = 0, + VSS_APP_SYSTEM = 1, + VSS_APP_BACK_END = 2, + VSS_APP_FRONT_END = 3, + VSS_APP_SYSTEM_RM = 4 +} VSS_APPLICATION_LEVEL; diff --git a/include/vswriter.h b/include/vswriter.h new file mode 100644 index 0000000..043b871 --- /dev/null +++ b/include/vswriter.h @@ -0,0 +1,47 @@ +/* + * Copyright 2014 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_VSWRITER_H +#define __WINE_VSWRITER_H + +typedef enum +{ + VSS_UT_UNDEFINED, + VSS_UT_BOOTABLESYSTEMSTATE, + VSS_UT_SYSTEMSERVICE, + VSS_UT_USERDATA, + VSS_UT_OTHER +} VSS_USAGE_TYPE; + +typedef enum +{ + VSS_ST_UNDEFINED, + VSS_ST_TRANSACTEDDB, + VSS_ST_NONTRANSACTEDDB, + VSS_ST_OTHER +} VSS_SOURCE_TYPE; + +typedef enum +{ + VSS_AWS_UNDEFINED, + VSS_AWS_NO_ALTERNATE_WRITER, + VSS_AWS_ALTERNATE_WRITER_EXISTS, + VSS_AWS_THIS_IS_ALTERNATE_WRITER +} VSS_ALTERNATE_WRITER_STATE; + +#endif /* ___WINE_VSWRITER_H */

1 0

Hans Leidekker : vssapi: New dll.
by Alexandre Julliard 27 Nov '14

27 Nov '14

Module: wine Branch: master Commit: 153d389f459bf1d10e206432cccbc06fd22a8ec2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=153d389f459bf1d10e206432c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 27 12:16:07 2014 +0100 vssapi: New dll. --- configure | 2 ++ configure.ac | 1 + dlls/vssapi/Makefile.in | 1 + dlls/vssapi/vssapi.spec | 84 +++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 88 insertions(+) diff --git a/configure b/configure index d09438e..4b1a37d 100755 --- a/configure +++ b/configure @@ -1255,6 +1255,7 @@ enable_vcomp100 enable_vcomp90 enable_vdmdbg enable_version +enable_vssapi enable_wbemdisp enable_wbemprox enable_webservices @@ -17356,6 +17357,7 @@ wine_fn_config_test dlls/version/tests version_test wine_fn_config_dll vmm.vxd enable_win16 wine_fn_config_dll vnbt.vxd enable_win16 wine_fn_config_dll vnetbios.vxd enable_win16 +wine_fn_config_dll vssapi enable_vssapi wine_fn_config_dll vtdapi.vxd enable_win16 wine_fn_config_dll vwin32.vxd enable_win16 wine_fn_config_dll w32skrnl enable_win16 diff --git a/configure.ac b/configure.ac index 04bcbd8..5521af2 100644 --- a/configure.ac +++ b/configure.ac @@ -3235,6 +3235,7 @@ WINE_CONFIG_TEST(dlls/version/tests) WINE_CONFIG_DLL(vmm.vxd,enable_win16) WINE_CONFIG_DLL(vnbt.vxd,enable_win16) WINE_CONFIG_DLL(vnetbios.vxd,enable_win16) +WINE_CONFIG_DLL(vssapi) WINE_CONFIG_DLL(vtdapi.vxd,enable_win16) WINE_CONFIG_DLL(vwin32.vxd,enable_win16) WINE_CONFIG_DLL(w32skrnl,enable_win16) diff --git a/dlls/vssapi/Makefile.in b/dlls/vssapi/Makefile.in new file mode 100644 index 0000000..583ec1c --- /dev/null +++ b/dlls/vssapi/Makefile.in @@ -0,0 +1 @@ +MODULE = vssapi.dll diff --git a/dlls/vssapi/vssapi.spec b/dlls/vssapi/vssapi.spec new file mode 100644 index 0000000..4ad38a3 --- /dev/null +++ b/dlls/vssapi/vssapi.spec @@ -0,0 +1,84 @@ +@ stub IsVolumeSnapshotted +@ stub VssFreeSnapshotProperties +@ stub ShouldBlockRevert +@ stub ??0CVssJetWriter@@QAE@XZ +@ stub ??0CVssWriter@@QAE@XZ +@ stub ??1CVssJetWriter@@UAE@XZ +@ stub ??1CVssWriter@@UAE@XZ +@ stub ?AreComponentsSelected@CVssJetWriter@@IBG_NXZ +@ stub ?AreComponentsSelected@CVssWriter@@IBG_NXZ +@ stub ?CreateVssBackupComponents@@YGJPAPAVIVssBackupComponents@@@Z +@ stub ?CreateVssExamineWriterMetadata@@YGJPAGPAPAVIVssExamineWriterMetadata@@@Z +@ stub ?CreateVssSnapshotSetDescription@@YGJU_GUID@@JPAPAVIVssSnapshotSetDescription@@@Z +@ stub ?GetBackupType@CVssJetWriter@@IBG?AW4_VSS_BACKUP_TYPE@@XZ +@ stub ?GetBackupType@CVssWriter@@IBG?AW4_VSS_BACKUP_TYPE@@XZ +@ stub ?GetContext@CVssJetWriter@@IBGJXZ +@ stub ?GetContext@CVssWriter@@IBGJXZ +@ stub ?GetCurrentLevel@CVssJetWriter@@IBG?AW4_VSS_APPLICATION_LEVEL@@XZ +@ stub ?GetCurrentLevel@CVssWriter@@IBG?AW4_VSS_APPLICATION_LEVEL@@XZ +@ stub ?GetCurrentSnapshotSetId@CVssJetWriter@@IBG?AU_GUID@@XZ +@ stub ?GetCurrentSnapshotSetId@CVssWriter@@IBG?AU_GUID@@XZ +@ stub ?GetCurrentVolumeArray@CVssJetWriter@@IBGPAPBGXZ +@ stub ?GetCurrentVolumeArray@CVssWriter@@IBGPAPBGXZ +@ stub ?GetCurrentVolumeCount@CVssJetWriter@@IBGIXZ +@ stub ?GetCurrentVolumeCount@CVssWriter@@IBGIXZ +@ stub ?GetRestoreType@CVssJetWriter@@IBG?AW4_VSS_RESTORE_TYPE@@XZ +@ stub ?GetRestoreType@CVssWriter@@IBG?AW4_VSS_RESTORE_TYPE@@XZ +@ stub ?GetSnapshotDeviceName@CVssJetWriter@@IBGJPBGPAPBG@Z +@ stub ?GetSnapshotDeviceName@CVssWriter@@IBGJPBGPAPBG@Z +@ stub ?Initialize@CVssJetWriter@@QAGJU_GUID@@PBG_N211K@Z +@ stub ?Initialize@CVssWriter@@QAGJU_GUID@@PBGW4VSS_USAGE_TYPE@@W4VSS_SOURCE_TYPE@@W4_VSS_APPLICATION_LEVEL@@KW4VSS_ALTERNATE_WRITER_STATE@@_N@Z +@ stub ?InstallAlternateWriter@CVssWriter@@QAGJU_GUID@@0@Z +@ stub ?IsBootableSystemStateBackedUp@CVssJetWriter@@IBG_NXZ +@ stub ?IsBootableSystemStateBackedUp@CVssWriter@@IBG_NXZ +@ stub ?IsPartialFileSupportEnabled@CVssJetWriter@@IBG_NXZ +@ stub ?IsPartialFileSupportEnabled@CVssWriter@@IBG_NXZ +@ stub ?IsPathAffected@CVssJetWriter@@IBG_NPBG@Z +@ stub ?IsPathAffected@CVssWriter@@IBG_NPBG@Z +@ stub ?LoadVssSnapshotSetDescription@@YGJPBGPAPAVIVssSnapshotSetDescription@@U_GUID@@@Z +@ stub ?OnAbortBegin@CVssJetWriter@@UAGXXZ +@ stub ?OnAbortEnd@CVssJetWriter@@UAGXXZ +@ stub ?OnBackOffIOOnVolume@CVssWriter@@UAG_NPAGU_GUID@@1@Z +@ stub ?OnBackupComplete@CVssWriter@@UAG_NPAVIVssWriterComponents@@@Z +@ stub ?OnBackupCompleteBegin@CVssJetWriter@@UAG_NPAVIVssWriterComponents@@@Z +@ stub ?OnBackupCompleteEnd@CVssJetWriter@@UAG_NPAVIVssWriterComponents@@_N@Z +@ stub ?OnBackupShutdown@CVssWriter@@UAG_NU_GUID@@@Z +@ stub ?OnContinueIOOnVolume@CVssWriter@@UAG_NPAGU_GUID@@1@Z +@ stub ?OnFreezeBegin@CVssJetWriter@@UAG_NXZ +@ stub ?OnFreezeEnd@CVssJetWriter@@UAG_N_N@Z +@ stub ?OnIdentify@CVssJetWriter@@UAG_NPAVIVssCreateWriterMetadata@@@Z +@ stub ?OnIdentify@CVssWriter@@UAG_NPAVIVssCreateWriterMetadata@@@Z +@ stub ?OnPostRestore@CVssWriter@@UAG_NPAVIVssWriterComponents@@@Z +@ stub ?OnPostRestoreBegin@CVssJetWriter@@UAG_NPAVIVssWriterComponents@@@Z +@ stub ?OnPostRestoreEnd@CVssJetWriter@@UAG_NPAVIVssWriterComponents@@_N@Z +@ stub ?OnPostSnapshot@CVssJetWriter@@UAG_NPAVIVssWriterComponents@@@Z +@ stub ?OnPostSnapshot@CVssWriter@@UAG_NPAVIVssWriterComponents@@@Z +@ stub ?OnPreRestore@CVssWriter@@UAG_NPAVIVssWriterComponents@@@Z +@ stub ?OnPreRestoreBegin@CVssJetWriter@@UAG_NPAVIVssWriterComponents@@@Z +@ stub ?OnPreRestoreEnd@CVssJetWriter@@UAG_NPAVIVssWriterComponents@@_N@Z +@ stub ?OnPrepareBackup@CVssWriter@@UAG_NPAVIVssWriterComponents@@@Z +@ stub ?OnPrepareBackupBegin@CVssJetWriter@@UAG_NPAVIVssWriterComponents@@@Z +@ stub ?OnPrepareBackupEnd@CVssJetWriter@@UAG_NPAVIVssWriterComponents@@_N@Z +@ stub ?OnPrepareSnapshotBegin@CVssJetWriter@@UAG_NXZ +@ stub ?OnPrepareSnapshotEnd@CVssJetWriter@@UAG_N_N@Z +@ stub ?OnThawBegin@CVssJetWriter@@UAG_NXZ +@ stub ?OnThawEnd@CVssJetWriter@@UAG_N_N@Z +@ stub ?OnVSSApplicationStartup@CVssWriter@@UAG_NXZ +@ stub ?OnVSSShutdown@CVssWriter@@UAG_NXZ +@ stub ?SetWriterFailure@CVssJetWriter@@IAGJJ@Z +@ stub ?SetWriterFailure@CVssWriter@@IAGJJ@Z +@ stub ?Subscribe@CVssWriter@@QAGJK@Z +@ stub ?Uninitialize@CVssJetWriter@@QAGXXZ +@ stub ?Unsubscribe@CVssWriter@@QAGJXZ +@ stub CreateVssBackupComponentsInternal +@ stub CreateVssExamineWriterMetadataInternal +@ stub CreateVssExpressWriterInternal +@ stub CreateWriter +@ stub CreateWriterEx +@ stub DllCanUnloadNow +@ stub DllGetClassObject +@ stub GetProviderMgmtInterface +@ stub GetProviderMgmtInterfaceInternal +@ stub IsVolumeSnapshottedInternal +@ stub ShouldBlockRevertInternal +@ stub VssFreeSnapshotPropertiesInternal

1 0

Hans Leidekker : msiexec: Add support for /update.
by Alexandre Julliard 27 Nov '14

27 Nov '14

Module: wine Branch: master Commit: d81b8bbd798d340bd51f3b1dfca8e0c570446781 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d81b8bbd798d340bd51f3b1df… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 27 12:15:46 2014 +0100 msiexec: Add support for /update. --- programs/msiexec/msiexec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/msiexec/msiexec.c b/programs/msiexec/msiexec.c index 1c42e90..cb0984d 100644 --- a/programs/msiexec/msiexec.c +++ b/programs/msiexec/msiexec.c @@ -870,7 +870,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine ExitProcess(1); } } - else if(msi_option_equal(argvW[i], "p")) + else if(msi_option_equal(argvW[i], "p") || msi_option_equal(argvW[i], "update")) { FunctionPatch = TRUE; i++;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2014