Alexandre Julliard : uxtheme: Build with msvcrt.
Alexandre Julliard
julliard at winehq.org
Tue Jun 25 17:25:50 CDT 2019
Module: wine
Branch: master
Commit: 21a19fb4e35f4b8c61958ba25b0058c1e090f2b3
URL: https://source.winehq.org/git/wine.git/?a=commit;h=21a19fb4e35f4b8c61958ba25b0058c1e090f2b3
Author: Alexandre Julliard <julliard at winehq.org>
Date: Tue Jun 25 08:35:03 2019 +0200
uxtheme: Build with msvcrt.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/uxtheme/Makefile.in | 2 ++
dlls/uxtheme/buffer.c | 2 --
dlls/uxtheme/draw.c | 2 --
dlls/uxtheme/main.c | 2 --
dlls/uxtheme/metric.c | 2 --
dlls/uxtheme/msstyles.c | 17 +++++++----------
dlls/uxtheme/property.c | 2 --
dlls/uxtheme/stylemap.c | 2 --
dlls/uxtheme/system.c | 2 --
dlls/uxtheme/uxini.c | 2 --
10 files changed, 9 insertions(+), 26 deletions(-)
diff --git a/dlls/uxtheme/Makefile.in b/dlls/uxtheme/Makefile.in
index c3fff30..61817ee 100644
--- a/dlls/uxtheme/Makefile.in
+++ b/dlls/uxtheme/Makefile.in
@@ -3,6 +3,8 @@ IMPORTLIB = uxtheme
IMPORTS = user32 gdi32 advapi32
DELAYIMPORTS = msimg32
+EXTRADLLFLAGS = -mno-cygwin
+
C_SRCS = \
buffer.c \
draw.c \
diff --git a/dlls/uxtheme/buffer.c b/dlls/uxtheme/buffer.c
index 32d341c..b07284f 100644
--- a/dlls/uxtheme/buffer.c
+++ b/dlls/uxtheme/buffer.c
@@ -19,8 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "config.h"
-
#include <stdlib.h>
#include <stdarg.h>
diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c
index 69c53b9..3dcc582 100644
--- a/dlls/uxtheme/draw.c
+++ b/dlls/uxtheme/draw.c
@@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "config.h"
-
#include <stdlib.h>
#include <stdarg.h>
diff --git a/dlls/uxtheme/main.c b/dlls/uxtheme/main.c
index 73894e8..5e5610a 100644
--- a/dlls/uxtheme/main.c
+++ b/dlls/uxtheme/main.c
@@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "config.h"
-
#include <stdarg.h>
#include "windef.h"
diff --git a/dlls/uxtheme/metric.c b/dlls/uxtheme/metric.c
index 073422f..2d5a09d 100644
--- a/dlls/uxtheme/metric.c
+++ b/dlls/uxtheme/metric.c
@@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "config.h"
-
#include <stdarg.h>
#include "windef.h"
diff --git a/dlls/uxtheme/msstyles.c b/dlls/uxtheme/msstyles.c
index bc8eca7..cee5aaf 100644
--- a/dlls/uxtheme/msstyles.c
+++ b/dlls/uxtheme/msstyles.c
@@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "config.h"
-
#include <stdarg.h>
#include <stdlib.h>
@@ -34,7 +32,6 @@
#include "msstyles.h"
-#include "wine/unicode.h"
#include "wine/debug.h"
#include "wine/heap.h"
@@ -352,7 +349,7 @@ static BOOL MSSTYLES_ParseIniSectionName(LPCWSTR lpSection, DWORD dwLen, LPWSTR
*iStateId = 0;
comp = sec;
/* Get the application name */
- tmp = strchrW(comp, ':');
+ tmp = wcschr(comp, ':');
if(tmp) {
*tmp++ = 0;
tmp++;
@@ -360,19 +357,19 @@ static BOOL MSSTYLES_ParseIniSectionName(LPCWSTR lpSection, DWORD dwLen, LPWSTR
comp = tmp;
}
- tmp = strchrW(comp, '.');
+ tmp = wcschr(comp, '.');
if(tmp) {
*tmp++ = 0;
lstrcpynW(szClassName, comp, MAX_THEME_CLASS_NAME);
comp = tmp;
/* now get the part & state */
- tmp = strchrW(comp, '(');
+ tmp = wcschr(comp, '(');
if(tmp) {
*tmp++ = 0;
lstrcpynW(part, comp, ARRAY_SIZE(part));
comp = tmp;
/* now get the state */
- tmp = strchrW(comp, ')');
+ tmp = wcschr(comp, ')');
if (!tmp)
return FALSE;
*tmp = 0;
@@ -383,13 +380,13 @@ static BOOL MSSTYLES_ParseIniSectionName(LPCWSTR lpSection, DWORD dwLen, LPWSTR
}
}
else {
- tmp = strchrW(comp, '(');
+ tmp = wcschr(comp, '(');
if(tmp) {
*tmp++ = 0;
lstrcpynW(szClassName, comp, MAX_THEME_CLASS_NAME);
comp = tmp;
/* now get the state */
- tmp = strchrW(comp, ')');
+ tmp = wcschr(comp, ')');
if (!tmp)
return FALSE;
*tmp = 0;
@@ -1012,7 +1009,7 @@ PTHEME_CLASS MSSTYLES_OpenThemeClass(LPCWSTR pszAppName, LPCWSTR pszClassList)
}
start = pszClassList;
- while((end = strchrW(start, ';'))) {
+ while((end = wcschr(start, ';'))) {
len = end-start;
lstrcpynW(szClassName, start, min(len+1, ARRAY_SIZE(szClassName)));
start = end+1;
diff --git a/dlls/uxtheme/property.c b/dlls/uxtheme/property.c
index 0e077ae..93a72ab 100644
--- a/dlls/uxtheme/property.c
+++ b/dlls/uxtheme/property.c
@@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "config.h"
-
#include <stdarg.h>
#include "windef.h"
diff --git a/dlls/uxtheme/stylemap.c b/dlls/uxtheme/stylemap.c
index 19e3c93..149ee0e 100644
--- a/dlls/uxtheme/stylemap.c
+++ b/dlls/uxtheme/stylemap.c
@@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "config.h"
-
#include <stdarg.h>
#include "windef.h"
diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c
index c898ad3..6e9c0f2 100644
--- a/dlls/uxtheme/system.c
+++ b/dlls/uxtheme/system.c
@@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "config.h"
-
#include <stdarg.h>
#include <stdio.h>
diff --git a/dlls/uxtheme/uxini.c b/dlls/uxtheme/uxini.c
index 1581ff4..361e7f1 100644
--- a/dlls/uxtheme/uxini.c
+++ b/dlls/uxtheme/uxini.c
@@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "config.h"
-
#include <stdarg.h>
#include "windef.h"
More information about the wine-cvs
mailing list