November 2007 - Wine-commits

Alexandre Julliard : server: Don' t drop mouse messages that should go to a different thread input.
by Alexandre Julliard 08 Nov '07

08 Nov '07

Module: wine Branch: master Commit: 93938ebe5eecf0ad6be5bed1772dfcdf778cd56c URL: http://source.winehq.org/git/wine.git/?a=commit;h=93938ebe5eecf0ad6be5bed17… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 8 13:53:26 2007 +0100 server: Don't drop mouse messages that should go to a different thread input. Instead requeue them into the proper destination queue. Reported by Ulrich Czekalla. --- server/queue.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/server/queue.c b/server/queue.c index 1cda33c..51315fd 100644 --- a/server/queue.c +++ b/server/queue.c @@ -1222,12 +1222,20 @@ static void release_hardware_message( struct msg_queue *queue, unsigned int hw_i struct thread *owner = get_window_thread( new_win ); if (owner) { - if (owner->queue->input == input) + msg->win = new_win; + if (owner->queue->input != input) { - msg->win = new_win; - set_queue_bits( owner->queue, get_hardware_msg_bit( msg )); - remove = 0; + list_remove( &msg->entry ); + if (msg->msg == WM_MOUSEMOVE && merge_message( owner->queue->input, msg )) + { + free_message( msg ); + release_object( owner ); + return; + } + list_add_tail( &owner->queue->input->msg_list, &msg->entry ); } + set_queue_bits( owner->queue, get_hardware_msg_bit( msg )); + remove = 0; release_object( owner ); } }

1 0

Alexandre Julliard : ntdll: Increase the signal stack size to avoid crashes on nested signals.
by Alexandre Julliard 08 Nov '07

08 Nov '07

Module: wine Branch: master Commit: 0156dbba4f4d1b1d55a359fea15a217ff2a103ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=0156dbba4f4d1b1d55a359fea… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 8 13:53:47 2007 +0100 ntdll: Increase the signal stack size to avoid crashes on nested signals. --- dlls/ntdll/signal_i386.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 0603e44..a6f6ed5 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -1334,7 +1334,7 @@ size_t get_signal_stack_total_size(void) if (!signal_stack_size) { - size_t size = 4096, min_size = teb_size + max( MINSIGSTKSZ, 4096 ); + size_t size = 8192, min_size = teb_size + max( MINSIGSTKSZ, 8192 ); /* find the first power of two not smaller than min_size */ while (size < min_size) size *= 2; signal_stack_mask = size - 1;

1 0

EA Durbin : d3dxof: Fix some return values.
by Alexandre Julliard 08 Nov '07

08 Nov '07

Module: wine Branch: master Commit: 0bfba69c15d4da04fdef720798f6f047e356ee4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bfba69c15d4da04fdef72079… Author: EA Durbin <ead1234(a)hotmail.com> Date: Wed Nov 7 22:55:01 2007 -0600 d3dxof: Fix some return values. --- dlls/d3dxof/d3dxof.c | 56 +++++++++++++++++++++++++------------------------- 1 files changed, 28 insertions(+), 28 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index 0904f64..227e8c2 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -121,7 +121,7 @@ static HRESULT WINAPI IDirectXFileImpl_CreateEnumObject(IDirectXFile* iface, LPV *ppEnumObj = (LPDIRECTXFILEENUMOBJECT)object; - return S_FALSE; + return DXFILE_OK; } static HRESULT WINAPI IDirectXFileImpl_CreateSaveObject(IDirectXFile* iface, LPCSTR szFileName, DXFILEFORMAT dwFileFormat, LPDIRECTXFILESAVEOBJECT* ppSaveObj) @@ -130,7 +130,7 @@ static HRESULT WINAPI IDirectXFileImpl_CreateSaveObject(IDirectXFile* iface, LPC FIXME("(%p/%p)->(%s,%x,%p) stub!\n", This, iface, szFileName, dwFileFormat, ppSaveObj); - return S_FALSE; + return DXFILEERR_BADVALUE; } static HRESULT WINAPI IDirectXFileImpl_RegisterTemplates(IDirectXFile* iface, LPVOID pvData, DWORD cbSize) @@ -139,7 +139,7 @@ static HRESULT WINAPI IDirectXFileImpl_RegisterTemplates(IDirectXFile* iface, LP FIXME("(%p/%p)->(%p,%d) stub!\n", This, iface, pvData, cbSize); - return S_FALSE; + return DXFILEERR_BADVALUE; } static const IDirectXFileVtbl IDirectXFile_Vtbl = @@ -165,7 +165,7 @@ HRESULT IDirectXFileBinaryImpl_Create(IDirectXFileBinaryImpl** ppObj) *ppObj = object; - return S_OK; + return DXFILE_OK; } /*** IUnknown methods ***/ @@ -219,7 +219,7 @@ static HRESULT WINAPI IDirectXFileBinaryImpl_GetName(IDirectXFileBinary* iface, FIXME("(%p/%p)->(%p,%p) stub!\n", This, iface, pstrNameBuf, pdwBufLen); - return S_FALSE; + return DXFILEERR_BADVALUE; } static HRESULT WINAPI IDirectXFileBinaryImpl_GetId(IDirectXFileBinary* iface, LPGUID pGuid) @@ -228,7 +228,7 @@ static HRESULT WINAPI IDirectXFileBinaryImpl_GetId(IDirectXFileBinary* iface, LP FIXME("(%p/%p)->(%p) stub!\n", This, iface, pGuid); - return S_FALSE; + return DXFILEERR_BADVALUE; } /*** IDirectXFileBinary methods ***/ @@ -238,7 +238,7 @@ static HRESULT WINAPI IDirectXFileBinaryImpl_GetSize(IDirectXFileBinary* iface, FIXME("(%p/%p)->(%p) stub!\n", This, iface, pcbSize); - return S_FALSE; + return DXFILEERR_BADVALUE; } static HRESULT WINAPI IDirectXFileBinaryImpl_GetMimeType(IDirectXFileBinary* iface, LPCSTR* pszMimeType) @@ -247,7 +247,7 @@ static HRESULT WINAPI IDirectXFileBinaryImpl_GetMimeType(IDirectXFileBinary* ifa FIXME("(%p/%p)->(%p) stub!\n", This, iface, pszMimeType); - return S_FALSE; + return DXFILEERR_BADVALUE; } static HRESULT WINAPI IDirectXFileBinaryImpl_Read(IDirectXFileBinary* iface, LPVOID pvData, DWORD cbSize, LPDWORD pcbRead) @@ -256,7 +256,7 @@ static HRESULT WINAPI IDirectXFileBinaryImpl_Read(IDirectXFileBinary* iface, LPV FIXME("(%p/%p)->(%p, %d, %p) stub!\n", This, iface, pvData, cbSize, pcbRead); - return S_FALSE; + return DXFILEERR_BADVALUE; } static const IDirectXFileBinaryVtbl IDirectXFileBinary_Vtbl = @@ -338,7 +338,7 @@ static HRESULT WINAPI IDirectXFileDataImpl_GetName(IDirectXFileData* iface, LPST FIXME("(%p/%p)->(%p,%p) stub!\n", This, iface, pstrNameBuf, pdwBufLen); - return S_FALSE; + return DXFILEERR_BADVALUE; } static HRESULT WINAPI IDirectXFileDataImpl_GetId(IDirectXFileData* iface, LPGUID pGuid) @@ -347,7 +347,7 @@ static HRESULT WINAPI IDirectXFileDataImpl_GetId(IDirectXFileData* iface, LPGUID FIXME("(%p/%p)->(%p) stub!\n", This, iface, pGuid); - return S_FALSE; + return DXFILEERR_BADVALUE; } /*** IDirectXFileData methods ***/ @@ -357,7 +357,7 @@ static HRESULT WINAPI IDirectXFileDataImpl_GetData(IDirectXFileData* iface, LPCS FIXME("(%p/%p)->(%s,%p,%p) stub!\n", This, iface, szMember, pcbSize, ppvData); - return S_FALSE; + return DXFILEERR_BADVALUE; } static HRESULT WINAPI IDirectXFileDataImpl_GetType(IDirectXFileData* iface, const GUID** pguid) @@ -366,7 +366,7 @@ static HRESULT WINAPI IDirectXFileDataImpl_GetType(IDirectXFileData* iface, cons FIXME("(%p/%p)->(%p) stub!\n", This, iface, pguid); - return S_FALSE; + return DXFILEERR_BADVALUE; } static HRESULT WINAPI IDirectXFileDataImpl_GetNextObject(IDirectXFileData* iface, LPDIRECTXFILEOBJECT* ppChildObj) @@ -375,7 +375,7 @@ static HRESULT WINAPI IDirectXFileDataImpl_GetNextObject(IDirectXFileData* iface FIXME("(%p/%p)->(%p) stub!\n", This, iface, ppChildObj); - return S_FALSE; + return DXFILEERR_BADVALUE; } static HRESULT WINAPI IDirectXFileDataImpl_AddDataObject(IDirectXFileData* iface, LPDIRECTXFILEDATA pDataObj) @@ -384,7 +384,7 @@ static HRESULT WINAPI IDirectXFileDataImpl_AddDataObject(IDirectXFileData* iface FIXME("(%p/%p)->(%p) stub!\n", This, iface, pDataObj); - return S_FALSE; + return DXFILEERR_BADVALUE; } static HRESULT WINAPI IDirectXFileDataImpl_AddDataReference(IDirectXFileData* iface, LPCSTR szRef, const GUID* pguidRef) @@ -393,7 +393,7 @@ static HRESULT WINAPI IDirectXFileDataImpl_AddDataReference(IDirectXFileData* if FIXME("(%p/%p)->(%s,%p) stub!\n", This, iface, szRef, pguidRef); - return S_FALSE; + return DXFILEERR_BADVALUE; } static HRESULT WINAPI IDirectXFileDataImpl_AddBinaryObject(IDirectXFileData* iface, LPCSTR szName, const GUID* pguid, LPCSTR szMimeType, LPVOID pvData, DWORD cbSize) @@ -402,7 +402,7 @@ static HRESULT WINAPI IDirectXFileDataImpl_AddBinaryObject(IDirectXFileData* ifa FIXME("(%p/%p)->(%s,%p,%s,%p,%d) stub!\n", This, iface, szName, pguid, szMimeType, pvData, cbSize); - return S_FALSE; + return DXFILEERR_BADVALUE; } static const IDirectXFileDataVtbl IDirectXFileData_Vtbl = @@ -486,7 +486,7 @@ static HRESULT WINAPI IDirectXFileDataReferenceImpl_GetName(IDirectXFileDataRefe FIXME("(%p/%p)->(%p,%p) stub!\n", This, iface, pstrNameBuf, pdwBufLen); - return S_FALSE; + return DXFILEERR_BADVALUE; } static HRESULT WINAPI IDirectXFileDataReferenceImpl_GetId(IDirectXFileDataReference* iface, LPGUID pGuid) @@ -495,7 +495,7 @@ static HRESULT WINAPI IDirectXFileDataReferenceImpl_GetId(IDirectXFileDataRefere FIXME("(%p/%p)->(%p) stub!\n", This, iface, pGuid); - return S_FALSE; + return DXFILEERR_BADVALUE; } /*** IDirectXFileDataReference ***/ @@ -505,7 +505,7 @@ static HRESULT WINAPI IDirectXFileDataReferenceImpl_Resolve(IDirectXFileDataRefe FIXME("(%p/%p)->(%p) stub!\n", This, iface, ppDataObj); - return S_FALSE; + return DXFILEERR_BADVALUE; } static const IDirectXFileDataReferenceVtbl IDirectXFileDataReference_Vtbl = @@ -591,7 +591,7 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetNextDataObject(IDirectXFileE *ppDataObj = (LPDIRECTXFILEDATA)object; - return S_FALSE; + return DXFILEERR_BADVALUE; } static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetDataObjectById(IDirectXFileEnumObject* iface, REFGUID rguid, LPDIRECTXFILEDATA* ppDataObj) @@ -600,7 +600,7 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetDataObjectById(IDirectXFileE FIXME("(%p/%p)->(%p,%p) stub!\n", This, iface, rguid, ppDataObj); - return S_FALSE; + return DXFILEERR_BADVALUE; } static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetDataObjectByName(IDirectXFileEnumObject* iface, LPCSTR szName, LPDIRECTXFILEDATA* ppDataObj) @@ -609,7 +609,7 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetDataObjectByName(IDirectXFil FIXME("(%p/%p)->(%s,%p) stub!\n", This, iface, szName, ppDataObj); - return S_FALSE; + return DXFILEERR_BADVALUE; } static const IDirectXFileEnumObjectVtbl IDirectXFileEnumObject_Vtbl = @@ -687,7 +687,7 @@ static HRESULT WINAPI IDirectXFileObjectImpl_GetName(IDirectXFileObject* iface, FIXME("(%p/%p)->(%p,%p) stub!\n", This, iface, pstrNameBuf, pdwBufLen); - return S_FALSE; + return DXFILEERR_BADVALUE; } static HRESULT WINAPI IDirectXFileObjectImpl_GetId(IDirectXFileObject* iface, LPGUID pGuid) @@ -696,7 +696,7 @@ static HRESULT WINAPI IDirectXFileObjectImpl_GetId(IDirectXFileObject* iface, LP FIXME("(%p/%p)->(%p) stub!\n", This, iface, pGuid); - return S_FALSE; + return DXFILEERR_BADVALUE; } static const IDirectXFileObjectVtbl IDirectXFileObject_Vtbl = @@ -772,7 +772,7 @@ static HRESULT WINAPI IDirectXFileSaveObjectImpl_SaveTemplates(IDirectXFileSaveO FIXME("(%p/%p)->(%d,%p) stub!\n", This, iface, cTemplates, ppguidTemplates); - return S_FALSE; + return DXFILEERR_BADVALUE; } static HRESULT WINAPI IDirectXFileSaveObjectImpl_CreateDataObject(IDirectXFileSaveObject* iface, REFGUID rguidTemplate, LPCSTR szName, const GUID* pguid, DWORD cbSize, LPVOID pvData, LPDIRECTXFILEDATA* ppDataObj) @@ -781,7 +781,7 @@ static HRESULT WINAPI IDirectXFileSaveObjectImpl_CreateDataObject(IDirectXFileSa FIXME("(%p/%p)->(%p,%s,%p,%d,%p,%p) stub!\n", This, iface, rguidTemplate, szName, pguid, cbSize, pvData, ppDataObj); - return S_FALSE; + return DXFILEERR_BADVALUE; } static HRESULT WINAPI IDirectXFileSaveObjectImpl_SaveData(IDirectXFileSaveObject* iface, LPDIRECTXFILEDATA ppDataObj) @@ -790,7 +790,7 @@ static HRESULT WINAPI IDirectXFileSaveObjectImpl_SaveData(IDirectXFileSaveObject FIXME("(%p/%p)->(%p) stub!\n", This, iface, ppDataObj); - return S_FALSE; + return DXFILEERR_BADVALUE; } static const IDirectXFileSaveObjectVtbl IDirectXFileSaveObject_Vtbl =

1 0

Alexandre Julliard : libwine: Refuse to use a WINEPREFIX dir owned by a different user.
by Alexandre Julliard 08 Nov '07

08 Nov '07

Module: wine Branch: master Commit: 65d865d96313d96889bf8cbe88c931b5e1e9bb74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65d865d96313d96889bf8cbe8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 8 12:21:10 2007 +0100 libwine: Refuse to use a WINEPREFIX dir owned by a different user. --- libs/wine/config.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/libs/wine/config.c b/libs/wine/config.c index 5f8f31c..860cae2 100644 --- a/libs/wine/config.c +++ b/libs/wine/config.c @@ -230,6 +230,7 @@ static void init_paths(void) } } if (!S_ISDIR(st.st_mode)) fatal_error( "%s is not a directory\n", config_dir ); + if (st.st_uid != getuid()) fatal_error( "%s is not owned by you\n", config_dir ); init_server_dir( st.st_dev, st.st_ino ); }

1 0

Alex Villacís Lasso : riched20: Fix test failure in test_WM_PASTE.
by Alexandre Julliard 08 Nov '07

08 Nov '07

Module: wine Branch: master Commit: 8ae0eeafc6db41cb45d4ea6c1654ce6f6ddfe9d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ae0eeafc6db41cb45d4ea6c1… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Sat Nov 3 22:57:57 2007 -0500 riched20: Fix test failure in test_WM_PASTE. Native riched20 won't obey simple WM_CHAR or WM_KEYDOWN/WM_KEYUP messages when processing Ctrl-Key keystrokes. Use keybd_event() instead. --- dlls/riched20/tests/editor.c | 64 +++++++++++++++++++++++++++++++++++++---- 1 files changed, 57 insertions(+), 7 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index c5bde6a..5fb5975 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -1971,33 +1971,83 @@ static void test_EM_REPLACESEL(void) static void test_WM_PASTE(void) { + MSG msg; int result; char buffer[1024] = {0}; + char key_info[][3] = + { + /* VirtualKey, ScanCode, WM_CHAR code */ + {'C', 0x2e, 3}, /* Ctrl-C */ + {'X', 0x2d, 24}, /* Ctrl-X */ + {'V', 0x2f, 22}, /* Ctrl-V */ + {'Z', 0x2c, 26}, /* Ctrl-Z */ + {'Y', 0x15, 25}, /* Ctrl-Y */ + }; const char* text1 = "testing paste\r"; + const char* text1_step1 = "testing paste\r\ntesting paste\r\n"; const char* text1_after = "testing paste\r\n"; const char* text2 = "testing paste\r\rtesting paste"; + const char* text2_after = "testing paste\r\n\r\ntesting paste"; const char* text3 = "testing paste\r\npaste\r\ntesting paste"; HWND hwndRichEdit = new_richedit(NULL); + /* Native riched20 won't obey WM_CHAR messages or WM_KEYDOWN/WM_KEYUP + messages, probably because it inspects the keyboard state itself. + Therefore, native requires this in order to obey Ctrl-<key> keystrokes. + */ +#define SEND_CTRL_KEY(hwnd, k) \ + keybd_event(VK_CONTROL, 0x1d, 0, 0);\ + keybd_event(k[0], k[1], 0, 0);\ + keybd_event(k[0], k[1], KEYEVENTF_KEYUP, 0);\ + keybd_event(VK_CONTROL, 0x1d, KEYEVENTF_KEYUP, 0); \ + while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) { \ + TranslateMessage(&msg); \ + DispatchMessage(&msg); \ + } + +#define SEND_CTRL_C(hwnd) SEND_CTRL_KEY(hwnd, key_info[0]) +#define SEND_CTRL_X(hwnd) SEND_CTRL_KEY(hwnd, key_info[1]) +#define SEND_CTRL_V(hwnd) SEND_CTRL_KEY(hwnd, key_info[2]) +#define SEND_CTRL_Z(hwnd) SEND_CTRL_KEY(hwnd, key_info[3]) +#define SEND_CTRL_Y(hwnd) SEND_CTRL_KEY(hwnd, key_info[4]) + SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) text1); SendMessage(hwndRichEdit, EM_SETSEL, 0, 14); - SendMessage(hwndRichEdit, WM_CHAR, 3, 0); /* ctrl-c */ + + SEND_CTRL_C(hwndRichEdit) /* Copy */ SendMessage(hwndRichEdit, EM_SETSEL, 14, 14); - SendMessage(hwndRichEdit, WM_CHAR, 22, 0); /* ctrl-v */ - SendMessage(hwndRichEdit, WM_CHAR, 26, 0); /* ctrl-z */ + SEND_CTRL_V(hwndRichEdit) /* Paste */ SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); + /* Pasted text should be visible at this step */ + result = strcmp(text1_step1, buffer); + ok(result == 0, + "test paste: strcmp = %i\n", result); + SEND_CTRL_Z(hwndRichEdit) /* Undo */ + SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); + /* Text should be the same as before (except for \r -> \r\n conversion) */ result = strcmp(text1_after, buffer); ok(result == 0, "test paste: strcmp = %i\n", result); SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) text2); SendMessage(hwndRichEdit, EM_SETSEL, 8, 13); - SendMessage(hwndRichEdit, WM_CHAR, 3, 0); /* ctrl-c */ + SEND_CTRL_C(hwndRichEdit) /* Copy */ SendMessage(hwndRichEdit, EM_SETSEL, 14, 14); - SendMessage(hwndRichEdit, WM_CHAR, 22, 0); /* ctrl-v */ - SendMessage(hwndRichEdit, WM_CHAR, 26, 0); /* ctrl-z */ - SendMessage(hwndRichEdit, WM_CHAR, 25, 0); /* ctrl-y */ + SEND_CTRL_V(hwndRichEdit) /* Paste */ + SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); + /* Pasted text should be visible at this step */ + result = strcmp(text3, buffer); + ok(result == 0, + "test paste: strcmp = %i\n", result); + SEND_CTRL_Z(hwndRichEdit) /* Undo */ + SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); + /* Text should be the same as before (except for \r -> \r\n conversion) */ + result = strcmp(text2_after, buffer); + ok(result == 0, + "test paste: strcmp = %i\n", result); + SEND_CTRL_Y(hwndRichEdit) /* Redo */ SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); + /* Text should revert to post-paste state */ result = strcmp(buffer,text3); ok(result == 0, "test paste: strcmp = %i\n", result);

1 0

Hans Leidekker : wldap32: Fix build against latest OpenLDAP release.
by Alexandre Julliard 08 Nov '07

08 Nov '07

Module: wine Branch: master Commit: 032dbfe47493648084f57e24d019d63bfbe04dca URL: http://source.winehq.org/git/wine.git/?a=commit;h=032dbfe47493648084f57e24d… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Thu Nov 8 12:35:36 2007 +0100 wldap32: Fix build against latest OpenLDAP release. --- configure | 10 +++++- configure.ac | 6 +++- dlls/wldap32/parse.c | 69 ++++++++++++++++++++++++++++++++++----- dlls/wldap32/winldap_private.h | 8 +++++ include/config.h.in | 12 +++++++ 5 files changed, 94 insertions(+), 11 deletions(-) diff --git a/configure b/configure index 1fc3fa7..d2f86cf 100755 --- a/configure +++ b/configure @@ -12902,11 +12902,19 @@ LIBS="$LIBS $LDAPLIBS $LIBPTHREAD" + + + + for ac_func in \ ldap_count_references \ ldap_first_reference \ ldap_next_reference \ - ldap_parse_reference + ldap_parse_reference \ + ldap_parse_sort_control \ + ldap_parse_sortresponse_control \ + ldap_parse_vlv_control \ + ldap_parse_vlvresponse_control do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` { echo "$as_me:$LINENO: checking for $ac_func" >&5 diff --git a/configure.ac b/configure.ac index aa90092..3d62f45 100644 --- a/configure.ac +++ b/configure.ac @@ -864,7 +864,11 @@ then ldap_count_references \ ldap_first_reference \ ldap_next_reference \ - ldap_parse_reference, + ldap_parse_reference \ + ldap_parse_sort_control \ + ldap_parse_sortresponse_control \ + ldap_parse_vlv_control \ + ldap_parse_vlvresponse_control, [$LDAPLIBS $LIBPTHREAD]) fi WINE_NOTICE_IF([test "x$LDAPLIBS" = "x"],[libldap (OpenLDAP) development files not found. diff --git a/dlls/wldap32/parse.c b/dlls/wldap32/parse.c index e47adf2..81c30b3 100644 --- a/dlls/wldap32/parse.c +++ b/dlls/wldap32/parse.c @@ -325,7 +325,13 @@ ULONG CDECL ldap_parse_sort_controlW( WLDAP32_LDAP *ld, PLDAPControlW *control, #ifdef HAVE_LDAP char *attrU = NULL; LDAPControl **controlU = NULL; +#ifdef HAVE_LDAP_PARSE_SORT_CONTROL unsigned long res; +#elif defined(HAVE_LDAP_PARSE_SORTRESPONSE_CONTROL) + ber_int_t res; + LDAPControl *sortcontrol = NULL; + unsigned int i; +#endif TRACE( "(%p, %p, %p, %p)\n", ld, control, result, attr ); @@ -336,10 +342,29 @@ ULONG CDECL ldap_parse_sort_controlW( WLDAP32_LDAP *ld, PLDAPControlW *control, if (!controlU) return WLDAP32_LDAP_NO_MEMORY; } - ret = ldap_parse_sort_control( ld, controlU, &res, &attrU ); - - *result = res; - *attr = strUtoW( attrU ); +#ifdef HAVE_LDAP_PARSE_SORT_CONTROL + if (!(ret = ldap_parse_sort_control( ld, controlU, &res, &attrU ))) + { + *result = res; + *attr = strUtoW( attrU ); + } +#elif defined(HAVE_LDAP_PARSE_SORTRESPONSE_CONTROL) + for (i = 0; controlU[i]; i++) + { + if (!strcmp( LDAP_SERVER_RESP_SORT_OID, controlU[i]->ldctl_oid )) + sortcontrol = controlU[i]; + } + if (!sortcontrol) + { + controlarrayfreeU( controlU ); + return WLDAP32_LDAP_CONTROL_NOT_FOUND; + } + if (!(ret = ldap_parse_sortresponse_control( ld, sortcontrol, &res, &attrU ))) + { + *result = res; + *attr = strUtoW( attrU ); + } +#endif controlarrayfreeU( controlU ); #endif @@ -405,7 +430,13 @@ INT CDECL ldap_parse_vlv_controlW( WLDAP32_LDAP *ld, PLDAPControlW *control, int ret = LDAP_NOT_SUPPORTED; #ifdef HAVE_LDAP LDAPControl **controlU = NULL; +#ifdef HAVE_LDAP_PARSE_VLV_CONTROL unsigned long pos, count; +#elif defined(HAVE_LDAP_PARSE_VLVRESPONSE_CONTROL) + ber_int_t pos, count; + LDAPControl *vlvcontrol = NULL; + unsigned int i; +#endif TRACE( "(%p, %p, %p, %p, %p, %p)\n", ld, control, targetpos, listcount, context, errcode ); @@ -417,11 +448,31 @@ INT CDECL ldap_parse_vlv_controlW( WLDAP32_LDAP *ld, PLDAPControlW *control, if (!controlU) return WLDAP32_LDAP_NO_MEMORY; } - ret = ldap_parse_vlv_control( ld, controlU, &pos, &count, - (struct berval **)context, errcode ); - - *targetpos = pos; - *listcount = count; +#ifdef HAVE_LDAP_PARSE_VLV_CONTROL + if (!(ret = ldap_parse_vlv_control( ld, controlU, &pos, &count, + (struct berval **)context, errcode ))) + { + *targetpos = pos; + *listcount = count; + } +#elif defined(HAVE_LDAP_PARSE_VLVRESPONSE_CONTROL) + for (i = 0; controlU[i]; i++) + { + if (!strcmp( LDAP_CONTROL_VLVRESPONSE, controlU[i]->ldctl_oid )) + vlvcontrol = controlU[i]; + } + if (!vlvcontrol) + { + controlarrayfreeU( controlU ); + return WLDAP32_LDAP_CONTROL_NOT_FOUND; + } + if (!(ret = ldap_parse_vlvresponse_control( ld, vlvcontrol, &pos, &count, + (struct berval **)context, errcode ))) + { + *targetpos = pos; + *listcount = count; + } +#endif controlarrayfreeU( controlU ); #endif diff --git a/dlls/wldap32/winldap_private.h b/dlls/wldap32/winldap_private.h index 4936a58..e494e20 100644 --- a/dlls/wldap32/winldap_private.h +++ b/dlls/wldap32/winldap_private.h @@ -190,6 +190,14 @@ typedef struct WLDAP32_berval #define LDAP_PAGED_RESULT_OID_STRING_W (const WCHAR []){'1','.','2','.', \ '8','4','0','.','1','1','3','5','5','6','.','1','.','4','.','3','1','9',0} +#define LDAP_SERVER_RESP_SORT_OID "1.2.840.113556.1.4.474" +#define LDAP_SERVER_RESP_SORT_OID_W (const WCHAR []){'1','.','2','.', \ + '8','4','0','.','1','1','3','5','5','6','.','1','.','4','.','4','7','4',0} + +#define LDAP_CONTROL_VLVRESPONSE "2.16.840.1.113730.3.4.10" +#define LDAP_CONTROL_VLVRESPONSE_W (const WCHAR []){'2','.','1','6','.', \ + '8','4','0','.','1','.','1','1','3','7','3','0','.','3','.','4','.','1','0',0} + typedef struct ldapcontrolA { PCHAR ldctl_oid; diff --git a/include/config.h.in b/include/config.h.in index c352c42..75e5d64 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -288,6 +288,18 @@ /* Define to 1 if you have the `ldap_parse_reference' function. */ #undef HAVE_LDAP_PARSE_REFERENCE +/* Define to 1 if you have the `ldap_parse_sortresponse_control' function. */ +#undef HAVE_LDAP_PARSE_SORTRESPONSE_CONTROL + +/* Define to 1 if you have the `ldap_parse_sort_control' function. */ +#undef HAVE_LDAP_PARSE_SORT_CONTROL + +/* Define to 1 if you have the `ldap_parse_vlvresponse_control' function. */ +#undef HAVE_LDAP_PARSE_VLVRESPONSE_CONTROL + +/* Define to 1 if you have the `ldap_parse_vlv_control' function. */ +#undef HAVE_LDAP_PARSE_VLV_CONTROL + /* Define if you have libaudioIO */ #undef HAVE_LIBAUDIOIO

1 0

Alexandre Julliard : wldap32: Always return WLDAP32 error values instead of redefining the ldap.h ones.
by Alexandre Julliard 08 Nov '07

08 Nov '07

Module: wine Branch: master Commit: 469068715c871dbcae5cf7087a9acbeeb0182b49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=469068715c871dbcae5cf7087… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 8 13:11:34 2007 +0100 wldap32: Always return WLDAP32 error values instead of redefining the ldap.h ones. --- dlls/wldap32/add.c | 20 ++++++++------------ dlls/wldap32/bind.c | 31 ++++++++++++++----------------- dlls/wldap32/compare.c | 18 ++++++++---------- dlls/wldap32/control.c | 21 +++++++++------------ dlls/wldap32/delete.c | 18 ++++++++---------- dlls/wldap32/dn.c | 6 ++---- dlls/wldap32/error.c | 5 +---- dlls/wldap32/extended.c | 13 +++++-------- dlls/wldap32/init.c | 11 ++++------- dlls/wldap32/misc.c | 17 +++++++---------- dlls/wldap32/modify.c | 20 ++++++++------------ dlls/wldap32/modrdn.c | 18 ++++++++---------- dlls/wldap32/option.c | 36 +++++++++++++++++------------------- dlls/wldap32/page.c | 23 ++++++++++------------- dlls/wldap32/parse.c | 22 ++++++++++------------ dlls/wldap32/rename.c | 10 ++++------ dlls/wldap32/search.c | 23 ++++++++++------------- dlls/wldap32/value.c | 15 ++++++--------- dlls/wldap32/winldap_private.h | 2 ++ 19 files changed, 141 insertions(+), 188 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=469068715c871dbcae5cf…

1 0

Hans Leidekker : mlang: Release EnumRfc1766 object.
by Alexandre Julliard 08 Nov '07

08 Nov '07

Module: wine Branch: master Commit: 9b3ec4fbb8f45542fb87e3393ae2bef572e7639a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b3ec4fbb8f45542fb87e3393… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Thu Nov 8 12:35:46 2007 +0100 mlang: Release EnumRfc1766 object. --- dlls/mlang/tests/mlang.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index fb50e2e..c036f7a 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -677,6 +677,7 @@ static void test_rfc1766(IMultiLanguage2 *iML2) ok(n == 1, "couldn't fetch 1 RFC1766INFO structure\n"); ok(IsValidLocale(info.lcid, LCID_SUPPORTED), "invalid lcid %04x\n", info.lcid); } + IEnumRfc1766_Release(pEnumRfc1766); } static void test_GetLcidFromRfc1766(IMultiLanguage2 *iML2)

1 0

Hans Leidekker : mlang: Free SCRIPTINFO structure embedded in EnumScript object.
by Alexandre Julliard 08 Nov '07

08 Nov '07

Module: wine Branch: master Commit: 90d76060c4a151cde28985c1f96c8026fc74733e URL: http://source.winehq.org/git/wine.git/?a=commit;h=90d76060c4a151cde28985c1f… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Thu Nov 8 12:35:57 2007 +0100 mlang: Free SCRIPTINFO structure embedded in EnumScript object. --- dlls/mlang/mlang.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index b6bd57e..98c62bb 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -1216,6 +1216,7 @@ static ULONG WINAPI fnIEnumScript_Release( if (ref == 0) { TRACE("Destroying %p\n", This); + HeapFree(GetProcessHeap(), 0, This->script_info); HeapFree(GetProcessHeap(), 0, This); }

1 0

Juan Lang : wininet: Fix another typo.
by Alexandre Julliard 08 Nov '07

08 Nov '07

Module: wine Branch: master Commit: a1ab4a7effcaa41a3a6cb2b607d2466f7c30121a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1ab4a7effcaa41a3a6cb2b60… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Nov 7 14:45:06 2007 -0800 wininet: Fix another typo. --- dlls/wininet/http.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 328e151..0a23979 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3203,7 +3203,7 @@ static LPWSTR * HTTP_InterpretHttpHeader(LPCWSTR buffer) * */ -#define COALESCEFLASG (HTTP_ADDHDR_FLAG_COALESCE|HTTP_ADDHDR_FLAG_COALESCE_WITH_COMMA|HTTP_ADDHDR_FLAG_COALESCE_WITH_SEMICOLON) +#define COALESCEFLAGS (HTTP_ADDHDR_FLAG_COALESCE|HTTP_ADDHDR_FLAG_COALESCE_WITH_COMMA|HTTP_ADDHDR_FLAG_COALESCE_WITH_SEMICOLON) static BOOL HTTP_ProcessHeader(LPWININETHTTPREQW lpwhr, LPCWSTR field, LPCWSTR value, DWORD dwModifier) { @@ -3272,7 +3272,7 @@ static BOOL HTTP_ProcessHeader(LPWININETHTTPREQW lpwhr, LPCWSTR field, LPCWSTR v return TRUE; } - else if (dwModifier & COALESCEFLASG) + else if (dwModifier & COALESCEFLAGS) { LPWSTR lpsztmp; WCHAR ch = 0;

1 0