February 2010 - Wine-Commits

Hans Leidekker : msi: Get rid of ACTION_VerifyComponentForAction.
by Alexandre Julliard Feb. 16, 2010

Feb. 16, 2010

Module: wine Branch: master Commit: 598c5426070d33715c630b98045f05448b35d367 URL: http://source.winehq.org/git/wine.git/?a=commit;h=598c5426070d33715c630b980… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Feb 16 11:44:47 2010 +0100 msi: Get rid of ACTION_VerifyComponentForAction. --- dlls/msi/action.c | 61 +++++++++++++++++++++------------------------------ dlls/msi/files.c | 16 +++++-------- dlls/msi/font.c | 10 +++----- dlls/msi/helpers.c | 11 --------- dlls/msi/msipriv.h | 1 - 5 files changed, 35 insertions(+), 64 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 3d6b5c1..f9823fe 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -951,7 +951,7 @@ UINT msi_create_component_directories( MSIPACKAGE *package ) /* create all the folders required by the components are going to install */ LIST_FOR_EACH_ENTRY( comp, &package->components, MSICOMPONENT, entry ) { - if (!ACTION_VerifyComponentForAction( comp, INSTALLSTATE_LOCAL)) + if (comp->ActionRequest != INSTALLSTATE_LOCAL) continue; msi_create_directory( package, comp->Directory ); } @@ -2231,16 +2231,12 @@ static UINT ITERATE_WriteRegistryValues(MSIRECORD *row, LPVOID param) if (!comp) return ERROR_SUCCESS; - if (!ACTION_VerifyComponentForAction( comp, INSTALLSTATE_LOCAL)) + if (comp->ActionRequest != INSTALLSTATE_LOCAL) { - TRACE("Skipping write due to disabled component %s\n", - debugstr_w(component)); - + TRACE("Component not scheduled for installation: %s\n", debugstr_w(component)); comp->Action = comp->Installed; - return ERROR_SUCCESS; } - comp->Action = INSTALLSTATE_LOCAL; name = MSI_RecordGetString(row, 4); @@ -2704,8 +2700,8 @@ static UINT ACTION_ProcessComponents(MSIPACKAGE *package) debugstr_w(comp->FullKeypath), comp->RefCount); - if (ACTION_VerifyComponentForAction( comp, INSTALLSTATE_LOCAL) || - ACTION_VerifyComponentForAction( comp, INSTALLSTATE_SOURCE)) + if (comp->ActionRequest == INSTALLSTATE_LOCAL || + comp->ActionRequest == INSTALLSTATE_SOURCE) { if (!comp->FullKeypath) continue; @@ -2771,7 +2767,7 @@ static UINT ACTION_ProcessComponents(MSIPACKAGE *package) } RegCloseKey(hkey); } - else if (ACTION_VerifyComponentForAction(comp, INSTALLSTATE_ABSENT)) + else if (comp->ActionRequest == INSTALLSTATE_ABSENT) { if (package->Context == MSIINSTALLCONTEXT_MACHINE) MSIREG_DeleteUserDataComponentKey(comp->ComponentId, szLocalSid); @@ -2867,15 +2863,12 @@ static UINT ITERATE_RegisterTypeLibraries(MSIRECORD *row, LPVOID param) if (!comp) return ERROR_SUCCESS; - if (!ACTION_VerifyComponentForAction( comp, INSTALLSTATE_LOCAL)) + if (comp->ActionRequest != INSTALLSTATE_LOCAL) { - TRACE("Skipping typelib reg due to disabled component\n"); - + TRACE("Component not scheduled for installation: %s\n", debugstr_w(component)); comp->Action = comp->Installed; - return ERROR_SUCCESS; } - comp->Action = INSTALLSTATE_LOCAL; file = get_loaded_file( package, comp->KeyPath ); @@ -2979,10 +2972,9 @@ static UINT ITERATE_UnregisterTypeLibraries( MSIRECORD *row, LPVOID param ) if (!comp) return ERROR_SUCCESS; - if (!ACTION_VerifyComponentForAction( comp, INSTALLSTATE_ABSENT )) + if (comp->ActionRequest != INSTALLSTATE_ABSENT) { - TRACE("Skipping, component is not scheduled for uninstall\n"); - + TRACE("Component not scheduled for removal %s\n", debugstr_w(component)); comp->Action = comp->Installed; return ERROR_SUCCESS; } @@ -3071,10 +3063,9 @@ static UINT ITERATE_CreateShortcuts(MSIRECORD *row, LPVOID param) if (!comp) return ERROR_SUCCESS; - if (!ACTION_VerifyComponentForAction( comp, INSTALLSTATE_LOCAL )) + if (comp->ActionRequest != INSTALLSTATE_LOCAL) { - TRACE("Skipping shortcut creation due to disabled component\n"); - + TRACE("Component not scheduled for installation %s\n", debugstr_w(component)); comp->Action = comp->Installed; return ERROR_SUCCESS; } @@ -3208,10 +3199,9 @@ static UINT ITERATE_RemoveShortcuts( MSIRECORD *row, LPVOID param ) if (!comp) return ERROR_SUCCESS; - if (!ACTION_VerifyComponentForAction( comp, INSTALLSTATE_ABSENT )) + if (comp->ActionRequest != INSTALLSTATE_ABSENT) { - TRACE("Skipping, component not scheduled for uninstall\n"); - + TRACE("Component not scheduled for removal %s\n", debugstr_w(component)); comp->Action = comp->Installed; return ERROR_SUCCESS; } @@ -3626,17 +3616,15 @@ static UINT ITERATE_WriteIniValues(MSIRECORD *row, LPVOID param) component = MSI_RecordGetString(row, 8); comp = get_loaded_component(package,component); + if (!comp) + return ERROR_SUCCESS; - if (!ACTION_VerifyComponentForAction( comp, INSTALLSTATE_LOCAL)) + if (comp->ActionRequest != INSTALLSTATE_LOCAL) { - TRACE("Skipping ini file due to disabled component %s\n", - debugstr_w(component)); - + TRACE("Component not scheduled for installation %s\n", debugstr_w(component)); comp->Action = comp->Installed; - return ERROR_SUCCESS; } - comp->Action = INSTALLSTATE_LOCAL; identifier = MSI_RecordGetString(row,1); @@ -4490,14 +4478,15 @@ static UINT ITERATE_PublishComponent(MSIRECORD *rec, LPVOID param) component = MSI_RecordGetString(rec,3); comp = get_loaded_component(package,component); + if (!comp) + return ERROR_SUCCESS; - if (!ACTION_VerifyComponentForAction( comp, INSTALLSTATE_LOCAL ) && - !ACTION_VerifyComponentForAction( comp, INSTALLSTATE_SOURCE ) && - !ACTION_VerifyComponentForAction( comp, INSTALLSTATE_ADVERTISED )) + if (comp->ActionRequest != INSTALLSTATE_LOCAL && + comp->ActionRequest != INSTALLSTATE_SOURCE && + comp->ActionRequest != INSTALLSTATE_ADVERTISED) { - TRACE("Skipping: Component %s not scheduled for install\n", - debugstr_w(component)); - + TRACE("Component not scheduled for installation %s\n", debugstr_w(component)); + comp->Action = comp->Installed; return ERROR_SUCCESS; } diff --git a/dlls/msi/files.c b/dlls/msi/files.c index b7af4d3..d641950 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -108,7 +108,7 @@ static void schedule_install_files(MSIPACKAGE *package) LIST_FOR_EACH_ENTRY(file, &package->files, MSIFILE, entry) { - if (!ACTION_VerifyComponentForAction(file->Component, INSTALLSTATE_LOCAL)) + if (file->Component->ActionRequest != INSTALLSTATE_LOCAL) { TRACE("File %s is not scheduled for install\n", debugstr_w(file->File)); @@ -358,19 +358,15 @@ static UINT ITERATE_DuplicateFiles(MSIRECORD *row, LPVOID param) component = MSI_RecordGetString(row,2); comp = get_loaded_component(package,component); + if (!comp) + return ERROR_SUCCESS; - if (!ACTION_VerifyComponentForAction( comp, INSTALLSTATE_LOCAL )) + if (comp->ActionRequest != INSTALLSTATE_LOCAL) { - TRACE("Skipping copy due to disabled component %s\n", - debugstr_w(component)); - - /* the action taken was the same as the current install state */ - if (comp) - comp->Action = comp->Installed; - + TRACE("Component not scheduled for installation %s\n", debugstr_w(component)); + comp->Action = comp->Installed; return ERROR_SUCCESS; } - comp->Action = INSTALLSTATE_LOCAL; file_key = MSI_RecordGetString(row,3); diff --git a/dlls/msi/font.c b/dlls/msi/font.c index 73ebe20..1b2c3c7 100644 --- a/dlls/msi/font.c +++ b/dlls/msi/font.c @@ -201,10 +201,9 @@ static UINT ITERATE_RegisterFonts(MSIRECORD *row, LPVOID param) return ERROR_SUCCESS; } - /* check to make sure that component is installed */ - if (!ACTION_VerifyComponentForAction( file->Component, INSTALLSTATE_LOCAL)) + if (file->Component->ActionRequest != INSTALLSTATE_LOCAL) { - TRACE("Skipping: Component not scheduled for install\n"); + TRACE("Component not scheduled for installation\n"); return ERROR_SUCCESS; } @@ -280,10 +279,9 @@ static UINT ITERATE_UnregisterFonts( MSIRECORD *row, LPVOID param ) return ERROR_SUCCESS; } - /* check to make sure that component is uninstalled */ - if (!ACTION_VerifyComponentForAction( file->Component, INSTALLSTATE_ABSENT )) + if (file->Component->ActionRequest != INSTALLSTATE_ABSENT) { - TRACE("Skipping: Component not scheduled for uninstall\n"); + TRACE("Component not scheduled for removal\n"); return ERROR_SUCCESS; } diff --git a/dlls/msi/helpers.c b/dlls/msi/helpers.c index e3009f7..df25c3e 100644 --- a/dlls/msi/helpers.c +++ b/dlls/msi/helpers.c @@ -604,17 +604,6 @@ void ui_actiondata(MSIPACKAGE *package, LPCWSTR action, MSIRECORD * record) msiobj_release(&row->hdr); } -BOOL ACTION_VerifyComponentForAction( const MSICOMPONENT* comp, INSTALLSTATE check ) -{ - if (!comp) - return FALSE; - - if (comp->ActionRequest == check) - return TRUE; - else - return FALSE; -} - BOOL ACTION_VerifyFeatureForAction( const MSIFEATURE* feature, INSTALLSTATE check ) { if (!feature) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 8022afc..8c77a9f 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -982,7 +982,6 @@ extern void msi_free_action_script(MSIPACKAGE *package, UINT script); extern LPWSTR build_icon_path(MSIPACKAGE *, LPCWSTR); extern LPWSTR build_directory_name(DWORD , ...); extern BOOL create_full_pathW(const WCHAR *path); -extern BOOL ACTION_VerifyComponentForAction(const MSICOMPONENT*, INSTALLSTATE); extern BOOL ACTION_VerifyFeatureForAction(const MSIFEATURE*, INSTALLSTATE); extern void reduce_to_longfilename(WCHAR*); extern LPWSTR create_component_advertise_string(MSIPACKAGE*, MSICOMPONENT*, LPCWSTR);

1 0

Hans Leidekker : msi: Update the UI when registering or unregistering type libraries.
by Alexandre Julliard Feb. 16, 2010

Feb. 16, 2010

Module: wine Branch: master Commit: 54391a11c0c62d708bc6dbf79fa9fabe711c54ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=54391a11c0c62d708bc6dbf79… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Feb 16 11:44:34 2010 +0100 msi: Update the UI when registering or unregistering type libraries. --- dlls/msi/action.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 4ddfc82..3d6b5c1 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2882,6 +2882,8 @@ static UINT ITERATE_RegisterTypeLibraries(MSIRECORD *row, LPVOID param) if (!file) return ERROR_SUCCESS; + ui_actiondata( package, szRegisterTypeLibraries, row ); + module = LoadLibraryExW( file->TargetPath, NULL, LOAD_LIBRARY_AS_DATAFILE ); if (module) { @@ -2911,11 +2913,7 @@ static UINT ITERATE_RegisterTypeLibraries(MSIRECORD *row, LPVOID param) ERR("Failed to register type library %s\n", debugstr_w(tl_struct.path)); else - { - ui_actiondata(package,szRegisterTypeLibraries,row); - TRACE("Registered %s\n", debugstr_w(tl_struct.path)); - } ITypeLib_Release(tl_struct.ptLib); msi_free(tl_struct.path); @@ -2990,6 +2988,8 @@ static UINT ITERATE_UnregisterTypeLibraries( MSIRECORD *row, LPVOID param ) } comp->Action = INSTALLSTATE_ABSENT; + ui_actiondata( package, szUnregisterTypeLibraries, row ); + guid = MSI_RecordGetString( row, 1 ); CLSIDFromString( (LPWSTR)guid, &libid ); version = MSI_RecordGetInteger( row, 4 );

1 0

Kusanagi Kouichi : winex11.drv: Handle result string directly.
by Alexandre Julliard Feb. 16, 2010

Feb. 16, 2010

Module: wine Branch: master Commit: 4ccbcb02b27a72188c7bef50c0e2d078171b4827 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ccbcb02b27a72188c7bef50c… Author: Kusanagi Kouichi <slash(a)ac.auone-net.jp> Date: Tue Feb 16 18:51:43 2010 +0900 winex11.drv: Handle result string directly. --- dlls/winex11.drv/ime.c | 17 +++++++++++++++-- dlls/winex11.drv/x11drv.h | 2 +- dlls/winex11.drv/xim.c | 4 +--- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/dlls/winex11.drv/ime.c b/dlls/winex11.drv/ime.c index cfb0110..affa435 100644 --- a/dlls/winex11.drv/ime.c +++ b/dlls/winex11.drv/ime.c @@ -1049,9 +1049,22 @@ BOOL IME_SetCompositionString(DWORD dwIndex, LPCVOID lpComp, DWORD dwCompLen, lpRead, dwReadLen); } -BOOL IME_NotifyIME(DWORD dwAction, DWORD dwIndex, DWORD dwValue) +void IME_SetResultString(LPWSTR lpResult, DWORD dwResultLen) { - return NotifyIME(FROM_X11, dwAction, dwIndex, dwValue); + LPINPUTCONTEXT lpIMC; + HIMCC newCompStr; + + lpIMC = LockRealIMC(FROM_X11); + if (lpIMC == NULL) + return; + + newCompStr = updateResultStr(lpIMC->hCompStr, lpResult, dwResultLen); + ImmDestroyIMCC(lpIMC->hCompStr); + lpIMC->hCompStr = newCompStr; + + GenerateIMEMessage(FROM_X11, WM_IME_COMPOSITION, 0, GCS_RESULTSTR); + + UnlockRealIMC(FROM_X11); } /***** diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 03b3750..1173d31 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -307,7 +307,7 @@ extern void IME_UpdateAssociation(HWND focus); extern BOOL IME_SetCompositionString(DWORD dwIndex, LPCVOID lpComp, DWORD dwCompLen, LPCVOID lpRead, DWORD dwReadLen); -extern BOOL IME_NotifyIME(DWORD dwAction, DWORD dwIndex, DWORD dwValue); +extern void IME_SetResultString(LPWSTR lpResult, DWORD dwResultlen); extern void X11DRV_XDND_EnterEvent( HWND hWnd, XClientMessageEvent *event ); extern void X11DRV_XDND_PositionEvent( HWND hWnd, XClientMessageEvent *event ); diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c index 38b0a2c..0e32513 100644 --- a/dlls/winex11.drv/xim.c +++ b/dlls/winex11.drv/xim.c @@ -116,9 +116,7 @@ void X11DRV_XIMLookupChars( const char *str, DWORD count ) if ((focus = GetFocus())) IME_UpdateAssociation(focus); - IME_SetCompositionString(SCS_SETSTR, wcOutput, - sizeof (WCHAR) * dwOutput, NULL, 0); - IME_NotifyIME(NI_COMPOSITIONSTR, CPS_COMPLETE, 0); + IME_SetResultString(wcOutput, dwOutput); HeapFree(GetProcessHeap(), 0, wcOutput); }

1 0

Alexandre Julliard : wine.inf: Add a symlink for the Win9x-style timezone data.
by Alexandre Julliard Feb. 16, 2010

Feb. 16, 2010

Module: wine Branch: master Commit: d3aa514a2d2e314e0dc58fa82d3f881045d24a65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3aa514a2d2e314e0dc58fa82… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 16 12:18:18 2010 +0100 wine.inf: Add a symlink for the Win9x-style timezone data. --- tools/wine.inf.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index fffbeb6..13cc076 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2828,6 +2828,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Yakutsk Standard Time,"Display",,"Asia/Yakuts HKLM,%CurrentVersionNT%\Time Zones\Yakutsk Standard Time,"Dlt",,"Yakutsk Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Yakutsk Standard Time,"Std",,"Yakutsk Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Yakutsk Standard Time,"TZI",1,e4,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersion%\Time Zones,"SymbolicLinkValue",0x60000,"\Registry\Machine\%CurrentVersionNT%\Time Zones" [MountMgrService] Description="Device mounting service"

1 0

Alexandre Julliard : server: Save and load registry symlinks to/ from disk files.
by Alexandre Julliard Feb. 16, 2010

Feb. 16, 2010

Module: wine Branch: master Commit: b5d4289d22261b3a2f6f44624367f02da44da7dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5d4289d22261b3a2f6f44624… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 16 12:26:44 2010 +0100 server: Save and load registry symlinks to/from disk files. --- server/registry.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/server/registry.c b/server/registry.c index 2dc640e..ef38c8e 100644 --- a/server/registry.c +++ b/server/registry.c @@ -248,7 +248,7 @@ static void save_subkeys( const struct key *key, const struct key *base, FILE *f if (key->flags & KEY_VOLATILE) return; /* save key if it has either some values or no subkeys, or needs special options */ /* keys with no values but subkeys are saved implicitly by saving the subkeys */ - if ((key->last_value >= 0) || (key->last_subkey == -1) || key->class) + if ((key->last_value >= 0) || (key->last_subkey == -1) || key->class || (key->flags & KEY_SYMLINK)) { fprintf( f, "\n[" ); if (key != base) dump_path( key, base, f ); @@ -259,6 +259,7 @@ static void save_subkeys( const struct key *key, const struct key *base, FILE *f dump_strW( key->class, key->classlen / sizeof(WCHAR), f, "\"\"" ); fprintf( f, "\"\n" ); } + if (key->flags & KEY_SYMLINK) fputs( "#link\n", f ); for (i = 0; i <= key->last_value; i++) dump_value( &key->values[i], f ); } for (i = 0; i <= key->last_subkey; i++) save_subkeys( key->subkeys[i], base, f ); @@ -723,8 +724,7 @@ static struct key *create_key( struct key *key, const struct unicode_str *name, return NULL; } } - /* FIXME: no saving of symlinks yet */ - if (options & REG_OPTION_CREATE_LINK) key->flags |= KEY_SYMLINK | KEY_VOLATILE; + if (options & REG_OPTION_CREATE_LINK) key->flags |= KEY_SYMLINK; done: if (debug_level > 1) dump_operation( key, NULL, "Create" ); @@ -1247,6 +1247,7 @@ static int load_key_option( struct key *key, const char *buffer, struct file_loa if (!(key->class = memdup( info->tmp, len ))) len = 0; key->classlen = len; } + if (!strncmp( buffer, "#link", 5 )) key->flags |= KEY_SYMLINK; /* ignore unknown options */ return 1; }

1 0

Andrew Nguyen : gdi32: Check the region handle in GetClipRgn later.
by Alexandre Julliard Feb. 16, 2010

Feb. 16, 2010

Module: wine Branch: master Commit: a504867a89d1d8efd37516e360d12413da5ec745 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a504867a89d1d8efd37516e36… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Tue Feb 16 01:35:35 2010 -0600 gdi32: Check the region handle in GetClipRgn later. --- dlls/gdi32/clipping.c | 2 +- dlls/gdi32/tests/clipping.c | 88 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 89 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/clipping.c b/dlls/gdi32/clipping.c index 4e294b6..a942fe1 100644 --- a/dlls/gdi32/clipping.c +++ b/dlls/gdi32/clipping.c @@ -385,7 +385,7 @@ INT WINAPI GetClipRgn( HDC hdc, HRGN hRgn ) { INT ret = -1; DC * dc; - if (hRgn && (dc = get_dc_ptr( hdc ))) + if ((dc = get_dc_ptr( hdc ))) { if( dc->hClipRgn ) { diff --git a/dlls/gdi32/tests/clipping.c b/dlls/gdi32/tests/clipping.c index 06cb22a..0bca179 100644 --- a/dlls/gdi32/tests/clipping.c +++ b/dlls/gdi32/tests/clipping.c @@ -265,8 +265,96 @@ static void test_ExtCreateRegion(void) DeleteObject(hrgn); } +static void test_GetClipRgn(void) +{ + HDC hdc; + HRGN hrgn, hrgn2, hrgn3, hrgn4; + int ret; + + /* Test calling GetClipRgn with NULL device context and region handles. */ + ret = GetClipRgn(NULL, NULL); + ok(ret == -1, "Expected GetClipRgn to return -1, got %d\n", ret); + + hdc = GetDC(NULL); + ok(hdc != NULL, "Expected GetDC to return a valid device context handle\n"); + + /* Test calling GetClipRgn with a valid device context and NULL region. */ + ret = GetClipRgn(hdc, NULL); + ok(ret == 0 || + ret == -1 /* Win9x */, + "Expected GetClipRgn to return 0, got %d\n", ret); + + /* Initialize the test regions. */ + hrgn = CreateRectRgn(100, 100, 100, 100); + ok(hrgn != NULL, + "Expected CreateRectRgn to return a handle to a new rectangular region\n"); + + hrgn2 = CreateRectRgn(1, 2, 3, 4); + ok(hrgn2 != NULL, + "Expected CreateRectRgn to return a handle to a new rectangular region\n"); + + hrgn3 = CreateRectRgn(1, 2, 3, 4); + ok(hrgn3 != NULL, + "Expected CreateRectRgn to return a handle to a new rectangular region\n"); + + hrgn4 = CreateRectRgn(1, 2, 3, 4); + ok(hrgn4 != NULL, + "Expected CreateRectRgn to return a handle to a new rectangular region\n"); + + /* Try getting a clipping region from the device context + * when the device context's clipping region isn't set. */ + ret = GetClipRgn(hdc, hrgn2); + ok(ret == 0, "Expected GetClipRgn to return 0, got %d\n", ret); + + /* The region passed to GetClipRgn should be unchanged. */ + ret = EqualRgn(hrgn2, hrgn3); + ok(ret == 1, + "Expected EqualRgn to compare the two regions as equal, got %d\n", ret); + + /* Try setting and getting back a clipping region. */ + ret = SelectClipRgn(hdc, hrgn); + ok(ret == NULLREGION, + "Expected SelectClipRgn to return NULLREGION, got %d\n", ret); + + /* Passing a NULL region handle when the device context + * has a clipping region results in an error. */ + ret = GetClipRgn(hdc, NULL); + ok(ret == -1, "Expected GetClipRgn to return -1, got %d\n", ret); + + ret = GetClipRgn(hdc, hrgn2); + ok(ret == 1, "Expected GetClipRgn to return 1, got %d\n", ret); + + ret = EqualRgn(hrgn, hrgn2); + ok(ret == 1, + "Expected EqualRgn to compare the two regions as equal, got %d\n", ret); + + /* Try unsetting and then query the clipping region. */ + ret = SelectClipRgn(hdc, NULL); + ok(ret == SIMPLEREGION, + "Expected SelectClipRgn to return SIMPLEREGION, got %d\n", ret); + + ret = GetClipRgn(hdc, NULL); + ok(ret == 0 || + ret == -1 /* Win9x */, + "Expected GetClipRgn to return 0, got %d\n", ret); + + ret = GetClipRgn(hdc, hrgn3); + ok(ret == 0, "Expected GetClipRgn to return 0, got %d\n", ret); + + ret = EqualRgn(hrgn3, hrgn4); + ok(ret == 1, + "Expected EqualRgn to compare the two regions as equal, got %d\n", ret); + + DeleteObject(hrgn4); + DeleteObject(hrgn3); + DeleteObject(hrgn2); + DeleteObject(hrgn); + ReleaseDC(NULL, hdc); +} + START_TEST(clipping) { test_GetRandomRgn(); test_ExtCreateRegion(); + test_GetClipRgn(); }

1 0

Alexandre Julliard : setupapi: Add support for creating registry symlinks from a .inf file.
by Alexandre Julliard Feb. 16, 2010

Feb. 16, 2010

Module: wine Branch: master Commit: f6b3dba7a08a718f633804da508e4586ae72e6f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6b3dba7a08a718f633804da5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 16 12:18:02 2010 +0100 setupapi: Add support for creating registry symlinks from a .inf file. --- dlls/setupapi/install.c | 21 +++++++++++++++++---- 1 files changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c index 54eff1d..cb476af 100644 --- a/dlls/setupapi/install.c +++ b/dlls/setupapi/install.c @@ -370,6 +370,7 @@ static BOOL do_reg_operation( HKEY hkey, const WCHAR *value, INFCONTEXT *context { if (!(str = HeapAlloc( GetProcessHeap(), 0, size * sizeof(WCHAR) ))) return FALSE; SetupGetStringFieldW( context, 5, str, size, NULL ); + if (type == REG_LINK) size--; /* no terminating null for symlinks */ } } @@ -421,6 +422,7 @@ static BOOL registry_callback( HINF hinf, PCWSTR field, void *arg ) for (; ok; ok = SetupFindNextLine( &context, &context )) { + DWORD options = 0; WCHAR buffer[MAX_INF_STRING_LENGTH]; INT flags; @@ -446,15 +448,26 @@ static BOOL registry_callback( HINF hinf, PCWSTR field, void *arg ) if (!flags) flags = FLG_ADDREG_DELREG_BIT; else if (!(flags & FLG_ADDREG_DELREG_BIT)) continue; /* ignore this entry */ } + /* Wine extension: magic support for symlinks */ + if (flags >> 16 == REG_LINK) options = REG_OPTION_OPEN_LINK | REG_OPTION_CREATE_LINK; if (info->delete || (flags & FLG_ADDREG_OVERWRITEONLY)) { - if (RegOpenKeyW( root_key, buffer, &hkey )) continue; /* ignore if it doesn't exist */ + if (RegOpenKeyExW( root_key, buffer, options, MAXIMUM_ALLOWED, &hkey )) + continue; /* ignore if it doesn't exist */ } - else if (RegCreateKeyW( root_key, buffer, &hkey )) + else { - ERR( "could not create key %p %s\n", root_key, debugstr_w(buffer) ); - continue; + DWORD res = RegCreateKeyExW( root_key, buffer, 0, NULL, options, + MAXIMUM_ALLOWED, NULL, &hkey, NULL ); + if (res == ERROR_ALREADY_EXISTS && (options & REG_OPTION_CREATE_LINK)) + res = RegCreateKeyExW( root_key, buffer, 0, NULL, REG_OPTION_OPEN_LINK, + MAXIMUM_ALLOWED, NULL, &hkey, NULL ); + if (res) + { + ERR( "could not create key %p %s\n", root_key, debugstr_w(buffer) ); + continue; + } } TRACE( "key %p %s\n", root_key, debugstr_w(buffer) );

1 0

Dmitry Timoshkov : winedbg: Print parameter values in backtraces in hex.
by Alexandre Julliard Feb. 16, 2010

Feb. 16, 2010

Module: wine Branch: master Commit: aa25fcded70309a58e328033878f368683b3ae3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa25fcded70309a58e3280338… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Feb 16 16:36:21 2010 +0800 winedbg: Print parameter values in backtraces in hex. --- programs/winedbg/memory.c | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/memory.c b/programs/winedbg/memory.c index c8ceeb1..9554ea4 100644 --- a/programs/winedbg/memory.c +++ b/programs/winedbg/memory.c @@ -338,6 +338,20 @@ static void dbg_print_longlong(LONGLONG sv, BOOL is_signed) dbg_printf("%s", ptr); } +static void dbg_print_hex(ULONGLONG sv) +{ + if (!sv) + { + dbg_printf("0"); + return; + } + + if (sv >> 32) + dbg_printf("0x%lx%08lx", (unsigned long)(sv >> 32), (unsigned long)sv); + else + dbg_printf("0x%04lx", (unsigned long)sv); +} + static void print_typed_basic(const struct dbg_lvalue* lvalue) { LONGLONG val_int; @@ -367,12 +381,12 @@ static void print_typed_basic(const struct dbg_lvalue* lvalue) case btLong: if (!be_cpu->fetch_integer(lvalue, size, TRUE, &val_int)) return; if (size == 1) goto print_char; - dbg_print_longlong(val_int, TRUE); + dbg_print_hex(val_int); break; case btUInt: case btULong: if (!be_cpu->fetch_integer(lvalue, size, FALSE, &val_int)) return; - dbg_print_longlong(val_int, FALSE); + dbg_print_hex(val_int); break; case btFloat: if (!be_cpu->fetch_float(lvalue, size, &val_real)) return;

1 0

Nikolay Sivov : msxml3: Get rid of libxml2 accessors in ::substringData() for Text, Comment and CDATA nodes.
by Alexandre Julliard Feb. 16, 2010

Feb. 16, 2010

Module: wine Branch: master Commit: 3d18a77ae7606a8301b54b52d0cac7f978fd73a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d18a77ae7606a8301b54b52d… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Feb 16 02:53:09 2010 +0300 msxml3: Get rid of libxml2 accessors in ::substringData() for Text, Comment and CDATA nodes. --- dlls/msxml3/cdata.c | 31 ++++++++++++++----------------- dlls/msxml3/comment.c | 29 +++++++++++++---------------- dlls/msxml3/text.c | 31 ++++++++++++++----------------- 3 files changed, 41 insertions(+), 50 deletions(-) diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c index 12bc03d..57d601d 100644 --- a/dlls/msxml3/cdata.c +++ b/dlls/msxml3/cdata.c @@ -538,11 +538,10 @@ static HRESULT WINAPI domcdata_substringData( LONG offset, LONG count, BSTR *p) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); - xmlChar *pContent; - LONG nLength = 0; - HRESULT hr = S_FALSE; + HRESULT hr; + BSTR data; - TRACE("%p\n", iface); + TRACE("%p %d %d %p\n", This, offset, count, p); if(!p) return E_INVALIDARG; @@ -552,26 +551,24 @@ static HRESULT WINAPI domcdata_substringData( return E_INVALIDARG; if(count == 0) - return hr; + return S_FALSE; - pContent = xmlNodeGetContent(This->node.node); - if(pContent) + hr = IXMLDOMCDATASection_get_data(iface, &data); + if(hr == S_OK) { - nLength = xmlStrlen(pContent); + LONG len = SysStringLen(data); - if( offset < nLength) + if(offset < len) { - BSTR sContent = bstr_from_xmlChar(pContent); - if(offset + count > nLength) - *p = SysAllocString(&sContent[offset]); + if(offset + count > len) + *p = SysAllocString(&data[offset]); else - *p = SysAllocStringLen(&sContent[offset], count); - - SysFreeString(sContent); - hr = S_OK; + *p = SysAllocStringLen(&data[offset], count); } + else + hr = S_FALSE; - xmlFree(pContent); + SysFreeString(data); } return hr; diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c index c669eac..c4005c2 100644 --- a/dlls/msxml3/comment.c +++ b/dlls/msxml3/comment.c @@ -532,11 +532,10 @@ static HRESULT WINAPI domcomment_substringData( LONG offset, LONG count, BSTR *p) { domcomment *This = impl_from_IXMLDOMComment( iface ); - xmlChar *pContent; - LONG nLength = 0; - HRESULT hr = S_FALSE; + HRESULT hr; + BSTR data; - TRACE("%p %d %d %p\n", iface, offset, count, p); + TRACE("%p %d %d %p\n", This, offset, count, p); if(!p) return E_INVALIDARG; @@ -548,24 +547,22 @@ static HRESULT WINAPI domcomment_substringData( if(count == 0) return S_FALSE; - pContent = xmlNodeGetContent(This->node.node); - if(pContent) + hr = IXMLDOMComment_get_data(iface, &data); + if(hr == S_OK) { - nLength = xmlStrlen(pContent); + LONG len = SysStringLen(data); - if( offset < nLength) + if(offset < len) { - BSTR sContent = bstr_from_xmlChar(pContent); - if(offset + count > nLength) - *p = SysAllocString(&sContent[offset]); + if(offset + count > len) + *p = SysAllocString(&data[offset]); else - *p = SysAllocStringLen(&sContent[offset], count); - - SysFreeString(sContent); - hr = S_OK; + *p = SysAllocStringLen(&data[offset], count); } + else + hr = S_FALSE; - xmlFree(pContent); + SysFreeString(data); } return hr; diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c index e21b203..ba959d3 100644 --- a/dlls/msxml3/text.c +++ b/dlls/msxml3/text.c @@ -540,11 +540,10 @@ static HRESULT WINAPI domtext_substringData( LONG offset, LONG count, BSTR *p) { domtext *This = impl_from_IXMLDOMText( iface ); - xmlChar *pContent; - LONG nLength = 0; - HRESULT hr = S_FALSE; + HRESULT hr; + BSTR data; - TRACE("%p\n", iface); + TRACE("%p %d %d %p\n", This, offset, count, p); if(!p) return E_INVALIDARG; @@ -554,26 +553,24 @@ static HRESULT WINAPI domtext_substringData( return E_INVALIDARG; if(count == 0) - return hr; + return S_FALSE; - pContent = xmlNodeGetContent(This->node.node); - if(pContent) + hr = IXMLDOMText_get_data(iface, &data); + if(hr == S_OK) { - nLength = xmlStrlen(pContent); + LONG len = SysStringLen(data); - if( offset < nLength) + if(offset < len) { - BSTR sContent = bstr_from_xmlChar(pContent); - if(offset + count > nLength) - *p = SysAllocString(&sContent[offset]); + if(offset + count > len) + *p = SysAllocString(&data[offset]); else - *p = SysAllocStringLen(&sContent[offset], count); - - SysFreeString(sContent); - hr = S_OK; + *p = SysAllocStringLen(&data[offset], count); } + else + hr = S_FALSE; - xmlFree(pContent); + SysFreeString(data); } return hr;

1 0

Alexandre Julliard : server: Save and load the registry class names to/ from disk files.
by Alexandre Julliard Feb. 16, 2010

Feb. 16, 2010

Module: wine Branch: master Commit: 2a378676ef8036dfde5abbb3abe978c652c86097 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a378676ef8036dfde5abbb3a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 16 12:26:15 2010 +0100 server: Save and load the registry class names to/from disk files. --- server/registry.c | 35 ++++++++++++++++++++++++++++++++--- 1 files changed, 32 insertions(+), 3 deletions(-) diff --git a/server/registry.c b/server/registry.c index eb89800..2dc640e 100644 --- a/server/registry.c +++ b/server/registry.c @@ -246,13 +246,19 @@ static void save_subkeys( const struct key *key, const struct key *base, FILE *f int i; if (key->flags & KEY_VOLATILE) return; - /* save key if it has either some values or no subkeys */ + /* save key if it has either some values or no subkeys, or needs special options */ /* keys with no values but subkeys are saved implicitly by saving the subkeys */ - if ((key->last_value >= 0) || (key->last_subkey == -1)) + if ((key->last_value >= 0) || (key->last_subkey == -1) || key->class) { fprintf( f, "\n[" ); if (key != base) dump_path( key, base, f ); fprintf( f, "] %u\n", (unsigned int)((key->modif - ticks_1601_to_1970) / TICKS_PER_SEC) ); + if (key->class) + { + fprintf( f, "#class=\"" ); + dump_strW( key->class, key->classlen / sizeof(WCHAR), f, "\"\"" ); + fprintf( f, "\"\n" ); + } for (i = 0; i <= key->last_value; i++) dump_value( &key->values[i], f ); } for (i = 0; i <= key->last_subkey; i++) save_subkeys( key->subkeys[i], base, f ); @@ -1224,6 +1230,27 @@ static struct key *load_key( struct key *base, const char *buffer, int flags, return create_key( base, &name, NULL, flags, 0, 0, modif, &res ); } +/* load a key option from the input file */ +static int load_key_option( struct key *key, const char *buffer, struct file_load_info *info ) +{ + const char *p; + data_size_t len; + + if (!strncmp( buffer, "#class=", 7 )) + { + p = buffer + 7; + if (*p++ != '"') return 0; + if (!get_file_tmp_space( info, strlen(p) * sizeof(WCHAR) )) return 0; + len = info->tmplen; + if (parse_strW( info->tmp, &len, p, '\"' ) == -1) return 0; + free( key->class ); + if (!(key->class = memdup( info->tmp, len ))) len = 0; + key->classlen = len; + } + /* ignore unknown options */ + return 1; +} + /* parse a comma-separated list of hex digits */ static int parse_hex( unsigned char *dest, data_size_t *len, const char *buffer ) { @@ -1420,7 +1447,9 @@ static void load_keys( struct key *key, const char *filename, FILE *f, int prefi if (subkey) load_value( subkey, p, &info ); else file_read_error( "Value without key", &info ); break; - case '#': /* comment */ + case '#': /* option */ + if (subkey) load_key_option( subkey, p, &info ); + break; case ';': /* comment */ case 0: /* empty line */ break;

1 0