wine-commits March 2014

wine-commits@winehq.org

2 participants
530 discussions

Alistair Leslie-Hughes : netcfgx: Implement DllCanUnloadNow, DllGetClassObject, DllRegisterServer, DllUnregisterServer.
by Alexandre Julliard 20 Mar '14

20 Mar '14

Module: wine Branch: master Commit: d2733579ae1dada7b4e362f41ba92784baa26e56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2733579ae1dada7b4e362f41… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Mar 20 10:10:14 2014 +1100 netcfgx: Implement DllCanUnloadNow, DllGetClassObject, DllRegisterServer, DllUnregisterServer. --- dlls/netcfgx/main.c | 28 ++++++++++++++++++++++++++++ dlls/netcfgx/netcfgx.spec | 8 ++++---- 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/dlls/netcfgx/main.c b/dlls/netcfgx/main.c index 6cd1894..dd3394c 100644 --- a/dlls/netcfgx/main.c +++ b/dlls/netcfgx/main.c @@ -21,14 +21,20 @@ #include "windef.h" #include "winbase.h" +#include "ole2.h" +#include "rpcproxy.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(netcfgx); +static HINSTANCE NETCFGX_hInstance; + BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); + NETCFGX_hInstance = hinstDLL; + switch (fdwReason) { case DLL_WINE_PREATTACH: @@ -42,3 +48,25 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return TRUE; } + +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv) +{ + FIXME("(%s, %s, %p): stub\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + + return CLASS_E_CLASSNOTAVAILABLE; +} + +HRESULT WINAPI DllRegisterServer(void) +{ + return __wine_register_resources( NETCFGX_hInstance ); +} + +HRESULT WINAPI DllUnregisterServer(void) +{ + return __wine_unregister_resources( NETCFGX_hInstance ); +} + +HRESULT WINAPI DllCanUnloadNow(void) +{ + return S_FALSE; +} diff --git a/dlls/netcfgx/netcfgx.spec b/dlls/netcfgx/netcfgx.spec index 38ce927..cb48a6d 100644 --- a/dlls/netcfgx/netcfgx.spec +++ b/dlls/netcfgx/netcfgx.spec @@ -1,7 +1,7 @@ -@ stub DllCanUnloadNow -@ stub DllGetClassObject -@ stub DllRegisterServer -@ stub DllUnregisterServer +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() @ stub HrDiAddComponentToINetCfg @ stub LanaCfgFromCommandArgs @ stub ModemClassCoInstaller

1 0

Vincent Povirk : tapi32: Stub lineOpenW.
by Alexandre Julliard 20 Mar '14

20 Mar '14

Module: wine Branch: master Commit: b56102e998943c2f4f5e3bbb5f1381e9b3483435 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b56102e998943c2f4f5e3bbb5… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Mar 20 11:46:51 2014 -0500 tapi32: Stub lineOpenW. --- dlls/tapi32/line.c | 9 +++++++++ dlls/tapi32/tapi32.spec | 1 + 2 files changed, 10 insertions(+) diff --git a/dlls/tapi32/line.c b/dlls/tapi32/line.c index 2a13fad..c0e25ba 100644 --- a/dlls/tapi32/line.c +++ b/dlls/tapi32/line.c @@ -1268,6 +1268,15 @@ DWORD WINAPI lineNegotiateExtVersion(HLINEAPP hLineApp, DWORD dwDeviceID, DWORD } /*********************************************************************** + * lineOpenW (TAPI32.@) + */ +DWORD WINAPI lineOpenW(HLINEAPP hLineApp, DWORD dwDeviceID, LPHLINE lphLine, DWORD dwAPIVersion, DWORD dwExtVersion, DWORD dwCallbackInstance, DWORD dwPrivileges, DWORD dwMediaModes, LPLINECALLPARAMS lpCallParams) +{ + FIXME("stub.\n"); + return 0; +} + +/*********************************************************************** * lineOpen (TAPI32.@) */ DWORD WINAPI lineOpenA(HLINEAPP hLineApp, DWORD dwDeviceID, LPHLINE lphLine, DWORD dwAPIVersion, DWORD dwExtVersion, DWORD dwCallbackInstance, DWORD dwPrivileges, DWORD dwMediaModes, LPLINECALLPARAMS lpCallParams) diff --git a/dlls/tapi32/tapi32.spec b/dlls/tapi32/tapi32.spec index d4f2ae7..c2aa868 100644 --- a/dlls/tapi32/tapi32.spec +++ b/dlls/tapi32/tapi32.spec @@ -83,6 +83,7 @@ @ stdcall lineNegotiateExtVersion(long long long long long ptr) @ stdcall lineOpen(long long ptr long long long long long ptr) lineOpenA @ stdcall lineOpenA(long long ptr long long long long long ptr) +@ stdcall lineOpenW(long long ptr long long long long long ptr) @ stdcall linePark(long long str ptr) lineParkA @ stdcall lineParkA(long long str ptr) @ stdcall linePickup(long long ptr str str) linePickupA

1 0

Stefan Dösinger : wined3d: Remove the version parameter.
by Alexandre Julliard 20 Mar '14

20 Mar '14

Module: wine Branch: master Commit: 938529e1f91d4b3dce1f4526f2a68e4243926f28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=938529e1f91d4b3dce1f4526f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Mar 20 15:51:45 2014 +0100 wined3d: Remove the version parameter. --- dlls/d3d8/directx.c | 2 +- dlls/d3d9/directx.c | 2 +- dlls/ddraw/ddraw.c | 4 ++-- dlls/ddraw/main.c | 4 ++-- dlls/dxgi/factory.c | 2 +- dlls/wined3d/directx.c | 3 +-- dlls/wined3d/wined3d.spec | 2 +- dlls/wined3d/wined3d_main.c | 8 ++++---- dlls/wined3d/wined3d_private.h | 3 +-- include/wine/wined3d.h | 2 +- 10 files changed, 15 insertions(+), 17 deletions(-) diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index 4aac722..7270881 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -410,7 +410,7 @@ BOOL d3d8_init(struct d3d8 *d3d8) d3d8->refcount = 1; wined3d_mutex_lock(); - d3d8->wined3d = wined3d_create(8, flags); + d3d8->wined3d = wined3d_create(flags); wined3d_mutex_unlock(); if (!d3d8->wined3d) return FALSE; diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index 79e9eb5..6280d12 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -644,7 +644,7 @@ BOOL d3d9_init(struct d3d9 *d3d9, BOOL extended) d3d9->refcount = 1; wined3d_mutex_lock(); - d3d9->wined3d = wined3d_create(9, flags); + d3d9->wined3d = wined3d_create(flags); wined3d_mutex_unlock(); if (!d3d9->wined3d) return FALSE; diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index ed0606f..aa74a1e 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -4871,9 +4871,9 @@ HRESULT ddraw_init(struct ddraw *ddraw, enum wined3d_device_type device_type) ddraw->ref7 = 1; flags = WINED3D_LEGACY_DEPTH_BIAS | WINED3D_VIDMEM_ACCOUNTING; - if (!(ddraw->wined3d = wined3d_create(7, flags))) + if (!(ddraw->wined3d = wined3d_create(flags))) { - if (!(ddraw->wined3d = wined3d_create(7, flags | WINED3D_NO3D))) + if (!(ddraw->wined3d = wined3d_create(flags | WINED3D_NO3D))) { WARN("Failed to create a wined3d object.\n"); return E_FAIL; diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index 3bcd9b8..68bf3e3 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -408,9 +408,9 @@ HRESULT WINAPI DirectDrawEnumerateExA(LPDDENUMCALLBACKEXA callback, void *contex FIXME("flags 0x%08x not handled\n", flags & ~DDENUM_ATTACHEDSECONDARYDEVICES); TRACE("Enumerating ddraw interfaces\n"); - if (!(wined3d = wined3d_create(7, WINED3D_LEGACY_DEPTH_BIAS))) + if (!(wined3d = wined3d_create(WINED3D_LEGACY_DEPTH_BIAS))) { - if (!(wined3d = wined3d_create(7, WINED3D_LEGACY_DEPTH_BIAS | WINED3D_NO3D))) + if (!(wined3d = wined3d_create(WINED3D_LEGACY_DEPTH_BIAS | WINED3D_NO3D))) { WARN("Failed to create a wined3d object.\n"); return E_FAIL; diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index ac2450e..98d036e 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -329,7 +329,7 @@ static HRESULT dxgi_factory_init(struct dxgi_factory *factory, BOOL extended) factory->refcount = 1; EnterCriticalSection(&dxgi_cs); - factory->wined3d = wined3d_create(10, 0); + factory->wined3d = wined3d_create(0); if (!factory->wined3d) { LeaveCriticalSection(&dxgi_cs); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index eaf2427..ef81278 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -5204,9 +5204,8 @@ const struct wined3d_parent_ops wined3d_null_parent_ops = wined3d_null_wined3d_object_destroyed, }; -HRESULT wined3d_init(struct wined3d *wined3d, UINT version, DWORD flags) +HRESULT wined3d_init(struct wined3d *wined3d, DWORD flags) { - wined3d->dxVersion = version; wined3d->ref = 1; wined3d->flags = flags; diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 3a6dd33..3243f77 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -6,7 +6,7 @@ @ cdecl wined3d_check_device_format_conversion(ptr long long long long) @ cdecl wined3d_check_device_multisample_type(ptr long long long long long ptr) @ cdecl wined3d_check_device_type(ptr long long long long long) -@ cdecl wined3d_create(long long) +@ cdecl wined3d_create(long) @ cdecl wined3d_decref(ptr) @ cdecl wined3d_enum_adapter_modes(ptr long long long long ptr) @ cdecl wined3d_get_adapter_count(ptr) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index a0ecfa7..7ab2448 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -87,7 +87,7 @@ struct wined3d_settings wined3d_settings = FALSE, /* 3D support enabled by default. */ }; -struct wined3d * CDECL wined3d_create(UINT version, DWORD flags) +struct wined3d * CDECL wined3d_create(DWORD flags) { struct wined3d *object; HRESULT hr; @@ -99,10 +99,10 @@ struct wined3d * CDECL wined3d_create(UINT version, DWORD flags) return NULL; } - if (version == 7 && wined3d_settings.no_3d) + if (wined3d_settings.no_3d) flags |= WINED3D_NO3D; - hr = wined3d_init(object, version, flags); + hr = wined3d_init(object, flags); if (FAILED(hr)) { WARN("Failed to initialize wined3d object, hr %#x.\n", hr); @@ -110,7 +110,7 @@ struct wined3d * CDECL wined3d_create(UINT version, DWORD flags) return NULL; } - TRACE("Created wined3d object %p for d3d%d support.\n", object, version); + TRACE("Created wined3d object %p.\n", object); return object; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ff31ebc..0199ef8 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1785,12 +1785,11 @@ struct wined3d { LONG ref; DWORD flags; - UINT dxVersion; UINT adapter_count; struct wined3d_adapter adapters[1]; }; -HRESULT wined3d_init(struct wined3d *wined3d, UINT version, DWORD flags) DECLSPEC_HIDDEN; +HRESULT wined3d_init(struct wined3d *wined3d, DWORD flags) DECLSPEC_HIDDEN; BOOL wined3d_register_window(HWND window, struct wined3d_device *device) DECLSPEC_HIDDEN; void wined3d_unregister_window(HWND window) DECLSPEC_HIDDEN; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 7bb37d6..e6fa2d1 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2024,7 +2024,7 @@ HRESULT __cdecl wined3d_check_device_multisample_type(const struct wined3d *wine HRESULT __cdecl wined3d_check_device_type(const struct wined3d *wined3d, UINT adapter_idx, enum wined3d_device_type device_type, enum wined3d_format_id display_format_id, enum wined3d_format_id backbuffer_format_id, BOOL windowed); -struct wined3d * __cdecl wined3d_create(UINT version, DWORD flags); +struct wined3d * __cdecl wined3d_create(DWORD flags); ULONG __cdecl wined3d_decref(struct wined3d *wined3d); HRESULT __cdecl wined3d_enum_adapter_modes(const struct wined3d *wined3d, UINT adapter_idx, enum wined3d_format_id format_id, enum wined3d_scanline_ordering scanline_ordering,

1 0

Nikolay Sivov : user32: Added ChangeWindowMessageFilterEx() stub.
by Alexandre Julliard 20 Mar '14

20 Mar '14

Module: wine Branch: master Commit: d3c9e8a7e65c121c2f36641dd67711526c5896d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3c9e8a7e65c121c2f36641dd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 20 20:24:58 2014 +0400 user32: Added ChangeWindowMessageFilterEx() stub. --- dlls/user32/message.c | 9 +++++++++ dlls/user32/user32.spec | 1 + include/winuser.h | 23 +++++++++++++++++++++++ 3 files changed, 33 insertions(+) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 1aee670..e5dfa3e 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -4578,3 +4578,12 @@ BOOL WINAPI ChangeWindowMessageFilter( UINT message, DWORD flag ) FIXME( "%x %08x\n", message, flag ); return TRUE; } + +/****************************************************************** + * ChangeWindowMessageFilterEx (USER32.@) + */ +BOOL WINAPI ChangeWindowMessageFilterEx( HWND hwnd, UINT message, DWORD action, CHANGEFILTERSTRUCT *changefilter ) +{ + FIXME( "%p %x %d %p\n", hwnd, message, action, changefilter ); + return TRUE; +} diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 052f7ff..fe3906f 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -39,6 +39,7 @@ @ stdcall ChangeMenuA(long long ptr long long) @ stdcall ChangeMenuW(long long ptr long long) @ stdcall ChangeWindowMessageFilter(long long) +@ stdcall ChangeWindowMessageFilterEx(long long long ptr) @ stdcall CharLowerA(str) @ stdcall CharLowerBuffA(str long) @ stdcall CharLowerBuffW(wstr long) diff --git a/include/winuser.h b/include/winuser.h index e28bb13..0f3d0b1 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -3219,6 +3219,27 @@ typedef struct #define AnsiToOemBuffW CharToOemBuffW #define AnsiToOemBuff WINELIB_NAME_AW(AnsiToOemBuff) +/* ChangeWindowMessageFilter flags */ +#define MSGFLT_ADD 1 +#define MSGFLT_REMOVE 2 + +/* ChangeWindowMessageFilterEx defines */ +#define MSGFLTINFO_NONE 0 +#define MSGFLTINFO_ALREADYALLOWED_FORWND 1 +#define MSGFLTINFO_ALREADYDISALLOWED_FORWND 2 +#define MSGFLTINFO_ALLOWED_HIGHER 3 + +typedef struct tagCHANGEFILTERSTRUCT +{ + DWORD cbSize; + DWORD ExtStatus; +} CHANGEFILTERSTRUCT, *PCHANGEFILTERSTRUCT; + +/* Actions for ChangeWindowMessageFilterEx */ +#define MSGFLT_RESET 0 +#define MSGFLT_ALLOW 1 +#define MSGFLT_DISALLOW 2 + #if defined(_WINGDI_) && !defined(NOGDI) WINUSERAPI LONG WINAPI ChangeDisplaySettingsA(LPDEVMODEA,DWORD); WINUSERAPI LONG WINAPI ChangeDisplaySettingsW(LPDEVMODEW,DWORD); @@ -3293,6 +3314,8 @@ WINUSERAPI BOOL WINAPI ChangeClipboardChain(HWND,HWND); WINUSERAPI BOOL WINAPI ChangeMenuA(HMENU,UINT,LPCSTR,UINT,UINT); WINUSERAPI BOOL WINAPI ChangeMenuW(HMENU,UINT,LPCWSTR,UINT,UINT); #define ChangeMenu WINELIB_NAME_AW(ChangeMenu) +WINUSERAPI BOOL WINAPI ChangeWindowMessageFilter(UINT,DWORD); +WINUSERAPI BOOL WINAPI ChangeWindowMessageFilterEx(HWND,UINT,DWORD,CHANGEFILTERSTRUCT*); WINUSERAPI LPSTR WINAPI CharLowerA(LPSTR); WINUSERAPI LPWSTR WINAPI CharLowerW(LPWSTR); #define CharLower WINELIB_NAME_AW(CharLower)

1 0

Piotr Caban : msvcrt: Don't add 0x prefix while printing 0 with printf.
by Alexandre Julliard 20 Mar '14

20 Mar '14

Module: wine Branch: master Commit: 2693ce1a253e5fe2f684d5805b7b7c12e6294b71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2693ce1a253e5fe2f684d5805… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 20 16:20:26 2014 +0100 msvcrt: Don't add 0x prefix while printing 0 with printf. --- dlls/msvcrt/printf.h | 8 +++++--- dlls/msvcrt/tests/printf.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index 96e7845..a462f3a 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -265,9 +265,11 @@ static inline void FUNC_NAME(pf_integer_conv)(APICHAR *buf, int buf_len, } i = 0; - if(x==0 && flags->Precision) - buf[i++] = '0'; - else { + if(x == 0) { + flags->Alternate = 0; + if(flags->Precision) + buf[i++] = '0'; + } else { while(x != 0) { j = (ULONGLONG)x%base; x = (ULONGLONG)x/base; diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index 24bc401..829b2e0 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -329,18 +329,52 @@ static void test_sprintf( void ) format = "%#012x"; r = sprintf(buffer,format,1); ok(!strcmp(buffer,"0x0000000001"),"Hexadecimal zero-padded \"%s\"\n",buffer); + ok( r==12, "return count wrong\n"); + + r = sprintf(buffer,format,0); + ok(!strcmp(buffer,"000000000000"),"Hexadecimal zero-padded \"%s\"\n",buffer); + ok( r==12, "return count wrong\n"); format = "%#04.8x"; r = sprintf(buffer,format,1); ok(!strcmp(buffer,"0x00000001"), "Hexadecimal zero-padded precision \"%s\"\n",buffer); + ok( r==10, "return count wrong\n"); + + r = sprintf(buffer,format,0); + ok(!strcmp(buffer,"00000000"), "Hexadecimal zero-padded precision \"%s\"\n",buffer); + ok( r==8, "return count wrong\n"); format = "%#-08.2x"; r = sprintf(buffer,format,1); ok(!strcmp(buffer,"0x01 "), "Hexadecimal zero-padded not left-adjusted \"%s\"\n",buffer); + ok( r==8, "return count wrong\n"); + + r = sprintf(buffer,format,0); + ok(!strcmp(buffer,"00 "), "Hexadecimal zero-padded not left-adjusted \"%s\"\n",buffer); + ok( r==8, "return count wrong\n"); + + format = "%#.0x"; + r = sprintf(buffer,format,1); + ok(!strcmp(buffer,"0x1"), "Hexadecimal zero-padded zero-precision \"%s\"\n",buffer); + ok( r==3, "return count wrong\n"); + + r = sprintf(buffer,format,0); + ok(!strcmp(buffer,""), "Hexadecimal zero-padded zero-precision \"%s\"\n",buffer); + ok( r==0, "return count wrong\n"); format = "%#08o"; r = sprintf(buffer,format,1); ok(!strcmp(buffer,"00000001"), "Octal zero-padded \"%s\"\n",buffer); + ok( r==8, "return count wrong\n"); + + format = "%#o"; + r = sprintf(buffer,format,1); + ok(!strcmp(buffer,"01"), "Octal zero-padded \"%s\"\n",buffer); + ok( r==2, "return count wrong\n"); + + r = sprintf(buffer,format,0); + ok(!strcmp(buffer,"0"), "Octal zero-padded \"%s\"\n",buffer); + ok( r==1, "return count wrong\n"); if (sizeof(void *) == 8) {

1 0

Jacek Caban : oleaut32: Fixed vartest.c tests on Windows 8.1.
by Alexandre Julliard 20 Mar '14

20 Mar '14

Module: wine Branch: master Commit: b6db22da3bfbe4ab93c953406e76c4674af7051c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6db22da3bfbe4ab93c953406… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 20 12:28:12 2014 +0100 oleaut32: Fixed vartest.c tests on Windows 8.1. --- dlls/oleaut32/tests/vartest.c | 11 ++++------- dlls/oleaut32/variant.c | 3 ++- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 2f82d9b..d28b5c1 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -542,14 +542,11 @@ static void _test_bstr_var(unsigned line, const VARIANT *v, const char *str) static void test_VariantInit(void) { - VARIANTARG v1, v2; + VARIANT v; - /* Test that VariantInit() only sets the type */ - memset(&v1, -1, sizeof(v1)); - v2 = v1; - V_VT(&v2) = VT_EMPTY; - VariantInit(&v1); - ok(!memcmp(&v1, &v2, sizeof(v1)), "VariantInit() set extra fields\n"); + memset(&v, -1, sizeof(v)); + VariantInit(&v); + ok(V_VT(&v) == VT_EMPTY, "VariantInit() returned vt %d\n", V_VT(&v)); } /* All possible combinations of extra V_VT() flags */ diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 92cf01b..053903e 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -575,7 +575,8 @@ void WINAPI VariantInit(VARIANTARG* pVarg) { TRACE("(%p)\n", pVarg); - V_VT(pVarg) = VT_EMPTY; /* Native doesn't set any other fields */ + /* Win8.1 zeroes whole struct. Previous implementations don't set any other fields. */ + V_VT(pVarg) = VT_EMPTY; } HRESULT VARIANT_ClearInd(VARIANTARG *pVarg)

1 0

Nikolay Sivov : msi: Update MsiServerMessage registration version to match module version.
by Alexandre Julliard 20 Mar '14

20 Mar '14

Module: wine Branch: master Commit: 20e4705192dda4d7d127b20d9989052bb31611d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20e4705192dda4d7d127b20d9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 20 14:09:35 2014 +0400 msi: Update MsiServerMessage registration version to match module version. --- dlls/msi/msiserver.rgs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/msiserver.rgs b/dlls/msi/msiserver.rgs index c77ad2b..1313bd9 100644 --- a/dlls/msi/msiserver.rgs +++ b/dlls/msi/msiserver.rgs @@ -2,7 +2,7 @@ HKCR { NoRemove CLSID { - '{000C101D-0000-0000-C000-000000000046}' { DllVersion = s '3.1.4000' } + '{000C101D-0000-0000-C000-000000000046}' { DllVersion = s '4.5.6001' } '{000C1090-0000-0000-C000-000000000046}' { TypeLib = s '{000C1092-0000-0000-C000-000000000046}'

1 0

Nikolay Sivov : msi: MsiInstaller coclass is not included in a typelib.
by Alexandre Julliard 20 Mar '14

20 Mar '14

Module: wine Branch: master Commit: 117ae2576496df1b03b7d8283093d608e94b3d9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=117ae2576496df1b03b7d8283… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 20 14:09:14 2014 +0400 msi: MsiInstaller coclass is not included in a typelib. --- dlls/msi/msiserver.idl | 17 ++++++++--------- dlls/msi/msiserver.rgs | 7 ++++++- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/dlls/msi/msiserver.idl b/dlls/msi/msiserver.idl index f351ab1..5052602 100644 --- a/dlls/msi/msiserver.idl +++ b/dlls/msi/msiserver.idl @@ -153,6 +153,14 @@ coclass MsiServerMessage { interface IMsiMessage; } coclass PSFactoryBuffer { interface IPSFactoryBuffer; } [ + helpstring("Microsoft Windows Installer"), + threading(apartment), + progid("WindowsInstaller.Installer"), + uuid(000c1090-0000-0000-c000-000000000046) +] +coclass MsiInstaller { interface Installer; } + +[ uuid(000c1082-0000-0000-c000-000000000046) ] coclass MsiTransform { } @@ -184,7 +192,6 @@ coclass WineMsiRemoteCustomAction { interface WineMsiRemoteCustomAction; } ] coclass WineMsiRemotePackage { interface WineMsiRemotePackage; } - [ uuid(000C1092-0000-0000-C000-000000000046), version(1.0) ] library WindowsInstaller { @@ -551,12 +558,4 @@ library WindowsInstaller properties: methods: } - - [ - helpstring("Microsoft Windows Installer"), - threading(apartment), - progid("WindowsInstaller.Installer"), - uuid(000c1090-0000-0000-c000-000000000046) - ] - coclass MsiInstaller { interface Installer; } } diff --git a/dlls/msi/msiserver.rgs b/dlls/msi/msiserver.rgs index 9f408db..c77ad2b 100644 --- a/dlls/msi/msiserver.rgs +++ b/dlls/msi/msiserver.rgs @@ -3,6 +3,11 @@ HKCR NoRemove CLSID { '{000C101D-0000-0000-C000-000000000046}' { DllVersion = s '3.1.4000' } - '{000C1090-0000-0000-C000-000000000046}' { InProcHandler32 = s 'ole32.dll' } + '{000C1090-0000-0000-C000-000000000046}' + { + TypeLib = s '{000C1092-0000-0000-C000-000000000046}' + Version = s '1.0' + InProcHandler32 = s 'ole32.dll' + } } }

1 0

Alexandre Julliard : user32/tests: Make a few more messages optional.
by Alexandre Julliard 20 Mar '14

20 Mar '14

Module: wine Branch: master Commit: e445303ab45b218585357220c9c2d37d6418ba45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e445303ab45b218585357220c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 20 11:37:39 2014 +0100 user32/tests: Make a few more messages optional. --- dlls/user32/tests/msg.c | 90 +++++++++++++++++++++++++++++------------------ 1 file changed, 55 insertions(+), 35 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e445303ab45b218585357…

1 0

Dmitry Timoshkov : widl: Move is_void(), is_declptr() and is_conformant_array() to header.h and make them inline.
by Alexandre Julliard 20 Mar '14

20 Mar '14

Module: wine Branch: master Commit: e6d585a6b26c362369a9727896fc547f59e4dfeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6d585a6b26c362369a972789… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Mar 20 18:32:39 2014 +0900 widl: Move is_void(), is_declptr() and is_conformant_array() to header.h and make them inline. --- tools/widl/header.c | 10 ---------- tools/widl/header.h | 18 +++++++++++++++--- tools/widl/typegen.c | 5 ----- 3 files changed, 15 insertions(+), 18 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index 4ca6ed5..4f2222a 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -109,16 +109,6 @@ unsigned int get_attrv(const attr_list_t *list, enum attr_type t) return 0; } -int is_void(const type_t *t) -{ - return type_get_type(t) == TYPE_VOID; -} - -int is_conformant_array(const type_t *t) -{ - return is_array(t) && type_array_has_conformance(t); -} - static void write_guid(FILE *f, const char *guid_prefix, const char *name, const UUID *uuid) { if (!uuid) return; diff --git a/tools/widl/header.h b/tools/widl/header.h index 8ca1cf1..10601ff 100644 --- a/tools/widl/header.h +++ b/tools/widl/header.h @@ -28,9 +28,6 @@ extern int is_aliaschain_attr(const type_t *var, enum attr_type t); extern int is_attr(const attr_list_t *list, enum attr_type t); extern void *get_attrp(const attr_list_t *list, enum attr_type t); extern unsigned int get_attrv(const attr_list_t *list, enum attr_type t); -extern int is_void(const type_t *t); -extern int is_conformant_array(const type_t *t); -extern int is_declptr(const type_t *t); extern const char* get_name(const var_t *v); extern void write_type_left(FILE *h, type_t *t, int declonly); extern void write_type_right(FILE *h, type_t *t, int is_field); @@ -68,6 +65,21 @@ static inline int is_array(const type_t *t) return type_get_type(t) == TYPE_ARRAY; } +static inline int is_void(const type_t *t) +{ + return type_get_type(t) == TYPE_VOID; +} + +static inline int is_declptr(const type_t *t) +{ + return is_ptr(t) || (type_get_type(t) == TYPE_ARRAY && type_array_is_decl_as_ptr(t)); +} + +static inline int is_conformant_array(const type_t *t) +{ + return is_array(t) && type_array_has_conformance(t); +} + static inline int last_ptr(const type_t *type) { return is_ptr(type) && !is_declptr(type_pointer_get_ref(type)); diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index d017521..37d18f5 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -2774,11 +2774,6 @@ static void write_pointer_description(FILE *file, type_t *type, &offset_in_memory, &offset_in_buffer, typestring_offset); } -int is_declptr(const type_t *t) -{ - return is_ptr(t) || (type_get_type(t) == TYPE_ARRAY && type_array_is_decl_as_ptr(t)); -} - static unsigned int write_string_tfs(FILE *file, const attr_list_t *attrs, type_t *type, enum type_context context, const char *name, unsigned int *typestring_offset)

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
53
Older →

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