March 2010 - Wine-Commits - list.winehq.org

Alexandre Julliard : server: Initial support for Wow64 registry redirection .
by Alexandre Julliard March 2, 2010

March 2, 2010

Module: wine Branch: master Commit: ac08b038f00ede310543d102dfeba18d34c9b566 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac08b038f00ede310543d102d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 2 12:03:17 2010 +0100 server: Initial support for Wow64 registry redirection. --- dlls/ntdll/tests/reg.c | 3 ++- server/registry.c | 48 +++++++++++++++++++++++++++++++++++++++++++----- server/thread.c | 7 +++++++ server/thread.h | 1 + 4 files changed, 53 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index d534240..4480bbf 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -1157,7 +1157,8 @@ static void test_redirection(void) dw = get_key_value( key, "Winetest", 0 ); ok( dw == 64 || broken(dw == 32) /* xp64 */, "wrong value %u\n", dw ); check_key_value( key, "Winetest", KEY_WOW64_64KEY, 64 ); - check_key_value( key, "Winetest", KEY_WOW64_32KEY, 32 ); + dw = get_key_value( key, "Winetest", KEY_WOW64_32KEY ); + todo_wine ok( dw == 32, "wrong value %u\n", dw ); pNtClose( key ); status = pNtCreateKey( &key, KEY_WOW64_32KEY | KEY_ALL_ACCESS, &attr, 0, 0, 0, 0 ); diff --git a/server/registry.c b/server/registry.c index ea7ea20..ad57bd2 100644 --- a/server/registry.c +++ b/server/registry.c @@ -84,6 +84,7 @@ struct key #define KEY_DELETED 0x0002 /* key has been deleted */ #define KEY_DIRTY 0x0004 /* key has been modified */ #define KEY_SYMLINK 0x0008 /* key is a symbolic link */ +#define KEY_WOW64 0x0010 /* key contains a Wow6432Node subkey */ /* a key value */ struct key_value @@ -109,6 +110,7 @@ static const timeout_t save_period = 30 * -TICKS_PER_SEC; /* delay between peri static struct timeout_user *save_timeout_user; /* saving timer */ static const WCHAR root_name[] = { '\\','R','e','g','i','s','t','r','y','\\' }; +static const WCHAR wow6432node[] = {'W','o','w','6','4','3','2','N','o','d','e'}; static const WCHAR symlink_value[] = {'S','y','m','b','o','l','i','c','L','i','n','k','V','a','l','u','e'}; static const struct unicode_str symlink_str = { symlink_value, sizeof(symlink_value) }; @@ -166,6 +168,12 @@ static const struct object_ops key_ops = }; +static inline int is_wow6432node( const WCHAR *name, unsigned int len ) +{ + return (len == sizeof(wow6432node) && + !memicmpW( name, wow6432node, sizeof(wow6432node)/sizeof(WCHAR) )); +} + /* * The registry text file format v2 used by this code is similar to the one * used by REGEDIT import/export functionality, with the following differences: @@ -528,6 +536,7 @@ static struct key *alloc_subkey( struct key *parent, const struct unicode_str *n for (i = ++parent->last_subkey; i > index; i--) parent->subkeys[i] = parent->subkeys[i-1]; parent->subkeys[index] = key; + if (is_wow6432node( key->name, key->namelen )) parent->flags |= KEY_WOW64; } return key; } @@ -546,6 +555,7 @@ static void free_subkey( struct key *parent, int index ) parent->last_subkey--; key->flags |= KEY_DELETED; key->parent = NULL; + if (is_wow6432node( key->name, key->namelen )) parent->flags &= ~KEY_WOW64; release_object( key ); /* try to shrink the array */ @@ -587,6 +597,22 @@ static struct key *find_subkey( const struct key *key, const struct unicode_str return NULL; } +/* return the wow64 variant of the key, or the key itself if none */ +static struct key *find_wow64_subkey( struct key *key, const struct unicode_str *name ) +{ + static const struct unicode_str wow6432node_str = { wow6432node, sizeof(wow6432node) }; + int index; + + if (!(key->flags & KEY_WOW64)) return key; + if (!is_wow6432node( name->str, name->len )) + { + key = find_subkey( key, &wow6432node_str, &index ); + assert( key ); /* if KEY_WOW64 is set we must find it */ + } + return key; +} + + /* follow a symlink and return the resolved key */ static struct key *follow_symlink( struct key *key, int iteration ) { @@ -618,13 +644,15 @@ static struct key *follow_symlink( struct key *key, int iteration ) } /* open a subkey */ -static struct key *open_key( struct key *key, const struct unicode_str *name, unsigned int attributes ) +static struct key *open_key( struct key *key, const struct unicode_str *name, unsigned int access, + unsigned int attributes ) { int index; struct unicode_str token; token.str = NULL; if (!get_path_token( name, &token )) return NULL; + if (access & KEY_WOW64_32KEY) key = find_wow64_subkey( key, &token ); while (token.len) { if (!(key = find_subkey( key, &token, &index ))) @@ -634,6 +662,7 @@ static struct key *open_key( struct key *key, const struct unicode_str *name, un } get_path_token( name, &token ); if (!token.len) break; + if (!(access & KEY_WOW64_64KEY)) key = find_wow64_subkey( key, &token ); if (!(key = follow_symlink( key, 0 ))) { set_error( STATUS_OBJECT_NAME_NOT_FOUND ); @@ -641,6 +670,7 @@ static struct key *open_key( struct key *key, const struct unicode_str *name, un } } + if (!(access & KEY_WOW64_64KEY)) key = find_wow64_subkey( key, &token ); if (!(attributes & OBJ_OPENLINK) && !(key = follow_symlink( key, 0 ))) { set_error( STATUS_OBJECT_NAME_NOT_FOUND ); @@ -654,7 +684,7 @@ static struct key *open_key( struct key *key, const struct unicode_str *name, un /* create a subkey */ static struct key *create_key( struct key *key, const struct unicode_str *name, const struct unicode_str *class, unsigned int options, - unsigned int attributes, int *created ) + unsigned int access, unsigned int attributes, int *created ) { int index; struct unicode_str token, next; @@ -668,6 +698,7 @@ static struct key *create_key( struct key *key, const struct unicode_str *name, token.str = NULL; if (!get_path_token( name, &token )) return NULL; *created = 0; + if (access & KEY_WOW64_32KEY) key = find_wow64_subkey( key, &token ); while (token.len) { struct key *subkey; @@ -675,6 +706,7 @@ static struct key *create_key( struct key *key, const struct unicode_str *name, key = subkey; get_path_token( name, &token ); if (!token.len) break; + if (!(access & KEY_WOW64_64KEY)) key = find_wow64_subkey( key, &token ); if (!(key = follow_symlink( key, 0 ))) { set_error( STATUS_OBJECT_NAME_NOT_FOUND ); @@ -684,6 +716,7 @@ static struct key *create_key( struct key *key, const struct unicode_str *name, if (!token.len) /* the key already exists */ { + if (!(access & KEY_WOW64_64KEY)) key = find_wow64_subkey( key, &token ); if (options & REG_OPTION_CREATE_LINK) { set_error( STATUS_OBJECT_NAME_COLLISION ); @@ -1786,6 +1819,8 @@ DECL_HANDLER(create_key) struct unicode_str name, class; unsigned int access = req->access; + if (!is_wow64_thread( current )) access = (access & ~KEY_WOW64_32KEY) | KEY_WOW64_64KEY; + reply->hkey = 0; if (req->namelen > get_req_data_size()) @@ -1806,7 +1841,8 @@ DECL_HANDLER(create_key) /* NOTE: no access rights are required from the parent handle to create a key */ if ((parent = get_parent_hkey_obj( req->parent ))) { - if ((key = create_key( parent, &name, &class, req->options, req->attributes, &reply->created ))) + if ((key = create_key( parent, &name, &class, req->options, access, + req->attributes, &reply->created ))) { reply->hkey = alloc_handle( current->process, key, access, req->attributes ); release_object( key ); @@ -1822,12 +1858,14 @@ DECL_HANDLER(open_key) struct unicode_str name; unsigned int access = req->access; + if (!is_wow64_thread( current )) access = (access & ~KEY_WOW64_32KEY) | KEY_WOW64_64KEY; + reply->hkey = 0; /* NOTE: no access rights are required to open the parent key, only the child key */ if ((parent = get_parent_hkey_obj( req->parent ))) { get_req_path( &name, !req->parent ); - if ((key = open_key( parent, &name, req->attributes ))) + if ((key = open_key( parent, &name, access, req->attributes ))) { reply->hkey = alloc_handle( current->process, key, access, req->attributes ); release_object( key ); @@ -1961,7 +1999,7 @@ DECL_HANDLER(load_registry) { int dummy; get_req_path( &name, !req->hkey ); - if ((key = create_key( parent, &name, NULL, 0, 0, &dummy ))) + if ((key = create_key( parent, &name, NULL, 0, KEY_WOW64_64KEY, 0, &dummy ))) { load_registry( key, req->file ); release_object( key ); diff --git a/server/thread.c b/server/thread.c index bdb6c3c..a6bc55a 100644 --- a/server/thread.c +++ b/server/thread.c @@ -67,6 +67,7 @@ static const unsigned int supported_cpus = CPU_FLAG(CPU_SPARC); #else #error Unsupported CPU #endif +#define CPU_64BIT_MASK CPU_FLAG(CPU_x86_64) /* thread queues */ @@ -408,6 +409,12 @@ struct thread *get_thread_from_pid( int pid ) return NULL; } +/* determine if the thread is wow64 (32-bit client running on 64-bit server) */ +int is_wow64_thread( struct thread *thread ) +{ + return (supported_cpus & CPU_64BIT_MASK) && !(CPU_FLAG(thread->process->cpu) & CPU_64BIT_MASK); +} + int set_thread_affinity( struct thread *thread, affinity_t affinity ) { int ret = 0; diff --git a/server/thread.h b/server/thread.h index 1e95732..045a43c 100644 --- a/server/thread.h +++ b/server/thread.h @@ -118,6 +118,7 @@ extern int thread_add_inflight_fd( struct thread *thread, int client, int server extern int thread_get_inflight_fd( struct thread *thread, int client ); extern struct thread_snapshot *thread_snap( int *count ); extern struct token *thread_get_impersonation_token( struct thread *thread ); +extern int is_wow64_thread( struct thread *thread ); extern int set_thread_affinity( struct thread *thread, affinity_t affinity ); /* ptrace functions */

1 0

Hans Leidekker : msi: Only create environment strings when the component is set to be installed.
by Alexandre Julliard March 2, 2010

March 2, 2010

Module: wine Branch: master Commit: c8308ef99da4361aa558fa02665421d2e9d3540a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8308ef99da4361aa558fa026… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 2 14:55:31 2010 +0100 msi: Only create environment strings when the component is set to be installed. --- dlls/msi/action.c | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 0569cc7..6ff4c67 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -5702,13 +5702,14 @@ static LONG env_set_flags( LPCWSTR *name, LPCWSTR *value, DWORD *flags ) static UINT ITERATE_WriteEnvironmentString( MSIRECORD *rec, LPVOID param ) { MSIPACKAGE *package = param; - LPCWSTR name, value; + LPCWSTR name, value, component; LPWSTR data = NULL, newval = NULL; LPWSTR deformatted = NULL, ptr; DWORD flags, type, size; LONG res; HKEY env = NULL, root; LPCWSTR environment; + MSICOMPONENT *comp; static const WCHAR user_env[] = {'E','n','v','i','r','o','n','m','e','n','t',0}; @@ -5719,6 +5720,19 @@ static UINT ITERATE_WriteEnvironmentString( MSIRECORD *rec, LPVOID param ) 'S','e','s','s','i','o','n',' ','M','a','n','a','g','e','r','\\', 'E','n','v','i','r','o','n','m','e','n','t',0}; + component = MSI_RecordGetString(rec, 4); + comp = get_loaded_component(package, component); + if (!comp) + return ERROR_SUCCESS; + + if (comp->ActionRequest != INSTALLSTATE_LOCAL) + { + 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(rec, 2); value = MSI_RecordGetString(rec, 3);

1 0

Hans Leidekker : msi: Improve a trace.
by Alexandre Julliard March 2, 2010

March 2, 2010

Module: wine Branch: master Commit: a64372ca44e08dbaaf9376607ea2d6e6c38879dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=a64372ca44e08dbaaf9376607… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 2 14:55:06 2010 +0100 msi: Improve a trace. --- dlls/msi/action.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 872e8dd..0569cc7 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -6688,7 +6688,10 @@ static UINT ACTION_ScheduleReboot( MSIPACKAGE *package ) static UINT ACTION_AllocateRegistrySpace( MSIPACKAGE *package ) { - TRACE("%p\n", package); + static const WCHAR szAvailableFreeReg[] = + {'A','V','A','I','L','A','B','L','E','F','R','E','E','R','E','G',0}; + + TRACE("%p %d kilobytes\n", package, msi_get_property_int( package, szAvailableFreeReg, 0 )); return ERROR_SUCCESS; }

1 0

Andrey Turkin : userenv: Implement stubbed userenv.dll.138.
by Alexandre Julliard March 2, 2010

March 2, 2010

Module: wine Branch: master Commit: baf86a13f3f93a5f9076e714523d11052078dabc URL: http://source.winehq.org/git/wine.git/?a=commit;h=baf86a13f3f93a5f9076e7145… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Tue Mar 2 15:35:26 2010 +0300 userenv: Implement stubbed userenv.dll.138. --- dlls/userenv/userenv.spec | 2 ++ dlls/userenv/userenv_main.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 0 deletions(-) diff --git a/dlls/userenv/userenv.spec b/dlls/userenv/userenv.spec index 8b0b749..bde8c07 100644 --- a/dlls/userenv/userenv.spec +++ b/dlls/userenv/userenv.spec @@ -1,3 +1,5 @@ +138 stdcall @(long str str str str long str long long str str long) USERENV_138 + @ stdcall CreateEnvironmentBlock(ptr ptr long) @ stdcall DestroyEnvironmentBlock(ptr) @ stdcall ExpandEnvironmentStringsForUserA(ptr str ptr long) diff --git a/dlls/userenv/userenv_main.c b/dlls/userenv/userenv_main.c index 38fb64c..ddf0e21 100644 --- a/dlls/userenv/userenv_main.c +++ b/dlls/userenv/userenv_main.c @@ -176,3 +176,40 @@ BOOL WINAPI UnloadUserProfile( HANDLE hToken, HANDLE hProfile ) FIXME("(%p, %p): stub\n", hToken, hProfile); return FALSE; } + +/****************************************************************************** + * USERENV.138 + * + * Create .lnk file + * + * PARAMETERS + * int csidl [in] well-known directory location to create link in + * LPCSTR lnk_dir [in] directory (relative to directory specified by csidl) to create link in + * LPCSTR lnk_filename [in] filename of the link file without .lnk extension + * LPCSTR lnk_target [in] file/directory pointed to by link + * LPCSTR lnk_iconfile [in] link icon resource filename + * DWORD lnk_iconid [in] link icon resource id in file referred by lnk_iconfile + * LPCSTR work_directory [in] link target's work directory + * WORD hotkey [in] link hotkey (virtual key id) + * DWORD win_state [in] initial window size (SW_SHOWMAXIMIZED to start maximized, + * SW_SHOWMINNOACTIVE to start minimized, everything else is default state) + * LPCSTR comment [in] comment - link's comment + * LPCSTR loc_filename_resfile [in] resource file which holds localized filename for this link file + * DWORD loc_filename_resid [in] resource id for this link file's localized filename + * + * RETURNS + * TRUE: Link file was successfully created + * FALSE: Link file was not created + */ +BOOL WINAPI USERENV_138( int csidl, LPCSTR lnk_dir, LPCSTR lnk_filename, + LPCSTR lnk_target, LPCSTR lnk_iconfile, DWORD lnk_iconid, + LPCSTR work_directory, WORD hotkey, DWORD win_state, LPCSTR comment, + LPCSTR loc_filename_resfile, DWORD loc_filename_resid) +{ + FIXME("(%d,%s,%s,%s,%s,%d,%s,0x%x,%d,%s,%s,%d) - stub\n", csidl, debugstr_a(lnk_dir), + debugstr_a(lnk_filename), debugstr_a(lnk_target), debugstr_a(lnk_iconfile), + lnk_iconid, debugstr_a(work_directory), hotkey, win_state, + debugstr_a(comment), debugstr_a(loc_filename_resfile), loc_filename_resid ); + + return FALSE; +}

1 0

Henri Verbeet : user32: Also show dialogs right after a WM_TIMER message.
by Alexandre Julliard March 2, 2010

March 2, 2010

Module: wine Branch: master Commit: 6ee4a87ad6958dc2e00fff646a3bb2b50d188977 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ee4a87ad6958dc2e00fff646… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 2 11:51:52 2010 +0100 user32: Also show dialogs right after a WM_TIMER message. --- dlls/user32/dialog.c | 6 +++++ dlls/user32/tests/dialog.c | 50 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 0 deletions(-) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index 325d6e2..79f5182 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -815,6 +815,12 @@ INT DIALOG_DoDialogBox( HWND hwnd, HWND owner ) DispatchMessageW( &msg ); } if (dlgInfo->flags & DF_END) break; + + if (bFirstEmpty && msg.message == WM_TIMER) + { + ShowWindow( hwnd, SW_SHOWNORMAL ); + bFirstEmpty = FALSE; + } } } if (dlgInfo->flags & DF_OWNERENABLED) DIALOG_EnableOwner( owner ); diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index ef4d5dc..1b36c53 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -1157,6 +1157,55 @@ static void test_SaveRestoreFocus(void) DestroyWindow(hDlg); } +static INT_PTR CALLBACK timer_message_dlg_proc(HWND wnd, UINT msg, WPARAM wparam, LPARAM lparam) +{ + static int count; + BOOL visible; + + switch (msg) + { + case WM_INITDIALOG: + visible = GetWindowLong(wnd, GWL_STYLE) & WS_VISIBLE; + ok(!visible, "Dialog should not be visible.\n"); + SetTimer(wnd, 1, 100, NULL); + Sleep(200); + return FALSE; + + case WM_COMMAND: + if (LOWORD(wparam) != IDCANCEL) return FALSE; + EndDialog(wnd, LOWORD(wparam)); + return TRUE; + + case WM_TIMER: + if (wparam != 1) return FALSE; + visible = GetWindowLong(wnd, GWL_STYLE) & WS_VISIBLE; + if (!count++) + { + ok(!visible, "Dialog should not be visible.\n"); + PostMessage(wnd, WM_USER, 0, 0); + } + else + { + ok(visible, "Dialog should be visible.\n"); + PostMessage(wnd, WM_COMMAND, IDCANCEL, 0); + } + return TRUE; + + case WM_USER: + visible = GetWindowLong(wnd, GWL_STYLE) & WS_VISIBLE; + ok(visible, "Dialog should be visible.\n"); + return TRUE; + + default: + return FALSE; + } +} + +static void test_timer_message(void) +{ + DialogBoxA(g_hinst, "RADIO_TEST_DIALOG", NULL, timer_message_dlg_proc); +} + START_TEST(dialog) { g_hinst = GetModuleHandleA (0); @@ -1172,4 +1221,5 @@ START_TEST(dialog) test_DisabledDialogTest(); test_MessageBoxFontTest(); test_SaveRestoreFocus(); + test_timer_message(); }

1 0

Hans Leidekker : msi: Look at the requested action when installing services , not the action taken.
by Alexandre Julliard March 2, 2010

March 2, 2010

Module: wine Branch: master Commit: 87448dcaebabc44c79703cd7a5b708896e4f8751 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87448dcaebabc44c79703cd7a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 2 14:56:01 2010 +0100 msi: Look at the requested action when installing services, not the action taken. --- dlls/msi/action.c | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 6ff4c67..0011bc5 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -5001,15 +5001,24 @@ static UINT ITERATE_StartService(MSIRECORD *rec, LPVOID param) MSIPACKAGE *package = param; MSICOMPONENT *comp; SC_HANDLE scm = NULL, service = NULL; - LPCWSTR *vector = NULL; + LPCWSTR component, *vector = NULL; LPWSTR name, args; DWORD event, numargs; UINT r = ERROR_FUNCTION_FAILED; - comp = get_loaded_component(package, MSI_RecordGetString(rec, 6)); - if (!comp || comp->Action == INSTALLSTATE_UNKNOWN || comp->Action == INSTALLSTATE_ABSENT) + component = MSI_RecordGetString(rec, 6); + comp = get_loaded_component(package, component); + if (!comp) return ERROR_SUCCESS; + if (comp->ActionRequest != INSTALLSTATE_LOCAL) + { + TRACE("Component not scheduled for installation: %s\n", debugstr_w(component)); + comp->Action = comp->Installed; + return ERROR_SUCCESS; + } + comp->Action = INSTALLSTATE_LOCAL; + deformat_string(package, MSI_RecordGetString(rec, 2), &name); deformat_string(package, MSI_RecordGetString(rec, 4), &args); event = MSI_RecordGetInteger(rec, 3);

1 0

Marcus Meissner : windowscodecs: Handle old libpng.so using distros ( as SLE 10).
by Alexandre Julliard March 2, 2010

March 2, 2010

Module: wine Branch: master Commit: 615e0e64f9fa3a910c58af2a382943546d3230a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=615e0e64f9fa3a910c58af2a3… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Feb 27 23:13:21 2010 +0100 windowscodecs: Handle old libpng.so using distros (as SLE 10). --- configure | 84 ++++++++++++++++++++++++++++++++++++++++ configure.ac | 5 ++ dlls/windowscodecs/pngformat.c | 12 ++++++ include/config.h.in | 3 + 4 files changed, 104 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 5ecb68f..6d98218 100755 --- a/configure +++ b/configure @@ -11060,6 +11060,49 @@ _ACEOF fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for png_set_expand_gray_1_2_4_to_8 in -lpng" >&5 +$as_echo_n "checking for png_set_expand_gray_1_2_4_to_8 in -lpng... " >&6; } +if test "${ac_cv_lib_png_png_set_expand_gray_1_2_4_to_8+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lpng -lm -lz $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char png_set_expand_gray_1_2_4_to_8 (); +int +main () +{ +return png_set_expand_gray_1_2_4_to_8 (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_png_png_set_expand_gray_1_2_4_to_8=yes +else + ac_cv_lib_png_png_set_expand_gray_1_2_4_to_8=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_png_png_set_expand_gray_1_2_4_to_8" >&5 +$as_echo "$ac_cv_lib_png_png_set_expand_gray_1_2_4_to_8" >&6; } +if test "x$ac_cv_lib_png_png_set_expand_gray_1_2_4_to_8" = x""yes; then : + +$as_echo "#define HAVE_PNG_SET_EXPAND_GRAY_1_2_4_TO_8 1" >>confdefs.h + + +fi + elif test -n "$X_CFLAGS" -a "x$with_png" != "xno" then ac_save_CPPFLAGS="$CPPFLAGS" @@ -11132,6 +11175,47 @@ _ACEOF fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for png_set_expand_gray_1_2_4_to_8 in -lpng" >&5 +$as_echo_n "checking for png_set_expand_gray_1_2_4_to_8 in -lpng... " >&6; } +if test "${ac_cv_lib_png_png_set_expand_gray_1_2_4_to_8+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lpng $X_LIBS -lm -lz $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char png_set_expand_gray_1_2_4_to_8 (); +int +main () +{ +return png_set_expand_gray_1_2_4_to_8 (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_png_png_set_expand_gray_1_2_4_to_8=yes +else + ac_cv_lib_png_png_set_expand_gray_1_2_4_to_8=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_png_png_set_expand_gray_1_2_4_to_8" >&5 +$as_echo "$ac_cv_lib_png_png_set_expand_gray_1_2_4_to_8" >&6; } +if test "x$ac_cv_lib_png_png_set_expand_gray_1_2_4_to_8" = x""yes; then : + $as_echo "#define HAVE_PNG_SET_EXPAND_GRAY_1_2_4_TO_8 1" >>confdefs.h + +fi + fi fi if test "x$ac_cv_lib_soname_png" = "x"; then : diff --git a/configure.ac b/configure.ac index 0796200..8eb37a2 100644 --- a/configure.ac +++ b/configure.ac @@ -1420,6 +1420,9 @@ dnl **** Check for libpng **** if test "$ac_cv_header_png_h" = "yes" then WINE_CHECK_SONAME(png,png_create_read_struct,,,-lm -lz,[[libpng[[0-9]]*]]) + AC_CHECK_LIB(png,png_set_expand_gray_1_2_4_to_8, + [AC_DEFINE(HAVE_PNG_SET_EXPAND_GRAY_1_2_4_TO_8,1,[Define to 1 if libpng has the png_set_expand_gray_1_2_4_to_8 function.])] + ,,-lm -lz) elif test -n "$X_CFLAGS" -a "x$with_png" != "xno" then dnl libpng is in the X directory on Mac OS X @@ -1432,6 +1435,8 @@ then then AC_SUBST(PNGINCL,"$X_CFLAGS") WINE_CHECK_SONAME(png,png_create_read_struct,,,[$X_LIBS -lm -lz],[[libpng[[0-9]]*]]) + AC_CHECK_LIB(png,png_set_expand_gray_1_2_4_to_8, + [AC_DEFINE(HAVE_PNG_SET_EXPAND_GRAY_1_2_4_TO_8,1)],,[$X_LIBS -lm -lz]) fi fi WINE_WARNING_WITH(png,[test "x$ac_cv_lib_soname_png" = "x"], diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 482ea90..22b37b0 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -60,7 +60,11 @@ MAKE_FUNCPTR(png_get_PLTE); MAKE_FUNCPTR(png_get_tRNS); MAKE_FUNCPTR(png_set_bgr); MAKE_FUNCPTR(png_set_error_fn); +#if HAVE_PNG_SET_EXPAND_GRAY_1_2_4_TO_8 MAKE_FUNCPTR(png_set_expand_gray_1_2_4_to_8); +#else +MAKE_FUNCPTR(png_set_gray_1_2_4_to_8); +#endif MAKE_FUNCPTR(png_set_filler); MAKE_FUNCPTR(png_set_gray_to_rgb); MAKE_FUNCPTR(png_set_IHDR); @@ -103,7 +107,11 @@ static void *load_libpng(void) LOAD_FUNCPTR(png_get_tRNS); LOAD_FUNCPTR(png_set_bgr); LOAD_FUNCPTR(png_set_error_fn); +#if HAVE_PNG_SET_EXPAND_GRAY_1_2_4_TO_8 LOAD_FUNCPTR(png_set_expand_gray_1_2_4_to_8); +#else + LOAD_FUNCPTR(png_set_gray_1_2_4_to_8); +#endif LOAD_FUNCPTR(png_set_filler); LOAD_FUNCPTR(png_set_gray_to_rgb); LOAD_FUNCPTR(png_set_IHDR); @@ -306,7 +314,11 @@ static HRESULT WINAPI PngDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p { if (bit_depth < 8) { +#if HAVE_PNG_SET_EXPAND_GRAY_1_2_4_TO_8 ppng_set_expand_gray_1_2_4_to_8(This->png_ptr); +#else + ppng_set_gray_1_2_4_to_8(This->png_ptr); +#endif bit_depth = 8; } ppng_set_gray_to_rgb(This->png_ptr); diff --git a/include/config.h.in b/include/config.h.in index 4e8fcd1..7c34980 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -582,6 +582,9 @@ /* Define to 1 if you have the <png.h> header file. */ #undef HAVE_PNG_H +/* Define to 1 if libpng has the png_set_expand_gray_1_2_4_to_8 function. */ +#undef HAVE_PNG_SET_EXPAND_GRAY_1_2_4_TO_8 + /* Define to 1 if you have the `poll' function. */ #undef HAVE_POLL

1 0

Christian Costa : d3dx9_36: Remove useless HEAP_ZERO_MEMORY flag ( spotted by Henri Verbeet).
by Alexandre Julliard March 2, 2010

March 2, 2010

Module: wine Branch: master Commit: a942fe6fd7dba666cc9e68ac263572082e77d540 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a942fe6fd7dba666cc9e68ac2… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Tue Mar 2 08:37:07 2010 +0100 d3dx9_36: Remove useless HEAP_ZERO_MEMORY flag (spotted by Henri Verbeet). --- dlls/d3dx9_36/shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 5de3cad..9acad32 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -611,7 +611,7 @@ HRESULT WINAPI D3DXGetShaderConstantTableEx(CONST DWORD* pFunction, object->lpVtbl = &ID3DXConstantTable_Vtbl; object->ref = 1; - object->ctab = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); + object->ctab = HeapAlloc(GetProcessHeap(), 0, size); if (!object->ctab) { HeapFree(GetProcessHeap(), 0, object);

1 0

Alexandre Goujon : configure: Add dll name recognition for cygwin.
by Alexandre Julliard March 2, 2010

March 2, 2010

Module: wine Branch: master Commit: 2b05c84016958a86247b278aa764618d9ae3cb76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b05c84016958a86247b278aa… Author: Alexandre Goujon <ale.goujon(a)gmail.com> Date: Mon Mar 1 21:39:39 2010 +0100 configure: Add dll name recognition for cygwin. --- aclocal.m4 | 2 +- configure | 64 ++++++++++++++++++++++++++++++------------------------------ 2 files changed, 33 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2b05c84016958a86247b2…

1 0

Roderick Colenbrander : opengl32: Update opengl extensions.
by Alexandre Julliard March 2, 2010

March 2, 2010

Module: wine Branch: master Commit: 6c84c3f9ad141ef38e411df4cd3af2f767957e08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c84c3f9ad141ef38e411df4c… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Tue Mar 2 11:38:19 2010 +0100 opengl32: Update opengl extensions. --- dlls/opengl32/opengl_ext.c | 40 ++++++++++++++++++++-------------------- 1 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/opengl32/opengl_ext.c b/dlls/opengl32/opengl_ext.c index e446382..e3c767e 100644 --- a/dlls/opengl32/opengl_ext.c +++ b/dlls/opengl32/opengl_ext.c @@ -731,6 +731,8 @@ enum extensions EXT_glMTexCoord2fvSGIS, EXT_glMakeBufferNonResidentNV, EXT_glMakeBufferResidentNV, + EXT_glMakeNamedBufferNonResidentNV, + EXT_glMakeNamedBufferResidentNV, EXT_glMapBuffer, EXT_glMapBufferARB, EXT_glMapBufferRange, @@ -921,8 +923,6 @@ enum extensions EXT_glNamedFramebufferTextureEXT, EXT_glNamedFramebufferTextureFaceEXT, EXT_glNamedFramebufferTextureLayerEXT, - EXT_glNamedMakeBufferNonResidentNV, - EXT_glNamedMakeBufferResidentNV, EXT_glNamedProgramLocalParameter4dEXT, EXT_glNamedProgramLocalParameter4dvEXT, EXT_glNamedProgramLocalParameter4fEXT, @@ -7570,6 +7570,22 @@ static void WINAPI wine_glMakeBufferResidentNV( GLenum target, GLenum access ) { LEAVE_GL(); } +static void WINAPI wine_glMakeNamedBufferNonResidentNV( GLuint buffer ) { + void (*func_glMakeNamedBufferNonResidentNV)( GLuint ) = extension_funcs[EXT_glMakeNamedBufferNonResidentNV]; + TRACE("(%d)\n", buffer ); + ENTER_GL(); + func_glMakeNamedBufferNonResidentNV( buffer ); + LEAVE_GL(); +} + +static void WINAPI wine_glMakeNamedBufferResidentNV( GLuint buffer, GLenum access ) { + void (*func_glMakeNamedBufferResidentNV)( GLuint, GLenum ) = extension_funcs[EXT_glMakeNamedBufferResidentNV]; + TRACE("(%d, %d)\n", buffer, access ); + ENTER_GL(); + func_glMakeNamedBufferResidentNV( buffer, access ); + LEAVE_GL(); +} + static GLvoid* WINAPI wine_glMapBuffer( GLenum target, GLenum access ) { GLvoid* ret_value; GLvoid* (*func_glMapBuffer)( GLenum, GLenum ) = extension_funcs[EXT_glMapBuffer]; @@ -9100,22 +9116,6 @@ static void WINAPI wine_glNamedFramebufferTextureLayerEXT( GLuint framebuffer, G LEAVE_GL(); } -static void WINAPI wine_glNamedMakeBufferNonResidentNV( GLuint buffer ) { - void (*func_glNamedMakeBufferNonResidentNV)( GLuint ) = extension_funcs[EXT_glNamedMakeBufferNonResidentNV]; - TRACE("(%d)\n", buffer ); - ENTER_GL(); - func_glNamedMakeBufferNonResidentNV( buffer ); - LEAVE_GL(); -} - -static void WINAPI wine_glNamedMakeBufferResidentNV( GLuint buffer, GLenum access ) { - void (*func_glNamedMakeBufferResidentNV)( GLuint, GLenum ) = extension_funcs[EXT_glNamedMakeBufferResidentNV]; - TRACE("(%d, %d)\n", buffer, access ); - ENTER_GL(); - func_glNamedMakeBufferResidentNV( buffer, access ); - LEAVE_GL(); -} - static void WINAPI wine_glNamedProgramLocalParameter4dEXT( GLuint program, GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w ) { void (*func_glNamedProgramLocalParameter4dEXT)( GLuint, GLenum, GLuint, GLdouble, GLdouble, GLdouble, GLdouble ) = extension_funcs[EXT_glNamedProgramLocalParameter4dEXT]; TRACE("(%d, %d, %d, %f, %f, %f, %f)\n", program, target, index, x, y, z, w ); @@ -15755,6 +15755,8 @@ const OpenGL_extension extension_registry[NB_EXTENSIONS] = { { "glMTexCoord2fvSGIS", "GL_SGIS_multitexture", wine_glMTexCoord2fvSGIS }, { "glMakeBufferNonResidentNV", "GL_NV_shader_buffer_load", wine_glMakeBufferNonResidentNV }, { "glMakeBufferResidentNV", "GL_NV_shader_buffer_load", wine_glMakeBufferResidentNV }, + { "glMakeNamedBufferNonResidentNV", "GL_NV_shader_buffer_load", wine_glMakeNamedBufferNonResidentNV }, + { "glMakeNamedBufferResidentNV", "GL_NV_shader_buffer_load", wine_glMakeNamedBufferResidentNV }, { "glMapBuffer", "GL_VERSION_1_5", wine_glMapBuffer }, { "glMapBufferARB", "GL_ARB_vertex_buffer_object", wine_glMapBufferARB }, { "glMapBufferRange", "GL_ARB_map_buffer_range", wine_glMapBufferRange }, @@ -15945,8 +15947,6 @@ const OpenGL_extension extension_registry[NB_EXTENSIONS] = { { "glNamedFramebufferTextureEXT", "GL_EXT_direct_state_access", wine_glNamedFramebufferTextureEXT }, { "glNamedFramebufferTextureFaceEXT", "GL_EXT_direct_state_access", wine_glNamedFramebufferTextureFaceEXT }, { "glNamedFramebufferTextureLayerEXT", "GL_EXT_direct_state_access", wine_glNamedFramebufferTextureLayerEXT }, - { "glNamedMakeBufferNonResidentNV", "GL_NV_shader_buffer_load", wine_glNamedMakeBufferNonResidentNV }, - { "glNamedMakeBufferResidentNV", "GL_NV_shader_buffer_load", wine_glNamedMakeBufferResidentNV }, { "glNamedProgramLocalParameter4dEXT", "GL_EXT_direct_state_access", wine_glNamedProgramLocalParameter4dEXT }, { "glNamedProgramLocalParameter4dvEXT", "GL_EXT_direct_state_access", wine_glNamedProgramLocalParameter4dvEXT }, { "glNamedProgramLocalParameter4fEXT", "GL_EXT_direct_state_access", wine_glNamedProgramLocalParameter4fEXT },

1 0