February 2007 - Wine-commits

Alexander Nicolaysen Sørnes : wordpad: Make toolbar more like native.
by Alexandre Julliard 26 Feb '07

26 Feb '07

Module: wine Branch: master Commit: 557d69d18783630cbef677a09b27ba9a6365cf12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=557d69d18783630cbef677a09… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sat Feb 24 21:00:08 2007 +0100 wordpad: Make toolbar more like native. --- programs/wordpad/resource.h | 5 +++++ programs/wordpad/wordpad.c | 13 ++++++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/programs/wordpad/resource.h b/programs/wordpad/resource.h index 35d475f..fc1ddf0 100644 --- a/programs/wordpad/resource.h +++ b/programs/wordpad/resource.h @@ -21,6 +21,11 @@ #define ID_FILE_SAVE 1002 #define ID_FILE_NEW 1003 +#define ID_PRINT 1004 +#define ID_PREVIEW 1005 + +#define ID_FIND 1006 + #define ID_ALIGN_LEFT 1100 #define ID_ALIGN_CENTER 1101 #define ID_ALIGN_RIGHT 1102 diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 7269272..e3454ee 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -207,7 +207,7 @@ static LRESULT OnCreate( HWND hWnd, WPARAM wParam, LPARAM lParam) if(!SendMessage(hReBarWnd, RB_SETBARINFO, 0, (LPARAM)&rbi)) return -1; - hToolBarWnd = CreateToolbarEx(hReBarWnd, CCS_NOPARENTALIGN|CCS_NODIVIDER|CCS_NOMOVEY|WS_VISIBLE|WS_CHILD|TBSTYLE_TOOLTIPS|TBSTYLE_FLAT, + hToolBarWnd = CreateToolbarEx(hReBarWnd, CCS_NOPARENTALIGN|CCS_NODIVIDER|CCS_NOMOVEY|WS_VISIBLE|WS_CHILD|TBSTYLE_TOOLTIPS|TBSTYLE_BUTTON, IDC_TOOLBAR, 3, hInstance, IDB_TOOLBAR, NULL, 0, @@ -220,9 +220,13 @@ static LRESULT OnCreate( HWND hWnd, WPARAM wParam, LPARAM lParam) AddButton(hToolBarWnd, nStdBitmaps+STD_FILEOPEN, ID_FILE_OPEN); AddButton(hToolBarWnd, nStdBitmaps+STD_FILESAVE, ID_FILE_SAVE); AddSeparator(hToolBarWnd); + AddButton(hToolBarWnd, nStdBitmaps+STD_PRINT, ID_PRINT); + AddButton(hToolBarWnd, nStdBitmaps+STD_PRINTPRE, ID_PREVIEW); + AddSeparator(hToolBarWnd); + AddButton(hToolBarWnd, nStdBitmaps+STD_FIND, ID_FIND); + AddSeparator(hToolBarWnd); AddButton(hToolBarWnd, nStdBitmaps+STD_CUT, ID_EDIT_CUT); AddButton(hToolBarWnd, nStdBitmaps+STD_COPY, ID_EDIT_COPY); - AddSeparator(hToolBarWnd); AddButton(hToolBarWnd, nStdBitmaps+STD_UNDO, ID_EDIT_UNDO); AddButton(hToolBarWnd, nStdBitmaps+STD_REDOW, ID_EDIT_REDO); AddSeparator(hToolBarWnd); @@ -333,7 +337,10 @@ static LRESULT OnCommand( HWND hWnd, WPARAM wParam, LPARAM lParam) case ID_FILE_OPEN: case ID_FILE_SAVE: - MessageBox(hWnd, "Open/Save not implemented", "WordPad", MB_OK); + case ID_PRINT: + case ID_PREVIEW: + case ID_FIND: + MessageBox(hWnd, "Not implemented", "WordPad", MB_OK); break; case ID_FORMAT_BOLD:

1 0

Alexander Nicolaysen Sørnes : wordpad: Don't create maximized window.
by Alexandre Julliard 26 Feb '07

26 Feb '07

Module: wine Branch: master Commit: 38ad04576e41d35a641cb0bc5961be9fea4982f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38ad04576e41d35a641cb0bc5… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Feb 25 14:36:17 2007 +0100 wordpad: Don't create maximized window. --- programs/wordpad/wordpad.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index e3454ee..667e51d 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -619,7 +619,7 @@ int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hOldInstance, LPSTR szCmdPar hMainWnd = CreateWindowExW(0, wszMainWndClass, wszAppTitle, WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, 680, 260, NULL, NULL, hInstance, NULL); - ShowWindow(hMainWnd, SW_SHOWMAXIMIZED); + ShowWindow(hMainWnd, SW_SHOWDEFAULT); HandleCommandLine(GetCommandLineW());

1 0

Alexander Nicolaysen Sørnes : wordpad: Add paste support.
by Alexandre Julliard 26 Feb '07

26 Feb '07

Module: wine Branch: master Commit: a53eab603d496c3419dfcd4c366b244249d5906b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a53eab603d496c3419dfcd4c3… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Feb 25 14:38:50 2007 +0100 wordpad: Add paste support. --- programs/wordpad/resource.h | 1 + programs/wordpad/wordpad.c | 5 +++++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/programs/wordpad/resource.h b/programs/wordpad/resource.h index fc1ddf0..a103744 100644 --- a/programs/wordpad/resource.h +++ b/programs/wordpad/resource.h @@ -45,6 +45,7 @@ #define ID_EDIT_GETTEXT 1309 #define ID_EDIT_COPY 1310 #define ID_EDIT_CUT 1311 +#define ID_EDIT_PASTE 1312 #define ID_FORMAT_BOLD 1400 #define ID_FORMAT_ITALIC 1401 diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 667e51d..4334ed2 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -227,6 +227,7 @@ static LRESULT OnCreate( HWND hWnd, WPARAM wParam, LPARAM lParam) AddSeparator(hToolBarWnd); AddButton(hToolBarWnd, nStdBitmaps+STD_CUT, ID_EDIT_CUT); AddButton(hToolBarWnd, nStdBitmaps+STD_COPY, ID_EDIT_COPY); + AddButton(hToolBarWnd, nStdBitmaps+STD_PASTE, ID_EDIT_PASTE); AddButton(hToolBarWnd, nStdBitmaps+STD_UNDO, ID_EDIT_UNDO); AddButton(hToolBarWnd, nStdBitmaps+STD_REDOW, ID_EDIT_REDO); AddSeparator(hToolBarWnd); @@ -372,6 +373,10 @@ static LRESULT OnCommand( HWND hWnd, WPARAM wParam, LPARAM lParam) PostMessage(hwndEditor, WM_COPY, 0, 0); break; + case ID_EDIT_PASTE: + PostMessage(hwndEditor, WM_PASTE, 0, 0); + break; + case ID_EDIT_SELECTALL: { CHARRANGE range = {0, -1};

1 0

Alexander Nicolaysen Sørnes : wordpad: Make edit menu more like native.
by Alexandre Julliard 26 Feb '07

26 Feb '07

Module: wine Branch: master Commit: 194c3f2524a0e66a3eb77647e2944a859aaeb064 URL: http://source.winehq.org/git/wine.git/?a=commit;h=194c3f2524a0e66a3eb77647e… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Feb 25 14:39:58 2007 +0100 wordpad: Make edit menu more like native. --- programs/wordpad/De.rc | 4 +++- programs/wordpad/En.rc | 4 +++- programs/wordpad/Fr.rc | 14 ++++++++------ programs/wordpad/Hu.rc | 4 +++- programs/wordpad/Nl.rc | 4 +++- programs/wordpad/No.rc | 14 ++++++++------ programs/wordpad/Pl.rc | 4 +++- programs/wordpad/Tr.rc | 4 +++- programs/wordpad/resource.h | 1 + programs/wordpad/wordpad.c | 4 ++++ 10 files changed, 39 insertions(+), 18 deletions(-) diff --git a/programs/wordpad/De.rc b/programs/wordpad/De.rc index d9a42d4..1d58b7b 100644 --- a/programs/wordpad/De.rc +++ b/programs/wordpad/De.rc @@ -32,10 +32,12 @@ BEGIN BEGIN MENUITEM "&R�ckg�ngig\tCtrl+Z", ID_EDIT_UNDO MENUITEM "&Wiederholen\tCtrl+Y", ID_EDIT_REDO - MENUITEM "&Alles markieren\tCtrl+A", ID_EDIT_SELECTALL MENUITEM SEPARATOR MENUITEM "Aus&schneiden\tCtrl+X", ID_EDIT_CUT MENUITEM "&Kopieren\tCtrl+C", ID_EDIT_COPY + MENUITEM "&Einf�gen\tCtrl+V", ID_EDIT_PASTE + MENUITEM "&L�schen\tDEL", ID_EDIT_CLEAR + MENUITEM "&Alles markieren\tCtrl+A", ID_EDIT_SELECTALL MENUITEM SEPARATOR MENUITEM "Schreibgesch�&tzt", ID_EDIT_READONLY MENUITEM "&Ge�ndert", ID_EDIT_MODIFIED diff --git a/programs/wordpad/En.rc b/programs/wordpad/En.rc index e99d140..a78ab0e 100644 --- a/programs/wordpad/En.rc +++ b/programs/wordpad/En.rc @@ -32,10 +32,12 @@ BEGIN BEGIN MENUITEM "&Undo\tCtrl+Z", ID_EDIT_UNDO MENUITEM "&Redo\tCtrl+Y", ID_EDIT_REDO - MENUITEM "&Select all\tCtrl+A", ID_EDIT_SELECTALL MENUITEM SEPARATOR MENUITEM "Cu&t\tCtrl+X", ID_EDIT_CUT MENUITEM "&Copy\tCtrl+C", ID_EDIT_COPY + MENUITEM "&Paste\tCtrl+V", ID_EDIT_PASTE + MENUITEM "&Clear\tDEL", ID_EDIT_CLEAR + MENUITEM "&Select all\tCtrl+A", ID_EDIT_SELECTALL MENUITEM SEPARATOR MENUITEM "Read-&only", ID_EDIT_READONLY MENUITEM "&Modified", ID_EDIT_MODIFIED diff --git a/programs/wordpad/Fr.rc b/programs/wordpad/Fr.rc index 6c2573b..901749e 100644 --- a/programs/wordpad/Fr.rc +++ b/programs/wordpad/Fr.rc @@ -30,15 +30,17 @@ BEGIN END POPUP "�&dition" BEGIN - MENUITEM "&Annuler\tCtrl+Z", ID_EDIT_UNDO - MENUITEM "&R�p�ter\tCtrl+Y", ID_EDIT_REDO - MENUITEM "&S�lectionner tout\tCtrl+A", ID_EDIT_SELECTALL + MENUITEM "&Annuler\tCtrl+Z", ID_EDIT_UNDO + MENUITEM "&R�p�ter\tCtrl+Y", ID_EDIT_REDO MENUITEM SEPARATOR - MENUITEM "&Couper\tCtrl+X", ID_EDIT_CUT - MENUITEM "Co&pier\tCtrl+C", ID_EDIT_COPY + MENUITEM "&Couper\tCtrl+X", ID_EDIT_CUT + MENUITEM "Co&pier\tCtrl+C", ID_EDIT_COPY + MENUITEM "C&oller\tCtrl+V", ID_EDIT_PASTE + MENUITEM "&Effacer\tDel", ID_EDIT_CLEAR + MENUITEM "&S�lectionner tout\tCtrl+A", ID_EDIT_SELECTALL MENUITEM SEPARATOR MENUITEM "Lecture-&seule", ID_EDIT_READONLY - MENUITEM "&Modifi�", ID_EDIT_MODIFIED + MENUITEM "&Modifi�", ID_EDIT_MODIFIED MENUITEM SEPARATOR POPUP "&Avanc�s" BEGIN diff --git a/programs/wordpad/Hu.rc b/programs/wordpad/Hu.rc index 0326448..8c1e058 100644 --- a/programs/wordpad/Hu.rc +++ b/programs/wordpad/Hu.rc @@ -32,10 +32,12 @@ BEGIN BEGIN MENUITEM "&Visszavon�s\tCtrl+Z", ID_EDIT_UNDO MENUITEM "&El�re\tCtrl+Y", ID_EDIT_REDO - MENUITEM "M&indet kijel�li\tCtrl+A", ID_EDIT_SELECTALL MENUITEM SEPARATOR MENUITEM "Kiv&�g�s\tCtrl+X", ID_EDIT_CUT MENUITEM "M�&sol�s\tCtrl+C", ID_EDIT_COPY + MENUITEM "&Beilleszt�s\tCtrl+V", ID_EDIT_PASTE + MENUITEM "T�r&l�s\tDel", ID_EDIT_CLEAR + MENUITEM "M&indet kijel�li\tCtrl+A", ID_EDIT_SELECTALL MENUITEM SEPARATOR MENUITEM "Csak &olvashat�", ID_EDIT_READONLY MENUITEM "M�&dos�tva", ID_EDIT_MODIFIED diff --git a/programs/wordpad/Nl.rc b/programs/wordpad/Nl.rc index fe7703e..3a18519 100644 --- a/programs/wordpad/Nl.rc +++ b/programs/wordpad/Nl.rc @@ -32,10 +32,12 @@ BEGIN BEGIN MENUITEM "&Ongedaan maken\tCtrl+Z", ID_EDIT_UNDO MENUITEM "O&pnieuw\tCtrl+Y", ID_EDIT_REDO - MENUITEM "&Alles selecteren\tCtrl+A", ID_EDIT_SELECTALL MENUITEM SEPARATOR MENUITEM "K&nippen\tCtrl+X", ID_EDIT_CUT MENUITEM "&Kopieren\tCtrl+C", ID_EDIT_COPY + MENUITEM "&Plakken\tCtrl+V", ID_EDIT_PASTE + MENUITEM "&Verwijderen\tDel", ID_EDIT_CLEAR + MENUITEM "&Alles selecteren\tCtrl+A", ID_EDIT_SELECTALL MENUITEM SEPARATOR MENUITEM "Alleen &lezen", ID_EDIT_READONLY MENUITEM "&Gewijzigd", ID_EDIT_MODIFIED diff --git a/programs/wordpad/No.rc b/programs/wordpad/No.rc index d9dd3cd..7021490 100644 --- a/programs/wordpad/No.rc +++ b/programs/wordpad/No.rc @@ -30,14 +30,16 @@ BEGIN END POPUP "R&ediger" BEGIN - MENUITEM "&Angre\tCtrl+Z", ID_EDIT_UNDO - MENUITEM "&Gjenta\tCtrl+Y", ID_EDIT_REDO - MENUITEM "&Merk alt\tCtrl+A", ID_EDIT_SELECTALL + MENUITEM "&Angre\tCtrl+Z", ID_EDIT_UNDO + MENUITEM "&Gjenta\tCtrl+Y", ID_EDIT_REDO MENUITEM SEPARATOR - MENUITEM "Klipp u&t\tCtrl+X", ID_EDIT_CUT - MENUITEM "&Kopier\tCtrl+C", ID_EDIT_COPY + MENUITEM "Klipp u&t\tCtrl+X", ID_EDIT_CUT + MENUITEM "&Kopier\tCtrl+C", ID_EDIT_COPY + MENUITEM "&Lim inn\tCtrl+V", ID_EDIT_PASTE + MENUITEM "&Fjern\tDEL", ID_EDIT_CLEAR + MENUITEM "&Merk alt\tCtrl+A", ID_EDIT_SELECTALL MENUITEM SEPARATOR - MENUITEM "&Skrivebeskyttet", ID_EDIT_READONLY + MENUITEM "&Skrivebeskyttet", ID_EDIT_READONLY MENUITEM "E&ndret", ID_EDIT_MODIFIED MENUITEM SEPARATOR POPUP "&Ekstra" diff --git a/programs/wordpad/Pl.rc b/programs/wordpad/Pl.rc index 3f0bf06..cd76e0f 100644 --- a/programs/wordpad/Pl.rc +++ b/programs/wordpad/Pl.rc @@ -33,10 +33,12 @@ BEGIN BEGIN MENUITEM "&Cofnij\tCtrl+Z", ID_EDIT_UNDO MENUITEM "&Powt�rz\tCtrl+Y", ID_EDIT_REDO - MENUITEM "&Zaznacz wszystko\tCtrl+A", ID_EDIT_SELECTALL MENUITEM SEPARATOR MENUITEM "Wy&tnij\tCtrl+X", ID_EDIT_CUT MENUITEM "&Kopiuj\tCtrl+C", ID_EDIT_COPY + MENUITEM "Wkl&ej\tCtrl+V", ID_EDIT_PASTE + MENUITEM "&Usu�\tDel", ID_EDIT_CLEAR + MENUITEM "&Zaznacz wszystko\tCtrl+A", ID_EDIT_SELECTALL MENUITEM SEPARATOR MENUITEM "Tylko do &odczytu", ID_EDIT_READONLY MENUITEM "&Zmodifykowany", ID_EDIT_MODIFIED diff --git a/programs/wordpad/Tr.rc b/programs/wordpad/Tr.rc index d47e86e..f43f8fd 100644 --- a/programs/wordpad/Tr.rc +++ b/programs/wordpad/Tr.rc @@ -34,10 +34,12 @@ BEGIN BEGIN MENUITEM "&Geri Al\tCtrl+Z", ID_EDIT_UNDO MENUITEM "&Yinele\tCtrl+Y", ID_EDIT_REDO - MENUITEM "&T�m�n� se�\tCtrl+A", ID_EDIT_SELECTALL MENUITEM SEPARATOR MENUITEM "Ke&s\tCtrl+X", ID_EDIT_CUT MENUITEM "&Kopyala\tCtrl+C", ID_EDIT_COPY + MENUITEM "Ya&p��t�r\tCtrl+V", ID_EDIT_PASTE + MENUITEM "&Sil\tDel", ID_EDIT_CLEAR + MENUITEM "&T�m�n� se�\tCtrl+A", ID_EDIT_SELECTALL MENUITEM SEPARATOR MENUITEM "Salt-&okunur", ID_EDIT_READONLY MENUITEM "&De�i�mi�", ID_EDIT_MODIFIED diff --git a/programs/wordpad/resource.h b/programs/wordpad/resource.h index a103744..72976f7 100644 --- a/programs/wordpad/resource.h +++ b/programs/wordpad/resource.h @@ -46,6 +46,7 @@ #define ID_EDIT_COPY 1310 #define ID_EDIT_CUT 1311 #define ID_EDIT_PASTE 1312 +#define ID_EDIT_CLEAR 1313 #define ID_FORMAT_BOLD 1400 #define ID_FORMAT_ITALIC 1401 diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 4334ed2..455f73f 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -377,6 +377,10 @@ static LRESULT OnCommand( HWND hWnd, WPARAM wParam, LPARAM lParam) PostMessage(hwndEditor, WM_PASTE, 0, 0); break; + case ID_EDIT_CLEAR: + PostMessage(hwndEditor, WM_CLEAR, 0, 0); + break; + case ID_EDIT_SELECTALL: { CHARRANGE range = {0, -1};

1 0

Rok Mandeljc : include/d3d9types.h: Remove Size from D3DVOLUME_DESC.
by Alexandre Julliard 26 Feb '07

26 Feb '07

Module: wine Branch: master Commit: 106badf11b8e95b9d5f5ceacde00d75c9425e6f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=106badf11b8e95b9d5f5ceacd… Author: Rok Mandeljc <rok.mandeljc(a)email.si> Date: Sat Feb 24 13:03:31 2007 +0100 include/d3d9types.h: Remove Size from D3DVOLUME_DESC. --- include/d3d9types.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/d3d9types.h b/include/d3d9types.h index d1f58b9..c0ead88 100644 --- a/include/d3d9types.h +++ b/include/d3d9types.h @@ -1528,7 +1528,7 @@ typedef struct _D3DVOLUME_DESC { D3DRESOURCETYPE Type; DWORD Usage; D3DPOOL Pool; - UINT Size; + UINT Width; UINT Height; UINT Depth;

1 0

Fabian Bieler : user32: Do not call NULL message callback.
by Alexandre Julliard 26 Feb '07

26 Feb '07

Module: wine Branch: master Commit: 311423242b8981db8712624bb1d9fa5fccaff055 URL: http://source.winehq.org/git/wine.git/?a=commit;h=311423242b8981db8712624bb… Author: Fabian Bieler <der.fabe(a)gmx.net> Date: Sat Feb 24 19:57:22 2007 +0100 user32: Do not call NULL message callback. --- dlls/user32/message.c | 2 ++ dlls/user32/tests/msg.c | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 22b922d..5d7020e 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -1905,6 +1905,8 @@ static BOOL process_hardware_message( MSG *msg, UINT hw_id, ULONG_PTR extra_info static inline void call_sendmsg_callback( SENDASYNCPROC callback, HWND hwnd, UINT msg, ULONG_PTR data, LRESULT result ) { + if (!callback) return; + if (TRACE_ON(relay)) DPRINTF( "%04x:Call message callback %p (hwnd=%p,msg=%s,data=%08lx,result=%08lx)\n", GetCurrentThreadId(), callback, hwnd, SPY_GetMsgName( msg, hwnd ), diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index f45a059..7b4505d 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -8889,6 +8889,20 @@ static void test_dialog_messages(void) #undef check_selection } +static void test_nullCallback(void) +{ + HWND hwnd; + MSG msg; + + hwnd = CreateWindowExA(0, "TestWindowClass", "Test overlapped", WS_OVERLAPPEDWINDOW, + 100, 100, 200, 200, 0, 0, 0, NULL); + ok (hwnd != 0, "Failed to create overlapped window\n"); + + SendMessageCallbackA(hwnd,WM_NULL,0,0,NULL,0); + while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessage( &msg ); + DestroyWindow(hwnd); +} + START_TEST(msg) { BOOL ret; @@ -8959,6 +8973,7 @@ START_TEST(msg) test_SetWindowRgn(); test_sys_menu(); test_dialog_messages(); + test_nullCallback(); UnhookWindowsHookEx(hCBT_hook); if (pUnhookWinEvent)

1 0

Rob Shearman : ole32: Add tests for default handler creation and handler marshaling.
by Alexandre Julliard 26 Feb '07

26 Feb '07

Module: wine Branch: master Commit: 0101f89a8d08328c84425d08d1ed6513d7bd781e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0101f89a8d08328c84425d08d… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Feb 23 19:38:11 2007 +0000 ole32: Add tests for default handler creation and handler marshaling. --- dlls/ole32/tests/marshal.c | 142 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 142 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index 11f03df..f6397eb 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -48,6 +48,7 @@ static const IID IID_IWineTest = }; /* 5201163f-8164-4fd0-a1a2-5d5a3654d3bd */ #define EXTENTID_WineTest IID_IWineTest +#define CLSID_WineTest IID_IWineTest static void test_cocreateinstance_proxy(void) { @@ -1963,6 +1964,145 @@ static void test_freethreadedmarshaler(void) IMarshal_Release(pFTMarshal); } +static void test_inproc_handler(void) +{ + HRESULT hr; + IUnknown *pObject; + IUnknown *pObject2; + char buffer[256]; + LPOLESTR pszClsid; + HKEY hkey; + DWORD dwDisposition; + DWORD error; + + hr = StringFromCLSID(&CLSID_WineTest, &pszClsid); + ok_ole_success(hr, "StringFromCLSID"); + strcpy(buffer, "CLSID\\"); + WideCharToMultiByte(CP_ACP, 0, pszClsid, -1, buffer + strlen(buffer), sizeof(buffer) - strlen(buffer), NULL, NULL); + CoTaskMemFree(pszClsid); + strcat(buffer, "\\InprocHandler32"); + error = RegCreateKeyEx(HKEY_CLASSES_ROOT, buffer, 0, NULL, 0, KEY_SET_VALUE, NULL, &hkey, &dwDisposition); + ok(error == ERROR_SUCCESS, "RegCreateKeyEx failed with error %d\n", error); + error = RegSetValueEx(hkey, NULL, 0, REG_SZ, (const unsigned char *)"ole32.dll", strlen("ole32.dll") + 1); + ok(error == ERROR_SUCCESS, "RegSetValueEx failed with error %d\n", error); + RegCloseKey(hkey); + + hr = CoCreateInstance(&CLSID_WineTest, NULL, CLSCTX_INPROC_HANDLER, &IID_IUnknown, (void **)&pObject); + todo_wine + ok_ole_success(hr, "CoCreateInstance"); + + if (SUCCEEDED(hr)) + { + hr = IUnknown_QueryInterface(pObject, &IID_IWineTest, (void **)&pObject2); + ok(hr == E_NOINTERFACE, "IUnknown_QueryInterface on handler for invalid interface returned 0x%08x instead of E_NOINTERFACE\n", hr); + + /* it's a handler as it supports IOleObject */ + hr = IUnknown_QueryInterface(pObject, &IID_IOleObject, (void **)&pObject2); + ok_ole_success(hr, "IUnknown_QueryInterface(&IID_IOleObject)"); + IUnknown_Release(pObject2); + + IUnknown_Release(pObject); + } + + RegDeleteKey(HKEY_CLASSES_ROOT, buffer); + *strrchr(buffer, '\\') = '\0'; + RegDeleteKey(HKEY_CLASSES_ROOT, buffer); +} + +static HRESULT WINAPI Test_SMI_QueryInterface( + IStdMarshalInfo *iface, + REFIID riid, + LPVOID *ppvObj) +{ + if (ppvObj == NULL) return E_POINTER; + + if (IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IStdMarshalInfo)) + { + *ppvObj = (LPVOID)iface; + IClassFactory_AddRef(iface); + return S_OK; + } + + return E_NOINTERFACE; +} + +static ULONG WINAPI Test_SMI_AddRef(IStdMarshalInfo *iface) +{ + LockModule(); + return 2; /* non-heap-based object */ +} + +static ULONG WINAPI Test_SMI_Release(IStdMarshalInfo *iface) +{ + UnlockModule(); + return 1; /* non-heap-based object */ +} + +static HRESULT WINAPI Test_SMI_GetClassForHandler( + IStdMarshalInfo *iface, + DWORD dwDestContext, + void *pvDestContext, + CLSID *pClsid) +{ + *pClsid = CLSID_WineTest; + return S_OK; +} + +static const IStdMarshalInfoVtbl Test_SMI_Vtbl = +{ + Test_SMI_QueryInterface, + Test_SMI_AddRef, + Test_SMI_Release, + Test_SMI_GetClassForHandler +}; + +static IStdMarshalInfo Test_SMI = {&Test_SMI_Vtbl}; + +static void test_handler_marshaling(void) +{ + HRESULT hr; + IStream *pStream = NULL; + IUnknown *pProxy = NULL; + IUnknown *pObject; + DWORD tid; + HANDLE thread; + static const LARGE_INTEGER ullZero; + + cLocks = 0; + + hr = CreateStreamOnHGlobal(NULL, TRUE, &pStream); + ok_ole_success(hr, "CreateStreamOnHGlobal"); + tid = start_host_object(pStream, &IID_IUnknown, (IUnknown*)&Test_SMI, MSHLFLAGS_NORMAL, &thread); + + ok_more_than_one_lock(); + + IStream_Seek(pStream, ullZero, STREAM_SEEK_SET, NULL); + hr = CoUnmarshalInterface(pStream, &IID_IUnknown, (void **)&pProxy); + ok_ole_success(hr, "CoUnmarshalInterface"); + IStream_Release(pStream); + + ok_more_than_one_lock(); + + hr = IUnknown_QueryInterface(pProxy, &IID_IWineTest, (void **)&pObject); + ok(hr == E_NOINTERFACE, "IUnknown_QueryInterface with unknown IID should have returned E_NOINTERFACE instead of 0x%08x\n", hr); + + /* it's a handler as it supports IOleObject */ + hr = IUnknown_QueryInterface(pProxy, &IID_IOleObject, (void **)&pObject); + todo_wine + ok_ole_success(hr, "IUnknown_QueryInterface(&IID_IOleObject)"); + if (SUCCEEDED(hr)) IUnknown_Release(pObject); + + IUnknown_Release(pProxy); + + ok_no_locks(); + + end_host_object(tid, thread); + + /* FIXME: test IPersist interface has the same effect as IStdMarshalInfo */ +} + + static HANDLE heventShutdown; static void LockModuleOOP(void) @@ -2441,6 +2581,8 @@ START_TEST(marshal) test_call_from_message(); test_WM_QUIT_handling(); test_freethreadedmarshaler(); + test_inproc_handler(); + test_handler_marshaling(); /* doesn't pass with Win9x COM DLLs (even though Essential COM says it should) */ if (0) test_out_of_process_com();

1 0

Rob Shearman : ole32: Use IsEqualIID instead of memcmp in HGLOBALLockBytesImpl_QueryInterface.
by Alexandre Julliard 26 Feb '07

26 Feb '07

Module: wine Branch: master Commit: 29706e67096edc1d5702b0b57f33307e5177ae68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29706e67096edc1d5702b0b57… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Feb 23 19:39:17 2007 +0000 ole32: Use IsEqualIID instead of memcmp in HGLOBALLockBytesImpl_QueryInterface. --- dlls/ole32/memlockbytes.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/ole32/memlockbytes.c b/dlls/ole32/memlockbytes.c index 18761fb..57c5b0b 100644 --- a/dlls/ole32/memlockbytes.c +++ b/dlls/ole32/memlockbytes.c @@ -286,11 +286,8 @@ static HRESULT WINAPI HGLOBALLockBytesImpl_QueryInterface( /* * Compare the riid with the interface IDs implemented by this object. */ - if (memcmp(&IID_IUnknown, riid, sizeof(IID_IUnknown)) == 0) - { - *ppvObject = (ILockBytes*)This; - } - else if (memcmp(&IID_ILockBytes, riid, sizeof(IID_ILockBytes)) == 0) + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_ILockBytes)) { *ppvObject = (ILockBytes*)This; }

1 0

Rob Shearman : libwine: Eliminate duplicate function implementations in string.c
by Alexandre Julliard 26 Feb '07

26 Feb '07

Module: wine Branch: master Commit: 4c8fbfed9055cefe562602f97e08c12e95b2d86b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c8fbfed9055cefe562602f97… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Feb 23 19:40:09 2007 +0000 libwine: Eliminate duplicate function implementations in string.c by using macros to turn off inlining when including wine/unicode.h. --- include/wine/unicode.h | 130 ++++++++++++++++++---------------- libs/wine/string.c | 186 +----------------------------------------------- 2 files changed, 69 insertions(+), 247 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4c8fbfed9055cefe56260…

1 0

Hans Leidekker : ws2_32: Handle NULL argument in inet_addr.
by Alexandre Julliard 26 Feb '07

26 Feb '07

Module: wine Branch: master Commit: bde4e36208982d1ca4204d780e92bf62c7ea1249 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bde4e36208982d1ca4204d780… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Fri Feb 23 15:41:10 2007 +0100 ws2_32: Handle NULL argument in inet_addr. --- dlls/ws2_32/socket.c | 1 + dlls/ws2_32/tests/sock.c | 13 +++++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index e7a5846..1d007a9 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2175,6 +2175,7 @@ int WINAPI WSAHtons(SOCKET s, WS_u_short hostshort, WS_u_short *lpnetshort) */ WS_u_long WINAPI WS_inet_addr(const char *cp) { + if (!cp) return INADDR_NONE; return inet_addr(cp); } diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 970e27a..c5bf766 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1491,7 +1491,7 @@ done: closesocket(server_socket); } -static void test_extendedSocketOptions() +static void test_extendedSocketOptions(void) { WSADATA wsa; SOCKET sock; @@ -1565,7 +1565,7 @@ static void test_extendedSocketOptions() WSACleanup(); } -static void test_getsockname() +static void test_getsockname(void) { WSADATA wsa; SOCKET sock; @@ -1612,6 +1612,14 @@ static void test_getsockname() WSACleanup(); } +static void test_inet_addr(void) +{ + u_long addr; + + addr = inet_addr(NULL); + ok(addr == INADDR_NONE, "inet_addr succeeded unexpectedly\n"); +} + /**************** Main program ***************/ START_TEST( sock ) @@ -1643,6 +1651,7 @@ START_TEST( sock ) test_select(); test_accept(); test_getsockname(); + test_inet_addr(); Exit(); }

1 0