May 2012 - Wine-commits - list.winehq.org

Lucas Zawacki : dinput/tests: Added a test for DIPROP_JOYSTICKID.
by Alexandre Julliard 30 May '12

30 May '12

Module: wine Branch: master Commit: e3d243861c3bced6fd7e8e68696cc4b11be3f5db URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3d243861c3bced6fd7e8e686… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Tue May 29 13:42:28 2012 -0300 dinput/tests: Added a test for DIPROP_JOYSTICKID. --- dlls/dinput/tests/joystick.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/dinput/tests/joystick.c b/dlls/dinput/tests/joystick.c index c2f63c2..a49ee2e 100644 --- a/dlls/dinput/tests/joystick.c +++ b/dlls/dinput/tests/joystick.c @@ -180,6 +180,7 @@ static BOOL CALLBACK EnumJoysticks( ULONG ref; DIDEVICEINSTANCE inst; DIDEVICEINSTANCE_DX3 inst3; + DIPROPDWORD dipw; HWND hWnd = get_hwnd(); char oldstate[248], curstate[248]; @@ -205,6 +206,16 @@ static BOOL CALLBACK EnumJoysticks( trace("---- %s ----\n", lpddi->tszProductName); + /* Test for joystick ID property */ + ZeroMemory(&dipw, sizeof(dipw)); + dipw.diph.dwSize = sizeof(DIPROPDWORD); + dipw.diph.dwHeaderSize = sizeof(DIPROPHEADER); + dipw.diph.dwObj = 0; + dipw.diph.dwHow = DIPH_DEVICE; + + hr = IDirectInputDevice_GetProperty(pJoystick, DIPROP_JOYSTICKID, &dipw.diph); + ok(SUCCEEDED(hr), "IDirectInputDevice_GetProperty() for DIPROP_JOYSTICKID failed\n"); + hr = IDirectInputDevice_SetDataFormat(pJoystick, NULL); ok(hr==E_POINTER,"IDirectInputDevice_SetDataFormat() should have returned " "E_POINTER, returned: %08x\n", hr);

1 0

Alexandre Julliard : appwiz.cpl: Specify a default download URL for add-ons .
by Alexandre Julliard 30 May '12

30 May '12

Module: wine Branch: master Commit: d8b6b01bca3c5bb017518781dd595abb86aa5135 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8b6b01bca3c5bb017518781d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 30 13:22:46 2012 +0200 appwiz.cpl: Specify a default download URL for add-ons. --- dlls/appwiz.cpl/addons.c | 53 ++++++++++++++++++++++++++-------------------- dlls/mshtml/mshtml.inf | 6 +---- tools/wine.inf.in | 2 - 3 files changed, 31 insertions(+), 30 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index 4a5acba..fd48487 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -72,6 +72,7 @@ typedef struct { const char *file_name; const char *subdir_name; const char *sha; + const char *url_default; const char *config_key; const char *url_config_key; const char *dir_config_key; @@ -84,6 +85,7 @@ static const addon_info_t addons_info[] = { "wine_gecko-" GECKO_VERSION "-" ARCH_STRING ".msi", "gecko", GECKO_SHA, + "http://source.winehq.org/winegecko.php", "MSHTML", "GeckoUrl", "GeckoCabDir", MAKEINTRESOURCEW(ID_DWL_GECKO_DIALOG) }, @@ -92,6 +94,7 @@ static const addon_info_t addons_info[] = { "wine-mono-" MONO_VERSION ".msi", "mono", MONO_SHA, + "http://source.winehq.org/winemono.php", "Dotnet", "MonoUrl", "MonoCabDir", MAKEINTRESOURCEW(ID_DWL_MONO_DIALOG) } @@ -425,6 +428,22 @@ static const IBindStatusCallbackVtbl InstallCallbackVtbl = { static IBindStatusCallback InstallCallback = { &InstallCallbackVtbl }; +static void append_url_params( WCHAR *url ) +{ + static const WCHAR arch_formatW[] = {'?','a','r','c','h','='}; + static const WCHAR v_formatW[] = {'&','v','='}; + DWORD size = INTERNET_MAX_URL_LENGTH * sizeof(WCHAR); + DWORD len = strlenW(url); + + memcpy(url+len, arch_formatW, sizeof(arch_formatW)); + len += sizeof(arch_formatW)/sizeof(WCHAR); + len += MultiByteToWideChar(CP_ACP, 0, ARCH_STRING, sizeof(ARCH_STRING), + url+len, size/sizeof(WCHAR)-len)-1; + memcpy(url+len, v_formatW, sizeof(v_formatW)); + len += sizeof(v_formatW)/sizeof(WCHAR); + MultiByteToWideChar(CP_ACP, 0, addon->version, -1, url+len, size/sizeof(WCHAR)-len); +} + static LPWSTR get_url(void) { DWORD size = INTERNET_MAX_URL_LENGTH*sizeof(WCHAR); @@ -434,36 +453,24 @@ static LPWSTR get_url(void) DWORD returned_size; static const WCHAR httpW[] = {'h','t','t','p'}; - static const WCHAR arch_formatW[] = {'?','a','r','c','h','='}; - static const WCHAR v_formatW[] = {'&','v','='}; - - hkey = open_config_key(); - if(!hkey) - return NULL; url = heap_alloc(size); returned_size = size; - config_key = heap_strdupAtoW(addon->url_config_key); - res = RegQueryValueExW(hkey, config_key, NULL, &type, (LPBYTE)url, &returned_size); - heap_free(config_key); - RegCloseKey(hkey); - if(res != ERROR_SUCCESS || type != REG_SZ) { - heap_free(url); - return NULL; + hkey = open_config_key(); + if (hkey) + { + config_key = heap_strdupAtoW(addon->url_config_key); + res = RegQueryValueExW(hkey, config_key, NULL, &type, (LPBYTE)url, &returned_size); + heap_free(config_key); + RegCloseKey(hkey); + if(res == ERROR_SUCCESS && type == REG_SZ) goto found; } - if(returned_size > sizeof(httpW) && !memcmp(url, httpW, sizeof(httpW))) { - DWORD len; + MultiByteToWideChar( CP_ACP, 0, addon->url_default, -1, url, size / sizeof(WCHAR) ); - len = strlenW(url); - memcpy(url+len, arch_formatW, sizeof(arch_formatW)); - len += sizeof(arch_formatW)/sizeof(WCHAR); - len += MultiByteToWideChar(CP_ACP, 0, ARCH_STRING, sizeof(ARCH_STRING), url+len, size/sizeof(WCHAR)-len)-1; - memcpy(url+len, v_formatW, sizeof(v_formatW)); - len += sizeof(v_formatW)/sizeof(WCHAR); - MultiByteToWideChar(CP_ACP, 0, addon->version, -1, url+len, size/sizeof(WCHAR)-len); - } +found: + if (returned_size > sizeof(httpW) && !memcmp(url, httpW, sizeof(httpW))) append_url_params( url ); TRACE("Got URL %s\n", debugstr_w(url)); return url; diff --git a/dlls/mshtml/mshtml.inf b/dlls/mshtml/mshtml.inf index 8186c2d..4a650b4 100644 --- a/dlls/mshtml/mshtml.inf +++ b/dlls/mshtml/mshtml.inf @@ -3,7 +3,7 @@ Signature="$CHICAGO$" [RegisterDll] -AddReg=Classes.Reg, Protocols.Reg, IE.Reg, FileAssoc.Reg, WineGecko.Reg +AddReg=Classes.Reg, Protocols.Reg, IE.Reg, FileAssoc.Reg [UnregisterDll] @@ -69,10 +69,6 @@ HKLM,"Software\Microsoft\Internet Explorer\Default Behaviors","TIME",, "CLSID:47 HKLM,"Software\Microsoft\Internet Explorer\ActiveX Compatibility","Version",,"6.17" -[WineGecko.Reg] -HKCU,Software\Wine\MSHTML,"GeckoUrl",,"http://source.winehq.org/winegecko.php" - - [FileAssoc.Reg] ;; AVI diff --git a/tools/wine.inf.in b/tools/wine.inf.in index b182953..f95d9dc 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -712,8 +712,6 @@ HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{de5aed00-a4bf-11d1-99 HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{de5aed00-a4bf-11d1-9948-00c04f98bbc9},"Locale",2,"*" HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{de5aed00-a4bf-11d1-9948-00c04f98bbc9},"Version",2,"4,74,9273,0" -HKCU,SOFTWARE\Wine\Dotnet,"MonoUrl",,"http://source.winehq.org/winemono.php" - [Nls] HKLM,System\CurrentControlSet\Control\Nls\Codepage,"37",,"" HKLM,System\CurrentControlSet\Control\Nls\Language,"0401",,""

1 0

Oleksij Rempel : shell32: Return empty list instead of NULL.
by Alexandre Julliard 30 May '12

30 May '12

Module: wine Branch: master Commit: 83196d0cb3dedd00254d13e3be9a8be7f2f8eb1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=83196d0cb3dedd00254d13e3b… Author: Oleksij Rempel <bug-track(a)fisher-privat.net> Date: Tue May 29 23:10:07 2012 +0200 shell32: Return empty list instead of NULL. --- dlls/shell32/dde.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/dde.c b/dlls/shell32/dde.c index 2e04bd7..144470b 100644 --- a/dlls/shell32/dde.c +++ b/dlls/shell32/dde.c @@ -82,6 +82,14 @@ static inline HDDEDATA Dde_OnRequest(UINT uFmt, HCONV hconv, HSZ hszTopic, FIXME( "returning fake program groups list\n" ); return DdeCreateDataHandle( dwDDEInst, groups_data, sizeof(groups_data), 0, hszGroups, uFmt, 0 ); } + else if (hszTopic == hszProgmanTopic && hszItem == hszProgmanService && uFmt == CF_TEXT) + { + static BYTE groups_data[] = "\r\n"; + FIXME( "returning empty groups list\n" ); + /* this is an workaround for an app wich expect some data + * and cant handle NULL. */ + return DdeCreateDataHandle( dwDDEInst, groups_data, sizeof(groups_data), 0, hszProgmanService, uFmt, 0 ); + } FIXME( "%u %p %s %s: stub\n", uFmt, hconv, debugstr_hsz(hszTopic), debugstr_hsz(hszItem) ); return NULL; }

1 0

Oleksij Rempel : krnl386.exe: Fix drive spec in get_media_id call.
by Alexandre Julliard 30 May '12

30 May '12

Module: wine Branch: master Commit: fa3038c6bda292f156d98316d65f5b03433f7b22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa3038c6bda292f156d98316d… Author: Oleksij Rempel <bug-track(a)fisher-privat.net> Date: Tue May 29 23:10:08 2012 +0200 krnl386.exe: Fix drive spec in get_media_id call. --- dlls/krnl386.exe16/int21.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/krnl386.exe16/int21.c b/dlls/krnl386.exe16/int21.c index f25194b..3652054 100644 --- a/dlls/krnl386.exe16/int21.c +++ b/dlls/krnl386.exe16/int21.c @@ -2609,8 +2609,9 @@ static void INT21_Ioctl_Block( CONTEXT *context ) { WCHAR label[12],fsname[9]; DWORD serial; + TRACE( "GENERIC IOCTL - Get media id - %c:\n", + 'A' + drive ); - drivespec[0] += drive; GetVolumeInformationW(drivespec, label, 12, &serial, NULL, NULL, fsname, 9); *(WORD*)dataptr = 0; memcpy(dataptr+2,&serial,4);

1 0

Piotr Caban : msvcrt: Handle rethrown exception in cxx_frame_handler.
by Alexandre Julliard 30 May '12

30 May '12

Module: wine Branch: master Commit: 5e418f0ccfa307af3a6adbebfdedf01093f99ab8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e418f0ccfa307af3a6adbebf… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 25 19:42:51 2012 +0200 msvcrt: Handle rethrown exception in cxx_frame_handler. --- dlls/msvcrt/except_i386.c | 20 +++++++++++++++++++- 1 files changed, 19 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/except_i386.c b/dlls/msvcrt/except_i386.c index d8b03a4..7c3265c 100644 --- a/dlls/msvcrt/except_i386.c +++ b/dlls/msvcrt/except_i386.c @@ -373,7 +373,9 @@ static DWORD catch_function_nested_handler( EXCEPTION_RECORD *rec, EXCEPTION_REG if(rec->ExceptionCode == CXX_EXCEPTION) { PEXCEPTION_RECORD prev_rec = nested_frame->rec; - if(rec->ExceptionInformation[1] == 0 && rec->ExceptionInformation[2] == 0) + if((rec->ExceptionInformation[1] == 0 && rec->ExceptionInformation[2] == 0) || + (rec->ExceptionInformation[1] == prev_rec->ExceptionInformation[1] && + rec->ExceptionInformation[2] == prev_rec->ExceptionInformation[2])) { /* exception was rethrown */ rec->ExceptionInformation[1] = prev_rec->ExceptionInformation[1]; @@ -381,6 +383,13 @@ static DWORD catch_function_nested_handler( EXCEPTION_RECORD *rec, EXCEPTION_REG TRACE("detect rethrow: re-propagate: obj: %lx, type: %lx\n", rec->ExceptionInformation[1], rec->ExceptionInformation[2]); } + else if (nested_frame->prev_rec && + nested_frame->prev_rec->ExceptionInformation[1] == prev_rec->ExceptionInformation[1] && + nested_frame->prev_rec->ExceptionInformation[2] == prev_rec->ExceptionInformation[2]) + { + TRACE("detect threw new exception in catch block - not owning old(obj: %lx type: %lx)\n", + prev_rec->ExceptionInformation[1], prev_rec->ExceptionInformation[2]); + } else { /* new exception in exception handler, destroy old */ void *object = (void*)prev_rec->ExceptionInformation[1]; @@ -506,6 +515,15 @@ DWORD CDECL cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame if(rec->ExceptionCode == CXX_EXCEPTION) { + if (rec->ExceptionInformation[1] == 0 && rec->ExceptionInformation[2] == 0) + { + EXCEPTION_RECORD *exc_record = msvcrt_get_thread_data()->exc_record; + rec->ExceptionInformation[1] = exc_record->ExceptionInformation[1]; + rec->ExceptionInformation[2] = exc_record->ExceptionInformation[2]; + TRACE("detect rethrow: obj: %lx, type: %lx\n", + rec->ExceptionInformation[1], rec->ExceptionInformation[2]); + } + exc_type = (cxx_exception_type *)rec->ExceptionInformation[2]; if (rec->ExceptionInformation[0] > CXX_FRAME_MAGIC_VC8 &&

1 0

Christian Costa : d3drm: Implement IDirect3DRMFrameXImpl_GetLights and IDirect3DRMLightArray interface .
by Alexandre Julliard 30 May '12

30 May '12

Module: wine Branch: master Commit: 6e15d91927c6b855d9c9058d18cdee9804f64795 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e15d91927c6b855d9c9058d1… Author: Christian Costa <titan.costa(a)gmail.com> Date: Sun May 27 17:44:19 2012 +0200 d3drm: Implement IDirect3DRMFrameXImpl_GetLights and IDirect3DRMLightArray interface. --- dlls/d3drm/frame.c | 164 ++++++++++++++++++++++++++++++++++++++++++++- dlls/d3drm/tests/d3drm.c | 2 +- 2 files changed, 161 insertions(+), 5 deletions(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 574e2f8..f0e1cd0 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -71,8 +71,16 @@ typedef struct { LPDIRECT3DRMVISUAL* visuals; } IDirect3DRMVisualArrayImpl; +typedef struct { + IDirect3DRMLightArray IDirect3DRMLightArray_iface; + LONG ref; + ULONG size; + LPDIRECT3DRMLIGHT* lights; +} IDirect3DRMLightArrayImpl; + HRESULT Direct3DRMFrameArray_create(IDirect3DRMFrameArray** obj); HRESULT Direct3DRMVisualArray_create(IDirect3DRMVisualArray** ret_iface); +HRESULT Direct3DRMLightArray_create(IDirect3DRMLightArray** ret_iface); static inline IDirect3DRMFrameImpl *impl_from_IDirect3DRMFrame2(IDirect3DRMFrame2 *iface) { @@ -87,6 +95,11 @@ static inline IDirect3DRMFrameImpl *impl_from_IDirect3DRMFrame3(IDirect3DRMFrame static inline IDirect3DRMFrameImpl *unsafe_impl_from_IDirect3DRMFrame2(IDirect3DRMFrame2 *iface); static inline IDirect3DRMFrameImpl *unsafe_impl_from_IDirect3DRMFrame3(IDirect3DRMFrame3 *iface); +static inline IDirect3DRMLightArrayImpl *impl_from_IDirect3DRMLightArray(IDirect3DRMLightArray *iface) +{ + return CONTAINING_RECORD(iface, IDirect3DRMLightArrayImpl, IDirect3DRMLightArray_iface); +} + /*** IUnknown methods ***/ static HRESULT WINAPI IDirect3DRMFrame2Impl_QueryInterface(IDirect3DRMFrame2* iface, REFIID riid, void** object) @@ -348,9 +361,9 @@ static HRESULT WINAPI IDirect3DRMFrame2Impl_GetLights(IDirect3DRMFrame2* iface, { IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame2(iface); - FIXME("(%p/%p)->(%p): stub\n", iface, This, lights); + TRACE("(%p/%p)->(%p)\n", iface, This, lights); - return E_NOTIMPL; + return IDirect3DRMFrame3_GetLights(&This->IDirect3DRMFrame3_iface, lights); } static D3DRMMATERIALMODE WINAPI IDirect3DRMFrame2Impl_GetMaterialMode(IDirect3DRMFrame2* iface) @@ -1401,10 +1414,33 @@ static HRESULT WINAPI IDirect3DRMFrame3Impl_GetLights(IDirect3DRMFrame3* iface, LPDIRECT3DRMLIGHTARRAY *lights) { IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame3(iface); + IDirect3DRMLightArrayImpl* obj; + HRESULT hr; - FIXME("(%p/%p)->(%p): stub\n", iface, This, lights); + TRACE("(%p/%p)->(%p)\n", iface, This, lights); - return E_NOTIMPL; + if (!lights) + return D3DRMERR_BADVALUE; + + hr = Direct3DRMLightArray_create(lights); + + if (hr != D3DRM_OK) + return hr; + + obj = (IDirect3DRMLightArrayImpl*)*lights; + + obj->size = This->nb_lights; + if (This->nb_lights) + { + ULONG i; + obj->lights = HeapAlloc(GetProcessHeap(), 0, This->nb_lights * sizeof(LPDIRECT3DRMLIGHT)); + if (!obj->lights) + return E_OUTOFMEMORY; + for (i = 0; i < This->nb_lights; i++) + IDirect3DRMLight_QueryInterface(This->lights[i], &IID_IDirect3DRMLight, (void**)&obj->lights[i]); + } + + return D3DRM_OK; } static D3DRMMATERIALMODE WINAPI IDirect3DRMFrame3Impl_GetMaterialMode(IDirect3DRMFrame3* iface) @@ -2544,3 +2580,123 @@ HRESULT Direct3DRMVisualArray_create(IDirect3DRMVisualArray** ret_iface) return S_OK; } + +/*** IUnknown methods ***/ +static HRESULT WINAPI IDirect3DRMLightArrayImpl_QueryInterface(IDirect3DRMLightArray* iface, + REFIID riid, void** object) +{ + IDirect3DRMLightArrayImpl *This = impl_from_IDirect3DRMLightArray(iface); + + TRACE("(%p/%p)->(%s, %p)\n", iface, This, debugstr_guid(riid), object); + + *object = NULL; + + if (IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IDirect3DRMLightArray)) + { + *object = &This->IDirect3DRMLightArray_iface; + } + else + { + FIXME("interface %s not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; + } + + IDirect3DRMLightArray_AddRef(iface); + return S_OK; +} + +static ULONG WINAPI IDirect3DRMLightArrayImpl_AddRef(IDirect3DRMLightArray* iface) +{ + IDirect3DRMLightArrayImpl *This = impl_from_IDirect3DRMLightArray(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p)->(): new ref = %u\n", This, ref); + + return ref; +} + +static ULONG WINAPI IDirect3DRMLightArrayImpl_Release(IDirect3DRMLightArray* iface) +{ + IDirect3DRMLightArrayImpl *This = impl_from_IDirect3DRMLightArray(iface); + ULONG ref = InterlockedDecrement(&This->ref); + ULONG i; + + TRACE("(%p)->(): new ref = %u\n", This, ref); + + if (!ref) + { + for (i = 0; i < This->size; i++) + IDirect3DRMLight_Release(This->lights[i]); + HeapFree(GetProcessHeap(), 0, This->lights); + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +/*** IDirect3DRMArray methods ***/ +static DWORD WINAPI IDirect3DRMLightArrayImpl_GetSize(IDirect3DRMLightArray* iface) +{ + IDirect3DRMLightArrayImpl *This = impl_from_IDirect3DRMLightArray(iface); + + TRACE("(%p)->() = %d\n", This, This->size); + + return This->size; +} + +/*** IDirect3DRMLightArray methods ***/ +static HRESULT WINAPI IDirect3DRMLightArrayImpl_GetElement(IDirect3DRMLightArray* iface, DWORD index, LPDIRECT3DRMLIGHT* light) +{ + IDirect3DRMLightArrayImpl *This = impl_from_IDirect3DRMLightArray(iface); + + TRACE("(%p)->(%u, %p)\n", This, index, light); + + if (!light) + return D3DRMERR_BADVALUE; + + *light = NULL; + + if (index >= This->size) + return D3DRMERR_BADVALUE; + + IDirect3DRMLight_AddRef(This->lights[index]); + *light = This->lights[index]; + + return D3DRM_OK; +} + +static const struct IDirect3DRMLightArrayVtbl Direct3DRMLightArray_Vtbl = +{ + /*** IUnknown methods ***/ + IDirect3DRMLightArrayImpl_QueryInterface, + IDirect3DRMLightArrayImpl_AddRef, + IDirect3DRMLightArrayImpl_Release, + /*** IDirect3DRMArray methods ***/ + IDirect3DRMLightArrayImpl_GetSize, + /*** IDirect3DRMLightArray methods ***/ + IDirect3DRMLightArrayImpl_GetElement +}; + +HRESULT Direct3DRMLightArray_create(IDirect3DRMLightArray** obj) +{ + IDirect3DRMLightArrayImpl* object; + + TRACE("(%p)\n", obj); + + *obj = NULL; + + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DRMLightArrayImpl)); + if (!object) + { + ERR("Out of memory\n"); + return E_OUTOFMEMORY; + } + + object->IDirect3DRMLightArray_iface.lpVtbl = &Direct3DRMLightArray_Vtbl; + object->ref = 1; + + *obj = &object->IDirect3DRMLightArray_iface; + + return S_OK; +} diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index b6ed51a..c22804d 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -795,7 +795,7 @@ static void test_Frame(void) pLightArray = NULL; hr = IDirect3DRMFrame_GetLights(pFrameP1, &pLightArray); - todo_wine ok(hr == D3DRM_OK, "Cannot get lights (hr = %x)\n", hr); + ok(hr == D3DRM_OK, "Cannot get lights (hr = %x)\n", hr); if (pLightArray) { count = IDirect3DRMLightArray_GetSize(pLightArray);

1 0

Christian Costa : d3drm: Implement IDirect3DRMMesh_GetGroupTexture.
by Alexandre Julliard 30 May '12

30 May '12

Module: wine Branch: master Commit: b340501a93478d79e223c6933a8a1646d7ad8b37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b340501a93478d79e223c6933… Author: Christian Costa <titan.costa(a)gmail.com> Date: Sun May 27 17:44:42 2012 +0200 d3drm: Implement IDirect3DRMMesh_GetGroupTexture. --- dlls/d3drm/meshbuilder.c | 20 +++++++++++++++++--- dlls/d3drm/tests/d3drm.c | 6 +++--- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 97f85c9..2074702 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -43,6 +43,7 @@ typedef struct { unsigned vertex_per_face; DWORD face_data_size; unsigned* face_data; + IDirect3DRMTexture3* texture; } mesh_group; typedef struct { @@ -2451,6 +2452,8 @@ static HRESULT WINAPI IDirect3DRMMeshImpl_AddGroup(IDirect3DRMMesh* iface, memcpy(group->face_data, face_data, group->face_data_size * sizeof(unsigned)); + group->texture = NULL; + *return_id = This->nb_groups++; return D3DRM_OK; @@ -2630,13 +2633,24 @@ static HRESULT WINAPI IDirect3DRMMeshImpl_GetGroupMaterial(IDirect3DRMMesh* ifac } static HRESULT WINAPI IDirect3DRMMeshImpl_GetGroupTexture(IDirect3DRMMesh* iface, - D3DRMGROUPINDEX id, LPDIRECT3DRMTEXTURE *returnPtr) + D3DRMGROUPINDEX id, LPDIRECT3DRMTEXTURE *texture) { IDirect3DRMMeshImpl *This = impl_from_IDirect3DRMMesh(iface); - FIXME("(%p)->(%u,%p): stub\n", This, id, returnPtr); + TRACE("(%p)->(%u,%p)\n", This, id, texture); - return E_NOTIMPL; + if (id >= This->nb_groups) + return D3DRMERR_BADVALUE; + + if (!texture) + return E_POINTER; + + if (This->groups[id].texture) + IDirect3DRMTexture_QueryInterface(This->groups[id].texture, &IID_IDirect3DRMTexture, (void**)texture); + else + *texture = NULL; + + return D3DRM_OK; } static const struct IDirect3DRMMeshVtbl Direct3DRMMesh_Vtbl = diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index c22804d..f9940c1 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -354,7 +354,7 @@ static void test_MeshBuilder(void) unsigned nb_vertices, nb_faces, nb_face_vertices; DWORD data_size; LPDIRECT3DRMMATERIAL material; - LPDIRECT3DRMTEXTURE texture; + LPDIRECT3DRMTEXTURE texture = (LPDIRECT3DRMTEXTURE)0xdeadbeef; D3DVALUE values[3]; nb_groups = IDirect3DRMMesh_GetGroupCount(mesh); @@ -368,8 +368,8 @@ static void test_MeshBuilder(void) todo_wine ok(nb_face_vertices == 3, "Wrong number of vertices per face %u (must be 3)\n", nb_face_vertices); todo_wine ok(data_size == 3, "Wrong number of face data bytes %u (must be 3)\n", data_size); hr = IDirect3DRMMesh_GetGroupTexture(mesh, 0, &texture); - todo_wine ok(hr == D3DRM_OK, "GetCroupTexture failed returning hr = %x\n", hr); - todo_wine ok(texture == NULL, "No texture should be present\n"); + ok(hr == D3DRM_OK, "GetCroupTexture failed returning hr = %x\n", hr); + ok(texture == NULL, "No texture should be present\n"); hr = IDirect3DRMMesh_GetGroupMaterial(mesh, 0, &material); todo_wine ok(hr == D3DRM_OK, "GetCroupMaterial failed returning hr = %x\n", hr); todo_wine ok(material != NULL, "No material should be present\n");

1 0

Christian Costa : d3drm: Implement IDirect3DRMMeshImpl_GetGroupMaterial.
by Alexandre Julliard 30 May '12

30 May '12

Module: wine Branch: master Commit: 3fbe4914bded91d0fb9a22e542a1a8ab4ab69b9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fbe4914bded91d0fb9a22e54… Author: Christian Costa <titan.costa(a)gmail.com> Date: Sun May 27 17:44:51 2012 +0200 d3drm: Implement IDirect3DRMMeshImpl_GetGroupMaterial. --- dlls/d3drm/meshbuilder.c | 19 ++++++++++++++++--- dlls/d3drm/tests/d3drm.c | 6 +++--- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 2074702..4401a56 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -43,6 +43,7 @@ typedef struct { unsigned vertex_per_face; DWORD face_data_size; unsigned* face_data; + IDirect3DRMMaterial2* material; IDirect3DRMTexture3* texture; } mesh_group; @@ -2452,6 +2453,7 @@ static HRESULT WINAPI IDirect3DRMMeshImpl_AddGroup(IDirect3DRMMesh* iface, memcpy(group->face_data, face_data, group->face_data_size * sizeof(unsigned)); + group->material = NULL; group->texture = NULL; *return_id = This->nb_groups++; @@ -2623,13 +2625,24 @@ static D3DRMRENDERQUALITY WINAPI IDirect3DRMMeshImpl_GetGroupQuality(IDirect3DRM } static HRESULT WINAPI IDirect3DRMMeshImpl_GetGroupMaterial(IDirect3DRMMesh* iface, - D3DRMGROUPINDEX id, LPDIRECT3DRMMATERIAL *returnPtr) + D3DRMGROUPINDEX id, LPDIRECT3DRMMATERIAL *material) { IDirect3DRMMeshImpl *This = impl_from_IDirect3DRMMesh(iface); - FIXME("(%p)->(%u,%p): stub\n", This, id, returnPtr); + TRACE("(%p)->(%u,%p)\n", This, id, material); - return E_NOTIMPL; + if (id >= This->nb_groups) + return D3DRMERR_BADVALUE; + + if (!material) + return E_POINTER; + + if (This->groups[id].material) + IDirect3DRMTexture_QueryInterface(This->groups[id].material, &IID_IDirect3DRMMaterial, (void**)material); + else + *material = NULL; + + return D3DRM_OK; } static HRESULT WINAPI IDirect3DRMMeshImpl_GetGroupTexture(IDirect3DRMMesh* iface, diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index f9940c1..fdf4e90 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -353,7 +353,7 @@ static void test_MeshBuilder(void) DWORD nb_groups; unsigned nb_vertices, nb_faces, nb_face_vertices; DWORD data_size; - LPDIRECT3DRMMATERIAL material; + LPDIRECT3DRMMATERIAL material = (LPDIRECT3DRMMATERIAL)0xdeadbeef; LPDIRECT3DRMTEXTURE texture = (LPDIRECT3DRMTEXTURE)0xdeadbeef; D3DVALUE values[3]; @@ -371,8 +371,8 @@ static void test_MeshBuilder(void) ok(hr == D3DRM_OK, "GetCroupTexture failed returning hr = %x\n", hr); ok(texture == NULL, "No texture should be present\n"); hr = IDirect3DRMMesh_GetGroupMaterial(mesh, 0, &material); - todo_wine ok(hr == D3DRM_OK, "GetCroupMaterial failed returning hr = %x\n", hr); - todo_wine ok(material != NULL, "No material should be present\n"); + ok(hr == D3DRM_OK, "GetCroupMaterial failed returning hr = %x\n", hr); + todo_wine ok(material != NULL, "No material present\n"); if ((hr == D3DRM_OK) && material) { hr = IDirect3DRMMaterial_GetEmissive(material, &values[0], &values[1], &values[2]);

1 0

Christian Costa : d3drm: Generate normals automatically when there are not present in the x file.
by Alexandre Julliard 30 May '12

30 May '12

Module: wine Branch: master Commit: 8d9d97be0fc6beec7f7e8451e2f191d5ec4f5a80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d9d97be0fc6beec7f7e8451e… Author: Christian Costa <titan.costa(a)gmail.com> Date: Sun May 27 17:44:59 2012 +0200 d3drm: Generate normals automatically when there are not present in the x file. --- dlls/d3drm/meshbuilder.c | 55 +++++++++++++++++++++++++++++++++++++++++---- dlls/d3drm/tests/d3drm.c | 2 +- 2 files changed, 51 insertions(+), 6 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 4401a56..22aec7e 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -1118,6 +1118,8 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3* iface, LPDIRECTXFILEDATA pData) TRACE("Mesh name is '%s'\n", This->name ? This->name : ""); + This->nb_normals = 0; + hr = IDirectXFileData_GetData(pData, NULL, &size, (void**)&ptr); if (hr != DXFILE_OK) goto end; @@ -1211,10 +1213,19 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3* iface, LPDIRECTXFILEDATA pData) pData2 = NULL; } + if (!This->nb_normals) + { + /* Allocate normals, one per vertex */ + This->pNormals = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, This->nb_vertices * sizeof(D3DVECTOR)); + if (!This->pNormals) + goto end; + } + for (i = 0; i < This->nb_faces; i++) { DWORD j; DWORD nb_face_indexes; + D3DVECTOR face_normal; if (faces_vertex_idx_size < sizeof(DWORD)) WARN("Not enough data to read number of indices of face %d\n", i); @@ -1227,22 +1238,46 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3* iface, LPDIRECTXFILEDATA pData) if (faces_vertex_idx_size < (nb_face_indexes * sizeof(DWORD))) WARN("Not enough data to read all indices of face %d\n", i); + if (!This->nb_normals) + { + /* Compute face normal */ + if (nb_face_indexes > 2) + { + D3DVECTOR a, b; + + D3DRMVectorSubtract(&a, &This->pVertices[faces_vertex_idx_ptr[2]], &This->pVertices[faces_vertex_idx_ptr[1]]); + D3DRMVectorSubtract(&a, &This->pVertices[faces_vertex_idx_ptr[1]], &This->pVertices[faces_vertex_idx_ptr[0]]); + D3DRMVectorCrossProduct(&face_normal, &a, &b); + D3DRMVectorNormalize(&face_normal); + } + else + { + face_normal.u1.x = 0.0f; + face_normal.u2.y = 0.0f; + face_normal.u3.z = 0.0f; + } + } + for (j = 0; j < nb_face_indexes; j++) { /* Copy vertex index */ - *(faces_data_ptr + faces_data_size++) = *(faces_vertex_idx_ptr++); + *(faces_data_ptr + faces_data_size++) = *faces_vertex_idx_ptr; /* Copy normal index */ - if (faces_normal_idx_data) + if (This->nb_normals) { /* Read from x file */ *(faces_data_ptr + faces_data_size++) = *(faces_normal_idx_ptr++); } else { - FIXME("No normal available, generate a fake normal index\n"); - /* Must be generated, put 0 for now */ - *(faces_data_ptr + faces_data_size++) = 0; + DWORD vertex_idx = *faces_vertex_idx_ptr; + if (vertex_idx > This->nb_vertices) + vertex_idx = 0; + *(faces_data_ptr + faces_data_size++) = vertex_idx; + /* Add face normal to vertex normal */ + D3DRMVectorAdd(&This->pNormals[vertex_idx], &This->pNormals[vertex_idx], &face_normal); } + faces_vertex_idx_ptr++; } faces_vertex_idx_size -= nb_face_indexes; } @@ -1253,6 +1288,16 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3* iface, LPDIRECTXFILEDATA pData) /* Set size (in number of DWORD) of all faces data */ This->face_data_size = faces_data_size; + if (!This->nb_normals) + { + /* Normalize all normals */ + for (i = 0; i < This->nb_vertices; i++) + { + D3DRMVectorNormalize(&This->pNormals[i]); + } + This->nb_normals = This->nb_vertices; + } + /* If there is no texture coordinates, generate default texture coordinates (0.0f, 0.0f) for each vertex */ if (!This->pCoords2d) { diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index fdf4e90..8d35802 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -240,7 +240,7 @@ static void test_MeshBuilder(void) hr = IDirect3DRMMeshBuilder_GetVertices(pMeshBuilder, &val1, NULL, &val2, NULL, &val3, NULL); ok(hr == D3DRM_OK, "Cannot get vertices information (hr = %x)\n", hr); ok(val1 == 4, "Wrong number of vertices %d (must be 4)\n", val1); - todo_wine ok(val2 == 4, "Wrong number of normals %d (must be 4)\n", val2); + ok(val2 == 4, "Wrong number of normals %d (must be 4)\n", val2); ok(val3 == 22, "Wrong number of face data bytes %d (must be 22)\n", val3); /* Check that Load method generated default texture coordinates (0.0f, 0.0f) for each vertex */

1 0

Jacek Caban : wininet: Use CRLF separator in INTERNET_CERTIFICATE_INFO.
by Alexandre Julliard 30 May '12

30 May '12

Module: wine Branch: master Commit: 37e483d567327fb65c71970fe2992ddd12b7f937 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37e483d567327fb65c71970fe… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 30 12:13:53 2012 +0200 wininet: Use CRLF separator in INTERNET_CERTIFICATE_INFO. --- dlls/wininet/http.c | 8 ++++---- dlls/wininet/tests/http.c | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 74c9006..54ac0d5 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2130,18 +2130,18 @@ static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffe info->ftExpiry = context->pCertInfo->NotAfter; info->ftStart = context->pCertInfo->NotBefore; len = CertNameToStrA(context->dwCertEncodingType, - &context->pCertInfo->Subject, CERT_SIMPLE_NAME_STR, NULL, 0); + &context->pCertInfo->Subject, CERT_SIMPLE_NAME_STR|CERT_NAME_STR_CRLF_FLAG, NULL, 0); info->lpszSubjectInfo = LocalAlloc(0, len); if(info->lpszSubjectInfo) CertNameToStrA(context->dwCertEncodingType, - &context->pCertInfo->Subject, CERT_SIMPLE_NAME_STR, + &context->pCertInfo->Subject, CERT_SIMPLE_NAME_STR|CERT_NAME_STR_CRLF_FLAG, info->lpszSubjectInfo, len); len = CertNameToStrA(context->dwCertEncodingType, - &context->pCertInfo->Issuer, CERT_SIMPLE_NAME_STR, NULL, 0); + &context->pCertInfo->Issuer, CERT_SIMPLE_NAME_STR|CERT_NAME_STR_CRLF_FLAG, NULL, 0); info->lpszIssuerInfo = LocalAlloc(0, len); if(info->lpszIssuerInfo) CertNameToStrA(context->dwCertEncodingType, - &context->pCertInfo->Issuer, CERT_SIMPLE_NAME_STR, + &context->pCertInfo->Issuer, CERT_SIMPLE_NAME_STR|CERT_NAME_STR_CRLF_FLAG, info->lpszIssuerInfo, len); info->dwKeySize = NETCON_GetCipherStrength(req->netconn); CertFreeCertificateContext(context); diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 2e7b693..204c5b7 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2878,6 +2878,45 @@ static void release_cert_info(INTERNET_CERTIFICATE_INFOA *info) LocalFree(info->lpszEncryptionAlgName); } +static void test_cert_struct(HINTERNET req) +{ + INTERNET_CERTIFICATE_INFOA info; + DWORD size; + BOOL res; + + static const char ex_subject[] = + "US\r\n" + "Minnesota\r\n" + "Saint Paul\r\n" + "WineHQ\r\n" + "test.winehq.org\r\n" + "webmaster(a)winehq.org"; + + static const char ex_issuer[] = + "US\r\n" + "Minnesota\r\n" + "WineHQ\r\n" + "test.winehq.org\r\n" + "webmaster(a)winehq.org"; + + memset(&info, 0x5, sizeof(&info)); + + size = sizeof(info); + res = InternetQueryOption(req, INTERNET_OPTION_SECURITY_CERTIFICATE_STRUCT, &info, &size); + ok(res, "InternetQueryOption failed: %u\n", GetLastError()); + ok(size == sizeof(info), "size = %u\n", size); + + ok(!strcmp(info.lpszSubjectInfo, ex_subject), "lpszSubjectInfo = %s\n", info.lpszSubjectInfo); + ok(!strcmp(info.lpszIssuerInfo, ex_issuer), "lpszIssuerInfo = %s\n", info.lpszIssuerInfo); + ok(!info.lpszSignatureAlgName, "lpszSignatureAlgName = %s\n", info.lpszSignatureAlgName); + ok(!info.lpszEncryptionAlgName, "lpszEncryptionAlgName = %s\n", info.lpszEncryptionAlgName); + ok(!info.lpszProtocolName, "lpszProtocolName = %s\n", info.lpszProtocolName); + todo_wine + ok(info.dwKeySize == 128, "dwKeySize = %u\n", info.dwKeySize); + + release_cert_info(&info); +} + #define test_secflags_option(a,b) _test_secflags_option(__LINE__,a,b) static void _test_secflags_option(unsigned line, HINTERNET req, DWORD ex_flags) { @@ -3058,6 +3097,8 @@ static void test_security_flags(void) test_secflags_option(req, SECURITY_FLAG_SECURE|SECURITY_FLAG_IGNORE_UNKNOWN_CA |SECURITY_FLAG_STRENGTH_STRONG|0x800000); + test_cert_struct(req); + res = InternetReadFile(req, buf, sizeof(buf), &size); ok(res, "InternetReadFile failed: %u\n", GetLastError()); ok(size, "size = 0\n");

1 0