May 2008 - Wine-commits - list.winehq.org

Francois Gouget : cryptdlg: Fix the GetFriendlyNameOfCert[AW] call convention.
by Alexandre Julliard 06 May '08

06 May '08

Module: wine Branch: master Commit: a425379175e57d902c26bea6248fae5b7a5d885b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a425379175e57d902c26bea62… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue May 6 15:58:01 2008 +0200 cryptdlg: Fix the GetFriendlyNameOfCert[AW] call convention. --- dlls/cryptdlg/main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/cryptdlg/main.c b/dlls/cryptdlg/main.c index 2a4a02e..9d3eb4e 100644 --- a/dlls/cryptdlg/main.c +++ b/dlls/cryptdlg/main.c @@ -50,7 +50,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) /*********************************************************************** * GetFriendlyNameOfCertA (CRYPTDLG.@) */ -DWORD GetFriendlyNameOfCertA(PCCERT_CONTEXT pccert, LPSTR pchBuffer, +DWORD WINAPI GetFriendlyNameOfCertA(PCCERT_CONTEXT pccert, LPSTR pchBuffer, DWORD cchBuffer) { return CertGetNameStringA(pccert, CERT_NAME_FRIENDLY_DISPLAY_TYPE, 0, NULL, @@ -60,7 +60,7 @@ DWORD GetFriendlyNameOfCertA(PCCERT_CONTEXT pccert, LPSTR pchBuffer, /*********************************************************************** * GetFriendlyNameOfCertW (CRYPTDLG.@) */ -DWORD GetFriendlyNameOfCertW(PCCERT_CONTEXT pccert, LPWSTR pchBuffer, +DWORD WINAPI GetFriendlyNameOfCertW(PCCERT_CONTEXT pccert, LPWSTR pchBuffer, DWORD cchBuffer) { return CertGetNameStringW(pccert, CERT_NAME_FRIENDLY_DISPLAY_TYPE, 0, NULL,

1 0

Francois Gouget : mshtml: gcc 2. 95 does not allow an array of undefined dimension in a struct. So fix dispex_static_data_t accordingly.
by Alexandre Julliard 06 May '08

06 May '08

Module: wine Branch: master Commit: 53f2cb83dcb6e459b7a2bf9e7c5fd713e445d2b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53f2cb83dcb6e459b7a2bf9e7… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue May 6 16:04:58 2008 +0200 mshtml: gcc 2.95 does not allow an array of undefined dimension in a struct. So fix dispex_static_data_t accordingly. --- dlls/mshtml/htmlcomment.c | 9 +++++---- dlls/mshtml/htmldoc.c | 15 ++++++++------- dlls/mshtml/htmlelem.c | 24 +++++++++++++----------- dlls/mshtml/htmlimg.c | 17 +++++++++-------- dlls/mshtml/htmlinput.c | 17 +++++++++-------- dlls/mshtml/htmlnode.c | 9 +++++---- dlls/mshtml/htmloption.c | 17 +++++++++-------- dlls/mshtml/htmlstyle.c | 9 +++++---- dlls/mshtml/htmltextnode.c | 13 +++++++------ dlls/mshtml/htmlwindow.c | 11 ++++++----- dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/omnavigator.c | 9 +++++---- 12 files changed, 82 insertions(+), 70 deletions(-) diff --git a/dlls/mshtml/htmlcomment.c b/dlls/mshtml/htmlcomment.c index 2155a16..b006dbb 100644 --- a/dlls/mshtml/htmlcomment.c +++ b/dlls/mshtml/htmlcomment.c @@ -175,14 +175,15 @@ static const NodeImplVtbl HTMLCommentElementImplVtbl = { HTMLCommentElement_destructor }; +static const tid_t HTMLCommentElement_iface_tids[] = { + IHTMLCommentElement_tid, + 0 +}; static dispex_static_data_t HTMLCommentElement_dispex = { NULL, DispHTMLCommentElement_tid, NULL, - { - IHTMLCommentElement_tid, - 0 - } + HTMLCommentElement_iface_tids }; HTMLElement *HTMLCommentElement_Create(nsIDOMNode *nsnode) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 73e31f1..c7d9eb8 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1490,17 +1490,18 @@ static const IDispatchExVtbl DocDispatchExVtbl = { DocDispatchEx_GetNameSpaceParent }; +static const tid_t HTMLDocument_iface_tids[] = { + IHTMLDocument2_tid, + IHTMLDocument3_tid, + IHTMLDocument4_tid, + IHTMLDocument5_tid, + 0 +}; static dispex_static_data_t HTMLDocument_dispex = { NULL, DispHTMLDocument_tid, NULL, - { - IHTMLDocument2_tid, - IHTMLDocument3_tid, - IHTMLDocument4_tid, - IHTMLDocument5_tid, - 0 - } + HTMLDocument_iface_tids }; HRESULT HTMLDocument_Create(IUnknown *pUnkOuter, REFIID riid, void** ppvObject) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 837f548..22e8c5c 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1326,17 +1326,18 @@ static const NodeImplVtbl HTMLElementImplVtbl = { HTMLElement_destructor }; +static const tid_t HTMLElement_iface_tids[] = { + IHTMLDOMNode_tid, + IHTMLDOMNode2_tid, + IHTMLElement_tid, + IHTMLElement2_tid, + 0 +}; static dispex_static_data_t HTMLElement_dispex = { NULL, DispHTMLUnknownElement_tid, NULL, - { - IHTMLDOMNode_tid, - IHTMLDOMNode2_tid, - IHTMLElement_tid, - IHTMLElement2_tid, - 0 - } + HTMLElement_iface_tids }; void HTMLElement_Init(HTMLElement *This) @@ -1769,14 +1770,15 @@ static const dispex_static_data_vtbl_t HTMLElementColection_dispex_vtbl = { HTMLElementCollection_invoke }; +static const tid_t HTMLElementCollection_iface_tids[] = { + IHTMLElementCollection_tid, + 0 +}; static dispex_static_data_t HTMLElementCollection_dispex = { &HTMLElementColection_dispex_vtbl, DispHTMLElementCollection_tid, NULL, - { - IHTMLElementCollection_tid, - 0 - } + HTMLElementCollection_iface_tids }; IHTMLElementCollection *create_all_collection(HTMLDOMNode *node) diff --git a/dlls/mshtml/htmlimg.c b/dlls/mshtml/htmlimg.c index 81060c1..92647be 100644 --- a/dlls/mshtml/htmlimg.c +++ b/dlls/mshtml/htmlimg.c @@ -526,18 +526,19 @@ static const NodeImplVtbl HTMLImgElementImplVtbl = { HTMLImgElement_destructor }; +static const tid_t HTMLImgElement_iface_tids[] = { + IHTMLDOMNode_tid, + IHTMLDOMNode2_tid, + IHTMLElement_tid, + IHTMLElement2_tid, + IHTMLImgElement_tid, + 0 +}; static dispex_static_data_t HTMLImgElement_dispex = { NULL, DispHTMLImg_tid, NULL, - { - IHTMLDOMNode_tid, - IHTMLDOMNode2_tid, - IHTMLElement_tid, - IHTMLElement2_tid, - IHTMLImgElement_tid, - 0 - } + HTMLImgElement_iface_tids }; HTMLElement *HTMLImgElement_Create(nsIDOMHTMLElement *nselem) diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index c4f2750..5b605b3 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -1059,18 +1059,19 @@ static const NodeImplVtbl HTMLInputElementImplVtbl = { HTMLInputElement_destructor }; +static const tid_t HTMLInputElement_iface_tids[] = { + IHTMLDOMNode_tid, + IHTMLDOMNode2_tid, + IHTMLElement_tid, + IHTMLElement2_tid, + IHTMLInputElement_tid, + 0 +}; static dispex_static_data_t HTMLInputElement_dispex = { NULL, DispHTMLInputElement_tid, NULL, - { - IHTMLDOMNode_tid, - IHTMLDOMNode2_tid, - IHTMLElement_tid, - IHTMLElement2_tid, - IHTMLInputElement_tid, - 0 - } + HTMLInputElement_iface_tids }; HTMLElement *HTMLInputElement_Create(nsIDOMHTMLElement *nselem) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index f330d15..f217893 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -193,14 +193,15 @@ static const IHTMLDOMChildrenCollectionVtbl HTMLDOMChildrenCollectionVtbl = { HTMLDOMChildrenCollection_item }; +static const tid_t HTMLDOMChildrenCollection_iface_tids[] = { + IHTMLDOMChildrenCollection_tid, + 0 +}; static dispex_static_data_t HTMLDOMChildrenCollection_dispex = { NULL, DispDOMChildrenCollection_tid, NULL, - { - IHTMLDOMChildrenCollection_tid, - 0 - } + HTMLDOMChildrenCollection_iface_tids }; static IHTMLDOMChildrenCollection *create_child_collection(HTMLDocument *doc, nsIDOMNodeList *nslist) diff --git a/dlls/mshtml/htmloption.c b/dlls/mshtml/htmloption.c index 0753810..efb9830 100644 --- a/dlls/mshtml/htmloption.c +++ b/dlls/mshtml/htmloption.c @@ -331,18 +331,19 @@ static const NodeImplVtbl HTMLOptionElementImplVtbl = { HTMLOptionElement_destructor }; +static const tid_t HTMLOptionElement_iface_tids[] = { + IHTMLDOMNode_tid, + IHTMLDOMNode2_tid, + IHTMLElement_tid, + IHTMLElement2_tid, + IHTMLOptionElement_tid, + 0 +}; static dispex_static_data_t HTMLOptionElement_dispex = { NULL, DispHTMLOptionElement_tid, NULL, - { - IHTMLDOMNode_tid, - IHTMLDOMNode2_tid, - IHTMLElement_tid, - IHTMLElement2_tid, - IHTMLOptionElement_tid, - 0 - } + HTMLOptionElement_iface_tids }; HTMLElement *HTMLOptionElement_Create(nsIDOMHTMLElement *nselem) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 01aa391..a9dc179 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -1845,14 +1845,15 @@ static const IHTMLStyleVtbl HTMLStyleVtbl = { HTMLStyle_toString }; +static const tid_t HTMLStyle_iface_tids[] = { + IHTMLStyle_tid, + 0 +}; static dispex_static_data_t HTMLStyle_dispex = { NULL, DispHTMLStyle_tid, NULL, - { - IHTMLStyle_tid, - 0 - } + HTMLStyle_iface_tids }; IHTMLStyle *HTMLStyle_Create(nsIDOMCSSStyleDeclaration *nsstyle) diff --git a/dlls/mshtml/htmltextnode.c b/dlls/mshtml/htmltextnode.c index b98821b..1911b18 100644 --- a/dlls/mshtml/htmltextnode.c +++ b/dlls/mshtml/htmltextnode.c @@ -185,16 +185,17 @@ static const NodeImplVtbl HTMLDOMTextNodeImplVtbl = { HTMLDOMTextNode_destructor }; +static const tid_t HTMLDOMTextNode_iface_tids[] = { + IHTMLDOMNode_tid, + IHTMLDOMNode2_tid, + IHTMLDOMTextNode_tid, + 0 +}; static dispex_static_data_t HTMLDOMTextNode_dispex = { NULL, DispHTMLDOMTextNode_tid, 0, - { - IHTMLDOMNode_tid, - IHTMLDOMNode2_tid, - IHTMLDOMTextNode_tid, - 0 - } + HTMLDOMTextNode_iface_tids }; HTMLDOMNode *HTMLDOMTextNode_Create(nsIDOMNode *nsnode) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 2073132..c46f05e 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -1107,15 +1107,16 @@ static const IDispatchExVtbl WindowDispExVtbl = { WindowDispEx_GetNameSpaceParent }; +static const tid_t HTMLWindow_iface_tids[] = { + IHTMLWindow2_tid, + IHTMLWindow3_tid, + 0 +}; static dispex_static_data_t HTMLWindow_dispex = { NULL, DispHTMLWindow2_tid, NULL, - { - IHTMLWindow2_tid, - IHTMLWindow3_tid, - 0 - } + HTMLWindow_iface_tids }; static const char wineConfig_func[] = diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 921d975..7ad2325 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -108,7 +108,7 @@ typedef struct { const dispex_static_data_vtbl_t *vtbl; const tid_t disp_tid; dispex_data_t *data; - const tid_t iface_tids[]; + const tid_t* const iface_tids; } dispex_static_data_t; typedef struct { diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index 74b2cfd..26287e8 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -300,14 +300,15 @@ static const IOmNavigatorVtbl OmNavigatorVtbl = { OmNavigator_get_userProfile }; +static const tid_t OmNavigator_iface_tids[] = { + IOmNavigator_tid, + 0 +}; static dispex_static_data_t OmNavigator_dispex = { NULL, IOmNavigator_tid, NULL, - { - IOmNavigator_tid, - 0 - } + OmNavigator_iface_tids }; IOmNavigator *OmNavigator_Create(void)

1 0

Francois Gouget : msxml3/tests: Add a trailing '\n' to an ok() call.
by Alexandre Julliard 06 May '08

06 May '08

Module: wine Branch: master Commit: 9787d68941bf31c00fd4a980dd272a5686f76fd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9787d68941bf31c00fd4a980d… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue May 6 15:55:25 2008 +0200 msxml3/tests: Add a trailing '\n' to an ok() call. --- dlls/msxml3/tests/domdoc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index d30dfc5..bd45a77 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -3277,7 +3277,7 @@ static void test_Namespaces(void) hr = IXMLDOMDocument2_loadXML(doc, _bstr_(szNamespacesXML), &bSucc); ok(hr == S_OK, "ret %08x\n", hr ); - ok(bSucc == VARIANT_TRUE, "Expected VARIANT_TRUE got VARIANT_FALSE"); + ok(bSucc == VARIANT_TRUE, "Expected VARIANT_TRUE got VARIANT_FALSE\n"); hr = IXMLDOMDocument_selectSingleNode(doc, _bstr_("root"), &pNode ); ok(hr == S_OK, "ret %08x\n", hr );

1 0

Francois Gouget : fusion: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 06 May '08

06 May '08

Module: wine Branch: master Commit: 10a25c384f413a3b6348b491914aa0c8a82051b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10a25c384f413a3b6348b4919… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue May 6 15:54:15 2008 +0200 fusion: Fix compilation on systems that don't support nameless unions. --- dlls/fusion/assembly.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/fusion/assembly.c b/dlls/fusion/assembly.c index 2110ba5..8973af3 100644 --- a/dlls/fusion/assembly.c +++ b/dlls/fusion/assembly.c @@ -230,8 +230,8 @@ static HRESULT parse_clr_tables(ASSEMBLY *assembly, ULONG offset) assembly->numtables = 0; for (i = 0; i < MAX_CLR_TABLES; i++) { - if ((i < 32 && (assembly->tableshdr->MaskValid.LowPart >> i) & 1) || - (i >= 32 && (assembly->tableshdr->MaskValid.HighPart >> i) & 1)) + if ((i < 32 && (assembly->tableshdr->MaskValid.u.LowPart >> i) & 1) || + (i >= 32 && (assembly->tableshdr->MaskValid.u.HighPart >> i) & 1)) { assembly->numtables++; } @@ -240,7 +240,7 @@ static HRESULT parse_clr_tables(ASSEMBLY *assembly, ULONG offset) currofs += assembly->numtables * sizeof(DWORD); memset(assembly->tables, -1, MAX_CLR_TABLES * sizeof(CLRTABLE)); - if (assembly->tableshdr->MaskValid.LowPart & 1) + if (assembly->tableshdr->MaskValid.u.LowPart & 1) { assembly->tables[0].offset = currofs; assembly->tables[0].rows = assembly->numrows[0]; @@ -250,8 +250,8 @@ static HRESULT parse_clr_tables(ASSEMBLY *assembly, ULONG offset) offidx = 1; for (i = 1; i < MAX_CLR_TABLES; i++) { - if ((i < 32 && (assembly->tableshdr->MaskValid.LowPart >> i) & 1) || - (i >= 32 && (assembly->tableshdr->MaskValid.HighPart >> i) & 1)) + if ((i < 32 && (assembly->tableshdr->MaskValid.u.LowPart >> i) & 1) || + (i >= 32 && (assembly->tableshdr->MaskValid.u.HighPart >> i) & 1)) { currofs += COR_TABLE_SIZES[previ] * assembly->numrows[offidx - 1]; assembly->tables[i].offset = currofs;

1 0

Francois Gouget : gdi32/tests: Add a trailing '\n' to a couple of ok() calls.
by Alexandre Julliard 06 May '08

06 May '08

Module: wine Branch: master Commit: 125dac3af88a896a464ad0bf2955b726f3c02f72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=125dac3af88a896a464ad0bf2… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue May 6 15:55:16 2008 +0200 gdi32/tests: Add a trailing '\n' to a couple of ok() calls. --- dlls/gdi32/tests/clipping.c | 2 +- dlls/gdi32/tests/metafile.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/tests/clipping.c b/dlls/gdi32/tests/clipping.c index 25cc146..595a94e 100644 --- a/dlls/gdi32/tests/clipping.c +++ b/dlls/gdi32/tests/clipping.c @@ -155,7 +155,7 @@ static void verify_region(HRGN hrgn, const RECT *rc) ok(EqualRect(rect, rc), "rects don't match\n"); } - ok(rgn.data.rdh.dwSize == sizeof(rgn.data.rdh), "expected sizeof(rdh), got %u", rgn.data.rdh.dwSize); + ok(rgn.data.rdh.dwSize == sizeof(rgn.data.rdh), "expected sizeof(rdh), got %u\n", rgn.data.rdh.dwSize); ok(rgn.data.rdh.iType == RDH_RECTANGLES, "expected RDH_RECTANGLES, got %u\n", rgn.data.rdh.iType); if (IsRectEmpty(rc)) { diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 0b50d58..7c14428 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -1441,7 +1441,7 @@ static int CALLBACK clip_emf_enum_proc(HDC hdc, HANDLETABLE *handle_table, trace("rect (%d,%d-%d,%d)\n", rect.left, rect.top, rect.right, rect.bottom); ok(EqualRect(&rect, rc), "rects don't match\n"); - ok(rgn1->data.rdh.dwSize == sizeof(rgn1->data.rdh), "expected sizeof(rdh), got %u", rgn1->data.rdh.dwSize); + ok(rgn1->data.rdh.dwSize == sizeof(rgn1->data.rdh), "expected sizeof(rdh), got %u\n", rgn1->data.rdh.dwSize); ok(rgn1->data.rdh.iType == RDH_RECTANGLES, "expected RDH_RECTANGLES, got %u\n", rgn1->data.rdh.iType); ok(rgn1->data.rdh.nCount == 1, "expected 1, got %u\n", rgn1->data.rdh.nCount); ok(rgn1->data.rdh.nRgnSize == sizeof(RECT), "expected sizeof(RECT), got %u\n", rgn1->data.rdh.nRgnSize); @@ -1494,7 +1494,7 @@ static int CALLBACK clip_emf_enum_proc(HDC hdc, HANDLETABLE *handle_table, rc_transformed.right, rc_transformed.bottom); ok(EqualRect(&rect, &rc_transformed), "rects don't match\n"); - ok(rgn2.data.rdh.dwSize == sizeof(rgn1->data.rdh), "expected sizeof(rdh), got %u", rgn2.data.rdh.dwSize); + ok(rgn2.data.rdh.dwSize == sizeof(rgn1->data.rdh), "expected sizeof(rdh), got %u\n", rgn2.data.rdh.dwSize); ok(rgn2.data.rdh.iType == RDH_RECTANGLES, "expected RDH_RECTANGLES, got %u\n", rgn2.data.rdh.iType); ok(rgn2.data.rdh.nCount == 1, "expected 1, got %u\n", rgn2.data.rdh.nCount); ok(rgn2.data.rdh.nRgnSize == sizeof(RECT), "expected sizeof(RECT), got %u\n", rgn2.data.rdh.nRgnSize);

1 0

Francois Gouget : d3d9/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 06 May '08

06 May '08

Module: wine Branch: master Commit: 58665f5db73eb1824e66884bd300b2ee23b2a58a URL: http://source.winehq.org/git/wine.git/?a=commit;h=58665f5db73eb1824e66884bd… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue May 6 15:57:30 2008 +0200 d3d9/tests: Fix compilation on systems that don't support nameless unions. --- dlls/d3d9/tests/visual.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index c954806..998dcda 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -170,8 +170,8 @@ static IDirect3DDevice9 *init_d3d9(void) trace("Description string: \"%s\"\n", identifier.Description); trace("Device name string: \"%s\"\n", identifier.DeviceName); trace("Driver version %d.%d.%d.%d\n", - HIWORD(identifier.DriverVersion.HighPart), LOWORD(identifier.DriverVersion.HighPart), - HIWORD(identifier.DriverVersion.LowPart), LOWORD(identifier.DriverVersion.LowPart)); + HIWORD(U(identifier.DriverVersion).HighPart), LOWORD(U(identifier.DriverVersion).HighPart), + HIWORD(U(identifier.DriverVersion).LowPart), LOWORD(U(identifier.DriverVersion).LowPart)); hr = IDirect3D9_CreateDevice(d3d9_ptr, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, present_parameters.hDeviceWindow, D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device_ptr); if(FAILED(hr)) {

1 0

Alexandre Julliard : shell32: Set the correct default for shell folders relative to the windows directory .
by Alexandre Julliard 06 May '08

06 May '08

Module: wine Branch: master Commit: 7c25ab8a07da7956eebed25fafecacb3aa9d8b05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c25ab8a07da7956eebed25fa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 6 15:50:10 2008 +0200 shell32: Set the correct default for shell folders relative to the windows directory. --- dlls/shell32/shellpath.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 6e66d1f..fb0c309 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -1925,7 +1925,15 @@ static HRESULT _SHRegisterFolders(HKEY hRootKey, HANDLE hToken, else if (CSIDL_Data[folders[i]].type == CSIDL_Type_AllUsers) _SHGetAllUsersProfilePath(SHGFP_TYPE_DEFAULT, folders[i], path); else if (CSIDL_Data[folders[i]].type == CSIDL_Type_WindowsPath) + { GetWindowsDirectoryW(path, MAX_PATH); + if (CSIDL_Data[folders[i]].szDefaultPath && + !IS_INTRESOURCE(CSIDL_Data[folders[i]].szDefaultPath)) + { + PathAddBackslashW(path); + strcatW(path, CSIDL_Data[folders[i]].szDefaultPath); + } + } else hr = E_FAIL; if (*path)

1 0

Alexandre Julliard : kernel32: Set the USERPROFILE and ALLUSERSPROFILE environment variables based on the ProfileList registry keys .
by Alexandre Julliard 06 May '08

06 May '08

Module: wine Branch: master Commit: 6477a1c1bfd7966ff75b6847156a765ec088b0b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6477a1c1bfd7966ff75b68471… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 6 15:54:07 2008 +0200 kernel32: Set the USERPROFILE and ALLUSERSPROFILE environment variables based on the ProfileList registry keys. --- dlls/kernel32/process.c | 117 +++++++++++++++++++++++++++++++++++++++-- dlls/userenv/tests/userenv.c | 2 +- tools/wine.inf.in | 1 - 3 files changed, 112 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index aeec13d..2118511 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -417,6 +417,50 @@ static BOOL set_registry_environment(void) return ret; } + +/*********************************************************************** + * get_reg_value + */ +static WCHAR *get_reg_value( HKEY hkey, const WCHAR *name ) +{ + char buffer[1024 * sizeof(WCHAR) + sizeof(KEY_VALUE_PARTIAL_INFORMATION)]; + KEY_VALUE_PARTIAL_INFORMATION *info = (KEY_VALUE_PARTIAL_INFORMATION *)buffer; + DWORD len, size = sizeof(buffer); + WCHAR *ret = NULL; + UNICODE_STRING nameW; + + RtlInitUnicodeString( &nameW, name ); + if (NtQueryValueKey( hkey, &nameW, KeyValuePartialInformation, buffer, size, &size )) + return NULL; + + if (size <= FIELD_OFFSET( KEY_VALUE_PARTIAL_INFORMATION, Data )) return NULL; + len = (size - FIELD_OFFSET( KEY_VALUE_PARTIAL_INFORMATION, Data )) / sizeof(WCHAR); + + if (info->Type == REG_EXPAND_SZ) + { + UNICODE_STRING value, expanded; + + value.MaximumLength = len * sizeof(WCHAR); + value.Buffer = (WCHAR *)info->Data; + if (!value.Buffer[len - 1]) len--; /* don't count terminating null if any */ + value.Length = len * sizeof(WCHAR); + expanded.Length = expanded.MaximumLength = 1024 * sizeof(WCHAR); + if (!(expanded.Buffer = HeapAlloc( GetProcessHeap(), 0, expanded.MaximumLength ))) return NULL; + if (!RtlExpandEnvironmentStrings_U( NULL, &value, &expanded, NULL )) ret = expanded.Buffer; + else RtlFreeUnicodeString( &expanded ); + } + else if (info->Type == REG_SZ) + { + if ((ret = HeapAlloc( GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR) ))) + { + memcpy( ret, info->Data, len * sizeof(WCHAR) ); + ret[len] = 0; + } + } + return ret; +} + + /*********************************************************************** * set_additional_environment * @@ -424,16 +468,73 @@ static BOOL set_registry_environment(void) */ static void set_additional_environment(void) { + static const WCHAR profile_keyW[] = {'M','a','c','h','i','n','e','\\', + 'S','o','f','t','w','a','r','e','\\', + 'M','i','c','r','o','s','o','f','t','\\', + 'W','i','n','d','o','w','s',' ','N','T','\\', + 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', + 'P','r','o','f','i','l','e','L','i','s','t',0}; + static const WCHAR profiles_valueW[] = {'P','r','o','f','i','l','e','s','D','i','r','e','c','t','o','r','y',0}; + static const WCHAR all_users_valueW[] = {'A','l','l','U','s','e','r','s','P','r','o','f','i','l','e','\0'}; static const WCHAR usernameW[] = {'U','S','E','R','N','A','M','E',0}; + static const WCHAR userprofileW[] = {'U','S','E','R','P','R','O','F','I','L','E',0}; + static const WCHAR allusersW[] = {'A','L','L','U','S','E','R','S','P','R','O','F','I','L','E',0}; + OBJECT_ATTRIBUTES attr; + UNICODE_STRING nameW; + WCHAR *user_name = NULL, *profile_dir = NULL, *all_users_dir = NULL; + HANDLE hkey; const char *name = wine_get_user_name(); - DWORD len = MultiByteToWideChar( CP_UNIXCP, 0, name, -1, NULL, 0 ); + DWORD len; + + /* set the USERNAME variable */ + + len = MultiByteToWideChar( CP_UNIXCP, 0, name, -1, NULL, 0 ); if (len) { - LPWSTR nameW = HeapAlloc( GetProcessHeap(), 0, len*sizeof(WCHAR) ); - MultiByteToWideChar( CP_UNIXCP, 0, name, -1, nameW, len ); - SetEnvironmentVariableW( usernameW, nameW ); - HeapFree( GetProcessHeap(), 0, nameW ); + user_name = HeapAlloc( GetProcessHeap(), 0, len*sizeof(WCHAR) ); + MultiByteToWideChar( CP_UNIXCP, 0, name, -1, user_name, len ); + SetEnvironmentVariableW( usernameW, user_name ); } + + /* set the USERPROFILE and ALLUSERSPROFILE variables */ + + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.ObjectName = &nameW; + attr.Attributes = 0; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + RtlInitUnicodeString( &nameW, profile_keyW ); + if (!NtOpenKey( &hkey, KEY_ALL_ACCESS, &attr )) + { + profile_dir = get_reg_value( hkey, profiles_valueW ); + all_users_dir = get_reg_value( hkey, all_users_valueW ); + NtClose( hkey ); + } + + if (profile_dir) + { + WCHAR *value, *p; + + if (all_users_dir) len = max( len, strlenW(all_users_dir) + 1 ); + len += strlenW(profile_dir) + 1; + value = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); + strcpyW( value, profile_dir ); + p = value + strlenW(value); + if (p > value && p[-1] != '\\') *p++ = '\\'; + strcpyW( p, user_name ); + SetEnvironmentVariableW( userprofileW, value ); + if (all_users_dir) + { + strcpyW( p, all_users_dir ); + SetEnvironmentVariableW( allusersW, value ); + } + HeapFree( GetProcessHeap(), 0, value ); + } + + HeapFree( GetProcessHeap(), 0, all_users_dir ); + HeapFree( GetProcessHeap(), 0, profile_dir ); + HeapFree( GetProcessHeap(), 0, user_name ); } /*********************************************************************** @@ -945,7 +1046,11 @@ void __wine_kernel_init(void) if (WaitForSingleObject( boot_event, 30000 )) WARN( "boot event wait timed out\n" ); CloseHandle( boot_event ); /* if we didn't find environment section, try again now that wineboot has run */ - if (!got_environment) set_registry_environment(); + if (!got_environment) + { + set_registry_environment(); + set_additional_environment(); + } } LdrInitializeThunk( 0, 0, 0, 0 ); diff --git a/dlls/userenv/tests/userenv.c b/dlls/userenv/tests/userenv.c index eccb1f1..a8d5221 100644 --- a/dlls/userenv/tests/userenv.c +++ b/dlls/userenv/tests/userenv.c @@ -162,7 +162,7 @@ static void test_create_env(void) int i, j; static const struct profile_item common_vars[] = { - { "ALLUSERSPROFILE", { 1, 1, 1, 1 } }, + { "ALLUSERSPROFILE", { 1, 1, 0, 0 } }, { "CommonProgramFiles", { 1, 1, 1, 1 } }, { "ComSpec", { 1, 1, 0, 0 } }, { "COMPUTERNAME", { 1, 1, 1, 1 } }, diff --git a/tools/wine.inf.in b/tools/wine.inf.in index f3750b3..bea392e 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -271,7 +271,6 @@ HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"SystemDrive", HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"SYSTEMROOT",,"%10%" HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"TEMP",0x00020000,"%10%\temp" HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"TMP",0x00020000,"%10%\temp" -HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"USERPROFILE",,"%53%" HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"windir",0x00020000,"%10%" HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"winsysdir",,"%11%"

1 0

Francois Gouget : ole32: Fix spelling of pCapabilities.
by Alexandre Julliard 06 May '08

06 May '08

Module: wine Branch: master Commit: 928048b5e3d3db1ff1a84336d1eb43bae97d978a URL: http://source.winehq.org/git/wine.git/?a=commit;h=928048b5e3d3db1ff1a84336d… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue May 6 15:51:33 2008 +0200 ole32: Fix spelling of pCapabilities. --- include/objbase.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/objbase.h b/include/objbase.h index 9f86fa9..6a07a25 100644 --- a/include/objbase.h +++ b/include/objbase.h @@ -393,7 +393,7 @@ HRESULT WINAPI CoInitializeSecurity(PSECURITY_DESCRIPTOR pSecDesc, LONG cAuthSvc HRESULT WINAPI CoGetCallContext(REFIID riid, void** ppInterface); HRESULT WINAPI CoQueryAuthenticationServices(DWORD* pcAuthSvc, SOLE_AUTHENTICATION_SERVICE** asAuthSvc); -HRESULT WINAPI CoQueryProxyBlanket(IUnknown* pProxy, DWORD* pwAuthnSvc, DWORD* pAuthzSvc, OLECHAR** pServerPrincName, DWORD* pAuthnLevel, DWORD* pImpLevel, RPC_AUTH_IDENTITY_HANDLE* pAuthInfo, DWORD* pCapabilites); +HRESULT WINAPI CoQueryProxyBlanket(IUnknown* pProxy, DWORD* pwAuthnSvc, DWORD* pAuthzSvc, OLECHAR** pServerPrincName, DWORD* pAuthnLevel, DWORD* pImpLevel, RPC_AUTH_IDENTITY_HANDLE* pAuthInfo, DWORD* pCapabilities); HRESULT WINAPI CoSetProxyBlanket(IUnknown* pProxy, DWORD dwAuthnSvc, DWORD dwAuthzSvc, OLECHAR* pServerPrincName, DWORD dwAuthnLevel, DWORD dwImpLevel, RPC_AUTH_IDENTITY_HANDLE pAuthInfo, DWORD dwCapabilities); HRESULT WINAPI CoCopyProxy(IUnknown* pProxy, IUnknown** ppCopy);

1 0

Alexander Dorofeyev : ddraw: Add full implementation of IDirect3DDevice7_Load.
by Alexandre Julliard 06 May '08

06 May '08

Module: wine Branch: master Commit: 7e8be9ecc01ee9815b62577c095237c42fe6c0a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e8be9ecc01ee9815b62577c0… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Tue May 6 00:49:28 2008 +0300 ddraw: Add full implementation of IDirect3DDevice7_Load. --- dlls/ddraw/device.c | 310 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 304 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7e8be9ecc01ee9815b625…

1 0