September 2008 - Wine-Commits

Alexandre Julliard : user32/tests: Cope with last error behavior on Vista.
by Alexandre Julliard Sept. 18, 2008

Sept. 18, 2008

Module: wine Branch: master Commit: b40628825acb280f17ecd970077bad12acf94d0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b40628825acb280f17ecd9700… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 17 16:24:10 2008 +0200 user32/tests: Cope with last error behavior on Vista. --- dlls/user32/tests/cursoricon.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 0c611a3..710b67c 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -76,11 +76,10 @@ static LRESULT CALLBACK callback_child(HWND hwnd, UINT msg, WPARAM wParam, LPARA SetLastError(0xdeadbeef); ret = DestroyCursor((HCURSOR) lParam); error = GetLastError(); - todo_wine { - ok(!ret, "DestroyCursor on the active cursor succeeded.\n"); - ok(error == ERROR_DESTROY_OBJECT_OF_OTHER_THREAD, + todo_wine ok(!ret, "DestroyCursor on the active cursor succeeded.\n"); + ok(error == ERROR_DESTROY_OBJECT_OF_OTHER_THREAD || + error == 0xdeadbeef, /* vista */ "Last error: %u\n", error); - } return TRUE; case WM_DESTROY: PostQuitMessage(0); @@ -132,7 +131,7 @@ static void do_child(void) PostMessage(parent, PROC_INIT, (WPARAM) child, 0); /* Receive messages. */ - while ((ret = GetMessage(&msg, child, 0, 0))) + while ((ret = GetMessage(&msg, 0, 0, 0))) { ok(ret != -1, "GetMessage failed. Error: %u\n", GetLastError()); TranslateMessage(&msg); @@ -990,7 +989,8 @@ static void test_DestroyCursor(void) todo_wine { ok(!ret, "DestroyCursor succeeded.\n"); error = GetLastError(); - ok(error == ERROR_INVALID_CURSOR_HANDLE, "Last error: 0x%08x\n", error); + ok(error == ERROR_INVALID_CURSOR_HANDLE || error == 0xdeadbeef, /* vista */ + "Last error: 0x%08x\n", error); } DeleteObject(cursorInfo.hbmMask);

1 0

Alexandre Julliard : mstask/tests: Fix test failures on XP.
by Alexandre Julliard Sept. 18, 2008

Sept. 18, 2008

Module: wine Branch: master Commit: 0e894c3444043b8c7b67f2de9be264b1bd52694c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e894c3444043b8c7b67f2de9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 17 16:23:08 2008 +0200 mstask/tests: Fix test failures on XP. --- dlls/mstask/tests/task.c | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 deletions(-) diff --git a/dlls/mstask/tests/task.c b/dlls/mstask/tests/task.c index 88a4fdf..328dd76 100644 --- a/dlls/mstask/tests/task.c +++ b/dlls/mstask/tests/task.c @@ -164,9 +164,13 @@ static void test_SetApplicationName_GetApplicationName(void) ok(hres == S_OK, "GetApplicationName failed: %08x\n", hres); if (hres == S_OK) { - full_name = path_resolve_name(notepad); - ok(!lstrcmpiW(stored_name, full_name), "Got %s, expected %s\n", - dbgstr_w(stored_name), dbgstr_w(full_name)); + full_name = path_resolve_name(notepad_exe); /* XP SP1 appends .exe */ + if (lstrcmpiW(stored_name, full_name) != 0) + { + full_name = path_resolve_name(notepad); + ok(!lstrcmpiW(stored_name, full_name), "Got %s, expected %s\n", + dbgstr_w(stored_name), dbgstr_w(full_name)); + } CoTaskMemFree(stored_name); } @@ -467,7 +471,8 @@ static void test_SetAccountInformation_GetAccountInformation(void) "Failed setting dummy account with no password: %08x\n", hres); hres = ITask_GetAccountInformation(test_task, &account_name); ok(hres == S_OK || - broken(hres == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)), + broken(hres == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) || + hres == SCHED_E_CANNOT_OPEN_TASK), "GetAccountInformation failed: %08x\n", hres); if (hres == S_OK) { @@ -485,7 +490,8 @@ static void test_SetAccountInformation_GetAccountInformation(void) "Failed setting dummy account with password: %08x\n", hres); hres = ITask_GetAccountInformation(test_task, &account_name); ok(hres == S_OK || - broken(hres == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)), + broken(hres == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) || + hres == SCHED_E_CANNOT_OPEN_TASK), "GetAccountInformation failed: %08x\n", hres); if (hres == S_OK) { @@ -500,7 +506,8 @@ static void test_SetAccountInformation_GetAccountInformation(void) ok(hres == S_OK, "Failed setting system account: %08x\n", hres); hres = ITask_GetAccountInformation(test_task, &account_name); ok(hres == S_OK || - broken(hres == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)), + broken(hres == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) || + hres == SCHED_E_CANNOT_OPEN_TASK), "GetAccountInformation failed: %08x\n", hres); if (hres == S_OK) {

1 0

Alexandre Julliard : shlwapi/tests: SHLWAPI. 23 apparently returns an HRESULT on Vista.
by Alexandre Julliard Sept. 18, 2008

Sept. 18, 2008

Module: wine Branch: master Commit: a3dd2967cabac273275755d1535e493428c482a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3dd2967cabac273275755d15… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 17 16:23:19 2008 +0200 shlwapi/tests: SHLWAPI.23 apparently returns an HRESULT on Vista. --- dlls/shlwapi/tests/clsid.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/shlwapi/tests/clsid.c b/dlls/shlwapi/tests/clsid.c index 917df22..98a8c6d 100644 --- a/dlls/shlwapi/tests/clsid.c +++ b/dlls/shlwapi/tests/clsid.c @@ -107,6 +107,7 @@ static void test_ClassIDs(void) DWORD dwLen; BOOL bRet; int i = 0; + int is_vista = 0; if (!pSHLWAPI_269 || !pSHLWAPI_23) return; @@ -114,7 +115,8 @@ static void test_ClassIDs(void) while (*guids) { dwLen = pSHLWAPI_23(*guids, szBuff, 256); - ok(dwLen == 39, "wrong size for id %d\n", i); + if (!i && dwLen == S_OK) is_vista = 1; /* seems to return an HRESULT on vista */ + ok(dwLen == (is_vista ? S_OK : 39), "wrong size %u for id %d\n", dwLen, i); bRet = pSHLWAPI_269(szBuff, &guid); ok(bRet != FALSE, "created invalid string '%s'\n", szBuff); @@ -128,7 +130,7 @@ static void test_ClassIDs(void) /* Test endianess */ dwLen = pSHLWAPI_23(&IID_Endianess, szBuff, 256); - ok(dwLen == 39, "wrong size for IID_Endianess\n"); + ok(dwLen == (is_vista ? S_OK : 39), "wrong size %u for IID_Endianess\n", dwLen); ok(!strcmp(szBuff, "{01020304-0506-0708-090A-0B0C0D0E0F0A}"), "Endianess Broken, got '%s'\n", szBuff); @@ -136,17 +138,17 @@ static void test_ClassIDs(void) /* test lengths */ szBuff[0] = ':'; dwLen = pSHLWAPI_23(&IID_Endianess, szBuff, 0); - ok(dwLen == 0, "accepted bad length\n"); + ok(dwLen == (is_vista ? E_FAIL : 0), "accepted bad length\n"); ok(szBuff[0] == ':', "wrote to buffer with no length\n"); szBuff[0] = ':'; dwLen = pSHLWAPI_23(&IID_Endianess, szBuff, 38); - ok(dwLen == 0, "accepted bad length\n"); + ok(dwLen == (is_vista ? E_FAIL : 0), "accepted bad length\n"); ok(szBuff[0] == ':', "wrote to buffer with no length\n"); szBuff[0] = ':'; dwLen = pSHLWAPI_23(&IID_Endianess, szBuff, 39); - ok(dwLen == 39, "rejected ok length\n"); + ok(dwLen == (is_vista ? S_OK : 39), "rejected ok length\n"); ok(szBuff[0] == '{', "Didn't write to buffer with ok length\n"); /* Test string */ @@ -155,7 +157,7 @@ static void test_ClassIDs(void) ok(bRet == FALSE, "accepted invalid string\n"); dwLen = pSHLWAPI_23(&IID_Endianess, szBuff, 39); - ok(dwLen == 39, "rejected ok length\n"); + ok(dwLen == (is_vista ? S_OK : 39), "rejected ok length\n"); ok(szBuff[0] == '{', "Didn't write to buffer with ok length\n"); }

1 0

Alexandre Julliard : user32/tests: Fix some test failures on XP.
by Alexandre Julliard Sept. 17, 2008

Sept. 17, 2008

Module: wine Branch: master Commit: 343d2420fc0ca30d2880ed4f4e418908eeb80aa3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=343d2420fc0ca30d2880ed4f4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 17 14:05:06 2008 +0200 user32/tests: Fix some test failures on XP. --- dlls/user32/tests/win.c | 32 ++++++++++++++++++-------------- 1 files changed, 18 insertions(+), 14 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 407becd..3954b07 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -3906,7 +3906,7 @@ static LRESULT CALLBACK minmax_wnd_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM l } static int expected_cx, expected_cy; -static RECT expected_rect; +static RECT expected_rect, broken_rect; static LRESULT CALLBACK winsizes_wnd_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) { @@ -3930,8 +3930,10 @@ static LRESULT CALLBACK winsizes_wnd_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM hwnd, msg, cs->cx, cs->cy, rect.left, rect.top, rect.right, rect.bottom ); ok( cs->cx == expected_cx, "wrong x size %d/%d\n", cs->cx, expected_cx ); ok( cs->cy == expected_cy, "wrong y size %d/%d\n", cs->cy, expected_cy ); - ok( rect.right - rect.left == expected_rect.right - expected_rect.left && - rect.bottom - rect.top == expected_rect.bottom - expected_rect.top, + ok( (rect.right - rect.left == expected_rect.right - expected_rect.left && + rect.bottom - rect.top == expected_rect.bottom - expected_rect.top) || + broken( rect.right - rect.left == broken_rect.right - broken_rect.left && + rect.bottom - rect.top == broken_rect.bottom - broken_rect.top), "wrong rect %d,%d-%d,%d / %d,%d-%d,%d\n", rect.left, rect.top, rect.right, rect.bottom, expected_rect.left, expected_rect.top, expected_rect.right, expected_rect.bottom ); @@ -4212,6 +4214,7 @@ static void test_CreateWindow(void) expected_cx = expected_cy = 200000; SetRect( &expected_rect, 0, 0, 200000, 200000 ); + broken_rect = expected_rect; hwnd = CreateWindowExA(0, "Sizes_WndClass", NULL, WS_CHILD, 300000, 300000, 200000, 200000, parent, 0, 0, NULL); ok( hwnd != 0, "creation failed err %u\n", GetLastError()); GetClientRect( hwnd, &rc ); @@ -4221,6 +4224,7 @@ static void test_CreateWindow(void) expected_cx = expected_cy = -10; SetRect( &expected_rect, 0, 0, 0, 0 ); + broken_rect = expected_rect; hwnd = CreateWindowExA(0, "Sizes_WndClass", NULL, WS_CHILD, -20, -20, -10, -10, parent, 0, 0, NULL); ok( hwnd != 0, "creation failed err %u\n", GetLastError()); GetClientRect( hwnd, &rc ); @@ -4230,6 +4234,7 @@ static void test_CreateWindow(void) expected_cx = expected_cy = -200000; SetRect( &expected_rect, 0, 0, 0, 0 ); + broken_rect = expected_rect; hwnd = CreateWindowExA(0, "Sizes_WndClass", NULL, WS_CHILD, -300000, -300000, -200000, -200000, parent, 0, 0, NULL); ok( hwnd != 0, "creation failed err %u\n", GetLastError()); GetClientRect( hwnd, &rc ); @@ -4245,21 +4250,23 @@ static void test_CreateWindow(void) expected_cx = 100; expected_cy = 0x7fffffff; SetRect( &expected_rect, 10, 10, 110, 0x7fffffff ); + SetRect( &broken_rect, 10, 10, 110, 0x7fffffffU + 10 ); hwnd = CreateWindowExA(0, "Sizes_WndClass", NULL, WS_CHILD, 10, 10, 100, 0x7fffffff, parent, 0, 0, NULL); ok( hwnd != 0, "creation failed err %u\n", GetLastError()); GetClientRect( hwnd, &rc ); ok( rc.right == 100, "invalid rect right %u\n", rc.right ); - ok( rc.bottom == 0x7fffffff - 10, "invalid rect bottom %u\n", rc.bottom ); + ok( rc.bottom == 0x7fffffff - 10 || broken(rc.bottom == 0), "invalid rect bottom %u\n", rc.bottom ); DestroyWindow(hwnd); expected_cx = 0x7fffffff; expected_cy = 0x7fffffff; SetRect( &expected_rect, 20, 10, 0x7fffffff, 0x7fffffff ); + SetRect( &broken_rect, 20, 10, 0x7fffffffU + 20, 0x7fffffffU + 10 ); hwnd = CreateWindowExA(0, "Sizes_WndClass", NULL, WS_CHILD, 20, 10, 0x7fffffff, 0x7fffffff, parent, 0, 0, NULL); ok( hwnd != 0, "creation failed err %u\n", GetLastError()); GetClientRect( hwnd, &rc ); - ok( rc.right == 0x7fffffff - 20, "invalid rect right %u\n", rc.right ); - ok( rc.bottom == 0x7fffffff - 10, "invalid rect bottom %u\n", rc.bottom ); + ok( rc.right == 0x7fffffff - 20 || broken(rc.right == 0), "invalid rect right %u\n", rc.right ); + ok( rc.bottom == 0x7fffffff - 10 || broken(rc.bottom == 0), "invalid rect bottom %u\n", rc.bottom ); DestroyWindow(hwnd); /* top level window */ @@ -4635,10 +4642,7 @@ static LRESULT CALLBACK TestExposedRegion_WndProc(HWND hwnd, UINT msg, WPARAM wP if(waitResult != WAIT_TIMEOUT) { GetUpdateRect(hwnd, &updateRect, FALSE); -todo_wine -{ - ok(!IsRectEmpty(&updateRect), "Exposed rect should not be empty\n"); -} + ok(IsRectEmpty(&updateRect), "Exposed rect should be empty\n"); } return 1; @@ -4856,14 +4860,14 @@ static void test_layered_window(void) ok( alpha == 22, "wrong alpha %u\n", alpha ); ok( flags == (LWA_COLORKEY | LWA_ALPHA), "wrong flags %x\n", flags ); - /* alpha not changed if LWA_ALPHA is not set */ ret = pSetLayeredWindowAttributes( hwnd, 0x888888, 33, LWA_COLORKEY ); ok( ret, "SetLayeredWindowAttributes should succeed on layered window\n" ); alpha = 0; ret = pGetLayeredWindowAttributes( hwnd, &key, &alpha, &flags ); ok( ret, "GetLayeredWindowAttributes should succeed on layered window\n" ); ok( key == 0x888888, "wrong color key %x\n", key ); - ok( alpha == 22, "wrong alpha %u\n", alpha ); + /* alpha not changed on vista if LWA_ALPHA is not set */ + ok( alpha == 22 || alpha == 33, "wrong alpha %u\n", alpha ); ok( flags == LWA_COLORKEY, "wrong flags %x\n", flags ); /* color key always changed */ @@ -4873,7 +4877,7 @@ static void test_layered_window(void) ret = pGetLayeredWindowAttributes( hwnd, &key, &alpha, &flags ); ok( ret, "GetLayeredWindowAttributes should succeed on layered window\n" ); ok( key == 0x999999, "wrong color key %x\n", key ); - ok( alpha == 22, "wrong alpha %u\n", alpha ); + ok( alpha == 22 || alpha == 44, "wrong alpha %u\n", alpha ); ok( flags == 0, "wrong flags %x\n", flags ); /* default alpha is 0 */ @@ -4884,7 +4888,7 @@ static void test_layered_window(void) ret = pGetLayeredWindowAttributes( hwnd, &key, &alpha, &flags ); ok( ret, "GetLayeredWindowAttributes should succeed on layered window\n" ); ok( key == 0x222222, "wrong color key %x\n", key ); - ok( alpha == 0, "wrong alpha %u\n", alpha ); + ok( alpha == 0 || alpha == 55, "wrong alpha %u\n", alpha ); ok( flags == 0, "wrong flags %x\n", flags ); DestroyWindow( hwnd );

1 0

Rob Shearman : oleaut32: Fix a typo in VarTokenizeFormatString.
by Alexandre Julliard Sept. 17, 2008

Sept. 17, 2008

Module: wine Branch: master Commit: 0ac31924a12891b8095e8fd0e7a51bd00b4b058a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ac31924a12891b8095e8fd0e… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Wed Sep 17 11:00:42 2008 +0100 oleaut32: Fix a typo in VarTokenizeFormatString. The second 'q' should be upper case. --- dlls/oleaut32/varformat.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/varformat.c b/dlls/oleaut32/varformat.c index 27735fc..217fb10 100644 --- a/dlls/oleaut32/varformat.c +++ b/dlls/oleaut32/varformat.c @@ -966,7 +966,7 @@ HRESULT WINAPI VarTokenizeFormatString(LPOLESTR lpszFormat, LPBYTE rgbTok, } fmt_state &= ~FMT_STATE_OPEN_COPY; } - else if ((*pFormat == 'q' || *pFormat == 'q') && COULD_BE(FMT_TYPE_DATE)) + else if ((*pFormat == 'q' || *pFormat == 'Q') && COULD_BE(FMT_TYPE_DATE)) { /* Date formats: Quarter specifier * Other formats: Literal

1 0

Rob Shearman : include: Add DUMMYUNIONNAME to unions in the _wireVARIANT, TYPEDESC and VARDESC structures in oaidl.idl.
by Alexandre Julliard Sept. 17, 2008

Sept. 17, 2008

Module: wine Branch: master Commit: c8db4e62324171e7baea39f107be208ddbbf2f69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8db4e62324171e7baea39f10… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Wed Sep 17 11:00:04 2008 +0100 include: Add DUMMYUNIONNAME to unions in the _wireVARIANT, TYPEDESC and VARDESC structures in oaidl.idl. --- include/oaidl.idl | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/oaidl.idl b/include/oaidl.idl index 7afc862..1cc166a 100644 --- a/include/oaidl.idl +++ b/include/oaidl.idl @@ -286,7 +286,7 @@ struct _wireVARIANT { [case(VT_DISPATCH|VT_BYREF)] IDispatch **ppdispVal; [case(VT_ARRAY|VT_BYREF)] wireSAFEARRAY *pparray; [case(VT_RECORD, VT_RECORD|VT_BYREF)] wireBRECORD brecVal; - }; + } DUMMYUNIONNAME; }; /* Dispatch */ @@ -313,7 +313,7 @@ typedef struct tagTYPEDESC { [case(VT_CARRAY)] struct tagARRAYDESC *lpadesc; [case(VT_USERDEFINED)] HREFTYPE hreftype; [default] ; - }; + } DUMMYUNIONNAME; VARTYPE vt; } TYPEDESC; @@ -484,7 +484,7 @@ typedef struct tagVARDESC { [switch_is(varkind)] union { [case(VAR_PERINSTANCE, VAR_DISPATCH, VAR_STATIC)] ULONG oInst; [case(VAR_CONST)] VARIANT *lpvarValue; - }; + } DUMMYUNIONNAME; ELEMDESC elemdescVar; WORD wVarFlags; VARKIND varkind;

1 0

Rob Shearman : include: Add DUMMYUNIONNAME to the anonymous union in the uSTGMEDIUM structure in objidl .idl.
by Alexandre Julliard Sept. 17, 2008

Sept. 17, 2008

Module: wine Branch: master Commit: 56502ebb99e6643599d5395a58492186da842937 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56502ebb99e6643599d5395a5… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Wed Sep 17 10:58:43 2008 +0100 include: Add DUMMYUNIONNAME to the anonymous union in the uSTGMEDIUM structure in objidl.idl. --- include/objidl.idl | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/include/objidl.idl b/include/objidl.idl index 0e869cb..e0d83fa 100644 --- a/include/objidl.idl +++ b/include/objidl.idl @@ -1378,7 +1378,6 @@ interface IAdviseSink : IUnknown [size_is(cbData)] byte data[]; } RemSTGMEDIUM; - /* FIXME: C/C++ nameless union version */ typedef struct tagSTGMEDIUM { DWORD tymed; [switch_is(tymed)] union { @@ -1390,7 +1389,7 @@ interface IAdviseSink : IUnknown [case(TYMED_ISTREAM)] IStream *pstm; [case(TYMED_ISTORAGE)] IStorage *pstg; [default] ; - }; + } DUMMYUNIONNAME; [unique] IUnknown *pUnkForRelease; } uSTGMEDIUM;

1 0

Rob Shearman : include: Make exdisp.h compile when included after commdlg.h .
by Alexandre Julliard Sept. 17, 2008

Sept. 17, 2008

Module: wine Branch: master Commit: 97a9df1c3cccfb0a491b0a59d9f78e5f0ef1c741 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97a9df1c3cccfb0a491b0a59d… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Wed Sep 17 10:57:37 2008 +0100 include: Make exdisp.h compile when included after commdlg.h. --- include/exdisp.idl | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/include/exdisp.idl b/include/exdisp.idl index 70da5ac..363e61a 100644 --- a/include/exdisp.idl +++ b/include/exdisp.idl @@ -26,6 +26,10 @@ import "docobj.idl"; #include <olectl.h> #include <exdispid.h> +cpp_quote("#ifdef WINE_NO_UNICODE_MACROS") +cpp_quote("#undef FindText") +cpp_quote("#endif") + /***************************************************************************** * SHDocVw library */

1 0

Rob Shearman : include: Make dmusici. h compile when it is included after winspool.h.
by Alexandre Julliard Sept. 17, 2008

Sept. 17, 2008

Module: wine Branch: master Commit: d524a761a1a71ac0a7598eecd15f2ec749c2edac URL: http://source.winehq.org/git/wine.git/?a=commit;h=d524a761a1a71ac0a7598eecd… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Wed Sep 17 10:57:32 2008 +0100 include: Make dmusici.h compile when it is included after winspool.h. --- include/dmusici.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/include/dmusici.h b/include/dmusici.h index c6e6852..2eb6daa 100644 --- a/include/dmusici.h +++ b/include/dmusici.h @@ -34,6 +34,10 @@ #include <dmplugin.h> #include <pshpack8.h> +#ifdef WINE_NO_UNICODE_MACROS +#undef AddPort +#endif + #ifdef __cplusplus extern "C" { #endif

1 0

Rob Shearman : cryptnet: Define CERT_REVOCATION_PARA_HAS_EXTRA_FIELDS before including any PSDK headers .
by Alexandre Julliard Sept. 17, 2008

Sept. 17, 2008

Module: wine Branch: master Commit: f530cf9e76867b77001037823c5b26a39ce9c6c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f530cf9e76867b77001037823… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Wed Sep 17 10:57:27 2008 +0100 cryptnet: Define CERT_REVOCATION_PARA_HAS_EXTRA_FIELDS before including any PSDK headers. --- dlls/cryptnet/cryptnet_main.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index ffd4d64..049d577 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -20,21 +20,23 @@ #include "config.h" #include "wine/port.h" -#include <stdio.h> #define NONAMELESSUNION #define NONAMELESSSTRUCT +#define CERT_REVOCATION_PARA_HAS_EXTRA_FIELDS + +#include <stdio.h> #include "windef.h" -#include "wine/debug.h" #include "winbase.h" #include "winnt.h" #include "winnls.h" #include "wininet.h" #include "objbase.h" -#define CERT_REVOCATION_PARA_HAS_EXTRA_FIELDS #include "wincrypt.h" +#include "wine/debug.h" + WINE_DEFAULT_DEBUG_CHANNEL(cryptnet); BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)

1 0