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

Andy Norris : winealsa: Add support for alsa cards without a PCM mixer ( only Line).
by Alexandre Julliard March 8, 2011

March 8, 2011

Module: wine Branch: master Commit: 254b8f85b5f05e6fa6e688f453520f800086c2fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=254b8f85b5f05e6fa6e688f45… Author: Andy Norris <bk-git(a)usrlocalsbin.com> Date: Sat Mar 5 16:03:55 2011 -0500 winealsa: Add support for alsa cards without a PCM mixer (only Line). --- dlls/winealsa.drv/alsa.c | 153 ++++++++++++++++++++++++--------------------- dlls/winealsa.drv/mixer.c | 10 +++- 2 files changed, 90 insertions(+), 73 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index b242cfa..0b244fa 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -421,6 +421,8 @@ int ALSA_CheckSetVolume(snd_hctl_t *hctl, int *out_left, int *out_right, snd_ctl_elem_info_t * eleminfop = NULL; snd_ctl_elem_value_t * elemvaluep = NULL; snd_ctl_elem_id_t * elemidp = NULL; + const char *names[] = {"PCM Playback Volume", "Line Playback Volume", NULL}; + const char **name; #define EXIT_ON_ERROR(f,txt,exitcode) do \ @@ -447,81 +449,88 @@ int ALSA_CheckSetVolume(snd_hctl_t *hctl, int *out_left, int *out_right, /* Setup and find an element id that exactly matches the characteristic we want ** FIXME: It is probably short sighted to hard code and fixate on PCM Playback Volume */ - snd_ctl_elem_id_set_name(elemidp, "PCM Playback Volume"); - snd_ctl_elem_id_set_interface(elemidp, SND_CTL_ELEM_IFACE_MIXER); - elem = snd_hctl_find_elem(hctl, elemidp); - if (elem) - { - /* Read and return volume information */ - EXIT_ON_ERROR(snd_hctl_elem_info(elem, eleminfop), "snd_hctl_elem_info", MMSYSERR_NOTSUPPORTED); - value_count = snd_ctl_elem_info_get_count(eleminfop); - if (out_min || out_max || out_step) - { - if (!snd_ctl_elem_info_is_readable(eleminfop)) - { - ERR("snd_ctl_elem_info_is_readable returned false; cannot return info\n"); - rc = MMSYSERR_NOTSUPPORTED; - goto out; - } - - if (out_min) - *out_min = snd_ctl_elem_info_get_min(eleminfop); - - if (out_max) - *out_max = snd_ctl_elem_info_get_max(eleminfop); - - if (out_step) - *out_step = snd_ctl_elem_info_get_step(eleminfop); - } - - if (out_left || out_right) - { - EXIT_ON_ERROR(snd_hctl_elem_read(elem, elemvaluep), "snd_hctl_elem_read", MMSYSERR_NOTSUPPORTED); - - if (out_left) - *out_left = snd_ctl_elem_value_get_integer(elemvaluep, 0); - - if (out_right) - { - if (value_count == 1) - *out_right = snd_ctl_elem_value_get_integer(elemvaluep, 0); - else if (value_count == 2) - *out_right = snd_ctl_elem_value_get_integer(elemvaluep, 1); - else - { - ERR("Unexpected value count %d from snd_ctl_elem_info_get_count while getting volume info\n", value_count); - rc = -1; - goto out; - } - } - } - /* Set the volume */ - if (new_left || new_right) - { - EXIT_ON_ERROR(snd_hctl_elem_read(elem, elemvaluep), "snd_hctl_elem_read", MMSYSERR_NOTSUPPORTED); - if (new_left) - snd_ctl_elem_value_set_integer(elemvaluep, 0, *new_left); - if (new_right) - { - if (value_count == 1) - snd_ctl_elem_value_set_integer(elemvaluep, 0, *new_right); - else if (value_count == 2) - snd_ctl_elem_value_set_integer(elemvaluep, 1, *new_right); - else - { - ERR("Unexpected value count %d from snd_ctl_elem_info_get_count while setting volume info\n", value_count); - rc = -1; - goto out; - } - } - - EXIT_ON_ERROR(snd_hctl_elem_write(elem, elemvaluep), "snd_hctl_elem_write", MMSYSERR_NOTSUPPORTED); - } + for( name = names; *name; name++ ) + { + snd_ctl_elem_id_set_name(elemidp, *name); + snd_ctl_elem_id_set_interface(elemidp, SND_CTL_ELEM_IFACE_MIXER); + elem = snd_hctl_find_elem(hctl, elemidp); + if (elem) + { + /* Read and return volume information */ + EXIT_ON_ERROR(snd_hctl_elem_info(elem, eleminfop), "snd_hctl_elem_info", MMSYSERR_NOTSUPPORTED); + value_count = snd_ctl_elem_info_get_count(eleminfop); + if (out_min || out_max || out_step) + { + if (!snd_ctl_elem_info_is_readable(eleminfop)) + { + ERR("snd_ctl_elem_info_is_readable returned false; cannot return info\n"); + rc = MMSYSERR_NOTSUPPORTED; + goto out; + } + + if (out_min) + *out_min = snd_ctl_elem_info_get_min(eleminfop); + + if (out_max) + *out_max = snd_ctl_elem_info_get_max(eleminfop); + + if (out_step) + *out_step = snd_ctl_elem_info_get_step(eleminfop); + } + + if (out_left || out_right) + { + EXIT_ON_ERROR(snd_hctl_elem_read(elem, elemvaluep), "snd_hctl_elem_read", MMSYSERR_NOTSUPPORTED); + + if (out_left) + *out_left = snd_ctl_elem_value_get_integer(elemvaluep, 0); + + if (out_right) + { + if (value_count == 1) + *out_right = snd_ctl_elem_value_get_integer(elemvaluep, 0); + else if (value_count == 2) + *out_right = snd_ctl_elem_value_get_integer(elemvaluep, 1); + else + { + ERR("Unexpected value count %d from snd_ctl_elem_info_get_count while getting volume info\n", value_count); + rc = -1; + goto out; + } + } + } + + /* Set the volume */ + if (new_left || new_right) + { + EXIT_ON_ERROR(snd_hctl_elem_read(elem, elemvaluep), "snd_hctl_elem_read", MMSYSERR_NOTSUPPORTED); + if (new_left) + snd_ctl_elem_value_set_integer(elemvaluep, 0, *new_left); + if (new_right) + { + if (value_count == 1) + snd_ctl_elem_value_set_integer(elemvaluep, 0, *new_right); + else if (value_count == 2) + snd_ctl_elem_value_set_integer(elemvaluep, 1, *new_right); + else + { + ERR("Unexpected value count %d from snd_ctl_elem_info_get_count while setting volume info\n", value_count); + rc = -1; + goto out; + } + } + + EXIT_ON_ERROR(snd_hctl_elem_write(elem, elemvaluep), "snd_hctl_elem_write", MMSYSERR_NOTSUPPORTED); + } + + break; + } } - else + + if( !*name ) { - ERR("Could not find 'PCM Playback Volume' element\n"); + ERR("Could not find '{PCM,Line} Playback Volume' element\n"); rc = MMSYSERR_NOTSUPPORTED; } diff --git a/dlls/winealsa.drv/mixer.c b/dlls/winealsa.drv/mixer.c index 90760eb..7d5b452 100644 --- a/dlls/winealsa.drv/mixer.c +++ b/dlls/winealsa.drv/mixer.c @@ -435,7 +435,7 @@ static void ALSA_MixerInit(void) char cardind[6], cardname[10]; snd_ctl_t *ctl; - snd_mixer_elem_t *elem, *mastelem = NULL, *headelem = NULL, *captelem = NULL, *pcmelem = NULL, *micelem = NULL; + snd_mixer_elem_t *elem, *mastelem = NULL, *headelem = NULL, *captelem = NULL, *pcmelem = NULL, *lineelem = NULL, *micelem = NULL; memset(info, 0, snd_ctl_card_info_sizeof()); memset(&mixdev[mixnum], 0, sizeof(*mixdev)); @@ -520,6 +520,8 @@ static void ALSA_MixerInit(void) headelem = elem; else if (!strcasecmp(snd_mixer_selem_get_name(elem), "PCM") && !pcmelem) pcmelem = elem; + else if (!strcasecmp(snd_mixer_selem_get_name(elem), "Line") && !lineelem) + lineelem = elem; ++(mixdev[mixnum].chans); } } @@ -548,6 +550,12 @@ static void ALSA_MixerInit(void) mastelem = pcmelem; capcontrols -= !!snd_mixer_selem_has_capture_switch(mastelem); } + else if (lineelem && !mastelem) + { + /* Use 'Line' as master device */ + mastelem = lineelem; + capcontrols -= !!snd_mixer_selem_has_capture_switch(mastelem); + } else if (!mastelem && !captelem && !micelem) { /* If there is nothing sensible that can act as 'Master' control, something is wrong */

1 0

Alexandre Julliard : user32: No longer export HOOK_CallHooks.
by Alexandre Julliard March 8, 2011

March 8, 2011

Module: wine Branch: master Commit: 383bda91cfb920171b3a0082bbb59551f00cf5ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=383bda91cfb920171b3a0082b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 8 14:50:47 2011 +0100 user32: No longer export HOOK_CallHooks. --- dlls/user32/user32.spec | 5 ----- dlls/winex11.drv/x11drv.h | 3 --- 2 files changed, 0 insertions(+), 8 deletions(-) diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index be54f77..c89b710 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -780,8 +780,3 @@ # or 'wine_' (for user-visible functions) to avoid namespace conflicts. # @ cdecl __wine_send_input(long ptr) - -################################################################ -# Wine dll separation hacks, these will go away, don't use them -# -@ cdecl HOOK_CallHooks(long long long long long) diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 6f0c8db..c973675 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -858,9 +858,6 @@ extern void X11DRV_XIMLookupChars( const char *str, DWORD count ) DECLSPEC_HIDDE extern void X11DRV_ForceXIMReset(HWND hwnd) DECLSPEC_HIDDEN; extern BOOL X11DRV_SetPreeditState(HWND hwnd, BOOL fOpen); -/* FIXME: private functions imported from user32 */ -extern LRESULT HOOK_CallHooks( INT id, INT code, WPARAM wparam, LPARAM lparam, BOOL unicode ); - #define XEMBED_MAPPED (1 << 0) #endif /* __WINE_X11DRV_H */

1 0

Hans Leidekker : msi: Assume a file is present if the target exists with the same size and there 's no file version or hash to verify.
by Alexandre Julliard March 8, 2011

March 8, 2011

Module: wine Branch: master Commit: 429407cfb6418d64592326d21aa19a25656f2ac4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=429407cfb6418d64592326d21… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 8 10:09:01 2011 +0100 msi: Assume a file is present if the target exists with the same size and there's no file version or hash to verify. --- dlls/msi/files.c | 31 +++++++++++++++++++---------- dlls/msi/msipriv.h | 1 + dlls/msi/tests/install.c | 47 ++++++++++++++++++++++++++++++++++++++++----- 3 files changed, 62 insertions(+), 17 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 493baed..4736fce 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -119,12 +119,21 @@ static msi_file_state calculate_install_state( MSIFILE *file ) { return msifs_overwrite; } - if (file->hash.dwFileHashInfoSize && msi_file_hash_matches( file )) + if (file->hash.dwFileHashInfoSize) { - TRACE("file hashes match, not overwriting\n"); - return msifs_present; + if (msi_file_hash_matches( file )) + { + TRACE("file hashes match, not overwriting\n"); + return msifs_hashmatch; + } + else + { + TRACE("file hashes do not match, overwriting\n"); + return msifs_overwrite; + } } - return msifs_overwrite; + /* assume present */ + return msifs_present; } static void schedule_install_files(MSIPACKAGE *package) @@ -299,6 +308,13 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package) ERR("Unable to load media info for %s (%u)\n", debugstr_w(file->File), rc); return ERROR_FUNCTION_FAILED; } + if (!file->Component->Enabled) continue; + + if (file->state != msifs_hashmatch && (rc = ready_media( package, file, mi ))) + { + ERR("Failed to ready media for %s\n", debugstr_w(file->File)); + goto done; + } if (file->state != msifs_missing && !mi->is_continuous && file->state != msifs_overwrite) continue; @@ -308,13 +324,6 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package) { MSICABDATA data; - rc = ready_media(package, file, mi); - if (rc != ERROR_SUCCESS) - { - ERR("Failed to ready media for %s\n", debugstr_w(file->File)); - goto done; - } - data.mi = mi; data.package = package; data.cb = installfiles_cb; diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 10f51de..096678c 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -499,6 +499,7 @@ typedef enum _msi_file_state { msifs_present, msifs_installed, msifs_skipped, + msifs_hashmatch } msi_file_state; typedef struct tagMSIFILE diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index ae6be76..deff5f7 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -713,7 +713,8 @@ static const CHAR mc_component_dat[] = "Component\tComponentId\tDirectory_\tAttr "maximus\t\tMSITESTDIR\t0\t1\tmaximus\n" "augustus\t\tMSITESTDIR\t0\t1\taugustus\n" "caesar\t\tMSITESTDIR\t0\t1\tcaesar\n" - "gaius\t\tMSITESTDIR\t0\tGAIUS=1\tgaius\n"; + "gaius\t\tMSITESTDIR\t0\tGAIUS=1\tgaius\n" + "tiberius\t\tMSITESTDIR\t0\t\ttiberius\n"; static const CHAR mc_file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" @@ -721,7 +722,8 @@ static const CHAR mc_file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion "maximus\tmaximus\tmaximus\t500\t\t\t16384\t1\n" "augustus\taugustus\taugustus\t500\t\t\t0\t2\n" "caesar\tcaesar\tcaesar\t500\t\t\t16384\t3\n" - "gaius\tgaius\tgaius\t500\t\t\t16384\t4"; + "gaius\tgaius\tgaius\t500\t\t\t16384\t4\n" + "tiberius\ttiberius\ttiberius\t500\t\t\t0\t5\n"; static const CHAR mc_media_dat[] = "DiskId\tLastSequence\tDiskPrompt\tCabinet\tVolumeLabel\tSource\n" "i2\ti4\tL64\tS255\tS32\tS72\n" @@ -729,7 +731,8 @@ static const CHAR mc_media_dat[] = "DiskId\tLastSequence\tDiskPrompt\tCabinet\tV "1\t1\t\ttest1.cab\tDISK1\t\n" "2\t2\t\ttest2.cab\tDISK2\t\n" "3\t3\t\ttest3.cab\tDISK3\t\n" - "4\t4\t\ttest3.cab\tDISK3\t\n"; + "4\t4\t\ttest3.cab\tDISK3\t\n" + "5\t5\t\ttest4.cab\tDISK4\t\n"; static const CHAR mc_file_hash_dat[] = "File_\tOptions\tHashPart1\tHashPart2\tHashPart3\tHashPart4\n" "s72\ti2\ti4\ti4\ti4\ti4\n" @@ -2295,6 +2298,29 @@ static BOOL delete_cf(const CHAR *rel_path, BOOL is_file) return RemoveDirectoryA(path); } +static BOOL compare_pf_data(const char *filename, const char *data, DWORD size) +{ + DWORD read; + HANDLE handle; + BOOL ret = FALSE; + char *buffer, path[MAX_PATH]; + + lstrcpyA(path, PROG_FILES_DIR); + lstrcatA(path, "\\"); + lstrcatA(path, filename); + + handle = CreateFileA(path, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + buffer = HeapAlloc(GetProcessHeap(), 0, size); + if (buffer) + { + ReadFile(handle, buffer, size, &read, NULL); + if (read == size && !memcmp(data, buffer, size)) ret = TRUE; + HeapFree(GetProcessHeap(), 0, buffer); + } + CloseHandle(handle); + return ret; +} + static void delete_test_files(void) { DeleteFileA("msitest.msi"); @@ -4068,15 +4094,18 @@ static void test_missingcab(void) CreateDirectoryA("msitest", NULL); create_file("msitest\\augustus", 500); create_file("maximus", 500); + create_file("tiberius", 500); create_database(msifile, mc_tables, sizeof(mc_tables) / sizeof(msi_table)); MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); create_cab_file("test1.cab", MEDIA_SIZE, "maximus\0"); + create_cab_file("test4.cab", MEDIA_SIZE, "tiberius\0"); create_pf("msitest", FALSE); create_pf_data("msitest\\caesar", "abcdefgh", TRUE); + create_pf_data("msitest\\tiberius", "abcdefgh", TRUE); r = MsiInstallProductA(msifile, NULL); if (r == ERROR_INSTALL_PACKAGE_REJECTED) @@ -4093,11 +4122,14 @@ static void test_missingcab(void) ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n"); } ok(delete_pf("msitest\\caesar", TRUE), "File not installed\n"); + ok(compare_pf_data("msitest\\tiberius", "abcdefgh", sizeof("abcdefgh")), "Wrong file contents\n"); + ok(delete_pf("msitest\\tiberius", TRUE), "File not installed\n"); ok(!delete_pf("msitest\\gaius", TRUE), "File installed\n"); - ok(delete_pf("msitest", FALSE), "File not installed\n"); + ok(delete_pf("msitest", FALSE), "Directory not created\n"); create_pf("msitest", FALSE); create_pf_data("msitest\\caesar", "abcdefgh", TRUE); + create_pf_data("msitest\\tiberius", "abcdefgh", TRUE); create_pf("msitest\\gaius", TRUE); r = MsiInstallProductA(msifile, "GAIUS=1"); @@ -4108,16 +4140,19 @@ static void test_missingcab(void) ok(!delete_pf("msitest\\augustus", TRUE), "File installed\n"); } ok(delete_pf("msitest\\caesar", TRUE), "File removed\n"); + ok(compare_pf_data("msitest\\tiberius", "abcdefgh", sizeof("abcdefgh")), "Wrong file contents\n"); + ok(delete_pf("msitest\\tiberius", TRUE), "File removed\n"); ok(delete_pf("msitest\\gaius", TRUE), "File removed\n"); - ok(delete_pf("msitest", FALSE), "File not installed\n"); + ok(delete_pf("msitest", FALSE), "Directory not created\n"); error: - delete_pf("msitest\\caesar", TRUE); delete_pf("msitest", FALSE); DeleteFile("msitest\\augustus"); RemoveDirectory("msitest"); DeleteFile("maximus"); + DeleteFile("tiberius"); DeleteFile("test1.cab"); + DeleteFile("test4.cab"); DeleteFile(msifile); }

1 0

Juan Lang : wininet: Increment file use count when committing a URL cache entry.
by Alexandre Julliard March 8, 2011

March 8, 2011

Module: wine Branch: master Commit: 6e713b3946b292f5da42a966b3aa65a78afae034 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e713b3946b292f5da42a966b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sun Mar 6 10:07:17 2011 -0800 wininet: Increment file use count when committing a URL cache entry. --- dlls/wininet/urlcache.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index ad439dd..de31ff6 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -2633,6 +2633,11 @@ static BOOL CommitUrlCacheEntryInternal( (DWORD)((LPBYTE)pUrlEntry - (LPBYTE)pHeader)); if (error != ERROR_SUCCESS) URLCache_DeleteEntry(pHeader, &pUrlEntry->CacheFileEntry); + else + { + if (pUrlEntry->CacheDir < pHeader->DirectoryCount) + pHeader->directory_data[pUrlEntry->CacheDir].dwNumFiles++; + } cleanup: URLCacheContainer_UnlockIndex(pContainer, pHeader);

1 0

Eric Pouech : dbghelp: When using a regular expression on a file name, interpret '*' as any string (.* in regexp form).
by Alexandre Julliard March 8, 2011

March 8, 2011

Module: wine Branch: master Commit: 2d570921dc37a9cec36a9a1bf4e71205bf199c91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d570921dc37a9cec36a9a1bf… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Mar 7 22:41:02 2011 +0100 dbghelp: When using a regular expression on a file name, interpret '*' as any string (.* in regexp form). --- dlls/dbghelp/symbol.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 07e62e2..78b0b2c 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -220,6 +220,10 @@ static BOOL compile_file_regex(regex_t* re, const char* srcfile) *p++ = '\\'; *p++ = '.'; break; + case '*': + *p++ = '.'; + *p++ = '*'; + break; default: *p++ = *srcfile; break; @@ -2029,8 +2033,8 @@ BOOL WINAPI SymEnumLines(HANDLE hProcess, ULONG64 base, PCSTR compiland, if (dli->is_source_file) { file = source_get(pair.effective, dli->u.source_file); - if (!match_regexp(&re, file)) file = ""; - strcpy(sci.FileName, file); + if (!match_regexp(&re, file)) sci.FileName[0] = '\0'; + else strcpy(sci.FileName, file); } else if (sci.FileName[0]) {

1 0

Alexandre Julliard : user.exe: Call the 16-bit hook directly in SendMessage16.
by Alexandre Julliard March 8, 2011

March 8, 2011

Module: wine Branch: master Commit: eda60796817fcda152d9988966ef2b91cb7dd012 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eda60796817fcda152d998896… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 8 14:50:18 2011 +0100 user.exe: Call the 16-bit hook directly in SendMessage16. --- dlls/user.exe16/hook.c | 17 +++++++++++++++++ dlls/user.exe16/message.c | 15 +-------------- dlls/user.exe16/user_private.h | 2 +- 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/dlls/user.exe16/hook.c b/dlls/user.exe16/hook.c index 640899e..105254e 100644 --- a/dlls/user.exe16/hook.c +++ b/dlls/user.exe16/hook.c @@ -186,6 +186,23 @@ static LRESULT wndproc_hook_callback16( HWND16 hwnd, UINT16 msg, WPARAM16 wp, LP return ret; } +/* helper for SendMessage16 */ +void call_WH_CALLWNDPROC_hook( HWND16 hwnd, UINT16 msg, WPARAM16 wp, LPARAM lp ) +{ + CWPSTRUCT16 cwp; + struct hook16_queue_info *info = get_hook_info( FALSE ); + + if (!info->proc[WH_CALLWNDPROC - WH_MINHOOK]) return; + + cwp.hwnd = hwnd; + cwp.message = msg; + cwp.wParam = wp; + cwp.lParam = lp; + + lp = MapLS( &cwp ); + call_hook_16( WH_CALLWNDPROC, HC_ACTION, 1, lp ); + UnMapLS( lp ); +} /*********************************************************************** * call_WH_MSGFILTER diff --git a/dlls/user.exe16/message.c b/dlls/user.exe16/message.c index b10b761..bc81d45 100644 --- a/dlls/user.exe16/message.c +++ b/dlls/user.exe16/message.c @@ -39,19 +39,6 @@ DWORD USER16_AlertableWait = 0; struct wow_handlers32 wow_handlers32; -static LRESULT cwp_hook_callback( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp, - LRESULT *result, void *arg ) -{ - CWPSTRUCT cwp; - - cwp.hwnd = hwnd; - cwp.message = msg; - cwp.wParam = wp; - cwp.lParam = lp; - *result = 0; - return HOOK_CallHooks( WH_CALLWNDPROC, HC_ACTION, 1, (LPARAM)&cwp, FALSE ); -} - static LRESULT send_message_callback( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp, LRESULT *result, void *arg ) { @@ -1498,7 +1485,7 @@ LRESULT WINAPI SendMessage16( HWND16 hwnd16, UINT16 msg, WPARAM16 wparam, LPARAM WNDPROC16 winproc; /* first the WH_CALLWNDPROC hook */ - WINPROC_CallProc16To32A( cwp_hook_callback, hwnd16, msg, wparam, lparam, &result, NULL ); + call_WH_CALLWNDPROC_hook( hwnd16, msg, wparam, lparam ); if (!(winproc = (WNDPROC16)GetWindowLong16( hwnd16, GWLP_WNDPROC ))) return 0; diff --git a/dlls/user.exe16/user_private.h b/dlls/user.exe16/user_private.h index d202bfe..7c91afb 100644 --- a/dlls/user.exe16/user_private.h +++ b/dlls/user.exe16/user_private.h @@ -93,7 +93,7 @@ extern LRESULT WINPROC_CallProc16To32A( winproc_callback_t callback, HWND16 hwnd extern LRESULT WINPROC_CallProc32ATo16( winproc_callback16_t callback, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, LRESULT *result, void *arg ) DECLSPEC_HIDDEN; -extern LRESULT HOOK_CallHooks( INT id, INT code, WPARAM wparam, LPARAM lparam, BOOL unicode ) DECLSPEC_HIDDEN; +extern void call_WH_CALLWNDPROC_hook( HWND16 hwnd, UINT16 msg, WPARAM16 wp, LPARAM lp ) DECLSPEC_HIDDEN; #define GET_WORD(ptr) (*(const WORD *)(ptr)) #define GET_DWORD(ptr) (*(const DWORD *)(ptr))

1 0

Nikolay Sivov : msxml3: Merge obsolete interfaces tests in a single file.
by Alexandre Julliard March 8, 2011

March 8, 2011

Module: wine Branch: master Commit: 1b1c4c014021a99811154bdb0caef1d862d699ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b1c4c014021a99811154bdb0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 8 00:39:24 2011 +0300 msxml3: Merge obsolete interfaces tests in a single file. --- dlls/msxml3/tests/Makefile.in | 3 +- dlls/msxml3/tests/xmldoc.c | 534 ++++++++++++++++++++++++++++++++++++ dlls/msxml3/tests/xmlelem.c | 598 ----------------------------------------- 3 files changed, 535 insertions(+), 600 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1b1c4c014021a99811154…

1 0

Eric Pouech : winedbg: Fix 'break file : lineno' command so that file can be in other modules than the current one.
by Alexandre Julliard March 8, 2011

March 8, 2011

Module: wine Branch: master Commit: cf7120b8cce712bdd450d19585427633b7033544 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf7120b8cce712bdd450d1958… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Mar 7 22:41:09 2011 +0100 winedbg: Fix 'break file : lineno' command so that file can be in other modules than the current one. --- programs/winedbg/break.c | 60 +++++++++++++++++++++++++++------------------ 1 files changed, 36 insertions(+), 24 deletions(-) diff --git a/programs/winedbg/break.c b/programs/winedbg/break.c index debc0c7..e156a40 100644 --- a/programs/winedbg/break.c +++ b/programs/winedbg/break.c @@ -270,6 +270,7 @@ void break_add_break_from_id(const char *name, int lineno, BOOL swbp) struct cb_break_lineno { + const char* filename; int lineno; ADDRESS64 addr; }; @@ -287,6 +288,17 @@ static BOOL CALLBACK line_cb(SRCCODEINFO* sci, void* user) return TRUE; } +static BOOL CALLBACK mcb(PCWSTR module, DWORD64 base, void* user) +{ + struct cb_break_lineno* bkln = user; + + SymEnumLines(dbg_curr_process->handle, base, NULL, bkln->filename, line_cb, bkln); + /* continue module enum if no addr found + * FIXME: we don't report when several addresses match the same filename/lineno pair + */ + return !bkln->addr.Offset; +} + /*********************************************************************** * break_add_break_from_lineno * @@ -295,38 +307,38 @@ static BOOL CALLBACK line_cb(SRCCODEINFO* sci, void* user) void break_add_break_from_lineno(const char *filename, int lineno, BOOL swbp) { struct cb_break_lineno bkln; + bkln.addr.Offset = 0; + bkln.lineno = lineno; - memory_get_current_pc(&bkln.addr); - - if (lineno != -1) + if (!filename) { + DWORD disp; + ADDRESS64 curr; IMAGEHLP_LINE64 il; - DWORD_PTR linear = (DWORD_PTR)memory_to_linear_addr(&bkln.addr); + DWORD_PTR linear; - if (!filename) + memory_get_current_pc(&curr); + linear = (DWORD_PTR)memory_to_linear_addr(&curr); + il.SizeOfStruct = sizeof(il); + if (!SymGetLineFromAddr64(dbg_curr_process->handle, linear, &disp, &il)) { - DWORD disp; - - il.SizeOfStruct = sizeof(il); - if (!SymGetLineFromAddr64(dbg_curr_process->handle, linear, &disp, &il)) - { - dbg_printf("Unable to add breakpoint (unknown address %lx)\n", linear); - return; - } - filename = il.FileName; - } - bkln.addr.Offset = 0; - bkln.lineno = lineno; - SymEnumLines(dbg_curr_process->handle, linear, NULL, filename, line_cb, &bkln); - if (!bkln.addr.Offset) - { - dbg_printf("Unknown line number\n" - "(either out of file, or no code at given line number)\n"); + dbg_printf("Unable to add breakpoint (unknown address %lx)\n", linear); return; } + filename = il.FileName; + SymEnumLines(dbg_curr_process->handle, linear, NULL, filename, line_cb, &bkln); } - - break_add_break(&bkln.addr, TRUE, swbp); + else + { + /* we have to enumerate across modules */ + bkln.filename = filename; + SymEnumerateModulesW64(dbg_curr_process->handle, mcb, &bkln); + } + if (bkln.addr.Offset) + break_add_break(&bkln.addr, TRUE, swbp); + else + dbg_printf("Unknown line number\n" + "(either out of file, or no code at given line number)\n"); } /***********************************************************************

1 0

Juan Lang : wininet: Decrement file use count when deleting a cache entry.
by Alexandre Julliard March 8, 2011

March 8, 2011

Module: wine Branch: master Commit: 601b4fa589edb1c290432a1153c8b93f1978ce32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=601b4fa589edb1c290432a115… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sun Mar 6 10:05:45 2011 -0800 wininet: Decrement file use count when deleting a cache entry. --- dlls/wininet/urlcache.c | 32 ++++++++++++++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index de31ff6..ca7f880 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -2924,6 +2924,7 @@ BOOL WINAPI DeleteUrlCacheEntryA(LPCSTR lpszUrlName) LPURLCACHE_HEADER pHeader; struct _HASH_ENTRY * pHashEntry; CACHEFILE_ENTRY * pEntry; + const URL_CACHEFILE_ENTRY * pUrlEntry; DWORD error; TRACE("(%s)\n", debugstr_a(lpszUrlName)); @@ -2954,6 +2955,21 @@ BOOL WINAPI DeleteUrlCacheEntryA(LPCSTR lpszUrlName) } pEntry = (CACHEFILE_ENTRY *)((LPBYTE)pHeader + pHashEntry->dwOffsetEntry); + if (pEntry->dwSignature != URL_SIGNATURE) + { + URLCacheContainer_UnlockIndex(pContainer, pHeader); + FIXME("Trying to delete entry of unknown format %s\n", + debugstr_an((LPCSTR)&pEntry->dwSignature, sizeof(DWORD))); + SetLastError(ERROR_FILE_NOT_FOUND); + return FALSE; + } + pUrlEntry = (const URL_CACHEFILE_ENTRY *)pEntry; + if (pUrlEntry->CacheDir < pHeader->DirectoryCount) + { + if (pHeader->directory_data[pUrlEntry->CacheDir].dwNumFiles) + pHeader->directory_data[pUrlEntry->CacheDir].dwNumFiles--; + } + URLCache_DeleteEntry(pHeader, pEntry); URLCache_DeleteEntryFromHash(pHashEntry); @@ -2973,6 +2989,7 @@ BOOL WINAPI DeleteUrlCacheEntryW(LPCWSTR lpszUrlName) LPURLCACHE_HEADER pHeader; struct _HASH_ENTRY * pHashEntry; CACHEFILE_ENTRY * pEntry; + const URL_CACHEFILE_ENTRY * pUrlEntry; LPSTR urlA; DWORD error; @@ -3017,6 +3034,21 @@ BOOL WINAPI DeleteUrlCacheEntryW(LPCWSTR lpszUrlName) } pEntry = (CACHEFILE_ENTRY *)((LPBYTE)pHeader + pHashEntry->dwOffsetEntry); + if (pEntry->dwSignature != URL_SIGNATURE) + { + URLCacheContainer_UnlockIndex(pContainer, pHeader); + FIXME("Trying to delete entry of unknown format %s\n", + debugstr_an((LPCSTR)&pEntry->dwSignature, sizeof(DWORD))); + SetLastError(ERROR_FILE_NOT_FOUND); + return FALSE; + } + pUrlEntry = (const URL_CACHEFILE_ENTRY *)pEntry; + if (pUrlEntry->CacheDir < pHeader->DirectoryCount) + { + if (pHeader->directory_data[pUrlEntry->CacheDir].dwNumFiles) + pHeader->directory_data[pUrlEntry->CacheDir].dwNumFiles--; + } + URLCache_DeleteEntry(pHeader, pEntry); URLCache_DeleteEntryFromHash(pHashEntry);

1 0

Juan Lang : wininet: Fully initialize time variable (valgrind).
by Alexandre Julliard March 8, 2011

March 8, 2011

Module: wine Branch: master Commit: b9673bcc4d5ed07fb8461726b7ee1750e75e0a16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9673bcc4d5ed07fb8461726b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Mar 7 13:13:11 2011 -0800 wininet: Fully initialize time variable (valgrind). --- dlls/wininet/http.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 841a83f..2fb2a2e 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3769,7 +3769,7 @@ static BOOL HTTP_ParseRfc1123Date(LPCWSTR value, FILETIME *ft) WCHAR *nextPtr, day[4], month[4], *monthPtr; LPCWSTR ptr; unsigned long num; - SYSTEMTIME st; + SYSTEMTIME st = { 0 }; ptr = strchrW(value, ','); if (!ptr)

1 0