January 2007 - Wine-Commits

Andrew Talbot : dmloader: Declare some functions static.
by Alexandre Julliard Jan. 5, 2007

Jan. 5, 2007

Module: wine Branch: master Commit: b530ac97fbeda9bf2e1cb49e2b9153ec68a15aec URL: http://source.winehq.org/git/wine.git/?a=commit;h=b530ac97fbeda9bf2e1cb49e2… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Fri Jan 5 13:37:37 2007 +0000 dmloader: Declare some functions static. --- dlls/dmloader/debug.c | 10 +++++----- dlls/dmloader/debug.h | 5 ----- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/dmloader/debug.c b/dlls/dmloader/debug.c index 3d8b6cc..b71376f 100644 --- a/dlls/dmloader/debug.c +++ b/dlls/dmloader/debug.c @@ -64,7 +64,7 @@ const char *debugstr_dmversion (LPDMUS_V } /* month number into month name (for debugstr_filetime) */ -const char *debugstr_month (DWORD dwMonth) { +static const char *debugstr_month (DWORD dwMonth) { switch (dwMonth) { case 1: return "January"; case 2: return "February"; @@ -428,7 +428,7 @@ const char *debugstr_dmreturn (DWORD cod /* generic flag-dumping function */ -const char* debugstr_flags (DWORD flags, const flag_info* names, size_t num_names){ +static const char* debugstr_flags (DWORD flags, const flag_info* names, size_t num_names){ static char buffer[128] = "", *ptr = &buffer[0]; unsigned int i, size = sizeof(buffer); @@ -446,7 +446,7 @@ const char* debugstr_flags (DWORD flags, } /* dump DMUS_OBJ flags */ -const char *debugstr_DMUS_OBJ_FLAGS (DWORD flagmask) { +static const char *debugstr_DMUS_OBJ_FLAGS (DWORD flagmask) { static const flag_info flags[] = { FE(DMUS_OBJ_OBJECT), FE(DMUS_OBJ_CLASS), @@ -465,7 +465,7 @@ const char *debugstr_DMUS_OBJ_FLAGS (DWO } /* dump DMUS_CONTAINER flags */ -const char *debugstr_DMUS_CONTAINER_FLAGS (DWORD flagmask) { +static const char *debugstr_DMUS_CONTAINER_FLAGS (DWORD flagmask) { static const flag_info flags[] = { FE(DMUS_CONTAINER_NOLOADS) }; @@ -473,7 +473,7 @@ const char *debugstr_DMUS_CONTAINER_FLAG } /* dump DMUS_CONTAINED_OBJF flags */ -const char *debugstr_DMUS_CONTAINED_OBJF_FLAGS (DWORD flagmask) { +static const char *debugstr_DMUS_CONTAINED_OBJF_FLAGS (DWORD flagmask) { static const flag_info flags[] = { FE(DMUS_CONTAINED_OBJF_KEEP) }; diff --git a/dlls/dmloader/debug.h b/dlls/dmloader/debug.h index f6486a5..8d28cea 100644 --- a/dlls/dmloader/debug.h +++ b/dlls/dmloader/debug.h @@ -57,12 +57,7 @@ extern const char *debugstr_filetime (LP extern const char *debugstr_dmguid (const GUID *id); /* returns name of given error code */ extern const char *debugstr_dmreturn (DWORD code); -/* generic flags-dumping function */ -extern const char *debugstr_flags (DWORD flags, const flag_info* names, size_t num_names); -extern const char *debugstr_DMUS_OBJ_FLAGS (DWORD flagmask); -extern const char *debugstr_DMUS_CONTAINER_FLAGS (DWORD flagmask); -extern const char *debugstr_DMUS_CONTAINED_OBJF_FLAGS (DWORD flagmask); /* dump whole DMUS_OBJECTDESC struct */ extern const char *debugstr_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc); extern const char *debugstr_DMUS_IO_CONTAINER_HEADER (LPDMUS_IO_CONTAINER_HEADER pHeader);

1 0

Andrew Talbot : dmime: Declare some functions static.
by Alexandre Julliard Jan. 5, 2007

Jan. 5, 2007

Module: wine Branch: master Commit: 96ff8e26cfc734e2af78696022bc3c96434db04a URL: http://source.winehq.org/git/wine.git/?a=commit;h=96ff8e26cfc734e2af7869602… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Fri Jan 5 13:36:53 2007 +0000 dmime: Declare some functions static. --- dlls/dmime/dmutils.c | 12 ++++++------ dlls/dmime/dmutils.h | 9 --------- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/dlls/dmime/dmutils.c b/dlls/dmime/dmutils.c index 83ad57b..84bf8bb 100644 --- a/dlls/dmime/dmutils.c +++ b/dlls/dmime/dmutils.c @@ -242,7 +242,7 @@ const char *debugstr_fourcc (DWORD fourc } /* DMUS_VERSION struct to string conversion for debug messages */ -const char *debugstr_dmversion (LPDMUS_VERSION version) { +static const char *debugstr_dmversion (LPDMUS_VERSION version) { if (!version) return "'null'"; return wine_dbg_sprintf ("\'%i,%i,%i,%i\'", HIWORD(version->dwVersionMS),LOWORD(version->dwVersionMS), @@ -269,7 +269,7 @@ static const char *debugstr_month (DWORD } /* FILETIME struct to string conversion for debug messages */ -const char *debugstr_filetime (LPFILETIME time) { +static const char *debugstr_filetime (LPFILETIME time) { SYSTEMTIME sysTime; if (!time) return "'null'"; @@ -614,7 +614,7 @@ const char *debugstr_dmreturn (DWORD cod /* generic flag-dumping function */ -const char* debugstr_flags (DWORD flags, const flag_info* names, size_t num_names){ +static const char* debugstr_flags (DWORD flags, const flag_info* names, size_t num_names){ static char buffer[128] = "", *ptr = &buffer[0]; unsigned int i, size = sizeof(buffer); @@ -632,7 +632,7 @@ const char* debugstr_flags (DWORD flags, } /* dump DMUS_OBJ flags */ -const char *debugstr_DMUS_OBJ_FLAGS (DWORD flagmask) { +static const char *debugstr_DMUS_OBJ_FLAGS (DWORD flagmask) { static const flag_info flags[] = { FE(DMUS_OBJ_OBJECT), FE(DMUS_OBJ_CLASS), @@ -651,7 +651,7 @@ const char *debugstr_DMUS_OBJ_FLAGS (DWO } /* dump DMUS_CONTAINER flags */ -const char *debugstr_DMUS_CONTAINER_FLAGS (DWORD flagmask) { +static const char *debugstr_DMUS_CONTAINER_FLAGS (DWORD flagmask) { static const flag_info flags[] = { FE(DMUS_CONTAINER_NOLOADS) }; @@ -659,7 +659,7 @@ const char *debugstr_DMUS_CONTAINER_FLAG } /* dump DMUS_CONTAINED_OBJF flags */ -const char *debugstr_DMUS_CONTAINED_OBJF_FLAGS (DWORD flagmask) { +static const char *debugstr_DMUS_CONTAINED_OBJF_FLAGS (DWORD flagmask) { static const flag_info flags[] = { FE(DMUS_CONTAINED_OBJF_KEEP) }; diff --git a/dlls/dmime/dmutils.h b/dlls/dmime/dmutils.h index 8bca6b5..d902cdf 100644 --- a/dlls/dmime/dmutils.h +++ b/dlls/dmime/dmutils.h @@ -66,20 +66,11 @@ extern int even_or_odd (DWORD number); extern BOOL IS_VALID_DMFORM (FOURCC chunkID); /* FOURCC to string conversion for debug messages */ extern const char *debugstr_fourcc (DWORD fourcc); -/* DMUS_VERSION struct to string conversion for debug messages */ -extern const char *debugstr_dmversion (LPDMUS_VERSION version); -/* FILETIME struct to string conversion for debug messages */ -extern const char *debugstr_filetime (LPFILETIME time); /* returns name of given GUID */ extern const char *debugstr_dmguid (const GUID *id); /* returns name of given error code */ extern const char *debugstr_dmreturn (DWORD code); -/* generic flags-dumping function */ -extern const char *debugstr_flags (DWORD flags, const flag_info* names, size_t num_names); -extern const char *debugstr_DMUS_OBJ_FLAGS (DWORD flagmask); -extern const char *debugstr_DMUS_CONTAINER_FLAGS (DWORD flagmask); -extern const char *debugstr_DMUS_CONTAINED_OBJF_FLAGS (DWORD flagmask); /* dump whole DMUS_OBJECTDESC struct */ extern const char *debugstr_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc); extern void debug_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc);

1 0

Francois Gouget : quartz: Use '%u' to print GetLastError().
by Alexandre Julliard Jan. 5, 2007

Jan. 5, 2007

Module: wine Branch: master Commit: 4fb03d9091c84f2560ed79669e21ca96e7ea8099 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fb03d9091c84f2560ed79669… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jan 5 13:05:20 2007 +0100 quartz: Use '%u' to print GetLastError(). --- dlls/quartz/memallocator.c | 6 +++--- dlls/quartz/videorenderer.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/memallocator.c b/dlls/quartz/memallocator.c index 917a542..9b4a0fb 100644 --- a/dlls/quartz/memallocator.c +++ b/dlls/quartz/memallocator.c @@ -245,7 +245,7 @@ static HRESULT WINAPI BaseMemAllocator_C { if (!(This->hSemWaiting = CreateSemaphoreW(NULL, This->pProps->cBuffers, This->pProps->cBuffers, NULL))) { - ERR("Couldn't create semaphore (error was %d)\n", GetLastError()); + ERR("Couldn't create semaphore (error was %u)\n", GetLastError()); hr = HRESULT_FROM_WIN32(GetLastError()); } else @@ -393,7 +393,7 @@ static HRESULT WINAPI BaseMemAllocator_R /* notify a waiting thread that there is now a free buffer */ if (!ReleaseSemaphore(This->hSemWaiting, 1, NULL)) { - ERR("ReleaseSemaphore failed with error %d\n", GetLastError()); + ERR("ReleaseSemaphore failed with error %u\n", GetLastError()); hr = HRESULT_FROM_WIN32(GetLastError()); } @@ -821,7 +821,7 @@ static HRESULT StdMemAllocator_Free(IMem /* free memory */ if (!VirtualFree(This->pMemory, 0, MEM_RELEASE)) { - ERR("Couldn't free memory. Error: %d\n", GetLastError()); + ERR("Couldn't free memory. Error: %u\n", GetLastError()); return HRESULT_FROM_WIN32(GetLastError()); } diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 246b097..7adf59a 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -156,7 +156,7 @@ static BOOL CreateRenderingWindow(VideoR { if (!RegisterClassA(&winclass)) { - ERR("Unable to register window %x\n", GetLastError()); + ERR("Unable to register window %u\n", GetLastError()); return FALSE; } wnd_class_registered = TRUE;

1 0

Francois Gouget : urlmon: Print GetLastError() in decimal with '%u'.
by Alexandre Julliard Jan. 5, 2007

Jan. 5, 2007

Module: wine Branch: master Commit: 4dc5c7aedececcdba5b65d1091b52163034c6c72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dc5c7aedececcdba5b65d109… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jan 5 13:05:31 2007 +0100 urlmon: Print GetLastError() in decimal with '%u'. --- dlls/urlmon/umon.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/umon.c b/dlls/urlmon/umon.c index 7f69580..c8cef9c 100644 --- a/dlls/urlmon/umon.c +++ b/dlls/urlmon/umon.c @@ -711,7 +711,7 @@ static HRESULT URLMonikerImpl_BindToStor } if(bSuccess) { - TRACE("res = %d gle = %08x url len = %d\n", hres, GetLastError(), bind->expected_size); + TRACE("res = %d gle = %u url len = %d\n", hres, GetLastError(), bind->expected_size); IBindStatusCallback_OnProgress(bind->pbscb, 0, 0, BINDSTATUS_CACHEFILENAMEAVAILABLE, szFileName); @@ -765,7 +765,7 @@ static HRESULT WINAPI URLMonikerImpl_Bin bret = InternetCrackUrlW(This->URLName, 0, ICU_ESCAPE, &url); if(!bret) { - ERR("InternetCrackUrl failed: %d\n", GetLastError()); + ERR("InternetCrackUrl failed: %u\n", GetLastError()); return E_FAIL; }

1 0

Paul Vriens : winetest: Pass correct working directory to the tests.
by Alexandre Julliard Jan. 5, 2007

Jan. 5, 2007

Module: wine Branch: master Commit: 5b692005e8514417cb7592b3d008ae660e24915d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b692005e8514417cb7592b3d… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Thu Jan 4 21:35:23 2007 +0100 winetest: Pass correct working directory to the tests. --- programs/winetest/main.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 62dda0d..c2f6881 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -266,7 +266,7 @@ extract_test (struct wine_test *test, co value of WaitForSingleObject. */ static int -run_ex (char *cmd, const char *out, DWORD ms) +run_ex (char *cmd, const char *out, const char *tempdir, DWORD ms) { STARTUPINFO si; PROCESS_INFORMATION pi; @@ -289,7 +289,7 @@ run_ex (char *cmd, const char *out, DWOR } if (!CreateProcessA (NULL, cmd, NULL, NULL, TRUE, 0, - NULL, NULL, &si, &pi)) { + NULL, tempdir, &si, &pi)) { status = -2; } else { CloseHandle (pi.hThread); @@ -358,7 +358,7 @@ get_subtests (const char *tempdir, struc extract_test (test, tempdir, res_name); cmd = strmake (NULL, "%s --list", test->exename); - run_ex (cmd, subname, 5000); + run_ex (cmd, subname, tempdir, 5000); free (cmd); subfile = fopen (subname, "r"); @@ -407,7 +407,7 @@ get_subtests (const char *tempdir, struc } static void -run_test (struct wine_test* test, const char* subtest) +run_test (struct wine_test* test, const char* subtest, const char *tempdir) { int status; const char* file = get_test_source_file(test->name, subtest); @@ -415,7 +415,7 @@ run_test (struct wine_test* test, const char *cmd = strmake (NULL, "%s %s", test->exename, subtest); xprintf ("%s:%s start %s %s\n", test->name, subtest, file, rev); - status = run_ex (cmd, NULL, 120000); + status = run_ex (cmd, NULL, tempdir, 120000); free (cmd); xprintf ("%s:%s done (%d)\n", test->name, subtest, status); } @@ -538,7 +538,7 @@ run_tests (char *logname) for (j = 0; j < test->subtest_count; j++) { report (R_STEP, "Running: %s:%s", test->name, test->subtests[j]); - run_test (test, test->subtests[j]); + run_test (test, test->subtests[j], tempdir); } } report (R_DELTA, 0, "Running: Done");

1 0

Louis Lenders : devenum: Update Dutch resource.
by Alexandre Julliard Jan. 5, 2007

Jan. 5, 2007

Module: wine Branch: master Commit: 0f0297393588a268e2a6c30072676086a0494c7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f0297393588a268e2a6c3007… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Thu Jan 4 19:35:54 2007 +0000 devenum: Update Dutch resource. --- dlls/devenum/devenum.rc | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/devenum/devenum.rc b/dlls/devenum/devenum.rc index 143f151..cde4780 100644 --- a/dlls/devenum/devenum.rc +++ b/dlls/devenum/devenum.rc @@ -104,3 +104,12 @@ LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGI 9 "Standard enhet for lydavspilling" 10 "Standard enhet for MIDI-avspilling" } + +STRINGTABLE DISCARDABLE +LANGUAGE LANG_DUTCH, SUBLANG_DEFAULT +{ + 7 "Standaard DirectSound" + 8 "DirectSound: %s" + 9 "Standaardapparaat WaveOut" + 10 "Standaardapparaat MidiOut" +}

1 0

Francois Gouget : qcap: Print GetLastError() in decimal with '%u'.
by Alexandre Julliard Jan. 5, 2007

Jan. 5, 2007

Module: wine Branch: master Commit: 597f0b86b10341c8e08b6f4526c84bb2db1de6fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=597f0b86b10341c8e08b6f452… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jan 5 12:54:17 2007 +0100 qcap: Print GetLastError() in decimal with '%u'. --- dlls/qcap/v4l.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index ea844d1..bfc5236 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -689,7 +689,7 @@ HRESULT qcap_driver_run(Capture *capBox, LeaveCriticalSection(&capBox->CritSect); return S_OK; } - ERR("Creating thread failed.. %x\n", GetLastError()); + ERR("Creating thread failed.. %u\n", GetLastError()); LeaveCriticalSection(&capBox->CritSect); return E_FAIL; }

1 0

Dmitry Timoshkov : kernel32: GetTimeFormat and GetDateFormat should fail if LOCALE_NOUSEROVERRIDE is specified simultaneously with a format string .
by Alexandre Julliard Jan. 5, 2007

Jan. 5, 2007

Module: wine Branch: master Commit: f70fb8ec4c19739b579b9f3d5c47aaed1777f29e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f70fb8ec4c19739b579b9f3d5… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Fri Jan 5 14:25:39 2007 +0800 kernel32: GetTimeFormat and GetDateFormat should fail if LOCALE_NOUSEROVERRIDE is specified simultaneously with a format string. --- dlls/kernel32/lcformat.c | 4 ++-- dlls/kernel32/tests/locale.c | 13 +++++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/lcformat.c b/dlls/kernel32/lcformat.c index 068e2fc..5a3a332 100644 --- a/dlls/kernel32/lcformat.c +++ b/dlls/kernel32/lcformat.c @@ -329,10 +329,10 @@ BOOL NLS_IsUnicodeOnlyLcid(LCID lcid) #define IsTimeFmtChar(p) (p == 'H'||p == 'h'||p == 'm'||p == 's'||p == 't') /* Only the following flags can be given if a date/time format is specified */ -#define DATE_FORMAT_FLAGS (DATE_DATEVARSONLY|LOCALE_NOUSEROVERRIDE) +#define DATE_FORMAT_FLAGS (DATE_DATEVARSONLY) #define TIME_FORMAT_FLAGS (TIME_TIMEVARSONLY|TIME_FORCE24HOURFORMAT| \ TIME_NOMINUTESORSECONDS|TIME_NOSECONDS| \ - TIME_NOTIMEMARKER|LOCALE_NOUSEROVERRIDE) + TIME_NOTIMEMARKER) /****************************************************************************** * NLS_GetDateTimeFormatW <internal> diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index d2158be..2efa6f8 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -183,6 +183,11 @@ static void test_GetTimeFormatA(void) ret = GetTimeFormatA(lcid, TIME_FORCE24HOURFORMAT, &curtime, input, buffer, COUNTOF(buffer)); EXPECT_VALID; EXPECT_LENA; EXPECT_EQA; + /* MSDN: LOCALE_NOUSEROVERRIDE can't be specified with a format string */ + SetLastError(0xdeadbeef); + ret = GetTimeFormatA(lcid, NUO|TIME_FORCE24HOURFORMAT, &curtime, input, buffer, COUNTOF(buffer)); + EXPECT_FLAGS; EXPECT_LEN(0); EXPECT_EQA; + STRINGSA("tt HH':'mm'@'ss", "A"); /* Insufficent buffer */ SetLastError(0xdeadbeef); ret = GetTimeFormatA(lcid, TIME_FORCE24HOURFORMAT, &curtime, input, buffer, 2); @@ -339,6 +344,12 @@ static void test_GetDateFormatA(void) ret = GetDateFormatA(lcid, 0, &curtime, input, buffer, COUNTOF(buffer)); EXPECT_VALID; EXPECT_LENA; EXPECT_EQA; + /* Same as above but with LOCALE_NOUSEROVERRIDE */ + STRINGSA("ddd',' MMM dd yy",""); /* Simple case */ + SetLastError(0xdeadbeef); + ret = GetDateFormatA(lcid, NUO, &curtime, input, buffer, COUNTOF(buffer)); + EXPECT_FLAGS; EXPECT_LEN(0); EXPECT_EQA; + STRINGSA("ddd',' MMM dd yy","Sat, May 04 02"); /* Format containing "'" */ ret = GetDateFormatA(lcid, 0, &curtime, input, buffer, COUNTOF(buffer)); EXPECT_VALID; EXPECT_LENA; EXPECT_EQA; @@ -370,12 +381,14 @@ static void test_GetDateFormatA(void) /* test for expected DATE_YEARMONTH behavior with null format */ /* NT4 returns ERROR_INVALID_FLAGS for DATE_YEARMONTH */ STRINGSA("ddd',' MMM dd ''''yy", ""); /* DATE_YEARMONTH */ + SetLastError(0xdeadbeef); ret = GetDateFormat(lcid, NUO|DATE_YEARMONTH, &curtime, input, buffer, COUNTOF(buffer)); EXPECT_FLAGS; EXPECT_LEN(0); EXPECT_EQA; /* Test that using invalid DATE_* flags results in the correct error */ /* and return values */ STRINGSA("m/d/y", ""); /* Invalid flags */ + SetLastError(0xdeadbeef); ret = GetDateFormat(lcid, DATE_YEARMONTH|DATE_SHORTDATE|DATE_LONGDATE, &curtime, input, buffer, COUNTOF(buffer)); EXPECT_FLAGS; EXPECT_LEN(0); EXPECT_EQA;

1 0

Louis Lenders : comdlg32: Update Dutch resource.
by Alexandre Julliard Jan. 5, 2007

Jan. 5, 2007

Module: wine Branch: master Commit: 36b0aabe01cf69b2f06ec648affd22519956b928 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36b0aabe01cf69b2f06ec648a… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Thu Jan 4 19:31:06 2007 +0000 comdlg32: Update Dutch resource. --- dlls/comdlg32/cdlg_Nl.rc | 53 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 53 insertions(+), 0 deletions(-) diff --git a/dlls/comdlg32/cdlg_Nl.rc b/dlls/comdlg32/cdlg_Nl.rc index 04ba677..5f61d48 100644 --- a/dlls/comdlg32/cdlg_Nl.rc +++ b/dlls/comdlg32/cdlg_Nl.rc @@ -219,6 +219,29 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "&Help", pshHelp , 174, 75, 50, 14, WS_GROUP | WS_TABSTOP } +NEWFILEOPENORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 280, 164 +STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_CLIPCHILDREN +CAPTION "Openen" +FONT 8, "MS Shell Dlg" +{ + LTEXT "&Zoeken in",IDC_LOOKINSTATIC,4,6,43,8, SS_NOTIFY + COMBOBOX IDC_LOOKIN,49,3,132,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + + LTEXT "" , IDC_TOOLBARSTATIC, 181, 2, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE + LISTBOX IDC_SHELLSTATIC,4,20,272,85, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE + + LTEXT "Bestands&naam:",IDC_FILENAMESTATIC,5,112,48,8, SS_NOTIFY + EDITTEXT IDC_FILENAME,54,110,155,12,ES_AUTOHSCROLL + + LTEXT "Bestands&typen:",IDC_FILETYPESTATIC,5,128,48,8, SS_NOTIFY + COMBOBOX IDC_FILETYPE,54,126,155,53,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + + CONTROL "Openen met als kenmerk &Alleen-lezen",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,54,145,100,10 + + DEFPUSHBUTTON "&Openen", IDOK,222,110,50,14 + PUSHBUTTON "Annuleren", IDCANCEL,222,128,50,14 + PUSHBUTTON "&Help", pshHelp,222,145,50,14 +} PRINT32 DIALOG LOADONCALL MOVEABLE DISCARDABLE 32, 32, 288, 186 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | @@ -323,3 +346,33 @@ wachtrij" PD32_PRINTER_STATUS_SERVER_UNKNOWN "Print server onbekend; " PD32_PRINTER_STATUS_POWER_SAVE "Power safe mode; " } + +STRINGTABLE DISCARDABLE /* Color names */ +{ + IDS_COLOR_BLACK "Zwart" + IDS_COLOR_MAROON "Kastanjebruin" + IDS_COLOR_GREEN "Groen" + IDS_COLOR_OLIVE "Olijfgroen" + IDS_COLOR_NAVY "Marineblauw" + IDS_COLOR_PURPLE "Paars" + IDS_COLOR_TEAL "Groenblauw" + IDS_COLOR_GRAY "Grijs" + IDS_COLOR_SILVER "Zilver" + IDS_COLOR_RED "Rood" + IDS_COLOR_LIME "Lichtgroen" + IDS_COLOR_YELLOW "Geel" + IDS_COLOR_BLUE "Blauw" + IDS_COLOR_FUCHSIA "Fuchsiapaars" + IDS_COLOR_AQUA "Zeeblauw" + IDS_COLOR_WHITE "Wit" +} + +STRINGTABLE DISCARDABLE +{ + IDS_FONT_SIZE "Selecteer een lettertype tussen %d en %d punten." + IDS_SAVE_BUTTON "&Opslaan" + IDS_SAVE_IN "Op&slaan in:" + IDS_SAVE "Opslaan" + IDS_SAVE_AS "Opslaan als" + IDS_OPEN_FILE "Open bestand" +}

1 0

Vitaliy Margolen : dinput: Change EnumObjects to use GetObjectInfo.
by Alexandre Julliard Jan. 5, 2007

Jan. 5, 2007

Module: wine Branch: master Commit: 504798ce9f28276b961451dace8ed6fac218599c URL: http://source.winehq.org/git/wine.git/?a=commit;h=504798ce9f28276b961451dac… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Thu Jan 4 11:59:23 2007 -0700 dinput: Change EnumObjects to use GetObjectInfo. Also small debug trace correction to make it more readable. --- dlls/dinput/device.c | 77 ++++++++++++++++++------------------------- dlls/dinput/tests/device.c | 4 +- 2 files changed, 34 insertions(+), 47 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 460c7ee..469f3d8 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -800,15 +800,12 @@ ULONG WINAPI IDirectInputDevice2AImpl_Ad return InterlockedIncrement(&(This->ref)); } -HRESULT WINAPI IDirectInputDevice2AImpl_EnumObjects( - LPDIRECTINPUTDEVICE8A iface, - LPDIENUMDEVICEOBJECTSCALLBACKA lpCallback, - LPVOID lpvRef, - DWORD dwFlags) +HRESULT WINAPI IDirectInputDevice2AImpl_EnumObjects(LPDIRECTINPUTDEVICE8A iface, + LPDIENUMDEVICEOBJECTSCALLBACKA lpCallback, LPVOID lpvRef, DWORD dwFlags) { IDirectInputDevice2AImpl *This = (IDirectInputDevice2AImpl *)iface; DIDEVICEOBJECTINSTANCEA ddoi; - int i, axis = 0, button = 0; + int i; TRACE("(%p) %p,%p flags:%08x)\n", iface, lpCallback, lpvRef, dwFlags); TRACE(" - flags = "); @@ -821,56 +818,46 @@ HRESULT WINAPI IDirectInputDevice2AImpl_ for (i = 0; i < This->data_format.wine_df->dwNumObjs; i++) { - LPDIOBJECTDATAFORMAT odf; - DWORD type; + LPDIOBJECTDATAFORMAT odf = dataformat_to_odf(This->data_format.wine_df, i); - odf = (LPDIOBJECTDATAFORMAT)((LPBYTE)This->data_format.wine_df->rgodf + - i * This->data_format.wine_df->dwObjSize); - type = DIEFT_GETTYPE(odf->dwType); - - if (type & DIDFT_AXIS) axis++; - else if (type & DIDFT_BUTTON) button++; + if (dwFlags != DIDFT_ALL && !(dwFlags & DIEFT_GETTYPE(odf->dwType))) continue; + if (IDirectInputDevice_GetObjectInfo(iface, &ddoi, odf->dwType, DIPH_BYID) != DI_OK) + continue; - if (dwFlags != DIDFT_ALL && !(dwFlags & type)) continue; - - ddoi.guidType = *odf->pguid; - ddoi.dwType = odf->dwType; - ddoi.dwFlags = odf->dwFlags; - ddoi.dwOfs = !This->data_format.offsets ? odf->dwOfs : This->data_format.offsets[i]; - - if (IsEqualGUID(&ddoi.guidType, &GUID_XAxis)) strcpy(ddoi.tszName, "X-Axis"); - else if (IsEqualGUID(&ddoi.guidType, &GUID_YAxis)) strcpy(ddoi.tszName, "Y-Axis"); - else if (IsEqualGUID(&ddoi.guidType, &GUID_ZAxis)) strcpy(ddoi.tszName, "Z-Axis"); - else if (IsEqualGUID(&ddoi.guidType, &GUID_Key )) - GetKeyNameTextA((DIDFT_GETINSTANCE(odf->dwType) & 0x80) << 17 | - (DIDFT_GETINSTANCE(odf->dwType) & 0x7f) << 16, - ddoi.tszName, sizeof(ddoi.tszName)); - else if (type & DIDFT_AXIS) wsprintfA(ddoi.tszName, "%d-Axis", axis - 1); - else if (type & DIDFT_BUTTON) wsprintfA(ddoi.tszName, "Button %d", button - 1); - else FIXME("no name\n"); - - _dump_OBJECTINSTANCEA(&ddoi); if (lpCallback(&ddoi, lpvRef) != DIENUM_CONTINUE) break; } return DI_OK; } -HRESULT WINAPI IDirectInputDevice2WImpl_EnumObjects( - LPDIRECTINPUTDEVICE8W iface, - LPDIENUMDEVICEOBJECTSCALLBACKW lpCallback, - LPVOID lpvRef, - DWORD dwFlags) +HRESULT WINAPI IDirectInputDevice2WImpl_EnumObjects(LPDIRECTINPUTDEVICE8W iface, + LPDIENUMDEVICEOBJECTSCALLBACKW lpCallback, LPVOID lpvRef, DWORD dwFlags) { - device_enumobjects_AtoWcb_data data; + IDirectInputDevice2AImpl *This = (IDirectInputDevice2AImpl *)iface; + DIDEVICEOBJECTINSTANCEW ddoi; + int i; - data.lpCallBack = lpCallback; - data.lpvRef = lpvRef; + TRACE("(%p) %p,%p flags:%08x)\n", iface, lpCallback, lpvRef, dwFlags); + TRACE(" - flags = "); + _dump_EnumObjects_flags(dwFlags); + TRACE("\n"); - return IDirectInputDevice2AImpl_EnumObjects( - (LPDIRECTINPUTDEVICE8A) iface, - (LPDIENUMDEVICEOBJECTSCALLBACKA) DIEnumDevicesCallbackAtoW, - (LPVOID) &data, dwFlags); + /* Only the fields till dwFFMaxForce are relevant */ + memset(&ddoi, 0, sizeof(ddoi)); + ddoi.dwSize = FIELD_OFFSET(DIDEVICEOBJECTINSTANCEW, dwFFMaxForce); + + for (i = 0; i < This->data_format.wine_df->dwNumObjs; i++) + { + LPDIOBJECTDATAFORMAT odf = dataformat_to_odf(This->data_format.wine_df, i); + + if (dwFlags != DIDFT_ALL && !(dwFlags & DIEFT_GETTYPE(odf->dwType))) continue; + if (IDirectInputDevice_GetObjectInfo(iface, &ddoi, odf->dwType, DIPH_BYID) != DI_OK) + continue; + + if (lpCallback(&ddoi, lpvRef) != DIENUM_CONTINUE) break; + } + + return DI_OK; } /****************************************************************************** diff --git a/dlls/dinput/tests/device.c b/dlls/dinput/tests/device.c index 58c9d8f..2a9c24a 100644 --- a/dlls/dinput/tests/device.c +++ b/dlls/dinput/tests/device.c @@ -59,8 +59,8 @@ static const DIDATAFORMAT data_format = static BOOL CALLBACK enum_callback(LPCDIDEVICEOBJECTINSTANCE oi, LPVOID info) { if (winetest_debug > 1) - trace(" Type:%4x Ofs:%2x Name:%s Flags:%08x\n", - oi->dwType, oi->dwOfs, oi->tszName, oi->dwFlags); + trace(" Type:%4x Ofs:%3d Flags:%08x Name:%s\n", + oi->dwType, oi->dwOfs, oi->dwFlags, oi->tszName); (*(int*)info)++; return DIENUM_CONTINUE; }

1 0