October 2006 - Wine-commits

Ivan Gyurdiev : d3d9/tests: Remove unused device parameter.
by Alexandre Julliard 09 Oct '06

09 Oct '06

Module: wine Branch: master Commit: 8f21b6f682ef0bce19646e8770f310d1e5aff7da URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f21b6f682ef0bce19646e877… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Sat Oct 7 21:45:19 2006 -0400 d3d9/tests: Remove unused device parameter. --- dlls/d3d9/tests/stateblock.c | 14 +++++--------- 1 files changed, 5 insertions(+), 9 deletions(-) diff --git a/dlls/d3d9/tests/stateblock.c b/dlls/d3d9/tests/stateblock.c index a16eba7..1d85e3f 100644 --- a/dlls/d3d9/tests/stateblock.c +++ b/dlls/d3d9/tests/stateblock.c @@ -603,7 +603,6 @@ static void shader_constant_teardown_han } static void shader_constants_queue_test( - IDirect3DDevice9 *device, state_test* test, const shader_constant_arg* test_arg) { @@ -754,7 +753,6 @@ static void light_teardown_handler( } static void lights_queue_test( - IDirect3DDevice9 *device, state_test* test, const light_arg* test_arg) { @@ -932,7 +930,6 @@ static void transform_teardown_handler( } static void transform_queue_test( - IDirect3DDevice9 *device, state_test* test) { test->setup_handler = transform_setup_handler; @@ -1375,7 +1372,6 @@ static void render_state_teardown_handle } static void render_states_queue_test( - IDirect3DDevice9 *device, state_test* test, const render_state_arg* test_arg) { @@ -1423,26 +1419,26 @@ static void test_state_management( if (caps.VertexShaderVersion & 0xffff) { vshader_constant_arg.idx = 0; vshader_constant_arg.pshader = FALSE; - shader_constants_queue_test(device, &tests[tcount], &vshader_constant_arg); + shader_constants_queue_test(&tests[tcount], &vshader_constant_arg); tcount++; } if (caps.PixelShaderVersion & 0xffff) { pshader_constant_arg.idx = 0; pshader_constant_arg.pshader = TRUE; - shader_constants_queue_test(device, &tests[tcount], &pshader_constant_arg); + shader_constants_queue_test(&tests[tcount], &pshader_constant_arg); tcount++; } light_arg.idx = 0; - lights_queue_test(device, &tests[tcount], &light_arg); + lights_queue_test(&tests[tcount], &light_arg); tcount++; - transform_queue_test(device, &tests[tcount]); + transform_queue_test(&tests[tcount]); tcount++; render_state_arg.device_pparams = device_pparams; - render_states_queue_test(device, &tests[tcount], &render_state_arg); + render_states_queue_test(&tests[tcount], &render_state_arg); tcount++; execute_test_chain_all(device, tests, tcount);

1 0

Louis. Lenders : user32: Return a fake device notification handle in RegisterDeviceNotificationA.
by Alexandre Julliard 09 Oct '06

09 Oct '06

Module: wine Branch: master Commit: b072f85610bd22ef096323bb3935a70070e911b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b072f85610bd22ef096323bb3… Author: Louis. Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Sun Oct 8 19:35:16 2006 +0100 user32: Return a fake device notification handle in RegisterDeviceNotificationA. --- dlls/user/misc.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/user/misc.c b/dlls/user/misc.c index d5691f0..91f3787 100644 --- a/dlls/user/misc.c +++ b/dlls/user/misc.c @@ -541,8 +541,9 @@ DWORD WINAPI RegisterTasklist (DWORD x) */ HDEVNOTIFY WINAPI RegisterDeviceNotificationA(HANDLE hnd, LPVOID notifyfilter, DWORD flags) { - FIXME("(hwnd=%p, filter=%p,flags=0x%08x), STUB!\n", hnd,notifyfilter,flags ); - return 0; + FIXME("(hwnd=%p, filter=%p,flags=0x%08x),\n\ + returns a fake device notification handle!\n", hnd,notifyfilter,flags ); + return (HDEVNOTIFY) 0xcafecafe; } /***********************************************************************

1 0

Louis. Lenders : msxml3: Add a version resource.
by Alexandre Julliard 09 Oct '06

09 Oct '06

Module: wine Branch: master Commit: 2d6b45081b5e36b1ab4068bd20e1011d03250e42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d6b45081b5e36b1ab4068bd2… Author: Louis. Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Sun Oct 8 17:59:35 2006 +0100 msxml3: Add a version resource. --- dlls/msxml3/Makefile.in | 2 ++ dlls/msxml3/version.rc | 25 +++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/Makefile.in b/dlls/msxml3/Makefile.in index fed6633..08ede48 100644 --- a/dlls/msxml3/Makefile.in +++ b/dlls/msxml3/Makefile.in @@ -22,6 +22,8 @@ C_SRCS = \ regsvr.c \ text.c +RC_SRCS = version.rc + @MAKE_DLL_RULES@ @DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/msxml3/version.rc b/dlls/msxml3/version.rc new file mode 100644 index 0000000..a035174 --- /dev/null +++ b/dlls/msxml3/version.rc @@ -0,0 +1,25 @@ +/* + * 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 + */ + +#define WINE_OLESELFREGISTER +#define WINE_FILEDESCRIPTION_STR "Wine MSXML 3.0" +#define WINE_FILENAME_STR "msxml3.dll" +#define WINE_FILEVERSION 8,30,9926,0 +#define WINE_FILEVERSION_STR "8.30.9926.0" +#define WINE_PRODUCTVERSION 8,30,9926,0 +#define WINE_PRODUCTVERSION_STR "8.30.9926.0" + +#include "wine/wine_common_ver.rc"

1 0

Vitaliy Margolen : winex11drv: Win64 printf format warning fixes.
by Alexandre Julliard 09 Oct '06

09 Oct '06

Module: wine Branch: master Commit: 6069d0d5966580a36b2a257fa251ca3720caf633 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6069d0d5966580a36b2a257fa… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Sat Oct 7 17:34:01 2006 -0600 winex11drv: Win64 printf format warning fixes. --- dlls/winex11.drv/Makefile.in | 1 - dlls/winex11.drv/bitblt.c | 8 ++++---- dlls/winex11.drv/bitmap.c | 4 ++-- dlls/winex11.drv/brush.c | 2 +- dlls/winex11.drv/clipboard.c | 8 ++++---- dlls/winex11.drv/dce.c | 8 ++++---- dlls/winex11.drv/desktop.c | 4 ++-- dlls/winex11.drv/dib.c | 26 +++++++++++++------------- dlls/winex11.drv/event.c | 2 +- dlls/winex11.drv/graphics.c | 2 +- dlls/winex11.drv/keyboard.c | 4 ++-- dlls/winex11.drv/mouse.c | 2 +- dlls/winex11.drv/opengl.c | 8 ++++---- dlls/winex11.drv/palette.c | 20 ++++++++++---------- dlls/winex11.drv/scroll.c | 2 +- dlls/winex11.drv/settings.c | 18 +++++++++--------- dlls/winex11.drv/text.c | 2 +- dlls/winex11.drv/window.c | 6 +++--- dlls/winex11.drv/winpos.c | 14 +++++++------- dlls/winex11.drv/x11ddraw.c | 2 +- dlls/winex11.drv/xdnd.c | 2 +- dlls/winex11.drv/xim.c | 3 +-- dlls/winex11.drv/xrandr.c | 8 ++++---- dlls/winex11.drv/xrender.c | 10 +++++----- dlls/winex11.drv/xvidmode.c | 4 ++-- 25 files changed, 84 insertions(+), 86 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6069d0d5966580a36b2a2…

1 0

James Hawkins : msi: Make internal functions static.
by Alexandre Julliard 09 Oct '06

09 Oct '06

Module: wine Branch: master Commit: 563a50ab357049b15a84951397699f783e907711 URL: http://source.winehq.org/git/wine.git/?a=commit;h=563a50ab357049b15a8495139… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Oct 9 00:05:04 2006 -0700 msi: Make internal functions static. --- dlls/msi/action.c | 2 +- dlls/msi/action.h | 1 + dlls/msi/custom.c | 2 +- dlls/msi/files.c | 2 -- dlls/msi/helpers.c | 2 +- dlls/msi/install.c | 4 ++-- dlls/msi/msi.c | 12 ++++++------ dlls/msi/msipriv.h | 1 + dlls/msi/package.c | 2 -- dlls/msi/registry.c | 2 +- dlls/msi/select.c | 2 +- 11 files changed, 15 insertions(+), 17 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index be92b6f..b7e55ed 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -3850,7 +3850,7 @@ static UINT ACTION_ForceReboot(MSIPACKAG return ERROR_INSTALL_SUSPEND; } -UINT ACTION_ResolveSource(MSIPACKAGE* package) +static UINT ACTION_ResolveSource(MSIPACKAGE* package) { DWORD attrib; UINT rc; diff --git a/dlls/msi/action.h b/dlls/msi/action.h index d58bc52..9dc19ac 100644 --- a/dlls/msi/action.h +++ b/dlls/msi/action.h @@ -289,6 +289,7 @@ extern UINT register_unique_action(MSIPA extern BOOL check_unique_action(MSIPACKAGE *, LPCWSTR); extern WCHAR* generate_error_string(MSIPACKAGE *, UINT, DWORD, ... ); extern UINT msi_create_component_directories( MSIPACKAGE *package ); +extern void msi_ui_error( DWORD msg_id, DWORD type ); /* control event stuff */ diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index b93e68e..dfebfce 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -120,7 +120,7 @@ static BOOL check_execution_scheduling_o /* stores the CustomActionData before the action: * [CustomActionData]Action */ -LPWSTR msi_get_deferred_action(LPCWSTR action, LPWSTR actiondata) +static LPWSTR msi_get_deferred_action(LPCWSTR action, LPWSTR actiondata) { LPWSTR deferred; DWORD len; diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 5f9f4d8..4e33da7 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -58,8 +58,6 @@ extern const WCHAR szRemoveFiles[]; static const WCHAR cszTempFolder[]= {'T','e','m','p','F','o','l','d','e','r',0}; -extern LPCWSTR msi_download_file( LPCWSTR szUrl, LPWSTR filename ); - /* * This is a helper function for handling embedded cabinet media */ diff --git a/dlls/msi/helpers.c b/dlls/msi/helpers.c index 868d737..5ba6b8a 100644 --- a/dlls/msi/helpers.c +++ b/dlls/msi/helpers.c @@ -426,7 +426,7 @@ static void free_feature( MSIFEATURE *fe msi_free( feature ); } -void free_extension( MSIEXTENSION *ext ) +static void free_extension( MSIEXTENSION *ext ) { struct list *item, *cursor; diff --git a/dlls/msi/install.c b/dlls/msi/install.c index 39db1f6..66b6f3c 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -150,8 +150,8 @@ UINT msi_strcpy_to_awstring( LPCWSTR str /*********************************************************************** * MsiGetTargetPath (internal) */ -UINT WINAPI MSI_GetTargetPath( MSIHANDLE hInstall, LPCWSTR szFolder, - awstring *szPathBuf, DWORD* pcchPathBuf ) +static UINT WINAPI MSI_GetTargetPath( MSIHANDLE hInstall, LPCWSTR szFolder, + awstring *szPathBuf, DWORD* pcchPathBuf ) { MSIPACKAGE *package; LPWSTR path; diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 662f9ea..79615ff 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -431,8 +431,8 @@ UINT WINAPI MsiGetProductCodeW(LPCWSTR s return ERROR_SUCCESS; } -UINT WINAPI MSI_GetProductInfo(LPCWSTR szProduct, LPCWSTR szAttribute, - awstring *szValue, DWORD *pcchValueBuf) +static UINT WINAPI MSI_GetProductInfo(LPCWSTR szProduct, LPCWSTR szAttribute, + awstring *szValue, DWORD *pcchValueBuf) { UINT r; HKEY hkey; @@ -960,8 +960,8 @@ UINT WINAPI MsiVerifyPackageW( LPCWSTR s return r; } -INSTALLSTATE WINAPI MSI_GetComponentPath(LPCWSTR szProduct, LPCWSTR szComponent, - awstring* lpPathBuf, DWORD* pcchBuf) +static INSTALLSTATE WINAPI MSI_GetComponentPath(LPCWSTR szProduct, LPCWSTR szComponent, + awstring* lpPathBuf, DWORD* pcchBuf) { WCHAR squished_pc[GUID_SIZE], squished_comp[GUID_SIZE]; UINT rc; @@ -1409,7 +1409,7 @@ INSTALLSTATE WINAPI MsiUseFeatureA( LPCS /*********************************************************************** * MSI_ProvideQualifiedComponentEx [internal] */ -UINT WINAPI MSI_ProvideQualifiedComponentEx(LPCWSTR szComponent, +static UINT WINAPI MSI_ProvideQualifiedComponentEx(LPCWSTR szComponent, LPCWSTR szQualifier, DWORD dwInstallMode, LPWSTR szProduct, DWORD Unused1, DWORD Unused2, awstring *lpPathBuf, DWORD* pcchPathBuf) @@ -1534,7 +1534,7 @@ UINT WINAPI MsiProvideQualifiedComponent /*********************************************************************** * MSI_GetUserInfo [internal] */ -USERINFOSTATE WINAPI MSI_GetUserInfo(LPCWSTR szProduct, +static USERINFOSTATE WINAPI MSI_GetUserInfo(LPCWSTR szProduct, awstring *lpUserNameBuf, DWORD* pcchUserNameBuf, awstring *lpOrgNameBuf, DWORD* pcchOrgNameBuf, awstring *lpSerialBuf, DWORD* pcchSerialBuf) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 8b9eabb..8ea81e5 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -416,6 +416,7 @@ extern MSICONDITION MSI_EvaluateConditio extern UINT MSI_GetComponentStateW( MSIPACKAGE *, LPCWSTR, INSTALLSTATE *, INSTALLSTATE * ); extern UINT MSI_GetFeatureStateW( MSIPACKAGE *, LPCWSTR, INSTALLSTATE *, INSTALLSTATE * ); extern UINT WINAPI MSI_SetFeatureStateW(MSIPACKAGE*, LPCWSTR, INSTALLSTATE ); +extern LPCWSTR msi_download_file( LPCWSTR szUrl, LPWSTR filename ); /* for deformating */ extern UINT MSI_FormatRecordW( MSIPACKAGE *, MSIRECORD *, LPWSTR, DWORD * ); diff --git a/dlls/msi/package.c b/dlls/msi/package.c index b9f4bb5..5959128 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -47,8 +47,6 @@ #include "action.h" WINE_DEFAULT_DEBUG_CHANNEL(msi); -extern void msi_ui_error( DWORD msg_id, DWORD type ); - static void msi_free_properties( MSIPACKAGE *package ); static void MSI_FreePackage( MSIOBJECTHDR *arg) diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index b246f5f..5ad5059 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -855,7 +855,7 @@ UINT WINAPI MsiEnumClientsW(LPCWSTR szCo return r; } -UINT WINAPI MSI_EnumComponentQualifiers( LPCWSTR szComponent, DWORD iIndex, +static UINT WINAPI MSI_EnumComponentQualifiers( LPCWSTR szComponent, DWORD iIndex, awstring *lpQualBuf, DWORD* pcchQual, awstring *lpAppBuf, DWORD* pcchAppBuf ) { diff --git a/dlls/msi/select.c b/dlls/msi/select.c index d47792b..c961130 100644 --- a/dlls/msi/select.c +++ b/dlls/msi/select.c @@ -285,7 +285,7 @@ static UINT SELECT_AddColumn( MSISELECTV return ERROR_SUCCESS; } -int select_count_columns( column_info *col ) +static int select_count_columns( column_info *col ) { int n; for (n = 0; col; col = col->next)

1 0

James Hawkins : msi: Add missing declarations to the public headers.
by Alexandre Julliard 09 Oct '06

09 Oct '06

Module: wine Branch: master Commit: 5fd3c4ad15bfe7f976ca421c81f285487ddced29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fd3c4ad15bfe7f976ca421c8… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Oct 9 00:05:27 2006 -0700 msi: Add missing declarations to the public headers. --- include/msi.h | 8 ++++++++ include/msiquery.h | 10 ++++++++++ 2 files changed, 18 insertions(+), 0 deletions(-) diff --git a/include/msi.h b/include/msi.h index 17b3db6..28b9c51 100644 --- a/include/msi.h +++ b/include/msi.h @@ -528,6 +528,14 @@ INSTALLSTATE WINAPI MsiLocateComponentA( INSTALLSTATE WINAPI MsiLocateComponentW(LPCWSTR, LPWSTR, DWORD *); #define MsiLocateComponent WINELIB_NAME_AW(MsiLocateComponent) +UINT WINAPI MsiSourceListAddSourceA(LPCSTR, LPCSTR, DWORD, LPCSTR); +UINT WINAPI MsiSourceListAddSourceW(LPCWSTR, LPCWSTR, DWORD, LPCWSTR); +#define MsiSourceListAddSource WINELIB_NAME_AW(MsiSourceListAddSource) + +UINT WINAPI MsiSourceListClearAllA(LPCSTR, LPCSTR, DWORD); +UINT WINAPI MsiSourceListClearAllW(LPCWSTR, LPCWSTR, DWORD); +#define MsiSourceListClearAll WINELIB_NAME_AW(MsiSourceListClearAll) + UINT WINAPI MsiSourceListGetInfoA(LPCSTR, LPCSTR, MSIINSTALLCONTEXT, DWORD, LPCSTR, LPSTR, LPDWORD); UINT WINAPI MsiSourceListGetInfoW(LPCWSTR, LPCWSTR, MSIINSTALLCONTEXT, DWORD, LPCWSTR, LPWSTR, LPDWORD); #define MsiSourceListGetInfo WINELIB_NAME_AW(MsiSourceListGetInfo) diff --git a/include/msiquery.h b/include/msiquery.h index 8ea24b6..231f9be 100644 --- a/include/msiquery.h +++ b/include/msiquery.h @@ -290,4 +290,14 @@ BOOL WINAPI MsiSetMode(MSIHANDLE, MSIRUN UINT WINAPI MsiViewModify(MSIHANDLE, MSIMODIFY, MSIHANDLE); +UINT WINAPI MsiGetFeatureCostA(MSIHANDLE, LPCSTR, MSICOSTTREE, INSTALLSTATE, INT*); +UINT WINAPI MsiGetFeatureCostW(MSIHANDLE, LPCWSTR, MSICOSTTREE, INSTALLSTATE, INT*); +#define MsiGetFeatureCost WINELIB_NAME_AW(MsiGetFeatureCost) + +LANGID WINAPI MsiGetLanguage(MSIHANDLE); + +UINT WINAPI MsiSetInstallLevel(MSIHANDLE, int); + +MSIHANDLE WINAPI MsiGetLastErrorRecord(); + #endif /* __WINE_MSIQUERY_H */

1 0

Andrew Talbot : server: Cast-qual warning fix.
by Alexandre Julliard 09 Oct '06

09 Oct '06

Module: wine Branch: master Commit: e60c86657a59401e99d474ee571b707ef1a1e3f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e60c86657a59401e99d474ee5… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Oct 7 19:47:38 2006 +0100 server: Cast-qual warning fix. --- server/ptrace.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/server/ptrace.c b/server/ptrace.c index 4de242f..ef72713 100644 --- a/server/ptrace.c +++ b/server/ptrace.c @@ -272,7 +272,7 @@ static int suspend_for_ptrace( struct th } /* read an int from a thread address space */ -static int read_thread_int( struct thread *thread, const int *addr, int *data ) +static int read_thread_int( struct thread *thread, int *addr, int *data ) { errno = 0; *data = ptrace( PTRACE_PEEKDATA, get_ptrace_pid(thread), (caddr_t)addr, 0 );

1 0

James Hawkins : msi: Perform button control events in greatest to least order.
by Alexandre Julliard 09 Oct '06

09 Oct '06

Module: wine Branch: master Commit: f721a24a13bf250f0794b7249ffa863619b0b450 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f721a24a13bf250f0794b7249… Author: James Hawkins <truiken(a)gmail.com> Date: Fri Oct 6 18:09:43 2006 -0700 msi: Perform button control events in greatest to least order. --- dlls/msi/dialog.c | 2 + dlls/msi/msipriv.h | 1 + dlls/msi/msiquery.c | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 79 insertions(+), 1 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 11890ac..6c6aa0e 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -2914,7 +2914,7 @@ static UINT msi_dialog_button_handler( m return 0; } - r = MSI_IterateRecords( view, 0, msi_dialog_control_event, dialog ); + r = MSI_ReverseIterateRecords( view, 0, msi_dialog_control_event, dialog ); msiobj_release( &view->hdr ); return r; diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index cc3b88b..8b9eabb 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -386,6 +386,7 @@ extern UINT MSI_OpenDatabaseW( LPCWSTR, extern UINT MSI_DatabaseOpenViewW(MSIDATABASE *, LPCWSTR, MSIQUERY ** ); extern UINT MSI_OpenQuery( MSIDATABASE *, MSIQUERY **, LPCWSTR, ... ); typedef UINT (*record_func)( MSIRECORD *, LPVOID ); +extern UINT MSI_ReverseIterateRecords( MSIQUERY *, DWORD *, record_func, LPVOID ); extern UINT MSI_IterateRecords( MSIQUERY *, DWORD *, record_func, LPVOID ); extern MSIRECORD *MSI_QueryGetRecord( MSIDATABASE *db, LPCWSTR query, ... ); extern UINT MSI_DatabaseImport( MSIDATABASE *, LPCWSTR, LPCWSTR ); diff --git a/dlls/msi/msiquery.c b/dlls/msi/msiquery.c index 7816e13..ff8aa42 100644 --- a/dlls/msi/msiquery.c +++ b/dlls/msi/msiquery.c @@ -27,6 +27,7 @@ #include "winbase.h" #include "winerror.h" #include "wine/debug.h" #include "wine/unicode.h" +#include "wine/list.h" #include "msi.h" #include "msiquery.h" #include "objbase.h" @@ -164,6 +165,82 @@ UINT MSI_OpenQuery( MSIDATABASE *db, MSI return r; } +struct rec_list +{ + struct list entry; + MSIRECORD *rec; +}; + +UINT MSI_ReverseIterateRecords( MSIQUERY *view, DWORD *count, + record_func func, LPVOID param ) +{ + MSIRECORD *rec = NULL; + struct rec_list *add_rec; + struct list records; + UINT r, n = 0, max = 0; + + r = MSI_ViewExecute( view, NULL ); + if( r != ERROR_SUCCESS ) + return r; + + list_init( &records ); + + if( count ) + max = *count; + + /* reverse the query */ + for( n = 0; (max == 0) || (n < max); n++ ) + { + r = MSI_ViewFetch( view, &rec ); + if( r != ERROR_SUCCESS ) + { + if ( r == ERROR_NO_MORE_ITEMS ) + break; + else + goto done; + } + + add_rec = msi_alloc( sizeof( *add_rec ) ); + if (!add_rec) + goto done; + + add_rec->rec = rec; + list_add_head( &records, &add_rec->entry ); + } + + /* iterate over the reversed records */ + n = 0; + LIST_FOR_EACH_ENTRY( add_rec, &records, struct rec_list, entry ) + { + if (func) + r = func( add_rec->rec, param ); + + msiobj_release( &add_rec->rec->hdr ); + if ( r != ERROR_SUCCESS ) + goto done; + + n++; + } + +done: + MSI_ViewClose( view ); + + while ( !list_empty( &records ) ) + { + add_rec = LIST_ENTRY( list_head( &records ), struct rec_list, entry ); + list_remove( &add_rec->entry ); + msi_free( add_rec ); + } + + if( count ) + *count = n; + + if( r == ERROR_NO_MORE_ITEMS ) + r = ERROR_SUCCESS; + + return r; +} + UINT MSI_IterateRecords( MSIQUERY *view, DWORD *count, record_func func, LPVOID param ) {

1 0

Mikołaj Zalewski : uninstaller: Fix Polish translation .
by Alexandre Julliard 09 Oct '06

09 Oct '06

Module: wine Branch: master Commit: 34aaea93b6bb86fd3f18f12c039c32a1604d6454 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34aaea93b6bb86fd3f18f12c0… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Sun Oct 8 23:23:59 2006 +0200 uninstaller: Fix Polish translation. --- programs/uninstaller/Pl.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/uninstaller/Pl.rc b/programs/uninstaller/Pl.rc index bbc43ac..4b5937d 100644 --- a/programs/uninstaller/Pl.rc +++ b/programs/uninstaller/Pl.rc @@ -40,6 +40,6 @@ STRINGTABLE DISCARDABLE { IDS_APPNAME, "Wine - usuwanie program�w" IDS_ABOUT, "Wine - usuwanie program�w (C) 2005 by Andreas Mohr, Hannu Valtonen and Jonathan Ernst." IDS_ABOUTTITLE, "O narz�dziu do usuwania program�w" - IDS_REGISTRYKEYNOTAVAILABLE, "Nie ma informacji o usuwaniu tego programu w rejestrze (jeszcze), nie ma nic do zrobienia!" + IDS_REGISTRYKEYNOTAVAILABLE, "Nie ma (jeszcze) informacji o programach do usuni�cia w rejestrze. Nie ma nic do zrobienia!" IDS_UNINSTALLFAILED, "Nie uda�o si� wykona� polecenia '%s', kt�re powinno usun�� progam. By� mo�e ju� by� usuni�ty.\r\nCzy chcesz usun�� jego wpis z tej listy?" }

1 0

Mikołaj Zalewski : clock: Update Polish translation.
by Alexandre Julliard 09 Oct '06

09 Oct '06

Module: wine Branch: master Commit: edcf8143c45825381018f01a17ac1b7ad7be1553 URL: http://source.winehq.org/git/wine.git/?a=commit;h=edcf8143c45825381018f01a1… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Sun Oct 8 23:22:17 2006 +0200 clock: Update Polish translation. --- programs/clock/Pl.rc | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/programs/clock/Pl.rc b/programs/clock/Pl.rc index e14bfc2..a9774d8 100644 --- a/programs/clock/Pl.rc +++ b/programs/clock/Pl.rc @@ -48,3 +48,28 @@ STRINGTABLE DISCARDABLE { IDS_CLOCK, "Zegar" } + + +STRINGTABLE DISCARDABLE +{ +IDS_LICENSE_CAPTION, "LICENCJA" +IDS_LICENSE, +"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.\n\ +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.\n\ +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" + +IDS_WARRANTY_CAPTION, "BEZ GWARANCJI" +IDS_WARRANTY, +"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." +}

1 0