Module: wine
Branch: refs/heads/master
Commit: d70db020a6d961b8266fbd780e42409064e4e6e0
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d70db020a6d961b8266fbd7…
Author: Robert Shearman <rob(a)codeweavers.com>
Date: Mon Jun 5 01:41:04 2006 +0100
msi: An empty string is equivalent to nil, so handle this in the optimised WHERE_execute path.
---
dlls/msi/where.c | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/dlls/msi/where.c b/dlls/msi/where.c
index 6fa70a3..a02b19b 100644
--- a/dlls/msi/where.c
+++ b/dlls/msi/where.c
@@ -265,11 +265,17 @@ static UINT WHERE_execute( struct tagMSI
if ((col_cond->type == EXPR_COL_NUMBER_STRING) && (val_cond->type == EXPR_SVAL))
{
col = col_cond->u.col_number;
- r = msi_string2idW(wv->db->strings, val_cond->u.sval, &value);
- if (r != ERROR_SUCCESS)
+ /* special case for "" - translate it into nil */
+ if (!val_cond->u.sval[0])
+ value = 0;
+ else
{
- TRACE("no id for %s, assuming it doesn't exist in the table\n", debugstr_w(wv->cond->u.expr.right->u.sval));
- return ERROR_SUCCESS;
+ r = msi_string2idW(wv->db->strings, val_cond->u.sval, &value);
+ if (r != ERROR_SUCCESS)
+ {
+ TRACE("no id for %s, assuming it doesn't exist in the table\n", debugstr_w(wv->cond->u.expr.right->u.sval));
+ return ERROR_SUCCESS;
+ }
}
do
Module: wine
Branch: refs/heads/master
Commit: b7049d52e5f643bed53833a5f79526d0fb6615b8
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b7049d52e5f643bed53833a…
Author: Mike McCormack <mike(a)codeweavers.com>
Date: Sun Jun 4 00:27:50 2006 +0900
winemine: Remove dialog.h as it's redundant.
---
programs/winemine/dialog.c | 1 -
programs/winemine/dialog.h | 29 -----------------------------
programs/winemine/main.c | 1 -
3 files changed, 0 insertions(+), 31 deletions(-)
delete mode 100644 programs/winemine/dialog.h
diff --git a/programs/winemine/dialog.c b/programs/winemine/dialog.c
index ef0ccee..c9139b2 100644
--- a/programs/winemine/dialog.c
+++ b/programs/winemine/dialog.c
@@ -22,7 +22,6 @@ #define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include "main.h"
-#include "dialog.h"
#include "resource.h"
BOOL CALLBACK CustomDlgProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam )
diff --git a/programs/winemine/dialog.h b/programs/winemine/dialog.h
deleted file mode 100644
index 235af8e..0000000
--- a/programs/winemine/dialog.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * WineMine (dialog.h)
- *
- * Copyright 2000 Joshua Thielen
- *
- * 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
- */
-
-
-BOOL CALLBACK CustomDlgProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam );
-
-BOOL CALLBACK CongratsDlgProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam );
-
-BOOL CALLBACK TimesDlgProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam );
-
-BOOL CALLBACK AboutDlgProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam );
-
diff --git a/programs/winemine/main.c b/programs/winemine/main.c
index 6b5549a..7551db0 100644
--- a/programs/winemine/main.c
+++ b/programs/winemine/main.c
@@ -25,7 +25,6 @@ #include <time.h>
#include <windows.h>
#include <stdlib.h>
#include "main.h"
-#include "dialog.h"
#include "resource.h"
#include <wine/debug.h>