April 2010 - Wine-commits - list.winehq.org

Hans Leidekker : msi: Implement the UnregisterMIMEInfo standard action.
by Alexandre Julliard 02 Apr '10

02 Apr '10

Module: wine Branch: master Commit: 3050cde95eabb59e02be5d63311d6bd45789c2fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=3050cde95eabb59e02be5d633… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 2 09:40:07 2010 +0100 msi: Implement the UnregisterMIMEInfo standard action. --- dlls/msi/action.c | 8 ---- dlls/msi/classes.c | 94 +++++++++++++++++++++++++++++++++++++-------------- dlls/msi/msipriv.h | 3 ++ 3 files changed, 71 insertions(+), 34 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 25cd4fc..3322371 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -158,8 +158,6 @@ static const WCHAR szUnpublishFeatures[] = {'U','n','p','u','b','l','i','s','h','F','e','a','t','u','r','e','s',0}; static const WCHAR szUnregisterComPlus[] = {'U','n','r','e','g','i','s','t','e','r','C','o','m','P','l','u','s',0}; -static const WCHAR szUnregisterMIMEInfo[] = - {'U','n','r','e','g','i','s','t','e','r','M','I','M','E','I','n','f','o',0}; static const WCHAR szUnregisterTypeLibraries[] = {'U','n','r','e','g','i','s','t','e','r','T','y','p','e','L','i','b','r','a','r','i','e','s',0}; static const WCHAR szValidateProductID[] = @@ -6947,12 +6945,6 @@ static UINT ACTION_RemoveExistingProducts( MSIPACKAGE *package ) return msi_unimplemented_action_stub( package, "RemoveExistingProducts", table ); } -static UINT ACTION_UnregisterMIMEInfo( MSIPACKAGE *package ) -{ - static const WCHAR table[] = { 'M','I','M','E',0 }; - return msi_unimplemented_action_stub( package, "UnregisterMIMEInfo", table ); -} - typedef UINT (*STANDARDACTIONHANDLER)(MSIPACKAGE*); static const struct diff --git a/dlls/msi/classes.c b/dlls/msi/classes.c index 744acfb..ce2325d 100644 --- a/dlls/msi/classes.c +++ b/dlls/msi/classes.c @@ -27,7 +27,7 @@ * UnregisterClassInfo * UnregisterProgIdInfo * UnregisterExtensionInfo - * UnregisterMIMEInfo (TODO) + * UnregisterMIMEInfo */ #include <stdarg.h> @@ -1429,11 +1429,6 @@ UINT ACTION_RegisterMIMEInfo(MSIPACKAGE *package) LIST_FOR_EACH_ENTRY( mt, &package->mimes, MSIMIME, entry ) { LPWSTR extension; - LPCWSTR exten; - LPCWSTR mime; - static const WCHAR fmt[] = - {'M','I','M','E','\\','D','a','t','a','b','a','s','e','\\', - 'C','o','n','t','e','n','t',' ','T','y','p','e','\\', '%','s',0}; LPWSTR key; /* @@ -1446,33 +1441,80 @@ UINT ACTION_RegisterMIMEInfo(MSIPACKAGE *package) if (!mt->InstallMe) { - TRACE("MIME %s not scheduled to be installed\n", - debugstr_w(mt->ContentType)); + TRACE("MIME %s not scheduled to be installed\n", debugstr_w(mt->ContentType)); continue; } - - mime = mt->ContentType; - exten = mt->Extension->Extension; - extension = msi_alloc( (lstrlenW( exten ) + 2)*sizeof(WCHAR) ); - extension[0] = '.'; - lstrcpyW(extension+1,exten); + TRACE("Registering MIME type %s\n", debugstr_w(mt->ContentType)); - key = msi_alloc( (strlenW(mime)+strlenW(fmt)+1) * sizeof(WCHAR) ); - sprintfW(key,fmt,mime); - msi_reg_set_subkey_val( HKEY_CLASSES_ROOT, key, szExten, extension ); + extension = msi_alloc( (strlenW( mt->Extension->Extension ) + 2) * sizeof(WCHAR) ); + key = msi_alloc( (strlenW( mt->ContentType ) + strlenW( szMIMEDatabase ) + 1) * sizeof(WCHAR) ); - msi_free(extension); - msi_free(key); + if (extension && key) + { + extension[0] = '.'; + strcpyW( extension + 1, mt->Extension->Extension ); - if (mt->clsid) - FIXME("Handle non null for field 3\n"); + strcpyW( key, szMIMEDatabase ); + strcatW( key, mt->ContentType ); + msi_reg_set_subkey_val( HKEY_CLASSES_ROOT, key, szExten, extension ); - uirow = MSI_CreateRecord(2); - MSI_RecordSetStringW(uirow,1,mt->ContentType); - MSI_RecordSetStringW(uirow,2,exten); - ui_actiondata(package,szRegisterMIMEInfo,uirow); - msiobj_release(&uirow->hdr); + if (mt->clsid) + msi_reg_set_subkey_val( HKEY_CLASSES_ROOT, key, szCLSID, mt->clsid ); + } + msi_free( extension ); + msi_free( key ); + + uirow = MSI_CreateRecord( 2 ); + MSI_RecordSetStringW( uirow, 1, mt->ContentType ); + MSI_RecordSetStringW( uirow, 2, mt->Extension->Extension ); + ui_actiondata( package, szRegisterMIMEInfo, uirow ); + msiobj_release( &uirow->hdr ); + } + + return ERROR_SUCCESS; +} + +UINT ACTION_UnregisterMIMEInfo( MSIPACKAGE *package ) +{ + MSIRECORD *uirow; + MSIMIME *mime; + + load_classes_and_such( package ); + + LIST_FOR_EACH_ENTRY( mime, &package->mimes, MSIMIME, entry ) + { + LONG res; + LPWSTR mime_key; + + mime->InstallMe = (mime->InstallMe || + (mime->Class && mime->Class->Installed) || + (mime->Extension && mime->Extension->Installed)); + + if (mime->InstallMe) + { + TRACE("MIME %s not scheduled to be removed\n", debugstr_w(mime->ContentType)); + continue; + } + + TRACE("Unregistering MIME type %s\n", debugstr_w(mime->ContentType)); + + mime_key = msi_alloc( (strlenW( szMIMEDatabase ) + strlenW( mime->ContentType ) + 1) * sizeof(WCHAR) ); + if (mime_key) + { + strcpyW( mime_key, szMIMEDatabase ); + strcatW( mime_key, mime->ContentType ); + res = RegDeleteKeyW( HKEY_CLASSES_ROOT, mime_key ); + if (res != ERROR_SUCCESS) + WARN("Failed to delete MIME key %d\n", res); + msi_free( mime_key ); + } + + uirow = MSI_CreateRecord( 2 ); + MSI_RecordSetStringW( uirow, 1, mime->ContentType ); + MSI_RecordSetStringW( uirow, 2, mime->Extension->Extension ); + ui_actiondata( package, szUnregisterMIMEInfo, uirow ); + msiobj_release( &uirow->hdr ); } return ERROR_SUCCESS; diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 7ab1c87..5e699ae 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -965,6 +965,7 @@ extern UINT ACTION_RegisterFonts(MSIPACKAGE *package); extern UINT ACTION_UnregisterClassInfo(MSIPACKAGE *package); extern UINT ACTION_UnregisterExtensionInfo(MSIPACKAGE *package); extern UINT ACTION_UnregisterFonts(MSIPACKAGE *package); +extern UINT ACTION_UnregisterMIMEInfo(MSIPACKAGE *package); extern UINT ACTION_UnregisterProgIdInfo(MSIPACKAGE *package); /* Helpers */ @@ -1089,6 +1090,7 @@ static const WCHAR szMoveFiles[] = {'M','o','v','e','F','i','l','e','s',0}; static const WCHAR szCCPSearch[] = {'C','C','P','S','e','a','r','c','h',0}; static const WCHAR szUnregisterClassInfo[] = {'U','n','r','e','g','i','s','t','e','r','C','l','a','s','s','I','n','f','o',0}; static const WCHAR szUnregisterExtensionInfo[] = {'U','n','r','e','g','i','s','t','e','r','E','x','t','e','n','s','i','o','n','I','n','f','o',0}; +static const WCHAR szUnregisterMIMEInfo[] = {'U','n','r','e','g','i','s','t','e','r','M','I','M','E','I','n','f','o',0}; static const WCHAR szUnregisterProgIdInfo[] = {'U','n','r','e','g','i','s','t','e','r','P','r','o','g','I','d','I','n','f','o',0}; static const WCHAR szRegisterFonts[] = {'R','e','g','i','s','t','e','r','F','o','n','t','s',0}; static const WCHAR szUnregisterFonts[] = {'U','n','r','e','g','i','s','t','e','r','F','o','n','t','s',0}; @@ -1099,6 +1101,7 @@ static const WCHAR szAppID[] = {'A','p','p','I','D',0}; static const WCHAR szDefaultIcon[] = {'D','e','f','a','u','l','t','I','c','o','n',0}; static const WCHAR szInprocHandler[] = {'I','n','p','r','o','c','H','a','n','d','l','e','r',0}; static const WCHAR szInprocHandler32[] = {'I','n','p','r','o','c','H','a','n','d','l','e','r','3','2',0}; +static const WCHAR szMIMEDatabase[] = {'M','I','M','E','\\','D','a','t','a','b','a','s','e','\\','C','o','n','t','e','n','t',' ','T','y','p','e','\\',0}; /* memory allocation macro functions */ static void *msi_alloc( size_t len ) __WINE_ALLOC_SIZE(1);

1 0

Hans Leidekker : msi: Add tests for registering and unregistering MIME info .
by Alexandre Julliard 02 Apr '10

02 Apr '10

Module: wine Branch: master Commit: 7aad77ae58ee7a6743fbff32e76e7cf05eb584d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7aad77ae58ee7a6743fbff32e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 2 10:40:28 2010 +0200 msi: Add tests for registering and unregistering MIME info. --- dlls/msi/tests/install.c | 102 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 102 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 1438bf8..842bb52 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -1799,6 +1799,62 @@ static const CHAR rei_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" "PublishProduct\t\t5200\n" "InstallFinalize\t\t6000\n"; +static const CHAR rmi_file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" + "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" + "File\tFile\n" + "mime.txt\tmime\tmime.txt\t1000\t\t\t8192\t1\n"; + +static const CHAR rmi_feature_dat[] = "Feature\tFeature_Parent\tTitle\tDescription\tDisplay\tLevel\tDirectory_\tAttributes\n" + "s38\tS38\tL64\tL255\tI2\ti2\tS72\ti2\n" + "Feature\tFeature\n" + "mime\t\t\tmime feature\t1\t2\tMSITESTDIR\t0\n"; + +static const CHAR rmi_feature_comp_dat[] = "Feature_\tComponent_\n" + "s38\ts72\n" + "FeatureComponents\tFeature_\tComponent_\n" + "mime\tmime\n"; + +static const CHAR rmi_component_dat[] = "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n" + "s72\tS38\ts72\ti2\tS255\tS72\n" + "Component\tComponent\n" + "mime\t{A1D630CE-13A7-4882-AFDD-148E2BBAFC6D}\tMSITESTDIR\t0\t\tmime.txt\n"; + +static const CHAR rmi_extension_dat[] = "Extension\tComponent_\tProgId_\tMIME_\tFeature_\n" + "s255\ts72\tS255\tS64\ts38\n" + "Extension\tExtension\tComponent_\n" + "mime\tmime\t\tmime/type\tmime\n"; + +static const CHAR rmi_verb_dat[] = "Extension_\tVerb\tSequence\tCommand\tArgument\n" + "s255\ts32\tI2\tL255\tL255\n" + "Verb\tExtension_\tVerb\n" + "mime\tOpen\t1\t&Open\t/argument\n"; + +static const CHAR rmi_mime_dat[] = "ContentType\tExtension_\tCLSID\n" + "s64\ts255\tS38\n" + "MIME\tContentType\n" + "mime/type\tmime\t\n"; + +static const CHAR rmi_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" + "s72\tS255\tI2\n" + "InstallExecuteSequence\tAction\n" + "LaunchConditions\t\t100\n" + "CostInitialize\t\t800\n" + "FileCost\t\t900\n" + "CostFinalize\t\t1000\n" + "InstallValidate\t\t1400\n" + "InstallInitialize\t\t1500\n" + "ProcessComponents\t\t1600\n" + "RemoveFiles\t\t1700\n" + "InstallFiles\t\t2000\n" + "UnregisterExtensionInfo\t\t3000\n" + "UnregisterMIMEInfo\t\t3500\n" + "RegisterExtensionInfo\t\t4000\n" + "RegisterMIMEInfo\t\t4500\n" + "RegisterProduct\t\t5000\n" + "PublishFeatures\t\t5100\n" + "PublishProduct\t\t5200\n" + "InstallFinalize\t\t6000\n"; + typedef struct _msi_table { const CHAR *filename; @@ -2746,6 +2802,21 @@ static const msi_table rei_tables[] = ADD_TABLE(property) }; +static const msi_table rmi_tables[] = +{ + ADD_TABLE(directory), + ADD_TABLE(rmi_component), + ADD_TABLE(rmi_feature), + ADD_TABLE(rmi_feature_comp), + ADD_TABLE(rmi_file), + ADD_TABLE(rmi_extension), + ADD_TABLE(rmi_verb), + ADD_TABLE(rmi_mime), + ADD_TABLE(rmi_install_exec_seq), + ADD_TABLE(media), + ADD_TABLE(property) +}; + /* cabinet definitions */ /* make the max size large so there is only one cab file */ @@ -9144,6 +9215,36 @@ static void test_register_extension_info(void) delete_test_files(); } +static void test_register_mime_info(void) +{ + UINT r; + LONG res; + HKEY hkey; + + create_test_files(); + create_file("msitest\\mime.txt", 1000); + create_database(msifile, rmi_tables, sizeof(rmi_tables) / sizeof(msi_table)); + + MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); + + r = MsiInstallProductA(msifile, NULL); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + res = RegOpenKeyA(HKEY_CLASSES_ROOT, "MIME\\Database\\Content Type\\mime/type", &hkey); + ok(res == ERROR_SUCCESS, "key not created\n"); + RegCloseKey(hkey); + + r = MsiInstallProductA(msifile, "REMOVE=ALL"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + res = RegOpenKeyA(HKEY_CLASSES_ROOT, "MIME\\Database\\Content Type\\mime/type", &hkey); + ok(res == ERROR_FILE_NOT_FOUND, "key not removed\n"); + + ok(!delete_pf("msitest\\mime.txt", TRUE), "file not removed\n"); + ok(!delete_pf("msitest", FALSE), "directory not removed\n"); + delete_test_files(); +} + START_TEST(install) { DWORD len; @@ -9253,6 +9354,7 @@ START_TEST(install) test_remove_env_strings(); test_register_class_info(); test_register_extension_info(); + test_register_mime_info(); DeleteFileA(log_file);

1 0

Hans Leidekker : msi: Reset the MsiEnumPatchesExW index on failure.
by Alexandre Julliard 02 Apr '10

02 Apr '10

Module: wine Branch: master Commit: dd1bef3498110ef0b30121943f064801b8206585 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd1bef3498110ef0b30121943… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 2 10:43:08 2010 +0200 msi: Reset the MsiEnumPatchesExW index on failure. --- dlls/msi/registry.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index 3e03ecf..7a4c3f8 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -2041,7 +2041,7 @@ UINT WINAPI MsiEnumPatchesExW(LPCWSTR szProductCode, LPCWSTR szUserSid, DWORD idx = 0; UINT r; - static int last_index = 0; + static DWORD last_index; TRACE("(%s, %s, %d, %d, %d, %p, %p, %p, %p, %p)\n", debugstr_w(szProductCode), debugstr_w(szUserSid), dwContext, dwFilter, @@ -2077,6 +2077,8 @@ UINT WINAPI MsiEnumPatchesExW(LPCWSTR szProductCode, LPCWSTR szUserSid, if (r == ERROR_SUCCESS) last_index = dwIndex; + else + last_index = 0; return r; }

1 0

Alexandre Julliard : ntdll/tests: Skip a couple of exception tests that crash on Wow64.
by Alexandre Julliard 02 Apr '10

02 Apr '10

Module: wine Branch: master Commit: 29937272cbf199040a4999368a3118045dade003 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29937272cbf199040a4999368… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 2 13:35:06 2010 +0200 ntdll/tests: Skip a couple of exception tests that crash on Wow64. --- dlls/ntdll/tests/exception.c | 125 +++++++++++++++++++++++++---------------- 1 files changed, 76 insertions(+), 49 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=29937272cbf199040a499…

1 0

Roderick Colenbrander : wined3d: Move upsideDown calculation to blit implementation.
by Alexandre Julliard 02 Apr '10

02 Apr '10

Module: wine Branch: master Commit: ff82e66a696208f8233776adb37d1e09f5e445c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff82e66a696208f8233776adb… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Thu Apr 1 23:58:49 2010 +0200 wined3d: Move upsideDown calculation to blit implementation. --- dlls/wined3d/device.c | 18 +++------ dlls/wined3d/surface.c | 79 +++++++++++++++++++++++----------------- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 53 insertions(+), 46 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ff82e66a696208f823377…

1 0

Roderick Colenbrander : wined3d: Remove the swapchain parameter from fb_copy_to_texture_hwstretch in order to unify all blit calls .
by Alexandre Julliard 02 Apr '10

02 Apr '10

Module: wine Branch: master Commit: ae8d9e21e3abb93c2b2d5d668bf23cd179604ebc URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae8d9e21e3abb93c2b2d5d668… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Thu Apr 1 23:58:50 2010 +0200 wined3d: Remove the swapchain parameter from fb_copy_to_texture_hwstretch in order to unify all blit calls. --- dlls/wined3d/surface.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 2dea6a0..3bde8fd 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3515,12 +3515,12 @@ static inline void fb_copy_to_texture_direct(IWineD3DSurfaceImpl *This, IWineD3D /* Uses the hardware to stretch and flip the image */ static inline void fb_copy_to_texture_hwstretch(IWineD3DSurfaceImpl *This, IWineD3DSurface *SrcSurface, - IWineD3DSwapChainImpl *swapchain, const RECT *src_rect, const RECT *dst_rect_in, - WINED3DTEXTUREFILTERTYPE Filter) + const RECT *src_rect, const RECT *dst_rect_in, WINED3DTEXTUREFILTERTYPE Filter) { IWineD3DDeviceImpl *myDevice = This->resource.device; GLuint src, backup = 0; IWineD3DSurfaceImpl *Src = (IWineD3DSurfaceImpl *) SrcSurface; + IWineD3DSwapChainImpl *src_swapchain = NULL; float left, right, top, bottom; /* Texture coordinates */ UINT fbwidth = Src->currentDesc.Width; UINT fbheight = Src->currentDesc.Height; @@ -3618,7 +3618,9 @@ static inline void fb_copy_to_texture_hwstretch(IWineD3DSurfaceImpl *This, IWine wined3d_gl_min_mip_filter(minMipLookup, Filter, WINED3DTEXF_NONE)); checkGLcall("glTexParameteri"); - if(!swapchain || (IWineD3DSurface *) Src == swapchain->backBuffer[0]) { + IWineD3DSurface_GetContainer((IWineD3DSurface *)SrcSurface, &IID_IWineD3DSwapChain, (void **)&src_swapchain); + if (src_swapchain) IWineD3DSwapChain_Release((IWineD3DSwapChain *)src_swapchain); + if (!src_swapchain || (IWineD3DSurface *) Src == src_swapchain->backBuffer[0]) { src = backup ? backup : Src->texture_name; } else { glReadBuffer(GL_FRONT); @@ -3991,7 +3993,7 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, const fb_copy_to_texture_direct(This, SrcSurface, &src_rect, &dst_rect, Filter); } else { TRACE("Using hardware stretching to flip / stretch the texture\n"); - fb_copy_to_texture_hwstretch(This, SrcSurface, srcSwapchain, &src_rect, &dst_rect, Filter); + fb_copy_to_texture_hwstretch(This, SrcSurface, &src_rect, &dst_rect, Filter); } /* Clear the palette as the surface didn't have a palette attached, it would confuse GetPalette and other calls */

1 0

Mikhail Maroukhine : advapi32: Fix compiler warnings with flag -Wcast-qual.
by Alexandre Julliard 02 Apr '10

02 Apr '10

Module: wine Branch: master Commit: 3d2fc2f315cecbf4442f38ff9b6bfda4106e2982 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d2fc2f315cecbf4442f38ff9… Author: Mikhail Maroukhine <mikolg(a)yandex.ru> Date: Thu Apr 1 23:24:15 2010 +0700 advapi32: Fix compiler warnings with flag -Wcast-qual. --- dlls/advapi32/cred.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/cred.c b/dlls/advapi32/cred.c index d978b43..7d5c286 100644 --- a/dlls/advapi32/cred.c +++ b/dlls/advapi32/cred.c @@ -474,10 +474,10 @@ static DWORD registry_write_credential(HKEY hkey, const CREDENTIALW *credential, GetSystemTimeAsFileTime(&LastWritten); - ret = RegSetValueExW(hkey, wszFlagsValue, 0, REG_DWORD, (LPVOID)&credential->Flags, + ret = RegSetValueExW(hkey, wszFlagsValue, 0, REG_DWORD, (const BYTE*)&credential->Flags, sizeof(credential->Flags)); if (ret != ERROR_SUCCESS) return ret; - ret = RegSetValueExW(hkey, wszTypeValue, 0, REG_DWORD, (LPVOID)&credential->Type, + ret = RegSetValueExW(hkey, wszTypeValue, 0, REG_DWORD, (const BYTE*)&credential->Type, sizeof(credential->Type)); if (ret != ERROR_SUCCESS) return ret; ret = RegSetValueExW(hkey, NULL, 0, REG_SZ, (LPVOID)credential->TargetName, @@ -492,7 +492,7 @@ static DWORD registry_write_credential(HKEY hkey, const CREDENTIALW *credential, ret = RegSetValueExW(hkey, wszLastWrittenValue, 0, REG_BINARY, (LPVOID)&LastWritten, sizeof(LastWritten)); if (ret != ERROR_SUCCESS) return ret; - ret = RegSetValueExW(hkey, wszPersistValue, 0, REG_DWORD, (LPVOID)&credential->Persist, + ret = RegSetValueExW(hkey, wszPersistValue, 0, REG_DWORD, (const BYTE*)&credential->Persist, sizeof(credential->Persist)); if (ret != ERROR_SUCCESS) return ret; /* FIXME: Attributes */

1 0

Vincent Povirk : winex11.drv: Clip rectangle values to 16-bit limits.
by Alexandre Julliard 02 Apr '10

02 Apr '10

Module: wine Branch: master Commit: 986a534ebed82a8b99a182ecfb2790bf00eee6be URL: http://source.winehq.org/git/wine.git/?a=commit;h=986a534ebed82a8b99a182ecf… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Apr 1 16:57:14 2010 -0500 winex11.drv: Clip rectangle values to 16-bit limits. --- dlls/winex11.drv/graphics.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/graphics.c b/dlls/winex11.drv/graphics.c index bc00e85..53cbab4 100644 --- a/dlls/winex11.drv/graphics.c +++ b/dlls/winex11.drv/graphics.c @@ -36,6 +36,7 @@ #define PI M_PI #endif #include <string.h> +#include <limits.h> #include "windef.h" #include "winbase.h" @@ -131,10 +132,10 @@ RGNDATA *X11DRV_GetRegionData( HRGN hrgn, HDC hdc_lptodp ) for (j = data->rdh.nCount-1; j >= 0; j--) { tmp = rect[j]; - xrect[j].x = tmp.left; - xrect[j].y = tmp.top; - xrect[j].width = tmp.right - tmp.left; - xrect[j].height = tmp.bottom - tmp.top; + xrect[j].x = max( min( tmp.left, SHRT_MAX), SHRT_MIN); + xrect[j].y = max( min( tmp.top, SHRT_MAX), SHRT_MIN); + xrect[j].width = max( min( tmp.right - xrect[j].x, USHRT_MAX), 0); + xrect[j].height = max( min( tmp.bottom - xrect[j].y, USHRT_MAX), 0); } } else @@ -142,10 +143,10 @@ RGNDATA *X11DRV_GetRegionData( HRGN hrgn, HDC hdc_lptodp ) for (i = 0; i < data->rdh.nCount; i++) { tmp = rect[i]; - xrect[i].x = tmp.left; - xrect[i].y = tmp.top; - xrect[i].width = tmp.right - tmp.left; - xrect[i].height = tmp.bottom - tmp.top; + xrect[i].x = max( min( tmp.left, SHRT_MAX), SHRT_MIN); + xrect[i].y = max( min( tmp.top, SHRT_MAX), SHRT_MIN); + xrect[i].width = max( min( tmp.right - xrect[i].x, USHRT_MAX), 0); + xrect[i].height = max( min( tmp.bottom - xrect[i].y, USHRT_MAX), 0); } } return data;

1 0

Stefan Leichter : ws2_32: Partly implement level IPPROTO_IPV6 of getsockopt .
by Alexandre Julliard 02 Apr '10

02 Apr '10

Module: wine Branch: master Commit: 89aaf74f1f214cc8bbc63aa99fc4390b2ed7e9f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89aaf74f1f214cc8bbc63aa99… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Thu Apr 1 23:50:54 2010 +0200 ws2_32: Partly implement level IPPROTO_IPV6 of getsockopt. --- dlls/ws2_32/socket.c | 30 +++++++++++++++++++++++++++++- 1 files changed, 29 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 3f87eb6..0918779 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2317,7 +2317,35 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, return SOCKET_ERROR; case WS_IPPROTO_IPV6: - FIXME("IPPROTO_IPV6 unimplemented (optname 0x%08x)\n", optname); + switch(optname) + { +#ifdef IPV6_ADD_MEMBERSHIP + case WS_IPV6_ADD_MEMBERSHIP: +#endif +#ifdef IPV6_DROP_MEMBERSHIP + case WS_IPV6_DROP_MEMBERSHIP: +#endif + case WS_IPV6_MULTICAST_IF: + case WS_IPV6_MULTICAST_HOPS: + case WS_IPV6_MULTICAST_LOOP: + case WS_IPV6_UNICAST_HOPS: + case WS_IPV6_V6ONLY: + if ( (fd = get_sock_fd( s, 0, NULL )) == -1) + return SOCKET_ERROR; + convert_sockopt(&level, &optname); + if (getsockopt(fd, level, optname, optval, (unsigned int *)optlen) != 0 ) + { + SetLastError((errno == EBADF) ? WSAENOTSOCK : wsaErrno()); + ret = SOCKET_ERROR; + } + release_sock_fd( s, fd ); + return ret; + case WS_IPV6_DONTFRAG: + FIXME("WS_IPV6_DONTFRAG is always false!\n"); + *(BOOL*)optval = FALSE; + return 0; + } + FIXME("Unknown IPPROTO_IPV6 optname 0x%08x\n", optname); return SOCKET_ERROR; default:

1 0

Christian Costa : d3dx9_36: Implement D3DXCreateLine and add stubbed interface for ID3DXLine + tests.
by Alexandre Julliard 02 Apr '10

02 Apr '10

Module: wine Branch: master Commit: cf2315bd52bb24d698397d366d46c1d68c327386 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf2315bd52bb24d698397d366… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Fri Apr 2 08:54:42 2010 +0200 d3dx9_36: Implement D3DXCreateLine and add stubbed interface for ID3DXLine + tests. --- dlls/d3dx9_36/Makefile.in | 1 + dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/line.c | 276 +++++++++++++++++++++++++++++++++++++++ dlls/d3dx9_36/tests/Makefile.in | 1 + dlls/d3dx9_36/tests/line.c | 76 +++++++++++ 5 files changed, 355 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cf2315bd52bb24d698397…

1 0