August 2007 - Wine-commits - list.winehq.org

Stefan Leichter : dmsynth: Remove 'recursive registry key delete' function.
by Alexandre Julliard 30 Aug '07

30 Aug '07

Module: wine Branch: master Commit: 615e4be7f94cc8525551d0878f451308c6bce06e URL: http://source.winehq.org/git/wine.git/?a=commit;h=615e4be7f94cc8525551d0878… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Thu Aug 30 18:13:54 2007 +0200 dmsynth: Remove 'recursive registry key delete' function. --- dlls/dmsynth/regsvr.c | 76 +++++------------------------------------------- 1 files changed, 8 insertions(+), 68 deletions(-) diff --git a/dlls/dmsynth/regsvr.c b/dlls/dmsynth/regsvr.c index c9957a0..322190e 100644 --- a/dlls/dmsynth/regsvr.c +++ b/dlls/dmsynth/regsvr.c @@ -101,9 +101,6 @@ static LONG register_key_defvalueA(HKEY base, WCHAR const *name, static LONG register_progid(WCHAR const *clsid, char const *progid, char const *curver_progid, char const *name, char const *extra); -static LONG recursive_delete_key(HKEY key); -static LONG recursive_delete_keyA(HKEY base, char const *name); -static LONG recursive_delete_keyW(HKEY base, WCHAR const *name); /*********************************************************************** * register_interfaces @@ -190,7 +187,8 @@ static HRESULT unregister_interfaces(struct regsvr_interface const *list) { WCHAR buf[39]; StringFromGUID2(list->iid, buf, 39); - res = recursive_delete_keyW(interface_key, buf); + res = RegDeleteTreeW(interface_key, buf); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; } RegCloseKey(interface_key); @@ -295,16 +293,19 @@ static HRESULT unregister_coclasses(struct regsvr_coclass const *list) { WCHAR buf[39]; StringFromGUID2(list->clsid, buf, 39); - res = recursive_delete_keyW(coclass_key, buf); + res = RegDeleteTreeW(coclass_key, buf); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; if (list->progid) { - res = recursive_delete_keyA(HKEY_CLASSES_ROOT, list->progid); + res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->progid); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; } if (list->viprogid) { - res = recursive_delete_keyA(HKEY_CLASSES_ROOT, list->viprogid); + res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->viprogid); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; } } @@ -413,67 +414,6 @@ error_close_progid_key: } /*********************************************************************** - * recursive_delete_key - */ -static LONG recursive_delete_key(HKEY key) { - LONG res; - WCHAR subkey_name[MAX_PATH]; - DWORD cName; - HKEY subkey; - - for (;;) { - cName = sizeof(subkey_name) / sizeof(WCHAR); - res = RegEnumKeyExW(key, 0, subkey_name, &cName, - NULL, NULL, NULL, NULL); - if (res != ERROR_SUCCESS && res != ERROR_MORE_DATA) { - res = ERROR_SUCCESS; /* presumably we're done enumerating */ - break; - } - res = RegOpenKeyExW(key, subkey_name, 0, - KEY_READ | KEY_WRITE, &subkey); - if (res == ERROR_FILE_NOT_FOUND) continue; - if (res != ERROR_SUCCESS) break; - - res = recursive_delete_key(subkey); - RegCloseKey(subkey); - if (res != ERROR_SUCCESS) break; - } - - if (res == ERROR_SUCCESS) res = RegDeleteKeyW(key, 0); - return res; -} - -/*********************************************************************** - * recursive_delete_keyA - */ -static LONG recursive_delete_keyA(HKEY base, char const *name) { - LONG res; - HKEY key; - - res = RegOpenKeyExA(base, name, 0, KEY_READ | KEY_WRITE, &key); - if (res == ERROR_FILE_NOT_FOUND) return ERROR_SUCCESS; - if (res != ERROR_SUCCESS) return res; - res = recursive_delete_key(key); - RegCloseKey(key); - return res; -} - -/*********************************************************************** - * recursive_delete_keyW - */ -static LONG recursive_delete_keyW(HKEY base, WCHAR const *name) { - LONG res; - HKEY key; - - res = RegOpenKeyExW(base, name, 0, KEY_READ | KEY_WRITE, &key); - if (res == ERROR_FILE_NOT_FOUND) return ERROR_SUCCESS; - if (res != ERROR_SUCCESS) return res; - res = recursive_delete_key(key); - RegCloseKey(key); - return res; -} - -/*********************************************************************** * coclass list */ static struct regsvr_coclass const coclass_list[] = {

1 0

Kai Blin : secur32: Implement LsaRegisterLogonProcess stub.
by Alexandre Julliard 30 Aug '07

30 Aug '07

Module: wine Branch: master Commit: b53e1ffa47f66b92a44b09a0bd285f4402e0a053 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b53e1ffa47f66b92a44b09a0b… Author: Kai Blin <kai.blin(a)gmail.com> Date: Thu Aug 30 19:58:15 2007 +0200 secur32: Implement LsaRegisterLogonProcess stub. --- dlls/secur32/lsa.c | 7 +++++++ dlls/secur32/secur32.spec | 2 +- include/ntsecapi.h | 1 + 3 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index 738253a..0c0fcdc 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -98,3 +98,10 @@ NTSTATUS WINAPI LsaLookupAuthenticationPackage(HANDLE LsaHandle, AuthenticationPackage = NULL; return STATUS_SUCCESS; } + +NTSTATUS WINAPI LsaRegisterLogonProcess(PLSA_STRING LogonProcessName, + PHANDLE LsaHandle, PLSA_OPERATIONAL_MODE SecurityMode) +{ + FIXME("%p %p %p stub\n", LogonProcessName, LsaHandle, SecurityMode); + return STATUS_SUCCESS; +} diff --git a/dlls/secur32/secur32.spec b/dlls/secur32/secur32.spec index d237dec..b8da828 100644 --- a/dlls/secur32/secur32.spec +++ b/dlls/secur32/secur32.spec @@ -40,7 +40,7 @@ @ stdcall LsaGetLogonSessionData(ptr ptr) @ stdcall LsaLogonUser(ptr ptr long long ptr long ptr ptr ptr ptr ptr ptr ptr ptr) @ stdcall LsaLookupAuthenticationPackage(ptr ptr ptr) -@ stub LsaRegisterLogonProcess +@ stdcall LsaRegisterLogonProcess(ptr ptr ptr) @ stub LsaRegisterPolicyChangeNotification @ stub LsaUnregisterPolicyChangeNotification @ stdcall MakeSignature(ptr long ptr long) diff --git a/include/ntsecapi.h b/include/ntsecapi.h index cedd20c..03e8d35 100644 --- a/include/ntsecapi.h +++ b/include/ntsecapi.h @@ -171,6 +171,7 @@ typedef OBJECT_ATTRIBUTES LSA_OBJECT_ATTRIBUTES, *PLSA_OBJECT_ATTRIBUTES; typedef PVOID LSA_HANDLE, *PLSA_HANDLE; typedef ULONG LSA_ENUMERATION_HANDLE, *PLSA_ENUMERATION_HANDLE; +typedef ULONG LSA_OPERATIONAL_MODE, *PLSA_OPERATIONAL_MODE; typedef enum {

1 0

Stefan Leichter : dmusic: Remove 'recursive registry key delete' function.
by Alexandre Julliard 30 Aug '07

30 Aug '07

Module: wine Branch: master Commit: eec8c4222313285f6d3c8f25c2b01aef06819956 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eec8c4222313285f6d3c8f25c… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Thu Aug 30 18:09:10 2007 +0200 dmusic: Remove 'recursive registry key delete' function. --- dlls/dmusic/regsvr.c | 76 +++++-------------------------------------------- 1 files changed, 8 insertions(+), 68 deletions(-) diff --git a/dlls/dmusic/regsvr.c b/dlls/dmusic/regsvr.c index f66626e..ab7774c 100644 --- a/dlls/dmusic/regsvr.c +++ b/dlls/dmusic/regsvr.c @@ -101,9 +101,6 @@ static LONG register_key_defvalueA(HKEY base, WCHAR const *name, static LONG register_progid(WCHAR const *clsid, char const *progid, char const *curver_progid, char const *name, char const *extra); -static LONG recursive_delete_key(HKEY key); -static LONG recursive_delete_keyA(HKEY base, char const *name); -static LONG recursive_delete_keyW(HKEY base, WCHAR const *name); /*********************************************************************** * register_interfaces @@ -190,7 +187,8 @@ static HRESULT unregister_interfaces(struct regsvr_interface const *list) { WCHAR buf[39]; StringFromGUID2(list->iid, buf, 39); - res = recursive_delete_keyW(interface_key, buf); + res = RegDeleteTreeW(interface_key, buf); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; } RegCloseKey(interface_key); @@ -295,16 +293,19 @@ static HRESULT unregister_coclasses(struct regsvr_coclass const *list) { WCHAR buf[39]; StringFromGUID2(list->clsid, buf, 39); - res = recursive_delete_keyW(coclass_key, buf); + res = RegDeleteTreeW(coclass_key, buf); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; if (list->progid) { - res = recursive_delete_keyA(HKEY_CLASSES_ROOT, list->progid); + res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->progid); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; } if (list->viprogid) { - res = recursive_delete_keyA(HKEY_CLASSES_ROOT, list->viprogid); + res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->viprogid); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; } } @@ -413,67 +414,6 @@ error_close_progid_key: } /*********************************************************************** - * recursive_delete_key - */ -static LONG recursive_delete_key(HKEY key) { - LONG res; - WCHAR subkey_name[MAX_PATH]; - DWORD cName; - HKEY subkey; - - for (;;) { - cName = sizeof(subkey_name) / sizeof(WCHAR); - res = RegEnumKeyExW(key, 0, subkey_name, &cName, - NULL, NULL, NULL, NULL); - if (res != ERROR_SUCCESS && res != ERROR_MORE_DATA) { - res = ERROR_SUCCESS; /* presumably we're done enumerating */ - break; - } - res = RegOpenKeyExW(key, subkey_name, 0, - KEY_READ | KEY_WRITE, &subkey); - if (res == ERROR_FILE_NOT_FOUND) continue; - if (res != ERROR_SUCCESS) break; - - res = recursive_delete_key(subkey); - RegCloseKey(subkey); - if (res != ERROR_SUCCESS) break; - } - - if (res == ERROR_SUCCESS) res = RegDeleteKeyW(key, 0); - return res; -} - -/*********************************************************************** - * recursive_delete_keyA - */ -static LONG recursive_delete_keyA(HKEY base, char const *name) { - LONG res; - HKEY key; - - res = RegOpenKeyExA(base, name, 0, KEY_READ | KEY_WRITE, &key); - if (res == ERROR_FILE_NOT_FOUND) return ERROR_SUCCESS; - if (res != ERROR_SUCCESS) return res; - res = recursive_delete_key(key); - RegCloseKey(key); - return res; -} - -/*********************************************************************** - * recursive_delete_keyW - */ -static LONG recursive_delete_keyW(HKEY base, WCHAR const *name) { - LONG res; - HKEY key; - - res = RegOpenKeyExW(base, name, 0, KEY_READ | KEY_WRITE, &key); - if (res == ERROR_FILE_NOT_FOUND) return ERROR_SUCCESS; - if (res != ERROR_SUCCESS) return res; - res = recursive_delete_key(key); - RegCloseKey(key); - return res; -} - -/*********************************************************************** * coclass list */ static struct regsvr_coclass const coclass_list[] = {

1 0

Detlef Riekenberg : winspool: Powerpoint XP expect a valid pointer on Win9x .
by Alexandre Julliard 30 Aug '07

30 Aug '07

Module: wine Branch: master Commit: 449fa0d204a8a4e537a78117b2d6893e6b146b19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=449fa0d204a8a4e537a78117b… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Aug 24 20:05:57 2007 +0200 winspool: Powerpoint XP expect a valid pointer on Win9x. --- dlls/winspool.drv/info.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 44c41a1..3a76bbf 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -4591,6 +4591,15 @@ static BOOL WINSPOOL_GetDriverInfoFromReg( if (di) di->pDependentFiles = (LPWSTR)strPtr; strPtr = (pDriverStrings) ? pDriverStrings + (*pcbNeeded) : NULL; } + else if (GetVersion() & 0x80000000) { + /* Powerpoint XP expects that pDependentFiles is always valid on win9x */ + size = 2 * ((unicode) ? sizeof(WCHAR) : 1); + *pcbNeeded += size; + if ((*pcbNeeded <= cbBuf) && strPtr) ZeroMemory(strPtr, size); + + if (di) di->pDependentFiles = (LPWSTR)strPtr; + strPtr = (pDriverStrings) ? pDriverStrings + (*pcbNeeded) : NULL; + } /* .pMonitorName is the optional Language Monitor */ if (WINSPOOL_GetStringFromReg(hkeyDriver, MonitorW, strPtr, 0, &size, unicode)) {

1 0

Francois Gouget : wininet: Fix many wininet prototypes: the context is a DWORD_PTR now.
by Alexandre Julliard 30 Aug '07

30 Aug '07

Module: wine Branch: master Commit: d4337f2b5e26b341233b89f00b3e8791327a2b76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4337f2b5e26b341233b89f00… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 30 16:21:33 2007 +0200 wininet: Fix many wininet prototypes: the context is a DWORD_PTR now. --- dlls/wininet/ftp.c | 44 ++++++++++++++-------------- dlls/wininet/gopher.c | 12 ++++---- dlls/wininet/http.c | 26 ++++++++-------- dlls/wininet/internet.c | 38 ++++++++++++------------ dlls/wininet/internet.h | 32 ++++++++++---------- dlls/wininet/tests/http.c | 2 +- dlls/wininet/utility.c | 8 ++-- include/wininet.h | 70 ++++++++++++++++++++++---------------------- 8 files changed, 116 insertions(+), 116 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d4337f2b5e26b341233b8…

1 0

Trent Waddington : server: Handle existing timer replacement when no window handle specified.
by Alexandre Julliard 30 Aug '07

30 Aug '07

Module: wine Branch: master Commit: fc635fa827ad7bef0bb163ea6c2521f1ad1da8c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc635fa827ad7bef0bb163ea6… Author: Trent Waddington <trent.waddington(a)gmail.com> Date: Thu Aug 30 19:05:50 2007 +1000 server: Handle existing timer replacement when no window handle specified. --- dlls/user32/tests/msg.c | 34 ++++++++++++++++++++++++++++++++++ server/queue.c | 19 ++++++++++++++----- 2 files changed, 48 insertions(+), 5 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index e6443e6..188551c 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -6780,6 +6780,39 @@ static void test_timers(void) ok(DestroyWindow(info.hWnd), "failed to destroy window\n"); } +static int count = 0; +static VOID CALLBACK callback_count( + HWND hwnd, + UINT uMsg, + UINT_PTR idEvent, + DWORD dwTime +) +{ + count++; +} + +static void test_timers_no_wnd(void) +{ + UINT_PTR id, id2; + MSG msg; + + count = 0; + id = SetTimer(NULL, 0, 100, callback_count); + ok(id != 0, "did not get id from SetTimer.\n"); + id2 = SetTimer(NULL, id, 200, callback_count); + ok(id2 == id, "did not get same id from SetTimer when replacing (%li expected %li).\n", id2, id); + Sleep(150); + while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) DispatchMessage(&msg); + ok(count == 0, "did not get zero count as expected (%i).\n", count); + Sleep(150); + while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) DispatchMessage(&msg); + ok(count == 1, "did not get one count as expected (%i).\n", count); + KillTimer(NULL, id); + Sleep(250); + while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) DispatchMessage(&msg); + ok(count == 1, "killing replaced timer did not work (%i).\n", count); +} + /* Various win events with arbitrary parameters */ static const struct message WmWinEventsSeq[] = { { EVENT_SYSTEM_SOUND, winevent_hook|wparam|lparam, OBJID_WINDOW, 0 }, @@ -9617,6 +9650,7 @@ START_TEST(msg) test_message_conversion(); test_accelerators(); test_timers(); + test_timers_no_wnd(); test_set_hook(); test_DestroyWindow(); test_DispatchMessage(); diff --git a/server/queue.c b/server/queue.c index 1e8de22..cdab2a8 100644 --- a/server/queue.c +++ b/server/queue.c @@ -1927,13 +1927,22 @@ DECL_HANDLER(set_win_timer) else { queue = get_current_queue(); - /* find a free id for it */ - do + /* look for a timer with this id */ + if (id && (timer = find_timer( queue, NULL, req->msg, id ))) { - id = queue->next_timer_id; - if (++queue->next_timer_id >= 0x10000) queue->next_timer_id = 1; + /* free and reuse id */ + free_timer( queue, timer ); + } + else + { + /* find a free id for it */ + do + { + id = queue->next_timer_id; + if (++queue->next_timer_id >= 0x10000) queue->next_timer_id = 1; + } + while (find_timer( queue, 0, req->msg, id )); } - while (find_timer( queue, 0, req->msg, id )); } if ((timer = set_timer( queue, req->rate )))

1 0

Alexandre Julliard : server: Detaching from a process needs to continue all the pending events.
by Alexandre Julliard 30 Aug '07

30 Aug '07

Module: wine Branch: master Commit: 9c18d92f3665f949dcfb1cb222346d58344e8d2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c18d92f3665f949dcfb1cb22… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 30 19:47:43 2007 +0200 server: Detaching from a process needs to continue all the pending events. --- server/debugger.c | 29 ++++++++++++----------------- 1 files changed, 12 insertions(+), 17 deletions(-) diff --git a/server/debugger.c b/server/debugger.c index eb89ef9..ee8ef10 100644 --- a/server/debugger.c +++ b/server/debugger.c @@ -451,7 +451,7 @@ static int debugger_attach( struct process *process, struct thread *debugger ) /* detach a process from a debugger thread (and resume it ?) */ int debugger_detach( struct process *process, struct thread *debugger ) { - struct debug_event *event; + struct debug_event *event, *next; struct debug_ctx *debug_ctx; if (!process->debugger || process->debugger != debugger) @@ -464,23 +464,18 @@ int debugger_detach( struct process *process, struct thread *debugger ) /* send continue indication for all events */ debug_ctx = debugger->debug_ctx; - /* find the event in the queue - * FIXME: could loop on process' threads and look the debug_event field */ - LIST_FOR_EACH_ENTRY( event, &debug_ctx->event_queue, struct debug_event, entry ) + /* free all events from this process */ + LIST_FOR_EACH_ENTRY_SAFE( event, next, &debug_ctx->event_queue, struct debug_event, entry ) { - if (event->state != EVENT_QUEUED) continue; - - if (event->sender->process == process) - { - assert( event->sender->debug_event == event ); - event->status = DBG_CONTINUE; - event->state = EVENT_CONTINUED; - wake_up( &event->obj, 0 ); - unlink_event( debug_ctx, event ); - /* from queued debug event */ - resume_process( process ); - break; - } + if (event->sender->process != process) continue; + + assert( event->state != EVENT_CONTINUED ); + event->status = DBG_CONTINUE; + event->state = EVENT_CONTINUED; + wake_up( &event->obj, 0 ); + unlink_event( debug_ctx, event ); + /* from queued debug event */ + resume_process( process ); } /* remove relationships between process and its debugger */

1 0

Maarten Lankhorst : dsound: Increase dll refcount and disable thread calls.
by Alexandre Julliard 30 Aug '07

30 Aug '07

Module: wine Branch: master Commit: e56a302f7d2acf4e50034d3c878c2e068687c800 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e56a302f7d2acf4e50034d3c8… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Aug 30 14:50:32 2007 +0200 dsound: Increase dll refcount and disable thread calls. --- dlls/dsound/dsound_main.c | 9 +++------ dlls/dsound/tests/dsound.c | 8 ++++++++ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c index 5f29ad4..770525c 100644 --- a/dlls/dsound/dsound_main.c +++ b/dlls/dsound/dsound_main.c @@ -585,16 +585,13 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpvReserved) INIT_GUID(DSOUND_renderer_guids[i], 0xbd6dd71a, 0x3deb, 0x11d1, 0xb1, 0x71, 0x00, 0xc0, 0x4f, 0xc2, 0x00, 0x00 + i); INIT_GUID(DSOUND_capture_guids[i], 0xbd6dd71b, 0x3deb, 0x11d1, 0xb1, 0x71, 0x00, 0xc0, 0x4f, 0xc2, 0x00, 0x00 + i); } + DisableThreadLibraryCalls(hInstDLL); + /* Increase refcount on dsound by 1 */ + GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (LPCWSTR)hInstDLL, &hInstDLL); break; case DLL_PROCESS_DETACH: TRACE("DLL_PROCESS_DETACH\n"); break; - case DLL_THREAD_ATTACH: - TRACE("DLL_THREAD_ATTACH\n"); - break; - case DLL_THREAD_DETACH: - TRACE("DLL_THREAD_DETACH\n"); - break; default: TRACE("UNKNOWN REASON\n"); break; diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index cbb6829..fe22064 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -970,6 +970,14 @@ START_TEST(dsound) hDsound = LoadLibrary("dsound.dll"); if (hDsound) { + ok( FreeLibrary(hDsound), "FreeLibrary(1) returned %d\n", GetLastError()); + ok( FreeLibrary(hDsound), "FreeLibrary(2) returned %d\n", GetLastError()); + ok(!FreeLibrary(hDsound), "DirectSound DLL still loaded\n"); + } + + hDsound = LoadLibrary("dsound.dll"); + if (hDsound) + { trace("DLL Version: %s\n", get_file_version("dsound.dll")); pDirectSoundEnumerateA = (void*)GetProcAddress(hDsound,

1 0

Francois Gouget : winscard: Update win32. api to fix the winapi_check warnings.
by Alexandre Julliard 30 Aug '07

30 Aug '07

Module: wine Branch: master Commit: 566330691da717d09e2b6e9fd0ad1ffe2d97a858 URL: http://source.winehq.org/git/wine.git/?a=commit;h=566330691da717d09e2b6e9fd… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 30 16:18:22 2007 +0200 winscard: Update win32.api to fix the winapi_check warnings. --- tools/winapi/win32.api | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index 3e8a7b9..a8e1c73 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -5928,6 +5928,18 @@ VOID BOOL HWND +%%winscard.dll + +%long + +DWORD +LONG + +%ptr + +LPCVOID +LPSCARDCONTEXT + %%winspool.drv %long

1 0

Francois Gouget : shlwapi: Move SHAddDataBlock() to the front and remove the forward declaration.
by Alexandre Julliard 30 Aug '07

30 Aug '07

Module: wine Branch: master Commit: b25fdbb23efefe322e08a6a1bcf412e5c92afa63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b25fdbb23efefe322e08a6a1b… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 30 16:18:46 2007 +0200 shlwapi: Move SHAddDataBlock() to the front and remove the forward declaration. --- dlls/shlwapi/clist.c | 192 +++++++++++++++++++++++++------------------------- 1 files changed, 95 insertions(+), 97 deletions(-) diff --git a/dlls/shlwapi/clist.c b/dlls/shlwapi/clist.c index 29028bf..a68ada4 100644 --- a/dlls/shlwapi/clist.c +++ b/dlls/shlwapi/clist.c @@ -34,8 +34,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); /* dwSignature for contained DATABLOCK_HEADER items */ #define CLIST_ID_CONTAINER (~0U) -HRESULT WINAPI SHAddDataBlock(LPDBLIST*,const DATABLOCK_HEADER*); - /************************************************************************* * NextItem * @@ -49,6 +47,101 @@ static inline LPDATABLOCK_HEADER NextItem(LPDBLIST lpList) } /************************************************************************* + * @ [SHLWAPI.20] + * + * Insert a new item into a DataBlock list. + * + * PARAMS + * lppList [0] Pointer to the List + * lpNewItem [I] The new item to add to the list + * + * RETURNS + * Success: S_OK. The item is added to the list. + * Failure: An HRESULT error code. + * + * NOTES + * If the size of the element to be inserted is less than the size of a + * DATABLOCK_HEADER node, or the Id for the item is CLIST_ID_CONTAINER, + * the call returns S_OK but does not actually add the element. + * See SHWriteDataBlockList. + */ +HRESULT WINAPI SHAddDataBlock(LPDBLIST* lppList, const DATABLOCK_HEADER *lpNewItem) +{ + LPDATABLOCK_HEADER lpInsertAt = NULL; + ULONG ulSize; + + TRACE("(%p,%p)\n", lppList, lpNewItem); + + if(!lppList || !lpNewItem ) + return E_INVALIDARG; + + if (lpNewItem->cbSize < sizeof(DATABLOCK_HEADER) || + lpNewItem->dwSignature == CLIST_ID_CONTAINER) + return S_OK; + + ulSize = lpNewItem->cbSize; + + if(ulSize & 0x3) + { + /* Tune size to a ULONG boundary, add space for container element */ + ulSize = ((ulSize + 0x3) & 0xFFFFFFFC) + sizeof(DATABLOCK_HEADER); + TRACE("Creating container item, new size = %d\n", ulSize); + } + + if(!*lppList) + { + /* An empty list. Allocate space for terminal ulSize also */ + *lppList = (LPDATABLOCK_HEADER)LocalAlloc(LMEM_ZEROINIT, + ulSize + sizeof(ULONG)); + lpInsertAt = *lppList; + } + else + { + /* Append to the end of the list */ + ULONG ulTotalSize = 0; + LPDATABLOCK_HEADER lpIter = *lppList; + + /* Iterate to the end of the list, calculating the total size */ + while (lpIter->cbSize) + { + ulTotalSize += lpIter->cbSize; + lpIter = NextItem(lpIter); + } + + /* Increase the size of the list */ + lpIter = (LPDATABLOCK_HEADER)LocalReAlloc((HLOCAL)*lppList, + ulTotalSize + ulSize+sizeof(ULONG), + LMEM_ZEROINIT | LMEM_MOVEABLE); + if(lpIter) + { + *lppList = lpIter; + lpInsertAt = (LPDATABLOCK_HEADER)((char*)lpIter + ulTotalSize); /* At end */ + } + } + + if(lpInsertAt) + { + /* Copy in the new item */ + LPDATABLOCK_HEADER lpDest = lpInsertAt; + + if(ulSize != lpNewItem->cbSize) + { + lpInsertAt->cbSize = ulSize; + lpInsertAt->dwSignature = CLIST_ID_CONTAINER; + lpDest++; + } + memcpy(lpDest, lpNewItem, lpNewItem->cbSize); + + /* Terminate the list */ + lpInsertAt = NextItem(lpInsertAt); + lpInsertAt->cbSize = 0; + + return lpNewItem->cbSize; + } + return S_OK; +} + +/************************************************************************* * @ [SHLWAPI.17] * * Write a DataBlock list to an IStream object. @@ -247,101 +340,6 @@ VOID WINAPI SHFreeDataBlockList(LPDBLIST lpList) } /************************************************************************* - * @ [SHLWAPI.20] - * - * Insert a new item into a DataBlock list. - * - * PARAMS - * lppList [0] Pointer to the List - * lpNewItem [I] The new item to add to the list - * - * RETURNS - * Success: S_OK. The item is added to the list. - * Failure: An HRESULT error code. - * - * NOTES - * If the size of the element to be inserted is less than the size of a - * DATABLOCK_HEADER node, or the Id for the item is CLIST_ID_CONTAINER, - * the call returns S_OK but does not actually add the element. - * See SHWriteDataBlockList. - */ -HRESULT WINAPI SHAddDataBlock(LPDBLIST* lppList, const DATABLOCK_HEADER *lpNewItem) -{ - LPDATABLOCK_HEADER lpInsertAt = NULL; - ULONG ulSize; - - TRACE("(%p,%p)\n", lppList, lpNewItem); - - if(!lppList || !lpNewItem ) - return E_INVALIDARG; - - if (lpNewItem->cbSize < sizeof(DATABLOCK_HEADER) || - lpNewItem->dwSignature == CLIST_ID_CONTAINER) - return S_OK; - - ulSize = lpNewItem->cbSize; - - if(ulSize & 0x3) - { - /* Tune size to a ULONG boundary, add space for container element */ - ulSize = ((ulSize + 0x3) & 0xFFFFFFFC) + sizeof(DATABLOCK_HEADER); - TRACE("Creating container item, new size = %d\n", ulSize); - } - - if(!*lppList) - { - /* An empty list. Allocate space for terminal ulSize also */ - *lppList = (LPDATABLOCK_HEADER)LocalAlloc(LMEM_ZEROINIT, - ulSize + sizeof(ULONG)); - lpInsertAt = *lppList; - } - else - { - /* Append to the end of the list */ - ULONG ulTotalSize = 0; - LPDATABLOCK_HEADER lpIter = *lppList; - - /* Iterate to the end of the list, calculating the total size */ - while (lpIter->cbSize) - { - ulTotalSize += lpIter->cbSize; - lpIter = NextItem(lpIter); - } - - /* Increase the size of the list */ - lpIter = (LPDATABLOCK_HEADER)LocalReAlloc((HLOCAL)*lppList, - ulTotalSize + ulSize+sizeof(ULONG), - LMEM_ZEROINIT | LMEM_MOVEABLE); - if(lpIter) - { - *lppList = lpIter; - lpInsertAt = (LPDATABLOCK_HEADER)((char*)lpIter + ulTotalSize); /* At end */ - } - } - - if(lpInsertAt) - { - /* Copy in the new item */ - LPDATABLOCK_HEADER lpDest = lpInsertAt; - - if(ulSize != lpNewItem->cbSize) - { - lpInsertAt->cbSize = ulSize; - lpInsertAt->dwSignature = CLIST_ID_CONTAINER; - lpDest++; - } - memcpy(lpDest, lpNewItem, lpNewItem->cbSize); - - /* Terminate the list */ - lpInsertAt = NextItem(lpInsertAt); - lpInsertAt->cbSize = 0; - - return lpNewItem->cbSize; - } - return S_OK; -} - -/************************************************************************* * @ [SHLWAPI.21] * * Remove an item from a DataBlock list.

1 0