September 2006 - Wine-commits

Stefan Leichter : dmband: Print 64bit integers with wine_dbgstr_longlong.
by Alexandre Julliard 27 Sep '06

27 Sep '06

Module: wine Branch: master Commit: 5cc08af85867b9173affe895b86a341d78f5e137 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5cc08af85867b9173affe89… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Tue Sep 26 21:26:51 2006 +0200 dmband: Print 64bit integers with wine_dbgstr_longlong. --- dlls/dmband/bandtrack.c | 9 ++++++--- dlls/dmband/dmutils.c | 6 ++++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/dmband/bandtrack.c b/dlls/dmband/bandtrack.c index aeb24b4..0d8ff09 100644 --- a/dlls/dmband/bandtrack.c +++ b/dlls/dmband/bandtrack.c @@ -184,19 +184,22 @@ static HRESULT WINAPI IDirectMusicBandTr static HRESULT WINAPI IDirectMusicBandTrack_IDirectMusicTrack_PlayEx (LPDIRECTMUSICTRACK8 iface, void* pStateData, REFERENCE_TIME rtStart, REFERENCE_TIME rtEnd, REFERENCE_TIME rtOffset, DWORD dwFlags, IDirectMusicPerformance* pPerf, IDirectMusicSegmentState* pSegSt, DWORD dwVirtualID) { ICOM_THIS_MULTI(IDirectMusicBandTrack, TrackVtbl, iface); - FIXME("(%p, %p, %lli, %lli, %lli, %ld, %p, %p, %ld): stub\n", This, pStateData, rtStart, rtEnd, rtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); + FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %ld, %p, %p, %ld): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart), + wine_dbgstr_longlong(rtEnd), wine_dbgstr_longlong(rtOffset), dwFlags, pPerf, pSegSt, dwVirtualID); return S_OK; } static HRESULT WINAPI IDirectMusicBandTrack_IDirectMusicTrack_GetParamEx (LPDIRECTMUSICTRACK8 iface, REFGUID rguidType, REFERENCE_TIME rtTime, REFERENCE_TIME* prtNext, void* pParam, void* pStateData, DWORD dwFlags) { ICOM_THIS_MULTI(IDirectMusicBandTrack, TrackVtbl, iface); - FIXME("(%p, %s, %lli, %p, %p, %p, %ld): stub\n", This, debugstr_dmguid(rguidType), rtTime, prtNext, pParam, pStateData, dwFlags); + FIXME("(%p, %s, 0x%s, %p, %p, %p, %ld): stub\n", This, debugstr_dmguid(rguidType), + wine_dbgstr_longlong(rtTime), prtNext, pParam, pStateData, dwFlags); return S_OK; } static HRESULT WINAPI IDirectMusicBandTrack_IDirectMusicTrack_SetParamEx (LPDIRECTMUSICTRACK8 iface, REFGUID rguidType, REFERENCE_TIME rtTime, void* pParam, void* pStateData, DWORD dwFlags) { ICOM_THIS_MULTI(IDirectMusicBandTrack, TrackVtbl, iface); - FIXME("(%p, %s, %lli, %p, %p, %ld): stub\n", This, debugstr_dmguid(rguidType), rtTime, pParam, pStateData, dwFlags); + FIXME("(%p, %s, 0x%s, %p, %p, %ld): stub\n", This, debugstr_dmguid(rguidType), + wine_dbgstr_longlong(rtTime), pParam, pStateData, dwFlags); return S_OK; } diff --git a/dlls/dmband/dmutils.c b/dlls/dmband/dmutils.c index 0d379bb..b61ecba 100644 --- a/dlls/dmband/dmutils.c +++ b/dlls/dmband/dmutils.c @@ -694,7 +694,8 @@ const char *debugstr_DMUS_OBJECTDESC (LP if (pDesc->dwValidData & DMUS_OBJ_NAME) ptr += sprintf(ptr, " - wszName = %s\n", debugstr_w(pDesc->wszName)); if (pDesc->dwValidData & DMUS_OBJ_CATEGORY) ptr += sprintf(ptr, " - wszCategory = %s\n", debugstr_w(pDesc->wszCategory)); if (pDesc->dwValidData & DMUS_OBJ_FILENAME) ptr += sprintf(ptr, " - wszFileName = %s\n", debugstr_w(pDesc->wszFileName)); - if (pDesc->dwValidData & DMUS_OBJ_MEMORY) ptr += sprintf(ptr, " - llMemLength = %lli\n - pbMemData = %p\n", pDesc->llMemLength, pDesc->pbMemData); + if (pDesc->dwValidData & DMUS_OBJ_MEMORY) ptr += sprintf(ptr, " - llMemLength = 0x%s\n - pbMemData = %p\n", + wine_dbgstr_longlong(pDesc->llMemLength), pDesc->pbMemData); if (pDesc->dwValidData & DMUS_OBJ_STREAM) ptr += sprintf(ptr, " - pStream = %p\n", pDesc->pStream); return wine_dbg_sprintf("%s", buffer); @@ -715,7 +716,8 @@ void debug_DMUS_OBJECTDESC (LPDMUS_OBJEC if (pDesc->dwValidData & DMUS_OBJ_VERSION) TRACE(" - vVersion = %s\n", debugstr_dmversion(&pDesc->vVersion)); if (pDesc->dwValidData & DMUS_OBJ_CATEGORY) TRACE(" - wszCategory = %s\n", debugstr_w(pDesc->wszCategory)); if (pDesc->dwValidData & DMUS_OBJ_FILENAME) TRACE(" - wszFileName = %s\n", debugstr_w(pDesc->wszFileName)); - if (pDesc->dwValidData & DMUS_OBJ_MEMORY) TRACE(" - llMemLength = %lli\n - pbMemData = %p\n", pDesc->llMemLength, pDesc->pbMemData); + if (pDesc->dwValidData & DMUS_OBJ_MEMORY) TRACE(" - llMemLength = 0x%s\n - pbMemData = %p\n", + wine_dbgstr_longlong(pDesc->llMemLength), pDesc->pbMemData); if (pDesc->dwValidData & DMUS_OBJ_STREAM) TRACE(" - pStream = %p\n", pDesc->pStream); } else { TRACE("(NULL)\n");

1 0

Mikołaj Zalewski : video codecs: add Polish translation.
by Alexandre Julliard 27 Sep '06

27 Sep '06

Module: wine Branch: master Commit: 077a38128c5e2c96b4e17ff3d34c37328c7ac21f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=077a38128c5e2c96b4e17ff… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Tue Sep 26 20:46:28 2006 +0200 video codecs: add Polish translation. --- dlls/iccvid/iccvid_Pl.rc | 26 ++++++++++++++++++++++++++ dlls/iccvid/rsrc.rc | 1 + dlls/msrle32/msrle_Pl.rc | 29 +++++++++++++++++++++++++++++ dlls/msrle32/rsrc.rc | 1 + dlls/msvidc32/msvidc32_Pl.rc | 25 +++++++++++++++++++++++++ dlls/msvidc32/rsrc.rc | 1 + 6 files changed, 83 insertions(+), 0 deletions(-) diff --git a/dlls/iccvid/iccvid_Pl.rc b/dlls/iccvid/iccvid_Pl.rc new file mode 100644 index 0000000..e276e87 --- /dev/null +++ b/dlls/iccvid/iccvid_Pl.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2005 Dmitry Timoshkov + * Copyright 2006 Mikolaj Zalewski + * + * 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 + */ + +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_NAME "Kodek Cinepak Video" + IDS_DESCRIPTION "Kodek Cinepak Video" +} diff --git a/dlls/iccvid/rsrc.rc b/dlls/iccvid/rsrc.rc index dbfd9b5..06ccbf8 100644 --- a/dlls/iccvid/rsrc.rc +++ b/dlls/iccvid/rsrc.rc @@ -25,4 +25,5 @@ #include "iccvid_Fr.rc" #include "iccvid_Hu.rc" #include "iccvid_Ko.rc" #include "iccvid_No.rc" +#include "iccvid_Pl.rc" #include "iccvid_Tr.rc" diff --git a/dlls/msrle32/msrle_Pl.rc b/dlls/msrle32/msrle_Pl.rc new file mode 100644 index 0000000..013fea5 --- /dev/null +++ b/dlls/msrle32/msrle_Pl.rc @@ -0,0 +1,29 @@ +/* + * English resource file for MS-RLE + * + * Copyright 2002 Michael Gnnewig + * Copyright 2006 Mikolaj Zalewski + * + * 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 + */ + +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_NAME "WINE-MS-RLE" + IDS_DESCRIPTION "Kodek Wine MS-RLE" + IDS_ABOUT L"Koder-dekoder Wine MS-RLE\nCopyright 2002 - Michael G\x00fcnnewig" +} diff --git a/dlls/msrle32/rsrc.rc b/dlls/msrle32/rsrc.rc index 84f5485..6b826b2 100644 --- a/dlls/msrle32/rsrc.rc +++ b/dlls/msrle32/rsrc.rc @@ -43,6 +43,7 @@ #include "msrle_Ja.rc" #include "msrle_Ko.rc" #include "msrle_Nl.rc" #include "msrle_No.rc" +#include "msrle_Pl.rc" #include "msrle_Pt.rc" #include "msrle_Ru.rc" #include "msrle_Si.rc" diff --git a/dlls/msvidc32/msvidc32_Pl.rc b/dlls/msvidc32/msvidc32_Pl.rc new file mode 100644 index 0000000..af39271 --- /dev/null +++ b/dlls/msvidc32/msvidc32_Pl.rc @@ -0,0 +1,25 @@ +/* + * Copyright 2005 Dmitry Timoshkov + * + * 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 + */ + +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_NAME "MS-CRAM" + IDS_DESCRIPTION "Kodek Wine Video 1" +} diff --git a/dlls/msvidc32/rsrc.rc b/dlls/msvidc32/rsrc.rc index 046881f..e7d9384 100644 --- a/dlls/msvidc32/rsrc.rc +++ b/dlls/msvidc32/rsrc.rc @@ -25,4 +25,5 @@ #include "msvidc32_En.rc" #include "msvidc32_Hu.rc" #include "msvidc32_Ko.rc" #include "msvidc32_No.rc" +#include "msvidc32_Pl.rc" #include "msvidc32_Tr.rc"

1 0

Mikołaj Zalewski : msrle32: Show correctly the authors surname in some non-latin1 languages.
by Alexandre Julliard 27 Sep '06

27 Sep '06

Module: wine Branch: master Commit: 649215b21274553632e2d2adfb9d7984eb75f25e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=649215b21274553632e2d2a… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Tue Sep 26 20:52:44 2006 +0200 msrle32: Show correctly the authors surname in some non-latin1 languages. --- dlls/msrle32/msrle32.c | 10 +++++----- dlls/msrle32/msrle_Cs.rc | 2 +- dlls/msrle32/msrle_Hu.rc | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/msrle32/msrle32.c b/dlls/msrle32/msrle32.c index 34ebd79..28da739 100644 --- a/dlls/msrle32/msrle32.c +++ b/dlls/msrle32/msrle32.c @@ -1203,16 +1203,16 @@ static LRESULT Configure(CodecInfo *pi, static LRESULT About(CodecInfo *pi, HWND hWnd) { - CHAR szTitle[20]; - CHAR szAbout[128]; + WCHAR szTitle[20]; + WCHAR szAbout[128]; /* pre-condition */ assert(MSRLE32_hModule != 0); - LoadStringA(MSRLE32_hModule, IDS_NAME, szTitle, sizeof(szTitle)); - LoadStringA(MSRLE32_hModule, IDS_ABOUT, szAbout, sizeof(szAbout)); + LoadStringW(MSRLE32_hModule, IDS_NAME, szTitle, sizeof(szTitle)); + LoadStringW(MSRLE32_hModule, IDS_ABOUT, szAbout, sizeof(szAbout)); - MessageBoxA(hWnd, szAbout, szTitle, MB_OK|MB_ICONINFORMATION); + MessageBoxW(hWnd, szAbout, szTitle, MB_OK|MB_ICONINFORMATION); return ICERR_OK; } diff --git a/dlls/msrle32/msrle_Cs.rc b/dlls/msrle32/msrle_Cs.rc index 076038b..51fb1df 100644 --- a/dlls/msrle32/msrle_Cs.rc +++ b/dlls/msrle32/msrle_Cs.rc @@ -28,5 +28,5 @@ STRINGTABLE DISCARDABLE { IDS_NAME "WINE-MS-RLE" IDS_DESCRIPTION "Wine MS-RLE video kodek" - IDS_ABOUT "Wine MS-RLE video kodek\nCopyright 2002 Michael G�nnewig" + IDS_ABOUT L"Wine MS-RLE video kodek\nCopyright 2002 Michael G�nnewig" } diff --git a/dlls/msrle32/msrle_Hu.rc b/dlls/msrle32/msrle_Hu.rc index e5a860b..95016ac 100644 --- a/dlls/msrle32/msrle_Hu.rc +++ b/dlls/msrle32/msrle_Hu.rc @@ -24,5 +24,5 @@ STRINGTABLE DISCARDABLE { IDS_NAME "WINE-MS-RLE" IDS_DESCRIPTION "Wine MS-RLE video kodek" - IDS_ABOUT "Wine MS-RLE video kodek\nCopyright 2002, Michael Gnnewig" + IDS_ABOUT L"Wine MS-RLE video kodek\nCopyright 2002, Michael G\x00fcnnewig" }

1 0

appdb/unit_test test_error_log.php
by WineHQ 27 Sep '06

27 Sep '06

ChangeSet ID: 28288 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/09/26 21:47:52 Modified files: unit_test : test_error_log.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Flush the error log before performing the error log test, otherwise pending errors can throw the tests error count off and cause it to improperly fail Patch: http://cvs.winehq.org/patch.py?id=28288 Old revision New revision Changes Path 1.1 1.2 +3 -1 appdb/unit_test/test_error_log.php Index: appdb/unit_test/test_error_log.php diff -u -p appdb/unit_test/test_error_log.php:1.1 appdb/unit_test/test_error_log.php:1.2 --- appdb/unit_test/test_error_log.php:1.1 27 Sep 2006 2:47:52 -0000 +++ appdb/unit_test/test_error_log.php 27 Sep 2006 2:47:52 -0000 @@ -5,6 +5,8 @@ require_once(BASE."include/incl.php"); function test_error_log_log_error() { + error_log::flush(); /* flush the error log */ + error_log::log_error(ERROR_SQL, "This is a sql error"); error_log::log_error(ERROR_GENERAL, "This is a general error"); @@ -37,4 +39,4 @@ if(!test_error_log_log_error()) else echo "test_error_log_log_error() passed\n"; -?> \ No newline at end of file +?>

1 0

appdb/ ./index.php include/application.php inc ...
by WineHQ 27 Sep '06

27 Sep '06

ChangeSet ID: 28287 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/09/26 21:44:17 Modified files: . : index.php include : application.php sidebar.php unit_test : test_application.php Added files: . : browse_by_rating.php Log message: "EA Durbin" <ead1234(a)hotmail.com> Add the ability to browse applications by rating and a unit test for the added Application::getWithRating() Patch: http://cvs.winehq.org/patch.py?id=28287 Old revision New revision Changes Path 1.38 1.39 +3 -3 appdb/index.php Added 1.1 +0 -0 appdb/browse_by_rating.php 1.72 1.73 +40 -0 appdb/include/application.php 1.22 1.23 +1 -0 appdb/include/sidebar.php 1.1 1.2 +133 -38 appdb/unit_test/test_application.php

1 0

James Hawkins : msi: If the feature linked to a component has a state of INSTALLSTATE_UNKNOWN, the component's state should match.
by Alexandre Julliard 26 Sep '06

26 Sep '06

Module: wine Branch: master Commit: bbd4d1e3ef314098f1e7777629cb0bc7c347c330 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bbd4d1e3ef314098f1e7777… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Sep 25 20:05:25 2006 -0700 msi: If the feature linked to a component has a state of INSTALLSTATE_UNKNOWN, the component's state should match. --- dlls/msi/action.c | 5 +++++ dlls/msi/tests/package.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 0 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 037d509..49cba04 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1831,6 +1831,11 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *pa component->ActionRequest = INSTALLSTATE_ABSENT; } } + else if (feature->ActionRequest == INSTALLSTATE_UNKNOWN) + { + component->Action = INSTALLSTATE_UNKNOWN; + component->ActionRequest = INSTALLSTATE_UNKNOWN; + } } if (component->ForceLocalState && feature->Action == INSTALLSTATE_SOURCE) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 3b3a1e7..abf996f 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -2339,6 +2339,14 @@ static void test_featureparents(void) r = add_feature_entry( hdb, "'bayer', 'waters', '', '', 14, 1, '', 9" ); ok( r == ERROR_SUCCESS, "cannot add feature: %d\n", r ); + /* component of disabled feature (install level) */ + r = add_component_entry( hdb, "'delphinus', '', 'TARGETDIR', 0, '', 'delphinus_file'" ); + ok( r == ERROR_SUCCESS, "cannot add component: %d\n", r ); + + /* component of disabled child feature (install level) */ + r = add_component_entry( hdb, "'hydrus', '', 'TARGETDIR', 0, '', 'hydrus_file'" ); + ok( r == ERROR_SUCCESS, "cannot add component: %d\n", r ); + /* msidbFeatureAttributesFavorLocal:msidbComponentAttributesLocalOnly */ r = add_component_entry( hdb, "'leo', '', 'TARGETDIR', 0, '', 'leo_file'" ); ok( r == ERROR_SUCCESS, "cannot add component: %d\n", r ); @@ -2419,6 +2427,12 @@ static void test_featureparents(void) r = add_feature_components_entry( hdb, "'orion', 'lepus'" ); ok( r == ERROR_SUCCESS, "cannot add feature components: %d\n", r ); + r = add_feature_components_entry( hdb, "'waters', 'delphinus'" ); + ok( r == ERROR_SUCCESS, "cannot add feature components: %d\n", r ); + + r = add_feature_components_entry( hdb, "'bayer', 'hydrus'" ); + ok( r == ERROR_SUCCESS, "cannot add feature components: %d\n", r ); + r = add_file_entry( hdb, "'leo_file', 'leo', 'leo.txt', 100, '', '1033', 8192, 1" ); ok( r == ERROR_SUCCESS, "cannot add file: %d\n", r); @@ -2446,6 +2460,12 @@ static void test_featureparents(void) r = add_file_entry( hdb, "'lepus_file', 'lepus', 'lepus.txt', 0, '', '1033', 8192, 1" ); ok( r == ERROR_SUCCESS, "cannot add file: %d\n", r); + r = add_file_entry( hdb, "'delphinus_file', 'delphinus', 'delphinus.txt', 0, '', '1033', 8192, 1" ); + ok( r == ERROR_SUCCESS, "cannot add file: %d\n", r); + + r = add_file_entry( hdb, "'hydrus_file', 'hydrus', 'hydrus.txt', 0, '', '1033', 8192, 1" ); + ok( r == ERROR_SUCCESS, "cannot add file: %d\n", r); + hpkg = package_from_db( hdb ); ok( hpkg, "failed to create package\n"); @@ -2556,6 +2576,20 @@ static void test_featureparents(void) ok( state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); ok( action == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", action); + state = 0xdeadbee; + action = 0xdeadbee; + r = MsiGetComponentState(hpkg, "delphinus", &state, &action); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); + ok( state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); + ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); + + state = 0xdeadbee; + action = 0xdeadbee; + r = MsiGetComponentState(hpkg, "hydrus", &state, &action); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); + ok( state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); + ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); + r = MsiSetFeatureState(hpkg, "orion", INSTALLSTATE_ABSENT); ok( r == ERROR_SUCCESS, "failed to set feature state: %d\n", r); @@ -2657,6 +2691,20 @@ static void test_featureparents(void) { ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); } + + state = 0xdeadbee; + action = 0xdeadbee; + r = MsiGetComponentState(hpkg, "delphinus", &state, &action); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); + ok( state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); + ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); + + state = 0xdeadbee; + action = 0xdeadbee; + r = MsiGetComponentState(hpkg, "hydrus", &state, &action); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); + ok( state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); + ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); MsiCloseHandle(hpkg); }

1 0

James Hawkins : msi: Only specifically resolve the TARGETDIR directory once .
by Alexandre Julliard 26 Sep '06

26 Sep '06

Module: wine Branch: master Commit: ad609f15180b73f75f08d7e61223f70294befb71 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ad609f15180b73f75f08d7e… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Sep 25 20:04:55 2006 -0700 msi: Only specifically resolve the TARGETDIR directory once. --- dlls/msi/helpers.c | 20 ++++++++++---------- dlls/msi/tests/package.c | 15 +++------------ 2 files changed, 13 insertions(+), 22 deletions(-) diff --git a/dlls/msi/helpers.c b/dlls/msi/helpers.c index 50fc992..dbca4f3 100644 --- a/dlls/msi/helpers.c +++ b/dlls/msi/helpers.c @@ -216,10 +216,14 @@ LPWSTR resolve_folder(MSIPACKAGE *packag if (!name) return NULL; + f = get_loaded_folder( package, name ); + if (!f) + return NULL; + /* special resolving for Target and Source root dir */ if (strcmpW(name,cszTargetDir)==0 || strcmpW(name,cszSourceDir)==0) { - if (!source) + if (!f->ResolvedTarget && !f->Property) { LPWSTR check_path; check_path = msi_dup_property( package, cszTargetDir ); @@ -236,17 +240,13 @@ LPWSTR resolve_folder(MSIPACKAGE *packag if (strcmpiW(path,check_path)!=0) MSI_SetPropertyW(package,cszTargetDir,path); msi_free(check_path); + + f->ResolvedTarget = path; } - else - path = get_source_root( package ); - if (folder) - *folder = get_loaded_folder( package, name ); - return path; - } - f = get_loaded_folder( package, name ); - if (!f) - return NULL; + if (!f->ResolvedSource) + f->ResolvedSource = get_source_root( package ); + } if (folder) *folder = f; diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 78b4b3a..3b3a1e7 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -454,10 +454,7 @@ static void test_getsourcepath( void ) sz = sizeof buffer -1; strcpy(buffer,"x bad"); r = MsiGetSourcePath( hpkg, "TARGETDIR", buffer, &sz ); - todo_wine - { - ok( r == ERROR_DIRECTORY, "return value wrong\n"); - } + ok( r == ERROR_DIRECTORY, "return value wrong\n"); r = MsiDoAction( hpkg, "CostInitialize"); ok( r == ERROR_SUCCESS, "cost init failed\n"); @@ -675,17 +672,11 @@ static void test_settargetpath(void) lstrcat( tempdir, "\\" ); r = MsiGetTargetPath( hpkg, "TARGETDIR", buffer, &sz ); ok( r == ERROR_SUCCESS, "failed to get target path: %d\n", r); - todo_wine - { - ok( !lstrcmp(buffer, tempdir), "Expected %s, got %s\n", tempdir, buffer); - } + ok( !lstrcmp(buffer, tempdir), "Expected %s, got %s\n", tempdir, buffer); sprintf( file, "%srootfile.txt", tempdir ); query_file_path( hpkg, "[#RootFile]", buffer ); - todo_wine - { - ok( !lstrcmp(buffer, file), "Expected %s, got %s\n", file, buffer); - } + ok( !lstrcmp(buffer, file), "Expected %s, got %s\n", file, buffer); r = MsiSetTargetPath( hpkg, "TestParent", "C:\\one\\two" ); ok( r == ERROR_SUCCESS, "MsiSetTargetPath returned %d\n", r );

1 0

James Hawkins : msi: Store the full path to the database file in the MSIDATABASE structure.
by Alexandre Julliard 26 Sep '06

26 Sep '06

Module: wine Branch: master Commit: da14a4a25e686c5395164fb82c60d7b9590e7d50 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=da14a4a25e686c5395164fb… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Sep 25 20:03:31 2006 -0700 msi: Store the full path to the database file in the MSIDATABASE structure. --- dlls/msi/database.c | 19 ++++++++++++++++++- dlls/msi/install.c | 2 +- dlls/msi/msipriv.h | 1 + dlls/msi/package.c | 18 +++++++++--------- dlls/msi/tests/package.c | 38 +++++++++++++++++++++++++++++++------- 5 files changed, 60 insertions(+), 18 deletions(-) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index d984613..fa40c08 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -28,6 +28,7 @@ #include "winbase.h" #include "winreg.h" #include "winnls.h" #include "wine/debug.h" +#include "wine/unicode.h" #include "msi.h" #include "msiquery.h" #include "msipriv.h" @@ -58,6 +59,7 @@ static VOID MSI_CloseDatabase( MSIOBJECT MSIDATABASE *db = (MSIDATABASE *) arg; DWORD r; + msi_free(db->path); free_cached_tables( db ); msi_free_transforms( db ); msi_destroy_stringtable( db->strings ); @@ -77,15 +79,19 @@ UINT MSI_OpenDatabaseW(LPCWSTR szDBPath, HRESULT r; MSIDATABASE *db = NULL; UINT ret = ERROR_FUNCTION_FAILED; - LPCWSTR szMode; + LPCWSTR szMode, save_path; STATSTG stat; BOOL created = FALSE; + WCHAR path[MAX_PATH]; + + static const WCHAR backslash[] = {'\\',0}; TRACE("%s %s\n",debugstr_w(szDBPath),debugstr_w(szPersist) ); if( !pdb ) return ERROR_INVALID_PARAMETER; + save_path = szDBPath; szMode = szPersist; if( HIWORD( szPersist ) ) { @@ -162,6 +168,17 @@ UINT MSI_OpenDatabaseW(LPCWSTR szDBPath, goto end; } + if (!strchrW( save_path, '\\' )) + { + GetCurrentDirectoryW( MAX_PATH, path ); + lstrcatW( path, backslash ); + lstrcatW( path, save_path ); + } + else + lstrcpyW( path, save_path ); + + db->path = strdupW( path ); + if( TRACE_ON( msi ) ) enum_stream_names( stg ); diff --git a/dlls/msi/install.c b/dlls/msi/install.c index f80f68a..39db1f6 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -137,7 +137,7 @@ UINT msi_strcpy_to_awstring( LPCWSTR str if (len) len--; WideCharToMultiByte( CP_ACP, 0, str, -1, awbuf->str.a, *sz, NULL, NULL ); - if ( *sz && (len >= *sz) ) + if ( awbuf->str.a && *sz && (len >= *sz) ) awbuf->str.a[*sz - 1] = 0; } diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index a10be59..0d27ec8 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -71,6 +71,7 @@ typedef struct tagMSIDATABASE MSIOBJECTHDR hdr; IStorage *storage; string_table *strings; + LPWSTR path; LPWSTR deletefile; LPCWSTR mode; struct list tables; diff --git a/dlls/msi/package.c b/dlls/msi/package.c index c700bbf..1959dd0 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -513,6 +513,10 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, MSIHANDLE handle; UINT r; + static const WCHAR OriginalDatabase[] = + {'O','r','i','g','i','n','a','l','D','a','t','a','b','a','s','e',0}; + static const WCHAR Database[] = {'D','A','T','A','B','A','S','E',0}; + TRACE("%s %p\n", debugstr_w(szPackage), pPackage); if( szPackage[0] == '#' ) @@ -551,20 +555,16 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, if( !package ) return ERROR_FUNCTION_FAILED; - /* - * FIXME: I don't think this is right. Maybe we should be storing the - * name of the database in the MSIDATABASE structure and fetching this - * info from there, or maybe this is only relevant to cached databases. - */ if( szPackage[0] != '#' ) { - static const WCHAR OriginalDatabase[] = - {'O','r','i','g','i','n','a','l','D','a','t','a','b','a','s','e',0}; - static const WCHAR Database[] = {'D','A','T','A','B','A','S','E',0}; - MSI_SetPropertyW( package, OriginalDatabase, szPackage ); MSI_SetPropertyW( package, Database, szPackage ); } + else + { + MSI_SetPropertyW( package, OriginalDatabase, db->path ); + MSI_SetPropertyW( package, Database, db->path ); + } *pPackage = package; diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index cd55f89..ce94b92 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -454,14 +454,16 @@ static void test_getsourcepath( void ) sz = sizeof buffer -1; strcpy(buffer,"x bad"); r = MsiGetSourcePath( hpkg, "TARGETDIR", buffer, &sz ); - ok( r == ERROR_DIRECTORY, "return value wrong\n"); + todo_wine + { + ok( r == ERROR_DIRECTORY, "return value wrong\n"); + } r = MsiDoAction( hpkg, "CostInitialize"); ok( r == ERROR_SUCCESS, "cost init failed\n"); r = MsiDoAction( hpkg, "CostFinalize"); ok( r == ERROR_SUCCESS, "cost finalize failed\n"); - todo_wine { sz = sizeof buffer -1; buffer[0] = 'x'; r = MsiGetSourcePath( hpkg, "TARGETDIR", buffer, &sz ); @@ -472,13 +474,10 @@ static void test_getsourcepath( void ) strcpy(buffer,"x bad"); r = MsiGetSourcePath( hpkg, "TARGETDIR", buffer, &sz ); ok( r == ERROR_MORE_DATA, "return value wrong\n"); - } ok( buffer[0] == 'x', "buffer modified\n"); - todo_wine { r = MsiGetSourcePath( hpkg, "TARGETDIR", NULL, NULL ); ok( r == ERROR_SUCCESS, "return value wrong\n"); - } r = MsiGetSourcePath( hpkg, "TARGETDIR ", NULL, NULL ); ok( r == ERROR_DIRECTORY, "return value wrong\n"); @@ -489,10 +488,8 @@ static void test_getsourcepath( void ) r = MsiGetSourcePath( hpkg, "TARGETDIR", buffer, NULL ); ok( r == ERROR_INVALID_PARAMETER, "return value wrong\n"); - todo_wine { r = MsiGetSourcePath( hpkg, "TARGETDIR", NULL, &sz ); ok( r == ERROR_SUCCESS, "return value wrong\n"); - } MsiCloseHandle( hpkg ); DeleteFile(msifile); @@ -2696,6 +2693,32 @@ static void test_featureparents(void) MsiCloseHandle(hpkg); } +static void test_installprops(void) +{ + MSIHANDLE hpkg, hdb; + CHAR path[MAX_PATH]; + CHAR buf[MAX_PATH]; + DWORD size; + UINT r; + + GetCurrentDirectory(MAX_PATH, path); + lstrcat(path, "\\"); + lstrcat(path, msifile); + + hdb = create_package_db(); + ok( hdb, "failed to create database\n"); + + hpkg = package_from_db(hdb); + ok( hpkg, "failed to create package\n"); + + MsiCloseHandle(hdb); + + size = MAX_PATH; + r = MsiGetProperty(hpkg, "DATABASE", buf, &size); + ok( r == ERROR_SUCCESS, "failed to get property: %d\n", r); + ok( !lstrcmp(buf, path), "Expected %s, got %s\n", path, buf); +} + START_TEST(package) { test_createpackage(); @@ -2713,4 +2736,5 @@ START_TEST(package) test_removefiles(); test_appsearch(); test_featureparents(); + test_installprops(); }

1 0

James Hawkins : msi: Add tests for setting the target path of TARGETDIR ( based on a patch by Andrey Turkin).
by Alexandre Julliard 26 Sep '06

26 Sep '06

Module: wine Branch: master Commit: 3ee3fc35ef9d2a3173b01b3bd925dc55a21bd7f3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3ee3fc35ef9d2a3173b01b3… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Sep 25 20:04:05 2006 -0700 msi: Add tests for setting the target path of TARGETDIR (based on a patch by Andrey Turkin). --- dlls/msi/tests/package.c | 135 +++++++++++++++++++--------------------------- 1 files changed, 56 insertions(+), 79 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index ce94b92..78b4b3a 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -572,7 +572,7 @@ static void query_file_path(MSIHANDLE hp static void test_settargetpath(void) { - char tempdir[MAX_PATH+8], buffer[MAX_PATH]; + char tempdir[MAX_PATH+8], buffer[MAX_PATH], file[MAX_PATH]; DWORD sz; MSIHANDLE hpkg; UINT r; @@ -584,81 +584,40 @@ static void test_settargetpath(void) r = add_directory_entry( hdb, "'TARGETDIR', '', 'SourceDir'" ); ok( r == S_OK, "failed to add directory entry: %d\n" , r ); - r = run_query( hdb, /* these tables required by Windows Installer for MsiSetTargetPath */ - "CREATE TABLE `Component` ( " - "`Component` CHAR(72) NOT NULL, " - "`ComponentId` CHAR(38), " - "`Directory_` CHAR(72) NOT NULL, " - "`Attributes` SHORT NOT NULL, " - "`Condition` CHAR(255), " - "`KeyPath` CHAR(72) " - "PRIMARY KEY `Component`)" ); + r = create_component_table( hdb ); ok( r == S_OK, "cannot create Component table: %d\n", r ); - r = run_query( hdb, - "INSERT INTO `Component` " - "(`Component`, `ComponentId`, `Directory_`, `Attributes`, `Condition`, `KeyPath`) " - "VALUES( 'WinWorkAround', '{83e2694d-0864-4124-9323-6d37630912a1}', 'TARGETDIR', 8, '', 'FL_dummycomponent')" ); + r = add_component_entry( hdb, "'RootComp', '{83e2694d-0864-4124-9323-6d37630912a1}', 'TARGETDIR', 8, '', 'RootFile'" ); ok( r == S_OK, "cannot add dummy component: %d\n", r ); - r = run_query( hdb, - "INSERT INTO `Component` " - "(`Component`, `ComponentId`, `Directory_`, `Attributes`, `Condition`, `KeyPath`) " - "VALUES( 'TestComp', '{A3FB59C8-C293-4F7E-B8C5-F0E1D8EEE4E5}', 'TestDir', 0, '', 'TestFile')" ); + r = add_component_entry( hdb, "'TestComp', '{A3FB59C8-C293-4F7E-B8C5-F0E1D8EEE4E5}', 'TestDir', 0, '', 'TestFile'" ); ok( r == S_OK, "cannot add test component: %d\n", r ); - r = run_query( hdb, - "CREATE TABLE `Feature` ( " - "`Feature` CHAR(38) NOT NULL, " - "`Feature_Parent` CHAR(38), " - "`Title` CHAR(64), " - "`Description` CHAR(255), " - "`Display` SHORT NOT NULL, " - "`Level` SHORT NOT NULL, " - "`Directory_` CHAR(72), " - "`Attributes` SHORT NOT NULL " - "PRIMARY KEY `Feature`)" ); + r = create_feature_table( hdb ); ok( r == S_OK, "cannot create Feature table: %d\n", r ); - r = run_query( hdb, - "INSERT INTO `Feature` " - "(`Feature`, `Feature_Parent`, `Display`, `Level`, `Attributes`) " - "VALUES( 'TestFeature', '', 0, 1, 0 )" ); + r = add_feature_entry( hdb, "'TestFeature', '', '', '', 0, 1, '', 0" ); ok( r == ERROR_SUCCESS, "cannot add TestFeature to Feature table: %d\n", r ); - r = run_query( hdb, - "CREATE TABLE `FeatureComponents` ( " - "`Feature_` CHAR(38) NOT NULL, " - "`Component_` CHAR(72) NOT NULL " - "PRIMARY KEY `Feature_` )" ); + r = create_feature_components_table( hdb ); ok( r == S_OK, "cannot create FeatureComponents table: %d\n", r ); - r = run_query( hdb, - "INSERT INTO `FeatureComponents` " - "(`Feature_`, `Component_`) " - "VALUES( 'TestFeature', 'TestComp' )" ); + r = add_feature_components_entry( hdb, "'TestFeature', 'RootComp'" ); + ok( r == S_OK, "cannot insert component into FeatureComponents table: %d\n", r ); + + r = add_feature_components_entry( hdb, "'TestFeature', 'TestComp'" ); ok( r == S_OK, "cannot insert component into FeatureComponents table: %d\n", r ); add_directory_entry( hdb, "'TestParent', 'TARGETDIR', 'TestParent'" ); add_directory_entry( hdb, "'TestDir', 'TestParent', 'TestDir'" ); - r = run_query( hdb, - "CREATE TABLE `File` (" - "`File` CHAR(72) NOT NULL, " - "`Component_` CHAR(72) NOT NULL, " - "`FileName` CHAR(255) NOT NULL, " - "`FileSize` LONG NOT NULL, " - "`Version` CHAR(72), " - "`Language` CHAR(20), " - "`Attributes` SHORT, " - "`Sequence` SHORT NOT NULL " - "PRIMARY KEY `File`)" ); + r = create_file_table( hdb ); ok( r == S_OK, "cannot create File table: %d\n", r ); - r = run_query( hdb, - "INSERT INTO `File` " - "(`File`, `Component_`, `FileName`, `FileSize`, `Version`, `Language`, `Attributes`, `Sequence`) " - "VALUES( 'TestFile', 'TestComp', 'testfile.txt', 0, '', '1033', 8192, 1 )" ); + r = add_file_entry( hdb, "'RootFile', 'RootComp', 'rootfile.txt', 0, '', '1033', 8192, 1" ); + ok( r == S_OK, "cannot add file to the File table: %d\n", r ); + + r = add_file_entry( hdb, "'TestFile', 'TestComp', 'testfile.txt', 0, '', '1033', 8192, 1" ); ok( r == S_OK, "cannot add file to the File table: %d\n", r ); hpkg = package_from_db( hdb ); @@ -687,32 +646,45 @@ static void test_settargetpath(void) sz = sizeof tempdir - 1; r = MsiGetTargetPath( hpkg, "TARGETDIR", tempdir, &sz ); - if ( r == S_OK ) - { - if ( GetTempFileName( tempdir, "_wt", 0, buffer ) ) - { - sprintf( tempdir, "%s\\subdir", buffer ); - r = MsiSetTargetPath( hpkg, "TARGETDIR", buffer ); - ok( r == ERROR_SUCCESS, "MsiSetTargetPath on file returned %d\n", r ); + sprintf( file, "%srootfile.txt", tempdir ); + query_file_path( hpkg, "[#RootFile]", buffer ); + ok( r == ERROR_SUCCESS, "failed to get target path: %d\n", r); + ok( !lstrcmp(buffer, file), "Expected %s, got %s\n", file, buffer ); - r = MsiSetTargetPath( hpkg, "TARGETDIR", tempdir ); - ok( r == ERROR_SUCCESS, "MsiSetTargetPath on 'subdir' of file returned %d\n", r ); + GetTempFileName( tempdir, "_wt", 0, buffer ); + sprintf( tempdir, "%s\\subdir", buffer ); - DeleteFile( buffer ); + r = MsiSetTargetPath( hpkg, "TARGETDIR", buffer ); + ok( r == ERROR_SUCCESS, "MsiSetTargetPath on file returned %d\n", r ); - r = MsiSetTargetPath( hpkg, "TARGETDIR", buffer ); - ok( r == ERROR_SUCCESS, "MsiSetTargetPath returned %d\n", r ); + r = MsiSetTargetPath( hpkg, "TARGETDIR", tempdir ); + ok( r == ERROR_SUCCESS, "MsiSetTargetPath on 'subdir' of file returned %d\n", r ); - r = GetFileAttributes( buffer ); - ok ( r == INVALID_FILE_ATTRIBUTES, "file/directory exists after MsiSetTargetPath. Attributes: %08X\n", r ); + DeleteFile( buffer ); - r = MsiSetTargetPath( hpkg, "TARGETDIR", tempdir ); - ok( r == ERROR_SUCCESS, "MsiSetTargetPath on subsubdir returned %d\n", r ); - } else { - trace("GetTempFileName failed, cannot do some tests\n"); - } - } else { - trace( "MsiGetTargetPath failed: %d\n", r ); + r = MsiSetTargetPath( hpkg, "TARGETDIR", buffer ); + ok( r == ERROR_SUCCESS, "MsiSetTargetPath returned %d\n", r ); + + r = GetFileAttributes( buffer ); + ok ( r == INVALID_FILE_ATTRIBUTES, "file/directory exists after MsiSetTargetPath. Attributes: %08X\n", r ); + + r = MsiSetTargetPath( hpkg, "TARGETDIR", tempdir ); + ok( r == ERROR_SUCCESS, "MsiSetTargetPath on subsubdir returned %d\n", r ); + + sz = sizeof buffer - 1; + lstrcat( tempdir, "\\" ); + r = MsiGetTargetPath( hpkg, "TARGETDIR", buffer, &sz ); + ok( r == ERROR_SUCCESS, "failed to get target path: %d\n", r); + todo_wine + { + ok( !lstrcmp(buffer, tempdir), "Expected %s, got %s\n", tempdir, buffer); + } + + sprintf( file, "%srootfile.txt", tempdir ); + query_file_path( hpkg, "[#RootFile]", buffer ); + todo_wine + { + ok( !lstrcmp(buffer, file), "Expected %s, got %s\n", file, buffer); } r = MsiSetTargetPath( hpkg, "TestParent", "C:\\one\\two" ); @@ -721,7 +693,12 @@ static void test_settargetpath(void) query_file_path( hpkg, "[#TestFile]", buffer ); ok( !lstrcmp(buffer, "C:\\one\\two\\TestDir\\testfile.txt"), "Expected C:\\one\\two\\TestDir\\testfile.txt, got %s\n", buffer ); - + + sz = sizeof buffer - 1; + r = MsiGetTargetPath( hpkg, "TestParent", buffer, &sz ); + ok( r == ERROR_SUCCESS, "failed to get target path: %d\n", r); + ok( !lstrcmp(buffer, "C:\\one\\two\\"), "Expected C:\\one\\two\\, got %s\n", buffer); + MsiCloseHandle( hpkg ); }

1 0

Nicolas Delcros : winuser.h: Fix PROPENUMPROCEXA/W types declarations.
by Alexandre Julliard 26 Sep '06

26 Sep '06

Module: wine Branch: master Commit: 1492950c8edfce11b48fd139f5b4d1698c292bd3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1492950c8edfce11b48fd13… Author: Nicolas Delcros <nicolas(a)dyalog.com> Date: Thu Sep 21 17:06:21 2006 +0100 winuser.h: Fix PROPENUMPROCEXA/W types declarations. --- dlls/user/property.c | 4 ++-- include/winuser.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/user/property.c b/dlls/user/property.c index 6e9fa93..fac119b 100644 --- a/dlls/user/property.c +++ b/dlls/user/property.c @@ -76,7 +76,7 @@ static property_data_t *get_properties( * * relay to call the EnumProps callback function from EnumPropsEx */ -static BOOL CALLBACK EnumPropsA_relay( HWND hwnd, LPCSTR str, HANDLE handle, ULONG_PTR lparam ) +static BOOL CALLBACK EnumPropsA_relay( HWND hwnd, LPSTR str, HANDLE handle, ULONG_PTR lparam ) { PROPENUMPROCA func = (PROPENUMPROCA)lparam; return func( hwnd, str, handle ); @@ -88,7 +88,7 @@ static BOOL CALLBACK EnumPropsA_relay( H * * relay to call the EnumProps callback function from EnumPropsEx */ -static BOOL CALLBACK EnumPropsW_relay( HWND hwnd, LPCWSTR str, HANDLE handle, ULONG_PTR lparam ) +static BOOL CALLBACK EnumPropsW_relay( HWND hwnd, LPWSTR str, HANDLE handle, ULONG_PTR lparam ) { PROPENUMPROCW func = (PROPENUMPROCW)lparam; return func( hwnd, str, handle ); diff --git a/include/winuser.h b/include/winuser.h index b9962e3..14d36e5 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -46,8 +46,8 @@ typedef BOOL (CALLBACK *NAMEENUMPROCA typedef BOOL (CALLBACK *NAMEENUMPROCW)(LPWSTR,LPARAM); typedef BOOL (CALLBACK *PROPENUMPROCA)(HWND,LPCSTR,HANDLE); typedef BOOL (CALLBACK *PROPENUMPROCW)(HWND,LPCWSTR,HANDLE); -typedef BOOL (CALLBACK *PROPENUMPROCEXA)(HWND,LPCSTR,HANDLE,ULONG_PTR); -typedef BOOL (CALLBACK *PROPENUMPROCEXW)(HWND,LPCWSTR,HANDLE,ULONG_PTR); +typedef BOOL (CALLBACK *PROPENUMPROCEXA)(HWND,LPSTR,HANDLE,ULONG_PTR); +typedef BOOL (CALLBACK *PROPENUMPROCEXW)(HWND,LPWSTR,HANDLE,ULONG_PTR); typedef VOID (CALLBACK *SENDASYNCPROC)(HWND,UINT,ULONG_PTR,LRESULT); typedef VOID (CALLBACK *TIMERPROC)(HWND,UINT,UINT_PTR,DWORD); typedef VOID (CALLBACK *WINEVENTPROC)(HWINEVENTHOOK,DWORD,HWND,LONG,LONG,

1 0