June 2013 - Wine-Commits - list.winehq.org

André Hentschel : difxapi: Add stubs for DriverPackageUninstall{A, W}.
by Alexandre Julliard June 3, 2013

June 3, 2013

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

Hans Leidekker : msi: Don' t defer custom actions in the UI sequence if they match the currently running script .
by Alexandre Julliard June 3, 2013

June 3, 2013

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

Henri Verbeet : wined3d: Allow textures as swapchain surfaces.
by Alexandre Julliard June 3, 2013

June 3, 2013

Module: wine Branch: master Commit: a3f59cf6188947d4190e5dbfe22215f9c20efa18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3f59cf6188947d4190e5dbfe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 3 09:19:35 2013 +0200 wined3d: Allow textures as swapchain surfaces. --- dlls/wined3d/arb_program_shader.c | 7 +- dlls/wined3d/context.c | 11 +- dlls/wined3d/device.c | 3 +- dlls/wined3d/surface.c | 209 +++++++++++++++++-------------------- dlls/wined3d/swapchain.c | 18 +-- dlls/wined3d/texture.c | 6 +- dlls/wined3d/wined3d_private.h | 25 +---- 7 files changed, 120 insertions(+), 159 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a3f59cf6188947d4190e5…

1 0

Alistair Leslie-Hughes : ole32/tests: Fix crash under NT.
by Alexandre Julliard June 3, 2013

June 3, 2013

Module: wine Branch: master Commit: 0f4c77d8779d5e14e8f97226abbeddebdd9804c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f4c77d8779d5e14e8f97226a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Jun 2 20:19:57 2013 +1000 ole32/tests: Fix crash under NT. --- dlls/ole32/tests/storage32.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index 9d99c38..3514fdd 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -3071,11 +3071,13 @@ if (hr == S_OK) { /* reader mode */ hr = StgOpenStorage(fileW, NULL, STGM_DIRECT_SWMR | STGM_READ | STGM_SHARE_DENY_NONE, NULL, 0, &stg); - ok(hr == S_OK, "got %08x\n", hr); - - hr = IStorage_QueryInterface(stg, &IID_IDirectWriterLock, (void**)&dwlock); - ok(hr == E_NOINTERFACE, "got %08x\n", hr); - IStorage_Release(stg); + ok(hr == S_OK || broken(hr == STG_E_INVALIDFLAG), "got %08x\n", hr); + if(hr == S_OK) + { + hr = IStorage_QueryInterface(stg, &IID_IDirectWriterLock, (void**)&dwlock); + ok(hr == E_NOINTERFACE, "got %08x\n", hr); + IStorage_Release(stg); + } /* writer mode */ hr = StgOpenStorage(fileW, NULL, STGM_DIRECT_SWMR | STGM_READWRITE | STGM_SHARE_DENY_WRITE, NULL, 0, &stg);

1 0

André Hentschel : difxapi: Add stubs for DIFXAPISetLogCallback{A, W}.
by Alexandre Julliard June 3, 2013

June 3, 2013

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

Christian Costa : d3dxof: Move list type and list nb elements into the parse context.
by Alexandre Julliard June 3, 2013

June 3, 2013

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

Christian Costa : d3dxof: Uncomment some traces and use better name for some variables.
by Alexandre Julliard June 3, 2013

June 3, 2013

Module: wine Branch: master Commit: f39547f5a875c7b9ccc11fb8d3c796c21d668143 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f39547f5a875c7b9ccc11fb8d… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu May 30 23:05:31 2013 +0200 d3dxof: Uncomment some traces and use better name for some variables. --- dlls/d3dxof/parsing.c | 25 +++++++++++-------------- 1 files changed, 11 insertions(+), 14 deletions(-) diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index 2faf7a2..3ad9fa7 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -647,7 +647,6 @@ static WORD parse_TOKEN(parse_buffer * buf) char c; if (!read_bytes(buf, &c, 1)) return TOKEN_NONE; - /*TRACE("char = '%c'\n", is_space(c) ? ' ' : c);*/ if ((c == '#') || (c == '/')) { /* Handle comment (# or //) */ @@ -766,16 +765,14 @@ static WORD parse_TOKEN(parse_buffer * buf) case TOKEN_NAME: { DWORD count; - char strname[100]; + char *name = (char*)buf->value; if (!read_bytes(buf, &count, 4)) return TOKEN_ERROR; - if (!read_bytes(buf, strname, count)) + if (!read_bytes(buf, name, count)) return TOKEN_ERROR; - strname[count] = 0; - /*TRACE("name = %s\n", strname);*/ - - strcpy((char*)buf->value, strname); + name[count] = 0; + TRACE("name = %s\n", name); } break; case TOKEN_INTEGER: @@ -784,7 +781,7 @@ static WORD parse_TOKEN(parse_buffer * buf) if (!read_bytes(buf, &integer, 4)) return TOKEN_ERROR; - /*TRACE("integer = %ld\n", integer);*/ + TRACE("integer = %u\n", integer); *(DWORD*)buf->value = integer; } @@ -799,7 +796,7 @@ static WORD parse_TOKEN(parse_buffer * buf) sprintf(strguid, CLSIDFMT, class_id.Data1, class_id.Data2, class_id.Data3, class_id.Data4[0], class_id.Data4[1], class_id.Data4[2], class_id.Data4[3], class_id.Data4[4], class_id.Data4[5], class_id.Data4[6], class_id.Data4[7]); - /*TRACE("guid = {%s}\n", strguid);*/ + TRACE("guid = %s\n", strguid); *(GUID*)buf->value = class_id; } @@ -808,19 +805,19 @@ static WORD parse_TOKEN(parse_buffer * buf) { DWORD count; WORD tmp_token; - char strname[100]; + char *string = (char*)buf->value; + if (!read_bytes(buf, &count, 4)) return TOKEN_ERROR; - if (!read_bytes(buf, strname, count)) + if (!read_bytes(buf, string, count)) return TOKEN_ERROR; - strname[count] = 0; + string[count] = 0; if (!read_bytes(buf, &tmp_token, 2)) return TOKEN_ERROR; if ((tmp_token != TOKEN_COMMA) && (tmp_token != TOKEN_SEMICOLON)) ERR("No comma or semicolon (got %d)\n", tmp_token); - /*TRACE("name = %s\n", strname);*/ + TRACE("string = %s\n", string); - strcpy((char*)buf->value, strname); token = TOKEN_LPSTR; } break;

1 0

Henri Verbeet : d3drm: Avoid LPDIRECT3DRMOBJECTARRAY.
by Alexandre Julliard June 3, 2013

June 3, 2013

Module: wine Branch: master Commit: edf46d91bcd5d14e0729b9661b64bc5f66f6f51e URL: http://source.winehq.org/git/wine.git/?a=commit;h=edf46d91bcd5d14e0729b9661… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 3 09:19:37 2013 +0200 d3drm: Avoid LPDIRECT3DRMOBJECTARRAY. --- include/d3drmobj.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/d3drmobj.h b/include/d3drmobj.h index 00bdb21..5576701 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -4564,7 +4564,7 @@ DECLARE_INTERFACE_(IDirect3DRMInterpolator, IDirect3DRMObject) STDMETHOD(GetClassName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; /*** IDirect3DRMInterpolator methods ***/ STDMETHOD(AttachObject)(THIS_ IDirect3DRMObject *object) PURE; - STDMETHOD(GetAttachedObjects)(THIS_ LPDIRECT3DRMOBJECTARRAY *) PURE; + STDMETHOD(GetAttachedObjects)(THIS_ IDirect3DRMObjectArray **array) PURE; STDMETHOD(DetachObject)(THIS_ IDirect3DRMObject *object) PURE; STDMETHOD(SetIndex)(THIS_ D3DVALUE) PURE; STDMETHOD_(D3DVALUE, GetIndex)(THIS) PURE;

1 0

Christian Costa : d3dxof: Turn a fixme into warn.
by Alexandre Julliard June 3, 2013

June 3, 2013

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

André Hentschel : difxapi: Add stubs for DriverPackagePreinstall{A, W}.
by Alexandre Julliard June 3, 2013

June 3, 2013

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