February 2007 - Wine-Commits

Rob Shearman : oleaut32: Always register the typelib for the tmarshal tests .
by Alexandre Julliard Feb. 8, 2007

Feb. 8, 2007

Module: wine Branch: master Commit: d2a38cef9981eef210b31abfea341804c60494d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2a38cef9981eef210b31abfe… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Feb 7 22:09:43 2007 +0000 oleaut32: Always register the typelib for the tmarshal tests. --- dlls/oleaut32/tests/tmarshal.c | 39 +++++++++++++-------------------------- 1 files changed, 13 insertions(+), 26 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index 99bbf00..9308408 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -520,16 +520,20 @@ typedef struct KindaEnum LONG refs; } KindaEnum; -static HRESULT register_current_module_typelib(ITypeLib **typelib) +static HRESULT register_current_module_typelib(void) { WCHAR path[MAX_PATH]; HRESULT hr; + ITypeLib *typelib; GetModuleFileNameW(NULL, path, MAX_PATH); - hr = LoadTypeLib(path, typelib); + hr = LoadTypeLib(path, &typelib); if (SUCCEEDED(hr)) - hr = RegisterTypeLib(*typelib, path, NULL); + { + hr = RegisterTypeLib(typelib, path, NULL); + ITypeLib_Release(typelib); + } return hr; } @@ -544,11 +548,6 @@ static IWidget *Widget_Create(void) hr = LoadRegTypeLib(&LIBID_TestTypelib, 1, 0, LOCALE_NEUTRAL, &pTypeLib); ok_ole_success(hr, LoadRegTypeLib); - if (hr == TYPE_E_LIBNOTREGISTERED) - { - hr = register_current_module_typelib(&pTypeLib); - ok_ole_success(hr, register_current_module_typelib); - } if (SUCCEEDED(hr)) { ITypeInfo *pTypeInfo; @@ -658,19 +657,6 @@ static const IKindaEnumWidgetVtbl KindaE static IKindaEnumWidget *KindaEnumWidget_Create(void) { KindaEnum *This; - HRESULT hr; - ITypeLib *pTypeLib; - - hr = LoadRegTypeLib(&LIBID_TestTypelib, 1, 0, LOCALE_NEUTRAL, &pTypeLib); - if (hr == TYPE_E_LIBNOTREGISTERED) - { - hr = register_current_module_typelib(&pTypeLib); - ok_ole_success(hr, register_current_module_typelib); - } - else - ok_ole_success(hr, LoadRegTypeLib); - if (SUCCEEDED(hr)) - ITypeLib_Release(pTypeLib); This = (KindaEnum *)HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); if (!This) return NULL; @@ -720,11 +706,7 @@ static ITypeInfo *NonOleAutomation_GetTy { ITypeLib *pTypeLib; HRESULT hr = LoadRegTypeLib(&LIBID_TestTypelib, 1, 0, LOCALE_NEUTRAL, &pTypeLib); - if (hr == TYPE_E_LIBNOTREGISTERED) - { - hr = register_current_module_typelib(&pTypeLib); - ok_ole_success(hr, register_current_module_typelib); - } + ok_ole_success(hr, LoadRegTypeLib); if (SUCCEEDED(hr)) { ITypeInfo *pTypeInfo; @@ -1106,8 +1088,13 @@ static void test_DispCallFunc(void) START_TEST(tmarshal) { + HRESULT hr; + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + hr = register_current_module_typelib(); + ok_ole_success(hr, register_current_module_typelib); + test_typelibmarshal(); test_DispCallFunc();

1 0

Rob Shearman : oleaut32: Comment out "dual" attribute of IKindaEnumWidget in tmarshal test to cause the interface to be marshaled correctly .
by Alexandre Julliard Feb. 8, 2007

Feb. 8, 2007

Module: wine Branch: master Commit: d794398e739399a8569ac0269d4df5ec0da93208 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d794398e739399a8569ac0269… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Feb 7 19:21:33 2007 +0000 oleaut32: Comment out "dual" attribute of IKindaEnumWidget in tmarshal test to cause the interface to be marshaled correctly. This fixes a bunch of tmarshal tests. --- dlls/oleaut32/tests/tmarshal.c | 55 ++++++++++++++++---------------------- dlls/oleaut32/tests/tmarshal.idl | 2 + 2 files changed, 25 insertions(+), 32 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index 9308408..8ef02d8 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -136,10 +136,7 @@ static DWORD CALLBACK host_object_proc(L } hr = CoMarshalInterface(data->stream, &data->iid, data->object, MSHCTX_INPROC, NULL, data->marshal_flags); - todo_wine - { - ok_ole_success(hr, CoMarshalInterface); - } + ok_ole_success(hr, CoMarshalInterface); /* force the message queue to be created before signaling parent thread */ PeekMessage(&msg, NULL, WM_USER, WM_USER, PM_NOREMOVE); @@ -747,10 +744,7 @@ static void test_typelibmarshal(void) IStream_Seek(pStream, ullZero, STREAM_SEEK_SET, NULL); hr = CoUnmarshalInterface(pStream, &IID_IKindaEnumWidget, (void **)&pKEW); - todo_wine - { - ok_ole_success(hr, CoUnmarshalInterface); - } + ok_ole_success(hr, CoUnmarshalInterface); IStream_Release(pStream); hr = IKindaEnumWidget_Next(pKEW, &pWidget); @@ -769,12 +763,9 @@ static void test_typelibmarshal(void) VariantInit(&varresult); hr = IDispatch_Invoke(pDispatch, DISPID_TM_NAME, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_PROPERTYPUT, &dispparams, &varresult, &excepinfo, NULL); ok_ole_success(hr, IDispatch_Invoke); - todo_wine - { - ok(excepinfo.wCode == 0x0 && excepinfo.scode == S_OK, - "EXCEPINFO differs from expected: wCode = 0x%x, scode = 0x%08x\n", - excepinfo.wCode, excepinfo.scode); - } + ok(excepinfo.wCode == 0x0 && excepinfo.scode == S_OK, + "EXCEPINFO differs from expected: wCode = 0x%x, scode = 0x%08x\n", + excepinfo.wCode, excepinfo.scode); VariantClear(&varresult); /* call put_Name (direct) */ @@ -791,12 +782,9 @@ static void test_typelibmarshal(void) VariantInit(&varresult); hr = IDispatch_Invoke(pDispatch, DISPID_TM_NAME, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_PROPERTYGET, &dispparams, &varresult, &excepinfo, NULL); ok_ole_success(hr, IDispatch_Invoke); - todo_wine - { - ok(excepinfo.wCode == 0x0 && excepinfo.scode == S_OK, - "EXCEPINFO differs from expected: wCode = 0x%x, scode = 0x%08x\n", - excepinfo.wCode, excepinfo.scode); - } + ok(excepinfo.wCode == 0x0 && excepinfo.scode == S_OK, + "EXCEPINFO differs from expected: wCode = 0x%x, scode = 0x%08x\n", + excepinfo.wCode, excepinfo.scode); trace("Name = %s\n", wine_dbgstr_w(V_BSTR(&varresult))); VariantClear(&varresult); @@ -905,12 +893,13 @@ static void test_typelibmarshal(void) VariantInit(&varresult); hr = IDispatch_Invoke(pDispatch, DISPID_TM_CLONEDISPATCH, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_PROPERTYGET, &dispparams, &varresult, &excepinfo, NULL); ok_ole_success(hr, IDispatch_Invoke); + + ok(excepinfo.wCode == 0x0 && excepinfo.scode == S_OK, + "EXCEPINFO differs from expected: wCode = 0x%x, scode = 0x%08x\n", + excepinfo.wCode, excepinfo.scode); + todo_wine { - ok(excepinfo.wCode == 0x0 && excepinfo.scode == S_OK, - "EXCEPINFO differs from expected: wCode = 0x%x, scode = 0x%08x\n", - excepinfo.wCode, excepinfo.scode); - ok(V_VT(&varresult) == VT_I2, "V_VT(&varresult) was %d instead of VT_I2\n", V_VT(&varresult)); ok(V_I2(&varresult) == 1234, "V_I2(&varresult) was %d instead of 1234\n", V_I2(&varresult)); } @@ -930,11 +919,14 @@ static void test_typelibmarshal(void) todo_wine { ok_ole_success(hr, IDispatch_Invoke); + } - ok(excepinfo.wCode == 0x0 && excepinfo.scode == S_OK, + ok(excepinfo.wCode == 0x0 && excepinfo.scode == S_OK, "EXCEPINFO differs from expected: wCode = 0x%x, scode = 0x%08x\n", - excepinfo.wCode, excepinfo.scode); + excepinfo.wCode, excepinfo.scode); + todo_wine + { ok(V_VT(&varresult) == VT_I2, "V_VT(&varresult) was %d instead of VT_I2\n", V_VT(&varresult)); ok(V_I2(&varresult) == 1234, "V_I2(&varresult) was %d instead of 1234\n", V_I2(&varresult)); } @@ -964,12 +956,9 @@ static void test_typelibmarshal(void) VariantInit(&varresult); hr = IDispatch_Invoke(pDispatch, DISPID_TM_ERROR, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, NULL, &excepinfo, NULL); ok(hr == DISP_E_EXCEPTION, "IDispatch_Invoke should have returned DISP_E_EXCEPTION instead of 0x%08x\n", hr); - todo_wine - { - ok(excepinfo.wCode == 0x0 && excepinfo.scode == E_NOTIMPL, - "EXCEPINFO differs from expected: wCode = 0x%x, scode = 0x%08x\n", - excepinfo.wCode, excepinfo.scode); - } + ok(excepinfo.wCode == 0x0 && excepinfo.scode == E_NOTIMPL, + "EXCEPINFO differs from expected: wCode = 0x%x, scode = 0x%08x\n", + excepinfo.wCode, excepinfo.scode); VariantClear(&varresult); /* call BstrRet */ @@ -1010,8 +999,10 @@ static void test_typelibmarshal(void) dispparams.cArgs = 1; dispparams.rgvarg = vararg; VariantInit(&varresult); +#if 0 /* NULL unknown not currently marshaled correctly */ hr = IDispatch_Invoke(pDispatch, DISPID_TM_NAME, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_PROPERTYPUT, &dispparams, &varresult, &excepinfo, NULL); ok(hr == DISP_E_TYPEMISMATCH, "IDispatch_Invoke should have returned DISP_E_TYPEMISMATCH instead of 0x%08x\n", hr); +#endif VariantClear(&varresult); /* tests bad param type */ diff --git a/dlls/oleaut32/tests/tmarshal.idl b/dlls/oleaut32/tests/tmarshal.idl index 78c9d03..35d9916 100644 --- a/dlls/oleaut32/tests/tmarshal.idl +++ b/dlls/oleaut32/tests/tmarshal.idl @@ -95,7 +95,9 @@ library TestTypelib [ odl, uuid(a028db05-30f0-4b93-b17a-41c72f831d84), +#if 0 /* FIXME: commented out as causes widl to generate incorrect typelib */ dual, +#endif oleautomation ] interface IKindaEnumWidget : IUnknown

1 0

Detlef Riekenberg : regedit: Do not use a local copy of a global pointer.
by Alexandre Julliard Feb. 8, 2007

Feb. 8, 2007

Module: wine Branch: master Commit: 5b19d5899f29900f095ea81168c2d121b402c323 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b19d5899f29900f095ea8116… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Feb 8 00:14:15 2007 +0100 regedit: Do not use a local copy of a global pointer. --- programs/regedit/childwnd.c | 64 +++++++++++++++++++++---------------------- 1 files changed, 31 insertions(+), 33 deletions(-) diff --git a/programs/regedit/childwnd.c b/programs/regedit/childwnd.c index 3b3be61..6a56e82 100644 --- a/programs/regedit/childwnd.c +++ b/programs/regedit/childwnd.c @@ -171,7 +171,6 @@ static void OnTreeSelectionChanged(HWND static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { - ChildWnd* pChildWnd = g_pChildWnd; switch (LOWORD(wParam)) { /* Parse the menu selections: */ case ID_REGISTRY_EXIT: @@ -182,8 +181,8 @@ static BOOL _CmdWndProc(HWND hWnd, UINT /* TODO */ break; case ID_SWITCH_PANELS: - pChildWnd->nFocusPanel = !pChildWnd->nFocusPanel; - SetFocus(pChildWnd->nFocusPanel? pChildWnd->hListWnd: pChildWnd->hTreeWnd); + g_pChildWnd->nFocusPanel = !g_pChildWnd->nFocusPanel; + SetFocus(g_pChildWnd->nFocusPanel? g_pChildWnd->hListWnd: g_pChildWnd->hTreeWnd); break; default: return FALSE; @@ -205,19 +204,18 @@ static BOOL _CmdWndProc(HWND hWnd, UINT LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { static int last_split; - ChildWnd* pChildWnd = g_pChildWnd; switch (message) { case WM_CREATE: - g_pChildWnd = pChildWnd = HeapAlloc(GetProcessHeap(), 0, sizeof(ChildWnd)); - if (!pChildWnd) return 0; - LoadString(hInst, IDS_REGISTRY_ROOT_NAME, pChildWnd->szPath, MAX_PATH); - pChildWnd->nSplitPos = 250; - pChildWnd->hWnd = hWnd; - pChildWnd->hTreeWnd = CreateTreeView(hWnd, pChildWnd->szPath, TREE_WINDOW); - pChildWnd->hListWnd = CreateListView(hWnd, LIST_WINDOW/*, pChildWnd->szPath*/); - pChildWnd->nFocusPanel = 1; - SetFocus(pChildWnd->hTreeWnd); + g_pChildWnd = HeapAlloc(GetProcessHeap(), 0, sizeof(ChildWnd)); + if (!g_pChildWnd) return 0; + LoadString(hInst, IDS_REGISTRY_ROOT_NAME, g_pChildWnd->szPath, MAX_PATH); + g_pChildWnd->nSplitPos = 250; + g_pChildWnd->hWnd = hWnd; + g_pChildWnd->hTreeWnd = CreateTreeView(hWnd, g_pChildWnd->szPath, TREE_WINDOW); + g_pChildWnd->hListWnd = CreateListView(hWnd, LIST_WINDOW/*, g_pChildWnd->szPath*/); + g_pChildWnd->nFocusPanel = 1; + SetFocus(g_pChildWnd->hTreeWnd); break; case WM_COMMAND: if (!_CmdWndProc(hWnd, message, wParam, lParam)) { @@ -232,23 +230,23 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, POINT pt; GetCursorPos(&pt); ScreenToClient(hWnd, &pt); - if (pt.x>=pChildWnd->nSplitPos-SPLIT_WIDTH/2 && pt.x<pChildWnd->nSplitPos+SPLIT_WIDTH/2+1) { + if (pt.x>=g_pChildWnd->nSplitPos-SPLIT_WIDTH/2 && pt.x<g_pChildWnd->nSplitPos+SPLIT_WIDTH/2+1) { SetCursor(LoadCursor(0, IDC_SIZEWE)); return TRUE; } } goto def; case WM_DESTROY: - HeapFree(GetProcessHeap(), 0, pChildWnd); - pChildWnd = NULL; + HeapFree(GetProcessHeap(), 0, g_pChildWnd); + g_pChildWnd = NULL; PostQuitMessage(0); break; case WM_LBUTTONDOWN: { RECT rt; int x = (short)LOWORD(lParam); GetClientRect(hWnd, &rt); - if (x>=pChildWnd->nSplitPos-SPLIT_WIDTH/2 && x<pChildWnd->nSplitPos+SPLIT_WIDTH/2+1) { - last_split = pChildWnd->nSplitPos; + if (x>=g_pChildWnd->nSplitPos-SPLIT_WIDTH/2 && x<g_pChildWnd->nSplitPos+SPLIT_WIDTH/2+1) { + last_split = g_pChildWnd->nSplitPos; draw_splitbar(hWnd, last_split); SetCapture(hWnd); } @@ -262,7 +260,7 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, draw_splitbar(hWnd, last_split); last_split = -1; GetClientRect(hWnd, &rt); - pChildWnd->nSplitPos = x; + g_pChildWnd->nSplitPos = x; ResizeWnd(rt.right, rt.bottom); ReleaseCapture(); } @@ -304,8 +302,8 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, break; case WM_SETFOCUS: - if (pChildWnd != NULL) { - SetFocus(pChildWnd->nFocusPanel? pChildWnd->hListWnd: pChildWnd->hTreeWnd); + if (g_pChildWnd != NULL) { + SetFocus(g_pChildWnd->nFocusPanel? g_pChildWnd->hListWnd: g_pChildWnd->hTreeWnd); } break; @@ -313,16 +311,16 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, break; case WM_NOTIFY: - if ((int)wParam == TREE_WINDOW) { + if (((int)wParam == TREE_WINDOW) && (g_pChildWnd != NULL)) { switch (((LPNMHDR)lParam)->code) { case TVN_ITEMEXPANDING: - return !OnTreeExpanding(pChildWnd->hTreeWnd, (NMTREEVIEW*)lParam); + return !OnTreeExpanding(g_pChildWnd->hTreeWnd, (NMTREEVIEW*)lParam); case TVN_SELCHANGED: - OnTreeSelectionChanged(pChildWnd->hTreeWnd, pChildWnd->hListWnd, + OnTreeSelectionChanged(g_pChildWnd->hTreeWnd, g_pChildWnd->hListWnd, ((NMTREEVIEW *)lParam)->itemNew.hItem, TRUE); break; case NM_SETFOCUS: - pChildWnd->nFocusPanel = 0; + g_pChildWnd->nFocusPanel = 0; break; case NM_RCLICK: { POINT pt; @@ -334,16 +332,16 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, case TVN_ENDLABELEDIT: { HKEY hRootKey; LPNMTVDISPINFO dispInfo = (LPNMTVDISPINFO)lParam; - LPCTSTR path = GetItemPath(pChildWnd->hTreeWnd, 0, &hRootKey); + LPCTSTR path = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hRootKey); BOOL res = RenameKey(hWnd, hRootKey, path, dispInfo->item.pszText); if (res) { TVITEMEX item; - LPTSTR fullPath = GetPathFullPath(pChildWnd->hTreeWnd, + LPTSTR fullPath = GetPathFullPath(g_pChildWnd->hTreeWnd, dispInfo->item.pszText); item.mask = TVIF_HANDLE | TVIF_TEXT; - item.hItem = TreeView_GetSelection(pChildWnd->hTreeWnd); + item.hItem = TreeView_GetSelection(g_pChildWnd->hTreeWnd); item.pszText = dispInfo->item.pszText; - SendMessage( pChildWnd->hTreeWnd, TVM_SETITEMW, 0, (LPARAM)&item ); + SendMessage( g_pChildWnd->hTreeWnd, TVM_SETITEMW, 0, (LPARAM)&item ); SendMessage(hStatusBar, SB_SETTEXT, 0, (LPARAM)fullPath); HeapFree(GetProcessHeap(), 0, fullPath); } @@ -353,17 +351,17 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, return 0; /* goto def; */ } } else - if ((int)wParam == LIST_WINDOW) { + if (((int)wParam == LIST_WINDOW) && (g_pChildWnd != NULL)) { if (((LPNMHDR)lParam)->code == NM_SETFOCUS) { - pChildWnd->nFocusPanel = 1; - } else if (!SendMessage(pChildWnd->hListWnd, WM_NOTIFY_REFLECT, wParam, lParam)) { + g_pChildWnd->nFocusPanel = 1; + } else if (!SendMessage(g_pChildWnd->hListWnd, WM_NOTIFY_REFLECT, wParam, lParam)) { goto def; } } break; case WM_SIZE: - if (wParam != SIZE_MINIMIZED && pChildWnd != NULL) { + if (wParam != SIZE_MINIMIZED && g_pChildWnd != NULL) { ResizeWnd(LOWORD(lParam), HIWORD(lParam)); } /* fall through */

1 0

Detlef Riekenberg : regedit: Do not pass a global available pointer to a static function.
by Alexandre Julliard Feb. 8, 2007

Feb. 8, 2007

Module: wine Branch: master Commit: 0a0316ea455668c25dad97643098f528932dcdae URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a0316ea455668c25dad97643… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Feb 8 00:08:44 2007 +0100 regedit: Do not pass a global available pointer to a static function. --- programs/regedit/childwnd.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/programs/regedit/childwnd.c b/programs/regedit/childwnd.c index b7262ff..3b3be61 100644 --- a/programs/regedit/childwnd.c +++ b/programs/regedit/childwnd.c @@ -60,14 +60,14 @@ static void draw_splitbar(HWND hWnd, int ReleaseDC(hWnd, hdc); } -static void ResizeWnd(ChildWnd* pChildWnd, int cx, int cy) +static void ResizeWnd(int cx, int cy) { HDWP hdwp = BeginDeferWindowPos(2); RECT rt = {0, 0, cx, cy}; - cx = pChildWnd->nSplitPos + SPLIT_WIDTH/2; - DeferWindowPos(hdwp, pChildWnd->hTreeWnd, 0, rt.left, rt.top, pChildWnd->nSplitPos-SPLIT_WIDTH/2-rt.left, rt.bottom-rt.top, SWP_NOZORDER|SWP_NOACTIVATE); - DeferWindowPos(hdwp, pChildWnd->hListWnd, 0, rt.left+cx , rt.top, rt.right-cx, rt.bottom-rt.top, SWP_NOZORDER|SWP_NOACTIVATE); + cx = g_pChildWnd->nSplitPos + SPLIT_WIDTH/2; + DeferWindowPos(hdwp, g_pChildWnd->hTreeWnd, 0, rt.left, rt.top, g_pChildWnd->nSplitPos-SPLIT_WIDTH/2-rt.left, rt.bottom-rt.top, SWP_NOZORDER|SWP_NOACTIVATE); + DeferWindowPos(hdwp, g_pChildWnd->hListWnd, 0, rt.left+cx , rt.top, rt.right-cx, rt.bottom-rt.top, SWP_NOZORDER|SWP_NOACTIVATE); EndDeferWindowPos(hdwp); } @@ -263,7 +263,7 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, last_split = -1; GetClientRect(hWnd, &rt); pChildWnd->nSplitPos = x; - ResizeWnd(pChildWnd, rt.right, rt.bottom); + ResizeWnd(rt.right, rt.bottom); ReleaseCapture(); } break; @@ -279,7 +279,7 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, RECT rt; draw_splitbar(hWnd, last_split); GetClientRect(hWnd, &rt); - ResizeWnd(pChildWnd, rt.right, rt.bottom); + ResizeWnd(rt.right, rt.bottom); last_split = -1; ReleaseCapture(); SetCursor(LoadCursor(0, IDC_ARROW)); @@ -364,7 +364,7 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, case WM_SIZE: if (wParam != SIZE_MINIMIZED && pChildWnd != NULL) { - ResizeWnd(pChildWnd, LOWORD(lParam), HIWORD(lParam)); + ResizeWnd(LOWORD(lParam), HIWORD(lParam)); } /* fall through */ default: def:

1 0

Detlef Riekenberg : regedit: Declare some variables static.
by Alexandre Julliard Feb. 8, 2007

Feb. 8, 2007

Module: wine Branch: master Commit: cccd55a9dc8f73a69e3fe8426a0084403420f364 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cccd55a9dc8f73a69e3fe8426… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Feb 7 23:48:29 2007 +0100 regedit: Declare some variables static. --- programs/regedit/framewnd.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index bb05ea4..006e802 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -42,6 +42,10 @@ static TCHAR favoriteName[128]; static TCHAR searchString[128]; static int searchMask = SEARCH_KEYS | SEARCH_VALUES | SEARCH_CONTENT; +static TCHAR FileNameBuffer[_MAX_PATH]; +static TCHAR FileTitleBuffer[_MAX_PATH]; +static TCHAR FilterBuffer[_MAX_PATH]; + /******************************************************************************* * Local module support methods */ @@ -286,9 +290,6 @@ static UINT_PTR CALLBACK ExportRegistryF return 0L; } -TCHAR FileNameBuffer[_MAX_PATH]; -TCHAR FileTitleBuffer[_MAX_PATH]; -TCHAR FilterBuffer[_MAX_PATH]; static BOOL InitOpenFileName(HWND hWnd, OPENFILENAME *pofn) {

1 0

Jacek Caban : urlmon: Fix continue_call handling.
by Alexandre Julliard Feb. 8, 2007

Feb. 8, 2007

Module: wine Branch: master Commit: 6299859ee795e91018212d0575edc13a2663e4a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6299859ee795e91018212d057… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 8 02:34:52 2007 +0100 urlmon: Fix continue_call handling. --- dlls/urlmon/binding.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index 756ad2f..70d08a3 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -151,8 +151,11 @@ static LRESULT WINAPI notif_wnd_proc(HWN Binding *binding = (Binding*)lParam; task_header_t *task; - while((task = pop_task(binding))) + while((task = pop_task(binding))) { + binding->continue_call++; task->proc(binding, task); + binding->continue_call--; + } IBinding_Release(BINDING(binding)); return 0;

1 0

Jacek Caban : urlmon: Call OnProgress directly in report_data.
by Alexandre Julliard Feb. 8, 2007

Feb. 8, 2007

Module: wine Branch: master Commit: 88f76cc29e33ea6663ca443fcedc658eaf8c5c7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=88f76cc29e33ea6663ca443fc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 8 02:34:13 2007 +0100 urlmon: Call OnProgress directly in report_data. --- dlls/urlmon/binding.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index 07d9333..756ad2f 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -834,15 +834,18 @@ static void report_data(Binding *This, D FindMimeFromData(NULL, This->url, This->stream->buf, min(This->stream->buf_size, 255), This->mime, 0, &mime, 0); - on_progress(This, progress, progress_max, BINDSTATUS_MIMETYPEAVAILABLE, mime); + IBindStatusCallback_OnProgress(This->callback, progress, progress_max, + BINDSTATUS_MIMETYPEAVAILABLE, mime); } if(bscf & BSCF_FIRSTDATANOTIFICATION) { - on_progress(This, progress, progress_max, BINDSTATUS_BEGINDOWNLOADDATA, This->url); + IBindStatusCallback_OnProgress(This->callback, progress, progress_max, + BINDSTATUS_BEGINDOWNLOADDATA, This->url); } if(bscf & BSCF_LASTDATANOTIFICATION) - on_progress(This, progress, progress_max, BINDSTATUS_ENDDOWNLOADDATA, This->url); + IBindStatusCallback_OnProgress(This->callback, progress, progress_max, + BINDSTATUS_ENDDOWNLOADDATA, This->url); if(!This->request_locked) { HRESULT hres = IInternetProtocol_LockRequest(This->protocol, 0);

1 0

Jacek Caban : urlmon: Added ReportProgress(BINDSTATUS_DIRECTBIND) implementation.
by Alexandre Julliard Feb. 8, 2007

Feb. 8, 2007

Module: wine Branch: master Commit: 4613567d3225a1391e1223f78b68b361e6164126 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4613567d3225a1391e1223f78… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 8 02:33:32 2007 +0100 urlmon: Added ReportProgress(BINDSTATUS_DIRECTBIND) implementation. --- dlls/urlmon/binding.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index 9a1ef78..07d9333 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -74,7 +74,7 @@ struct Binding { DWORD bindf; LPWSTR mime; LPWSTR url; - BOOL verified_mime; + BOOL report_mime; DWORD continue_call; BOOL request_locked; @@ -799,11 +799,14 @@ static HRESULT WINAPI InternetProtocolSi on_progress(This, 0, 0, BINDSTATUS_SENDINGREQUEST, szStatusText); break; case BINDSTATUS_VERIFIEDMIMETYPEAVAILABLE: - This->verified_mime = TRUE; + This->report_mime = FALSE; on_progress(This, 0, 0, BINDSTATUS_MIMETYPEAVAILABLE, szStatusText); break; case BINDSTATUS_CACHEFILENAMEAVAILABLE: break; + case BINDSTATUS_DIRECTBIND: + This->report_mime = FALSE; + break; default: FIXME("Unhandled status code %d\n", ulStatusCode); return E_NOTIMPL; @@ -821,10 +824,10 @@ static void report_data(Binding *This, D if(GetCurrentThreadId() != This->apartment_thread) FIXME("called from worked hread\n"); - if(!This->verified_mime) { + if(This->report_mime) { LPWSTR mime; - This->verified_mime = TRUE; + This->report_mime = FALSE; fill_stream_buffer(This->stream); @@ -1184,7 +1187,7 @@ static HRESULT Binding_Create(LPCWSTR ur ret->url = NULL; ret->apartment_thread = GetCurrentThreadId(); ret->notif_hwnd = get_notif_hwnd(); - ret->verified_mime = FALSE; + ret->report_mime = TRUE; ret->continue_call = 0; ret->request_locked = FALSE; ret->task_queue_head = ret->task_queue_tail = NULL;

1 0

Jacek Caban : urlmon: Fix ReportResult on async protocols.
by Alexandre Julliard Feb. 8, 2007

Feb. 8, 2007

Module: wine Branch: master Commit: f799192b3e42ff9fe236eef883f2d6ad88f9c21f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f799192b3e42ff9fe236eef88… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 8 02:32:48 2007 +0100 urlmon: Fix ReportResult on async protocols. --- dlls/urlmon/binding.c | 22 ++++++++++++++++++++-- 1 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index 8bc954d..9a1ef78 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -1,5 +1,5 @@ /* - * Copyright 2005 Jacek Caban + * Copyright 2005-2007 Jacek Caban for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -895,6 +895,18 @@ static HRESULT WINAPI InternetProtocolSi return S_OK; } +static void report_result_proc(Binding *binding, task_header_t *t) +{ + IInternetProtocol_Terminate(binding->protocol, 0); + + if(binding->request_locked) { + IInternetProtocol_UnlockRequest(binding->protocol); + binding->request_locked = FALSE; + } + + HeapFree(GetProcessHeap(), 0, t); +} + static HRESULT WINAPI InternetProtocolSink_ReportResult(IInternetProtocolSink *iface, HRESULT hrResult, DWORD dwError, LPCWSTR szResult) { @@ -902,7 +914,13 @@ static HRESULT WINAPI InternetProtocolSi TRACE("(%p)->(%08x %d %s)\n", This, hrResult, dwError, debugstr_w(szResult)); - IInternetProtocol_Terminate(This->protocol, 0); + if(GetCurrentThreadId() == This->apartment_thread && !This->continue_call) { + IInternetProtocol_Terminate(This->protocol, 0); + }else { + task_header_t *task = HeapAlloc(GetProcessHeap(), 0, sizeof(task_header_t)); + push_task(This, task, report_result_proc); + } + return S_OK; }

1 0

Mike McCormack : msiexec: Catch the -Embedding flag and print out a message .
by Alexandre Julliard Feb. 8, 2007

Feb. 8, 2007

Module: wine Branch: master Commit: ecefcccabf8a834138d4c8d190282f6cd5881cc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecefcccabf8a834138d4c8d19… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Feb 8 10:56:27 2007 +0900 msiexec: Catch the -Embedding flag and print out a message. --- programs/msiexec/msiexec.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/programs/msiexec/msiexec.c b/programs/msiexec/msiexec.c index 64ad48e..2d2728c 100644 --- a/programs/msiexec/msiexec.c +++ b/programs/msiexec/msiexec.c @@ -360,6 +360,12 @@ static DWORD DoRegServer(void) return ret; } +static INT DoEmbedding( LPWSTR key ) +{ + printf("Remote custom actions are not supported yet\n"); + return 1; +} + static BOOL process_args_from_reg( LPWSTR ident, int *pargc, WCHAR ***pargv ) { LONG r; @@ -438,6 +444,9 @@ int main(int argc, char **argv) return 1; } + if (argc == 3 && msi_option_equal(argvW[1], "Embedding")) + return DoEmbedding( argvW[2] ); + for(i = 1; i < argc; i++) { WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i]));

1 0