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

Henri Verbeet : d3drm: Avoid LPDIRECT3DRMUSERVISUAL.
by Alexandre Julliard 03 Jun '13

03 Jun '13

Module: wine Branch: master Commit: 97bc1eb389b99114b7071b7b8d3f932b4d50245a URL: http://source.winehq.org/git/wine.git/?a=commit;h=97bc1eb389b99114b7071b7b8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 3 09:19:36 2013 +0200 d3drm: Avoid LPDIRECT3DRMUSERVISUAL. --- dlls/d3drm/d3drm.c | 25 +++++++++---------------- include/d3drm.h | 6 +++--- 2 files changed, 12 insertions(+), 19 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index df3b9cc..b39db28 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -305,11 +305,10 @@ static HRESULT WINAPI IDirect3DRMImpl_CreateWrap(IDirect3DRM *iface, D3DRMWRAPTY return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMImpl_CreateUserVisual(IDirect3DRM* iface, D3DRMUSERVISUALCALLBACK cb, LPVOID pArg, LPDIRECT3DRMUSERVISUAL * ppUserVisual) +static HRESULT WINAPI IDirect3DRMImpl_CreateUserVisual(IDirect3DRM *iface, + D3DRMUSERVISUALCALLBACK cb, void *ctx, IDirect3DRMUserVisual **visual) { - IDirect3DRMImpl *This = impl_from_IDirect3DRM(iface); - - FIXME("(%p/%p)->(%p,%p,%p): stub\n", iface, This, cb, pArg, ppUserVisual); + FIXME("iface %p, cb %p, ctx %p visual %p stub!\n", iface, cb, ctx, visual); return E_NOTIMPL; } @@ -677,13 +676,10 @@ static HRESULT WINAPI IDirect3DRM2Impl_CreateWrap(IDirect3DRM2 *iface, D3DRMWRAP return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRM2Impl_CreateUserVisual(IDirect3DRM2* iface, - D3DRMUSERVISUALCALLBACK cb, LPVOID pArg, - LPDIRECT3DRMUSERVISUAL * ppUserVisual) +static HRESULT WINAPI IDirect3DRM2Impl_CreateUserVisual(IDirect3DRM2 *iface, + D3DRMUSERVISUALCALLBACK cb, void *ctx, IDirect3DRMUserVisual **visual) { - IDirect3DRMImpl *This = impl_from_IDirect3DRM2(iface); - - FIXME("(%p/%p)->(%p,%p,%p): stub\n", iface, This, cb, pArg, ppUserVisual); + FIXME("iface %p, cb %p, ctx %p, visual %p stub!\n", iface, cb, ctx, visual); return E_NOTIMPL; } @@ -1074,13 +1070,10 @@ static HRESULT WINAPI IDirect3DRM3Impl_CreateWrap(IDirect3DRM3 *iface, D3DRMWRAP return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRM3Impl_CreateUserVisual(IDirect3DRM3* iface, - D3DRMUSERVISUALCALLBACK cb, LPVOID arg, - LPDIRECT3DRMUSERVISUAL* UserVisual) +static HRESULT WINAPI IDirect3DRM3Impl_CreateUserVisual(IDirect3DRM3 *iface, + D3DRMUSERVISUALCALLBACK cb, void *ctx, IDirect3DRMUserVisual **visual) { - IDirect3DRMImpl *This = impl_from_IDirect3DRM3(iface); - - FIXME("(%p/%p)->(%p,%p,%p): stub\n", iface, This, cb, arg, UserVisual); + FIXME("iface %p, cb %p, ctx %p, visual %p stub!\n", iface, cb, ctx, visual); return E_NOTIMPL; } diff --git a/include/d3drm.h b/include/d3drm.h index 4a6ae4c..2a23e51 100644 --- a/include/d3drm.h +++ b/include/d3drm.h @@ -86,7 +86,7 @@ DECLARE_INTERFACE_(IDirect3DRM,IUnknown) STDMETHOD(CreateWrap)(THIS_ D3DRMWRAPTYPE type, IDirect3DRMFrame *reference, D3DVALUE ox, D3DVALUE oy, D3DVALUE oz, D3DVALUE dx, D3DVALUE dy, D3DVALUE dz, D3DVALUE ux, D3DVALUE uy, D3DVALUE uz, D3DVALUE ou, D3DVALUE ov, D3DVALUE su, D3DVALUE sv, IDirect3DRMWrap **wrap) PURE; - STDMETHOD(CreateUserVisual)(THIS_ D3DRMUSERVISUALCALLBACK, LPVOID pArg, LPDIRECT3DRMUSERVISUAL *) PURE; + STDMETHOD(CreateUserVisual)(THIS_ D3DRMUSERVISUALCALLBACK cb, void *ctx, IDirect3DRMUserVisual **visual) PURE; STDMETHOD(LoadTexture)(THIS_ const char *filename, IDirect3DRMTexture **texture) PURE; STDMETHOD(LoadTextureFromResource)(THIS_ HRSRC resource, IDirect3DRMTexture **texture) PURE; STDMETHOD(SetSearchPath)(THIS_ LPCSTR) PURE; @@ -225,7 +225,7 @@ DECLARE_INTERFACE_(IDirect3DRM2,IUnknown) STDMETHOD(CreateWrap)(THIS_ D3DRMWRAPTYPE type, IDirect3DRMFrame *reference, D3DVALUE ox, D3DVALUE oy, D3DVALUE oz, D3DVALUE dx, D3DVALUE dy, D3DVALUE dz, D3DVALUE ux, D3DVALUE uy, D3DVALUE uz, D3DVALUE ou, D3DVALUE ov, D3DVALUE su, D3DVALUE sv, IDirect3DRMWrap **wrap) PURE; - STDMETHOD(CreateUserVisual)(THIS_ D3DRMUSERVISUALCALLBACK, LPVOID pArg, LPDIRECT3DRMUSERVISUAL *) PURE; + STDMETHOD(CreateUserVisual)(THIS_ D3DRMUSERVISUALCALLBACK cb, void *ctx, IDirect3DRMUserVisual **visual) PURE; STDMETHOD(LoadTexture)(THIS_ const char *filename, IDirect3DRMTexture2 **texture) PURE; STDMETHOD(LoadTextureFromResource)(THIS_ HMODULE module, const char *resource_name, const char *resource_type, IDirect3DRMTexture2 **texture) PURE; @@ -368,7 +368,7 @@ DECLARE_INTERFACE_(IDirect3DRM3,IUnknown) D3DVALUE ox, D3DVALUE oy, D3DVALUE oz, D3DVALUE dx, D3DVALUE dy, D3DVALUE dz, D3DVALUE ux, D3DVALUE uy, D3DVALUE uz, D3DVALUE ou, D3DVALUE ov, D3DVALUE su, D3DVALUE sv, IDirect3DRMWrap **wrap) PURE; - STDMETHOD(CreateUserVisual)(THIS_ D3DRMUSERVISUALCALLBACK, LPVOID pArg, LPDIRECT3DRMUSERVISUAL *) PURE; + STDMETHOD(CreateUserVisual)(THIS_ D3DRMUSERVISUALCALLBACK cb, void *ctx, IDirect3DRMUserVisual **visual) PURE; STDMETHOD(LoadTexture)(THIS_ const char *filename, IDirect3DRMTexture3 **texture) PURE; STDMETHOD(LoadTextureFromResource)(THIS_ HMODULE module, const char *resource_name, const char *resource_type, IDirect3DRMTexture3 **texture) PURE;

1 0

Henri Verbeet : d3drm: Avoid LPDIRECT3DRMOBJECTARRAY.
by Alexandre Julliard 03 Jun '13

03 Jun '13

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: Uncomment some traces and use better name for some variables.
by Alexandre Julliard 03 Jun '13

03 Jun '13

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

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

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: 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

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

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 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 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