December 2006 - Wine-Commits

Stefan Dösinger : wined3d: Move WINED3DRS_FILLMODE to the state table.
by Alexandre Julliard Dec. 7, 2006

Dec. 7, 2006

Module: wine Branch: master Commit: de96320421d82c4728a898456fbcbc7546e00007 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de96320421d82c4728a898456… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Dec 5 23:45:35 2006 +0100 wined3d: Move WINED3DRS_FILLMODE to the state table. --- dlls/wined3d/device.c | 9 +-------- dlls/wined3d/state.c | 23 ++++++++++++++++++++++- 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 939dfbe..077ac42 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3437,14 +3437,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl switch (State) { case WINED3DRS_FILLMODE : - switch ((WINED3DFILLMODE) Value) { - case WINED3DFILL_POINT : glPolygonMode(GL_FRONT_AND_BACK, GL_POINT); break; - case WINED3DFILL_WIREFRAME : glPolygonMode(GL_FRONT_AND_BACK, GL_LINE); break; - case WINED3DFILL_SOLID : glPolygonMode(GL_FRONT_AND_BACK, GL_FILL); break; - default: - FIXME("Unrecognized WINED3DRS_FILLMODE value %d\n", Value); - } - checkGLcall("glPolygonMode (fillmode)"); + StateTable[STATE_RENDER(WINED3DRS_FILLMODE)].apply(STATE_RENDER(WINED3DRS_FILLMODE), This->stateBlock); break; case WINED3DRS_LIGHTING : diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index b674b08..32b8032 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -58,6 +58,27 @@ static void state_undefined(DWORD state, WARN("undefined state %d\n", state); } +static void state_fillmode(DWORD state, IWineD3DStateBlockImpl *stateblock) { + D3DFILLMODE Value = stateblock->renderState[WINED3DRS_FILLMODE]; + + switch(Value) { + case D3DFILL_POINT: + glPolygonMode(GL_FRONT_AND_BACK, GL_POINT); + checkGLcall("glPolygonMode(GL_FRONT_AND_BACK, GL_POINT)"); + break; + case D3DFILL_WIREFRAME: + glPolygonMode(GL_FRONT_AND_BACK, GL_LINE); + checkGLcall("glPolygonMode(GL_FRONT_AND_BACK, GL_LINE)"); + break; + case D3DFILL_SOLID: + glPolygonMode(GL_FRONT_AND_BACK, GL_FILL); + checkGLcall("glPolygonMode(GL_FRONT_AND_BACK, GL_FILL)"); + break; + default: + FIXME("Unrecognized WINED3DRS_FILLMODE value %d\n", Value); + } +} + const struct StateEntry StateTable[] = { /* State name representative, apply function */ @@ -69,7 +90,7 @@ const struct StateEntry StateTable[] = { /* 5, WINED3DRS_WRAPU */ STATE_RENDER(WINED3DRS_WRAPU), state_unknown }, { /* 6, WINED3DRS_WRAPV */ STATE_RENDER(WINED3DRS_WRAPV), state_unknown }, { /* 7, WINED3DRS_ZENABLE */ STATE_RENDER(WINED3DRS_ZENABLE), state_unknown }, - { /* 8, WINED3DRS_FILLMODE */ STATE_RENDER(WINED3DRS_FILLMODE), state_unknown }, + { /* 8, WINED3DRS_FILLMODE */ STATE_RENDER(WINED3DRS_FILLMODE), state_fillmode }, { /* 9, WINED3DRS_SHADEMODE */ STATE_RENDER(WINED3DRS_SHADEMODE), state_unknown }, { /* 10, WINED3DRS_LINEPATTERN */ STATE_RENDER(WINED3DRS_LINEPATTERN), state_unknown }, { /* 11, WINED3DRS_MONOENABLE */ STATE_RENDER(WINED3DRS_MONOENABLE), state_unknown },

1 0

Stefan Dösinger : wined3d: Add render states to the state table.
by Alexandre Julliard Dec. 7, 2006

Dec. 7, 2006

Module: wine Branch: master Commit: 2a24e84a65d76bbd9c5c7edfdc4bd196358c6dff URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a24e84a65d76bbd9c5c7edfd… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Dec 6 13:22:12 2006 +0100 wined3d: Add render states to the state table. --- dlls/wined3d/state.c | 244 +++++++++++++++++++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 3 + 2 files changed, 245 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2a24e84a65d76bbd9c5c7…

1 0

Stefan Dösinger : wined3d: Create the state table.
by Alexandre Julliard Dec. 7, 2006

Dec. 7, 2006

Module: wine Branch: master Commit: c0268c7840bdf3a3eb4c6a096732f616c8af756d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0268c7840bdf3a3eb4c6a096… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Dec 5 23:36:10 2006 +0100 wined3d: Create the state table. --- dlls/wined3d/Makefile.in | 1 + dlls/wined3d/state.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 12 ++++++++++++ 3 files changed, 51 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/Makefile.in b/dlls/wined3d/Makefile.in index 2eea53c..0cdd967 100644 --- a/dlls/wined3d/Makefile.in +++ b/dlls/wined3d/Makefile.in @@ -22,6 +22,7 @@ C_SRCS = \ pixelshader.c \ query.c \ resource.c \ + state.c \ stateblock.c \ surface.c \ surface_gdi.c \ diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c new file mode 100644 index 0000000..2b929b6 --- /dev/null +++ b/dlls/wined3d/state.c @@ -0,0 +1,38 @@ +/* + * Direct3D state management + * + * Copyright 2006 Stefan D�singer 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 <stdio.h> +#ifdef HAVE_FLOAT_H +# include <float.h> +#endif +#include "wined3d_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d3d); + +static void state_unknown(DWORD state, IWineD3DStateBlockImpl *stateblock) { + FIXME("Unknown state %d\n", state); +} + +const struct StateEntry StateTable[] = +{ + /* State name representative, apply function */ + { /* 0, Undefined */ 0, state_unknown }, +}; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8eea594..42ecbcd 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -407,6 +407,18 @@ DWORD get_flexible_vertex_size(DWORD d3d #define GET_TEXCOORD_SIZE_FROM_FVF(d3dvtVertexType, tex_num) \ (((((d3dvtVertexType) >> (16 + (2 * (tex_num)))) + 1) & 0x03) + 1) +/* Routines and structures related to state management */ +typedef void (*APPLYSTATEFUNC)(DWORD state, IWineD3DStateBlockImpl *stateblock); + +struct StateEntry +{ + DWORD representative; + APPLYSTATEFUNC apply; +}; + +/* Global state table */ +extern const struct StateEntry StateTable[]; + /* Routine to fill gl caps for swapchains and IWineD3D */ BOOL IWineD3DImpl_FillGLCaps(IWineD3D *iface, Display* display);

1 0

Kai Blin : ws2_32: Downgrade SO_REUSEADDR fixme to a trace.
by Alexandre Julliard Dec. 7, 2006

Dec. 7, 2006

Module: wine Branch: master Commit: 804bba8d4c806d8c89ef5612175a9d0356467e20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=804bba8d4c806d8c89ef56121… Author: Kai Blin <kai.blin(a)gmail.com> Date: Thu Dec 7 18:35:35 2006 +0100 ws2_32: Downgrade SO_REUSEADDR fixme to a trace. --- dlls/ws2_32/socket.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 6d385eb..99f46bc 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2954,7 +2954,7 @@ int WINAPI WS_setsockopt(SOCKET s, int l * same time. There is no direct way to do that in unix. While Wineserver * might do this, it does not seem useful for now, so just ignore it.*/ case WS_SO_REUSEADDR: - FIXME("Ignoring SO_REUSEADDR, does not translate\n"); + TRACE("Ignoring SO_REUSEADDR, does not translate\n"); return 0; #ifdef SO_RCVTIMEO

1 0

Alexandre Julliard : ntdll: Check the NX compatibility flag for every loaded module.
by Alexandre Julliard Dec. 7, 2006

Dec. 7, 2006

Module: wine Branch: master Commit: 7ae1b2897e3fe8fa10dff50d2e96d40040223bf4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ae1b2897e3fe8fa10dff50d2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 7 20:52:16 2006 +0100 ntdll: Check the NX compatibility flag for every loaded module. --- dlls/ntdll/loader.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 4d15779..23c6e3b 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -681,6 +681,12 @@ static WINE_MODREF *alloc_module( HMODUL /* wait until init is called for inserting into this list */ wm->ldr.InInitializationOrderModuleList.Flink = NULL; wm->ldr.InInitializationOrderModuleList.Blink = NULL; + + if (!(nt->OptionalHeader.DllCharacteristics & IMAGE_DLLCHARACTERISTICS_NX_COMPAT)) + { + WARN( "disabling no-exec because of %s\n", debugstr_w(wm->ldr.BaseDllName.Buffer) ); + VIRTUAL_SetForceExec( TRUE ); + } return wm; } @@ -2126,8 +2132,6 @@ void WINAPI LdrInitializeThunk( ULONG un peb->ProcessParameters->ImagePathName = wm->ldr.FullDllName; version_init( wm->ldr.FullDllName.Buffer ); - if (!(nt->OptionalHeader.DllCharacteristics & IMAGE_DLLCHARACTERISTICS_NX_COMPAT)) - VIRTUAL_SetForceExec( TRUE ); /* the main exe needs to be the first in the load order list */ RemoveEntryList( &wm->ldr.InLoadOrderModuleList );

1 0

Alexandre Julliard : winebuild: Added --nxcompat option, and mark all modules as NX-compatible by default.
by Alexandre Julliard Dec. 7, 2006

Dec. 7, 2006

Module: wine Branch: master Commit: 662897e9d675941a089f9e6515006bdecb092ffb URL: http://source.winehq.org/git/wine.git/?a=commit;h=662897e9d675941a089f9e651… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 7 20:51:49 2006 +0100 winebuild: Added --nxcompat option, and mark all modules as NX-compatible by default. --- tools/winebuild/build.h | 1 + tools/winebuild/main.c | 7 +++++++ tools/winebuild/spec32.c | 4 ++-- tools/winebuild/utils.c | 3 +++ tools/winebuild/winebuild.man.in | 4 ++++ 5 files changed, 17 insertions(+), 2 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index 2749c4c..5668271 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -99,6 +99,7 @@ typedef struct int nb_names; /* number of entry points with names */ unsigned int nb_resources; /* number of resources */ int characteristics; /* characteristics for the PE header */ + int dll_characteristics;/* DLL characteristics for the PE header */ int subsystem; /* subsystem id */ int subsystem_major; /* subsystem version major number */ int subsystem_minor; /* subsystem version minor number */ diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index b5f0054..5005fe1 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -260,6 +260,7 @@ static const char usage_str[] = " -L, --library-path=DIR Look for imports libraries in DIR\n" " -M, --main-module=MODULE Set the name of the main module for a Win16 dll\n" " --nm-cmd=NM Command to use to get undefined symbols (default: nm)\n" +" --nxcompat=y|n Set the NX compatibility flag (default: yes)\n" " -N, --dll-name=DLLNAME Set the DLL name (default: from input file name)\n" " -o, --output=NAME Set the output file name (default: stdout)\n" " -r, --res=RSRC.RES Load resources from RSRC.RES\n" @@ -287,6 +288,7 @@ enum long_options_values LONG_OPT_EXTERNAL_SYMS, LONG_OPT_LDCMD, LONG_OPT_NMCMD, + LONG_OPT_NXCOMPAT, LONG_OPT_RELAY16, LONG_OPT_RELAY32, LONG_OPT_SAVE_TEMPS, @@ -306,6 +308,7 @@ static const struct option long_options[ { "external-symbols", 0, 0, LONG_OPT_EXTERNAL_SYMS }, { "ld-cmd", 1, 0, LONG_OPT_LDCMD }, { "nm-cmd", 1, 0, LONG_OPT_NMCMD }, + { "nxcompat", 1, 0, LONG_OPT_NXCOMPAT }, { "relay16", 0, 0, LONG_OPT_RELAY16 }, { "relay32", 0, 0, LONG_OPT_RELAY32 }, { "save-temps", 0, 0, LONG_OPT_SAVE_TEMPS }, @@ -476,6 +479,10 @@ static char **parse_options( int argc, c case LONG_OPT_NMCMD: nm_command = xstrdup( optarg ); break; + case LONG_OPT_NXCOMPAT: + if (optarg[0] == 'n' || optarg[0] == 'N') + spec->dll_characteristics &= ~IMAGE_DLLCHARACTERISTICS_NX_COMPAT; + break; case LONG_OPT_RELAY16: set_exec_mode( MODE_RELAY16 ); break; diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 9e74e85..6fcc42e 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -426,8 +426,8 @@ void BuildSpec32File( DLLSPEC *spec ) output( "\t.long 0\n" ); /* CheckSum */ output( "\t%s 0x%04x\n", /* Subsystem */ get_asm_short_keyword(), spec->subsystem ); - output( "\t%s 0\n", /* DllCharacteristics */ - get_asm_short_keyword() ); + output( "\t%s 0x%04x\n", /* DllCharacteristics */ + get_asm_short_keyword(), spec->dll_characteristics ); output( "\t%s %u,%u\n", /* SizeOfStackReserve/Commit */ get_asm_ptr_keyword(), (spec->stack_size ? spec->stack_size : 1024) * 1024, page_size ); output( "\t%s %u,%u\n", /* SizeOfHeapReserve/Commit */ diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index f86f198..3458eb7 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -31,6 +31,8 @@ # include <unistd.h> #endif +#include "windef.h" +#include "winnt.h" #include "build.h" #define MAX_TMP_FILES 8 @@ -332,6 +334,7 @@ DLLSPEC *alloc_dll_spec(void) spec->nb_names = 0; spec->nb_resources = 0; spec->characteristics = 0; + spec->dll_characteristics = IMAGE_DLLCHARACTERISTICS_NX_COMPAT; spec->subsystem = 0; spec->subsystem_major = 4; spec->subsystem_minor = 0; diff --git a/tools/winebuild/winebuild.man.in b/tools/winebuild/winebuild.man.in index 3b6d0c7..87f47f8 100644 --- a/tools/winebuild/winebuild.man.in +++ b/tools/winebuild/winebuild.man.in @@ -153,6 +153,10 @@ KRNL386.EXE. It shouldn't be needed othe Specify the command to use to get the list of undefined symbols; the default is \fBnm\fR. .TP +.BI --nxcompat= yes|no +Specify whether the module is compatible with no-exec support. The +default is yes. +.TP .BI \-o,\ --output= file Set the name of the output file (default is standard output). If the output file name end in \fB.o\fR, the text output is sent to a

1 0

Alexandre Julliard : winedump: Print sizes and offsets in hex.
by Alexandre Julliard Dec. 7, 2006

Dec. 7, 2006

Module: wine Branch: master Commit: b2972947ca7ae4c5968d2ac18cdb9da836f7f0ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2972947ca7ae4c5968d2ac18… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 7 18:01:29 2006 +0100 winedump: Print sizes and offsets in hex. --- tools/winedump/pe.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index e9ec8f8..9c25af1 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -217,7 +217,7 @@ static inline void print_datadirectory(D for (i = 0; i < n && i < 16; i++) { - printf(" %-12s rva: 0x%-8X size: %8u\n", + printf(" %-12s rva: 0x%-8x size: 0x%-8x\n", DirectoryNames[i], directory[i].VirtualAddress, directory[i].Size); } @@ -372,12 +372,11 @@ static void dump_pe_header(void) void dump_section(const IMAGE_SECTION_HEADER *sectHead) { - printf(" %-8.8s VirtSize: %-8u VirtAddr: %-8u 0x%08x\n", - sectHead->Name, sectHead->Misc.VirtualSize, sectHead->VirtualAddress, - sectHead->VirtualAddress); - printf(" raw data offs: %-8u raw data size: %-8u\n", + printf(" %-8.8s VirtSize: 0x%08x VirtAddr: 0x%08x\n", + sectHead->Name, sectHead->Misc.VirtualSize, sectHead->VirtualAddress); + printf(" raw data offs: 0x%08x raw data size: 0x%08x\n", sectHead->PointerToRawData, sectHead->SizeOfRawData); - printf(" relocation offs: %-8u relocations: %-8u\n", + printf(" relocation offs: 0x%08x relocations: 0x%08x\n", sectHead->PointerToRelocations, sectHead->NumberOfRelocations); printf(" line # offs: %-8u line #'s: %-8u\n", sectHead->PointerToLinenumbers, sectHead->NumberOfLinenumbers);

1 0

Huw Davies : wineps.drv: Don't try to download a non-scalable font.
by Alexandre Julliard Dec. 7, 2006

Dec. 7, 2006

Module: wine Branch: master Commit: 2844f383f13e6cda295a8272d5c956af6efc2e0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2844f383f13e6cda295a8272d… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Dec 7 15:28:27 2006 +0000 wineps.drv: Don't try to download a non-scalable font. --- dlls/wineps.drv/download.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wineps.drv/download.c b/dlls/wineps.drv/download.c index 670902e..5d35f5d 100644 --- a/dlls/wineps.drv/download.c +++ b/dlls/wineps.drv/download.c @@ -131,6 +131,7 @@ BOOL PSDRV_SelectDownloadFont(PSDRV_PDEV LPOUTLINETEXTMETRICA potm; DWORD len = GetOutlineTextMetricsA(physDev->hdc, 0, NULL); + if(!len) return FALSE; potm = HeapAlloc(GetProcessHeap(), 0, len); GetOutlineTextMetricsA(physDev->hdc, len, potm); get_download_name(physDev, potm, &ps_name);

1 0

Mike McCormack : msi: Add tests for comparison to empty strings.
by Alexandre Julliard Dec. 7, 2006

Dec. 7, 2006

Module: wine Branch: master Commit: c8898f6bba7a6a9eb7c77835a368d42c94cefc4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8898f6bba7a6a9eb7c77835a… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Dec 6 22:29:34 2006 +0900 msi: Add tests for comparison to empty strings. --- dlls/msi/tests/package.c | 133 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 133 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 5a6a7a8..112655d 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -1196,6 +1196,139 @@ static void test_condition(void) r = MsiEvaluateCondition(hpkg, "one >> two"); ok( r == MSICONDITION_TRUE, "wrong return val\n"); + r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"1.1.4322\""); + ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r); + + r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport > \"1.1.4322\""); + ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); + + r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport >= \"1.1.4322\""); + ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); + + r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport <= \"1.1.4322\""); + ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r); + + r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport <> \"1.1.4322\""); + ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); + + r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport ~< \"1.1.4322\""); + ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r); + + r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"abcd\""); + ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); + + r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"a1.1.4322\""); + ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); + + r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"1.1.4322a\""); + ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); + + r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"0000001.1.4322\""); + ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r); + + r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"1.1.4322.1\""); + ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r); + + r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"1.1.4322.1.1\""); + ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r); + + r = MsiEvaluateCondition(hpkg, "\"2\" < \"1.1"); + ok( r == MSICONDITION_ERROR, "wrong return val (%d)\n", r); + + r = MsiEvaluateCondition(hpkg, "\"2\" < \"1.1\""); + ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r); + + r = MsiEvaluateCondition(hpkg, "\"2\" < \"12.1\""); + ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r); + + r = MsiEvaluateCondition(hpkg, "\"02.1\" < \"2.11\""); + ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); + + r = MsiEvaluateCondition(hpkg, "\"02.1.1\" < \"2.1\""); + ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); + + r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"1.1\""); + ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r); + + r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"1\""); + ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r); + + r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"0\""); + ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r); + + r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"-1\""); + ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r); + + r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"a\""); + ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); + + r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"!\""); + ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r); + + r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"!\""); + ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r); + + r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"/\""); + ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r); + + r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \" \""); + ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r); + + r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"azAZ_\""); + ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); + + r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"a[a]\""); + ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); + + r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"a[a]a\""); + ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); + + todo_wine { + r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"[a]\""); + ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r); + + r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"[a]a\""); + ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r); + + r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"{a}\""); + ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r); + + r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"{a\""); + ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r); + + r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"[a\""); + ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r); + } + + r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"a{\""); + ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); + + r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"a]\""); + ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); + + r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"A\""); + ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); + + MsiSetProperty(hpkg, "MsiNetAssemblySupport", "1.1.4322"); + r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"1.1.4322\""); + ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r); + + r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"1.1.14322\""); + ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r); + + r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"1.1.5\""); + ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); + + r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"1.1\""); + ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r); + + r = MsiEvaluateCondition(hpkg, "MsiNetAssemblySupport < \"1\""); + ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r); + + MsiSetProperty(hpkg, "one", "1"); + r = MsiEvaluateCondition(hpkg, "one < \"1\""); + ok( r == MSICONDITION_FALSE, "wrong return val\n"); + MsiCloseHandle( hpkg ); DeleteFile(msifile); }

1 0

Mike McCormack : msi: Comparisons with null in conditions are special.
by Alexandre Julliard Dec. 7, 2006

Dec. 7, 2006

Module: wine Branch: master Commit: 9dce96b3155ce07dffa4f5b0712fbcaad9ba3e2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9dce96b3155ce07dffa4f5b07… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Dec 6 22:29:08 2006 +0900 msi: Comparisons with null in conditions are special. --- dlls/msi/cond.y | 99 ++++++++++++++++++++++++++++++++++++++++--------------- 1 files changed, 72 insertions(+), 27 deletions(-) diff --git a/dlls/msi/cond.y b/dlls/msi/cond.y index 9cfb001..d19127b 100644 --- a/dlls/msi/cond.y +++ b/dlls/msi/cond.y @@ -431,59 +431,104 @@ static INT compare_substring( LPCWSTR a, case COND_ISS: return strstriW( a, b ) ? 1 : 0; case COND_LHS: - return 0 == strncmpW( a, b, lstrlenW( b ) ); + return 0 == strncmpW( a, b, lstrlenW( b ) ); case COND_RHS: - return 0 == lstrcmpW( a + (lstrlenW( a ) - lstrlenW( b )), b ); + return 0 == lstrcmpW( a + (lstrlenW( a ) - lstrlenW( b )), b ); case COND_ILHS: - return 0 == strncmpiW( a, b, lstrlenW( b ) ); + return 0 == strncmpiW( a, b, lstrlenW( b ) ); case COND_IRHS: return 0 == lstrcmpiW( a + (lstrlenW( a ) - lstrlenW( b )), b ); default: - ERR("invalid substring operator\n"); + ERR("invalid substring operator\n"); return 0; } return 0; } +static BOOL is_empty( LPCWSTR p ) +{ + return !p || !p[0]; +} + +static BOOL is_alphaless( LPCWSTR p ) +{ + while (*p) + { + if (isalphaW( *p ) || (*p == '_')) + return FALSE; + p++; + } + return TRUE; +} + static INT compare_string( LPCWSTR a, INT operator, LPCWSTR b ) { + int r; + if (operator >= COND_SS && operator <= COND_RHS) return compare_substring( a, operator, b ); - - /* null and empty string are equivalent */ - if (!a) a = szEmpty; - if (!b) b = szEmpty; - /* a or b may be NULL */ + if (is_empty( a ) && is_empty( b )) + r = 0; + + else if (is_empty( a ) && is_alphaless( b )) + r = 1; + + else if (is_empty( b ) && is_alphaless( a )) + r = -1; + + else + { + /* null and empty string are equivalent */ + if (!a) a = szEmpty; + if (!b) b = szEmpty; + + switch (operator) + { + case COND_LT: + case COND_GT: + case COND_EQ: + case COND_NE: + case COND_GE: + case COND_LE: + r = lstrcmpW( a, b ); + break; + case COND_ILT: + case COND_IGT: + case COND_IEQ: + case COND_INE: + case COND_IGE: + case COND_ILE: + r = lstrcmpiW( a, b ); + break; + default: + ERR("invalid string operator\n"); + return 0; + } + } + switch (operator) { case COND_LT: - return -1 == lstrcmpW( a, b ); - case COND_GT: - return 1 == lstrcmpW( a, b ); - case COND_EQ: - return 0 == lstrcmpW( a, b ); - case COND_NE: - return 0 != lstrcmpW( a, b ); - case COND_GE: - return -1 != lstrcmpW( a, b ); - case COND_LE: - return 1 != lstrcmpW( a, b ); case COND_ILT: - return -1 == lstrcmpiW( a, b ); + return -1 == r; + case COND_GT: case COND_IGT: - return 1 == lstrcmpiW( a, b ); + return 1 == r; + case COND_EQ: case COND_IEQ: - return 0 == lstrcmpiW( a, b ); + return 0 == r; + case COND_NE: case COND_INE: - return 0 != lstrcmpiW( a, b ); + return 0 != r; + case COND_GE: case COND_IGE: - return -1 != lstrcmpiW( a, b ); + return -1 != r; + case COND_LE: case COND_ILE: - return 1 != lstrcmpiW( a, b ); + return 1 != r; default: ERR("invalid string operator\n"); - return 0; } return 0; }

1 0