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

Stefan Dösinger : d3d9: Add an IDirect3D9Ex stub.
by Alexandre Julliard 03 Mar '08

03 Mar '08

Module: wine Branch: master Commit: d9f97259939f7273d6325441ae1e82a7bb0691d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9f97259939f7273d6325441a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Feb 28 21:10:46 2008 +0100 d3d9: Add an IDirect3D9Ex stub. --- dlls/d3d9/d3d9_private.h | 4 +- dlls/d3d9/directx.c | 80 +++++++++++++++++++++++++++++++++++----------- 2 files changed, 63 insertions(+), 21 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d9f97259939f7273d6325…

1 0

Christopher Berner : user32/tests: Conformance tests for LoadStringW and LoadStringA.
by Alexandre Julliard 03 Mar '08

03 Mar '08

Module: wine Branch: master Commit: 4b130aa0b03b29abb8d576190dfab9c9cd324853 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b130aa0b03b29abb8d576190… Author: Christopher Berner <raccoonone(a)procyongames.com> Date: Sun Mar 2 09:01:55 2008 -0800 user32/tests: Conformance tests for LoadStringW and LoadStringA. --- dlls/user32/tests/resource.c | 54 ++++++++++++++++++++++++++++++++++++++++- dlls/user32/tests/resource.rc | 1 + 2 files changed, 54 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/resource.c b/dlls/user32/tests/resource.c index 59f86ef..c2055dd 100644 --- a/dlls/user32/tests/resource.c +++ b/dlls/user32/tests/resource.c @@ -31,6 +31,50 @@ static void init_function_pointers(void) pPrivateExtractIconsA = (void*)GetProcAddress(hmod, "PrivateExtractIconsA"); } +static void test_LoadStringW(void) +{ + HINSTANCE hInst = GetModuleHandle(NULL); + WCHAR copiedstringw[128], returnedstringw[128], *resourcepointer = NULL; + char copiedstring[128], returnedstring[128]; + int length1, length2, retvalue; + + /* Check that the string which is returned by LoadStringW matches + the string at the pointer returned by LoadStringW when called with buflen = 0 */ + length1 = LoadStringW(hInst, 2, (WCHAR *) &resourcepointer, 0); /* get pointer to resource. */ + length2 = LoadStringW(hInst, 2, returnedstringw, sizeof(returnedstringw) /sizeof(WCHAR)); /* get resource string */ + ok(length2 > 0, "LoadStringW failed to load resource 2, ret %d, err %d\n", length2, GetLastError()); + todo_wine + { + ok(length1 == length2, "LoadStringW returned different values dependent on buflen. ret1 %d, ret2 %d\n", + length1, length2); + ok(length1 > 0 && resourcepointer != NULL, "LoadStringW failed to get pointer to resource 2, ret %d, err %d\n", + length1, GetLastError()); + } + + /* Copy the resource since it is not '\0' terminated, and add '\0' to the end */ + if(resourcepointer != NULL) /* Check that the resource pointer was loaded to avoid access violation */ + { + memcpy(copiedstringw, resourcepointer, length1 * sizeof(WCHAR)); + copiedstringw[length1] = '\0'; + /* check that strings match */ + WideCharToMultiByte( CP_ACP, 0, returnedstringw, -1, returnedstring, 128, NULL, NULL ); + WideCharToMultiByte( CP_ACP, 0, copiedstringw, -1, copiedstring, 128, NULL, NULL ); + ok(!memcmp(copiedstringw, returnedstringw, (length2 + 1)*sizeof(WCHAR)), + "strings don't match: returnedstring = %s, copiedstring = %s\n", returnedstring, copiedstring); + } + todo_wine + { + /* check that calling LoadStringW with buffer = NULL returns zero */ + retvalue = LoadStringW(hInst, 2, NULL, 0); + ok(!retvalue, "LoadStringW returned a non-zero value when called with buffer = NULL, retvalue = %d", + retvalue); + /* check again, with a different buflen value, that calling LoadStringW with buffer = NULL returns zero */ + retvalue = LoadStringW(hInst, 2, NULL, 128); + ok(!retvalue, "LoadStringW returned a non-zero value when called with buffer = NULL, retvalue = %d", + retvalue); + } +} + static void test_LoadStringA (void) { HINSTANCE hInst = GetModuleHandle (NULL); @@ -74,6 +118,13 @@ static void test_LoadStringA (void) "LoadString failed: ret %d err %d\n", ret, GetLastError()); ok( LoadStringA( hInst, MAKELONG( 65534, 0xffff ), buf, sizeof(buf)) == ret, "LoadString failed: ret %d err %d\n", ret, GetLastError()); + + ret = LoadStringA(hInst, 0, buf, 0); + todo_wine + { + ok( ret == -1, "LoadStringA did not return -1 when called with buflen = 0, got %d, err %d\n", + ret, GetLastError()); + } } static void test_accel1(void) @@ -316,7 +367,8 @@ static void test_LoadImage(void) START_TEST(resource) { init_function_pointers(); - test_LoadStringA (); + test_LoadStringA(); + test_LoadStringW(); test_accel1(); test_accel2(); test_PrivateExtractIcons(); diff --git a/dlls/user32/tests/resource.rc b/dlls/user32/tests/resource.rc index 31ec68f..f01c6f5 100644 --- a/dlls/user32/tests/resource.rc +++ b/dlls/user32/tests/resource.rc @@ -41,6 +41,7 @@ STRINGTABLE { 0 "String resource" 1 "Another string resource" + 2 L"This is a wide string resource" 65534 "Test high id" }

1 0

Alexandre Julliard : user32: Reimplement LoadStringA to avoid memory allocations and to pass the tests.
by Alexandre Julliard 03 Mar '08

03 Mar '08

Module: wine Branch: master Commit: 28d29300748e0bdd1b89c686b97696aa696652ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=28d29300748e0bdd1b89c686b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 3 20:06:54 2008 +0100 user32: Reimplement LoadStringA to avoid memory allocations and to pass the tests. --- dlls/user32/resource.c | 36 ++++++++++++++++++------------------ dlls/user32/tests/resource.c | 7 ++----- 2 files changed, 20 insertions(+), 23 deletions(-) diff --git a/dlls/user32/resource.c b/dlls/user32/resource.c index b9a51ae..9eed0e8 100644 --- a/dlls/user32/resource.c +++ b/dlls/user32/resource.c @@ -24,6 +24,7 @@ #include "windef.h" #include "winbase.h" #include "winerror.h" +#include "winternl.h" #include "winnls.h" #include "wine/winbase16.h" #include "wine/winuser16.h" @@ -400,32 +401,31 @@ INT WINAPI LoadStringW( HINSTANCE instance, UINT resource_id, /********************************************************************** * LoadStringA (USER32.@) */ -INT WINAPI LoadStringA( HINSTANCE instance, UINT resource_id, - LPSTR buffer, INT buflen ) +INT WINAPI LoadStringA( HINSTANCE instance, UINT resource_id, LPSTR buffer, INT buflen ) { - INT retval; - LPWSTR wbuf; + HGLOBAL hmem; + HRSRC hrsrc; + DWORD retval = 0; TRACE("instance = %p, id = %04x, buffer = %p, length = %d\n", instance, resource_id, buffer, buflen); - if(buffer == NULL) /* asked size of string */ - return LoadStringW(instance, resource_id, NULL, 0); + if (!buflen) return -1; - wbuf = HeapAlloc(GetProcessHeap(), 0, buflen * sizeof(WCHAR)); - if(!wbuf) - return 0; - - retval = LoadStringW(instance, resource_id, wbuf, buflen); - if(retval != 0) + /* Use loword (incremented by 1) as resourceid */ + if ((hrsrc = FindResourceW( instance, MAKEINTRESOURCEW((LOWORD(resource_id) >> 4) + 1), + (LPWSTR)RT_STRING )) && + (hmem = LoadResource( instance, hrsrc ))) { - retval = WideCharToMultiByte(CP_ACP, 0, wbuf, retval, buffer, buflen - 1, NULL, NULL); - buffer[retval] = 0; - TRACE("%s loaded !\n", debugstr_a(buffer)); - } - else buffer[0] = 0; /* no check of buflen here */ - HeapFree( GetProcessHeap(), 0, wbuf ); + const WCHAR *p = LockResource(hmem); + unsigned int id = resource_id & 0x000f; + + while (id--) p += *p + 1; + RtlUnicodeToMultiByteN( buffer, buflen - 1, &retval, p + 1, *p * sizeof(WCHAR) ); + } + buffer[retval] = 0; + TRACE("returning %s\n", debugstr_a(buffer)); return retval; } diff --git a/dlls/user32/tests/resource.c b/dlls/user32/tests/resource.c index c2055dd..0fd77b7 100644 --- a/dlls/user32/tests/resource.c +++ b/dlls/user32/tests/resource.c @@ -120,11 +120,8 @@ static void test_LoadStringA (void) "LoadString failed: ret %d err %d\n", ret, GetLastError()); ret = LoadStringA(hInst, 0, buf, 0); - todo_wine - { - ok( ret == -1, "LoadStringA did not return -1 when called with buflen = 0, got %d, err %d\n", - ret, GetLastError()); - } + ok( ret == -1, "LoadStringA did not return -1 when called with buflen = 0, got %d, err %d\n", + ret, GetLastError()); } static void test_accel1(void)

1 0

Alexandre Julliard : Replace some instances of LoadStringA by LoadStringW.
by Alexandre Julliard 03 Mar '08

03 Mar '08

Module: wine Branch: master Commit: 4fd668d01088e82b4639ee2f4f088e0b718e6a88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fd668d01088e82b4639ee2f4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 3 20:07:37 2008 +0100 Replace some instances of LoadStringA by LoadStringW. --- dlls/comdlg32/printdlg.c | 21 +++++++++------------ dlls/oledlg/insobjdlg.c | 34 +++++++++++++++++----------------- dlls/sane.ds/ui.c | 22 +++++++++++----------- 3 files changed, 37 insertions(+), 40 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index 73588b5..f2d67b5 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -308,15 +308,12 @@ static BOOL PRINTDLG_UpdatePrintDlgA(HWND hDlg, nToPage = GetDlgItemInt(hDlg, edt2, NULL, FALSE); if (nFromPage < lppd->nMinPage || nFromPage > lppd->nMaxPage || nToPage < lppd->nMinPage || nToPage > lppd->nMaxPage) { - char resourcestr[256]; - char resultstr[256]; - LoadStringA(COMDLG32_hInstance, PD32_INVALID_PAGE_RANGE, - resourcestr, 255); - sprintf(resultstr,resourcestr, lppd->nMinPage, lppd->nMaxPage); - LoadStringA(COMDLG32_hInstance, PD32_PRINT_TITLE, - resourcestr, 255); - MessageBoxA(hDlg, resultstr, resourcestr, - MB_OK | MB_ICONWARNING); + WCHAR resourcestr[256]; + WCHAR resultstr[256]; + LoadStringW(COMDLG32_hInstance, PD32_INVALID_PAGE_RANGE, resourcestr, 255); + wsprintfW(resultstr,resourcestr, lppd->nMinPage, lppd->nMaxPage); + LoadStringW(COMDLG32_hInstance, PD32_PRINT_TITLE, resourcestr, 255); + MessageBoxW(hDlg, resultstr, resourcestr, MB_OK | MB_ICONWARNING); return FALSE; } lppd->nFromPage = nFromPage; @@ -3569,9 +3566,9 @@ BOOL WINAPI PageSetupDlgA(LPPAGESETUPDLGA setupdlg) { bRet = PrintDlgA(&pdlg); if (!bRet){ if (!(setupdlg->Flags & PSD_NOWARNING)) { - char errstr[256]; - LoadStringA(COMDLG32_hInstance, PD32_NO_DEFAULT_PRINTER, errstr, 255); - MessageBoxA(setupdlg->hwndOwner, errstr, 0, MB_OK | MB_ICONERROR); + WCHAR errstr[256]; + LoadStringW(COMDLG32_hInstance, PD32_NO_DEFAULT_PRINTER, errstr, 255); + MessageBoxW(setupdlg->hwndOwner, errstr, 0, MB_OK | MB_ICONERROR); } return FALSE; } diff --git a/dlls/oledlg/insobjdlg.c b/dlls/oledlg/insobjdlg.c index 159b002..4578bbe 100644 --- a/dlls/oledlg/insobjdlg.c +++ b/dlls/oledlg/insobjdlg.c @@ -305,7 +305,7 @@ static void UIINSERTOBJECTDLG_SelectCreateNew(InsertObjectDlgInfo* pdlgInfo) */ static void UIINSERTOBJECTDLG_SelectCreateFromFile(InsertObjectDlgInfo* pdlgInfo) { - char resstr[MAX_PATH]; + WCHAR resstr[MAX_PATH]; ShowWindow(pdlgInfo->hwndAddCtrlBTN, SW_HIDE); ShowWindow(pdlgInfo->hwndObjTypeLBL, SW_HIDE); @@ -318,10 +318,10 @@ static void UIINSERTOBJECTDLG_SelectCreateFromFile(InsertObjectDlgInfo* pdlgInfo ShowWindow(pdlgInfo->hwndFileTB, SW_SHOW); ShowWindow(pdlgInfo->hwndBrowseBTN, SW_SHOW); - SendMessageA(pdlgInfo->hwndCreateFromFileCB, BM_SETCHECK, BST_CHECKED, 0); + SendMessageW(pdlgInfo->hwndCreateFromFileCB, BM_SETCHECK, BST_CHECKED, 0); - if (LoadStringA(OLEDLG_hInstance, IDS_RESULTFILEOBJDESC, resstr, MAX_PATH)) - SendMessageA(pdlgInfo->hwndResultDesc, WM_SETTEXT, 0, (LPARAM)resstr); + if (LoadStringW(OLEDLG_hInstance, IDS_RESULTFILEOBJDESC, resstr, MAX_PATH)) + SendMessageW(pdlgInfo->hwndResultDesc, WM_SETTEXT, 0, (LPARAM)resstr); } @@ -418,20 +418,20 @@ static void UIINSERTOBJECTDLG_FreeObjectTypes(InsertObjectDlgInfo* pdlgInfo) static void UIINSERTOBJECTDLG_SelChange(InsertObjectDlgInfo* pdlgInfo) { INT index; - CHAR objname[MAX_PATH]; - CHAR objdesc[MAX_PATH]; - CHAR resstr[MAX_PATH]; + WCHAR objname[MAX_PATH]; + WCHAR objdesc[MAX_PATH]; + WCHAR resstr[MAX_PATH]; TRACE("\n"); - if (LoadStringA(OLEDLG_hInstance, IDS_RESULTOBJDESC, resstr, MAX_PATH) && - ((index = SendMessageA(pdlgInfo->hwndObjTypeLB, LB_GETCURSEL, 0, 0)) >= 0) && - SendMessageA(pdlgInfo->hwndObjTypeLB, LB_GETTEXT, (WPARAM)index, (LPARAM)objname)) - sprintf(objdesc, resstr, objname); + if (LoadStringW(OLEDLG_hInstance, IDS_RESULTOBJDESC, resstr, MAX_PATH) && + ((index = SendMessageW(pdlgInfo->hwndObjTypeLB, LB_GETCURSEL, 0, 0)) >= 0) && + SendMessageW(pdlgInfo->hwndObjTypeLB, LB_GETTEXT, (WPARAM)index, (LPARAM)objname)) + wsprintfW(objdesc, resstr, objname); else objdesc[0] = 0; - SendMessageA(pdlgInfo->hwndResultDesc, WM_SETTEXT, 0, (LPARAM)objdesc); + SendMessageW(pdlgInfo->hwndResultDesc, WM_SETTEXT, 0, (LPARAM)objdesc); } @@ -615,13 +615,13 @@ static void UIINSERTOBJECTDLG_AddControl(InsertObjectDlgInfo* pdlgInfo) if (!bValid) { - char title[32]; - char msg[256]; + WCHAR title[32]; + WCHAR msg[256]; - LoadStringA(OLEDLG_hInstance, IDS_NOTOLEMODCAPTION, title, 32); - LoadStringA(OLEDLG_hInstance, IDS_NOTOLEMOD, msg, 256); + LoadStringW(OLEDLG_hInstance, IDS_NOTOLEMODCAPTION, title, 32); + LoadStringW(OLEDLG_hInstance, IDS_NOTOLEMOD, msg, 256); - MessageBoxA(pdlgInfo->hwndSelf, msg, title, MB_ICONEXCLAMATION); + MessageBoxW(pdlgInfo->hwndSelf, msg, title, MB_ICONEXCLAMATION); } } } diff --git a/dlls/sane.ds/ui.c b/dlls/sane.ds/ui.c index 6763240..83006c5 100644 --- a/dlls/sane.ds/ui.c +++ b/dlls/sane.ds/ui.c @@ -608,14 +608,13 @@ BOOL DoScannerUI(void) static void UpdateRelevantEdit(HWND hwnd, const SANE_Option_Descriptor *opt, int index, int position) { - CHAR buffer[244]; + WCHAR buffer[244]; HWND edit_w; - CHAR unit[20]; - - LoadStringA(SANE_instance, opt->unit, unit,20); + int len; if (opt->type == SANE_TYPE_INT) { + static const WCHAR formatW[] = {'%','i',0}; INT si; if (opt->constraint.range->quant) @@ -623,11 +622,11 @@ static void UpdateRelevantEdit(HWND hwnd, const SANE_Option_Descriptor *opt, else si = position; - sprintf(buffer,"%i %s",si,unit); - + len = wsprintfW( buffer, formatW, si ); } else if (opt->type == SANE_TYPE_FIXED) { + static const WCHAR formatW[] = {'%','f',0}; double s_quant, dd; s_quant = SANE_UNFIX(opt->constraint.range->quant); @@ -637,14 +636,15 @@ static void UpdateRelevantEdit(HWND hwnd, const SANE_Option_Descriptor *opt, else dd = position * 0.01; - sprintf(buffer,"%f %s",dd,unit); + len = wsprintfW( buffer, formatW, dd ); } - else - buffer[0] = 0; + else return; + + buffer[len++] = ' '; + LoadStringW( SANE_instance, opt->unit, buffer + len, sizeof(buffer)/sizeof(WCHAR) - len ); edit_w = GetDlgItem(hwnd,index+ID_BASE+ID_EDIT_BASE); - if (edit_w && buffer[0]) - SetWindowTextA(edit_w,buffer); + if (edit_w) SetWindowTextW(edit_w,buffer); }

1 0

Jacek Caban : wininet: Moved InternetReadFileExA to vtbl.
by Alexandre Julliard 03 Mar '08

03 Mar '08

Module: wine Branch: master Commit: d597fd12fc3b08ff69ef3fa2442e934b0f3c835d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d597fd12fc3b08ff69ef3fa24… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 3 18:07:20 2008 +0100 wininet: Moved InternetReadFileExA to vtbl. --- dlls/wininet/ftp.c | 3 + dlls/wininet/http.c | 69 ++++++++++++++++++++++ dlls/wininet/internet.c | 147 ++++------------------------------------------ dlls/wininet/internet.h | 1 + 4 files changed, 86 insertions(+), 134 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d597fd12fc3b08ff69ef3…

1 0

Stefan Dösinger : wined3d: Call fixup_extensions before destroying the fake context.
by Alexandre Julliard 03 Mar '08

03 Mar '08

Module: wine Branch: master Commit: 5709a0b4b6af7cd211a491de09a2837d03c7ba91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5709a0b4b6af7cd211a491de0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Feb 24 10:19:01 2008 +0100 wined3d: Call fixup_extensions before destroying the fake context. --- dlls/wined3d/directx.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 5b7333c..b7c56a6 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3397,10 +3397,11 @@ BOOL InitAdapters(void) { TRACE("iPixelFormat=%d, RGBA=%d/%d/%d/%d, depth=%d, stencil=%d\n", cfgs->iPixelFormat, cfgs->redSize, cfgs->greenSize, cfgs->blueSize, cfgs->alphaSize, cfgs->depthSize, cfgs->stencilSize); cfgs++; } - WineD3D_ReleaseFakeGLContext(); fixup_extensions(&Adapters[0].gl_info); + WineD3D_ReleaseFakeGLContext(); + select_shader_mode(&Adapters[0].gl_info, WINED3DDEVTYPE_HAL, &ps_selected_mode, &vs_selected_mode); select_shader_max_constants(ps_selected_mode, vs_selected_mode, &Adapters[0].gl_info); fillGLAttribFuncs(&Adapters[0].gl_info);

1 0

Alexandre Julliard : dlls: Move installation rules for 16-bit placeholders to the top-level makefile.
by Alexandre Julliard 03 Mar '08

03 Mar '08

Module: wine Branch: master Commit: c72b9b2820885e8d768cfb1c4bd06a12dd838a8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c72b9b2820885e8d768cfb1c4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 3 15:18:57 2008 +0100 dlls: Move installation rules for 16-bit placeholders to the top-level makefile. --- dlls/Makedll.rules.in | 17 +++-------------- dlls/Makefile.in | 12 ++++++++++++ 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/dlls/Makedll.rules.in b/dlls/Makedll.rules.in index 45a8836..5d897bb 100644 --- a/dlls/Makedll.rules.in +++ b/dlls/Makedll.rules.in @@ -81,19 +81,8 @@ doc-sgml: $(C_SRCS) dummy # Rules for installation -EXE_SPECS16 = $(SPEC_SRCS16:.exe.spec=.exe16) -DRV_SPECS16 = $(EXE_SPECS16:.drv.spec=.drv16) -ALL_SPECS16 = $(DRV_SPECS16:.spec=.dll16) - -WIN16_INSTALL = $(SPEC_SRCS16:%=_install_/%) - .PHONY: install_static_implib_def install_static_implib_a -.PHONY: $(SPEC_SRCS16:%=_install_/%) $(ALL_SPECS16:%=_install_/%) $(IMPORTLIB:%=_install_/%) $(IMPLIB_SRCS:%=_install_static_implib_/%) - -$(SPEC_SRCS16:%=_install_/%): $(ALL_SPECS16:%=_install_/%) - -$(ALL_SPECS16:%=_install_/%): $(DESTDIR)$(dlldir) dummy - echo "$(MODULE)" > $(DESTDIR)$(dlldir)/`basename $@` +.PHONY: $(IMPORTLIB:%=_install_/%) $(IMPLIB_SRCS:%=_install_static_implib_/%) $(IMPORTLIB:%=_install_/%): $(IMPORTLIB) $(DESTDIR)$(dlldir) dummy $(INSTALL_DATA) $(IMPORTLIB) $(DESTDIR)$(dlldir)/$(IMPORTLIB) @@ -105,13 +94,13 @@ install_static_implib_a: $(IMPLIB_SRCS:%=_install_static_implib_/%): install_static_implib_$(IMPLIBEXT) -install install-lib:: $(MODULE)$(DLLEXT) $(DESTDIR)$(dlldir) @WIN16_INSTALL@ dummy +install install-lib:: $(MODULE)$(DLLEXT) $(DESTDIR)$(dlldir) dummy $(INSTALL_PROGRAM) $(MODULE)$(DLLEXT) $(DESTDIR)$(dlldir)/$(MODULE)$(DLLEXT) install install-dev:: $(IMPORTLIB:%=_install_/%) $(IMPLIB_SRCS:%=_install_static_implib_/%) uninstall:: - -cd $(DESTDIR)$(dlldir) && $(RM) $(MODULE)$(DLLEXT) $(IMPORTLIB) $(STATICIMPLIB) $(ALL_SPECS16) + -cd $(DESTDIR)$(dlldir) && $(RM) $(MODULE)$(DLLEXT) $(IMPORTLIB) $(STATICIMPLIB) # Misc. rules diff --git a/dlls/Makefile.in b/dlls/Makefile.in index e2680c9..5b4145d 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -5,6 +5,8 @@ TOPOBJDIR = .. SRCDIR = @srcdir@ VPATH = @srcdir@ +INSTALLDIRS = $(DESTDIR)$(dlldir) + # special configure-dependent targets GLU32FILES = glu32 @@ -1071,11 +1073,21 @@ winecrt0/libwinecrt0.a: winecrt0 # Misc rules +.PHONY: $(WIN16_FILES:%=__install__/%) + +WIN16_INSTALL = $(WIN16_FILES:%=__install__/%) + +$(WIN16_FILES:%=__install__/%): $(WIN16_FILES) $(DESTDIR)$(dlldir) dummy + $(INSTALL_DATA) `basename $@` $(DESTDIR)$(dlldir)/`basename $@` + +install install-lib:: @WIN16_INSTALL@ + install-lib:: $(INSTALLSUBDIRS:%=%/__install-lib__) install-dev:: $(INSTALLSUBDIRS:%=%/__install-dev__) uninstall:: + -cd $(DESTDIR)$(dlldir) && $(RM) $(WIN16_FILES) -rmdir $(DESTDIR)$(dlldir) clean::

1 0

Alexandre Julliard : winebuild: Add support for 16-bit exe modules.
by Alexandre Julliard 03 Mar '08

03 Mar '08

Module: wine Branch: master Commit: 0c214a7091af8efe39ffdaea7fe9e2de4d8006ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c214a7091af8efe39ffdaea7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 3 15:19:53 2008 +0100 winebuild: Add support for 16-bit exe modules. --- tools/winebuild/main.c | 15 ++++----------- tools/winebuild/spec16.c | 39 ++++++++++++++++++++++++++++++++++++--- 2 files changed, 40 insertions(+), 14 deletions(-) diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index 3238b2a..82ee59d 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -596,10 +596,12 @@ int main(int argc, char **argv) case MODE_DLL: if (spec->subsystem != IMAGE_SUBSYSTEM_NATIVE) spec->characteristics |= IMAGE_FILE_DLL; + if (!spec_file_name) fatal_error( "missing .spec file\n" ); + /* fall through */ + case MODE_EXE: load_resources( argv, spec ); load_import_libs( argv ); - if (!spec_file_name) fatal_error( "missing .spec file\n" ); - if (!parse_input_file( spec )) break; + if (spec_file_name && !parse_input_file( spec )) break; switch (spec->type) { case SPEC_WIN16: @@ -614,15 +616,6 @@ int main(int argc, char **argv) default: assert(0); } break; - case MODE_EXE: - if (spec->type == SPEC_WIN16) fatal_error( "Cannot build 16-bit exe files\n" ); - if (!spec->file_name) fatal_error( "executable must be named via the -F option\n" ); - load_resources( argv, spec ); - load_import_libs( argv ); - if (spec_file_name && !parse_input_file( spec )) break; - read_undef_symbols( spec, argv ); - BuildSpec32File( spec ); - break; case MODE_DEF: if (argv[0]) fatal_error( "file argument '%s' not allowed in this mode\n", argv[0] ); if (spec->type == SPEC_WIN16) fatal_error( "Cannot yet build .def file for 16-bit dlls\n" ); diff --git a/tools/winebuild/spec16.c b/tools/winebuild/spec16.c index f5be830..8fda978 100644 --- a/tools/winebuild/spec16.c +++ b/tools/winebuild/spec16.c @@ -435,6 +435,7 @@ static int sort_func_list( ORDDEF **list, int count, { int i, j; + if (!count) return 0; qsort( list, count, sizeof(*list), compare ); for (i = j = 0; i < count; i++) @@ -528,6 +529,7 @@ static void output_init_code( const DLLSPEC *spec, const char *header_name ) void BuildSpec16File( DLLSPEC *spec ) { ORDDEF **typelist; + ORDDEF *entry_point = NULL; int i, j, nb_funcs; char header_name[256]; @@ -535,6 +537,12 @@ void BuildSpec16File( DLLSPEC *spec ) output_standard_file_header(); + if (!spec->file_name) + { + char *p; + spec->file_name = xstrdup( output_file_name ); + if ((p = strrchr( spec->file_name, '.' ))) *p = 0; + } if (!spec->dll_name) /* set default name from file name */ { char *p; @@ -542,6 +550,28 @@ void BuildSpec16File( DLLSPEC *spec ) if ((p = strrchr( spec->dll_name, '.' ))) *p = 0; } + /* store the main entry point as ordinal 0 */ + + if (!spec->ordinals) + { + spec->ordinals = xmalloc( sizeof(spec->ordinals[0]) ); + spec->ordinals[0] = NULL; + } + if (spec->init_func && !(spec->characteristics & IMAGE_FILE_DLL)) + { + entry_point = xmalloc( sizeof(*entry_point) ); + entry_point->type = TYPE_PASCAL; + entry_point->ordinal = 0; + entry_point->lineno = 0; + entry_point->flags = FLAG_REGISTER; + entry_point->name = NULL; + entry_point->link_name = xstrdup( spec->init_func ); + entry_point->export_name = NULL; + entry_point->u.func.arg_types[0] = 0; + assert( !spec->ordinals[0] ); + spec->ordinals[0] = entry_point; + } + /* Build sorted list of all argument types, without duplicates */ typelist = xmalloc( (spec->limit + 1) * sizeof(*typelist) ); @@ -594,12 +624,15 @@ void BuildSpec16File( DLLSPEC *spec ) get_asm_short_keyword() ); output( "\t.long 0\n" ); /* ne_crc */ output( "\t%s 0x%04x\n", get_asm_short_keyword(), /* ne_flags */ - NE_FFLAGS_SINGLEDATA | NE_FFLAGS_LIBMODULE ); + NE_FFLAGS_SINGLEDATA | + ((spec->characteristics & IMAGE_FILE_DLL) ? NE_FFLAGS_LIBMODULE : 0) ); output( "\t%s 2\n", get_asm_short_keyword() ); /* ne_autodata */ output( "\t%s %u\n", get_asm_short_keyword(), spec->heap_size ); /* ne_heap */ output( "\t%s 0\n", get_asm_short_keyword() ); /* ne_stack */ - output( "\t.long 0\n" ); /* ne_csip */ - output( "\t.long 0\n" ); /* ne_sssp */ + if (!entry_point) output( "\t.long 0\n" ); /* ne_csip */ + else output( "\t%s .L__wine_%s_0-.L__wine_spec_code_segment,1\n", + get_asm_short_keyword(), make_c_identifier(spec->dll_name) ); + output( "\t%s 0,2\n", get_asm_short_keyword() ); /* ne_sssp */ output( "\t%s 2\n", get_asm_short_keyword() ); /* ne_cseg */ output( "\t%s 0\n", get_asm_short_keyword() ); /* ne_cmod */ output( "\t%s 0\n", get_asm_short_keyword() ); /* ne_cbnrestab */

1 0

Alexandre Julliard : kernel32: Added a winoldap. mod 16-bit exe to launch 32-bit processes.
by Alexandre Julliard 03 Mar '08

03 Mar '08

Module: wine Branch: master Commit: c52d921f34dd4e2541da7577737f89ab5a75c84b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c52d921f34dd4e2541da75777… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 3 15:22:35 2008 +0100 kernel32: Added a winoldap.mod 16-bit exe to launch 32-bit processes. Based on a patch by Dmitry Timoshkov. --- .gitignore | 1 + dlls/Makefile.in | 3 ++- dlls/kernel32/Makefile.in | 4 ++++ dlls/kernel32/kernel16.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ dlls/kernel32/ne_module.c | 24 ++++++++++++++++++++---- include/wine/winbase16.h | 1 + tools/make_makefiles | 9 ++++++++- 7 files changed, 80 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 61d4f61..a8ec784 100644 --- a/.gitignore +++ b/.gitignore @@ -559,6 +559,7 @@ dlls/winmm/tests/winmm_crosstest.exe dlls/winmm/winmm_res.res dlls/winnls.dll16 dlls/winnls32/libwinnls32.def +dlls/winoldap.mod16 dlls/winscard/libwinscard.def dlls/winscard/rsrc.res dlls/winsock.dll16 diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 5b4145d..96e3a85 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -419,6 +419,7 @@ WIN16_FILES = \ wineps16.drv16 \ wing.dll16 \ winnls.dll16 \ + winoldap.mod16 \ winsock.dll16 \ wintab.dll16 \ wprocs.dll16 @@ -446,7 +447,7 @@ dispdib.dll16 gdi.exe16 wing.dll16: imm.dll16: echo "imm32.dll" >$@ -comm.drv16 krnl386.exe16 stress.dll16 system.drv16 toolhelp.dll16 win87em.dll16 windebug.dll16: +comm.drv16 krnl386.exe16 stress.dll16 system.drv16 toolhelp.dll16 win87em.dll16 windebug.dll16 winoldap.mod16: echo "kernel32.dll" >$@ lzexpand.dll16: diff --git a/dlls/kernel32/Makefile.in b/dlls/kernel32/Makefile.in index aab68e6..2d57ea2 100644 --- a/dlls/kernel32/Makefile.in +++ b/dlls/kernel32/Makefile.in @@ -96,6 +96,7 @@ MC_SRCS = \ nls/winerr_kor.mc EXTRA_OBJS = relay16asm.o +EXTRA_OBJS16 = winoldap.mod.o EXTRASUBDIRS = nls @@ -106,6 +107,9 @@ kernel.res: $(MC_SRCS:.mc=.mc.rc) relay16asm.o: $(WINEBUILD) $(WINEBUILD) $(WINEBUILDFLAGS) -o $@ --relay16 +winoldap.mod.o: $(WINEBUILD) + $(WINEBUILD) $(WINEBUILDFLAGS) --exe -o $@ --main-module $(MODULE) --entry WINOLDAP_EntryPoint + # Special rules for 16-bit resource and spec files krnl386.exe.spec.o: krnl386.exe.spec version16.res diff --git a/dlls/kernel32/kernel16.c b/dlls/kernel32/kernel16.c index 50b11a0..81c9bee 100644 --- a/dlls/kernel32/kernel16.c +++ b/dlls/kernel32/kernel16.c @@ -28,6 +28,9 @@ #include "toolhelp.h" #include "kernel_private.h" #include "kernel16_private.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(module); /************************************************************************** * DllEntryPoint (KERNEL.669) @@ -130,3 +133,44 @@ HANDLE WINAPI CreateThread16( SECURITY_ATTRIBUTES *sa, DWORD stack, args->param = param; return CreateThread( sa, stack, start_thread16, args, flags, id ); } + +/************************************************************************** + * WINOLDAP entry point + */ +void WINAPI WINOLDAP_EntryPoint( CONTEXT86 *context ) +{ + PDB16 *psp; + INT len; + LPSTR cmdline; + PROCESS_INFORMATION info; + STARTUPINFOA startup; + DWORD count, exit_code = 1; + + InitTask16( context ); + + TRACE( "(ds=%x es=%x fs=%x gs=%x, bx=%04x cx=%04x di=%04x si=%x)\n", + context->SegDs, context->SegEs, context->SegFs, context->SegGs, + context->Ebx, context->Ecx, context->Edi, context->Esi ); + + psp = GlobalLock16( context->SegEs ); + len = psp->cmdLine[0]; + cmdline = HeapAlloc( GetProcessHeap(), 0, len + 1 ); + memcpy( cmdline, psp->cmdLine + 1, len ); + cmdline[len] = 0; + ReleaseThunkLock( &count ); + + memset( &startup, 0, sizeof(startup) ); + startup.cb = sizeof(startup); + + /* FIXME: Should this be WinExec instead of CreateProcess? */ + if (CreateProcessA( NULL, cmdline, NULL, NULL, FALSE, + 0, NULL, NULL, &startup, &info )) + { + WaitForSingleObject( info.hProcess, INFINITE ); + GetExitCodeProcess( info.hProcess, &exit_code ); + CloseHandle( info.hThread ); + CloseHandle( info.hProcess ); + } + HeapFree( GetProcessHeap(), 0, cmdline ); + ExitThread( exit_code ); +} diff --git a/dlls/kernel32/ne_module.c b/dlls/kernel32/ne_module.c index 09e3175..27a0abc 100644 --- a/dlls/kernel32/ne_module.c +++ b/dlls/kernel32/ne_module.c @@ -1197,6 +1197,8 @@ HINSTANCE16 WINAPI LoadModule16( LPCSTR name, LPVOID paramBlock ) if (name == NULL) return 0; + TRACE("name %s, paramBlock %p\n", name, paramBlock); + /* Load module */ if ( (hModule = NE_GetModuleByFilename(name) ) != 0 ) @@ -1707,10 +1709,24 @@ HINSTANCE16 WINAPI WinExec16( LPCSTR lpCmdLine, UINT16 nCmdShow ) if (ret == 21 || ret == ERROR_BAD_FORMAT) /* 32-bit module or unknown executable*/ { - DWORD count; - ReleaseThunkLock( &count ); - ret = LOWORD( WinExec( lpCmdLine, nCmdShow ) ); - RestoreThunkLock( count ); + LOADPARAMS16 params; + WORD showCmd[2]; + showCmd[0] = 2; + showCmd[1] = nCmdShow; + + arglen = strlen( lpCmdLine ); + cmdline = HeapAlloc( GetProcessHeap(), 0, arglen + 1 ); + cmdline[0] = (BYTE)arglen; + memcpy( cmdline + 1, lpCmdLine, arglen ); + + params.hEnvironment = 0; + params.cmdLine = MapLS( cmdline ); + params.showCmd = MapLS( showCmd ); + params.reserved = 0; + + ret = LoadModule16( "winoldap.mod", &params ); + UnMapLS( params.cmdLine ); + UnMapLS( params.showCmd ); } return ret; } diff --git a/include/wine/winbase16.h b/include/wine/winbase16.h index 3657994..21d8dca 100644 --- a/include/wine/winbase16.h +++ b/include/wine/winbase16.h @@ -452,6 +452,7 @@ BOOL16 WINAPI GlobalUnlock16(HGLOBAL16); BOOL16 WINAPI GlobalUnWire16(HGLOBAL16); SEGPTR WINAPI GlobalWire16(HGLOBAL16); WORD WINAPI InitAtomTable16(WORD); +void WINAPI InitTask16(CONTEXT86*); BOOL16 WINAPI IsBadCodePtr16(SEGPTR); BOOL16 WINAPI IsBadHugeReadPtr16(SEGPTR,DWORD); BOOL16 WINAPI IsBadHugeWritePtr16(SEGPTR,DWORD); diff --git a/tools/make_makefiles b/tools/make_makefiles index 4de81a4..98700db 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -225,7 +225,7 @@ sub parse_makefile($) $make{$1} = $2; next; } - if (/^(BISON_SRCS|LEX_SRCS|IDL_[CHIPS]_SRCS|IDL_TLB_SRCS|IMPLIB_SRCS|MC_SRCS|RC_SRCS|RC_SRCS16|RC_BINARIES|SPEC_SRCS16|MANPAGES|PROGRAMS)\s*=\s*(.*)/) + if (/^(BISON_SRCS|LEX_SRCS|IDL_[CHIPS]_SRCS|IDL_TLB_SRCS|IMPLIB_SRCS|MC_SRCS|RC_SRCS|RC_SRCS16|RC_BINARIES|SPEC_SRCS16|EXTRA_OBJS16|MANPAGES|PROGRAMS)\s*=\s*(.*)/) { my @list = split(/\s+/, $2); $make{$1} = \@list; @@ -422,6 +422,13 @@ sub update_dlls(@) my @list = map { $_ =~ s/\.spec$//; $_ .= ".dll" unless $_ =~ /\./; $_; } @{$makefile{"SPEC_SRCS16"}}; $altnames{$module} = \@list; } + if (defined $makefile{"EXTRA_OBJS16"}) + { + foreach my $obj (@{$makefile{"EXTRA_OBJS16"}}) + { + if ($obj =~ /^(.*\.(exe|mod))\.o/) { push @{$altnames{$module}}, $1; } + } + } } # output special dlls configure definitions

1 0

Paul Vriens : advapi32/tests: Skip not available functions.
by Alexandre Julliard 03 Mar '08

03 Mar '08

Module: wine Branch: master Commit: bfc290f6d0779ce83017155703ea7a530e8a7e79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfc290f6d0779ce8301715570… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Mon Mar 3 10:46:06 2008 +0100 advapi32/tests: Skip not available functions. --- dlls/advapi32/tests/security.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 5086cb7..9ff02e9 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -910,8 +910,17 @@ static void test_AccessCheck(void) /* test INHERIT_ONLY_ACE */ ret = InitializeAcl(Acl, 256, ACL_REVISION); ok(ret, "InitializeAcl failed with error %d\n", GetLastError()); - ret = pAddAccessAllowedAceEx(Acl, ACL_REVISION, INHERIT_ONLY_ACE, KEY_READ, EveryoneSid); - ok(ret, "AddAccessAllowedAceEx failed with error %d\n", GetLastError()); + + /* NT doesn't have AddAccessAllowedAceEx. Skipping this call/test doesn't influence + * the next ones. + */ + if (pAddAccessAllowedAceEx) + { + ret = pAddAccessAllowedAceEx(Acl, ACL_REVISION, INHERIT_ONLY_ACE, KEY_READ, EveryoneSid); + ok(ret, "AddAccessAllowedAceEx failed with error %d\n", GetLastError()); + } + else + skip("AddAccessAllowedAceEx is not available\n"); ret = AccessCheck(SecurityDescriptor, Token, KEY_READ, &Mapping, PrivSet, &PrivSetLen, &Access, &AccessStatus);

1 0