wine-commits June 2013

wine-commits@winehq.org

2 participants
411 discussions

Hans Leidekker : msi: Don' t defer custom actions in the UI sequence if they match the currently running script .
by Alexandre Julliard 03 Jun '13

03 Jun '13

Module: wine Branch: master Commit: b64fabf39e923ebfaa9a77ed9dea05acf7e38dcb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b64fabf39e923ebfaa9a77ed9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jun 3 12:09:54 2013 +0200 msi: Don't defer custom actions in the UI sequence if they match the currently running script. --- dlls/msi/action.c | 10 ++++------ dlls/msi/custom.c | 4 ++-- dlls/msi/msipriv.h | 2 +- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 1fa065b..d964787 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -635,14 +635,12 @@ static UINT ACTION_ProcessUISequence(MSIPACKAGE *package) /******************************************************** * ACTION helper functions and functions that perform the actions *******************************************************/ -static BOOL ACTION_HandleCustomAction( MSIPACKAGE* package, LPCWSTR action, - UINT* rc, UINT script, BOOL force ) +static BOOL ACTION_HandleCustomAction( MSIPACKAGE *package, LPCWSTR action, UINT *rc, UINT script ) { BOOL ret=FALSE; UINT arc; - arc = ACTION_CustomAction(package, action, script, force); - + arc = ACTION_CustomAction( package, action, script ); if (arc != ERROR_CALL_NOT_IMPLEMENTED) { *rc = arc; @@ -7650,7 +7648,7 @@ UINT ACTION_PerformAction(MSIPACKAGE *package, const WCHAR *action, UINT script) handled = ACTION_HandleStandardAction(package, action, &rc); if (!handled) - handled = ACTION_HandleCustomAction(package, action, &rc, script, TRUE); + handled = ACTION_HandleCustomAction(package, action, &rc, script); if (!handled) { @@ -7672,7 +7670,7 @@ UINT ACTION_PerformUIAction(MSIPACKAGE *package, const WCHAR *action, UINT scrip handled = ACTION_HandleStandardAction(package, action, &rc); if (!handled) - handled = ACTION_HandleCustomAction(package, action, &rc, script, FALSE); + handled = ACTION_HandleCustomAction(package, action, &rc, script); if( !handled && ACTION_DialogBox(package, action) == ERROR_SUCCESS ) handled = TRUE; diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 33be99b..eadb355 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -1172,7 +1172,7 @@ static UINT defer_custom_action( MSIPACKAGE *package, const WCHAR *action, UINT return ERROR_SUCCESS; } -UINT ACTION_CustomAction(MSIPACKAGE *package, LPCWSTR action, UINT script, BOOL execute) +UINT ACTION_CustomAction( MSIPACKAGE *package, LPCWSTR action, UINT script ) { static const WCHAR query[] = { 'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', @@ -1212,7 +1212,7 @@ UINT ACTION_CustomAction(MSIPACKAGE *package, LPCWSTR action, UINT script, BOOL if (type & msidbCustomActionTypeNoImpersonate) WARN("msidbCustomActionTypeNoImpersonate not handled\n"); - if (!execute || !action_type_matches_script( type, script )) + if (!action_type_matches_script( type, script )) { rc = defer_custom_action( package, action, type ); goto end; diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 018f405..773e8c1 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -977,7 +977,7 @@ extern HINSTANCE msi_hInstance DECLSPEC_HIDDEN; extern UINT ACTION_PerformAction(MSIPACKAGE *package, const WCHAR *action, UINT script) DECLSPEC_HIDDEN; extern UINT ACTION_PerformUIAction(MSIPACKAGE *package, const WCHAR *action, UINT script) DECLSPEC_HIDDEN; extern void ACTION_FinishCustomActions( const MSIPACKAGE* package) DECLSPEC_HIDDEN; -extern UINT ACTION_CustomAction(MSIPACKAGE *package,const WCHAR *action, UINT script, BOOL execute) DECLSPEC_HIDDEN; +extern UINT ACTION_CustomAction(MSIPACKAGE *, const WCHAR *, UINT) DECLSPEC_HIDDEN; /* actions in other modules */ extern UINT ACTION_AppSearch(MSIPACKAGE *package) DECLSPEC_HIDDEN;

1 0

Dmitry Timoshkov : server: Mark the process as disconnected from desktop/ winstation before closing its handles.
by Alexandre Julliard 03 Jun '13

03 Jun '13

Module: wine Branch: master Commit: df6c2a841824cf9edb438f9aea2ccb25922b671b URL: http://source.winehq.org/git/wine.git/?a=commit;h=df6c2a841824cf9edb438f9ae… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jun 3 18:15:15 2013 +0900 server: Mark the process as disconnected from desktop/winstation before closing its handles. --- dlls/kernel32/tests/process.c | 1 - server/process.c | 2 +- 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 64e333e..9d3e983 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -1957,7 +1957,6 @@ static void test_TerminateProcess(void) SetLastError(0xdeadbeef); ret = TerminateProcess(pi.hProcess, 0); -todo_wine ok(ret, "TerminateProcess error %u\n", GetLastError()); CloseHandle(pi.hProcess); diff --git a/server/process.c b/server/process.c index 61d9d17..f1046c0 100644 --- a/server/process.c +++ b/server/process.c @@ -628,9 +628,9 @@ static void process_killed( struct process *process ) assert( list_empty( &process->thread_list )); process->end_time = current_time; if (!process->is_system) close_process_desktop( process ); - close_process_handles( process ); process->winstation = 0; process->desktop = 0; + close_process_handles( process ); if (process->idle_event) { release_object( process->idle_event );

1 0

André Hentschel : difxapi: Add stubs for DriverPackageGetPath{A, W}.
by Alexandre Julliard 03 Jun '13

03 Jun '13

Module: wine Branch: master Commit: 849bbd90ac3aeec8c4136fc2521d8f2f85bff545 URL: http://source.winehq.org/git/wine.git/?a=commit;h=849bbd90ac3aeec8c4136fc25… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jun 2 14:37:51 2013 +0200 difxapi: Add stubs for DriverPackageGetPath{A,W}. --- dlls/difxapi/difxapi.spec | 4 ++-- dlls/difxapi/main.c | 12 ++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/difxapi/difxapi.spec b/dlls/difxapi/difxapi.spec index 8ce068d..ad03719 100644 --- a/dlls/difxapi/difxapi.spec +++ b/dlls/difxapi/difxapi.spec @@ -1,7 +1,7 @@ @ stub DIFXAPISetLogCallbackA @ stub DIFXAPISetLogCallbackW -@ stub DriverPackageGetPathA -@ stub DriverPackageGetPathW +@ stdcall DriverPackageGetPathA(str ptr ptr) +@ stdcall DriverPackageGetPathW(wstr ptr ptr) @ stdcall DriverPackageInstallA(str long ptr ptr) @ stdcall DriverPackageInstallW(wstr long ptr ptr) @ stdcall DriverPackagePreinstallA(str long) diff --git a/dlls/difxapi/main.c b/dlls/difxapi/main.c index 8f3f339..820a4b3 100644 --- a/dlls/difxapi/main.c +++ b/dlls/difxapi/main.c @@ -64,3 +64,15 @@ DWORD WINAPI DriverPackageUninstallW(LPCWSTR inf, DWORD flags, PCINSTALLERINFO_W if (reboot) *reboot = FALSE; return ERROR_SUCCESS; } + +DWORD WINAPI DriverPackageGetPathA(LPCSTR inf, CHAR *dest, DWORD *count) +{ + FIXME("(%s, %p, %p) stub\n", wine_dbgstr_a(inf), dest, count); + return ERROR_UNSUPPORTED_TYPE; +} + +DWORD WINAPI DriverPackageGetPathW(LPCWSTR inf, WCHAR *dest, DWORD *count) +{ + FIXME("(%s, %p, %p) stub\n", wine_dbgstr_w(inf), dest, count); + return ERROR_UNSUPPORTED_TYPE; +}

1 0

André Hentschel : difxapi: Add stubs for DIFXAPISetLogCallback{A, W}.
by Alexandre Julliard 03 Jun '13

03 Jun '13

Module: wine Branch: master Commit: 5bee8b4e409f4f93bb15669d4be32d9ab6448b43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bee8b4e409f4f93bb15669d4… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jun 2 14:37:57 2013 +0200 difxapi: Add stubs for DIFXAPISetLogCallback{A,W}. --- dlls/difxapi/difxapi.spec | 4 ++-- dlls/difxapi/main.c | 10 ++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/difxapi/difxapi.spec b/dlls/difxapi/difxapi.spec index ad03719..33a805b 100644 --- a/dlls/difxapi/difxapi.spec +++ b/dlls/difxapi/difxapi.spec @@ -1,5 +1,5 @@ -@ stub DIFXAPISetLogCallbackA -@ stub DIFXAPISetLogCallbackW +@ stdcall DIFXAPISetLogCallbackA(ptr ptr) +@ stdcall DIFXAPISetLogCallbackW(ptr ptr) @ stdcall DriverPackageGetPathA(str ptr ptr) @ stdcall DriverPackageGetPathW(wstr ptr ptr) @ stdcall DriverPackageInstallA(str long ptr ptr) diff --git a/dlls/difxapi/main.c b/dlls/difxapi/main.c index 820a4b3..8a2679c 100644 --- a/dlls/difxapi/main.c +++ b/dlls/difxapi/main.c @@ -76,3 +76,13 @@ DWORD WINAPI DriverPackageGetPathW(LPCWSTR inf, WCHAR *dest, DWORD *count) FIXME("(%s, %p, %p) stub\n", wine_dbgstr_w(inf), dest, count); return ERROR_UNSUPPORTED_TYPE; } + +VOID WINAPI DIFXAPISetLogCallbackA(DIFXAPILOGCALLBACK_A cb, VOID *ctx) +{ + FIXME("(%p, %p) stub\n", cb, ctx); +} + +VOID WINAPI DIFXAPISetLogCallbackW(DIFXAPILOGCALLBACK_W cb, VOID *ctx) +{ + FIXME("(%p, %p) stub\n", cb, ctx); +}

1 0

André Hentschel : difxapi: Add stubs for DriverPackageUninstall{A, W}.
by Alexandre Julliard 03 Jun '13

03 Jun '13

Module: wine Branch: master Commit: d57ab7fd11bfe3ff51c7545fe85d53ff32d12050 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d57ab7fd11bfe3ff51c7545fe… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jun 2 14:39:36 2013 +0200 difxapi: Add stubs for DriverPackageUninstall{A,W}. --- dlls/difxapi/difxapi.spec | 4 ++-- dlls/difxapi/main.c | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/difxapi/difxapi.spec b/dlls/difxapi/difxapi.spec index b4409bd..8ce068d 100644 --- a/dlls/difxapi/difxapi.spec +++ b/dlls/difxapi/difxapi.spec @@ -6,5 +6,5 @@ @ stdcall DriverPackageInstallW(wstr long ptr ptr) @ stdcall DriverPackagePreinstallA(str long) @ stdcall DriverPackagePreinstallW(wstr long) -@ stub DriverPackageUninstallA -@ stub DriverPackageUninstallW +@ stdcall DriverPackageUninstallA(str long ptr ptr) +@ stdcall DriverPackageUninstallW(wstr long ptr ptr) diff --git a/dlls/difxapi/main.c b/dlls/difxapi/main.c index ff1d310..8f3f339 100644 --- a/dlls/difxapi/main.c +++ b/dlls/difxapi/main.c @@ -50,3 +50,17 @@ DWORD WINAPI DriverPackageInstallW(LPCWSTR inf, DWORD flags, PCINSTALLERINFO_W i if (reboot) *reboot = FALSE; return ERROR_SUCCESS; } + +DWORD WINAPI DriverPackageUninstallA(LPCSTR inf, DWORD flags, PCINSTALLERINFO_A info, BOOL *reboot) +{ + FIXME("(%s, %u, %p, %p) stub\n", wine_dbgstr_a(inf), flags, info, reboot); + if (reboot) *reboot = FALSE; + return ERROR_SUCCESS; +} + +DWORD WINAPI DriverPackageUninstallW(LPCWSTR inf, DWORD flags, PCINSTALLERINFO_W info, BOOL *reboot) +{ + FIXME("(%s, %u, %p, %p) stub\n", wine_dbgstr_w(inf), flags, info, reboot); + if (reboot) *reboot = FALSE; + return ERROR_SUCCESS; +}

1 0

André Hentschel : difxapi: Add stubs for DriverPackageInstall{A, W}.
by Alexandre Julliard 03 Jun '13

03 Jun '13

Module: wine Branch: master Commit: 741cb979057b55b31eb02075be1a6012979bad87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=741cb979057b55b31eb02075b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jun 2 14:37:06 2013 +0200 difxapi: Add stubs for DriverPackageInstall{A,W}. --- dlls/difxapi/difxapi.spec | 4 ++-- dlls/difxapi/main.c | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/difxapi/difxapi.spec b/dlls/difxapi/difxapi.spec index 6fbc0bb..b4409bd 100644 --- a/dlls/difxapi/difxapi.spec +++ b/dlls/difxapi/difxapi.spec @@ -2,8 +2,8 @@ @ stub DIFXAPISetLogCallbackW @ stub DriverPackageGetPathA @ stub DriverPackageGetPathW -@ stub DriverPackageInstallA -@ stub DriverPackageInstallW +@ stdcall DriverPackageInstallA(str long ptr ptr) +@ stdcall DriverPackageInstallW(wstr long ptr ptr) @ stdcall DriverPackagePreinstallA(str long) @ stdcall DriverPackagePreinstallW(wstr long) @ stub DriverPackageUninstallA diff --git a/dlls/difxapi/main.c b/dlls/difxapi/main.c index 047b912..ff1d310 100644 --- a/dlls/difxapi/main.c +++ b/dlls/difxapi/main.c @@ -36,3 +36,17 @@ DWORD WINAPI DriverPackagePreinstallW(LPCWSTR inf, DWORD flags) FIXME("(%s, %u) stub\n", wine_dbgstr_w(inf), flags); return ERROR_SUCCESS; } + +DWORD WINAPI DriverPackageInstallA(LPCSTR inf, DWORD flags, PCINSTALLERINFO_A info, BOOL *reboot) +{ + FIXME("(%s, %u, %p, %p) stub\n", wine_dbgstr_a(inf), flags, info, reboot); + if (reboot) *reboot = FALSE; + return ERROR_SUCCESS; +} + +DWORD WINAPI DriverPackageInstallW(LPCWSTR inf, DWORD flags, PCINSTALLERINFO_W info, BOOL *reboot) +{ + FIXME("(%s, %u, %p, %p) stub\n", wine_dbgstr_w(inf), flags, info, reboot); + if (reboot) *reboot = FALSE; + return ERROR_SUCCESS; +}

1 0

André Hentschel : difxapi: Add stubs for DriverPackagePreinstall{A, W}.
by Alexandre Julliard 03 Jun '13

03 Jun '13

Module: wine Branch: master Commit: 15cdb51792f2ba5f2dbc1821f08116575d7db5e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15cdb51792f2ba5f2dbc1821f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jun 2 14:36:59 2013 +0200 difxapi: Add stubs for DriverPackagePreinstall{A,W}. --- dlls/difxapi/Makefile.in | 3 ++ dlls/difxapi/difxapi.spec | 4 +- dlls/difxapi/main.c | 38 ++++++++++++++++++++++++ include/Makefile.in | 1 + include/difxapi.h | 70 +++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 114 insertions(+), 2 deletions(-) diff --git a/dlls/difxapi/Makefile.in b/dlls/difxapi/Makefile.in index 17ddaa2..68aba98 100644 --- a/dlls/difxapi/Makefile.in +++ b/dlls/difxapi/Makefile.in @@ -1,3 +1,6 @@ MODULE = difxapi.dll +C_SRCS = \ + main.c + @MAKE_DLL_RULES@ diff --git a/dlls/difxapi/difxapi.spec b/dlls/difxapi/difxapi.spec index a7f6ade..6fbc0bb 100644 --- a/dlls/difxapi/difxapi.spec +++ b/dlls/difxapi/difxapi.spec @@ -4,7 +4,7 @@ @ stub DriverPackageGetPathW @ stub DriverPackageInstallA @ stub DriverPackageInstallW -@ stub DriverPackagePreinstallA -@ stub DriverPackagePreinstallW +@ stdcall DriverPackagePreinstallA(str long) +@ stdcall DriverPackagePreinstallW(wstr long) @ stub DriverPackageUninstallA @ stub DriverPackageUninstallW diff --git a/dlls/difxapi/main.c b/dlls/difxapi/main.c new file mode 100644 index 0000000..047b912 --- /dev/null +++ b/dlls/difxapi/main.c @@ -0,0 +1,38 @@ +/* + * Copyright (c) 2013 André Hentschel + * + * 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 <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "difxapi.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(difxapi); + +DWORD WINAPI DriverPackagePreinstallA(LPCSTR inf, DWORD flags) +{ + FIXME("(%s, %u) stub\n", wine_dbgstr_a(inf), flags); + return ERROR_SUCCESS; +} + +DWORD WINAPI DriverPackagePreinstallW(LPCWSTR inf, DWORD flags) +{ + FIXME("(%s, %u) stub\n", wine_dbgstr_w(inf), flags); + return ERROR_SUCCESS; +} diff --git a/include/Makefile.in b/include/Makefile.in index 6517393..c3a39bc 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -246,6 +246,7 @@ SRCDIR_INCLUDES = \ devguid.h \ devpkey.h \ devpropdef.h \ + difxapi.h \ digitalv.h \ dinput.h \ dinputd.h \ diff --git a/include/difxapi.h b/include/difxapi.h new file mode 100644 index 0000000..f5149b8 --- /dev/null +++ b/include/difxapi.h @@ -0,0 +1,70 @@ +/* + * Copyright (c) 2013 André Hentschel + * + * 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 + */ + +#ifndef __WINE_DIFXAPI_H +#define __WINE_DIFXAPI_H + +#ifdef __cplusplus +extern "C" { +#endif + +typedef struct _INSTALLERINFO_A +{ + PSTR pApplicationId; + PSTR pDisplayName; + PSTR pProductName; + PSTR pMfgName; +} INSTALLERINFO_A, *PINSTALLERINFO_A; +typedef const PINSTALLERINFO_A PCINSTALLERINFO_A; + +typedef struct _INSTALLERINFO_W +{ + PWSTR pApplicationId; + PWSTR pDisplayName; + PWSTR pProductName; + PWSTR pMfgName; +} INSTALLERINFO_W, *PINSTALLERINFO_W; +typedef const PINSTALLERINFO_W PCINSTALLERINFO_W; + +typedef enum _DIFXAPI_LOG +{ + DIFXAPI_SUCCESS, + DIFXAPI_INFO, + DIFXAPI_WARNING, + DIFXAPI_ERROR, +} DIFXAPI_LOG; + +typedef VOID (CALLBACK *DIFXAPILOGCALLBACK_A)(DIFXAPI_LOG,DWORD,PCSTR,PVOID); +typedef VOID (CALLBACK *DIFXAPILOGCALLBACK_W)(DIFXAPI_LOG,DWORD,PCWSTR,PVOID); + +VOID WINAPI DIFXAPISetLogCallbackA(DIFXAPILOGCALLBACK_A,VOID*); +VOID WINAPI DIFXAPISetLogCallbackW(DIFXAPILOGCALLBACK_W,VOID*); +DWORD WINAPI DriverPackageGetPathA(PCSTR,PSTR,DWORD*); +DWORD WINAPI DriverPackageGetPathW(PCWSTR,PWSTR,DWORD*); +DWORD WINAPI DriverPackageInstallA(PCSTR,DWORD,PCINSTALLERINFO_A,BOOL*); +DWORD WINAPI DriverPackageInstallW(PCWSTR,DWORD,PCINSTALLERINFO_W,BOOL*); +DWORD WINAPI DriverPackagePreinstallA(PCSTR,DWORD); +DWORD WINAPI DriverPackagePreinstallW(PCWSTR,DWORD); +DWORD WINAPI DriverPackageUninstallA(PCSTR,DWORD,PCINSTALLERINFO_A,BOOL*); +DWORD WINAPI DriverPackageUninstallW(PCWSTR,DWORD,PCINSTALLERINFO_W,BOOL*); + +#ifdef __cplusplus +} +#endif + +#endif /* __WINE_DIFXAPI_H */

1 0

Christian Costa : d3dxof: Turn a fixme into warn.
by Alexandre Julliard 03 Jun '13

03 Jun '13

Module: wine Branch: master Commit: c5d01aa6ae5f67b2c8c78ab1c4ef386b5f715317 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5d01aa6ae5f67b2c8c78ab1c… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu May 30 23:05:54 2013 +0200 d3dxof: Turn a fixme into warn. --- dlls/d3dxof/parsing.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index 5df6f4c..69fb992 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -1262,7 +1262,7 @@ static BOOL parse_object_members_list(parse_buffer * buf) } else { - FIXME("Unexpected token %d\n", token); + WARN("Unexpected token %d\n", token); return FALSE; } }

1 0

Christian Costa : d3dxof: Fix list of float and integer in binary mode.
by Alexandre Julliard 03 Jun '13

03 Jun '13

Module: wine Branch: master Commit: 4102d8a0dc1b02d37d834f17d1925f3b0de6e2f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4102d8a0dc1b02d37d834f17d… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu May 30 23:05:47 2013 +0200 d3dxof: Fix list of float and integer in binary mode. --- dlls/d3dxof/d3dxof_private.h | 1 + dlls/d3dxof/parsing.c | 30 ++++++++++++++++++------------ dlls/d3dxof/tests/d3dxof.c | 4 ++-- 3 files changed, 21 insertions(+), 14 deletions(-) diff --git a/dlls/d3dxof/d3dxof_private.h b/dlls/d3dxof/d3dxof_private.h index 7812fff..cf33ed2 100644 --- a/dlls/d3dxof/d3dxof_private.h +++ b/dlls/d3dxof/d3dxof_private.h @@ -127,6 +127,7 @@ typedef struct { BOOL txt; DWORD list_nb_elements; BOOL list_type_float; + BOOL list_separator; ULONG cur_pos_data; LPBYTE cur_pstrings; BYTE value[100]; diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index 9335fdc..5df6f4c 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -743,16 +743,26 @@ static WORD parse_TOKEN(parse_buffer * buf) if (buf->list_nb_elements) { - token = buf->list_type_float ? TOKEN_FLOAT : TOKEN_INTEGER; - buf->list_nb_elements--; - { - DWORD integer; + if (buf->list_separator) + { + buf->list_nb_elements--; + buf->list_separator = FALSE; + /* Insert separarator between each values and since list does not accept separator at the end + use a comma so any extra separator will generate an error */ + token = TOKEN_COMMA; + } + else + { + DWORD value; - if (!read_bytes(buf, &integer, 4)) - return TOKEN_ERROR; + if (!read_bytes(buf, &value, 4)) + return TOKEN_ERROR; + *(DWORD*)buf->value = value; - *(DWORD*)buf->value = integer; - } + buf->list_separator = TRUE; + /* Convert list into a serie of their basic type counterpart */ + token = buf->list_type_float ? TOKEN_FLOAT : TOKEN_INTEGER; + } dump_TOKEN(token); return token; } @@ -1288,10 +1298,6 @@ static BOOL parse_object_parts(parse_buffer * buf, BOOL allow_optional) { buf->pxo->size = buf->cur_pos_data - buf->pxo->pos_data; - /* Skip trailing semicolon */ - while (check_TOKEN(buf) == TOKEN_SEMICOLON) - get_TOKEN(buf); - while (1) { if (check_TOKEN(buf) == TOKEN_OBRACE) diff --git a/dlls/d3dxof/tests/d3dxof.c b/dlls/d3dxof/tests/d3dxof.c index ecd4ba5..83fd23d 100644 --- a/dlls/d3dxof/tests/d3dxof.c +++ b/dlls/d3dxof/tests/d3dxof.c @@ -921,11 +921,11 @@ static void test_syntax_semicolon_comma(void) /* Test object with a single integer list in binary mode */ ret = test_buffer_object(dxfile, object_syntax_full_integer_list_bin, sizeof(object_syntax_full_integer_list_bin)); - todo_wine ok(ret == DXFILE_OK, "test_buffer_object failed with %#x\n", ret); + ok(ret == DXFILE_OK, "test_buffer_object failed with %#x\n", ret); /* Test object with mixed integer list and integers + single comma separators in binary mode */ ret = test_buffer_object(dxfile, object_syntax_mixed_integer_list_bin, sizeof(object_syntax_mixed_integer_list_bin)); - todo_wine ok(ret == DXFILE_OK, "test_buffer_object failed with %#x\n", ret); + ok(ret == DXFILE_OK, "test_buffer_object failed with %#x\n", ret); /* Test integer list followed by a semicolon in binary mode */ ret = test_buffer_object(dxfile, object_syntax_integer_list_semicolon_bin, sizeof(object_syntax_integer_list_semicolon_bin));

1 0

Christian Costa : d3dxof: Move list type and list nb elements into the parse context.
by Alexandre Julliard 03 Jun '13

03 Jun '13

Module: wine Branch: master Commit: 7325b798b45c3ab1b9a984e87b4d82169fa43e17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7325b798b45c3ab1b9a984e87… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu May 30 23:05:39 2013 +0200 d3dxof: Move list type and list nb elements into the parse context. --- dlls/d3dxof/d3dxof.c | 3 +-- dlls/d3dxof/d3dxof_private.h | 2 ++ dlls/d3dxof/parsing.c | 23 ++++++++++------------- 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index 7090141..c0bea3c 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -291,10 +291,9 @@ static HRESULT WINAPI IDirectXFileImpl_RegisterTemplates(IDirectXFile* iface, LP HRESULT hr; LPBYTE decomp_buffer = NULL; + ZeroMemory(&buf, sizeof(buf)); buf.buffer = pvData; buf.rem_bytes = cbSize; - buf.txt = FALSE; - buf.token_present = FALSE; buf.pdxf = This; TRACE("(%p/%p)->(%p,%d)\n", This, iface, pvData, cbSize); diff --git a/dlls/d3dxof/d3dxof_private.h b/dlls/d3dxof/d3dxof_private.h index 5bd3c71..7812fff 100644 --- a/dlls/d3dxof/d3dxof_private.h +++ b/dlls/d3dxof/d3dxof_private.h @@ -125,6 +125,8 @@ typedef struct { WORD current_token; BOOL token_present; BOOL txt; + DWORD list_nb_elements; + BOOL list_type_float; ULONG cur_pos_data; LPBYTE cur_pstrings; BYTE value[100]; diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index 3ad9fa7..9335fdc 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -717,10 +717,7 @@ static WORD parse_TOKEN(parse_buffer * buf) } else { - static int nb_elem; - static int is_float; - - if (!nb_elem) + if (!buf->list_nb_elements) { if (!read_bytes(buf, &token, 2)) return TOKEN_NONE; @@ -728,26 +725,26 @@ static WORD parse_TOKEN(parse_buffer * buf) /* Convert integer and float list into separate elements */ if (token == TOKEN_INTEGER_LIST) { - if (!read_bytes(buf, &nb_elem, 4)) + if (!read_bytes(buf, &buf->list_nb_elements, 4)) return TOKEN_ERROR; token = TOKEN_INTEGER; - is_float = FALSE; - TRACE("Integer list (TOKEN_INTEGER_LIST) of size %d\n", nb_elem); + buf->list_type_float = FALSE; + TRACE("Integer list (TOKEN_INTEGER_LIST) of size %d\n", buf->list_nb_elements); } else if (token == TOKEN_FLOAT_LIST) { - if (!read_bytes(buf, &nb_elem, 4)) + if (!read_bytes(buf, &buf->list_nb_elements, 4)) return TOKEN_ERROR; token = TOKEN_FLOAT; - is_float = TRUE; - TRACE("Float list (TOKEN_FLOAT_LIST) of size %d\n", nb_elem); + buf->list_type_float = TRUE; + TRACE("Float list (TOKEN_FLOAT_LIST) of size %d\n", buf->list_nb_elements); } } - if (nb_elem) + if (buf->list_nb_elements) { - token = is_float ? TOKEN_FLOAT : TOKEN_INTEGER; - nb_elem--; + token = buf->list_type_float ? TOKEN_FLOAT : TOKEN_INTEGER; + buf->list_nb_elements--; { DWORD integer;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2013