wine-commits June 2007

wine-commits@winehq.org

5 participants
856 discussions

Kai Blin : ws2_32: Add mapping for STATUS_OBJECT_TYPE_MISMATCH to WSAENOTSOCK.
by Alexandre Julliard 06 Jun '07

06 Jun '07

Module: wine Branch: master Commit: f500591f3802912afd872b4a6c8c0b00b80076fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=f500591f3802912afd872b4a6… Author: Kai Blin <kai.blin(a)gmail.com> Date: Tue Jun 5 14:43:20 2007 +0200 ws2_32: Add mapping for STATUS_OBJECT_TYPE_MISMATCH to WSAENOTSOCK. --- dlls/ws2_32/socket.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index f13ad2a..456be21 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -359,7 +359,8 @@ static inline DWORD NtStatusToWSAError( const DWORD status ) { case STATUS_SUCCESS: wserr = 0; break; case STATUS_PENDING: wserr = WSA_IO_PENDING; break; - case STATUS_INVALID_HANDLE: wserr = WSAENOTSOCK; break; /* WSAEBADF ? */ + case STATUS_OBJECT_TYPE_MISMATCH: wserr = WSAENOTSOCK; break; + case STATUS_INVALID_HANDLE: wserr = WSAEBADF; break; case STATUS_INVALID_PARAMETER: wserr = WSAEINVAL; break; case STATUS_PIPE_DISCONNECTED: wserr = WSAESHUTDOWN; break; case STATUS_CANCELLED: wserr = WSA_OPERATION_ABORTED; break;

1 0

Huw Davies : riched20: Don't mess with the caret if we don't have focus.
by Alexandre Julliard 06 Jun '07

06 Jun '07

Module: wine Branch: master Commit: 94dfc0e80e84488698180797432f621acae4d6f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94dfc0e80e844886981807974… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jun 5 13:56:55 2007 +0100 riched20: Don't mess with the caret if we don't have focus. --- dlls/riched20/caret.c | 17 ++++++++++++----- dlls/riched20/editor.c | 3 +++ dlls/riched20/editstr.h | 1 + 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 5f3259e..f2ca595 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -232,21 +232,28 @@ ME_MoveCaret(ME_TextEditor *editor) ME_WrapMarkedParagraphs(editor); ME_GetCursorCoordinates(editor, &editor->pCursors[0], &x, &y, &height); - CreateCaret(editor->hWnd, NULL, 0, height); - SetCaretPos(x, y); + if(editor->bHaveFocus) + { + CreateCaret(editor->hWnd, NULL, 0, height); + SetCaretPos(x, y); + } } void ME_ShowCaret(ME_TextEditor *ed) { ME_MoveCaret(ed); - ShowCaret(ed->hWnd); + if(ed->bHaveFocus) + ShowCaret(ed->hWnd); } void ME_HideCaret(ME_TextEditor *ed) { - HideCaret(ed->hWnd); - DestroyCaret(); + if(ed->bHaveFocus) + { + HideCaret(ed->hWnd); + DestroyCaret(); + } } void ME_InternalDeleteText(ME_TextEditor *editor, int nOfs, diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 24febcf..480b5d3 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1153,6 +1153,7 @@ ME_TextEditor *ME_MakeEditor(HWND hWnd) { ed->lpOleCallback = NULL; ed->mode = TM_RICHTEXT | TM_MULTILEVELUNDO | TM_MULTICODEPAGE; ed->AutoURLDetect_bEnable = FALSE; + ed->bHaveFocus = FALSE; GetClientRect(hWnd, &ed->rcFormat); for (i=0; i<HFONT_CACHE_SIZE; i++) { @@ -2335,11 +2336,13 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, } break; case WM_SETFOCUS: + editor->bHaveFocus = TRUE; ME_ShowCaret(editor); ME_SendOldNotify(editor, EN_SETFOCUS); return 0; case WM_KILLFOCUS: ME_HideCaret(editor); + editor->bHaveFocus = FALSE; ME_SendOldNotify(editor, EN_KILLFOCUS); return 0; case WM_ERASEBKGND: diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index 9859fe7..ee5dfe3 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -321,6 +321,7 @@ typedef struct tagME_TextEditor BOOL bHideSelection; BOOL AutoURLDetect_bEnable; WCHAR cPasswordMask; + BOOL bHaveFocus; } ME_TextEditor; typedef struct tagME_Context

1 0

Huw Davies : oleaut32: Fixes for the PICTYPE_UNINITIALIZED case.
by Alexandre Julliard 06 Jun '07

06 Jun '07

Module: wine Branch: master Commit: e848f6d539356188318ce4669de87866595b8482 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e848f6d539356188318ce4669… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jun 5 10:33:24 2007 +0100 oleaut32: Fixes for the PICTYPE_UNINITIALIZED case. --- dlls/oleaut32/olepicture.c | 2 ++ dlls/oleaut32/tests/olepicture.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 3eb6e3e..5d3a9f0 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -365,6 +365,7 @@ static void OLEPictureImpl_Destroy(OLEPictureImpl* Obj) DeleteEnhMetaFile(Obj->desc.u.emf.hemf); break; case PICTYPE_NONE: + case PICTYPE_UNINITIALIZED: /* Nothing to do */ break; default: @@ -505,6 +506,7 @@ static HRESULT WINAPI OLEPictureImpl_get_Handle(IPicture *iface, TRACE("(%p)->(%p)\n", This, phandle); switch(This->desc.picType) { case PICTYPE_NONE: + case PICTYPE_UNINITIALIZED: *phandle = 0; break; case PICTYPE_BITMAP: diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index 1f65c3d..00027de 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -43,6 +43,7 @@ static HMODULE hOleaut32; static HRESULT (WINAPI *pOleLoadPicture)(LPSTREAM,LONG,BOOL,REFIID,LPVOID*); +static HRESULT (WINAPI *pOleCreatePictureIndirect)(PICTDESC*,REFIID,BOOL,LPVOID*); #define ok_ole_success(hr, func) ok(hr == S_OK, func " failed with error 0x%08x\n", hr) @@ -396,10 +397,38 @@ static void test_Invoke(void) IPictureDisp_Release(picdisp); } +static void test_OleCreatePictureIndirect(void) +{ + IPicture *pict; + HRESULT hr; + short type; + OLE_HANDLE handle; + + if(!pOleCreatePictureIndirect) + { + skip("Skipping OleCreatePictureIndirect tests\n"); + return; + } + + hr = pOleCreatePictureIndirect(NULL, &IID_IPicture, TRUE, (void**)&pict); + ok(hr == S_OK, "hr %08x\n", hr); + + hr = IPicture_get_Type(pict, &type); + ok(hr == S_OK, "hr %08x\n", hr); + ok(type == PICTYPE_UNINITIALIZED, "type %d\n", type); + + hr = IPicture_get_Handle(pict, &handle); + ok(hr == S_OK, "hr %08x\n", hr); + ok(handle == 0, "handle %08x\n", handle); + + IPicture_Release(pict); +} + START_TEST(olepicture) { hOleaut32 = LoadLibraryA("oleaut32.dll"); pOleLoadPicture = (void*)GetProcAddress(hOleaut32, "OleLoadPicture"); + pOleCreatePictureIndirect = (void*)GetProcAddress(hOleaut32, "OleCreatePictureIndirect"); if (!pOleLoadPicture) return; @@ -414,6 +443,7 @@ START_TEST(olepicture) test_empty_image_2(); test_Invoke(); + test_OleCreatePictureIndirect(); }

1 0

Alexander Nicolaysen Sørnes : wordpad: Add missing dots to Open menu item.
by Alexandre Julliard 06 Jun '07

06 Jun '07

Module: wine Branch: master Commit: f19f4de59ec5873dfb45a3d5d6175b05b96fa347 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f19f4de59ec5873dfb45a3d5d… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Tue Jun 5 11:11:56 2007 +0200 wordpad: Add missing dots to Open menu item. --- programs/wordpad/De.rc | 2 +- programs/wordpad/En.rc | 2 +- programs/wordpad/Fr.rc | 2 +- programs/wordpad/Hu.rc | 2 +- programs/wordpad/Ko.rc | 2 +- programs/wordpad/Nl.rc | 2 +- programs/wordpad/No.rc | 12 ++++++------ programs/wordpad/Pl.rc | 4 ++-- programs/wordpad/Ru.rc | 2 +- programs/wordpad/Tr.rc | 2 +- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/programs/wordpad/De.rc b/programs/wordpad/De.rc index 054e234..64893cb 100644 --- a/programs/wordpad/De.rc +++ b/programs/wordpad/De.rc @@ -23,7 +23,7 @@ BEGIN POPUP "&Datei" BEGIN MENUITEM "&Neu\tCtrl+N", ID_FILE_NEW - MENUITEM "&�ffnen\tCtrl+O", ID_FILE_OPEN + MENUITEM "&�ffnen...\tCtrl+O", ID_FILE_OPEN MENUITEM "&Speichern\tCtrl+S", ID_FILE_SAVE MENUITEM "Speichern &unter...", ID_FILE_SAVEAS MENUITEM SEPARATOR diff --git a/programs/wordpad/En.rc b/programs/wordpad/En.rc index 4fa734d..2f08653 100644 --- a/programs/wordpad/En.rc +++ b/programs/wordpad/En.rc @@ -23,7 +23,7 @@ BEGIN POPUP "&File" BEGIN MENUITEM "&New\tCtrl+N", ID_FILE_NEW - MENUITEM "&Open\tCtrl+O", ID_FILE_OPEN + MENUITEM "&Open . . .\tCtrl+O", ID_FILE_OPEN MENUITEM "&Save\tCtrl+S", ID_FILE_SAVE MENUITEM "Save &as . . .", ID_FILE_SAVEAS MENUITEM SEPARATOR diff --git a/programs/wordpad/Fr.rc b/programs/wordpad/Fr.rc index e0d8370..c52dac2 100644 --- a/programs/wordpad/Fr.rc +++ b/programs/wordpad/Fr.rc @@ -23,7 +23,7 @@ BEGIN POPUP "&Fichier" BEGIN MENUITEM "&Nouveau\tCtrl+N", ID_FILE_NEW - MENUITEM "&Ouvrir\tCtrl+O", ID_FILE_OPEN + MENUITEM "&Ouvrir...\tCtrl+O", ID_FILE_OPEN MENUITEM "&Enregistrer\tCtrl+S", ID_FILE_SAVE MENUITEM "Enregistrer &sous...", ID_FILE_SAVEAS MENUITEM SEPARATOR diff --git a/programs/wordpad/Hu.rc b/programs/wordpad/Hu.rc index 2cab4f5..93c0220 100644 --- a/programs/wordpad/Hu.rc +++ b/programs/wordpad/Hu.rc @@ -23,7 +23,7 @@ BEGIN POPUP "&F�jl" BEGIN MENUITEM "&�j\tCtrl+N", ID_FILE_NEW - MENUITEM "&Megnyit�s\tCtrl+O", ID_FILE_OPEN + MENUITEM "&Megnyit�s...\tCtrl+O", ID_FILE_OPEN MENUITEM "M&ent�s\tCtrl+S", ID_FILE_SAVE MENUITEM "Ment�s m�&sk�nt...", ID_FILE_SAVEAS MENUITEM SEPARATOR diff --git a/programs/wordpad/Ko.rc b/programs/wordpad/Ko.rc index 6694006..d963f62 100644 --- a/programs/wordpad/Ko.rc +++ b/programs/wordpad/Ko.rc @@ -24,7 +24,7 @@ BEGIN POPUP "��(&F)" BEGIN MENUITEM "�� (&N)\tCtrl+N", ID_FILE_NEW - MENUITEM "��(&O)\tCtrl+O", ID_FILE_OPEN + MENUITEM "��(&O)...\tCtrl+O", ID_FILE_OPEN MENUITEM "��(&S)\tCtrl+S", ID_FILE_SAVE MENUITEM "�ٸ� �̸�� (&A)...", ID_FILE_SAVEAS MENUITEM SEPARATOR diff --git a/programs/wordpad/Nl.rc b/programs/wordpad/Nl.rc index e009d5f..67f378b 100644 --- a/programs/wordpad/Nl.rc +++ b/programs/wordpad/Nl.rc @@ -23,7 +23,7 @@ BEGIN POPUP "&Bestand" BEGIN MENUITEM "&Nieuw\tCtrl+N" ID_FILE_NEW - MENUITEM "&Openen\tCtrl+O", ID_FILE_OPEN + MENUITEM "&Openen...\tCtrl+O", ID_FILE_OPEN MENUITEM "O&pslaan\tCtrl+S", ID_FILE_SAVE MENUITEM "Ops&laan als...", ID_FILE_SAVEAS MENUITEM SEPARATOR diff --git a/programs/wordpad/No.rc b/programs/wordpad/No.rc index 3efb408..87be440 100644 --- a/programs/wordpad/No.rc +++ b/programs/wordpad/No.rc @@ -1,5 +1,5 @@ /* - * Copyright 2006 by Alexander N. S�rnes <alex(a)thehandofagony.com> + * Copyright 2006-2007 by Alexander N. S�rnes <alex(a)thehandofagony.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -22,12 +22,12 @@ MAINMENU MENU DISCARDABLE BEGIN POPUP "&Fil" BEGIN - MENUITEM "&Ny\tCtrl+N", ID_FILE_NEW - MENUITEM "&�pne\tCtrl+O", ID_FILE_OPEN - MENUITEM "&Lagre\tCtrl+S", ID_FILE_SAVE - MENUITEM "Lagre &som . . .", ID_FILE_SAVEAS + MENUITEM "&Ny\tCtrl+N", ID_FILE_NEW + MENUITEM "&�pne . . .\tCtrl+O", ID_FILE_OPEN + MENUITEM "&Lagre\tCtrl+S", ID_FILE_SAVE + MENUITEM "Lagre &som . . .", ID_FILE_SAVEAS MENUITEM SEPARATOR - MENUITEM "&Avslutt", ID_FILE_EXIT + MENUITEM "&Avslutt", ID_FILE_EXIT END POPUP "R&ediger" BEGIN diff --git a/programs/wordpad/Pl.rc b/programs/wordpad/Pl.rc index 9498484..c556264 100644 --- a/programs/wordpad/Pl.rc +++ b/programs/wordpad/Pl.rc @@ -23,8 +23,8 @@ MAINMENU MENU DISCARDABLE BEGIN POPUP "&Plik" BEGIN - MENUITEM "&Nowy\tCtrl+N", ID_FILE_NEW - MENUITEM "&Otw�rz\tCtrl+O", ID_FILE_OPEN + MENUITEM "&Nowy\tCtrl+N", ID_FILE_NEW + MENUITEM "&Otw�rz...\tCtrl+O", ID_FILE_OPEN MENUITEM "&Zapisz\tCtrl+S", ID_FILE_SAVE MENUITEM "Z&apisz jako...", ID_FILE_SAVEAS MENUITEM SEPARATOR diff --git a/programs/wordpad/Ru.rc b/programs/wordpad/Ru.rc index ff471e2..ef18f08 100644 --- a/programs/wordpad/Ru.rc +++ b/programs/wordpad/Ru.rc @@ -23,7 +23,7 @@ BEGIN POPUP "&��" BEGIN MENUITEM "��&��\tCtrl+N", ID_FILE_NEW - MENUITEM "&��\tCtrl+O", ID_FILE_OPEN + MENUITEM "&��...\tCtrl+O",ID_FILE_OPEN MENUITEM "&��\tCtrl+S", ID_FILE_SAVE MENUITEM "�� &��...", ID_FILE_SAVEAS MENUITEM SEPARATOR diff --git a/programs/wordpad/Tr.rc b/programs/wordpad/Tr.rc index 0d6598e..7a124ab 100644 --- a/programs/wordpad/Tr.rc +++ b/programs/wordpad/Tr.rc @@ -25,7 +25,7 @@ BEGIN POPUP "&Dosya" BEGIN MENUITEM "&Yeni\tCtrl+N", ID_FILE_NEW - MENUITEM "&A�\tCtrl+O", ID_FILE_OPEN + MENUITEM "&A�...\tCtrl+O", ID_FILE_OPEN MENUITEM "&Kaydet\tCtrl+S", ID_FILE_SAVE MENUITEM "&Farkl� Kaydet...", ID_FILE_SAVEAS MENUITEM SEPARATOR

1 0

Alexandre Julliard : advapi32: Convert the service list to a standard list.
by Alexandre Julliard 06 Jun '07

06 Jun '07

Module: wine Branch: master Commit: 84918394d2118b47eef71e35a3591156cf7b660d URL: http://source.winehq.org/git/wine.git/?a=commit;h=84918394d2118b47eef71e35a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 5 13:47:35 2007 +0200 advapi32: Convert the service list to a standard list. --- dlls/advapi32/service.c | 76 +++++++++++++++++++++++------------------------ 1 files changed, 37 insertions(+), 39 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 08df41f..7752b02 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -35,6 +35,7 @@ #include "winternl.h" #include "lmcons.h" #include "lmserver.h" +#include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(advapi); @@ -58,7 +59,7 @@ typedef struct service_start_info_t typedef struct service_data_t { - struct service_data_t *next; + struct list entry; union { LPHANDLER_FUNCTION handler; LPHANDLER_FUNCTION_EX handler_ex; @@ -86,7 +87,7 @@ static CRITICAL_SECTION_DEBUG service_cs_debug = }; static CRITICAL_SECTION service_cs = { &service_cs_debug, -1, 0, 0, 0, 0 }; -static service_data *service_list; +static struct list service_list = LIST_INIT(service_list); /****************************************************************************** * SC_HANDLEs @@ -764,22 +765,20 @@ static DWORD WINAPI service_control_dispatcher(LPVOID arg) static BOOL service_run_threads(void) { service_data *service; - DWORD count = 0, n = 0; + DWORD count, n = 0; HANDLE *handles; EnterCriticalSection( &service_cs ); - /* count how many services there are */ - for (service = service_list; service; service = service->next) - count++; + count = list_count( &service_list ); TRACE("starting %d pipe listener threads\n", count); handles = HeapAlloc(GetProcessHeap(), 0, sizeof(HANDLE)*count); - for (n=0, service = service_list; service; service = service->next, n++) - handles[n] = CreateThread( NULL, 0, service_control_dispatcher, - service, 0, NULL ); + LIST_FOR_EACH_ENTRY( service, &service_list, service_data, entry ) + handles[n++] = CreateThread( NULL, 0, service_control_dispatcher, + service, 0, NULL ); assert(n==count); LeaveCriticalSection( &service_cs ); @@ -816,11 +815,7 @@ BOOL WINAPI StartServiceCtrlDispatcherA( const SERVICE_TABLE_ENTRYA *servent ) MultiByteToWideChar(CP_ACP, 0, name, -1, info->name, len); info->proc.a = servent->lpServiceProc; info->unicode = FALSE; - - /* insert into the list */ - info->next = service_list; - service_list = info; - + list_add_head( &service_list, &info->entry ); servent++; } LeaveCriticalSection( &service_cs ); @@ -862,11 +857,7 @@ BOOL WINAPI StartServiceCtrlDispatcherW( const SERVICE_TABLE_ENTRYW *servent ) strcpyW(info->name, name); info->proc.w = servent->lpServiceProc; info->unicode = TRUE; - - /* insert into the list */ - info->next = service_list; - service_list = info; - + list_add_head( &service_list, &info->entry ); servent++; } LeaveCriticalSection( &service_cs ); @@ -934,16 +925,20 @@ SERVICE_STATUS_HANDLE WINAPI RegisterServiceCtrlHandlerW( LPCWSTR lpServiceName, LPHANDLER_FUNCTION lpfHandler ) { service_data *service; + SERVICE_STATUS_HANDLE handle = 0; EnterCriticalSection( &service_cs ); - for(service = service_list; service; service = service->next) + LIST_FOR_EACH_ENTRY( service, &service_list, service_data, entry ) + { if(!strcmpW(lpServiceName, service->name)) + { + service->handler.handler = lpfHandler; + handle = (SERVICE_STATUS_HANDLE)service; break; - if (service) - service->handler.handler = lpfHandler; + } + } LeaveCriticalSection( &service_cs ); - - return (SERVICE_STATUS_HANDLE)service; + return handle; } /****************************************************************************** @@ -957,7 +952,7 @@ BOOL WINAPI SetServiceStatus( SERVICE_STATUS_HANDLE hService, LPSERVICE_STATUS lpStatus ) { service_data *service; - BOOL r = TRUE; + BOOL r = FALSE; TRACE("%p %x %x %x %x %x %x %x\n", hService, lpStatus->dwServiceType, lpStatus->dwCurrentState, @@ -966,16 +961,16 @@ SetServiceStatus( SERVICE_STATUS_HANDLE hService, LPSERVICE_STATUS lpStatus ) lpStatus->dwWaitHint); EnterCriticalSection( &service_cs ); - for (service = service_list; service; service = service->next) + LIST_FOR_EACH_ENTRY( service, &service_list, service_data, entry ) + { if(service == (service_data*)hService) + { + memcpy( &service->status, lpStatus, sizeof(SERVICE_STATUS) ); + TRACE("Set service status to %d\n",service->status.dwCurrentState); + r = TRUE; break; - if (service) - { - memcpy( &service->status, lpStatus, sizeof(SERVICE_STATUS) ); - TRACE("Set service status to %d\n",service->status.dwCurrentState); + } } - else - r = FALSE; LeaveCriticalSection( &service_cs ); return r; @@ -2383,20 +2378,23 @@ SERVICE_STATUS_HANDLE WINAPI RegisterServiceCtrlHandlerExW( LPCWSTR lpServiceNam LPHANDLER_FUNCTION_EX lpHandlerProc, LPVOID lpContext ) { service_data *service; + SERVICE_STATUS_HANDLE handle = 0; TRACE("%s %p %p\n", debugstr_w(lpServiceName), lpHandlerProc, lpContext); EnterCriticalSection( &service_cs ); - for(service = service_list; service; service = service->next) + LIST_FOR_EACH_ENTRY( service, &service_list, service_data, entry ) + { if(!strcmpW(lpServiceName, service->name)) + { + service->handler.handler_ex = lpHandlerProc; + service->context = lpContext; + service->extended = TRUE; + handle = (SERVICE_STATUS_HANDLE)service; break; - if (service) - { - service->handler.handler_ex = lpHandlerProc; - service->context = lpContext; - service->extended = TRUE; + } } LeaveCriticalSection( &service_cs ); - return (SERVICE_STATUS_HANDLE)service; + return handle; }

1 0

lostwages/news 2007060401.xml
by WineHQ 05 Jun '07

05 Jun '07

ChangeSet ID: 31159 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: wineowner(a)winehq.org 2007/06/05 11:46:45 Modified files: news : 2007060401.xml Log message: minor grammatical change Patch: http://cvs.winehq.org/patch.py?id=31159 Old revision New revision Changes Path 1.1 1.2 +3 -3 lostwages/news/2007060401.xml Index: lostwages/news/2007060401.xml diff -u -p lostwages/news/2007060401.xml:1.1 lostwages/news/2007060401.xml:1.2 --- lostwages/news/2007060401.xml:1.1 5 Jun 2007 16:46:45 -0000 +++ lostwages/news/2007060401.xml 5 Jun 2007 16:46:45 -0000 @@ -1,6 +1,6 @@ <news> <date>June 4, 2007</date> - <title>CrossOver® 6.1</title> + <title>CrossOver® 6.1</title> <body> <p>We're a bit late in reporting this, but CodeWeavers released version 6.1 of their CrossOver products on May 15th. You can @@ -8,8 +8,8 @@ <a href="http://www.codeweavers.com/about/general/press/?id=20070515">press release</a> and <a href="http://crossover.codeweavers.com/pipermail/announce/2007-May/000038.html">announcement</a> - on their website. Version 6.0 brought the addition of gaming support - this release continue that trend by including support for EVE Online + on their website. Version 6.0 brought the addition of gaming support; + this release continues that trend by including support for EVE Online and more games playable through Steam, such as Call of Duty 2. Outlook picked up some changes to enable better remote connectivity. All in all, it sounds like there's a bunch of new functionality, so

1 0

Stefan Dösinger : ddraw: Hold the Lock in IDirect3DViewport methods.
by Alexandre Julliard 05 Jun '07

05 Jun '07

Module: wine Branch: master Commit: 974784cde01e7e9c706e48c5dbe65a5824bfd6a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=974784cde01e7e9c706e48c5d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed May 30 16:27:23 2007 +0200 ddraw: Hold the Lock in IDirect3DViewport methods. --- dlls/ddraw/viewport.c | 85 +++++++++++++++++++++++++++++++++++------------- 1 files changed, 62 insertions(+), 23 deletions(-) diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index c2b8fc6..1b7e21e 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -252,9 +252,12 @@ IDirect3DViewportImpl_GetViewport(IDirect3DViewport3 *iface, ICOM_THIS_FROM(IDirect3DViewportImpl, IDirect3DViewport3, iface); DWORD dwSize; TRACE("(%p/%p)->(%p)\n", This, iface, lpData); + + EnterCriticalSection(&ddraw_cs); if (This->use_vp2 != 0) { ERR(" Requesting to get a D3DVIEWPORT struct where a D3DVIEWPORT2 was set !\n"); - return DDERR_INVALIDPARAMS; + LeaveCriticalSection(&ddraw_cs); + return DDERR_INVALIDPARAMS; } dwSize = lpData->dwSize; memset(lpData, 0, dwSize); @@ -264,7 +267,8 @@ IDirect3DViewportImpl_GetViewport(IDirect3DViewport3 *iface, TRACE(" returning D3DVIEWPORT :\n"); _dump_D3DVIEWPORT(lpData); } - + LeaveCriticalSection(&ddraw_cs); + return DD_OK; } @@ -294,6 +298,7 @@ IDirect3DViewportImpl_SetViewport(IDirect3DViewport3 *iface, _dump_D3DVIEWPORT(lpData); } + EnterCriticalSection(&ddraw_cs); This->use_vp2 = 0; memset(&(This->viewports.vp1), 0, sizeof(This->viewports.vp1)); memcpy(&(This->viewports.vp1), lpData, lpData->dwSize); @@ -310,6 +315,7 @@ IDirect3DViewportImpl_SetViewport(IDirect3DViewport3 *iface, This->activate(This); if(current_viewport) IDirect3DViewport3_Release(current_viewport); } + LeaveCriticalSection(&ddraw_cs); return DD_OK; } @@ -384,14 +390,17 @@ IDirect3DViewportImpl_SetBackground(IDirect3DViewport3 *iface, ICOM_THIS_FROM(IDirect3DViewportImpl, IDirect3DViewport3, iface); TRACE("(%p)->(%d)\n", This, (DWORD) hMat); + EnterCriticalSection(&ddraw_cs); if(hMat && hMat > This->ddraw->d3ddevice->numHandles) { WARN("Specified Handle %d out of range\n", hMat); + LeaveCriticalSection(&ddraw_cs); return DDERR_INVALIDPARAMS; } else if(hMat && This->ddraw->d3ddevice->Handles[hMat - 1].type != DDrawHandle_Material) { WARN("Handle %d is not a material handle\n", hMat); + LeaveCriticalSection(&ddraw_cs); return DDERR_INVALIDPARAMS; } @@ -410,6 +419,7 @@ IDirect3DViewportImpl_SetBackground(IDirect3DViewport3 *iface, TRACE("Setting background to NULL\n"); } + LeaveCriticalSection(&ddraw_cs); return D3D_OK; } @@ -434,6 +444,7 @@ IDirect3DViewportImpl_GetBackground(IDirect3DViewport3 *iface, ICOM_THIS_FROM(IDirect3DViewportImpl, IDirect3DViewport3, iface); TRACE("(%p)->(%p,%p)\n", This, lphMat, lpValid); + EnterCriticalSection(&ddraw_cs); if(lpValid) { *lpValid = This->background != NULL; @@ -449,6 +460,7 @@ IDirect3DViewportImpl_GetBackground(IDirect3DViewport3 *iface, *lphMat = 0; } } + LeaveCriticalSection(&ddraw_cs); return D3D_OK; } @@ -523,12 +535,15 @@ IDirect3DViewportImpl_Clear(IDirect3DViewport3 *iface, { ICOM_THIS_FROM(IDirect3DViewportImpl, IDirect3DViewport3, iface); DWORD color = 0x00000000; - + HRESULT hr; + TRACE("(%p/%p)->(%08x,%p,%08x)\n", This, iface, dwCount, lpRects, dwFlags); if (This->active_device == NULL) { ERR(" Trying to clear a viewport not attached to a device !\n"); return D3DERR_VIEWPORTHASNODEVICE; } + + EnterCriticalSection(&ddraw_cs); if (dwFlags & D3DCLEAR_TARGET) { if (This->background == NULL) { ERR(" Trying to clear the color buffer without background material !\n"); @@ -541,13 +556,15 @@ IDirect3DViewportImpl_Clear(IDirect3DViewport3 *iface, } } - return IDirect3DDevice7_Clear(ICOM_INTERFACE(This->active_device, IDirect3DDevice7), - dwCount, - lpRects, - dwFlags & (D3DCLEAR_ZBUFFER | D3DCLEAR_TARGET), - color, - 1.0, - 0x00000000); + hr = IDirect3DDevice7_Clear(ICOM_INTERFACE(This->active_device, IDirect3DDevice7), + dwCount, + lpRects, + dwFlags & (D3DCLEAR_ZBUFFER | D3DCLEAR_TARGET), + color, + 1.0, + 0x00000000); + LeaveCriticalSection(&ddraw_cs); + return hr; } /***************************************************************************** @@ -574,9 +591,13 @@ IDirect3DViewportImpl_AddLight(IDirect3DViewport3 *iface, DWORD map = This->map_lights; TRACE("(%p)->(%p)\n", This, lpDirect3DLight); - + + EnterCriticalSection(&ddraw_cs); if (This->num_lights >= 8) + { + LeaveCriticalSection(&ddraw_cs); return DDERR_INVALIDPARAMS; + } /* Find a light number and update both light and viewports objects accordingly */ while(map&1) { @@ -598,7 +619,8 @@ IDirect3DViewportImpl_AddLight(IDirect3DViewport3 *iface, if (This->active_device != NULL) { lpDirect3DLightImpl->activate(lpDirect3DLightImpl); } - + + LeaveCriticalSection(&ddraw_cs); return D3D_OK; } @@ -624,6 +646,8 @@ IDirect3DViewportImpl_DeleteLight(IDirect3DViewport3 *iface, IDirect3DLightImpl *cur_light, *prev_light = NULL; TRACE("(%p)->(%p)\n", This, lpDirect3DLight); + + EnterCriticalSection(&ddraw_cs); cur_light = This->lights; while (cur_light != NULL) { if (cur_light == lpDirect3DLightImpl) { @@ -634,11 +658,14 @@ IDirect3DViewportImpl_DeleteLight(IDirect3DViewport3 *iface, cur_light->active_viewport = NULL; This->num_lights--; This->map_lights &= ~(1<<lpDirect3DLightImpl->dwLightIndex); - return D3D_OK; + LeaveCriticalSection(&ddraw_cs); + return D3D_OK; } prev_light = cur_light; cur_light = cur_light->next; } + LeaveCriticalSection(&ddraw_cs); + return DDERR_INVALIDPARAMS; } @@ -693,9 +720,12 @@ IDirect3DViewportImpl_GetViewport2(IDirect3DViewport3 *iface, ICOM_THIS_FROM(IDirect3DViewportImpl, IDirect3DViewport3, iface); DWORD dwSize; TRACE("(%p)->(%p)\n", This, lpData); + + EnterCriticalSection(&ddraw_cs); if (This->use_vp2 != 1) { ERR(" Requesting to get a D3DVIEWPORT2 struct where a D3DVIEWPORT was set !\n"); - return DDERR_INVALIDPARAMS; + LeaveCriticalSection(&ddraw_cs); + return DDERR_INVALIDPARAMS; } dwSize = lpData->dwSize; memset(lpData, 0, dwSize); @@ -705,7 +735,8 @@ IDirect3DViewportImpl_GetViewport2(IDirect3DViewport3 *iface, TRACE(" returning D3DVIEWPORT2 :\n"); _dump_D3DVIEWPORT2(lpData); } - + + LeaveCriticalSection(&ddraw_cs); return D3D_OK; } @@ -734,6 +765,7 @@ IDirect3DViewportImpl_SetViewport2(IDirect3DViewport3 *iface, _dump_D3DVIEWPORT2(lpData); } + EnterCriticalSection(&ddraw_cs); This->use_vp2 = 1; memset(&(This->viewports.vp2), 0, sizeof(This->viewports.vp2)); memcpy(&(This->viewports.vp2), lpData, lpData->dwSize); @@ -744,6 +776,7 @@ IDirect3DViewportImpl_SetViewport2(IDirect3DViewport3 *iface, This->activate(This); IDirect3DViewport3_Release(current_viewport); } + LeaveCriticalSection(&ddraw_cs); return D3D_OK; } @@ -822,18 +855,24 @@ IDirect3DViewportImpl_Clear2(IDirect3DViewport3 *iface, DWORD dwStencil) { ICOM_THIS_FROM(IDirect3DViewportImpl, IDirect3DViewport3, iface); + HRESULT hr; TRACE("(%p)->(%08x,%p,%08x,%08x,%f,%08x)\n", This, dwCount, lpRects, dwFlags, dwColor, dvZ, dwStencil); + + EnterCriticalSection(&ddraw_cs); if (This->active_device == NULL) { ERR(" Trying to clear a viewport not attached to a device !\n"); - return D3DERR_VIEWPORTHASNODEVICE; + LeaveCriticalSection(&ddraw_cs); + return D3DERR_VIEWPORTHASNODEVICE; } - return IDirect3DDevice7_Clear(ICOM_INTERFACE(This->active_device, IDirect3DDevice7), - dwCount, - lpRects, - dwFlags, - dwColor, - dvZ, - dwStencil); + hr = IDirect3DDevice7_Clear(ICOM_INTERFACE(This->active_device, IDirect3DDevice7), + dwCount, + lpRects, + dwFlags, + dwColor, + dvZ, + dwStencil); + LeaveCriticalSection(&ddraw_cs); + return hr; } /*****************************************************************************

1 0

Stefan Dösinger : ddraw: Hold the lock in IDirect3DVertexBuffer methods.
by Alexandre Julliard 05 Jun '07

05 Jun '07

Module: wine Branch: master Commit: f45684d54711d7407015fe1aa4f1b491d1fcd20f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f45684d54711d7407015fe1aa… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed May 30 16:19:10 2007 +0200 ddraw: Hold the lock in IDirect3DVertexBuffer methods. --- dlls/ddraw/vertexbuffer.c | 31 ++++++++++++++++++++++++------- 1 files changed, 24 insertions(+), 7 deletions(-) diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c index fce64a7..10b5fa4 100644 --- a/dlls/ddraw/vertexbuffer.c +++ b/dlls/ddraw/vertexbuffer.c @@ -165,6 +165,7 @@ IDirect3DVertexBufferImpl_Release(IDirect3DVertexBuffer7 *iface) IWineD3DVertexBuffer *curVB = NULL; UINT offset, stride; + EnterCriticalSection(&ddraw_cs); /* D3D7 Vertex buffers don't stay bound in the device, they are passed as a parameter * to drawPrimitiveVB. DrawPrimitiveVB sets them as the stream source in wined3d, * and they should get unset there before they are destroyed @@ -189,7 +190,9 @@ IDirect3DVertexBufferImpl_Release(IDirect3DVertexBuffer7 *iface) IWineD3DVertexDeclaration_Release(This->wineD3DVertexDeclaration); IWineD3DVertexBuffer_Release(This->wineD3DVertexBuffer); + LeaveCriticalSection(&ddraw_cs); HeapFree(GetProcessHeap(), 0, This); + return 0; } return ref; @@ -238,6 +241,7 @@ IDirect3DVertexBufferImpl_Lock(IDirect3DVertexBuffer7 *iface, HRESULT hr; TRACE("(%p)->(%08x,%p,%p)\n", This, Flags, Data, Size); + EnterCriticalSection(&ddraw_cs); if(Size) { /* Get the size, for returning it, and for locking */ @@ -251,11 +255,13 @@ IDirect3DVertexBufferImpl_Lock(IDirect3DVertexBuffer7 *iface, *Size = Desc.Size; } - return IWineD3DVertexBuffer_Lock(This->wineD3DVertexBuffer, - 0 /* OffsetToLock */, - 0 /* SizeToLock, 0 == Full lock */, - (BYTE **) Data, - Flags); + hr = IWineD3DVertexBuffer_Lock(This->wineD3DVertexBuffer, + 0 /* OffsetToLock */, + 0 /* SizeToLock, 0 == Full lock */, + (BYTE **) Data, + Flags); + LeaveCriticalSection(&ddraw_cs); + return hr; } static HRESULT WINAPI @@ -286,10 +292,14 @@ static HRESULT WINAPI IDirect3DVertexBufferImpl_Unlock(IDirect3DVertexBuffer7 *iface) { ICOM_THIS_FROM(IDirect3DVertexBufferImpl, IDirect3DVertexBuffer7, iface); + HRESULT hr; TRACE("(%p)->()\n", This); - /* This is easy :) */ - return IWineD3DVertexBuffer_Unlock(This->wineD3DVertexBuffer); + EnterCriticalSection(&ddraw_cs); + hr = IWineD3DVertexBuffer_Unlock(This->wineD3DVertexBuffer); + LeaveCriticalSection(&ddraw_cs); + + return hr; } static HRESULT WINAPI @@ -355,6 +365,7 @@ IDirect3DVertexBufferImpl_ProcessVertices(IDirect3DVertexBuffer7 *iface, */ if( !(VertexOp & D3DVOP_TRANSFORM) ) return DDERR_INVALIDPARAMS; + EnterCriticalSection(&ddraw_cs); /* WineD3D doesn't know d3d7 vertex operation, it uses * render states instead. Set the render states according to * the vertex ops @@ -392,6 +403,7 @@ IDirect3DVertexBufferImpl_ProcessVertices(IDirect3DVertexBuffer7 *iface, IWineD3DDevice_SetRenderState(D3D->wineD3DDevice, WINED3DRS_CLIPPING, oldClip); + LeaveCriticalSection(&ddraw_cs); return hr; } @@ -446,11 +458,13 @@ IDirect3DVertexBufferImpl_GetVertexBufferDesc(IDirect3DVertexBuffer7 *iface, if(!Desc) return DDERR_INVALIDPARAMS; + EnterCriticalSection(&ddraw_cs); hr = IWineD3DVertexBuffer_GetDesc(This->wineD3DVertexBuffer, &WDesc); if(hr != D3D_OK) { ERR("(%p) IWineD3DVertexBuffer::GetDesc failed with hr=%08x\n", This, hr); + LeaveCriticalSection(&ddraw_cs); return hr; } @@ -463,6 +477,7 @@ IDirect3DVertexBufferImpl_GetVertexBufferDesc(IDirect3DVertexBuffer7 *iface, Desc->dwCaps = This->Caps; Desc->dwFVF = WDesc.FVF; Desc->dwNumVertices = WDesc.Size / get_flexible_vertex_size(WDesc.FVF); + LeaveCriticalSection(&ddraw_cs); return D3D_OK; } @@ -504,7 +519,9 @@ IDirect3DVertexBufferImpl_Optimize(IDirect3DVertexBuffer7 *iface, /* We could forward this call to WineD3D and take advantage * of it once we use OpenGL vertex buffers */ + EnterCriticalSection(&ddraw_cs); This->Caps |= D3DVBCAPS_OPTIMIZED; + LeaveCriticalSection(&ddraw_cs); return DD_OK; }

1 0

Stefan Dösinger : ddraw: Hold the lock in IDirect3DTexture methods.
by Alexandre Julliard 05 Jun '07

05 Jun '07

Module: wine Branch: master Commit: 9aab44ded5c06c7e78cdb2d1f0586512cb056358 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9aab44ded5c06c7e78cdb2d1f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed May 30 16:17:43 2007 +0200 ddraw: Hold the lock in IDirect3DTexture methods. --- dlls/ddraw/texture.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/texture.c b/dlls/ddraw/texture.c index e7e5f3f..0880154 100644 --- a/dlls/ddraw/texture.c +++ b/dlls/ddraw/texture.c @@ -217,6 +217,7 @@ IDirect3DTextureImpl_GetHandle(IDirect3DTexture2 *iface, TRACE("(%p)->(%p,%p)\n", This, d3d, lpHandle); + EnterCriticalSection(&ddraw_cs); if(!This->Handle) { This->Handle = IDirect3DDeviceImpl_CreateHandle(d3d); @@ -230,6 +231,7 @@ IDirect3DTextureImpl_GetHandle(IDirect3DTexture2 *iface, TRACE(" returning handle %08x.\n", *lpHandle); + LeaveCriticalSection(&ddraw_cs); return D3D_OK; } @@ -304,6 +306,7 @@ IDirect3DTextureImpl_Load(IDirect3DTexture2 *iface, HRESULT ret_value = D3D_OK; TRACE("(%p)->(%p)\n", This, src_ptr); + EnterCriticalSection(&ddraw_cs); if (((src_ptr->surface_desc.ddsCaps.dwCaps & DDSCAPS_MIPMAP) != (This->surface_desc.ddsCaps.dwCaps & DDSCAPS_MIPMAP)) || (src_ptr->surface_desc.u2.dwMipMapCount != This->surface_desc.u2.dwMipMapCount)) @@ -331,6 +334,7 @@ IDirect3DTextureImpl_Load(IDirect3DTexture2 *iface, if( ret_value != D3D_OK) { ERR("IWineD3DSurface::GetPalette failed! This is unexpected\n"); + LeaveCriticalSection(&ddraw_cs); return D3DERR_TEXTURE_LOAD_FAILED; } if(wine_pal) @@ -339,6 +343,7 @@ IDirect3DTextureImpl_Load(IDirect3DTexture2 *iface, if(ret_value != D3D_OK) { ERR("IWineD3DPalette::GetParent failed! This is unexpected\n"); + LeaveCriticalSection(&ddraw_cs); return D3DERR_TEXTURE_LOAD_FAILED; } pal_impl = ICOM_OBJECT(IDirectDrawPaletteImpl, IDirectDrawPalette, pal); @@ -352,6 +357,7 @@ IDirect3DTextureImpl_Load(IDirect3DTexture2 *iface, if( ret_value != D3D_OK) { ERR("IWineD3DSurface::GetPalette failed! This is unexpected\n"); + LeaveCriticalSection(&ddraw_cs); return D3DERR_TEXTURE_LOAD_FAILED; } if(wine_pal_src) @@ -360,6 +366,7 @@ IDirect3DTextureImpl_Load(IDirect3DTexture2 *iface, if(ret_value != D3D_OK) { ERR("IWineD3DPalette::GetParent failed! This is unexpected\n"); + LeaveCriticalSection(&ddraw_cs); return D3DERR_TEXTURE_LOAD_FAILED; } pal_impl_src = ICOM_OBJECT(IDirectDrawPaletteImpl, IDirectDrawPalette, pal_src); @@ -395,6 +402,7 @@ IDirect3DTextureImpl_Load(IDirect3DTexture2 *iface, { /* Should also check for same pixel format, u1.lPitch, ... */ ERR("Error in surface sizes\n"); + LeaveCriticalSection(&ddraw_cs); return D3DERR_TEXTURE_LOAD_FAILED; } else @@ -419,6 +427,7 @@ IDirect3DTextureImpl_Load(IDirect3DTexture2 *iface, if(ret_value != D3D_OK) { ERR(" (%p) Locking the source surface failed\n", This); + LeaveCriticalSection(&ddraw_cs); return D3DERR_TEXTURE_LOAD_FAILED; } @@ -427,6 +436,7 @@ IDirect3DTextureImpl_Load(IDirect3DTexture2 *iface, { ERR(" (%p) Locking the destination surface failed\n", This); IWineD3DSurface_UnlockRect(src_ptr->WineD3DSurface); + LeaveCriticalSection(&ddraw_cs); return D3DERR_TEXTURE_LOAD_FAILED; } @@ -466,6 +476,7 @@ IDirect3DTextureImpl_Load(IDirect3DTexture2 *iface, } } + LeaveCriticalSection(&ddraw_cs); return ret_value; }

1 0

Stefan Dösinger : ddraw: Hold the lock in IDirect3DLight methods.
by Alexandre Julliard 05 Jun '07

05 Jun '07

Module: wine Branch: master Commit: 6eb8e3fb6f3aec264389e136647c7daf924068ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=6eb8e3fb6f3aec264389e1366… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed May 30 16:16:04 2007 +0200 ddraw: Hold the lock in IDirect3DLight methods. --- dlls/ddraw/light.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/light.c b/dlls/ddraw/light.c index 93144d3..aeb8390 100644 --- a/dlls/ddraw/light.c +++ b/dlls/ddraw/light.c @@ -201,10 +201,12 @@ IDirect3DLightImpl_SetLight(IDirect3DLight *iface, light7->dvTheta = lpLight->dvTheta; light7->dvPhi = lpLight->dvPhi; + EnterCriticalSection(&ddraw_cs); memcpy(&This->light, lpLight, lpLight->dwSize); if ((This->light.dwFlags & D3DLIGHT_ACTIVE) != 0) { This->update(This); } + LeaveCriticalSection(&ddraw_cs); return D3D_OK; } @@ -230,7 +232,11 @@ IDirect3DLightImpl_GetLight(IDirect3DLight *iface, TRACE(" Returning light definition :\n"); dump_light(&This->light); } + + EnterCriticalSection(&ddraw_cs); memcpy(lpLight, &This->light, lpLight->dwSize); + LeaveCriticalSection(&ddraw_cs); + return DD_OK; }

1 0

← Newer
1
...
71
72
73
74
75
76
77
...
86
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2007